summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-09-15 10:34:59 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-09-16 14:43:04 +0200
commit70e552065339f1f7ab14f991f3e840b5461e609e (patch)
treea4fbcac77284e42ba6f206dd307428718a69110d /sd
parent03c77bbbed1e275bede8c6b2ca924eb3647d6f90 (diff)
convert SvxURLFormat to scoped enum
Change-Id: Ie2199cf0bcfb6d649f8aa33325ab645b18e7c000 Reviewed-on: https://gerrit.libreoffice.org/42343 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/app/sdmod2.cxx6
-rw-r--r--sd/source/ui/view/drviewse.cxx4
-rw-r--r--sd/source/ui/view/outlnvs2.cxx2
3 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index e22d875fde2c..89f0285abca0 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -324,12 +324,12 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void)
{
switch ( pURLField->GetFormat() )
{
- case SVXURLFORMAT_APPDEFAULT: //!!! adjustable at App???
- case SVXURLFORMAT_REPR:
+ case SvxURLFormat::AppDefault: //!!! adjustable at App???
+ case SvxURLFormat::Repr:
pInfo->SetRepresentation( pURLField->GetRepresentation() );
break;
- case SVXURLFORMAT_URL:
+ case SvxURLFormat::Url:
pInfo->SetRepresentation( pURLField->GetURL() );
break;
}
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 0d263e632c67..0c26b58e1c75 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -1425,7 +1425,7 @@ void DrawViewShell::InsertURLField(const OUString& rURL, const OUString& rText,
if (pOLV)
{
ESelection aSel( pOLV->GetSelection() );
- SvxFieldItem aURLItem( SvxURLField( rURL, rText, SVXURLFORMAT_REPR ), EE_FEATURE_FIELD );
+ SvxFieldItem aURLItem( SvxURLField( rURL, rText, SvxURLFormat::Repr ), EE_FEATURE_FIELD );
pOLV->InsertField( aURLItem );
if ( aSel.nStartPos <= aSel.nEndPos )
aSel.nEndPos = aSel.nStartPos + 1;
@@ -1439,7 +1439,7 @@ void DrawViewShell::InsertURLField(const OUString& rURL, const OUString& rText,
pOutl->Init( OutlinerMode::TextObject );
OutlinerMode nOutlMode = pOutl->GetMode();
- SvxURLField aURLField(rURL, rText, SVXURLFORMAT_REPR);
+ SvxURLField aURLField(rURL, rText, SvxURLFormat::Repr);
aURLField.SetTargetFrame(rTarget);
SvxFieldItem aURLItem(aURLField, EE_FEATURE_FIELD);
pOutl->QuickInsertField( aURLItem, ESelection() );
diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx
index 250087afb10a..471931566585 100644
--- a/sd/source/ui/view/outlnvs2.cxx
+++ b/sd/source/ui/view/outlnvs2.cxx
@@ -374,7 +374,7 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq)
SvxFieldItem aURLItem(SvxURLField(pHLItem->GetURL(),
pHLItem->GetName(),
- SVXURLFORMAT_REPR), EE_FEATURE_FIELD);
+ SvxURLFormat::Repr), EE_FEATURE_FIELD);
ESelection aSel( pOutlinerView->GetSelection() );
pOutlinerView->InsertField(aURLItem);
if ( aSel.nStartPos <= aSel.nEndPos )