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

Remove two more _HC instances

Browse Source
This commit is contained in:
Sebastian Spaeth
2010-11-12 15:02:12 +01:00
parent 5515c056ab
commit 85f4b6abd1
2 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
extensions/source/propctrlr/browserline.cxx
View File

@@ -412,7 +412,9 @@ namespace pcr
return *rpButton; return *rpButton;
} }
//------------------------------------------------------------------ /**
* @param _out_rHCImage is unused now as there are no highcontrast variants
*/
void OBrowserLine::impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage, Image& _out_rHCImage ) void OBrowserLine::impl_getImagesFromURL_nothrow( const ::rtl::OUString& _rImageURL, Image& _out_rImage, Image& _out_rHCImage )
{ {
try try
@@ -426,23 +428,6 @@ namespace pcr
Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ), UNO_QUERY_THROW ); Reference< XGraphic > xGraphic( xGraphicProvider->queryGraphic( aMediaProperties ), UNO_QUERY_THROW );
_out_rImage = _out_rHCImage = Image( xGraphic ); _out_rImage = _out_rHCImage = Image( xGraphic );
// see if we find an HC version beside the normal graphic
INetURLObject aURL( _rImageURL );
::rtl::OUString sBaseName( aURL.getBase() );
aURL.setBase( sBaseName + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_hc" ) ) );
::rtl::OUString sHCImageURL( aURL.GetMainURL( INetURLObject::NO_DECODE ) );
Reference< XGraphic > xHCGraphic;
try
{
aMediaProperties[0].Value <<= sHCImageURL;
xHCGraphic = xGraphicProvider->queryGraphic( aMediaProperties );
}
catch( const Exception& ) { }
if ( xHCGraphic.is() )
_out_rHCImage = Image( xHCGraphic );
} }
catch( const Exception& ) catch( const Exception& )
{ {

2
wizards/source/formwizard/Language.xba
View File

@@ -112,8 +112,8 @@ Dim slblFields as String
.optAlign2.Label = GetResText(RID_FORM + 34) .optAlign2.Label = GetResText(RID_FORM + 34)
.optAlign0.State = 1 .optAlign0.State = 1
//FIXME: Remove this unused FNameAddOn through the file
FNameAddOn = &quot;&quot; FNameAddOn = &quot;&quot;
If isHighContrast(DlgFormDB.getPeer) Then FNameAddOn = &quot;_hc&quot;
IDArray = Array(36, 37, 40, 38, 39) IDArray = Array(36, 37, 40, 38, 39)
For i = 1 To 5 For i = 1 To 5