Author: alg
Date: Fri Oct 18 15:25:16 2013
New Revision: 1533499
URL: http://svn.apache.org/r1533499
Log:
filter and build adaptions
Modified:
openoffice/branches/alg/aw080/main/filter/inc/filter/msfilter/escherex.hxx
openoffice/branches/alg/aw080/main/filter/source/msfilter/escherex.cxx
openoffice/branches/alg/aw080/main/sc/inc/pch/precompiled_sc.hxx
openoffice/branches/alg/aw080/main/sc/source/core/inc/core_pch.hxx
openoffice/branches/alg/aw080/main/sc/source/ui/inc/ui_pch.hxx
openoffice/branches/alg/aw080/main/sd/inc/pch/precompiled_sd.hxx
openoffice/branches/alg/aw080/main/sd/source/ui/dlg/gluectrl.cxx
openoffice/branches/alg/aw080/main/sd/source/ui/func/fuediglu.cxx
Modified:
openoffice/branches/alg/aw080/main/filter/inc/filter/msfilter/escherex.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/filter/inc/filter/msfilter/escherex.hxx?rev=1533499&r1=1533498&r2=1533499&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/filter/inc/filter/msfilter/escherex.hxx
(original)
+++ openoffice/branches/alg/aw080/main/filter/inc/filter/msfilter/escherex.hxx
Fri Oct 18 15:25:16 2013
@@ -1159,7 +1159,7 @@ class MSFILTER_DLLPUBLIC EscherPropertyC
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;
Modified: openoffice/branches/alg/aw080/main/filter/source/msfilter/escherex.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/filter/source/msfilter/escherex.cxx?rev=1533499&r1=1533498&r2=1533499&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/filter/source/msfilter/escherex.cxx
(original)
+++ openoffice/branches/alg/aw080/main/filter/source/msfilter/escherex.cxx Fri
Oct 18 15:25:16 2013
@@ -155,7 +155,7 @@ EscherExClientAnchor_Base::~EscherExClie
EscherPropertyContainer::EscherPropertyContainer()
: mpGraphicProvider(0),
mpPicOutStrm(0),
- mpObjectRange(),
+ maObjectRange(),
mpSortStruct(0),
mnSortCount(0),
mnSortBufSize(64),
@@ -172,7 +172,7 @@ EscherPropertyContainer::EscherPropertyC
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::CreateGrap
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::CreateGrap
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::CreateGrap
}
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::CreateGrap
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::CreateGrap
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::CreateGrap
{
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::GetCust
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::CreateBlip
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 )
Modified: openoffice/branches/alg/aw080/main/sc/inc/pch/precompiled_sc.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sc/inc/pch/precompiled_sc.hxx?rev=1533499&r1=1533498&r2=1533499&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sc/inc/pch/precompiled_sc.hxx (original)
+++ openoffice/branches/alg/aw080/main/sc/inc/pch/precompiled_sc.hxx Fri Oct 18
15:25:16 2013
@@ -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>
Modified: openoffice/branches/alg/aw080/main/sc/source/core/inc/core_pch.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sc/source/core/inc/core_pch.hxx?rev=1533499&r1=1533498&r2=1533499&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sc/source/core/inc/core_pch.hxx
(original)
+++ openoffice/branches/alg/aw080/main/sc/source/core/inc/core_pch.hxx Fri Oct
18 15:25:16 2013
@@ -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>
Modified: openoffice/branches/alg/aw080/main/sc/source/ui/inc/ui_pch.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sc/source/ui/inc/ui_pch.hxx?rev=1533499&r1=1533498&r2=1533499&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sc/source/ui/inc/ui_pch.hxx (original)
+++ openoffice/branches/alg/aw080/main/sc/source/ui/inc/ui_pch.hxx Fri Oct 18
15:25:16 2013
@@ -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>
Modified: openoffice/branches/alg/aw080/main/sd/inc/pch/precompiled_sd.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/inc/pch/precompiled_sd.hxx?rev=1533499&r1=1533498&r2=1533499&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/inc/pch/precompiled_sd.hxx (original)
+++ openoffice/branches/alg/aw080/main/sd/inc/pch/precompiled_sd.hxx Fri Oct 18
15:25:16 2013
@@ -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"
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/dlg/gluectrl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/dlg/gluectrl.cxx?rev=1533499&r1=1533498&r2=1533499&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/dlg/gluectrl.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/dlg/gluectrl.cxx Fri Oct 18
15:25:16 2013
@@ -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>
Modified: openoffice/branches/alg/aw080/main/sd/source/ui/func/fuediglu.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/alg/aw080/main/sd/source/ui/func/fuediglu.cxx?rev=1533499&r1=1533498&r2=1533499&view=diff
==============================================================================
--- openoffice/branches/alg/aw080/main/sd/source/ui/func/fuediglu.cxx (original)
+++ openoffice/branches/alg/aw080/main/sd/source/ui/func/fuediglu.cxx Fri Oct
18 15:25:16 2013
@@ -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"
