filter and build adaptions

8 files changed, 14 insertions, 57 deletions

diff --git a/filter/inc/filter/msfilter/escherex.hxx b/filter/inc/filter/msfilter/escherex.hxx
index 1466f65acae2..1e571f368118 100644
--- a/filter/inc/filter/msfilter/escherex.hxx
+++ b/filter/inc/filter/msfilter/escherex.hxx
@@ -1159,7 +1159,7 @@ class MSFILTER_DLLPUBLIC EscherPropertyContainer
 private:
     EscherGraphicProvider*  mpGraphicProvider;
     SvStream*               mpPicOutStrm;
-    basegfx::B2DRange*      mpObjectRange; // TTTT: think about making this a member to be able to hand over a const&
+    basegfx::B2DRange       maObjectRange;
     EscherPropSortStruct*   mpSortStruct;
 
     sal_uInt32              mnSortCount;
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 6c9781d07c6e..3deef0c44a33 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -155,7 +155,7 @@ EscherExClientAnchor_Base::~EscherExClientAnchor_Base()
 EscherPropertyContainer::EscherPropertyContainer()
 :   mpGraphicProvider(0),
     mpPicOutStrm(0),
-    mpObjectRange(),
+    maObjectRange(),
     mpSortStruct(0),
     mnSortCount(0),
     mnSortBufSize(64),
@@ -172,7 +172,7 @@ EscherPropertyContainer::EscherPropertyContainer(
     basegfx::B2DRange& rObjectRange)         // FillBitmaps or GraphicObjects.
 :   mpGraphicProvider(&rGraphProv),
     mpPicOutStrm(pPiOutStrm),
-    mpObjectRange(&rObjectRange),
+    maObjectRange(rObjectRange),
     mpSortStruct(0),
     mnSortCount(0),
     mnSortBufSize(64),
@@ -1329,7 +1329,7 @@ bool EscherPropertyContainer::CreateGraphicProperties( const ::com::sun::star::u
         AddOpt( ESCHER_Prop_fillType, ESCHER_FillPicture );
         uno::Reference< beans::XPropertySet > aXPropSet( rXShape, uno::UNO_QUERY );
 
-        if ( mpGraphicProvider && mpPicOutStrm && mpObjectRange && aXPropSet.is() )
+        if ( mpGraphicProvider && mpPicOutStrm && !maObjectRange.isEmpty() && aXPropSet.is() )
         {
             ::com::sun::star::uno::Any aAny;
             ::com::sun::star::awt::Rectangle* pVisArea = NULL;
@@ -1339,7 +1339,7 @@ bool EscherPropertyContainer::CreateGraphicProperties( const ::com::sun::star::u
                 aAny >>= (*pVisArea);
             }
 
-            const basegfx::B2DRange aRange(0.0, 0.0, mpObjectRange->getWidth(), mpObjectRange->getHeight());
+            const basegfx::B2DRange aRange(0.0, 0.0, maObjectRange.getWidth(), maObjectRange.getHeight());
             const sal_uInt32 nBlibId(mpGraphicProvider->GetBlibID(*mpPicOutStrm, aUniqueId, aRange, pVisArea, NULL));
 
             if ( nBlibId )
@@ -1350,29 +1350,6 @@ bool EscherPropertyContainer::CreateGraphicProperties( const ::com::sun::star::u
             }
             delete pVisArea;
         }
-
-        // TTTT: Check if this works; not sure if this is correct and on the correct place
-        // pShapeBoundRect -> mpObjectRange
-        //
-        //if ( mpGraphicProvider && mpPicOutStrm && pShapeBoundRect && aXPropSet.is() )
-        //{
-        //  ::com::sun::star::uno::Any aAny;
-        //  ::com::sun::star::awt::Rectangle* pVisArea = NULL;
-        //  if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "VisibleArea" ) ) ) )
-        //  {
-        //      pVisArea = new ::com::sun::star::awt::Rectangle;
-        //      aAny >>= (*pVisArea);
-        //  }
-        //  Rectangle aRect( Point( 0, 0 ), pShapeBoundRect->GetSize() );
-        //  sal_uInt32 nBlibId = mpGraphicProvider->GetBlibID( *mpPicOutStrm, aUniqueId, aRect, pVisArea, NULL );
-        //  if ( nBlibId )
-        //  {
-        //      AddOpt( ESCHER_Prop_pib, nBlibId, true );
-        //      ImplCreateGraphicAttributes( aXPropSet, nBlibId, false );
-        //      bRetValue = true;
-        //  }
-        //  delete pVisArea;
-        //}
     }
     return bRetValue;
 }
