You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2014/04/22 13:45:25 UTC
svn commit: r1589094 - /openoffice/trunk/main/sd/source/ui/app/sdxfer.cxx
Author: alg
Date: Tue Apr 22 11:45:25 2014
New Revision: 1589094
URL: http://svn.apache.org/r1589094
Log:
i63399 add to clipboard as URL only when no fill and no line style, just a simple URL
Modified:
openoffice/trunk/main/sd/source/ui/app/sdxfer.cxx
Modified: openoffice/trunk/main/sd/source/ui/app/sdxfer.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/app/sdxfer.cxx?rev=1589094&r1=1589093&r2=1589094&view=diff
==============================================================================
--- openoffice/trunk/main/sd/source/ui/app/sdxfer.cxx (original)
+++ openoffice/trunk/main/sd/source/ui/app/sdxfer.cxx Tue Apr 22 11:45:25 2014
@@ -256,7 +256,16 @@ void SdTransferable::CreateObjectReplace
{
const SvxURLField* pURL = (SvxURLField*) pData;
- mpBookmark = new INetBookmark( pURL->GetURL(), pURL->GetRepresentation() );
+ // #63399# This special code identifies TextFrames which have just an URL
+ // as content and directly add this to the clipboard, probably to avoid adding
+ // an unnecessary DrawObject to the target where paste may take place. This is
+ // wanted only for SdrObjects with no fill and no line, else it is necessary to
+ // use the whole SdrObect. Test here for Line/FillStyle and take shortcut only
+ // when both are unused
+ if(!pObj->HasFillStyle() && !pObj->HasLineStyle())
+ {
+ mpBookmark = new INetBookmark( pURL->GetURL(), pURL->GetRepresentation() );
+ }
}
}
}