You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by er...@apache.org on 2011/09/11 00:43:49 UTC
svn commit: r1167621 -
/incubator/ooo/trunk/main/svx/source/svdraw/svdograf.cxx
Author: erack
Date: Sat Sep 10 22:43:48 2011
New Revision: 1167621
URL: http://svn.apache.org/viewvc?rev=1167621&view=rev
Log:
impress212: #i117042# added fix for i_updt1.bas testcase
# User sj <sj...@openoffice.org>
Modified:
incubator/ooo/trunk/main/svx/source/svdraw/svdograf.cxx
Modified: incubator/ooo/trunk/main/svx/source/svdraw/svdograf.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/svdraw/svdograf.cxx?rev=1167621&r1=1167620&r2=1167621&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/source/svdraw/svdograf.cxx (original)
+++ incubator/ooo/trunk/main/svx/source/svdraw/svdograf.cxx Sat Sep 10 22:43:48 2011
@@ -89,11 +89,11 @@ using namespace ::com::sun::star::io;
// ------------------
-const Graphic ImpLoadLinkedGraphic( const String& rFileName, const String& rFilterName )
+const Graphic ImpLoadLinkedGraphic( const String aFileName, const String aFilterName )
{
Graphic aGraphic;
- SfxMedium xMed( rFileName, STREAM_STD_READ, sal_True );
+ SfxMedium xMed( aFileName, STREAM_STD_READ, sal_True );
xMed.DownLoad();
SvStream* pInStrm = xMed.GetInStream();
@@ -102,8 +102,8 @@ const Graphic ImpLoadLinkedGraphic( cons
pInStrm->Seek( STREAM_SEEK_TO_BEGIN );
GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
- const sal_uInt16 nFilter = rFilterName.Len() && pGF->GetImportFormatCount()
- ? pGF->GetImportFormatNumber( rFilterName )
+ const sal_uInt16 nFilter = aFilterName.Len() && pGF->GetImportFormatCount()
+ ? pGF->GetImportFormatNumber( aFilterName )
: GRFILTER_FORMAT_DONTKNOW;
String aEmptyStr;
@@ -148,7 +148,7 @@ public:
void SAL_CALL Terminate( void );
- sal_Bool GraphicLinkChanged( const String& rFileName ){ return mrFileName != rFileName; };
+ sal_Bool GraphicLinkChanged( const String& rFileName ){ return maFileName != rFileName; };
protected:
@@ -164,17 +164,16 @@ protected:
private:
- ::osl::Mutex maMutex;
- const String& mrFileName;
- const String& mrFilterName;
+ const String maFileName;
+ const String maFilterName;
SdrGraphicLink& mrGraphicLink;
volatile bool mbIsTerminated;
};
SdrGraphicUpdater::SdrGraphicUpdater( const String& rFileName, const String& rFilterName, SdrGraphicLink& rGraphicLink )
-: mrFileName( rFileName )
-, mrFilterName( rFilterName )
+: maFileName( rFileName )
+, maFilterName( rFilterName )
, mrGraphicLink( rGraphicLink )
, mbIsTerminated( sal_False )
{
@@ -187,7 +186,6 @@ SdrGraphicUpdater::~SdrGraphicUpdater( v
void SdrGraphicUpdater::Terminate()
{
- ::osl::MutexGuard aGuard( maMutex );
mbIsTerminated = sal_True;
}
@@ -198,8 +196,7 @@ void SAL_CALL SdrGraphicUpdater::onTermi
void SAL_CALL SdrGraphicUpdater::run(void)
{
- Graphic aGraphic( ImpLoadLinkedGraphic( mrFileName, mrFilterName ) );
- ::osl::MutexGuard aGuard(maMutex);
+ Graphic aGraphic( ImpLoadLinkedGraphic( maFileName, maFilterName ) );
vos::OGuard aSolarGuard( Application::GetSolarMutex() );
if ( !mbIsTerminated )
{