@@ -1503,7 +1480,7 @@ GraphicObject lclDrawHatch(
 
 bool EscherPropertyContainer::CreateEmbeddedHatchProperties( const ::com::sun::star::drawing::Hatch& rHatch, const Color& rBackColor, bool bFillBackground )
 {
-    const basegfx::B2DRange aRange(mpObjectRange ? *mpObjectRange : basegfx::B2DRange(0.0, 0.0, 28000.0, 21000.0));
+    const basegfx::B2DRange aRange(maObjectRange.isEmpty() ? basegfx::B2DRange(0.0, 0.0, 28000.0, 21000.0) : maObjectRange);
     GraphicObject aGraphicObject = lclDrawHatch(rHatch, rBackColor, bFillBackground, aRange);
     ByteString aUniqueId = aGraphicObject.GetUniqueID();
     bool bRetValue = ImplCreateEmbeddedBmp( aUniqueId );
@@ -1607,7 +1584,9 @@ bool EscherPropertyContainer::CreateGraphicProperties(
 
                 const basegfx::B2DRange aRange(
                     basegfx::B2DTuple(0.0, 0.0),
-                    mpObjectRange ? mpObjectRange->getRange() : basegfx::B2DTuple(28000.0, 21000.0));
+                    maObjectRange.isEmpty() ?
+                        basegfx::B2DTuple(28000.0, 21000.0) :
+                        maObjectRange.getRange());
                 aGraphicObject = lclDrawHatch(aHatch, aBackColor, bFillBackground, aRange);
                 aUniqueId = aGraphicObject.GetUniqueID();
                 eBitmapMode = ::com::sun::star::drawing::BitmapMode_REPEAT;
@@ -1811,12 +1790,12 @@ bool EscherPropertyContainer::CreateGraphicProperties(
             else
                 AddOpt( ESCHER_Prop_fillType, ESCHER_FillPicture );
 
-            if(aUniqueId.Len() && mpObjectRange)
+            if(aUniqueId.Len() && !maObjectRange.isEmpty())
             {
                 // write out embedded graphic
                 if(mpGraphicProvider && mpPicOutStrm)
                 {
-                    const basegfx::B2DRange aRange(0.0, 0.0, mpObjectRange->getWidth(), mpObjectRange->getHeight());
+                    const basegfx::B2DRange aRange(0.0, 0.0, maObjectRange.getWidth(), maObjectRange.getHeight());
                     const sal_uInt32 nBlibId(mpGraphicProvider->GetBlibID(*mpPicOutStrm, aUniqueId, aRange, NULL, pGraphicAttr));
 
                     if ( nBlibId )
@@ -1838,7 +1817,7 @@ bool EscherPropertyContainer::CreateGraphicProperties(
                 {
                     EscherGraphicProvider aProvider;
                     SvMemoryStream aMemStrm;
-                    const basegfx::B2DRange aRange(0.0, 0.0, mpObjectRange->getWidth(), mpObjectRange->getHeight());
+                    const basegfx::B2DRange aRange(0.0, 0.0, maObjectRange.getWidth(), maObjectRange.getHeight());
 
                     if(aProvider.GetBlibID(aMemStrm, aUniqueId, aRange, NULL, pGraphicAttr))
                     {
@@ -3930,21 +3909,6 @@ MSO_SPT EscherPropertyContainer::GetCustomShapeType( const uno::Reference< drawi
                         if ( rProp.Value >>= rShapeType )
                             eShapeType = EnhancedCustomShapeTypeNames::Get( rShapeType );
                     }
-                    // TTTT: Need to remove "MirroredX" and "MirroredY" attributes
-                    // for CustomShapeGeometry completely
-                    //
-                    //else if ( rProp.Name.equalsAscii( "MirroredX" ) )
-                    //{
-                    //  sal_Bool bMirroredX = sal_Bool();
-                    //  if ( ( rProp.Value >>= bMirroredX ) && bMirroredX )
-                    //      nMirrorFlags  |= SHAPEFLAG_FLIPH;
-                    //}
-                    //else if ( rProp.Name.equalsAscii( "MirroredY" ) )
-                    //{
-                    //  sal_Bool bMirroredY = sal_Bool();
-                    //  if ( ( rProp.Value >>= bMirroredY ) && bMirroredY )
-                    //      nMirrorFlags  |= SHAPEFLAG_FLIPV;
-                    //}
                 }
             }
         }
@@ -3967,9 +3931,9 @@ bool EscherPropertyContainer::CreateBlipPropertiesforOLEControl(const ::com::sun
         ByteString  aUniqueId = aGraphicObject.GetUniqueID();
         if ( aUniqueId.Len() )
         {
-            if(mpGraphicProvider && mpPicOutStrm && mpObjectRange)
+            if(mpGraphicProvider && mpPicOutStrm && !maObjectRange.isEmpty())
             {
-                const basegfx::B2DRange aRange(0.0, 0.0, mpObjectRange->getWidth(), mpObjectRange->getHeight());
+                const basegfx::B2DRange aRange(0.0, 0.0, maObjectRange.getWidth(), maObjectRange.getHeight());
                 const sal_uInt32 nBlibId(mpGraphicProvider->GetBlibID(*mpPicOutStrm, aUniqueId, aRange, NULL));
 
                 if ( nBlibId )
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index f14f543c520e..82af5c6c2c72 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -165,7 +165,6 @@
 #include <svx/sdprcitm.hxx>
 #include <svx/sdrmasterpagedescriptor.hxx>
 #include <svx/sdtaitm.hxx>
-#include <svx/svdglue.hxx>
 #include <svx/svdlayer.hxx>
 #include <svx/svdoattr.hxx>
 #include <svx/svdobj.hxx>
diff --git a/sc/source/core/inc/core_pch.hxx b/sc/source/core/inc/core_pch.hxx
index f6cd08e11682..51473c337684 100644
--- a/sc/source/core/inc/core_pch.hxx
+++ b/sc/source/core/inc/core_pch.hxx
@@ -204,7 +204,6 @@
 #include <basic/sbxcore.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdsob.hxx>
-#include <svx/svdglue.hxx>
 #include <editeng/langitem.hxx>
 #include <editeng/eeitem.hxx>
 #include <callform.hxx>
diff --git a/sc/source/ui/inc/ui_pch.hxx b/sc/source/ui/inc/ui_pch.hxx
index c9f092803af6..05cdcd63ce17 100644
--- a/sc/source/ui/inc/ui_pch.hxx
+++ b/sc/source/ui/inc/ui_pch.hxx
@@ -204,7 +204,6 @@
 #include <svx/svdsob.hxx>
 #include <vcl/button.hxx>
 #include <svx/svdobj.hxx>
-#include <svx/svdglue.hxx>
 #include <svx/svdlayer.hxx>
 #include <vcl/msgbox.hxx>
 #include <svx/svdmrkv.hxx>
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 83b473275db0..64bd981ada1d 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -672,7 +672,6 @@
 #include "svx/svddef.hxx"
 #include "svx/svdetc.hxx"
 #include "editeng/measfld.hxx"
-#include "svx/sdrglue.hxx"
 #include "svx/svditer.hxx"
 #include "svx/svdlayer.hxx"
 #include "svx/svdoashp.hxx"
diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx
index 42fcf45585c7..eea57baf2d87 100644
--- a/sd/source/ui/dlg/gluectrl.cxx
+++ b/sd/source/ui/dlg/gluectrl.cxx
@@ -28,7 +28,6 @@
 #include <string> // HACK: prevent conflict between STLPORT and Workshop headers
 
 #include <svx/dialogs.hrc>
-#include <svx/sdrglue.hxx>
 #include <svl/intitem.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx
index c7a575885cca..ca055c872264 100644
--- a/sd/source/ui/func/fuediglu.cxx
+++ b/sd/source/ui/func/fuediglu.cxx
@@ -27,10 +27,8 @@
 #include "fuediglu.hxx"
 #include <svl/eitem.hxx>
 #include <svx/dialogs.hrc>
-#include <svx/sdrglue.hxx>
 #include <sfx2/request.hxx>
 
-
 #include "app.hrc"
 #include "strings.hrc"
 #include "res_bmp.hrc"