diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-11-20 14:43:45 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-11-20 14:44:27 +0100 |
| commit | 5668e73beb30b95abc6520b7432c54972ca3ab2c (patch) | |
| tree | b9772e4ab6a6f92d655c0bacbb364ce3b2a4eb18 /sw/source/ui/shells | |
| parent | editeng: warning C4805 unsafe mix of type sal_Bool and type bool (diff) | |
| download | core-5668e73beb30b95abc6520b7432c54972ca3ab2c.tar.gz core-5668e73beb30b95abc6520b7432c54972ca3ab2c.zip | |
avmedia: Implement "block untrusted referer links" feature
See f0a9ca24fd4bf79cac908bf0d6fdb8905dc504db "rhbz#887420 Implement 'block
untrusted referer links' feature" for details. This adds some further /*TODO?*/
comments, and one known problem (marked /*TODO!*/) is that movies/sounds are not
blocked during a slideshow presentation.
Change-Id: Ib2d0c7e4f7b02c4bdec0d8a90cee5e7e1bee8325
Diffstat (limited to 'sw/source/ui/shells')
| -rw-r--r-- | sw/source/ui/shells/grfshex.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/shells/textdrw.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/ui/shells/grfshex.cxx b/sw/source/ui/shells/grfshex.cxx index 1c7ea14300ca..60988bac1736 100644 --- a/sw/source/ui/shells/grfshex.cxx +++ b/sw/source/ui/shells/grfshex.cxx @@ -86,7 +86,7 @@ bool SwTextShell::InsertMediaDlg( SfxRequest& rReq ) if( pWindow ) pWindow->EnterWait(); - if( !::avmedia::MediaWindow::isMediaURL( aURL, true, &aPrefSize ) ) + if( !::avmedia::MediaWindow::isMediaURL( aURL, "", true, &aPrefSize ) ) { if( pWindow ) pWindow->LeaveWait(); @@ -138,7 +138,7 @@ bool SwTextShell::InsertMediaDlg( SfxRequest& rReq ) SdrMediaObj* pObj = new SdrMediaObj( Rectangle( aPos, aSize ) ); pObj->SetModel(rSh.GetDoc()->GetDrawModel()); // set before setURL - pObj->setURL( realURL ); + pObj->setURL( realURL, "" ); rSh.EnterStdMode(); rSh.SwFEShell::InsertDrawObj( *pObj, aPos ); bRet = true; diff --git a/sw/source/ui/shells/textdrw.cxx b/sw/source/ui/shells/textdrw.cxx index a85ed464ff0f..5b49b0e4597f 100644 --- a/sw/source/ui/shells/textdrw.cxx +++ b/sw/source/ui/shells/textdrw.cxx @@ -104,7 +104,7 @@ void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget, aTmp.setValue( &eButtonType, ::getCppuType((const form::FormButtonType*)0)); xPropSet->setPropertyValue( "ButtonType", aTmp ); - if ( ::avmedia::MediaWindow::isMediaURL( rURL ) ) + if ( ::avmedia::MediaWindow::isMediaURL( rURL, ""/*TODO?*/ ) ) { // #105638# OJ aTmp <<= sal_True; |