#i104312# fixed print objetcs for pictures and graphics; nopw works for drawing objects as well and does not effect form controls

2 files changed, 12 insertions, 3 deletions

diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
index 21b544a91d..fbffa0b23a 100644..100755
--- a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
@@ -40,6 +40,8 @@
 #include <svx/svdoole2.hxx>
 #include <svx/svdview.hxx>
 
+#include "fmobj.hxx"
+
 //////////////////////////////////////////////////////////////////////////////
 
 namespace sdr
@@ -91,8 +93,9 @@ namespace sdr
                 const bool bHideOle(rSdrView.getHideOle());
                 const bool bHideChart(rSdrView.getHideChart());
                 const bool bHideDraw(rSdrView.getHideDraw());
+                const bool bHideFormControl(rSdrView.getHideFormControl());
 
-                if(bHideOle || bHideChart || bHideDraw)
+                if(bHideOle || bHideChart || bHideDraw || bHideFormControl)
                 {
                     if(OBJ_OLE2 == rObject.GetObjIdentifier())
                     {
@@ -123,8 +126,13 @@ namespace sdr
                     }
                     else
                     {
+                        const bool bIsFormControl = dynamic_cast< const FmFormObj * >( &rObject ) != 0;
+                        if(bIsFormControl && bHideFormControl)
+                        {
+                            return false;
+                        }
                         // any other draw object
-                        if(bHideDraw)
+                        if(!bIsFormControl && bHideDraw)
                         {
                             return false;
                         }
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index cf0034903e..9f0dc043a1 100644..100755
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -275,7 +275,8 @@ SdrPaintView::SdrPaintView(SdrModel* pModel1, OutputDevice* pOut)
     mbPagePaintingAllowed(true),
     mbHideOle(false),
     mbHideChart(false),
-    mbHideDraw(false)
+    mbHideDraw(false),
+    mbHideFormControl(false)
 {
     DBG_CTOR(SdrPaintView,NULL);
     pMod=pModel1;