unused aCId in ScHTMLExport
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:
@@ -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';
|
||||
|
@@ -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(
|
||||
|
@@ -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,
|
||||
|
Reference in New Issue
Block a user