You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2012/06/27 15:45:34 UTC
svn commit: r1354497 [22/33] - in /incubator/ooo/branches/alg/aw080: ./
ext_libraries/apr-util/ ext_libraries/apr/ ext_libraries/coinmp/
ext_libraries/serf/ ext_libraries/serf/prj/ ext_libraries/serf/win/
ext_sources/ main/ main/animations/source/animc...
Modified: incubator/ooo/branches/alg/aw080/main/svtools/source/filter/wmf/winmtf.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svtools/source/filter/wmf/winmtf.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svtools/source/filter/wmf/winmtf.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svtools/source/filter/wmf/winmtf.cxx Wed Jun 27 13:44:09 2012
@@ -29,6 +29,9 @@
#include <vcl/metaact.hxx>
#include <vcl/metric.hxx>
#include <rtl/tencinfo.h>
+#include <vcl/svapp.hxx>
+#include <vcl/virdev.hxx>
+#include <vos/mutex.hxx>
// ------------------------------------------------------------------------
@@ -280,8 +283,11 @@ WinMtfFontStyle::WinMtfFontStyle( LOGFON
Size aFontSize( Size( rFont.lfWidth, rFont.lfHeight ) );
if ( rFont.lfHeight > 0 )
{
- // converting the cell height into a font height
+ // #117968# VirtualDevice is not thread safe, but filter is used in multithreading
+ vos::OGuard aGuard( Application::GetSolarMutex() );
VirtualDevice aVDev;
+
+ // converting the cell height into a font height
aFont.SetSize( aFontSize );
aVDev.SetFont( aFont );
FontMetric aMetric( aVDev.GetFontMetric() );
@@ -297,8 +303,11 @@ WinMtfFontStyle::WinMtfFontStyle( LOGFON
if ( !rFont.lfWidth )
{
+ // #117968# VirtualDevice is not thread safe, but filter is used in multithreading
+ vos::OGuard aGuard( Application::GetSolarMutex() );
VirtualDevice aVDev;
- aFont.SetSize( aFontSize );
+
+ aFont.SetSize( aFontSize );
aVDev.SetFont( aFont );
FontMetric aMetric( aVDev.GetFontMetric() );
aFontSize.Width() = aMetric.GetWidth();
@@ -1456,15 +1465,12 @@ void WinMtfOutput::DrawPolyBezier( Polyg
void WinMtfOutput::DrawText( Point& rPosition, String& rText, sal_Int32* pDXArry, sal_Bool bRecordPath, sal_Int32 nGfxMode )
{
- UpdateClipRegion();
-
- VirtualDevice* pVDev = NULL;
-
+ UpdateClipRegion();
rPosition = ImplMap( rPosition );
-
sal_Int32 nOldGfxMode = GetGfxMode();
SetGfxMode( GM_COMPATIBLE );
- if ( pDXArry )
+
+ if ( pDXArry )
{
sal_Int32 i, nSum, nLen = rText.Len();
@@ -1556,20 +1562,23 @@ void WinMtfOutput::DrawText( Point& rPos
if( mnTextAlign & ( TA_UPDATECP | TA_RIGHT_CENTER ) )
{
- if ( !pVDev )
- pVDev = new VirtualDevice;
+ // #117968# VirtualDevice is not thread safe, but filter is used in multithreading
+ vos::OGuard aGuard( Application::GetSolarMutex() );
+ VirtualDevice aVDev;
sal_Int32 nTextWidth;
- pVDev->SetMapMode( MapMode( MAP_100TH_MM ) );
- pVDev->SetFont( maFont );
- if( pDXArry )
+
+ aVDev.SetMapMode( MapMode( MAP_100TH_MM ) );
+ aVDev.SetFont( maFont );
+
+ if( pDXArry )
{
sal_uInt32 nLen = rText.Len();
- nTextWidth = pVDev->GetTextWidth( rText.GetChar( (sal_uInt16)( nLen - 1 ) ) );
+ nTextWidth = aVDev.GetTextWidth( rText.GetChar( (sal_uInt16)( nLen - 1 ) ) );
if( nLen > 1 )
nTextWidth += pDXArry[ nLen - 2 ];
}
else
- nTextWidth = pVDev->GetTextWidth( rText );
+ nTextWidth = aVDev.GetTextWidth( rText );
if( mnTextAlign & TA_UPDATECP )
rPosition = maActPos;
@@ -1603,19 +1612,20 @@ void WinMtfOutput::DrawText( Point& rPos
sal_Int32* pDX = pDXArry;
if ( !pDXArry )
{
- pDX = new sal_Int32[ rText.Len() ];
- if ( !pVDev )
- pVDev = new VirtualDevice;
- pVDev->SetMapMode( MAP_100TH_MM );
- pVDev->SetFont( maLatestFont );
- pVDev->GetTextArray( rText, pDX, 0, STRING_LEN );
+ // #117968# VirtualDevice is not thread safe, but filter is used in multithreading
+ vos::OGuard aGuard( Application::GetSolarMutex() );
+ VirtualDevice aVDev;
+
+ pDX = new sal_Int32[ rText.Len() ];
+ aVDev.SetMapMode( MAP_100TH_MM );
+ aVDev.SetFont( maLatestFont );
+ aVDev.GetTextArray( rText, pDX, 0, STRING_LEN );
}
mpGDIMetaFile->AddAction( new MetaTextArrayAction( rPosition, rText, pDX, 0, STRING_LEN ) );
if ( !pDXArry ) // this means we have created our own array
delete[] pDX; // which must be deleted
}
SetGfxMode( nOldGfxMode );
- delete pVDev;
}
//-----------------------------------------------------------------------------------
Modified: incubator/ooo/branches/alg/aw080/main/svtools/source/filter/wmf/winmtf.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svtools/source/filter/wmf/winmtf.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svtools/source/filter/wmf/winmtf.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svtools/source/filter/wmf/winmtf.hxx Wed Jun 27 13:44:09 2012
@@ -39,7 +39,6 @@
#include <tools/table.hxx>
#include <tools/dynary.hxx>
#include <vcl/graph.hxx>
-#include <vcl/virdev.hxx>
#include <tools/poly.hxx>
#include <vcl/font.hxx>
#include <vcl/bmpacc.hxx>
@@ -724,8 +723,6 @@ public:
class WMFReader : public WinMtf
{
private:
-
- VirtualDevice aVDev; // just for the purpose of "IsFontAvailable"
sal_uInt16 nUnitsPerInch;
sal_uInt32 nRecSize;
Modified: incubator/ooo/branches/alg/aw080/main/svtools/source/filter/wmf/winwmf.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svtools/source/filter/wmf/winwmf.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svtools/source/filter/wmf/winwmf.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svtools/source/filter/wmf/winwmf.cxx Wed Jun 27 13:44:09 2012
@@ -29,6 +29,7 @@
#include <rtl/crc.h>
#include <rtl/tencinfo.h>
#include <osl/endian.h>
+#include <vcl/svapp.hxx>
//====================== MS-Windows-defines ===============================
@@ -872,8 +873,9 @@ void WMFReader::ReadRecordParams( sal_uI
switch( nEsc )
{
case PRIVATE_ESCAPE_UNICODE :
- { // we will use text instead of polygons only if we have the correct font
- if ( aVDev.IsFontAvailable( pOut->GetFont().GetName() ) )
+ {
+ // we will use text instead of polygons only if we have the correct font
+ if ( Application::GetDefaultDevice()->IsFontAvailable( pOut->GetFont().GetName() ) )
{
Point aPt;
String aString;
Modified: incubator/ooo/branches/alg/aw080/main/svtools/source/misc/embedhlp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svtools/source/misc/embedhlp.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svtools/source/misc/embedhlp.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svtools/source/misc/embedhlp.cxx Wed Jun 27 13:44:09 2012
@@ -303,6 +303,7 @@ EmbeddedObjectRef::~EmbeddedObjectRef()
if ( mpImp->pHCGraphic )
DELETEZ( mpImp->pHCGraphic );
Clear();
+ delete mpImp;
}
/*
EmbeddedObjectRef& EmbeddedObjectRef::operator = ( const EmbeddedObjectRef& rObj )
Modified: incubator/ooo/branches/alg/aw080/main/svtools/source/table/tablecontrol_impl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svtools/source/table/tablecontrol_impl.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svtools/source/table/tablecontrol_impl.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svtools/source/table/tablecontrol_impl.cxx Wed Jun 27 13:44:09 2012
@@ -606,8 +606,16 @@ namespace svt { namespace table
if ( m_nRowCount > 0 )
goTo( m_nCurColumn, m_nRowCount - 1 );
else
+ {
m_nCurRow = ROW_INVALID;
+ m_nTopRow = 0;
+ }
+ }
+ else if ( m_nRowCount == 0 )
+ {
+ m_nTopRow = 0;
}
+
// relayout, since the scrollbar need might have changed
impl_ni_relayout();
@@ -2170,7 +2178,8 @@ namespace svt { namespace table
if ( i_lastRow == ROW_INVALID )
aInvalidateRect.Bottom() = m_pDataWindow->GetOutputSizePixel().Height();
- m_pDataWindow->Invalidate( aInvalidateRect );
+ m_pDataWindow->Invalidate( aInvalidateRect,
+ m_pDataWindow->GetControlBackground().GetTransparency() ? INVALIDATE_TRANSPARENT : 0 );
}
//------------------------------------------------------------------------------
Modified: incubator/ooo/branches/alg/aw080/main/svtools/source/table/tabledatawindow.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svtools/source/table/tabledatawindow.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svtools/source/table/tabledatawindow.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svtools/source/table/tabledatawindow.cxx Wed Jun 27 13:44:09 2012
@@ -196,6 +196,7 @@ namespace svt { namespace table
Point const aPoint = rMEvt.GetPosPixel();
RowPos const hitRow = m_rTableControl.getRowAtPoint( aPoint );
bool const wasRowSelected = m_rTableControl.isRowSelected( hitRow );
+ size_t const nPrevSelRowCount = m_rTableControl.getSelectedRowCount();
if ( !m_rTableControl.getInputHandler()->MouseButtonDown( m_rTableControl, rMEvt ) )
{
@@ -204,7 +205,8 @@ namespace svt { namespace table
}
bool const isRowSelected = m_rTableControl.isRowSelected( hitRow );
- if ( isRowSelected != wasRowSelected )
+ size_t const nCurSelRowCount = m_rTableControl.getSelectedRowCount();
+ if ( isRowSelected != wasRowSelected || nCurSelRowCount != nPrevSelRowCount )
{
m_aSelectHdl.Call( NULL );
}
Modified: incubator/ooo/branches/alg/aw080/main/svtools/source/uno/treecontrolpeer.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svtools/source/uno/treecontrolpeer.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svtools/source/uno/treecontrolpeer.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svtools/source/uno/treecontrolpeer.cxx Wed Jun 27 13:44:09 2012
@@ -1634,7 +1634,7 @@ UnoTreeListItem::~UnoTreeListItem()
sal_uInt16 UnoTreeListItem::IsA()
{
- return 0;
+ return SV_ITEM_ID_LBOXSTRING;
}
// --------------------------------------------------------------------
Modified: incubator/ooo/branches/alg/aw080/main/svx/Module_svx.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/Module_svx.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/Module_svx.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/Module_svx.mk Wed Jun 27 13:44:09 2012
@@ -30,7 +30,6 @@ $(eval $(call gb_Module_add_targets,svx,
AllLangResTarget_svx \
AllLangResTarget_ofa \
AllLangResTarget_gal \
- AllLangResTarget_about \
AllLangResTarget_textconversiondlgs \
Package_inc \
Package_sdi \
Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/msdffdef.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/msdffdef.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/msdffdef.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/msdffdef.hxx Wed Jun 27 13:44:09 2012
@@ -1220,4 +1220,7 @@ sal_uInt8 m_bTag;
void *m_pvBits; // raster bits of the blip.
#endif
+//ALT_TXT_MSINTEROP
+#define MSPROP_DESCRIPTION_MAX_LEN 4096
+
#endif
Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx Wed Jun 27 13:44:09 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/branches/alg/aw080/main/svx/inc/svx/sdr/properties/attributeproperties.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/sdr/properties/attributeproperties.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
(empty)
Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/sdr/properties/graphicproperties.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/sdr/properties/graphicproperties.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/sdr/properties/graphicproperties.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/sdr/properties/graphicproperties.hxx Wed Jun 27 13:44:09 2012
@@ -41,7 +41,7 @@ namespace sdr
// react on ItemSet changes
virtual void ItemSetChanged(const SfxItemSet& rSet);
- public:
+ public:
// basic constructor
GraphicProperties(SdrObject& rObj);
Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/sdr/properties/oleproperties.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/sdr/properties/oleproperties.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/sdr/properties/oleproperties.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/sdr/properties/oleproperties.hxx Wed Jun 27 13:44:09 2012
@@ -35,7 +35,10 @@ namespace sdr
class OleProperties : public RectangleProperties
{
protected:
- public:
+ // #119287# get correct StyleSheet for SdrObject we are based on
+ virtual SfxStyleSheet* getObjectDependentDefaultStyleSheet() const;
+
+ public:
// basic constructor
OleProperties(SdrObject& rObj);
Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svddrgmt.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svddrgmt.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svddrgmt.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svddrgmt.hxx Wed Jun 27 13:44:09 2012
@@ -83,7 +83,13 @@ public:
SdrDragEntrySdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool bModify);
virtual ~SdrDragEntrySdrObject();
- virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod);
+ // #54102# Split createPrimitive2DSequenceInCurrentState in prepareCurrentState and processing,
+ // added accessors to original and clone
+ void prepareCurrentState(SdrDragMethod& rDragMethod);
+ const SdrObject& getOriginal() const { return maOriginal; }
+ SdrObject* getClone() { return mpClone; }
+
+ virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod);
};
//////////////////////////////////////////////////////////////////////////////
@@ -132,8 +138,8 @@ private:
protected:
// access for derivated classes to maSdrDragEntries
- void clearSdrDragEntries() { for(sal_uInt32 a(0); a < maSdrDragEntries.size(); a++) { delete maSdrDragEntries[a]; } maSdrDragEntries.clear(); }
- void addSdrDragEntry(SdrDragEntry* pNew) { if(pNew) { maSdrDragEntries.push_back(pNew); }}
+ void clearSdrDragEntries();
+ void addSdrDragEntry(SdrDragEntry* pNew);
virtual void createSdrDragEntries();
virtual void createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool bModify);
Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdmodel.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdmodel.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdmodel.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdmodel.hxx Wed Jun 27 13:44:09 2012
@@ -220,6 +220,7 @@ protected:
// diverse data and helpers
rtl::Reference< SfxStyleSheetBasePool > mxStyleSheetPool;
SfxStyleSheet* mpDefaultStyleSheet;
+ SfxStyleSheet* mpDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj; // #119287#
comphelper::IEmbeddedHelper* m_pEmbeddedHelper; // helper for embedded objects to get rid of the SfxObjectShell
OutputDevice* mpReferenceOutputDevice; // ReferenzDevice fuer die EditEngine
sfx2::LinkManager* mpLinkManager; // LinkManager
@@ -533,6 +534,10 @@ public:
SfxStyleSheet* GetDefaultStyleSheet() const { return mpDefaultStyleSheet; }
void SetDefaultStyleSheet(SfxStyleSheet* pDefSS) { if(mpDefaultStyleSheet != pDefSS) mpDefaultStyleSheet = pDefSS; }
+ // #119287# default StyleSheet for SdrGrafObj and SdrOle2Obj
+ SfxStyleSheet* GetDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj() const { return mpDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj; }
+ void SetDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj(SfxStyleSheet* pDefSS) { mpDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj = pDefSS; }
+
void SetStarDrawPreviewMode(bool bPreview);
bool IsStarDrawPreviewMode() { return mbStarDrawPreviewMode; }
Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdobj.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdobj.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdobj.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdobj.hxx Wed Jun 27 13:44:09 2012
@@ -260,21 +260,21 @@ public:
class SVX_DLLPUBLIC SdrObjTransformInfoRec
{
public:
- bool bSelectAllowed : 1; // false=Obj kann nicht selektiert werden
- bool bMoveAllowed : 1; // false=Obj kann nicht verschoben werden
- bool bResizeFreeAllowed : 1; // false=Obj kann nicht frei resized werden
- bool bResizePropAllowed : 1; // false=Obj kann nichtmal proportional resized werden
- bool bRotateFreeAllowed : 1; // false=Obj kann nicht frei gedreht werden
- bool bRotate90Allowed : 1; // false=Obj kann nichtmal im 90deg Raster gedreht werden
- bool bMirrorFreeAllowed : 1; // false=Obj kann nicht frei gespiegelt werden
- bool bMirror45Allowed : 1; // false=Obj kann nichtmal ueber Achse im 45deg Raster gespiegelt werden
+ bool mbSelectAllowed : 1; // false=Obj kann nicht selektiert werden
+ bool mbMoveAllowed : 1; // false=Obj kann nicht verschoben werden
+ bool mbResizeFreeAllowed : 1; // false=Obj kann nicht frei resized werden
+ bool mbResizePropAllowed : 1; // false=Obj kann nichtmal proportional resized werden
+ bool mbRotateFreeAllowed : 1; // false=Obj kann nicht frei gedreht werden
+ bool mbRotate90Allowed : 1; // false=Obj kann nichtmal im 90deg Raster gedreht werden
+ bool mbMirrorFreeAllowed : 1; // false=Obj kann nicht frei gespiegelt werden
+ bool mbMirror45Allowed : 1; // false=Obj kann nichtmal ueber Achse im 45deg Raster gespiegelt werden
bool mbMirror90Allowed : 1; // false=Obj kann ebenfalls nicht ueber Achse im 90deg Raster gespiegelt werden
bool mbTransparenceAllowed : 1; // false=Obj does not have an interactive transparence control
bool mbGradientAllowed : 1; // false=Obj dooes not have an interactive gradient control
bool mbShearAllowed : 1; // false=Obj kann nicht verzerrt werden
bool mbEdgeRadiusAllowed : 1;
- bool bNoOrthoDesired : 1; // true bei Rect; ... false bei BMP,MTF;
- bool bNoContortion : 1; // false=Kein verzerren (bei Crook) moeglich (nur true bei PathObj und Gruppierten PathObjs)
+ bool mbNoOrthoDesired : 1; // true bei Rect; ... false bei BMP,MTF;
+ bool mbNoContortion : 1; // false=Kein verzerren (bei Crook) moeglich (nur true bei PathObj und Gruppierten PathObjs)
bool mbCanConvToPath : 1; // false=Keine Konvertierung in PathObj moeglich
bool mbCanConvToPoly : 1; // false=Keine Konvertierung in PolyObj moeglich
bool mbCanConvToContour : 1; // false=no conversion down to whole contour possible
Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdoedge.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdoedge.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdoedge.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdoedge.hxx Wed Jun 27 13:44:09 2012
@@ -263,7 +263,8 @@ public:
virtual bool MovCreate(SdrDragStat& rStat);
virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
virtual bool BckCreate(SdrDragStat& rStat);
- virtual void BrkCreate(SdrDragStat& rStat);
+
+ virtual void BrkCreate(SdrDragStat& rStat);
virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const;
virtual Pointer GetCreatePointer(const SdrView& rSdrView) const;
virtual SdrObject* DoConvertToPolygonObject(bool bBezier, bool bAddText) const;
Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdundo.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdundo.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdundo.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdundo.hxx Wed Jun 27 13:44:09 2012
@@ -35,6 +35,7 @@
#include "svx/svxdllapi.h"
#include <basegfx/point/b2dpoint.hxx>
#include <vector>
+#include <svl/style.hxx>
//////////////////////////////////////////////////////////////////////////////
// predefines
@@ -137,8 +138,8 @@ protected:
SfxItemSet* mpRedoItemSet;
SfxItemSet* mpRepeatItemSet;
- SfxStyleSheet* mpUndoStyleSheet;
- SfxStyleSheet* mpRedoStyleSheet;
+ rtl::Reference< SfxStyleSheetBase > mxUndoStyleSheet;
+ rtl::Reference< SfxStyleSheetBase > mxRedoStyleSheet;
// Bei Zuweisung von TextItems auf ein Zeichenobjekt mit Text:
OutlinerParaObject* mpTextUndoOPO;
@@ -153,6 +154,9 @@ protected:
bool mbStyleSheet : 1;
bool mbHaveToTakeRedoSet : 1;
+ // helper to ensure StyleSheet is in pool (provided by SdrModel from SdrObject)
+ void ensureStyleSheetInStyleSheetPool(SfxStyleSheetBasePool& rStyleSheetPool, SfxStyleSheet& rSheet);
+
public:
SdrUndoAttrObj(SdrObject& rNewObj, bool bStyleSheet1 = false, bool bSaveText = false);
virtual ~SdrUndoAttrObj();
Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unoshape.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unoshape.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unoshape.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unoshape.hxx Wed Jun 27 13:44:09 2012
@@ -369,9 +369,6 @@ protected:
virtual void unlock();
protected:
- using SvxUnoTextRangeBase::setPropertyValue;
- using SvxUnoTextRangeBase::getPropertyValue;
-
// overide these for special property handling in subcasses. Return true if property is handled
virtual bool setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
virtual bool getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
Modified: incubator/ooo/branches/alg/aw080/main/svx/prj/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/prj/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/prj/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/prj/makefile.mk Wed Jun 27 13:44:09 2012
@@ -32,5 +32,13 @@ VERBOSEFLAG :=
VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
all:
- cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShape2d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShape2d.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShape2d.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShape2d.cxx Wed Jun 27 13:44:09 2012
@@ -1539,14 +1539,99 @@ void EnhancedCustomShape2d::CreateSubPat
// create a circle
basegfx::B2DPoint _aCenter( GetPoint( seqCoordinates[ rSrcPt ], sal_True, sal_True ) );
double fWidth, fHeight;
- GetParameter( fWidth, seqCoordinates[ rSrcPt + 1 ].First, sal_True, sal_False );
- GetParameter( fHeight, seqCoordinates[ rSrcPt + 1 ].Second, sal_False, sal_True );
+ MSO_SPT eSpType = mso_sptEllipse;
+ const mso_CustomShape* pDefCustomShape = GetCustomShapeContent( eSpType );
+ sal_Bool bIsDefaultViewBox = sal_False;
+ sal_Bool bIsDefaultPath = sal_False;
+ sal_Bool bIsMSEllipse = sal_False;
+
+ if( ( nCoordWidth == pDefCustomShape->nCoordWidth )
+ && ( nCoordHeight == pDefCustomShape->nCoordHeight ) )
+ {
+ bIsDefaultViewBox = sal_True;
+ }
+
+ sal_Int32 j, nCount = pDefCustomShape->nVertices;//==3
+ com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair> seqCoordinates1, seqCoordinates2;
+
+ seqCoordinates1.realloc( nCount );
+
+ for ( j = 0; j < nCount; j++ )
+ {
+ seqCoordinates1[j] = seqCoordinates[ rSrcPt + j];
+ }
+
+ seqCoordinates2.realloc( nCount );
+
+ for ( j = 0; j < nCount; j++ )
+ {
+ EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( seqCoordinates2[ j ].First, pDefCustomShape->pVertices[ j ].nValA );
+ EnhancedCustomShape2d::SetEnhancedCustomShapeParameter( seqCoordinates2[ j ].Second, pDefCustomShape->pVertices[ j ].nValB );
+ }
+
+ if(seqCoordinates1 == seqCoordinates2)
+ {
+ bIsDefaultPath = sal_True;
+ }
+
+ const rtl::OUString sType( RTL_CONSTASCII_USTRINGPARAM ( "Type" ) );
+ rtl::OUString sShpType;
+ SdrCustomShapeGeometryItem& rGeometryItem = (SdrCustomShapeGeometryItem&)(const SdrCustomShapeGeometryItem&)pCustomShapeObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
+ Any* pAny = rGeometryItem.GetPropertyValueByName( sType );
+
+ if ( pAny )
+ {
+ *pAny >>= sShpType;
+ }
+
+ if( sShpType.getLength() > 3 && sShpType.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "mso" )))
+ {
+ bIsMSEllipse = sal_True;
+ }
+
+ if( (! bIsDefaultPath && ! bIsDefaultViewBox) || (bIsDefaultViewBox && bIsMSEllipse) /*&& (nGeneratorVersion == SfxObjectShell::Sym_L2)*/ )
+ {
+ _aCenter = GetPoint( seqCoordinates[ rSrcPt ], sal_True, sal_True );
+ GetParameter( fWidth, seqCoordinates[ rSrcPt + 1 ].First, sal_True, sal_False );
+ GetParameter( fHeight, seqCoordinates[ rSrcPt + 1 ].Second, sal_False, sal_True );
+ fWidth /= 2;
+ fHeight /= 2;
+ }
+ else if( bIsDefaultPath && !bIsDefaultViewBox /*&& (nGeneratorVersion == SfxObjectShell::Sym_L2)*/ )
+ {
+ _aCenter.setX(nCoordWidth/2 * fXScale);
+ _aCenter.setY(nCoordHeight/2 * fYScale);
+ fWidth = nCoordWidth/2;
+ fHeight = nCoordHeight/2;
+
+ const rtl::OUString sViewBox( RTL_CONSTASCII_USTRINGPARAM ( "ViewBox" ) );
+ const Any* pViewBox = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( sViewBox );
+ com::sun::star::awt::Rectangle aViewBox;
+ if ( pViewBox && (*pViewBox >>= aViewBox ) )
+ {
+ aViewBox.Width = pDefCustomShape->nCoordWidth;
+ aViewBox.Height = pDefCustomShape->nCoordHeight;
+ }
+ com::sun::star::beans::PropertyValue aPropVal;
+ aPropVal.Name = sViewBox;
+ aPropVal.Value <<= aViewBox;
+ rGeometryItem.SetPropertyValue( aPropVal );
+ pCustomShapeObj->SetMergedItem( rGeometryItem );
+ }
+ else
+ {
+ _aCenter = GetPoint( seqCoordinates[ rSrcPt ], sal_True, sal_True );
+ GetParameter( fWidth, seqCoordinates[ rSrcPt + 1 ].First, sal_True, sal_False );
+ GetParameter( fHeight, seqCoordinates[ rSrcPt + 1 ].Second, sal_False, sal_True );
+ }
+
fWidth *= fXScale;
fHeight*= fYScale;
basegfx::B2DRange aRange(
_aCenter.getX() - fWidth, _aCenter.getY() - fHeight,
_aCenter.getX() + fWidth, _aCenter.getY() + fHeight);
- if ( !basegfx::fTools::equalZero(aRange.getWidth()) && !basegfx::fTools::equalZero(aRange.getHeight()) )
+
+ if ( !basegfx::fTools::equalZero(aRange.getWidth()) && !basegfx::fTools::equalZero(aRange.getHeight()) )
{
double fStartAngle, fEndAngle;
GetParameter( fStartAngle, seqCoordinates[ rSrcPt + 2 ].First, sal_False, sal_False );
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/engine3d/obj3d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/engine3d/obj3d.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/engine3d/obj3d.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/engine3d/obj3d.cxx Wed Jun 27 13:44:09 2012
@@ -229,12 +229,12 @@ sal_uInt16 E3dObject::GetObjIdentifier()
void E3dObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bResizeFreeAllowed = true;
- rInfo.bResizePropAllowed = true;
- rInfo.bRotateFreeAllowed = true;
- rInfo.bRotate90Allowed = true;
- rInfo.bMirrorFreeAllowed = false;
- rInfo.bMirror45Allowed = false;
+ rInfo.mbResizeFreeAllowed = true;
+ rInfo.mbResizePropAllowed = true;
+ rInfo.mbRotateFreeAllowed = true;
+ rInfo.mbRotate90Allowed = true;
+ rInfo.mbMirrorFreeAllowed = false;
+ rInfo.mbMirror45Allowed = false;
rInfo.mbMirror90Allowed = false;
rInfo.mbShearAllowed = false;
rInfo.mbEdgeRadiusAllowed = false;
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofgraphic.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofgraphic.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofgraphic.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofgraphic.cxx Wed Jun 27 13:44:09 2012
@@ -324,10 +324,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;
@@ -344,25 +340,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));
// get object transformation
const basegfx::B2DHomMatrix& rObjectMatrix(GetGrafObject().getSdrObjectTransformation());
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx Wed Jun 27 13:44:09 2012
@@ -64,7 +64,8 @@ namespace sdr
const drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute(
drawinglayer::primitive2d::createNewSdrLineFillShadowTextAttribute(
rItemSet,
- rCaptionObj.getText(0)));
+ rCaptionObj.getText(0),
+ false));
// get object transformation
basegfx::B2DHomMatrix aObjectMatrix(rCaptionObj.getSdrObjectTransformation());
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx Wed Jun 27 13:44:09 2012
@@ -53,7 +53,8 @@ namespace sdr
const drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute(
drawinglayer::primitive2d::createNewSdrLineFillShadowTextAttribute(
rItemSet,
- GetCircObj().getText(0)));
+ GetCircObj().getText(0),
+ false));
// get object transformation
const basegfx::B2DHomMatrix& rObjectMatrix(GetCircObj().getSdrObjectTransformation());
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx Wed Jun 27 13:44:09 2012
@@ -74,10 +74,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/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx Wed Jun 27 13:44:09 2012
@@ -53,7 +53,8 @@ namespace sdr
const drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute(
drawinglayer::primitive2d::createNewSdrLineFillShadowTextAttribute(
rItemSet,
- GetPathObj().getText(0)));
+ GetPathObj().getText(0),
+ false));
basegfx::B2DPolyPolygon aUnitPolyPolygon(GetPathObj().getB2DPolyPolygonInObjectCoordinates());
sal_uInt32 nPolyCount(aUnitPolyPolygon.count());
sal_uInt32 nPointCount(0);
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx Wed Jun 27 13:44:09 2012
@@ -57,7 +57,8 @@ namespace sdr
const drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute(
drawinglayer::primitive2d::createNewSdrLineFillShadowTextAttribute(
rItemSet,
- GetRectObj().getText(0)));
+ GetRectObj().getText(0),
+ false));
// calculate corner radius
const sal_uInt32 nCornerRadius(((SdrMetricItem&)(rItemSet.Get(SDRATTR_ECKENRADIUS))).GetValue());
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/sdr/primitive2d/sdrattributecreator.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/sdr/primitive2d/sdrattributecreator.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/sdr/primitive2d/sdrattributecreator.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/sdr/primitive2d/sdrattributecreator.cxx Wed Jun 27 13:44:09 2012
@@ -717,7 +717,8 @@ namespace drawinglayer
attribute::SdrLineFillShadowTextAttribute createNewSdrLineFillShadowTextAttribute(
const SfxItemSet& rSet,
- const SdrText* pText)
+ const SdrText* pText,
+ bool bHasContent)
{
attribute::SdrLineAttribute aLine;
attribute::SdrFillAttribute aFill;
@@ -761,7 +762,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/branches/alg/aw080/main/svx/source/sdr/properties/attributeproperties.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/sdr/properties/attributeproperties.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/sdr/properties/attributeproperties.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/sdr/properties/attributeproperties.cxx Wed Jun 27 13:44:09 2012
@@ -292,8 +292,8 @@ namespace sdr
: DefaultProperties(rObj),
mpStyleSheet(0)
{
- // use default stylesheet
- SfxStyleSheet* pTargetStyleSheet = GetSdrObject().getSdrModelFromSdrObject().GetDefaultStyleSheet();
+ // use default stylesheet #119287#
+ SfxStyleSheet* pTargetStyleSheet = GetSdrObject().getDefaultStyleSheet();
if(pTargetStyleSheet)
{
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/sdr/properties/graphicproperties.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/sdr/properties/graphicproperties.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/sdr/properties/graphicproperties.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/sdr/properties/graphicproperties.cxx Wed Jun 27 13:44:09 2012
@@ -92,7 +92,7 @@ namespace sdr
RectangleProperties::ItemSetChanged(rSet);
}
- void GraphicProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
+ void GraphicProperties::SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr)
{
SdrGrafObj& rObj = (SdrGrafObj&)GetSdrObject();
@@ -121,10 +121,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/branches/alg/aw080/main/svx/source/sdr/properties/oleproperties.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/sdr/properties/oleproperties.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/sdr/properties/oleproperties.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/sdr/properties/oleproperties.cxx Wed Jun 27 13:44:09 2012
@@ -28,6 +28,7 @@
#include <svl/itemset.hxx>
#include <svx/xfillit0.hxx>
#include <svx/xlineit0.hxx>
+#include <svx/svdobj.hxx>
//////////////////////////////////////////////////////////////////////////////
@@ -35,7 +36,7 @@ namespace sdr
{
namespace properties
{
- OleProperties::OleProperties(SdrObject& rObj)
+ OleProperties::OleProperties(SdrObject& rObj)
: RectangleProperties(rObj)
{
}
@@ -61,10 +62,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
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svddrgmt.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svddrgmt.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svddrgmt.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svddrgmt.cxx Wed Jun 27 13:44:09 2012
@@ -32,7 +32,6 @@
#endif
#include <tools/bigint.hxx>
#include <vcl/svapp.hxx>
-
#include "svx/xattr.hxx"
#include <svx/xpoly.hxx>
#include <svx/svdetc.hxx>
@@ -78,6 +77,8 @@
#include <drawinglayer/attribute/sdrlineattribute.hxx>
#include <drawinglayer/attribute/sdrlinestartendattribute.hxx>
#include <svx/svdlegacy.hxx>
+#include <map>
+#include <vector>
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -152,13 +153,11 @@ SdrDragEntrySdrObject::~SdrDragEntrySdrO
}
}
-drawinglayer::primitive2d::Primitive2DSequence SdrDragEntrySdrObject::createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod)
+void SdrDragEntrySdrObject::prepareCurrentState(SdrDragMethod& rDragMethod)
{
// for the moment, i need to re-create the clone in all cases. I need to figure
// out when clone and original have the same class, so that i can use operator=
// in those cases
- const SdrObject* pSource = &maOriginal;
-
if(mpClone)
{
deleteSdrObjectSafeAndClearPointer(mpClone);
@@ -174,7 +173,15 @@ drawinglayer::primitive2d::Primitive2DSe
// apply original transformation, implemented at the DragMethods
rDragMethod.applyCurrentTransformationToSdrObject(*mpClone);
+ }
+}
+drawinglayer::primitive2d::Primitive2DSequence SdrDragEntrySdrObject::createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod)
+{
+ const SdrObject* pSource = &maOriginal;
+
+ if(mbModify && mpClone)
+ {
// choose source for geometry data
pSource = mpClone;
}
@@ -318,6 +325,24 @@ basegfx::B2DRange SdrDragMethod::getCurr
return getB2DRangeFromOverlayObjectList();
}
+void SdrDragMethod::clearSdrDragEntries()
+{
+ for(sal_uInt32 a(0); a < maSdrDragEntries.size(); a++)
+ {
+ delete maSdrDragEntries[a];
+ }
+
+ maSdrDragEntries.clear();
+}
+
+void SdrDragMethod::addSdrDragEntry(SdrDragEntry* pNew)
+{
+ if(pNew)
+ {
+ maSdrDragEntries.push_back(pNew);
+ }
+}
+
void SdrDragMethod::createSdrDragEntries()
{
if(getSdrView().GetSdrPageView())
@@ -609,6 +634,16 @@ void SdrDragMethod::CancelSdrDrag()
Hide();
}
+struct compareConstSdrObjectRefs
+{
+ bool operator()(const SdrObject* p1, const SdrObject* p2) const
+ {
+ return (p1 < p2);
+ }
+};
+
+typedef std::map< const SdrObject*, SdrObject*, compareConstSdrObjectRefs> SdrObjectAndCloneMap;
+
void SdrDragMethod::CreateOverlayGeometry(sdr::overlay::OverlayManager& rOverlayManager)
{
// create SdrDragEntries on demand
@@ -621,10 +656,77 @@ void SdrDragMethod::CreateOverlayGeometr
// modification from current interactive state
if(maSdrDragEntries.size())
{
+ // #54102# SdrDragEntrySdrObject creates clones of SdrObjects as base for creating the needed
+ // primitives, holding the original and the clone. If connectors (Edges) are involved,
+ // the cloned connectors need to be connected to the cloned SdrObjects (after cloning
+ // they are connected to the original SdrObjects). To do so, trigger the preparation
+ // steps for SdrDragEntrySdrObject, save an association of (orig, clone) in a helper
+ // and evtl. remember if it was an edge
+ SdrObjectAndCloneMap aOriginalAndClones;
+ std::vector< SdrEdgeObj* > aEdges;
+ sal_uInt32 a;
+
+ // #54102# execute prepareCurrentState for all SdrDragEntrySdrObject, register pair of original and
+ // clone, remember edges
+ for(a = 0; a < maSdrDragEntries.size(); a++)
+ {
+ SdrDragEntrySdrObject* pSdrDragEntrySdrObject = dynamic_cast< SdrDragEntrySdrObject*>(maSdrDragEntries[a]);
+
+ if(pSdrDragEntrySdrObject)
+ {
+ pSdrDragEntrySdrObject->prepareCurrentState(*this);
+
+ SdrEdgeObj* pSdrEdgeObj = dynamic_cast< SdrEdgeObj* >(pSdrDragEntrySdrObject->getClone());
+
+ if(pSdrEdgeObj)
+ {
+ aEdges.push_back(pSdrEdgeObj);
+ }
+
+ if(pSdrDragEntrySdrObject->getClone())
+ {
+ aOriginalAndClones[&pSdrDragEntrySdrObject->getOriginal()] = pSdrDragEntrySdrObject->getClone();
+ }
+ }
+ }
+
+ // #54102# if there are edges, reconnect their ends to the corresponding clones (if found)
+ if(aEdges.size())
+ {
+ for(a = 0; a < aEdges.size(); a++)
+ {
+ SdrEdgeObj* pSdrEdgeObj = aEdges[a];
+ SdrObject* pConnectedTo = pSdrEdgeObj->GetConnectedNode(true);
+
+ if(pConnectedTo)
+ {
+ SdrObjectAndCloneMap::iterator aEntry = aOriginalAndClones.find(pConnectedTo);
+
+ if(aEntry != aOriginalAndClones.end())
+ {
+ pSdrEdgeObj->ConnectToNode(true, aEntry->second);
+ }
+ }
+
+ pConnectedTo = pSdrEdgeObj->GetConnectedNode(false);
+
+ if(pConnectedTo)
+ {
+ SdrObjectAndCloneMap::iterator aEntry = aOriginalAndClones.find(pConnectedTo);
+
+ if(aEntry != aOriginalAndClones.end())
+ {
+ pSdrEdgeObj->ConnectToNode(false, aEntry->second);
+ }
+ }
+ }
+ }
+
+ // collect primitives for visualisation
drawinglayer::primitive2d::Primitive2DSequence aResult;
drawinglayer::primitive2d::Primitive2DSequence aResultTransparent;
-
- for(sal_uInt32 a(0); a < maSdrDragEntries.size(); a++)
+
+ for(a = 0; a < maSdrDragEntries.size(); a++)
{
SdrDragEntry* pCandidate = maSdrDragEntries[a];
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedtv.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedtv.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedtv.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedtv.cxx Wed Jun 27 13:44:09 2012
@@ -674,7 +674,7 @@ void SdrEditView::CheckPossibilities()
const bool bMovPrt(pObj->IsMoveProtect());
const bool bSizPrt(pObj->IsResizeProtect());
- if(!bMovPrt && aInfo.bMoveAllowed)
+ if(!bMovPrt && aInfo.mbMoveAllowed)
{
nMovableCount++; // Menge der MovableObjs zaehlen
}
@@ -696,37 +696,37 @@ void SdrEditView::CheckPossibilities()
}
// Wenn einer was nicht kann, duerfen's alle nicht
- if(!aInfo.bMoveAllowed)
+ if(!aInfo.mbMoveAllowed)
{
mbMoveAllowedOnSelection = false;
}
- if(!aInfo.bResizeFreeAllowed)
+ if(!aInfo.mbResizeFreeAllowed)
{
mbResizeFreeAllowed = false;
}
- if(!aInfo.bResizePropAllowed)
+ if(!aInfo.mbResizePropAllowed)
{
mbResizePropAllowed = false;
}
- if(!aInfo.bRotateFreeAllowed)
+ if(!aInfo.mbRotateFreeAllowed)
{
mbRotateFreeAllowed = false;
}
- if(!aInfo.bRotate90Allowed)
+ if(!aInfo.mbRotate90Allowed)
{
mbRotate90Allowed = false;
}
- if(!aInfo.bMirrorFreeAllowed)
+ if(!aInfo.mbMirrorFreeAllowed)
{
mbMirrorFreeAllowed = false;
}
- if(!aInfo.bMirror45Allowed)
+ if(!aInfo.mbMirror45Allowed)
{
mbMirror45Allowed = false;
}
@@ -746,7 +746,7 @@ void SdrEditView::CheckPossibilities()
mbEdgeRadiusAllowed = true;
}
- if(aInfo.bNoContortion)
+ if(aInfo.mbNoContortion)
{
mbContortionPossible = false;
}
@@ -755,7 +755,7 @@ void SdrEditView::CheckPossibilities()
// Movable und Rotatable sein, ausser maximal 1
if(!mbMoreThanOneNoMovRot)
{
- if(!aInfo.bMoveAllowed || !aInfo.bResizeFreeAllowed)
+ if(!aInfo.mbMoveAllowed || !aInfo.mbResizeFreeAllowed)
{
mbMoreThanOneNoMovRot = bNoMovRotFound;
bNoMovRotFound = true;
@@ -813,7 +813,7 @@ void SdrEditView::CheckPossibilities()
}
// OrthoDesiredOnMarked checken
- if(!mbOrthoDesiredOnMarked && !aInfo.bNoOrthoDesired)
+ if(!mbOrthoDesiredOnMarked && !aInfo.mbNoOrthoDesired)
{
mbOrthoDesiredOnMarked = true;
}
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedtv1.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedtv1.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedtv1.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedtv1.cxx Wed Jun 27 13:44:09 2012
@@ -2143,7 +2143,7 @@ void SdrEditView::AlignMarkedObjects(Sdr
SdrObjTransformInfoRec aInfo;
pObj->TakeObjInfo(aInfo);
- if(!aInfo.bMoveAllowed || pObj->IsMoveProtect())
+ if(!aInfo.mbMoveAllowed || pObj->IsMoveProtect())
{
const basegfx::B2DRange aObjRange(bBoundRects
? pObj->getObjectRange(getAsSdrView())
@@ -2202,7 +2202,7 @@ void SdrEditView::AlignMarkedObjects(Sdr
SdrObjTransformInfoRec aInfo;
pObj->TakeObjInfo(aInfo);
- if(aInfo.bMoveAllowed && !pObj->IsMoveProtect())
+ if(aInfo.mbMoveAllowed && !pObj->IsMoveProtect())
{
basegfx::B2DVector aMove(0.0, 0.0);
const basegfx::B2DRange aObjRange(bBoundRects
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdfmtf.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdfmtf.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdfmtf.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdfmtf.cxx Wed Jun 27 13:44:09 2012
@@ -1424,6 +1424,31 @@ void ImpSdrGDIMetaFileImport::DoAction(M
////////////////////////////////////////////////////////////////////////////////////////////////////
+XGradientStyle getXGradientStyleFromGradientStyle(const GradientStyle& rGradientStyle)
+{
+ XGradientStyle aXGradientStyle(XGRAD_LINEAR);
+
+ switch(rGradientStyle)
+ {
+ case GRADIENT_LINEAR: aXGradientStyle = XGRAD_LINEAR; break;
+ case GRADIENT_AXIAL: aXGradientStyle = XGRAD_AXIAL; break;
+ case GRADIENT_RADIAL: aXGradientStyle = XGRAD_RADIAL; break;
+ case GRADIENT_ELLIPTICAL: aXGradientStyle = XGRAD_ELLIPTICAL; break;
+ case GRADIENT_SQUARE: aXGradientStyle = XGRAD_SQUARE; break;
+ case GRADIENT_RECT: aXGradientStyle = XGRAD_RECT; break;
+
+ // Needed due to GRADIENT_FORCE_EQUAL_SIZE; this again is needed
+ // to force the enum defines in VCL to a defined size for the compilers,
+ // so despite it is never used it cannot be removed (would break the
+ // API implementation probably).
+ default: break;
+ }
+
+ return aXGradientStyle;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
void ImpSdrGDIMetaFileImport::DoAction(MetaGradientAction& rAct)
{
basegfx::B2DRange aRange(
@@ -1443,19 +1468,8 @@ void ImpSdrGDIMetaFileImport::DoAction(M
maCurrent * aObjectTransform);
SfxItemSet aGradientAttr(mrModel.GetItemPool(), XATTR_FILLSTYLE, XATTR_FILLSTYLE, XATTR_FILLGRADIENT, XATTR_FILLGRADIENT, 0, 0);
- XGradientStyle aXGradientStyle(XGRAD_LINEAR);
- const Gradient& rGradient = rAct.GetGradient();
-
- switch(rGradient.GetStyle())
- {
- case GRADIENT_LINEAR: aXGradientStyle = XGRAD_LINEAR; break;
- case GRADIENT_AXIAL: aXGradientStyle = XGRAD_AXIAL; break;
- case GRADIENT_RADIAL: aXGradientStyle = XGRAD_RADIAL; break;
- case GRADIENT_ELLIPTICAL: aXGradientStyle = XGRAD_ELLIPTICAL; break;
- case GRADIENT_SQUARE: aXGradientStyle = XGRAD_SQUARE; break;
- case GRADIENT_RECT: aXGradientStyle = XGRAD_RECT; break;
- }
-
+ const Gradient& rGradient = rAct.GetGradient();
+ const XGradientStyle aXGradientStyle(getXGradientStyleFromGradientStyle(rGradient.GetStyle()));
const XFillGradientItem aXFillGradientItem(
&mrModel.GetItemPool(),
XGradient(
@@ -1481,7 +1495,7 @@ void ImpSdrGDIMetaFileImport::DoAction(M
////////////////////////////////////////////////////////////////////////////////////////////////////
-void ImpSdrGDIMetaFileImport::DoAction(MetaWallpaperAction& rAct)
+void ImpSdrGDIMetaFileImport::DoAction(MetaWallpaperAction& /*rAct*/)
{
OSL_ENSURE(false, "Tried to construct SdrObject from MetaWallpaperAction: not supported (!)");
}
@@ -1509,14 +1523,14 @@ void ImpSdrGDIMetaFileImport::DoAction(M
////////////////////////////////////////////////////////////////////////////////////////////////////
-void ImpSdrGDIMetaFileImport::DoAction(MetaEPSAction& rAct)
+void ImpSdrGDIMetaFileImport::DoAction(MetaEPSAction& /*rAct*/)
{
OSL_ENSURE(false, "Tried to construct SdrObject from MetaEPSAction: not supported (!)");
}
////////////////////////////////////////////////////////////////////////////////////////////////////
-void ImpSdrGDIMetaFileImport::DoAction(MetaTextLineAction& rAct)
+void ImpSdrGDIMetaFileImport::DoAction(MetaTextLineAction& /*rAct*/)
{
OSL_ENSURE(false, "Tried to construct SdrObject from MetaTextLineAction: not supported (!)");
}
@@ -1533,23 +1547,12 @@ void ImpSdrGDIMetaFileImport::DoAction(M
if(!mbLastObjWasPolyWithoutLine || !CheckLastPolyLineAndFillMerge(aSource))
{
- const Gradient& rGradient = rAct.GetGradient();
SdrPathObj* pPath = new SdrPathObj(
mrModel,
aSource);
SfxItemSet aGradientAttr(mrModel.GetItemPool(), XATTR_FILLSTYLE, XATTR_FILLSTYLE, XATTR_FILLGRADIENT, XATTR_FILLGRADIENT, 0, 0);
- XGradientStyle aXGradientStyle(XGRAD_LINEAR);
-
- switch(rGradient.GetStyle())
- {
- case GRADIENT_LINEAR: aXGradientStyle = XGRAD_LINEAR; break;
- case GRADIENT_AXIAL: aXGradientStyle = XGRAD_AXIAL; break;
- case GRADIENT_RADIAL: aXGradientStyle = XGRAD_RADIAL; break;
- case GRADIENT_ELLIPTICAL: aXGradientStyle = XGRAD_ELLIPTICAL; break;
- case GRADIENT_SQUARE: aXGradientStyle = XGRAD_SQUARE; break;
- case GRADIENT_RECT: aXGradientStyle = XGRAD_RECT; break;
- }
-
+ const Gradient& rGradient = rAct.GetGradient();
+ const XGradientStyle aXGradientStyle(getXGradientStyleFromGradientStyle(rGradient.GetStyle()));
const XFillGradientItem aXFillGradientItem(
&mrModel.GetItemPool(),
XGradient(
@@ -1693,9 +1696,9 @@ void ImpSdrGDIMetaFileImport::DoAction(M
{
const double fOpNew(1.0 - fTransparence);
- for(sal_uInt32 y(0); y < pOld->Height(); y++)
+ for(sal_uInt32 y(0); y < static_cast< sal_uInt32 >(pOld->Height()); y++)
{
- for(sal_uInt32 x(0); x < pOld->Width(); x++)
+ for(sal_uInt32 x(0); x < static_cast< sal_uInt32 >(pOld->Width()); x++)
{
const double fOpOld(1.0 - (pOld->GetPixel(y, x).GetIndex() * fFactor));
const sal_uInt8 aCol(basegfx::fround((1.0 - (fOpOld * fOpNew)) * 255.0));
@@ -1712,9 +1715,9 @@ void ImpSdrGDIMetaFileImport::DoAction(M
{
if(pOld->Width() == pNew->Width() && pOld->Height() == pNew->Height())
{
- for(sal_uInt32 y(0); y < pOld->Height(); y++)
+ for(sal_uInt32 y(0); y < static_cast< sal_uInt32 >(pOld->Height()); y++)
{
- for(sal_uInt32 x(0); x < pOld->Width(); x++)
+ for(sal_uInt32 x(0); x < static_cast< sal_uInt32 >(pOld->Width()); x++)
{
const double fOpOld(1.0 - (pOld->GetPixel(y, x).GetIndex() * fFactor));
const double fOpNew(1.0 - (pNew->GetPixel(y, x).GetIndex() * fFactor));
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdmodel.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdmodel.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdmodel.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdmodel.cxx Wed Jun 27 13:44:09 2012
@@ -132,6 +132,7 @@ SdrModel::SdrModel(const String& rPath,
mpOutlinerCache(0),
mxStyleSheetPool(),
mpDefaultStyleSheet(0),
+ mpDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj(0),
m_pEmbeddedHelper(pPers),
mpReferenceOutputDevice(0),
mpLinkManager(0),
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdoashp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdoashp.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdoashp.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdoashp.cxx Wed Jun 27 13:44:09 2012
@@ -1650,18 +1650,18 @@ bool SdrObjCustomShape::IsDefaultGeometr
void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bResizeFreeAllowed=fObjectRotation == 0.0;
- rInfo.bResizePropAllowed=true;
- rInfo.bRotateFreeAllowed=true;
- rInfo.bRotate90Allowed =true;
- rInfo.bMirrorFreeAllowed=true;
- rInfo.bMirror45Allowed =true;
- rInfo.mbMirror90Allowed =true;
+ rInfo.mbResizeFreeAllowed = 0.0 == fObjectRotation;
+ rInfo.mbResizePropAllowed = true;
+ rInfo.mbRotateFreeAllowed = true;
+ rInfo.mbRotate90Allowed = true;
+ rInfo.mbMirrorFreeAllowed = true;
+ rInfo.mbMirror45Allowed = true;
+ rInfo.mbMirror90Allowed = true;
rInfo.mbTransparenceAllowed = false;
rInfo.mbGradientAllowed = false;
- rInfo.mbShearAllowed =true;
- rInfo.mbEdgeRadiusAllowed=false;
- rInfo.bNoContortion =true;
+ rInfo.mbShearAllowed = true;
+ rInfo.mbEdgeRadiusAllowed = false;
+ rInfo.mbNoContortion = true;
// #i37011#
if ( mXRenderedCustomShape.is() )
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdobj.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdobj.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdobj.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdobj.cxx Wed Jun 27 13:44:09 2012
@@ -424,21 +424,21 @@ SdrObjPlusData* SdrObjPlusData::Clone(Sd
//////////////////////////////////////////////////////////////////////////////
SdrObjTransformInfoRec::SdrObjTransformInfoRec()
-: bSelectAllowed(true),
- bMoveAllowed(true),
- bResizeFreeAllowed(true),
- bResizePropAllowed(true),
- bRotateFreeAllowed(true),
- bRotate90Allowed(true),
- bMirrorFreeAllowed(true),
- bMirror45Allowed(true),
+: mbSelectAllowed(true),
+ mbMoveAllowed(true),
+ mbResizeFreeAllowed(true),
+ mbResizePropAllowed(true),
+ mbRotateFreeAllowed(true),
+ mbRotate90Allowed(true),
+ mbMirrorFreeAllowed(true),
+ mbMirror45Allowed(true),
mbMirror90Allowed(true),
mbTransparenceAllowed(true),
mbGradientAllowed(true),
mbShearAllowed(true),
mbEdgeRadiusAllowed(true),
- bNoOrthoDesired(true),
- bNoContortion(true),
+ mbNoOrthoDesired(true),
+ mbNoContortion(true),
mbCanConvToPath(true),
mbCanConvToPoly(true),
mbCanConvToContour(false),
@@ -680,8 +680,8 @@ sal_uInt16 SdrObject::GetObjIdentifier()
void SdrObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bRotateFreeAllowed = false;
- rInfo.bMirrorFreeAllowed = false;
+ rInfo.mbRotateFreeAllowed = false;
+ rInfo.mbMirrorFreeAllowed = false;
rInfo.mbTransparenceAllowed = false;
rInfo.mbGradientAllowed = false;
rInfo.mbShearAllowed = false;
@@ -2493,11 +2493,16 @@ SvxShape* SdrObject::getSvxShape() const
// retrieving the impl pointer and subsequently using it is not thread-safe, of course, so it needs to be
// guarded by the SolarMutex
-#if OSL_DEBUG_LEVE > 0
uno::Reference< uno::XInterface > xShape( maWeakUnoShape );
- OSL_ENSURE( !( !xShapeGuard.is() && mpSvxShape ),
+#if OSL_DEBUG_LEVE > 0
+ OSL_ENSURE( !( !xShape.is() && mpSvxShape ),
"SdrObject::getSvxShape: still having IMPL-Pointer to dead object!" );
#endif
+ //#113608#, make sure mpSvxShape is always synchronized with maWeakUnoShape
+ if ( mpSvxShape && !xShape.is() )
+ {
+ const_cast< SvxShape* >(mpSvxShape) = NULL;
+ }
return mpSvxShape;
}
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdocapt.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdocapt.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdocapt.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdocapt.cxx Wed Jun 27 13:44:09 2012
@@ -258,10 +258,10 @@ SdrObject* SdrCaptionObj::CloneSdrObject
void SdrCaptionObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bRotateFreeAllowed = false;
- rInfo.bRotate90Allowed = false;
- rInfo.bMirrorFreeAllowed = false;
- rInfo.bMirror45Allowed = false;
+ rInfo.mbRotateFreeAllowed = false;
+ rInfo.mbRotate90Allowed = false;
+ rInfo.mbMirrorFreeAllowed = false;
+ rInfo.mbMirror45Allowed = false;
rInfo.mbMirror90Allowed = false;
rInfo.mbTransparenceAllowed = false;
rInfo.mbGradientAllowed = false;
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdoedge.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdoedge.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdoedge.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdoedge.cxx Wed Jun 27 13:44:09 2012
@@ -412,18 +412,19 @@ void SdrEdgeObj::ImpSetEdgeInfoToAttr()
void SdrEdgeObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bRotateFreeAllowed=false;
- rInfo.bRotate90Allowed =false;
- rInfo.bMirrorFreeAllowed=false;
- rInfo.bMirror45Allowed =false;
- rInfo.mbMirror90Allowed =false;
+ // #54102# allow rotation, mirror and shear
+ rInfo.mbRotateFreeAllowed = true;
+ rInfo.mbRotate90Allowed = true;
+ rInfo.mbMirrorFreeAllowed = true;
+ rInfo.mbMirror45Allowed = true;
+ rInfo.mbMirror90Allowed = true;
rInfo.mbTransparenceAllowed = false;
rInfo.mbGradientAllowed = false;
- rInfo.mbShearAllowed =false;
- rInfo.mbEdgeRadiusAllowed=false;
- bool bCanConv=!HasText() || ImpCanConvTextToCurve();
- rInfo.mbCanConvToPath=bCanConv;
- rInfo.mbCanConvToPoly=bCanConv;
+ rInfo.mbShearAllowed = true;
+ rInfo.mbEdgeRadiusAllowed = false;
+ const bool bCanConv(!HasText() || ImpCanConvTextToCurve());
+ rInfo.mbCanConvToPath = bCanConv;
+ rInfo.mbCanConvToPoly = bCanConv;
rInfo.mbCanConvToContour = (rInfo.mbCanConvToPoly || LineGeometryUsageIsNecessary());
}
@@ -778,9 +779,10 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(co
}
}
+ // #54102# To allow interactive preview, do also if not inserted
SdrPage* pOwningPage = getSdrPageFromSdrObject();
- bool bCon1=rCon1.pObj && rCon1.pObj->getSdrPageFromSdrObject() == pOwningPage && rCon1.pObj->IsObjectInserted();
- bool bCon2=rCon2.pObj && rCon2.pObj->getSdrPageFromSdrObject() == pOwningPage && rCon2.pObj->IsObjectInserted();
+ bool bCon1=rCon1.pObj && rCon1.pObj->getSdrPageFromSdrObject() == pOwningPage; // && rCon1.pObj->IsObjectInserted();
+ bool bCon2=rCon2.pObj && rCon2.pObj->getSdrPageFromSdrObject() == pOwningPage; // && rCon2.pObj->IsObjectInserted();
const SfxItemSet& rSet = GetObjectItemSet();
if (bCon1)
@@ -1651,7 +1653,8 @@ void __EXPORT SdrEdgeObj::Notify(SfxBroa
{
// Broadcasting nur, wenn auf der selben Page
const SdrObjectChangeBroadcaster aSdrObjectChangeBroadcaster(*this);
- ImpDirtyEdgeTrack();
+
+ ImpDirtyEdgeTrack();
ActionChanged();
}
((SdrEdgeObj*)this)->nNotifyingCount--;
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdograf.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdograf.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdograf.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdograf.cxx Wed Jun 27 13:44:09 2012
@@ -741,12 +741,12 @@ void SdrGrafObj::TakeObjInfo(SdrObjTrans
const bool bNoPresGrf((GRAPHIC_NONE != pGraphic->GetType()) && !IsEmptyPresObj());
const long nOldRotAngle(sdr::legacy::GetRotateAngle(*this));
- rInfo.bResizeFreeAllowed = nOldRotAngle % 9000 == 0 || nOldRotAngle % 18000 == 0 || nOldRotAngle % 27000 == 0;
- rInfo.bResizePropAllowed = true;
- rInfo.bRotateFreeAllowed = bNoPresGrf && !bAnim;
- rInfo.bRotate90Allowed = bNoPresGrf && !bAnim;
- rInfo.bMirrorFreeAllowed = bNoPresGrf && !bAnim;
- rInfo.bMirror45Allowed = bNoPresGrf && !bAnim;
+ rInfo.mbResizeFreeAllowed = nOldRotAngle % 9000 == 0 || nOldRotAngle % 18000 == 0 || nOldRotAngle % 27000 == 0;
+ rInfo.mbResizePropAllowed = true;
+ rInfo.mbRotateFreeAllowed = bNoPresGrf && !bAnim;
+ rInfo.mbRotate90Allowed = bNoPresGrf && !bAnim;
+ rInfo.mbMirrorFreeAllowed = bNoPresGrf && !bAnim;
+ rInfo.mbMirror45Allowed = bNoPresGrf && !bAnim;
rInfo.mbMirror90Allowed = !IsEmptyPresObj();
rInfo.mbTransparenceAllowed = false;
rInfo.mbGradientAllowed = false;
@@ -1482,4 +1482,10 @@ Reference< XInputStream > SdrGrafObj::ge
return xStream;
}
+SfxStyleSheet* SdrGrafObj::getDefaultStyleSheet()
+{
+ // use stylesheet without fill and without line
+ return getSdrModelFromSdrObject.GetDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj();
+}
+
// eof
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdogrp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdogrp.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdogrp.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdogrp.cxx Wed Jun 27 13:44:09 2012
@@ -150,7 +150,7 @@ SdrObjList* SdrObjGroup::getChildrenOfSd
void SdrObjGroup::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bNoContortion = false;
+ rInfo.mbNoContortion = false;
const sal_uInt32 nObjAnz(GetObjCount());
for(sal_uInt32 i(0); i < nObjAnz; i++)
@@ -159,38 +159,104 @@ void SdrObjGroup::TakeObjInfo(SdrObjTran
SdrObjTransformInfoRec aInfo;
pObj->TakeObjInfo(aInfo);
- if (!aInfo.bMoveAllowed ) rInfo.bMoveAllowed = false;
- if (!aInfo.bResizeFreeAllowed ) rInfo.bResizeFreeAllowed = false;
- if (!aInfo.bResizePropAllowed ) rInfo.bResizePropAllowed = false;
- if (!aInfo.bRotateFreeAllowed ) rInfo.bRotateFreeAllowed = false;
- if (!aInfo.bRotate90Allowed ) rInfo.bRotate90Allowed = false;
- if (!aInfo.bMirrorFreeAllowed ) rInfo.bMirrorFreeAllowed = false;
- if (!aInfo.bMirror45Allowed ) rInfo.bMirror45Allowed = false;
- if (!aInfo.mbMirror90Allowed ) rInfo.mbMirror90Allowed = false;
- if (!aInfo.mbShearAllowed ) rInfo.mbShearAllowed = false;
- if (!aInfo.mbEdgeRadiusAllowed) rInfo.mbEdgeRadiusAllowed = false;
- if (!aInfo.bNoOrthoDesired ) rInfo.bNoOrthoDesired = false;
- if (aInfo.bNoContortion ) rInfo.bNoContortion = true;
- if (!aInfo.mbCanConvToPath ) rInfo.mbCanConvToPath = false;
- if (!aInfo.mbCanConvToContour ) rInfo.mbCanConvToContour = false;
-
- if (!aInfo.mbCanConvToPoly ) rInfo.mbCanConvToPoly = false;
- if (!aInfo.mbCanConvToPathLineToArea) rInfo.mbCanConvToPathLineToArea = false;
- if (!aInfo.mbCanConvToPolyLineToArea) rInfo.mbCanConvToPolyLineToArea = false;
+ if(!aInfo.mbMoveAllowed)
+ {
+ rInfo.mbMoveAllowed = false;
+ }
+
+ if(!aInfo.mbResizeFreeAllowed)
+ {
+ rInfo.mbResizeFreeAllowed = false;
+ }
+
+ if(!aInfo.mbResizePropAllowed)
+ {
+ rInfo.mbResizePropAllowed = false;
+ }
+
+ if(!aInfo.mbRotateFreeAllowed)
+ {
+ rInfo.mbRotateFreeAllowed = false;
+ }
+
+ if(!aInfo.mbRotate90Allowed)
+ {
+ rInfo.mbRotate90Allowed = false;
+ }
+
+ if(!aInfo.mbMirrorFreeAllowed)
+ {
+ rInfo.mbMirrorFreeAllowed = false;
+ }
+
+ if(!aInfo.mbMirror45Allowed)
+ {
+ rInfo.mbMirror45Allowed = false;
+ }
+
+ if(!aInfo.mbMirror90Allowed)
+ {
+ rInfo.mbMirror90Allowed = false;
+ }
+
+ if(!aInfo.mbShearAllowed)
+ {
+ rInfo.mbShearAllowed = false;
+ }
+
+ if(!aInfo.mbEdgeRadiusAllowed)
+ {
+ rInfo.mbEdgeRadiusAllowed = false;
+ }
+
+ if(!aInfo.mbNoOrthoDesired)
+ {
+ rInfo.mbNoOrthoDesired = false;
+ }
+
+ if(aInfo.mbNoContortion)
+ {
+ rInfo.mbNoContortion = true;
+ }
+
+ if(!aInfo.mbCanConvToPath)
+ {
+ rInfo.mbCanConvToPath = false;
+ }
+
+ if(!aInfo.mbCanConvToContour)
+ {
+ rInfo.mbCanConvToContour = false;
+ }
+
+ if(!aInfo.mbCanConvToPoly)
+ {
+ rInfo.mbCanConvToPoly = false;
+ }
+
+ if(!aInfo.mbCanConvToPathLineToArea)
+ {
+ rInfo.mbCanConvToPathLineToArea = false;
+ }
+
+ if(!aInfo.mbCanConvToPolyLineToArea)
+ {
+ rInfo.mbCanConvToPolyLineToArea = false;
+ }
}
if(!nObjAnz)
{
- rInfo.bRotateFreeAllowed = false;
- rInfo.bRotate90Allowed = false;
- rInfo.bMirrorFreeAllowed = false;
- rInfo.bMirror45Allowed = false;
- rInfo.mbMirror90Allowed = false;
+ rInfo.mbRotateFreeAllowed = false;
+ rInfo.mbRotate90Allowed = false;
+ rInfo.mbMirrorFreeAllowed = false;
+ rInfo.mbMirror45Allowed = false;
+ rInfo.mbMirror90Allowed = false;
rInfo.mbTransparenceAllowed = false;
- rInfo.mbGradientAllowed = false;
- rInfo.mbShearAllowed = false;
- rInfo.mbEdgeRadiusAllowed = false;
- rInfo.bNoContortion = true;
+ rInfo.mbGradientAllowed = false;
+ rInfo.mbShearAllowed = false;
+ rInfo.mbEdgeRadiusAllowed = false;
+ rInfo.mbNoContortion = true;
}
if(1 != nObjAnz)
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdomeas.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdomeas.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdomeas.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdomeas.cxx Wed Jun 27 13:44:09 2012
@@ -260,21 +260,21 @@ bool SdrMeasureObj::DoesSupportTextInden
void SdrMeasureObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bSelectAllowed = true;
- rInfo.bMoveAllowed = true;
- rInfo.bResizeFreeAllowed = true;
- rInfo.bResizePropAllowed = true;
- rInfo.bRotateFreeAllowed = true;
- rInfo.bRotate90Allowed = true;
- rInfo.bMirrorFreeAllowed = true;
- rInfo.bMirror45Allowed = true;
+ rInfo.mbSelectAllowed = true;
+ rInfo.mbMoveAllowed = true;
+ rInfo.mbResizeFreeAllowed = true;
+ rInfo.mbResizePropAllowed = true;
+ rInfo.mbRotateFreeAllowed = true;
+ rInfo.mbRotate90Allowed = true;
+ rInfo.mbMirrorFreeAllowed = true;
+ rInfo.mbMirror45Allowed = true;
rInfo.mbMirror90Allowed = true;
rInfo.mbTransparenceAllowed = false;
rInfo.mbGradientAllowed = false;
rInfo.mbShearAllowed = true;
rInfo.mbEdgeRadiusAllowed = false;
- rInfo.bNoOrthoDesired = true;
- rInfo.bNoContortion = false;
+ rInfo.mbNoOrthoDesired = true;
+ rInfo.mbNoContortion = false;
rInfo.mbCanConvToPath = false;
rInfo.mbCanConvToPoly = true;
rInfo.mbCanConvToPathLineToArea = false;
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdomedia.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdomedia.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdomedia.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdomedia.cxx Wed Jun 27 13:44:09 2012
@@ -102,21 +102,21 @@ sdr::contact::ViewContact* SdrMediaObj::
void SdrMediaObj::TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const
{
- rInfo.bSelectAllowed = true;
- rInfo.bMoveAllowed = true;
- rInfo.bResizeFreeAllowed = true;
- rInfo.bResizePropAllowed = true;
- rInfo.bRotateFreeAllowed = false;
- rInfo.bRotate90Allowed = false;
- rInfo.bMirrorFreeAllowed = false;
- rInfo.bMirror45Allowed = false;
+ rInfo.mbSelectAllowed = true;
+ rInfo.mbMoveAllowed = true;
+ rInfo.mbResizeFreeAllowed = true;
+ rInfo.mbResizePropAllowed = true;
+ rInfo.mbRotateFreeAllowed = false;
+ rInfo.mbRotate90Allowed = false;
+ rInfo.mbMirrorFreeAllowed = false;
+ rInfo.mbMirror45Allowed = false;
rInfo.mbMirror90Allowed = false;
rInfo.mbTransparenceAllowed = false;
rInfo.mbGradientAllowed = false;
rInfo.mbShearAllowed = false;
rInfo.mbEdgeRadiusAllowed = false;
- rInfo.bNoOrthoDesired = false;
- rInfo.bNoContortion = false;
+ rInfo.mbNoOrthoDesired = false;
+ rInfo.mbNoContortion = false;
rInfo.mbCanConvToPath = false;
rInfo.mbCanConvToPoly = false;
rInfo.mbCanConvToContour = false;
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdoole2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdoole2.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdoole2.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdoole2.cxx Wed Jun 27 13:44:09 2012
@@ -87,6 +87,8 @@
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <editeng/outlobj.hxx>
+#include <svx/svdpage.hxx>
+
using namespace ::rtl;
using namespace ::com::sun::star;
@@ -1549,16 +1551,16 @@ String SdrOle2Obj::GetPersistName() cons
void SdrOle2Obj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
// #i118485# Allowing much more attributes for OLEs
- rInfo.bRotateFreeAllowed = true;
- rInfo.bRotate90Allowed = true;
- rInfo.bMirrorFreeAllowed = true;
- rInfo.bMirror45Allowed = true;
+ rInfo.mbRotateFreeAllowed = true;
+ rInfo.mbRotate90Allowed = true;
+ rInfo.mbMirrorFreeAllowed = true;
+ rInfo.mbMirror45Allowed = true;
rInfo.mbMirror90Allowed = true;
rInfo.mbTransparenceAllowed = true;
rInfo.mbGradientAllowed = true;
rInfo.mbShearAllowed = true;
rInfo.mbEdgeRadiusAllowed = false;
- rInfo.bNoOrthoDesired = false;
+ rInfo.mbNoOrthoDesired = false;
rInfo.mbCanConvToPath = true;
rInfo.mbCanConvToPoly = true;
rInfo.mbCanConvToPathLineToArea = false;
@@ -2136,4 +2138,12 @@ void SdrOle2Obj::SetWindow(const com::su
}
//////////////////////////////////////////////////////////////////////////////
+
+SfxStyleSheet* SdrOle2Obj::getDefaultStyleSheet()
+{
+ // use stylesheet without fill and without line
+ return getSdrModelFromSdrObject.GetDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj();
+}
+
+//////////////////////////////////////////////////////////////////////////////
// eof
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdopage.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdopage.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdopage.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdopage.cxx Wed Jun 27 13:44:09 2012
@@ -160,16 +160,16 @@ sal_uInt16 SdrPageObj::GetObjIdentifier(
void SdrPageObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bRotateFreeAllowed = false;
- rInfo.bRotate90Allowed = false;
- rInfo.bMirrorFreeAllowed = false;
- rInfo.bMirror45Allowed = false;
+ rInfo.mbRotateFreeAllowed = false;
+ rInfo.mbRotate90Allowed = false;
+ rInfo.mbMirrorFreeAllowed = false;
+ rInfo.mbMirror45Allowed = false;
rInfo.mbMirror90Allowed = false;
rInfo.mbTransparenceAllowed = false;
rInfo.mbGradientAllowed = false;
rInfo.mbShearAllowed = false;
rInfo.mbEdgeRadiusAllowed = false;
- rInfo.bNoOrthoDesired = false;
+ rInfo.mbNoOrthoDesired = false;
rInfo.mbCanConvToPath = false;
rInfo.mbCanConvToPoly = false;
rInfo.mbCanConvToPathLineToArea = false;
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdopath.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdopath.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdopath.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdopath.cxx Wed Jun 27 13:44:09 2012
@@ -1805,7 +1805,7 @@ void SdrPathObj::ImpSetClosed(bool bClos
void SdrPathObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bNoContortion=false;
+ rInfo.mbNoContortion=false;
const bool bCanConv(!HasText() || ImpCanConvTextToCurve());
const bool bIsPath(isBezier());
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdorect.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdorect.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdorect.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdorect.cxx Wed Jun 27 13:44:09 2012
@@ -125,12 +125,12 @@ void SdrRectObj::TakeObjInfo(SdrObjTrans
{
bool bNoTextFrame = !IsTextFrame();
const long aOldRotation(sdr::legacy::GetRotateAngle(*this));
- rInfo.bResizeFreeAllowed = bNoTextFrame || aOldRotation%9000==0;
- rInfo.bResizePropAllowed = true;
- rInfo.bRotateFreeAllowed = true;
- rInfo.bRotate90Allowed = true;
- rInfo.bMirrorFreeAllowed=bNoTextFrame;
- rInfo.bMirror45Allowed =bNoTextFrame;
+ rInfo.mbResizeFreeAllowed = bNoTextFrame || aOldRotation%9000==0;
+ rInfo.mbResizePropAllowed = true;
+ rInfo.mbRotateFreeAllowed = true;
+ rInfo.mbRotate90Allowed = true;
+ rInfo.mbMirrorFreeAllowed=bNoTextFrame;
+ rInfo.mbMirror45Allowed =bNoTextFrame;
rInfo.mbMirror90Allowed = bNoTextFrame;
// allow transparence
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdotext.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdotext.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdotext.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdotext.cxx Wed Jun 27 13:44:09 2012
@@ -404,19 +404,19 @@ SdrTextVertAdjust SdrTextObj::GetTextVer
void SdrTextObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
bool bNoTextFrame = !IsTextFrame();
- rInfo.bResizeFreeAllowed = bNoTextFrame;
+ rInfo.mbResizeFreeAllowed = bNoTextFrame;
- if(!rInfo.bResizeFreeAllowed)
+ if(!rInfo.mbResizeFreeAllowed)
{
sal_Int32 nAngle(sdr::legacy::GetRotateAngle(*this));
- rInfo.bResizeFreeAllowed = (0 == nAngle % 9000);
+ rInfo.mbResizeFreeAllowed = (0 == nAngle % 9000);
}
- rInfo.bResizePropAllowed = true;
- rInfo.bRotateFreeAllowed = true;
- rInfo.bRotate90Allowed = true;
- rInfo.bMirrorFreeAllowed=bNoTextFrame;
- rInfo.bMirror45Allowed =bNoTextFrame;
+ rInfo.mbResizePropAllowed = true;
+ rInfo.mbRotateFreeAllowed = true;
+ rInfo.mbRotate90Allowed = true;
+ rInfo.mbMirrorFreeAllowed = bNoTextFrame;
+ rInfo.mbMirror45Allowed = bNoTextFrame;
rInfo.mbMirror90Allowed = bNoTextFrame;
// allow transparence
Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdouno.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdouno.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdouno.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdouno.cxx Wed Jun 27 13:44:09 2012
@@ -329,16 +329,16 @@ bool SdrUnoObj::IsSdrUnoObj() const
void SdrUnoObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bRotateFreeAllowed = false;
- rInfo.bRotate90Allowed = false;
- rInfo.bMirrorFreeAllowed = false;
- rInfo.bMirror45Allowed = false;
+ rInfo.mbRotateFreeAllowed = false;
+ rInfo.mbRotate90Allowed = false;
+ rInfo.mbMirrorFreeAllowed = false;
+ rInfo.mbMirror45Allowed = false;
rInfo.mbMirror90Allowed = false;
rInfo.mbTransparenceAllowed = false;
rInfo.mbGradientAllowed = false;
rInfo.mbShearAllowed = false;
rInfo.mbEdgeRadiusAllowed = false;
- rInfo.bNoOrthoDesired = false;
+ rInfo.mbNoOrthoDesired = false;
rInfo.mbCanConvToPath = false;
rInfo.mbCanConvToPoly = false;
rInfo.mbCanConvToPathLineToArea = false;