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 /cui/source/factory | |
| 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 'cui/source/factory')
| -rw-r--r-- | cui/source/factory/dlgfact.cxx | 2 | ||||
| -rw-r--r-- | cui/source/factory/dlgfact.hxx | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index dfe6cce877f7..a8c280d07c86 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -1515,7 +1515,7 @@ AbstractSvxHpLinkDlg * AbstractDialogFactory_Impl::CreateSvxHpLinkDlg (Window* p AbstractFmSearchDialog* AbstractDialogFactory_Impl::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) { diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index e8211f878bdc..369e487946bb 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -164,7 +164,7 @@ class AbstractHangulHanjaConversionDialog_Impl: public AbstractHangulHanjaConver virtual editeng::HangulHanjaConversion::ConversionDirection GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const; virtual void SetCurrentString( const String& _rNewString, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions, + const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions, bool _bOriginatesFromDocument = true ); virtual String GetCurrentString( ) const ; @@ -515,7 +515,7 @@ class AbstractInsertObjectDialog_Impl : public SfxAbstractInsertObjectDialog { DECL_ABSTDLG_BASE(AbstractInsertObjectDialog_Impl, InsertObjectDialog_Impl) virtual com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( ::rtl::OUString* pGraphicMediaType ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( OUString* pGraphicMediaType ); virtual sal_Bool IsCreateNew(); }; @@ -623,10 +623,10 @@ public: const SfxItemSet& rAttr, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone); - virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommmand, + virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const OUString& rCommmand, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor, const SvObjectServerList* pList = 0 ); - virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommmand, + virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const OUString& rCommmand, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj ); virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent ); virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, sal_Bool bHTML, sfx2::SvBaseLink* p=0 ); @@ -714,7 +714,7 @@ public: sal_uInt32 nResId); 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); virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss (Window* pParent, //add for GraphicFilterEmboss @@ -777,7 +777,7 @@ public: virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( Window* pParent ) ; virtual VclAbstractDialog* CreateOptionsDialog( - Window* pParent, const rtl::OUString& rExtensionId, const rtl::OUString& rApplicationContext ); + Window* pParent, const OUString& rExtensionId, const rtl::OUString& rApplicationContext ); virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ); |