incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1344740 - in /incubator/ooo/trunk/main: sd/inc/ sd/source/core/ sd/source/ui/func/ sd/source/ui/view/ svx/inc/svx/sdr/primitive2d/ svx/source/sdr/contact/ svx/source/sdr/primitive2d/ svx/source/sdr/properties/
Date Thu, 31 May 2012 14:23:46 GMT
Author: alg
Date: Thu May 31 14:23:45 2012
New Revision: 1344740

URL: http://svn.apache.org/viewvc?rev=1344740&view=rev
Log:
#119287# exchanged hard attributes for OLE and GraphicObject with new default StyleSheet for
these objects

Modified:
    incubator/ooo/trunk/main/sd/inc/app.hrc
    incubator/ooo/trunk/main/sd/inc/glob.hrc
    incubator/ooo/trunk/main/sd/source/core/drawdoc4.cxx
    incubator/ooo/trunk/main/sd/source/core/glob.src
    incubator/ooo/trunk/main/sd/source/core/stlpool.cxx
    incubator/ooo/trunk/main/sd/source/ui/func/fuinsert.cxx
    incubator/ooo/trunk/main/sd/source/ui/view/sdview4.cxx
    incubator/ooo/trunk/main/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx
    incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofgraphic.cxx
    incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
    incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
    incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
    incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
    incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
    incubator/ooo/trunk/main/svx/source/sdr/primitive2d/sdrattributecreator.cxx
    incubator/ooo/trunk/main/svx/source/sdr/properties/graphicproperties.cxx
    incubator/ooo/trunk/main/svx/source/sdr/properties/oleproperties.cxx

Modified: incubator/ooo/trunk/main/sd/inc/app.hrc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/inc/app.hrc?rev=1344740&r1=1344739&r2=1344740&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sd/inc/app.hrc (original)
+++ incubator/ooo/trunk/main/sd/inc/app.hrc Thu May 31 14:23:45 2012
@@ -59,6 +59,7 @@
 #define HID_PSEUDOSHEET_BACKGROUND          (HID_SD_START + 97)
 #define HID_PSEUDOSHEET_NOTES               (HID_SD_START + 98)
 #define HID_PSEUDOSHEET_SUBTITLE            (HID_SD_START + 101)
+#define HID_POOLSHEET_OBJNOLINENOFILL       (HID_SD_START + 102)
 
 #define HID_SD_CELL_STYLE_DEFAULT							(HID_SD_START + 194)
 #define HID_SD_CELL_STYLE_BANDED							(HID_SD_START + 195)

Modified: incubator/ooo/trunk/main/sd/inc/glob.hrc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/inc/glob.hrc?rev=1344740&r1=1344739&r2=1344740&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sd/inc/glob.hrc (original)
+++ incubator/ooo/trunk/main/sd/inc/glob.hrc Thu May 31 14:23:45 2012
@@ -102,6 +102,8 @@
 #define STR_POOLSHEET_FIRST_COLUMN				RID_GLOB_START+73
 #define STR_POOLSHEET_LAST_COLUMN				RID_GLOB_START+74
 //
+#define STR_POOLSHEET_OBJNOLINENOFILL           RID_GLOB_START+75
+//
 #define STR_PSEUDOSHEET_TITLE                   RID_GLOB_START+80
 #define STR_PSEUDOSHEET_OUTLINE                 RID_GLOB_START+81
 #define STR_PSEUDOSHEET_BACKGROUNDOBJECTS       RID_GLOB_START+82

Modified: incubator/ooo/trunk/main/sd/source/core/drawdoc4.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/source/core/drawdoc4.cxx?rev=1344740&r1=1344739&r2=1344740&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sd/source/core/drawdoc4.cxx (original)
+++ incubator/ooo/trunk/main/sd/source/core/drawdoc4.cxx Thu May 31 14:23:45 2012
@@ -321,6 +321,17 @@ void SdDrawDocument::CreateLayoutTemplat
 	pISet->Put(XFillStyleItem(XFILL_NONE));
 	pISet->Put(XLineColorItem(String(), RGB_Color(COL_BLACK)));
 
