mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unused aCId in ScHTMLExport

Browse Source 
ever since

    commit fa135fd0e0
    Date:   Tue May 31 10:30:35 2016 +0200
    remove unused SID constants and associated code

Change-Id: I47388fa5dcfec67bbcd9f7bf0a079d9376bc05af
This commit is contained in:
Noel Grandin
2017-09-19 13:36:41 +02:00
parent 4819162e45
commit 107524b99f
3 changed files with 2 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sc/source/filter/html/htmlexp.cxx
View File

@@ -593,8 +593,6 @@ void ScHTMLExport::WriteBody()
aGrfNm = URIHelper::SmartRel2Abs( aGrfNm = URIHelper::SmartRel2Abs(
INetURLObject(aBaseURL), INetURLObject(aBaseURL),
aGrfNm, URIHelper::GetMaybeFileHdl()); aGrfNm, URIHelper::GetMaybeFileHdl());
if ( HasCId() )
MakeCIdURL( aGrfNm );
aLink = aGrfNm; aLink = aGrfNm;
} }
} }
@@ -602,11 +600,9 @@ void ScHTMLExport::WriteBody()
else else
{ {
aGrfNm = aLink; aGrfNm = aLink;
if( bCopyLocalFileToINet || HasCId() ) if( bCopyLocalFileToINet )
{ {
CopyLocalFileToINet( aGrfNm, aStreamPath ); CopyLocalFileToINet( aGrfNm, aStreamPath );
if ( HasCId() )
MakeCIdURL( aGrfNm );
} }
else else
aGrfNm = URIHelper::SmartRel2Abs( 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 ) void ScHTMLExport::IncIndent( short nVal )
{ {
sIndent[nIndent] = '\t'; sIndent[nIndent] = '\t';

6
sc/source/filter/html/htmlexp2.cxx
View File

@@ -195,19 +195,15 @@ void ScHTMLExport::WriteImage( OUString& rLinkName, const Graphic& rGrf,
INetURLObject(aBaseURL), INetURLObject(aBaseURL),
aGrfNm, aGrfNm,
URIHelper::GetMaybeFileHdl()); URIHelper::GetMaybeFileHdl());
if ( HasCId() )
MakeCIdURL( rLinkName );
} }
} }
} }
else else
{ {
// Linked graphic - figure out the URL for the IMG tag // Linked graphic - figure out the URL for the IMG tag
if( bCopyLocalFileToINet || HasCId() ) if( bCopyLocalFileToINet )
{ {
CopyLocalFileToINet( rLinkName, aStreamPath ); CopyLocalFileToINet( rLinkName, aStreamPath );
if ( HasCId() )
MakeCIdURL( rLinkName );
} }
else else
rLinkName = URIHelper::SmartRel2Abs( rLinkName = URIHelper::SmartRel2Abs(

6
sc/source/filter/inc/htmlexp.hxx
View File

@@ -108,7 +108,6 @@ class ScHTMLExport : public ScExportBase
ScHTMLStyle aHTMLStyle; ScHTMLStyle aHTMLStyle;
OUString aBaseURL; OUString aBaseURL;
OUString aStreamPath; OUString aStreamPath;
OUString aCId; // Content-Id for Mail-Export
VclPtr<OutputDevice> pAppWin; // for Pixel-work VclPtr<OutputDevice> pAppWin; // for Pixel-work
FileNameMapPtr pFileNameMap; // for CopyLocalFileToINet FileNameMapPtr pFileNameMap; // for CopyLocalFileToINet
OUString aNonConvertibleChars; // collect nonconvertible characters OUString aNonConvertibleChars; // collect nonconvertible characters
@@ -144,11 +143,6 @@ class ScHTMLExport : public ScExportBase
// copy a local file to internet if needed // copy a local file to internet if needed
void CopyLocalFileToINet( OUString& rFileNm, const OUString& rTargetNm ); void CopyLocalFileToINet( OUString& rFileNm, const OUString& rTargetNm );
bool HasCId()
{
return !aCId.isEmpty();
}
void MakeCIdURL( OUString& rURL );
void PrepareGraphics( ScDrawLayer*, SCTAB nTab, void PrepareGraphics( ScDrawLayer*, SCTAB nTab,
SCCOL nStartCol, SCROW nStartRow, SCCOL nStartCol, SCROW nStartRow,