diff options
25 files changed, 53 insertions, 51 deletions
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx index 6345473d4257..9cf295b45d82 100644 --- a/editeng/qa/unit/core-test.cxx +++ b/editeng/qa/unit/core-test.cxx @@ -442,14 +442,14 @@ IMPL_STATIC_LINK( Test, CalcFieldValueHdl, EditFieldInfo*, pInfo, void ) OUString aURL = pURLField->GetURL(); switch ( pURLField->GetFormat() ) { - case SVXURLFORMAT_APPDEFAULT: - case SVXURLFORMAT_REPR: + case SvxURLFormat::AppDefault: + case SvxURLFormat::Repr: { pInfo->SetRepresentation( pURLField->GetRepresentation() ); } break; - case SVXURLFORMAT_URL: + case SvxURLFormat::Url: { pInfo->SetRepresentation( aURL ); } @@ -484,12 +484,12 @@ void Test::testHyperlinkCopyPaste() // URL 1 OUString aURL1 = "mailto:///user@example.com"; OUString aRepres1 = "user@example.com"; - SvxURLField aURLField1( aURL1, aRepres1, SVXURLFORMAT_REPR ); + SvxURLField aURLField1( aURL1, aRepres1, SvxURLFormat::Repr ); SvxFieldItem aField1( aURLField1, EE_FEATURE_FIELD ); // URL 2 OUString aURL2 = "mailto:///example@domain.com"; OUString aRepres2 = "example@domain.com"; - SvxURLField aURLField2( aURL2, aRepres2, SVXURLFORMAT_REPR ); + SvxURLField aURLField2( aURL2, aRepres2, SvxURLFormat::Repr ); SvxFieldItem aField2( aURLField2, EE_FEATURE_FIELD ); // Insert initial text @@ -741,7 +741,7 @@ void Test::testHyperlinkSearch() ContentNode *pNode = rDoc.GetObject(0); EditSelection aSel(EditPaM(pNode, 22), EditPaM(pNode, 22)); SvxURLField aURLField("mailto:///jim@bob.com", "jim@bob.com", - SVXURLFORMAT_REPR); + SvxURLFormat::Repr); SvxFieldItem aField(aURLField, EE_FEATURE_FIELD); aEngine.InsertField(aSel, aField); diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx index 47603ca1a039..c6861a11d32e 100644 --- a/editeng/source/editeng/edtspell.cxx +++ b/editeng/source/editeng/edtspell.cxx @@ -628,7 +628,7 @@ bool EdtAutoCorrDoc::SetINetAttr(sal_Int32 nStt, sal_Int32 nEnd, SAL_WARN_IF(nCursor < nEnd, "editeng", "Cursor in the heart of the action?!"); nCursor -= ( nEnd-nStt ); - SvxFieldItem aField( SvxURLField( rURL, aText, SVXURLFORMAT_REPR ), + SvxFieldItem aField( SvxURLField( rURL, aText, SvxURLFormat::Repr ), EE_FEATURE_FIELD ); mpEditEngine->InsertField(aSel, aField); nCursor++; diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx index 4c38b5234610..18b556424321 100644 --- a/editeng/source/editeng/eehtml.cxx +++ b/editeng/source/editeng/eehtml.cxx @@ -779,7 +779,7 @@ void EditHTMLParser::AnchorEnd() if ( pCurAnchor ) { // Insert as URL-Field... - SvxFieldItem aFld( SvxURLField( pCurAnchor->aHRef, pCurAnchor->aText, SVXURLFORMAT_REPR ), EE_FEATURE_FIELD ); + SvxFieldItem aFld( SvxURLField( pCurAnchor->aHRef, pCurAnchor->aText, SvxURLFormat::Repr ), EE_FEATURE_FIELD ); aCurSel = mpEditEngine->InsertField(aCurSel, aFld); bFieldsInserted = true; pCurAnchor.reset(); diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx index 97b0ce9a38f8..84ec72924b16 100644 --- a/editeng/source/editeng/eertfpar.cxx +++ b/editeng/source/editeng/eertfpar.cxx @@ -568,7 +568,7 @@ void EditRTFParser::ReadField() if ( aFldRslt.isEmpty() ) aFldRslt = aFldInst; - SvxFieldItem aField( SvxURLField( aFldInst, aFldRslt, SVXURLFORMAT_REPR ), EE_FEATURE_FIELD ); + SvxFieldItem aField( SvxURLField( aFldInst, aFldRslt, SvxURLFormat::Repr ), EE_FEATURE_FIELD ); aCurSel = mpEditEngine->InsertField(aCurSel, aField); mpEditEngine->UpdateFieldsOnly(); bLastActionInsertParaBreak = false; diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 4c3f7f5d9f94..d6d2bda1a29b 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -105,9 +105,10 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe xPropSet->getPropertyValue(UNO_TC_PROP_URL_TARGET) >>= aTarget; xPropSet->getPropertyValue(UNO_TC_PROP_URL) >>= aURL; xPropSet->getPropertyValue(UNO_TC_PROP_URL_FORMAT) >>= nFmt; - SvxURLField* pData = new SvxURLField(aURL, aRep, aRep.isEmpty() ? SVXURLFORMAT_URL : SVXURLFORMAT_REPR); + SvxURLField* pData = new SvxURLField(aURL, aRep, aRep.isEmpty() ? SvxURLFormat::Url : SvxURLFormat::Repr); pData->SetTargetFrame(aTarget); - if (nFmt >= SVXURLFORMAT_APPDEFAULT && nFmt <= SVXURLFORMAT_REPR) + if (static_cast<SvxURLFormat>(nFmt) >= SvxURLFormat::AppDefault && + static_cast<SvxURLFormat>(nFmt) <= SvxURLFormat::Repr) pData->SetFormat(static_cast<SvxURLFormat>(nFmt)); return pData; @@ -424,7 +425,7 @@ SV_IMPL_PERSIST1( SvxURLField ); SvxURLField::SvxURLField() { - eFormat = SVXURLFORMAT_URL; + eFormat = SvxURLFormat::Url; } diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index ec4e45ad93f2..5642daf850e8 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -263,7 +263,7 @@ SvxUnoTextField::SvxUnoTextField( sal_Int32 nServiceId ) throw() break; case text::textfield::Type::URL: - mpImpl->mnInt16 = SVXURLFORMAT_REPR; + mpImpl->mnInt16 = static_cast<sal_uInt16>(SvxURLFormat::Repr); break; case text::textfield::Type::EXTENDED_FILE: @@ -415,9 +415,10 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw() break; case text::textfield::Type::URL: - pData = new SvxURLField( mpImpl->msString3, mpImpl->msString1, !mpImpl->msString1.isEmpty() ? SVXURLFORMAT_REPR : SVXURLFORMAT_URL ); + pData = new SvxURLField( mpImpl->msString3, mpImpl->msString1, !mpImpl->msString1.isEmpty() ? SvxURLFormat::Repr : SvxURLFormat::Url ); static_cast<SvxURLField*>(pData)->SetTargetFrame( mpImpl->msString2 ); - if( mpImpl->mnInt16 >= SVXURLFORMAT_APPDEFAULT && mpImpl->mnInt16 <= SVXURLFORMAT_REPR ) + if( static_cast<SvxURLFormat>(mpImpl->mnInt16) >= SvxURLFormat::AppDefault && + static_cast<SvxURLFormat>(mpImpl->mnInt16) <= SvxURLFormat::Repr ) static_cast<SvxURLField*>(pData)->SetFormat( (SvxURLFormat)mpImpl->mnInt16 ); break; diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 924bcd9d72c5..56f482db00dc 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -6898,7 +6898,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport aTarget += "#"; aTarget += pHyperlink->aConvSubString; } - xEntry->xField1.reset(new SvxFieldItem( SvxURLField( aTarget, OUString(), SVXURLFORMAT_REPR ), EE_FEATURE_FIELD )); + xEntry->xField1.reset(new SvxFieldItem( SvxURLField( aTarget, OUString(), SvxURLFormat::Repr ), EE_FEATURE_FIELD )); } } break; @@ -7030,7 +7030,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport { if ( nNextStringLen <= nHyperLenLeft ) { - pCurrent->mpFieldItem.reset( new SvxFieldItem( SvxURLField( pField->GetURL(), pCurrent->maString, SVXURLFORMAT_REPR ), EE_FEATURE_FIELD ) ); + pCurrent->mpFieldItem.reset( new SvxFieldItem( SvxURLField( pField->GetURL(), pCurrent->maString, SvxURLFormat::Repr ), EE_FEATURE_FIELD ) ); nHyperLenLeft -= nNextStringLen; if ( nHyperLenLeft ) @@ -7051,7 +7051,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport pNewCPS->maString = pCurrent->maString.copy( nHyperLenLeft,( nNextStringLen - nHyperLenLeft ) ); aCharPropList.insert( aCharPropList.begin() + nIdx + 1, pNewCPS ); OUString aRepresentation = pCurrent->maString.copy( 0, nHyperLenLeft ); - pCurrent->mpFieldItem.reset( new SvxFieldItem( SvxURLField( pField->GetURL(), aRepresentation, SVXURLFORMAT_REPR ), EE_FEATURE_FIELD ) ); + pCurrent->mpFieldItem.reset( new SvxFieldItem( SvxURLField( pField->GetURL(), aRepresentation, SvxURLFormat::Repr ), EE_FEATURE_FIELD ) ); nHyperLenLeft = 0; } (pCurrent->maString).clear(); diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index faccf33224b9..d40f8e30766c 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -130,10 +130,11 @@ public: }; -enum SvxURLFormat { SVXURLFORMAT_APPDEFAULT = 0, // Set as in App - SVXURLFORMAT_URL, // Represent URL - SVXURLFORMAT_REPR // Constitute representation - }; +enum class SvxURLFormat { + AppDefault = 0, // Set as in App + Url, // Represent URL + Repr // Constitute representation +}; class EDITENG_DLLPUBLIC SvxURLField : public SvxFieldData { @@ -147,7 +148,7 @@ public: SV_DECL_PERSIST1( SvxURLField, css::text::textfield::Type::URL ) SvxURLField(); - SvxURLField( const OUString& rURL, const OUString& rRepres, SvxURLFormat eFmt = SVXURLFORMAT_URL ); + SvxURLField( const OUString& rURL, const OUString& rRepres, SvxURLFormat eFmt = SvxURLFormat::Url ); const OUString& GetURL() const { return aURL; } void SetURL( const OUString& rURL ) { aURL = rURL; } diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index 4035c4b6b9ee..a46f18e1aaa5 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -133,7 +133,7 @@ OUString ScEditUtil::GetString( const EditTextObject& rEditText, const ScDocumen EditTextObject* ScEditUtil::CreateURLObjectFromURL( ScDocument& rDoc, const OUString& rURL, const OUString& rText ) { - SvxURLField aUrlField( rURL, rText, SVXURLFORMAT_APPDEFAULT); + SvxURLField aUrlField( rURL, rText, SvxURLFormat::AppDefault); EditEngine& rEE = rDoc.GetEditEngine(); rEE.SetText( EMPTY_OUSTRING ); rEE.QuickInsertField( SvxFieldItem( aUrlField, EE_FEATURE_FIELD ), @@ -202,11 +202,11 @@ OUString ScEditUtil::GetCellFieldValue( switch (rField.GetFormat()) { - case SVXURLFORMAT_APPDEFAULT: //TODO: configurable with App??? - case SVXURLFORMAT_REPR: + case SvxURLFormat::AppDefault: //TODO: configurable with App??? + case SvxURLFormat::Repr: aRet = rField.GetRepresentation(); break; - case SVXURLFORMAT_URL: + case SvxURLFormat::Url: aRet = aURL; break; default: diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index 3a13c8d3edec..62db0cb99b66 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -182,7 +182,7 @@ void lclInsertUrl( XclImpRoot& rRoot, const OUString& rUrl, SCCOL nScCol, SCROW aDisplText = rUrl; ScEditEngineDefaulter& rEE = rRoot.GetEditEngine(); - SvxURLField aUrlField( rUrl, aDisplText, SVXURLFORMAT_APPDEFAULT ); + SvxURLField aUrlField( rUrl, aDisplText, SvxURLFormat::AppDefault ); if( aCell.meType == CELLTYPE_EDIT ) { diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 9e8758cf184d..870be00691f4 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -1005,7 +1005,7 @@ void WorksheetGlobals::insertHyperlink( const ScAddress& rAddress, const OUStrin ScFieldEditEngine& rEE = rDoc.getDoc().GetEditEngine(); rEE.Clear(); - SvxURLField aURLField(rUrl, aStr, SVXURLFORMAT_REPR); + SvxURLField aURLField(rUrl, aStr, SvxURLFormat::Repr); SvxFieldItem aURLItem(aURLField, EE_FEATURE_FIELD); rEE.QuickInsertField(aURLItem, ESelection()); diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index 9e73c278e79c..244fa2d069d6 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -604,7 +604,7 @@ void ScXMLTableRowCellContext::PushParagraphFieldURL( const OUString& rURL, const OUString& rRep, const OUString& rStyleName, const OUString& rTargetFrame) { OUString aAbsURL = GetScImport().GetAbsoluteReference(rURL); - SvxURLField* pURLField = new SvxURLField(aAbsURL, rRep, SVXURLFORMAT_REPR); + SvxURLField* pURLField = new SvxURLField(aAbsURL, rRep, SvxURLFormat::Repr); pURLField->SetTargetFrame(rTargetFrame); PushParagraphField(pURLField, rStyleName); } diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 673c2fe834e8..00ed1d7c008a 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -2144,14 +2144,14 @@ IMPL_LINK( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void ) switch ( pURLField->GetFormat() ) { - case SVXURLFORMAT_APPDEFAULT: //TODO: Settable in the App? - case SVXURLFORMAT_REPR: + case SvxURLFormat::AppDefault: //TODO: Settable in the App? + case SvxURLFormat::Repr: { pInfo->SetRepresentation( pURLField->GetRepresentation() ); } break; - case SVXURLFORMAT_URL: + case SvxURLFormat::Url: { pInfo->SetRepresentation( aURL ); } diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 1f0253266364..4949d2bf3248 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -283,7 +283,7 @@ void ScDrawTextObjectBar::Execute( SfxRequest &rReq ) // insert new field - SvxURLField aURLField( rURL, rName, SVXURLFORMAT_REPR ); + SvxURLField aURLField( rURL, rName, SvxURLFormat::Repr ); aURLField.SetTargetFrame( rTarget ); SvxFieldItem aURLItem( aURLField, EE_FEATURE_FIELD ); pOutView->InsertField( aURLItem ); diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index d2f2154c6979..c0d3868d2d57 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -619,7 +619,7 @@ SvxFieldData* ScEditFieldObj::getData() break; case text::textfield::Type::URL: mpData.reset( - new SvxURLField(OUString(), OUString(), SVXURLFORMAT_APPDEFAULT)); + new SvxURLField(OUString(), OUString(), SvxURLFormat::AppDefault)); break; default: mpData.reset(new SvxFieldData); diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 25184309773b..26296201524a 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -575,7 +575,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) // insert new field - SvxURLField aURLField( rURL, rName, SVXURLFORMAT_REPR ); + SvxURLField aURLField( rURL, rName, SvxURLFormat::Repr ); aURLField.SetTargetFrame( rTarget ); SvxFieldItem aURLItem( aURLField, EE_FEATURE_FIELD ); pTableView->InsertField( aURLItem ); diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index c42c34571817..43ac8f0e1eee 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.cxx @@ -164,7 +164,7 @@ static void lcl_SelectFieldAfterInsert( EditView& rView ) void ScTabViewShell::InsertURLField( const OUString& rName, const OUString& rURL, const OUString& rTarget ) { - SvxURLField aURLField( rURL, rName, SVXURLFORMAT_REPR ); + SvxURLField aURLField( rURL, rName, SvxURLFormat::Repr ); aURLField.SetTargetFrame( rTarget ); SvxFieldItem aURLItem( aURLField, EE_FEATURE_FIELD ); diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index fa6510754e29..6439efb19fa5 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -746,7 +746,7 @@ void ScViewFunc::InsertBookmark( const OUString& rDescription, const OUString& r aInsSel = ESelection( 0, 0, 0, 1 ); // replace first character (field) } - SvxURLField aField( rURL, rDescription, SVXURLFORMAT_APPDEFAULT ); + SvxURLField aField( rURL, rDescription, SvxURLFormat::AppDefault ); if (pTarget) aField.SetTargetFrame(*pTarget); aEngine.QuickInsertField( SvxFieldItem( aField, EE_FEATURE_FIELD ), aInsSel ); 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 ) diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx index 037e420620df..d57ce3cd6fa1 100644 --- a/sw/source/core/doc/docdraw.cxx +++ b/sw/source/core/doc/docdraw.cxx @@ -517,15 +517,15 @@ IMPL_LINK(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo, void) // URL field switch ( static_cast<const SvxURLField*>( pField)->GetFormat() ) { - case SVXURLFORMAT_APPDEFAULT: //!!! Can be set in App??? - case SVXURLFORMAT_REPR: + case SvxURLFormat::AppDefault: //!!! Can be set in App??? + case SvxURLFormat::Repr: { pInfo->SetRepresentation( static_cast<const SvxURLField*>(pField)->GetRepresentation()); } break; - case SVXURLFORMAT_URL: + case SvxURLFormat::Url: { pInfo->SetRepresentation( static_cast<const SvxURLField*>(pField)->GetURL()); diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 362fbfc9d069..547a54504121 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -741,8 +741,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(WW8_CP nStartCp, WW8_CP nEndCp, sal_Int32 nChanged; if (!aIter->GetURL().isEmpty()) { - SvxURLField aURL(aIter->GetURL(), aString, - SVXURLFORMAT_APPDEFAULT); + SvxURLField aURL(aIter->GetURL(), aString, SvxURLFormat::AppDefault); m_pDrawEditEngine->QuickInsertField(SvxFieldItem(aURL, EE_FEATURE_FIELD), aSel); nChanged = nOrigLen - 1; } diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx index d42942362890..79febb081f52 100644 --- a/sw/source/uibase/shells/annotsh.cxx +++ b/sw/source/uibase/shells/annotsh.cxx @@ -389,7 +389,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq ) if(pItem) { const SvxHyperlinkItem& rHLinkItem = *static_cast<const SvxHyperlinkItem *>(pItem); - SvxURLField aField(rHLinkItem.GetURL(), rHLinkItem.GetName(), SVXURLFORMAT_APPDEFAULT); + SvxURLField aField(rHLinkItem.GetURL(), rHLinkItem.GetName(), SvxURLFormat::AppDefault); aField.SetTargetFrame(rHLinkItem.GetTargetFrame()); const SvxFieldItem* pFieldItem = pOLV->GetFieldAtSelection(); diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index 990a35094fcb..39c30245cced 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -475,7 +475,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) if(pItem) { const SvxHyperlinkItem& rHLinkItem = *static_cast<const SvxHyperlinkItem *>(pItem); - SvxURLField aField(rHLinkItem.GetURL(), rHLinkItem.GetName(), SVXURLFORMAT_APPDEFAULT); + SvxURLField aField(rHLinkItem.GetURL(), rHLinkItem.GetName(), SvxURLFormat::AppDefault); aField.SetTargetFrame(rHLinkItem.GetTargetFrame()); const SvxFieldItem* pFieldItem = pOLV->GetFieldAtSelection(); |