Commits

Anonymous committed 076d68c Merge

CWS-TOOLING: integrate CWS impress194

Comments (0)

Files changed (13)

binfilter/bf_sd/source/ui/docshell/sd_docshell.cxx

 
 #include <comphelper/classids.hxx>
 
+#include <tools/urlobj.hxx>
 #include <sot/formats.hxx>
 
 #include <bf_svtools/ctrltool.hxx>

binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx

 		case MWT_IDENTITY :
 		{
 			maXForm.eM11 = maXForm.eM12 = maXForm.eM21 = maXForm.eM22 = 1.0f;
-			maXForm.eDx = maXForm.eDx = 0.0f;
+			maXForm.eDx = maXForm.eDy = 0.0f;
 		}
 		break;
 

cui/source/options/treeopt.cxx

 #include <com/sun/star/frame/XLoadable.hpp>
 #include <tools/rcid.h>
 #include <tools/shl.hxx>
+#include <tools/urlobj.hxx>
 #include <comphelper/processfactory.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>

filter/source/msfilter/svdfppt.cxx

 															PPTCharPropSet* pCurrent = (PPTCharPropSet*)aCharPropList.GetObject( nIdx );
 															sal_Int32		nNextStringLen = pCurrent->maString.Len();
 
+															DBG_ASSERT( pFE->pField1, "missing field!" );
+															if (!pFE->pField1)
+															    break;
+
 															const SvxURLField* pField = (const SvxURLField*)pFE->pField1->GetField();
 
 															if ( pCurrent->mpFieldItem )

sd/source/filter/html/pubdlg.cxx

 #include <svl/eitem.hxx>
 #include <svtools/colrdlg.hxx>
 #include <editeng/colritem.hxx>
+#include <tools/urlobj.hxx>
 #include <tools/list.hxx>
 #include <sdiocmpt.hxx>
 #include <sfx2/docfile.hxx>

sd/source/ui/func/futext.cxx

 							// do the EndTextEdit first, it will delete the handles and force a
 							// recreation. This will make aVEvt.pHdl to point to a deleted handle,
 							// thus it is necessary to reset it and to get it again.