+	// ---- Object no fill no line -------------------------------------------
+
+	aName = String(SdResId(STR_POOLSHEET_OBJNOLINENOFILL));
+	pSheet = &(pSSPool->Make(aName, SD_STYLE_FAMILY_GRAPHICS, nMask));
+	pSheet->SetParent(aStdName);
+	pSheet->SetHelpId( aHelpFile, HID_POOLSHEET_OBJNOLINENOFILL );
+	pISet = &pSheet->GetItemSet();
+
+	pISet->Put(XFillStyleItem(XFILL_NONE));
+	pISet->Put(XLineStyleItem(XLINE_NONE));
+
 	// ---- Text ----------------------------------------------------------
 
 	aName = String(SdResId(STR_POOLSHEET_TEXT));

Modified: incubator/ooo/trunk/main/sd/source/core/glob.src
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/source/core/glob.src?rev=1344740&r1=1344739&r2=1344740&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sd/source/core/glob.src (original)
+++ incubator/ooo/trunk/main/sd/source/core/glob.src Thu May 31 14:23:45 2012
@@ -250,6 +250,10 @@ String STR_POOLSHEET_MEASURE
 {
 	Text [ en-US ] = "Dimension Line" ;
 };
+String STR_POOLSHEET_OBJNOLINENOFILL
+{
+	Text [ en-US ] = "Object with no fill and no line" ;
+};
 String STR_POOLSHEET_OBJWITHARROW
 {
 	Text [ en-US ] = "Object with arrow" ;

Modified: incubator/ooo/trunk/main/sd/source/core/stlpool.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/source/core/stlpool.cxx?rev=1344740&r1=1344739&r2=1344740&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sd/source/core/stlpool.cxx (original)
+++ incubator/ooo/trunk/main/sd/source/core/stlpool.cxx Thu May 31 14:23:45 2012
@@ -914,6 +914,7 @@ void SdStyleSheetPool::UpdateStdNames()
 				case HID_POOLSHEET_OBJWITHARROW:	nNameId = STR_POOLSHEET_OBJWITHARROW;	break;
 				case HID_POOLSHEET_OBJWITHSHADOW:	nNameId = STR_POOLSHEET_OBJWITHSHADOW;	break;
 				case HID_POOLSHEET_OBJWITHOUTFILL:	nNameId = STR_POOLSHEET_OBJWITHOUTFILL;	break;
+				case HID_POOLSHEET_OBJNOLINENOFILL:	nNameId = STR_POOLSHEET_OBJNOLINENOFILL;break;
 				case HID_POOLSHEET_TEXT:			nNameId = STR_POOLSHEET_TEXT;			break;
 				case HID_POOLSHEET_TEXTBODY:		nNameId = STR_POOLSHEET_TEXTBODY;		break;
 				case HID_POOLSHEET_TEXTBODY_JUSTIFY:nNameId = STR_POOLSHEET_TEXTBODY_JUSTIFY;break;

Modified: incubator/ooo/trunk/main/sd/source/ui/func/fuinsert.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/source/ui/func/fuinsert.cxx?rev=1344740&r1=1344739&r2=1344740&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sd/source/ui/func/fuinsert.cxx (original)
+++ incubator/ooo/trunk/main/sd/source/ui/func/fuinsert.cxx Thu May 31 14:23:45 2012
@@ -90,6 +90,7 @@
 #include "sdxfer.hxx"
 #include <vcl/svapp.hxx>
 #include "undo/undoobjects.hxx"
+#include "glob.hrc"
 
 using namespace com::sun::star;
 
@@ -353,6 +354,25 @@ void FuInsertOLE::DoExecute( SfxRequest&
             SdrOle2Obj* pOleObj = new SdrOle2Obj( svt::EmbeddedObjectRef( xObj, nAspect ),
aObjName, aRect );
 			SdrPageView* pPV = mpView->GetSdrPageView();
 
+            if(pOleObj)
+            {
+                // #119287#
+            	SdrModel* pModel = mpView ? mpView->GetModel() : 0;
+                SfxStyleSheetBasePool* pSfxStyleSheetBasePool = pModel ? pModel->GetStyleSheetPool()
: 0;
+		        SfxStyleSheet* pSheet = pSfxStyleSheetBasePool ? dynamic_cast< SfxStyleSheet*
>(pSfxStyleSheetBasePool->Find(String(SdResId(STR_POOLSHEET_OBJNOLINENOFILL)), SD_STYLE_FAMILY_GRAPHICS))
: 0;
+
+		        if(pSheet)
+		        {
+			        pOleObj->SetStyleSheet(pSheet, false);
+		        }
+                else
+                {
+		            pOleObj->SetMergedItem(XFillStyleItem(XFILL_NONE));
+		            pOleObj->SetMergedItem(XLineStyleItem(XLINE_NONE));
+    		        OSL_ENSURE(false, "Style Sheet for OLE not found (!)");
+                }
+            }
+
 			// if we have a pick obj we need to make this new ole a pres obj replacing the current
pick obj
 			if( pPickObj )
 			{

Modified: incubator/ooo/trunk/main/sd/source/ui/view/sdview4.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/source/ui/view/sdview4.cxx?rev=1344740&r1=1344739&r2=1344740&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sd/source/ui/view/sdview4.cxx (original)
+++ incubator/ooo/trunk/main/sd/source/ui/view/sdview4.cxx Thu May 31 14:23:45 2012
@@ -66,6 +66,7 @@
 #include <svtools/soerr.hxx>
 
 #include <sfx2/ipclient.hxx>
+#include "glob.hrc"
 
 using namespace com::sun::star;
 
@@ -222,6 +223,25 @@ SdrGrafObj* View::InsertGraphic( const G
 				bIsPresTarget = pP->IsPresObj(pPickObj);
 		}
 
+        if(pNewGrafObj)
+        {
+            // #119287#
+            SdrModel* pModel = pPV->GetView().GetModel();
+            SfxStyleSheetBasePool* pSfxStyleSheetBasePool = pModel ? pModel->GetStyleSheetPool()
: 0;
+		    SfxStyleSheet* pSheet = pSfxStyleSheetBasePool ? dynamic_cast< SfxStyleSheet* >(pSfxStyleSheetBasePool->Find(String(SdResId(STR_POOLSHEET_OBJNOLINENOFILL)),
SD_STYLE_FAMILY_GRAPHICS)) : 0;
+
+		    if(pSheet)
+		    {
+			    pNewGrafObj->SetStyleSheet(pSheet, false);
+		    }
+            else
+            {
+		        pNewGrafObj->SetMergedItem(XFillStyleItem(XFILL_NONE));
+		        pNewGrafObj->SetMergedItem(XLineStyleItem(XLINE_NONE));
+    		    OSL_ENSURE(false, "Style Sheet for GraphicObject not found (!)");
+            }
+        }
+
 		if( ( mnAction & DND_ACTION_MOVE ) && pPickObj && !bIsPresTarget )
 		{
 			// replace object

Modified: incubator/ooo/trunk/main/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx?rev=1344740&r1=1344739&r2=1344740&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx (original)
+++ incubator/ooo/trunk/main/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx Thu May 31
14:23:45 2012
@@ -98,7 +98,8 @@ namespace drawinglayer
 
 		attribute::SdrLineFillShadowTextAttribute createNewSdrLineFillShadowTextAttribute(
 			const SfxItemSet& rSet, 
-			const SdrText* pText);
+			const SdrText* pText,
+            bool bHasContent); // used from OLE and graphic
 
 		attribute::SdrLineFillShadowAttribute3D createNewSdrLineFillShadowAttribute(
 			const SfxItemSet& rSet, 

Modified: incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofgraphic.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofgraphic.cxx?rev=1344740&r1=1344739&r2=1344740&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofgraphic.cxx (original)
+++ incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofgraphic.cxx Thu May 31 14:23:45
2012
@@ -307,10 +307,6 @@ namespace sdr
 		{
 			drawinglayer::primitive2d::Primitive2DSequence xRetval;
 			const SfxItemSet& rItemSet = GetGrafObject().GetMergedItemSet();
-			drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute(
-				drawinglayer::primitive2d::createNewSdrLineFillShadowTextAttribute(
-                    rItemSet, 
-                    GetGrafObject().getText(0)));
 
 			// create and fill GraphicAttr
 			GraphicAttr	aLocalGrafInfo;
@@ -327,25 +323,13 @@ namespace sdr
 			aLocalGrafInfo.SetDrawMode(((SdrGrafModeItem&)rItemSet.Get(SDRATTR_GRAFMODE)).GetValue());
 			aLocalGrafInfo.SetCrop(rCrop.GetLeft(), rCrop.GetTop(), rCrop.GetRight(), rCrop.GetBottom());
 
-            if(aAttribute.isDefault() && 255L != aLocalGrafInfo.GetTransparency())
-			{
-				// no fill, no line, no text (invisible), but the graphic content is visible.
-				// Create evtl. shadow for content which was not created by createNewSdrLineFillShadowTextAttribute
yet
-				const drawinglayer::attribute::SdrShadowAttribute aShadow(
-					drawinglayer::primitive2d::createNewSdrShadowAttribute(rItemSet));
-
-                if(!aShadow.isDefault())
-                {
-				    // create new attribute set if indeed shadow is used
-				    aAttribute = drawinglayer::attribute::SdrLineFillShadowTextAttribute(
-					    aAttribute.getLine(), 
-					    aAttribute.getFill(), 
-					    aAttribute.getLineStartEnd(), 
-					    aShadow, 
-					    aAttribute.getFillFloatTransGradient(), 
-					    aAttribute.getText());
-                }
-			}
+            // we have content if graphic is not completely transparent
+            const bool bHasContent(255L != aLocalGrafInfo.GetTransparency());
+			drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute(
+				drawinglayer::primitive2d::createNewSdrLineFillShadowTextAttribute(
+                    rItemSet, 
+                    GetGrafObject().getText(0),
+                    bHasContent));
 
 			// take unrotated snap rect for position and size. Directly use model data, not getBoundRect()
or getSnapRect()
 			// which will use the primitive data we just create in the near future

Modified: incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx?rev=1344740&r1=1344739&r2=1344740&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx (original)
+++ incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx Thu May
31 14:23:45 2012
@@ -64,7 +64,8 @@ namespace sdr
 			const drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute(
 				drawinglayer::primitive2d::createNewSdrLineFillShadowTextAttribute(
                     rItemSet, 
-                    rCaptionObj.getText(0)));
+                    rCaptionObj.getText(0),
+                    false));
 
 			// take unrotated snap rect (direct model data) for position and size
 			const Rectangle& rRectangle = rCaptionObj.GetGeoRect();

Modified: incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx?rev=1344740&r1=1344739&r2=1344740&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx (original)
+++ incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx Thu May 31
14:23:45 2012
@@ -53,7 +53,8 @@ namespace sdr
 			const drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute(
 				drawinglayer::primitive2d::createNewSdrLineFillShadowTextAttribute(
                     rItemSet, 
-                    GetCircObj().getText(0)));
+                    GetCircObj().getText(0),
+                    false));
 
 			// take unrotated snap rect (direct model data) for position and size
 			const Rectangle& rRectangle = GetCircObj().GetGeoRect();

Modified: incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx?rev=1344740&r1=1344739&r2=1344740&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx (original)
+++ incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx Thu May 31
14:23:45 2012
@@ -92,10 +92,14 @@ namespace sdr
 
 		    // Prepare attribute settings, will be used soon anyways
 			const SfxItemSet& rItemSet = GetOle2Obj().GetMergedItemSet();
+
+            // this may be refined more granular; if no content, attributes may get simpler
+            const bool bHasContent(true);
 			const drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute(
 				drawinglayer::primitive2d::createNewSdrLineFillShadowTextAttribute(
                     rItemSet, 
-                    GetOle2Obj().getText(0)));
+                    GetOle2Obj().getText(0),
+                    bHasContent));
             drawinglayer::primitive2d::Primitive2DReference xContent;
 
             if(GetOle2Obj().IsChart())

