avmedia/source/win/framegrabber.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit eea8a6e2181ee805854d29184aab3317264dde94
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jan 11 15:04:18 2012 +0000
fix windows build error
diff --git a/avmedia/source/win/framegrabber.cxx
b/avmedia/source/win/framegrabber.cxx
index 9743d12..fd7264c 100644
--- a/avmedia/source/win/framegrabber.cxx
+++ b/avmedia/source/win/framegrabber.cxx
@@ -84,11 +84,11 @@ IMediaDet* FrameGrabber::implCreateMediaDet( const
::rtl::OUString& rURL ) const
if( SUCCEEDED( CoCreateInstance( CLSID_MediaDet, NULL,
CLSCTX_INPROC_SERVER, IID_IMediaDet, (void**) &pDet ) ) )
{
- String aLocalStr;
+ rtl::OUString aLocalStr;
- if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( rURL, aLocalStr
) && aLocalStr.Len() )
+ if( ::utl::LocalFileHelper::ConvertURLToPhysicalName( rURL, aLocalStr
) && !aLocalStr.isEmpty() )
{
- if( !SUCCEEDED( pDet->put_Filename( ::SysAllocString(
reinterpret_cast<LPCOLESTR>(aLocalStr.GetBuffer()) ) ) ) )
+ if( !SUCCEEDED( pDet->put_Filename( ::SysAllocString(
reinterpret_cast<LPCOLESTR>(aLocalStr.getStr()) ) ) ) )
{
pDet->Release();
pDet = NULL;
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
