summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-08-22 15:27:13 +0200
committerNoel Grandin <noel@peralex.com>2013-08-29 09:30:00 +0200
commit71a408f5b1244580b658bd79fa760bd2b3a64dea (patch)
treedf453a118d765f221bbc585822cdd5f32ba0eff5 /cui
parent82ecc2602cff2086da9a3ec1640156380c3ac028 (diff)
convert include/sfx2/sfxdlg.hxx from String to OUString
Change-Id: I13831d61e23db846d2083bbf96701384b750592f
Diffstat (limited to 'cui')
-rw-r--r--cui/source/factory/dlgfact.cxx20
-rw-r--r--cui/source/factory/dlgfact.hxx14
2 files changed, 17 insertions, 17 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index ab7a4bab0914..1e2f9b0802c7 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -396,12 +396,12 @@ sal_Bool AbstractInsertObjectDialog_Impl::IsCreateNew()
return pDlg->GetIconIfIconified( pGraphicMediaType );
}
-void AbstractPasteDialog_Impl::Insert( SotFormatStringId nFormat, const String & rFormatName )
+void AbstractPasteDialog_Impl::Insert( SotFormatStringId nFormat, const OUString & rFormatName )
{
pDlg->Insert( nFormat, rFormatName );
}
-void AbstractPasteDialog_Impl::SetObjName( const SvGlobalName & rClass, const String & rObjName )
+void AbstractPasteDialog_Impl::SetObjName( const SvGlobalName & rClass, const OUString & rObjName )
{
pDlg->SetObjName( rClass, rObjName );
}
@@ -1051,17 +1051,17 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* /*pParen
VclAbstractDialog* AbstractDialogFactory_Impl::CreateFrameDialog(
Window* pParent, const Reference< frame::XFrame >& rxFrame,
- sal_uInt32 nResId, const String& rParameter )
+ sal_uInt32 nResId, const OUString& rParameter )
{
Dialog* pDlg = NULL;
if ( SID_OPTIONS_TREEDIALOG == nResId || SID_OPTIONS_DATABASES == nResId )
{
// only activate last page if we dont want to activate a special page
- bool bActivateLastSelection = ( nResId != SID_OPTIONS_DATABASES && rParameter.Len() == 0 );
+ bool bActivateLastSelection = ( nResId != SID_OPTIONS_DATABASES && rParameter.isEmpty() );
OfaTreeOptionsDialog* pOptDlg = new OfaTreeOptionsDialog( pParent, rxFrame, bActivateLastSelection );
if ( nResId == SID_OPTIONS_DATABASES )
pOptDlg->ActivatePage(SID_SB_DBREGISTEROPTIONS);
- else if ( rParameter.Len() > 0 )
+ else if ( !rParameter.isEmpty() )
pOptDlg->ActivatePage( rParameter );
pDlg = pOptDlg;
}
@@ -1078,7 +1078,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nR
const SfxItemSet* pAttrSet,
SfxViewFrame* ,
bool /*bEditFmt*/,
- const String * )
+ const OUString * )
{
SfxTabDialog* pDlg=NULL;
switch ( nResId )
@@ -1103,7 +1103,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 nR
const SfxItemSet* pAttrSet,
const Reference< frame::XFrame >& xViewFrame,
bool /*bEditFmt*/,
- const String * )
+ const OUString * )
{
SfxTabDialog* pDlg=NULL;
switch ( nResId )
@@ -1234,11 +1234,11 @@ AbstractDialogFactory_Impl::CreateScriptSelectorDialog(
return new AbstractScriptSelectorDialog_Impl(pDlg);
}
-String AbstractScriptSelectorDialog_Impl::GetScriptURL() const
+OUString AbstractScriptSelectorDialog_Impl::GetScriptURL() const
{
if (pDlg)
return pDlg->GetScriptURL();
- return String();
+ return OUString();
}
void AbstractScriptSelectorDialog_Impl::SetRunLabel()
@@ -1249,7 +1249,7 @@ void AbstractScriptSelectorDialog_Impl::SetRunLabel()
}
VclAbstractDialog * AbstractDialogFactory_Impl::CreateSvxScriptOrgDialog( Window* pParent, //add for SvxScriptOrgDialog
- const String& rLanguage)
+ const OUString& rLanguage)
{
Dialog* pDlg=NULL;
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 9b38df3061b4..2e7409c26fb0 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -269,7 +269,7 @@ class AbstractScriptSelectorDialog_Impl : public AbstractScriptSelectorDialog
DECL_ABSTDLG_BASE(
AbstractScriptSelectorDialog_Impl, SvxScriptSelectorDialog)
- virtual String GetScriptURL() const;
+ virtual OUString GetScriptURL() const;
virtual void SetRunLabel();
};
@@ -523,8 +523,8 @@ class AbstractPasteDialog_Impl : public SfxAbstractPasteDialog
{
public:
DECL_ABSTDLG_BASE(AbstractPasteDialog_Impl, SvPasteObjectDialog )
- virtual void Insert( SotFormatStringId nFormat, const String & rFormatName );
- virtual void SetObjName( const SvGlobalName & rClass, const String & rObjName );
+ virtual void Insert( SotFormatStringId nFormat, const OUString & rFormatName );
+ virtual void SetObjName( const SvGlobalName & rClass, const OUString & rObjName );
virtual sal_uLong GetFormat( const TransferableDataHelper& aHelper,
const DataFlavorExVector* pFormats=0,
const TransferableObjectDescriptor* pDesc=0 );
@@ -596,19 +596,19 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame,
sal_uInt32 nResId
);
- virtual VclAbstractDialog* CreateFrameDialog( Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame, sal_uInt32 nResId, const String& rParameter );
+ virtual VclAbstractDialog* CreateFrameDialog( Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame, sal_uInt32 nResId, const OUString& rParameter );
virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId,
Window* pParent,
const SfxItemSet* pAttrSet,
SfxViewFrame* pViewFrame,
bool bEditFmt=false,
- const String *pUserButtonText=0 );
+ const OUString *pUserButtonText=0 );
virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId,
Window* pParent,
const SfxItemSet* pAttrSet,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame,
bool bEditFmt=false,
- const String *pUserButtonText=0 );
+ const OUString *pUserButtonText=0 );
virtual SfxAbstractTabDialog* CreateTextTabDialog( Window* pParent,
const SfxItemSet* pAttrSet,
SdrView* pView,
@@ -749,7 +749,7 @@ public:
virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId );
virtual DialogGetRanges GetDialogGetRangesFunc(); //add for SvxPostItDialog
- virtual VclAbstractDialog* CreateSvxScriptOrgDialog( Window* pParent, const String& rLanguage );
+ virtual VclAbstractDialog* CreateSvxScriptOrgDialog( Window* pParent, const OUString& rLanguage );
virtual AbstractScriptSelectorDialog*
CreateScriptSelectorDialog(