Commits

Christian Lippka  committed 3af00f8

#i161701# fixing typo

  • Participants
  • Parent commits b30a4e0

Comments (0)

Files changed (4)

File svx/source/sdr/contact/viewobjectcontactofgroup.cxx

 
         drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfGroup::getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const
 		{
-			const sal_uInt32 nSubHierarchyCount(GetViewContact().GetObjectCount());
+			drawinglayer::primitive2d::Primitive2DSequence xRetval;
 
-			if(nSubHierarchyCount)
+			// check model-view visibility
+			if(isPrimitiveVisible(rDisplayInfo))
 			{
-				const sal_Bool bDoGhostedDisplaying(
-					GetObjectContact().DoVisualizeEnteredGroup() 
-					&& !GetObjectContact().isOutputToPrinter()
-					&& GetObjectContact().getActiveViewContact() == &GetViewContact());
+				const sal_uInt32 nSubHierarchyCount(GetViewContact().GetObjectCount());
 
-				if(bDoGhostedDisplaying)
+				if(nSubHierarchyCount)
 				{
-					rDisplayInfo.ClearGhostedDrawMode();
-				}
+					const sal_Bool bDoGhostedDisplaying(
+						GetObjectContact().DoVisualizeEnteredGroup() 
+						&& !GetObjectContact().isOutputToPrinter()
+						&& GetObjectContact().getActiveViewContact() == &GetViewContact());
 
-				// create object hierarchy
-				drawinglayer::primitive2d::Primitive2DSequence xRetval(getPrimitive2DSequenceSubHierarchy(rDisplayInfo));
+					if(bDoGhostedDisplaying)
+					{
+						rDisplayInfo.ClearGhostedDrawMode();
+					}
 
-				if(xRetval.hasElements())
-				{
-					// get ranges
-					const drawinglayer::geometry::ViewInformation2D& rViewInformation2D(GetObjectContact().getViewInformation2D());
-					const ::basegfx::B2DRange aObjectRange(drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(xRetval, rViewInformation2D));
-					const basegfx::B2DRange aViewRange(rViewInformation2D.getViewport());
-					
-					// check geometrical visibility
-					if(!aViewRange.isEmpty() && !aViewRange.overlaps(aObjectRange))
+					// create object hierarchy
+					xRetval = getPrimitive2DSequenceSubHierarchy(rDisplayInfo);
+
+					if(xRetval.hasElements())
 					{
-						// not visible, release
-						xRetval.realloc(0);
+						// get ranges
+						const drawinglayer::geometry::ViewInformation2D& rViewInformation2D(GetObjectContact().getViewInformation2D());
+						const ::basegfx::B2DRange aObjectRange(drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(xRetval, rViewInformation2D));
+						const basegfx::B2DRange aViewRange(rViewInformation2D.getViewport());
+						
+						// check geometrical visibility
+						if(!aViewRange.isEmpty() && !aViewRange.overlaps(aObjectRange))
+						{
+							// not visible, release
+							xRetval.realloc(0);
+						}
+					}
+
+					if(bDoGhostedDisplaying)
+					{
+						rDisplayInfo.SetGhostedDrawMode();
 					}
 				}
-
-				if(bDoGhostedDisplaying)
+				else
 				{
-					rDisplayInfo.SetGhostedDrawMode();
+					// draw replacement object for group. This will use ViewContactOfGroup::createViewIndependentPrimitive2DSequence
+					// which creates the replacement primitives for an empty group
+					xRetval = ViewObjectContactOfSdrObj::getPrimitive2DSequenceHierarchy(rDisplayInfo);
 				}
-
-				return xRetval;
 			}
-			else
-			{
-				// draw replacement object for group. This will use ViewContactOfGroup::createViewIndependentPrimitive2DSequence
-				// which creates the replacement primitives for an empty group
-				return ViewObjectContactOfSdrObj::getPrimitive2DSequenceHierarchy(rDisplayInfo);
-			}
+			return xRetval;
 		}
 	} // end of namespace contact
 } // end of namespace sdr

File svx/source/svdraw/svdobj.cxx

 
 void SdrObject::SetPrintable(sal_Bool bPrn)
 {
-	if( bPrn != bNoPrint )
+	if( bPrn == bNoPrint )
 	{
 		bNoPrint=!bPrn;
 		SetChanged();

File xmloff/source/draw/sdxmlexp.cxx

         GetXMLToken(XML_N_ANIMATION), 
 		XML_NAMESPACE_ANIMATION);
 
-    if( getDefaultVersion() > SvtSaveOptions::ODFVER_12 )
+    if( getDefaultVersion() > SvtSaveOptions::ODFVER_012 )
     {
 	    _GetNamespaceMap().Add(
 		    GetXMLToken(XML_NP_OFFICE_EXT),

File xmloff/source/draw/shapeexport.cxx

 	// #88546# init to FALSE
 	mbHandleProgressBar( sal_False ),
 	msZIndex( RTL_CONSTASCII_USTRINGPARAM("ZOrder") ),
-	msPrintable( RTL_CONSTASCII_USTRINGPARAM("Pintable") ),
+	msPrintable( RTL_CONSTASCII_USTRINGPARAM("Printable") ),
 	msVisible( RTL_CONSTASCII_USTRINGPARAM("Visible") ),
 	msEmptyPres( RTL_CONSTASCII_USTRINGPARAM("IsEmptyPresentationObject") ),
 	msModel( RTL_CONSTASCII_USTRINGPARAM("Model") ),
 	// export draw:display (do not export in ODF 1.2 or older)
 	if( xSet.is() && ( mrExport.getDefaultVersion() > SvtSaveOptions::ODFVER_012 ) )
 	{
+		if( aShapeInfo.meShapeType != XmlShapeTypeDrawPageShape && aShapeInfo.meShapeType != XmlShapeTypePresPageShape &&
+			aShapeInfo.meShapeType != XmlShapeTypeHandoutShape )
+			
 		try
 		{
 			sal_Bool bVisible = sal_True;
 			xSet->getPropertyValue(msPrintable) >>= bPrintable;
 
 			XMLTokenEnum eDisplayToken = XML_TOKEN_INVALID;
-			switch( (bVisible << 1) | bPrintable )
+			const unsigned short nDisplay = (bVisible ? 2 : 0) | (bPrintable ? 1 : 0);
+			switch( nDisplay )
 			{
 			case 0: eDisplayToken = XML_NONE; break;
 			case 1: eDisplayToken = XML_PRINTER; break;