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

CID#705780 seeing as this is irredeemably wrong remove it

Browse Source 
This is catastrophically wrong, just appear to be lucky that
this code path is never called, so remove it entirely rather
than mess around fixing it

Change-Id: I4a8a443ed20b7e11cd9cc69b3d66d28087f09db8
This commit is contained in:
Caolán McNamara
2013-10-03 10:32:28 +01:00
parent 7f0acedf9b
commit 9af3b8b4ff
3 changed files with 1 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
xmlhelp/source/cxxhelp/provider/databases.cxx
View File

@@ -1051,47 +1051,6 @@ Reference< XHierarchicalNameAccess > Databases::findJarFileForPath
return xNA;
}
void Databases::popupDocument( URLParameter* urlPar,char **buffer,int *byteCount )
{
const char* pop1 =
" <html> "
" <head> "
" <help:css-file-link xmlns:help=\"http://openoffice.org/2000/help\"/> "
" </head> "
" <body> "
" <help:popup-cut Id=\"";
const sal_Int32 l1 = strlen( pop1 );
const char* pop3 = "\" Eid=\"";
const sal_Int32 l3 = strlen( pop3 );
const char* pop5 =
"\" xmlns:help=\"http://openoffice.org/2000/help\"></help:popup-cut> "
" </body> "
" </html>";
const sal_Int32 l5 = strlen( pop5 );
sal_Int32 l2,l4;
OUString val = urlPar->get_id();
OString pop2O( val.getStr(),l2 = val.getLength(),RTL_TEXTENCODING_UTF8 );
const char* pop2 = pop2O.getStr();
val = urlPar->get_eid();
OString pop4O( val.getStr(),l4 = val.getLength(),RTL_TEXTENCODING_UTF8 );
const char* pop4 = pop4O.getStr();
(*byteCount) = l1 + l2 + l3 + l4 + l5;
*buffer = new char[ 1+*byteCount ];
memcpy( *buffer,pop1,l1 );
memcpy( *buffer+l1,pop2,l2 );
memcpy( *buffer+(l1+l2),pop3,l3 );
memcpy( *buffer+(l1+l2+l3),pop4,l4 );
memcpy( *buffer+(l1+l2+l3+l4),pop5,l5 );
(*buffer)[*byteCount] = 0;
}
void Databases::changeCSS(const OUString& newStyleSheet)
{
m_aCSS = newStyleSheet.toAsciiLowerCase();

6
xmlhelp/source/cxxhelp/provider/databases.hxx
View File

@@ -201,12 +201,6 @@ namespace chelp {
const OUString& System ); // System not used by current implementation
// // of XCollator
/**
* Returns a copy of the popupfile
*/
void popupDocument( URLParameter* urlPar,char **buffer,int *byteCount );
/**
* Returns the cascading stlye sheet used to format the HTML-output.
* First try is language directory, second try is main installation directory.

8
xmlhelp/source/cxxhelp/provider/urlparameter.cxx
View File

@@ -794,13 +794,7 @@ helpRead(void * context, char * buffer, int len) {
static int
zipRead(void * context, char * buffer, int len) {
if( !ugblData->m_pInitial->get_eid().isEmpty() )
{
ugblData->m_pDatabases->popupDocument( ugblData->m_pInitial,&buffer,&len);
return len;
}
else
return helpRead(context, buffer, len);
return helpRead(context, buffer, len);
}
static int