Modified: incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx?rev=1344740&r1=1344739&r2=1344740&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx (original)
+++ incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx Thu May 31
14:23:45 2012
@@ -52,7 +52,8 @@ namespace sdr
 			const drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute(
 				drawinglayer::primitive2d::createNewSdrLineFillShadowTextAttribute(
 					rItemSet, 
-					GetPathObj().getText(0)));
+					GetPathObj().getText(0),
+                    false));
             basegfx::B2DPolyPolygon aUnitPolyPolygon(GetPathObj().GetPathPoly());
 			sal_uInt32 nPolyCount(aUnitPolyPolygon.count());
 			sal_uInt32 nPointCount(0);

Modified: incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx?rev=1344740&r1=1344739&r2=1344740&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx (original)
+++ incubator/ooo/trunk/main/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx Thu May 31
14:23:45 2012
@@ -54,7 +54,8 @@ namespace sdr
 			const drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute(
 				drawinglayer::primitive2d::createNewSdrLineFillShadowTextAttribute(
                     rItemSet, 
-                    GetRectObj().getText(0)));
+                    GetRectObj().getText(0),
+                    false));
 
 			// take unrotated snap rect (direct model data) for position and size
 			const Rectangle& rRectangle = GetRectObj().GetGeoRect();

