strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS iconswitching1 (1.17.44); FILE MERGED

Browse source 
2005/11/30 14:54:45 kendy 1.17.44.3: RESYNC: (1.18-1.19); FILE MERGED
2005/11/02 00:08:05 kendy 1.17.44.2: RESYNC: (1.17-1.18); FILE MERGED
2005/07/20 14:29:04 kendy 1.17.44.1: #i36518#
Icon switching for the help
This commit is contained in:
Kurt Zenker 2006-01-05 17:18:03 +00:00
parent 76837163c0
commit 2fe932ab98
1 changed files with 11 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
xmlhelp/source/cxxhelp/provider/provider.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: provider.cxx,v $
*
* $Revision: 1.19 $
* $Revision: 1.20 $
*
* last change: $Author: rt $ $Date: 2005-11-11 12:17:07 $
* last change: $Author: kz $ $Date: 2006-01-05 18:18:03 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -370,35 +370,22 @@ void ContentProvider::init()
rtl::OUString vendorshort = vendorname;
bool found = false;
Sequence< rtl::OUString > aImagesZipPaths( 2 );
xHierAccess = getHierAccess( sProvider,
"org.openoffice.Office.Common" );
rtl::OUString imageZip(getKey(xHierAccess,"Path/Current/UserConfig"));
subst(imageZip);
if(imageZip.getLength()) {
// test existence
if(1+imageZip.lastIndexOf('/') == imageZip.getLength())
imageZip += rtl::OUString::createFromAscii("images.zip");
else
imageZip += rtl::OUString::createFromAscii("/images.zip");
osl::DirectoryItem aDirItem;
if(osl::DirectoryItem::get(imageZip,aDirItem) == osl::FileBase::E_None)
found = true;
}
if(!found) {
imageZip = getKey(xHierAccess,"Path/Current/Config");
subst(imageZip);
if(1+imageZip.lastIndexOf('/') == imageZip.getLength())
imageZip += rtl::OUString::createFromAscii("images.zip");
else
imageZip += rtl::OUString::createFromAscii("/images.zip");
}
rtl::OUString aPath( getKey( xHierAccess, "Path/Current/UserConfig" ) );
subst( aPath );
aImagesZipPaths[ 0 ] = aPath;
aPath = getKey( xHierAccess, "Path/Current/Config" );
subst( aPath );
aImagesZipPaths[ 1 ] = aPath;
sal_Bool showBasic = getBooleanKey(xHierAccess,"Help/ShowBasic");
m_pDatabases = new Databases( showBasic,
instPath,
imageZip,
aImagesZipPaths,
productname,
productversion,
vendorname,