-							::Outliner* pOutl = mpView->GetTextEditOutliner();
-							
-							if (mxTextObj.is() && (mxTextObj->GetOutlinerParaObject() ||
-								(pOutl && pOutl->GetText(pOutl->GetParagraph( 0 )).Len() != 0)))
+
+							// #i112855#
+							// cl: I'm not sure why we checked here also for mxTextObj->GetOutlinerParaObjet
+							// this caused SdrEndTextEdit() to be called also when not in text editing and
+							// this does not make sense and caused troubles. (see issue 112855)
+
+//							::Outliner* pOutl = mpView->GetTextEditOutliner();
+//							
+//							if (mxTextObj.is() && (mxTextObj->GetOutlinerParaObject() ||
+//								(pOutl && pOutl->GetText(pOutl->GetParagraph( 0 )).Len() != 0)))
+							if( mpView->IsTextEdit() )
 							{
 								mpView->SdrEndTextEdit();
 

svtools/source/filter.vcl/wmf/winmtf.cxx

 		case MWT_IDENTITY :
 		{
 			maXForm.eM11 = maXForm.eM12 = maXForm.eM21 = maXForm.eM22 = 1.0f;
-			maXForm.eDx = maXForm.eDx = 0.0f;
+			maXForm.eDx = maXForm.eDy = 0.0f;
 		}
 		break;
 

sw/source/core/doc/acmplwrd.cxx

 #include "precompiled_sw.hxx"
 
 
+#include <tools/urlobj.hxx>
 #include <hintids.hxx>
 #include <hints.hxx>
 #include <unotools/transliterationwrapper.hxx>

vcl/inc/vcl/gfxlink.hxx

 #include <vcl/mapmod.hxx>
 #include <tools/stream.hxx>
 
-//#if 0 // _SOLAR__PRIVATE
-#include <tools/urlobj.hxx>
-
 // -------------
 // - ImpBuffer -
 // -------------
 
 struct ImpSwap
 {
-    INetURLObject   maURL;
+	rtl::OUString	maURL;
 	ULONG			mnDataSize;
 	ULONG			mnRefCount;
 
 
 	BYTE*			GetData() const;
 
-	BOOL			IsSwapped() const { return maURL.GetMainURL( INetURLObject::NO_DECODE ).getLength() > 0; }
+	BOOL			IsSwapped() const { return maURL.getLength() > 0; }
 
 	void			WriteTo( SvStream& rOStm ) const;
 };

vcl/source/gdi/gfxlink.cxx

 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
+#include <osl/file.h>
 #include <tools/vcompat.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
 	{
 		::utl::TempFile aTempFile;
 
-		maURL = INetURLObject(aTempFile.GetURL());
-
-		if( maURL.GetMainURL( INetURLObject::NO_DECODE ).getLength() )
+		maURL = aTempFile.GetURL();
+		if( maURL.getLength() )
 		{
-			SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( maURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE | STREAM_SHARE_DENYWRITE );
-
+			SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( maURL, STREAM_READWRITE | STREAM_SHARE_DENYWRITE );
 			if( pOStm )
 			{
 				pOStm->Write( pData, mnDataSize );
 
 				if( bError )
 				{
-					try
-					{
-						::ucbhelper::Content aCnt( maURL.GetMainURL( INetURLObject::NO_DECODE ), 
-											 ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() );
-
-						aCnt.executeCommand( ::rtl::OUString::createFromAscii( "delete" ), 
-											 ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) );
-					}
-					catch( const ::com::sun::star::ucb::ContentCreationException& )
-					{
-					}
-					catch( const ::com::sun::star::uno::RuntimeException& )
-					{
-					}
-					catch( const ::com::sun::star::ucb::CommandAbortedException& )
-					{
-					}
-        		    catch( const ::com::sun::star::uno::Exception& )
-		            {
-		            }
-
-					maURL = INetURLObject();
+					osl_removeFile( maURL.pData );
+					maURL = String();
 				}
 			}
 		}
 ImpSwap::~ImpSwap()
 {
 	if( IsSwapped() )
-	{
-		try
-		{
-			::ucbhelper::Content aCnt( maURL.GetMainURL( INetURLObject::NO_DECODE ), 
-								 ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >() );
-
-			aCnt.executeCommand( ::rtl::OUString::createFromAscii( "delete" ), 
-								 ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) );
-		}
-		catch( const ::com::sun::star::ucb::ContentCreationException& )
-		{
-		}
-		catch( const ::com::sun::star::uno::RuntimeException& )
-		{
-		}
-		catch( const ::com::sun::star::ucb::CommandAbortedException& )
-		{
-		}
-        catch( const ::com::sun::star::uno::Exception& )
-		{
-		}
-	}
+		osl_removeFile( maURL.pData );
 }
 
 // ------------------------------------------------------------------------
 
 	if( IsSwapped() )
 	{
-		SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( maURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE );
-
+		SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( maURL, STREAM_READWRITE );
 		if( pIStm )
 		{
 			pData = new BYTE[ mnDataSize ];

vcl/source/gdi/outdev6.cxx

 
 		if( OUTDEV_PRINTER == meOutDevType )
 		{
+			if(100 <= nTransparencePercent)
+			{
+				// #i112959# 100% transparent, draw nothing
+				return;
+			}
+
 			Rectangle		aPolyRect( LogicToPixel( rPolyPoly ).GetBoundRect() );
 			const Size		aDPISize( LogicToPixel( Size( 1, 1 ), MAP_INCH ) );
 			const long		nBaseExtent = Max( FRound( aDPISize.Width() / 300. ), 1L );
 				case( 25 ): nMove = nBaseExtent * 3; break;
 				case( 50 ): nMove = nBaseExtent * 4; break;
 				case( 75 ): nMove = nBaseExtent * 6; break;
-							// TODO What is the correct VALUE???
+
+				// #i112959#  very transparent (88 < nTransparencePercent <= 99)
+				case( 100 ): nMove = nBaseExtent * 8; break;
+
+				// #i112959# not transparent (nTransparencePercent < 13)
 				default:    nMove = 0; break;
 			}
 
 			Push( PUSH_CLIPREGION | PUSH_LINECOLOR );
 			IntersectClipRegion( rPolyPoly );
 			SetLineColor( GetFillColor() );
-
-			Rectangle aRect( aPolyRect.TopLeft(), Size( aPolyRect.GetWidth(), nBaseExtent ) );
-
 			const BOOL bOldMap = mbMap;
 			EnableMapMode( FALSE );
 
-			while( aRect.Top() <= aPolyRect.Bottom() )
+			if(nMove)
 			{
-				DrawRect( aRect );
-				aRect.Move( 0, nMove );
+				Rectangle aRect( aPolyRect.TopLeft(), Size( aPolyRect.GetWidth(), nBaseExtent ) );
+				while( aRect.Top() <= aPolyRect.Bottom() )
+				{
+					DrawRect( aRect );
+					aRect.Move( 0, nMove );
+				}
+
+				aRect = Rectangle( aPolyRect.TopLeft(), Size( nBaseExtent, aPolyRect.GetHeight() ) );
+				while( aRect.Left() <= aPolyRect.Right() )
+				{
+					DrawRect( aRect );
+					aRect.Move( nMove, 0 );
+				}
 			}
-
-			aRect = Rectangle( aPolyRect.TopLeft(), Size( nBaseExtent, aPolyRect.GetHeight() ) );
-			while( aRect.Left() <= aPolyRect.Right() )
+			else
 			{
-				DrawRect( aRect );
-				aRect.Move( nMove, 0 );
+				// #i112959# if not transparent, draw full rectangle in clip region
+				DrawRect( aPolyRect );
 			}
 
 			EnableMapMode( bOldMap );

vcl/source/gdi/pdfwriter_impl.cxx

 #include <math.h>
 #include <algorithm>
 
+#include <tools/urlobj.hxx>
 #include <pdfwriter_impl.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>

xmloff/source/draw/ximpcustomshape.cxx

 			case '8' :
 			case '9' :
 			case '.' :
+			case '-' :
 			{
 				com::sun::star::drawing::EnhancedCustomShapeParameterPair aPair;
 				if ( GetNextParameter( aPair.First, nIndex, rValue ) &&