Modified: incubator/ooo/trunk/main/svx/source/sdr/primitive2d/sdrattributecreator.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/sdr/primitive2d/sdrattributecreator.cxx?rev=1344740&r1=1344739&r2=1344740&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/source/sdr/primitive2d/sdrattributecreator.cxx (original)
+++ incubator/ooo/trunk/main/svx/source/sdr/primitive2d/sdrattributecreator.cxx Thu May 31
14:23:45 2012
@@ -721,7 +721,8 @@ namespace drawinglayer
 
 		attribute::SdrLineFillShadowTextAttribute createNewSdrLineFillShadowTextAttribute(
             const SfxItemSet& rSet, 
-            const SdrText* pText)
+            const SdrText* pText,
+            bool bHasContent)
 		{
 			attribute::SdrLineAttribute aLine;
 			attribute::SdrFillAttribute aFill;
@@ -765,7 +766,11 @@ namespace drawinglayer
 				}
 			}
 
-			if(!aLine.isDefault() || !aFill.isDefault() || !aText.isDefault())
+            // bHasContent is used from OLE and graphic objects. Normally a possible shadow
+            // depends on line, fill or text to be set, but for these objects it is possible
+            // to have none of these, but still content which needs to have a shadow (if
set),
+            // so shadow needs to be tried
+			if(bHasContent || !aLine.isDefault() || !aFill.isDefault() || !aText.isDefault())
 			{
 				// try shadow
 				aShadow = createNewSdrShadowAttribute(rSet);

Modified: incubator/ooo/trunk/main/svx/source/sdr/properties/graphicproperties.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/sdr/properties/graphicproperties.cxx?rev=1344740&r1=1344739&r2=1344740&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/source/sdr/properties/graphicproperties.cxx (original)
+++ incubator/ooo/trunk/main/svx/source/sdr/properties/graphicproperties.cxx Thu May 31 14:23:45
2012
@@ -127,10 +127,6 @@ namespace sdr
 			mpItemSet->Put( SdrGrafInvertItem( sal_False ) );
 			mpItemSet->Put( SdrGrafModeItem( GRAPHICDRAWMODE_STANDARD ) );
 			mpItemSet->Put( SdrGrafCropItem( 0, 0, 0, 0 ) );
-
-			// #i25616#
-			mpItemSet->Put( XFillStyleItem(XFILL_NONE) );
-			mpItemSet->Put( XLineStyleItem(XLINE_NONE) );
 		}
 	} // end of namespace properties
 } // end of namespace sdr

Modified: incubator/ooo/trunk/main/svx/source/sdr/properties/oleproperties.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/svx/source/sdr/properties/oleproperties.cxx?rev=1344740&r1=1344739&r2=1344740&view=diff
==============================================================================
--- incubator/ooo/trunk/main/svx/source/sdr/properties/oleproperties.cxx (original)
+++ incubator/ooo/trunk/main/svx/source/sdr/properties/oleproperties.cxx Thu May 31 14:23:45
2012
@@ -61,10 +61,6 @@ namespace sdr
 
 			// force ItemSet
 			GetObjectItemSet();
-
-			// #i108221#
-			mpItemSet->Put( XFillStyleItem(XFILL_NONE) );
-			mpItemSet->Put( XLineStyleItem(XLINE_NONE) );
 		}
 	} // end of namespace properties
 } // end of namespace sdr



Mime
View raw message