incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From er...@apache.org
Subject svn commit: r1167629 - in /incubator/ooo/trunk/main: drawinglayer/Package_inc.mk sd/source/filter/eppt/eppt.cxx svtools/source/filter/wmf/winmtf.cxx
Date Sat, 10 Sep 2011 22:46:56 GMT
Author: erack
Date: Sat Sep 10 22:46:56 2011
New Revision: 1167629

URL: http://svn.apache.org/viewvc?rev=1167629&view=rev
Log:
impress212: removed warning

# User sj <sj@openoffice.org>

Modified:
    incubator/ooo/trunk/main/drawinglayer/Package_inc.mk
    incubator/ooo/trunk/main/sd/source/filter/eppt/eppt.cxx
    incubator/ooo/trunk/main/svtools/source/filter/wmf/winmtf.cxx

Modified: incubator/ooo/trunk/main/drawinglayer/Package_inc.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/drawinglayer/Package_inc.mk?rev=1167629&r1=1167628&r2=1167629&view=diff
==============================================================================
--- incubator/ooo/trunk/main/drawinglayer/Package_inc.mk (original)
+++ incubator/ooo/trunk/main/drawinglayer/Package_inc.mk Sat Sep 10 22:46:56 2011
@@ -41,7 +41,7 @@ $(eval $(call gb_Package_add_file,drawin
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/embedded3dprimitive2d.hxx,drawinglayer/primitive2d/embedded3dprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/fillbitmapprimitive2d.hxx,drawinglayer/primitive2d/fillbitmapprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx,drawinglayer/primitive2d/fillgradientprimitive2d.hxx))
-$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/fillhatchprimitive2d.hxx,drawinglayer/primitive2d/fillhatchprimitive2d.hxx))
+$(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawin	glayer/primitive2d/fillhatchprimitive2d.hxx,drawinglayer/primitive2d/fillhatchprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/graphicprimitive2d.hxx,drawinglayer/primitive2d/graphicprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/gridprimitive2d.hxx,drawinglayer/primitive2d/gridprimitive2d.hxx))
 $(eval $(call gb_Package_add_file,drawinglayer_inc,inc/drawinglayer/primitive2d/groupprimitive2d.hxx,drawinglayer/primitive2d/groupprimitive2d.hxx))

Modified: incubator/ooo/trunk/main/sd/source/filter/eppt/eppt.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/source/filter/eppt/eppt.cxx?rev=1167629&r1=1167628&r2=1167629&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sd/source/filter/eppt/eppt.cxx (original)
+++ incubator/ooo/trunk/main/sd/source/filter/eppt/eppt.cxx Sat Sep 10 22:46:56 2011
@@ -211,7 +211,6 @@ PPTWriter::PPTWriter( const std::vector<
 	{
 		if ( (*aIter).Name.equals( sBaseURI ) )
 		{
-			rtl::OUString sBaseURI;
 			(*aIter).Value >>= maBaseURI;
 			break;
 		}

Modified: incubator/ooo/trunk/main/svtools/source/filter/wmf/winmtf.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svtools/source/filter/wmf/winmtf.cxx?rev=1167629&r1=1167628&r2=1167629&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svtools/source/filter/wmf/winmtf.cxx (original)
+++ incubator/ooo/trunk/main/svtools/source/filter/wmf/winmtf.cxx Sat Sep 10 22:46:56 2011
@@ -82,8 +82,9 @@ void WinMtfClipPath::ExcludeClipRect( co
 
 void WinMtfClipPath::SetClipPath( const PolyPolygon& rPolyPolygon, sal_Int32 nClippingMode
)
 {
-	if ( !rPolyPolygon.Count() )
-        aPolyPoly = rPolyPolygon;
+//	if ( !rPolyPolygon.Count() )
+	if ( true )        
+		aPolyPoly = rPolyPolygon;
 	else if ( nDepth < WIN_MTF_MAX_CLIP_DEPTH )
 	{
 		nDepth++;



Mime
View raw message