diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-19 13:36:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-09-20 08:42:30 +0200 |
| commit | 107524b99f087af9bea02e2d4e61a04a8c3ecbe0 (patch) | |
| tree | eae071414a731f9dfb8a0526ca0e9862e01e36de /sc | |
| parent | 4819162e452ff96f2a2e652a48a7bc3bfa3bc400 (diff) | |
unused aCId in ScHTMLExport
ever since
commit fa135fd0e05fc4ba784b4349d65f2e5ed26c0f55
Date: Tue May 31 10:30:35 2016 +0200
remove unused SID constants and associated code
Change-Id: I47388fa5dcfec67bbcd9f7bf0a079d9376bc05af
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/html/htmlexp.cxx | 21 | ||||
| -rw-r--r-- | sc/source/filter/html/htmlexp2.cxx | 6 | ||||
| -rw-r--r-- | sc/source/filter/inc/htmlexp.hxx | 6 |
3 files changed, 2 insertions, 31 deletions
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index b1ef63c92c2b..18361ebe8035 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -593,8 +593,6 @@ void ScHTMLExport::WriteBody() aGrfNm = URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), aGrfNm, URIHelper::GetMaybeFileHdl()); - if ( HasCId() ) - MakeCIdURL( aGrfNm ); aLink = aGrfNm; } } @@ -602,11 +600,9 @@ void ScHTMLExport::WriteBody() else { aGrfNm = aLink; - if( bCopyLocalFileToINet || HasCId() ) + if( bCopyLocalFileToINet ) { CopyLocalFileToINet( aGrfNm, aStreamPath ); - if ( HasCId() ) - MakeCIdURL( aGrfNm ); } else aGrfNm = URIHelper::SmartRel2Abs( @@ -1319,21 +1315,6 @@ void ScHTMLExport::CopyLocalFileToINet( OUString& rFileNm, } } -void ScHTMLExport::MakeCIdURL( OUString& rURL ) -{ - if( aCId.isEmpty() ) - return; - - INetURLObject aURLObj( rURL ); - if( INetProtocol::File != aURLObj.GetProtocol() ) - return; - - OUString aLastName( aURLObj.GetLastName().toAsciiLowerCase() ); - OSL_ENSURE( !aLastName.isEmpty(), "filename without length!" ); - - rURL = "cid:" + aLastName + "." + aCId; -} - void ScHTMLExport::IncIndent( short nVal ) { sIndent[nIndent] = '\t'; diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx index 493a4ddced41..f9698694633c 100644 --- a/sc/source/filter/html/htmlexp2.cxx +++ b/sc/source/filter/html/htmlexp2.cxx @@ -195,19 +195,15 @@ void ScHTMLExport::WriteImage( OUString& rLinkName, const Graphic& rGrf, INetURLObject(aBaseURL), aGrfNm, URIHelper::GetMaybeFileHdl()); - if ( HasCId() ) - MakeCIdURL( rLinkName ); } } } else { // Linked graphic - figure out the URL for the IMG tag - if( bCopyLocalFileToINet || HasCId() ) + if( bCopyLocalFileToINet ) { CopyLocalFileToINet( rLinkName, aStreamPath ); - if ( HasCId() ) - MakeCIdURL( rLinkName ); } else rLinkName = URIHelper::SmartRel2Abs( diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx index e685a9f13d4d..011b0d30b650 100644 --- a/sc/source/filter/inc/htmlexp.hxx +++ b/sc/source/filter/inc/htmlexp.hxx @@ -108,7 +108,6 @@ class ScHTMLExport : public ScExportBase ScHTMLStyle aHTMLStyle; OUString aBaseURL; OUString aStreamPath; - OUString aCId; // Content-Id for Mail-Export VclPtr<OutputDevice> pAppWin; // for Pixel-work FileNameMapPtr pFileNameMap; // for CopyLocalFileToINet OUString aNonConvertibleChars; // collect nonconvertible characters @@ -144,11 +143,6 @@ class ScHTMLExport : public ScExportBase // copy a local file to internet if needed void CopyLocalFileToINet( OUString& rFileNm, const OUString& rTargetNm ); - bool HasCId() - { - return !aCId.isEmpty(); - } - void MakeCIdURL( OUString& rURL ); void PrepareGraphics( ScDrawLayer*, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, |