diff options
Diffstat (limited to 'sw/source/filter')
-rw-r--r-- | sw/source/filter/basflt/shellio.cxx | 6 | ||||
-rw-r--r-- | sw/source/filter/html/htmlcss1.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/html/htmlform.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/html/htmlgrin.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/html/htmlnumreader.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/html/htmlsect.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/html/htmltab.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/html/svxcss1.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/html/swhtml.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par5.cxx | 2 |
10 files changed, 15 insertions, 15 deletions
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx index 2fcf22f80ed9..fcec80704d1b 100644 --- a/sw/source/filter/basflt/shellio.cxx +++ b/sw/source/filter/basflt/shellio.cxx @@ -87,8 +87,8 @@ sal_uLong SwReader::Read( const Reader& rOptions ) GetDoc(); // while reading, do not call OLE-Modified - Link aOLELink( pDoc->GetOle2Link() ); - pDoc->SetOle2Link( Link() ); + Link<> aOLELink( pDoc->GetOle2Link() ); + pDoc->SetOle2Link( Link<>() ); pDoc->SetInReading( true ); pDoc->SetInXMLImport( 0 != dynamic_cast< XMLReader* >(po) ); @@ -503,7 +503,7 @@ SwDoc* Reader::GetTemplateDoc() if( pDocSh->DoInitNew( 0 ) ) { pTemplate = pDocSh->GetDoc(); - pTemplate->SetOle2Link( Link() ); + pTemplate->SetOle2Link( Link<>() ); // always FALSE pTemplate->GetIDocumentUndoRedo().DoUndo( false ); pTemplate->getIDocumentSettingAccess().set(DocumentSettingId::BROWSE_MODE, bTmplBrowseMode ); diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index 93abca315423..9c2bde214c7f 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -1765,7 +1765,7 @@ void SwHTMLParser::InsertLink() sRel = rOption.GetString(); break; case HTML_O_HREF: - sHRef = URIHelper::SmartRel2Abs( INetURLObject( sBaseURL ), rOption.GetString(), Link(), false ); + sHRef = URIHelper::SmartRel2Abs( INetURLObject( sBaseURL ), rOption.GetString(), Link<>(), false ); break; case HTML_O_TYPE: sType = rOption.GetString(); diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index b256f8aa4f7d..622eaa7341a0 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -1345,7 +1345,7 @@ void SwHTMLParser::NewForm( bool bAppend ) if( !aAction.isEmpty() ) { - aAction = URIHelper::SmartRel2Abs(INetURLObject(sBaseURL), aAction, Link(), false); + aAction = URIHelper::SmartRel2Abs(INetURLObject(sBaseURL), aAction, Link<>(), false); } else { @@ -1866,7 +1866,7 @@ void SwHTMLParser::InsertInput() // Die URL erst nach dem Einfuegen setzen, weil sich der // Download der Grafik erst dann am XModel anmelden kann, // wenn das Control eingefuegt ist. - aTmp <<= OUString( URIHelper::SmartRel2Abs(INetURLObject(sBaseURL), sImgSrc, Link(), false)); + aTmp <<= OUString( URIHelper::SmartRel2Abs(INetURLObject(sBaseURL), sImgSrc, Link<>(), false)); xPropSet->setPropertyValue("ImageURL", aTmp ); } diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx index 84e90e5ea894..5bed2bbfe84f 100644 --- a/sw/source/filter/html/htmlgrin.cxx +++ b/sw/source/filter/html/htmlgrin.cxx @@ -1230,7 +1230,7 @@ ANCHOR_SETEVENT: { if( !sHRef.isEmpty() ) { - sHRef = URIHelper::SmartRel2Abs( INetURLObject(sBaseURL), sHRef, Link(), false ); + sHRef = URIHelper::SmartRel2Abs( INetURLObject(sBaseURL), sHRef, Link<>(), false ); } else { diff --git a/sw/source/filter/html/htmlnumreader.cxx b/sw/source/filter/html/htmlnumreader.cxx index 5e7abaff8f59..4bfa12171a3f 100644 --- a/sw/source/filter/html/htmlnumreader.cxx +++ b/sw/source/filter/html/htmlnumreader.cxx @@ -199,7 +199,7 @@ void SwHTMLParser::NewNumBulList( int nToken ) { aBulletSrc = rOption.GetString(); if( !InternalImgToPrivateURL(aBulletSrc) ) - aBulletSrc = URIHelper::SmartRel2Abs( INetURLObject( sBaseURL ), aBulletSrc, Link(), false ); + aBulletSrc = URIHelper::SmartRel2Abs( INetURLObject( sBaseURL ), aBulletSrc, Link<>(), false ); } break; case HTML_O_WIDTH: diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index 6c1ac2b9fe42..bd03a2eb0282 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -283,11 +283,11 @@ void SwHTMLParser::NewDivision( int nToken ) OUString aURL; if( nPos == -1 ) { - aURL = URIHelper::SmartRel2Abs(INetURLObject( sBaseURL ), aHRef, Link(), false); + aURL = URIHelper::SmartRel2Abs(INetURLObject( sBaseURL ), aHRef, Link<>(), false); } else { - aURL = URIHelper::SmartRel2Abs(INetURLObject( sBaseURL ), aHRef.copy( 0, nPos ), Link(), false ); + aURL = URIHelper::SmartRel2Abs(INetURLObject( sBaseURL ), aHRef.copy( 0, nPos ), Link<>(), false ); aURL += OUString(sfx2::cTokenSeparator); if( nPos2 == -1 ) { diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 3ff535072fe2..b43afd5ce6ca 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -2974,7 +2974,7 @@ SvxBrushItem* SwHTMLParser::CreateBrushItem( const Color *pColor, if( !rImageURL.isEmpty() ) { - pBrushItem->SetGraphicLink( URIHelper::SmartRel2Abs( INetURLObject(sBaseURL), rImageURL, Link(), false) ); + pBrushItem->SetGraphicLink( URIHelper::SmartRel2Abs( INetURLObject(sBaseURL), rImageURL, Link<>(), false) ); pBrushItem->SetGraphicPos( GPOS_TILED ); } } diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index 88cb86c71dc1..fe99845e7474 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -1573,7 +1573,7 @@ static void ParseCSS1_background( const CSS1Expression *pExpr, if( !aURL.isEmpty() ) { - aBrushItem.SetGraphicLink( URIHelper::SmartRel2Abs( INetURLObject( rParser.GetBaseURL()), aURL, Link(), false ) ); + aBrushItem.SetGraphicLink( URIHelper::SmartRel2Abs( INetURLObject( rParser.GetBaseURL()), aURL, Link<>(), false ) ); aBrushItem.SetGraphicPos( eRepeat ); } diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 0c6f9e667aa5..607691ca655f 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -606,8 +606,8 @@ void SwHTMLParser::Continue( int nToken ) } // waehrend des einlesens kein OLE-Modified rufen - Link aOLELink( pDoc->GetOle2Link() ); - pDoc->SetOle2Link( Link() ); + Link<> aOLELink( pDoc->GetOle2Link() ); + pDoc->SetOle2Link( Link<>() ); bool bModified = pDoc->getIDocumentState().IsModified(); bool const bWasUndo = pDoc->GetIDocumentUndoRedo().DoesUndo(); diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index daef1e6c8095..7b03c6449f7b 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -259,7 +259,7 @@ OUString SwWW8ImplReader::ConvertFFileName(const OUString& rOrg) // Need the more sophisticated url converter. if (!aName.isEmpty()) aName = URIHelper::SmartRel2Abs( - INetURLObject(sBaseURL), aName, Link(), false); + INetURLObject(sBaseURL), aName, Link<>(), false); return aName; } |