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 2013/02/27 19:10:44 UTC
svn commit: r1450891 [1/2] - in /openoffice/branches/sidebar/main:
chart2/source/controller/drawinglayer/ cui/source/tabpages/
filter/source/msfilter/ sc/sdi/ sc/source/filter/excel/ sc/source/ui/app/
sc/source/ui/drawfunc/ sd/sdi/ sd/source/core/ sd/s...
Author: alg
Date: Wed Feb 27 18:10:43 2013
New Revision: 1450891
URL: http://svn.apache.org/r1450891
Log:
i121420: Enhancements on the four svx-based panels, Area, Line, Graphic and Transformation
Added:
openoffice/branches/sidebar/main/svx/inc/svx/AffineMatrixItem.hxx (with props)
Modified:
openoffice/branches/sidebar/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
openoffice/branches/sidebar/main/cui/source/tabpages/tpline.cxx
openoffice/branches/sidebar/main/filter/source/msfilter/msdffimp.cxx
openoffice/branches/sidebar/main/sc/sdi/drawsh.sdi
openoffice/branches/sidebar/main/sc/source/filter/excel/xiescher.cxx
openoffice/branches/sidebar/main/sc/source/ui/app/typemap.cxx
openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drawsh.cxx
openoffice/branches/sidebar/main/sd/sdi/_drvwsh.sdi
openoffice/branches/sidebar/main/sd/source/core/typemap.cxx
openoffice/branches/sidebar/main/sd/source/ui/func/fuarea.cxx
openoffice/branches/sidebar/main/sd/source/ui/func/fuline.cxx
openoffice/branches/sidebar/main/sd/source/ui/table/tableobjectbar.cxx
openoffice/branches/sidebar/main/sd/source/ui/view/drviews2.cxx
openoffice/branches/sidebar/main/sd/source/ui/view/drviewsf.cxx
openoffice/branches/sidebar/main/sd/source/ui/view/drviewsj.cxx
openoffice/branches/sidebar/main/svx/Package_inc.mk
openoffice/branches/sidebar/main/svx/inc/helpid.hrc
openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc
openoffice/branches/sidebar/main/svx/inc/svx/svxids.hrc
openoffice/branches/sidebar/main/svx/inc/svx/xenum.hxx
openoffice/branches/sidebar/main/svx/inc/svx/xlinjoit.hxx
openoffice/branches/sidebar/main/svx/inc/svx/xlncapit.hxx
openoffice/branches/sidebar/main/svx/sdi/svx.sdi
openoffice/branches/sidebar/main/svx/sdi/xoitems.sdi
openoffice/branches/sidebar/main/svx/source/sdr/attribute/sdrformtextattribute.cxx
openoffice/branches/sidebar/main/svx/source/sdr/primitive2d/sdrattributecreator.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.hxx
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.hxx
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.hrc
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.hxx
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/LinePropertyPanel.src
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/TransformationPropertyPanel.cxx
openoffice/branches/sidebar/main/svx/source/sidebar/geometry/TransformationPropertyPanel.hxx
openoffice/branches/sidebar/main/svx/source/svdraw/svdedtv1.cxx
openoffice/branches/sidebar/main/svx/source/svdraw/svdfmtf.cxx
openoffice/branches/sidebar/main/svx/source/xoutdev/xattr2.cxx
openoffice/branches/sidebar/main/svx/source/xoutdev/xpool.cxx
openoffice/branches/sidebar/main/sw/sdi/drawsh.sdi
openoffice/branches/sidebar/main/sw/source/ui/shells/drawdlg.cxx
openoffice/branches/sidebar/main/sw/source/ui/shells/slotadd.cxx
openoffice/branches/sidebar/main/sw/source/ui/wrtsh/wrtsh3.cxx
Modified: openoffice/branches/sidebar/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx (original)
+++ openoffice/branches/sidebar/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx Wed Feb 27 18:10:43 2013
@@ -337,10 +337,11 @@ SdrOutliner* DrawViewWrapper::getOutline
SfxItemSet DrawViewWrapper::getPositionAndSizeItemSetFromMarkedObject() const
{
SfxItemSet aFullSet( GetModel()->GetItemPool(),
- SID_ATTR_TRANSFORM_POS_X,SID_ATTR_TRANSFORM_ANGLE,
- SID_ATTR_TRANSFORM_PROTECT_POS,SID_ATTR_TRANSFORM_AUTOHEIGHT,
- SDRATTR_ECKENRADIUS,SDRATTR_ECKENRADIUS,
- SID_ATTR_METRIC,SID_ATTR_METRIC,
+ SID_ATTR_TRANSFORM_POS_X, SID_ATTR_TRANSFORM_ANGLE,
+ SID_ATTR_TRANSFORM_MIRROR_HORIZONTAL, SID_ATTR_TRANSFORM_MIRROR_VERTICAL,
+ SID_ATTR_TRANSFORM_PROTECT_POS, SID_ATTR_TRANSFORM_AUTOHEIGHT,
+ SDRATTR_ECKENRADIUS, SDRATTR_ECKENRADIUS,
+ SID_ATTR_METRIC, SID_ATTR_METRIC,
0);
SfxItemSet aGeoSet( E3dView::GetGeoAttrFromMarked() );
aFullSet.Put( aGeoSet );
Modified: openoffice/branches/sidebar/main/cui/source/tabpages/tpline.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/cui/source/tabpages/tpline.cxx?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/cui/source/tabpages/tpline.cxx (original)
+++ openoffice/branches/sidebar/main/cui/source/tabpages/tpline.cxx Wed Feb 27 18:10:43 2013
@@ -728,22 +728,22 @@ sal_Bool SvxLineTabPage::FillItemSet( Sf
{
case 0: // Rounded, default
{
- pNew = new XLineJointItem(XLINEJOINT_ROUND);
+ pNew = new XLineJointItem(com::sun::star::drawing::LineJoint_ROUND);
break;
}
case 1: // - none -
{
- pNew = new XLineJointItem(XLINEJOINT_NONE);
+ pNew = new XLineJointItem(com::sun::star::drawing::LineJoint_NONE);
break;
}
case 2: // Miter
{
- pNew = new XLineJointItem(XLINEJOINT_MITER);
+ pNew = new XLineJointItem(com::sun::star::drawing::LineJoint_MITER);
break;
}
case 3: // Bevel
{
- pNew = new XLineJointItem(XLINEJOINT_BEVEL);
+ pNew = new XLineJointItem(com::sun::star::drawing::LineJoint_BEVEL);
break;
}
}
@@ -895,22 +895,22 @@ sal_Bool SvxLineTabPage::FillXLSet_Impl(
{
case 0: // Rounded, default
{
- rXLSet.Put(XLineJointItem(XLINEJOINT_ROUND));
+ rXLSet.Put(XLineJointItem(com::sun::star::drawing::LineJoint_ROUND));
break;
}
case 1: // - none -
{
- rXLSet.Put(XLineJointItem(XLINEJOINT_NONE));
+ rXLSet.Put(XLineJointItem(com::sun::star::drawing::LineJoint_NONE));
break;
}
case 2: // Miter
{
- rXLSet.Put(XLineJointItem(XLINEJOINT_MITER));
+ rXLSet.Put(XLineJointItem(com::sun::star::drawing::LineJoint_MITER));
break;
}
case 3: // Bevel
{
- rXLSet.Put(XLineJointItem(XLINEJOINT_BEVEL));
+ rXLSet.Put(XLineJointItem(com::sun::star::drawing::LineJoint_BEVEL));
break;
}
}
@@ -1344,15 +1344,15 @@ void SvxLineTabPage::Reset( const SfxIte
}
else if(SFX_ITEM_DONTCARE != rAttrs.GetItemState(XATTR_LINEJOINT))
{
- XLineJoint eLineJoint = ((const XLineJointItem&)(rAttrs.Get(XATTR_LINEJOINT))).GetValue();
+ const com::sun::star::drawing::LineJoint eLineJoint = ((const XLineJointItem&)(rAttrs.Get(XATTR_LINEJOINT))).GetValue();
switch(eLineJoint)
{
- case XLINEJOINT_ROUND : maLBEdgeStyle.SelectEntryPos(0); break;
- case XLINEJOINT_NONE : maLBEdgeStyle.SelectEntryPos(1); break;
- case XLINEJOINT_MITER : maLBEdgeStyle.SelectEntryPos(2); break;
- case XLINEJOINT_BEVEL : maLBEdgeStyle.SelectEntryPos(3); break;
- case XLINEJOINT_MIDDLE : break;
+ case com::sun::star::drawing::LineJoint_MIDDLE : // fallback to round, unused value
+ case com::sun::star::drawing::LineJoint_ROUND : maLBEdgeStyle.SelectEntryPos(0); break;
+ case com::sun::star::drawing::LineJoint_NONE : maLBEdgeStyle.SelectEntryPos(1); break;
+ case com::sun::star::drawing::LineJoint_MITER : maLBEdgeStyle.SelectEntryPos(2); break;
+ case com::sun::star::drawing::LineJoint_BEVEL : maLBEdgeStyle.SelectEntryPos(3); break;
}
}
else
Modified: openoffice/branches/sidebar/main/filter/source/msfilter/msdffimp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/filter/source/msfilter/msdffimp.cxx?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/filter/source/msfilter/msdffimp.cxx (original)
+++ openoffice/branches/sidebar/main/filter/source/msfilter/msdffimp.cxx Wed Feb 27 18:10:43 2013
@@ -1023,11 +1023,11 @@ void DffPropertyReader::ApplyLineAttribu
if ( eShapeType == mso_sptMin )
eLineJointDefault = mso_lineJoinRound;
MSO_LineJoin eLineJoint = (MSO_LineJoin)GetPropertyValue( DFF_Prop_lineJoinStyle, eLineJointDefault );
- XLineJoint eXLineJoint( XLINEJOINT_MITER );
+ com::sun::star::drawing::LineJoint eXLineJoint( com::sun::star::drawing::LineJoint_MITER );
if ( eLineJoint == mso_lineJoinBevel )
- eXLineJoint = XLINEJOINT_BEVEL;
+ eXLineJoint = com::sun::star::drawing::LineJoint_BEVEL;
else if ( eLineJoint == mso_lineJoinRound )
- eXLineJoint = XLINEJOINT_ROUND;
+ eXLineJoint = com::sun::star::drawing::LineJoint_ROUND;
rSet.Put( XLineJointItem( eXLineJoint ) );
if ( nLineFlags & 0x10 )
Modified: openoffice/branches/sidebar/main/sc/sdi/drawsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/sdi/drawsh.sdi?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/sdi/drawsh.sdi (original)
+++ openoffice/branches/sidebar/main/sc/sdi/drawsh.sdi Wed Feb 27 18:10:43 2013
@@ -64,7 +64,8 @@ interface TableDraw
SID_BITMAP_LIST [ StateMethod = GetDrawAttrState; Export = FALSE; ]
SID_DASH_LIST [ StateMethod = GetDrawAttrState; Export = FALSE; ]
SID_LINEEND_LIST [ StateMethod = GetDrawAttrState; Export = FALSE; ]
- // Flaechen-Attribute
+
+ // Flaechen-Attribute
SID_ATTR_FILL_STYLE [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
// #i25616#
@@ -79,15 +80,40 @@ interface TableDraw
SID_ATTR_FILL_GRADIENT [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
SID_ATTR_FILL_HATCH [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
SID_ATTR_FILL_BITMAP [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
+ SID_ATTR_FILL_TRANSPARENCE [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
+ SID_ATTR_FILL_FLOATTRANSPARENCE [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
+
// ---- Linien-Attribute:
SID_ATTR_LINE_STYLE [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
SID_ATTR_LINEEND_STYLE [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
+ SID_ATTR_LINE_START [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
+ SID_ATTR_LINE_END [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
SID_ATTR_LINE_DASH [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
SID_ATTR_LINE_WIDTH [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
SID_ATTR_LINE_COLOR [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
+ SID_ATTR_LINE_TRANSPARENCE [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
+ SID_ATTR_LINE_JOINT [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
+ SID_ATTR_LINE_CAP [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawAttrState; Export = FALSE; ]
SID_ATTRIBUTES_AREA [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
SID_ATTRIBUTES_LINE [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
SID_ATTR_TRANSFORM [ ExecMethod = ExecDrawAttr; StateMethod = GetDrawFuncState; Export = FALSE; ]
+
+ // use same as SID_ATTR_LINEEND_STYLE
+ SID_ATTR_TRANSFORM_MIRROR_HORIZONTAL [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_MIRROR_VERTICAL [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_POS_X [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_POS_Y [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_WIDTH [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_HEIGHT [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_ANGLE [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_ROT_X [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_ROT_Y [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_PROTECT_POS [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_PROTECT_SIZE [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_AUTOWIDTH [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_AUTOHEIGHT [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
+ SID_ATTR_TRANSFORM_MATRIX [ ExecMethod = ExecDrawAttr; StateMethod = GetAttrFuncState; Export = FALSE; ]
+
// ---- Ausrichtungs - Funktionen:
//! PseudoSlots gibt Aerger mit Referenz-Dialogen ???
SID_OBJECT_ALIGN
Modified: openoffice/branches/sidebar/main/sc/source/filter/excel/xiescher.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/source/filter/excel/xiescher.cxx?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/filter/excel/xiescher.cxx (original)
+++ openoffice/branches/sidebar/main/sc/source/filter/excel/xiescher.cxx Wed Feb 27 18:10:43 2013
@@ -647,7 +647,7 @@ void XclImpDrawObjBase::ConvertLineStyle
long nLineWidth = 35 * ::std::min( rLineData.mnWidth, EXC_OBJ_LINE_THICK );
rSdrObj.SetMergedItem( XLineWidthItem( nLineWidth ) );
rSdrObj.SetMergedItem( XLineColorItem( EMPTY_STRING, GetPalette().GetColor( rLineData.mnColorIdx ) ) );
- rSdrObj.SetMergedItem( XLineJointItem( XLINEJOINT_MITER ) );
+ rSdrObj.SetMergedItem( XLineJointItem( com::sun::star::drawing::LineJoint_MITER ) );
sal_uLong nDotLen = ::std::max< sal_uLong >( 70 * rLineData.mnWidth, 35 );
sal_uLong nDashLen = 3 * nDotLen;
Modified: openoffice/branches/sidebar/main/sc/source/ui/app/typemap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/source/ui/app/typemap.cxx?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/app/typemap.cxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/app/typemap.cxx Wed Feb 27 18:10:43 2013
@@ -128,5 +128,10 @@
#define SvxChooseControlItem SfxEnumItem
#define avmedia_MediaItem ::avmedia::MediaItem
+#include <svx/xflftrit.hxx>
+#include <svx/xlncapit.hxx>
+#include <svx/xlinjoit.hxx>
+#include <svx/AffineMatrixItem.hxx>
+
#define SFX_TYPEMAP
#include "scslots.hxx"
Modified: openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drawsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drawsh.cxx?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drawsh.cxx (original)
+++ openoffice/branches/sidebar/main/sc/source/ui/drawfunc/drawsh.cxx Wed Feb 27 18:10:43 2013
@@ -139,14 +139,21 @@ void ScDrawShell::ExecDrawAttr( SfxReque
case SID_ATTR_LINE_STYLE:
case SID_ATTR_LINEEND_STYLE:
+ case SID_ATTR_LINE_START:
+ case SID_ATTR_LINE_END:
case SID_ATTR_LINE_DASH:
case SID_ATTR_LINE_WIDTH:
case SID_ATTR_LINE_COLOR:
+ case SID_ATTR_LINE_TRANSPARENCE:
+ case SID_ATTR_LINE_JOINT:
+ case SID_ATTR_LINE_CAP:
case SID_ATTR_FILL_STYLE:
case SID_ATTR_FILL_COLOR:
case SID_ATTR_FILL_GRADIENT:
case SID_ATTR_FILL_HATCH:
case SID_ATTR_FILL_BITMAP:
+ case SID_ATTR_FILL_TRANSPARENCE:
+ case SID_ATTR_FILL_FLOATTRANSPARENCE:
// #i25616#
case SID_ATTR_FILL_SHADOW:
@@ -160,6 +167,9 @@ void ScDrawShell::ExecDrawAttr( SfxReque
case SID_ATTR_LINE_DASH:
case SID_ATTR_LINE_WIDTH:
case SID_ATTR_LINE_COLOR:
+ case SID_ATTR_LINE_TRANSPARENCE:
+ case SID_ATTR_LINE_JOINT:
+ case SID_ATTR_LINE_CAP:
ExecuteLineDlg( rReq );
break;
@@ -168,6 +178,8 @@ void ScDrawShell::ExecDrawAttr( SfxReque
case SID_ATTR_FILL_GRADIENT:
case SID_ATTR_FILL_HATCH:
case SID_ATTR_FILL_BITMAP:
+ case SID_ATTR_FILL_TRANSPARENCE:
+ case SID_ATTR_FILL_FLOATTRANSPARENCE:
// #i25616#
case SID_ATTR_FILL_SHADOW:
Modified: openoffice/branches/sidebar/main/sd/sdi/_drvwsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/sdi/_drvwsh.sdi?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/sdi/_drvwsh.sdi (original)
+++ openoffice/branches/sidebar/main/sd/sdi/_drvwsh.sdi Wed Feb 27 18:10:43 2013
@@ -211,6 +211,23 @@ interface DrawView
ExecMethod = FuTemporary ;
StateMethod = GetMenuState ;
]
+
+ // use same as SID_ATTR_LINEEND_STYLE
+ SID_ATTR_TRANSFORM_MIRROR_HORIZONTAL [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
+ SID_ATTR_TRANSFORM_MIRROR_VERTICAL [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
+ SID_ATTR_TRANSFORM_POS_X [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
+ SID_ATTR_TRANSFORM_POS_Y [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
+ SID_ATTR_TRANSFORM_WIDTH [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
+ SID_ATTR_TRANSFORM_HEIGHT [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
+ SID_ATTR_TRANSFORM_ANGLE [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
+ SID_ATTR_TRANSFORM_ROT_X [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
+ SID_ATTR_TRANSFORM_ROT_Y [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
+ SID_ATTR_TRANSFORM_PROTECT_POS [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
+ SID_ATTR_TRANSFORM_PROTECT_SIZE [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
+ SID_ATTR_TRANSFORM_AUTOWIDTH [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
+ SID_ATTR_TRANSFORM_AUTOHEIGHT [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
+ SID_ATTR_TRANSFORM_MATRIX [ ExecMethod = FuTemporary; StateMethod = GetAttrState; ]
+
/// !?
SID_CHAR_DLG // ole : no, status : ?
[
@@ -1268,11 +1285,36 @@ interface DrawView
ExecMethod = FuTemporary ;
StateMethod = GetAttrState ;
]
+ SID_ATTR_FILL_TRANSPARENCE // ole : no, status : ?
+ [
+ ExecMethod = FuTemporary ;
+ StateMethod = GetAttrState ;
+ ]
+ SID_ATTR_FILL_FLOATTRANSPARENCE // ole : no, status : ?
+ [
+ ExecMethod = FuTemporary ;
+ StateMethod = GetAttrState ;
+ ]
SID_ATTR_LINE_STYLE // ole : no, status : ?
[
ExecMethod = FuTemporary ;
StateMethod = GetAttrState ;
]
+ SID_ATTR_LINE_JOINT // ole : no, status : ?
+ [
+ ExecMethod = FuTemporary ;
+ StateMethod = GetAttrState ;
+ ]
+ SID_ATTR_LINE_CAP // ole : no, status : ?
+ [
+ ExecMethod = FuTemporary ;
+ StateMethod = GetAttrState ;
+ ]
+ SID_ATTR_LINE_TRANSPARENCE // ole : no, status : ?
+ [
+ ExecMethod = FuTemporary ;
+ StateMethod = GetAttrState ;
+ ]
SID_ATTR_LINE_DASH // ole : no, status : ?
[
ExecMethod = FuTemporary ;
@@ -1317,6 +1359,16 @@ interface DrawView
ExecMethod = FuTemporary ;
StateMethod = GetAttrState ;
]
+ SID_ATTR_LINE_START // ole : no, status : play rec
+ [
+ ExecMethod = FuTemporary ;
+ StateMethod = GetAttrState ;
+ ]
+ SID_ATTR_LINE_END // ole : no, status : play rec
+ [
+ ExecMethod = FuTemporary ;
+ StateMethod = GetAttrState ;
+ ]
SID_DELETE_PAGE // ole : no, status : play rec
[
ExecMethod = FuTemporary ;
Modified: openoffice/branches/sidebar/main/sd/source/core/typemap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/core/typemap.cxx?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/core/typemap.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/core/typemap.cxx Wed Feb 27 18:10:43 2013
@@ -126,6 +126,10 @@
#include <svl/rectitem.hxx>
#include <sfx2/frame.hxx>
+#include <svx/xlncapit.hxx>
+#include <svx/xflftrit.hxx>
+#include <svx/xlinjoit.hxx>
+#include <svx/AffineMatrixItem.hxx>
#define SFX_TYPEMAP
#include "sdslots.hxx"
Modified: openoffice/branches/sidebar/main/sd/source/ui/func/fuarea.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/ui/func/fuarea.cxx?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/func/fuarea.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/func/fuarea.cxx Wed Feb 27 18:10:43 2013
@@ -91,6 +91,8 @@ void FuArea::DoExecute( SfxRequest& rReq
SID_ATTR_FILL_GRADIENT,
SID_ATTR_FILL_HATCH,
SID_ATTR_FILL_BITMAP,
+ SID_ATTR_FILL_TRANSPARENCE,
+ SID_ATTR_FILL_FLOATTRANSPARENCE,
0 };
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );
Modified: openoffice/branches/sidebar/main/sd/source/ui/func/fuline.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/ui/func/fuline.cxx?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/func/fuline.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/func/fuline.cxx Wed Feb 27 18:10:43 2013
@@ -99,11 +99,16 @@ void FuLine::DoExecute( SfxRequest& rReq
// Attribute wurden geaendert, Listboxes in Objectbars muessen aktualisiert werden
static sal_uInt16 SidArray[] = {
- SID_ATTR_LINE_STYLE,
- SID_ATTR_LINE_DASH,
- SID_ATTR_LINE_WIDTH,
- SID_ATTR_LINE_COLOR,
- 0 };
+ SID_ATTR_LINE_STYLE, // ( SID_SVX_START + 169 )
+ SID_ATTR_LINE_DASH, // ( SID_SVX_START + 170 )
+ SID_ATTR_LINE_WIDTH, // ( SID_SVX_START + 171 )
+ SID_ATTR_LINE_COLOR, // ( SID_SVX_START + 172 )
+ SID_ATTR_LINE_START, // ( SID_SVX_START + 173 )
+ SID_ATTR_LINE_END, // ( SID_SVX_START + 174 )
+ SID_ATTR_LINE_TRANSPARENCE, // (SID_SVX_START+1107)
+ SID_ATTR_LINE_JOINT, // (SID_SVX_START+1110)
+ SID_ATTR_LINE_CAP, // (SID_SVX_START+1111)
+ 0 };
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray );
Modified: openoffice/branches/sidebar/main/sd/source/ui/table/tableobjectbar.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/ui/table/tableobjectbar.cxx?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/table/tableobjectbar.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/table/tableobjectbar.cxx Wed Feb 27 18:10:43 2013
@@ -203,6 +203,8 @@ void TableObjectBar::Execute( SfxRequest
pBindings->Invalidate( SID_FRAME_LINECOLOR );
pBindings->Invalidate( SID_ATTR_BORDER );
pBindings->Invalidate( SID_ATTR_FILL_STYLE );
+ pBindings->Invalidate( SID_ATTR_FILL_TRANSPARENCE );
+ pBindings->Invalidate( SID_ATTR_FILL_FLOATTRANSPARENCE );
pBindings->Invalidate( SID_TABLE_MERGE_CELLS );
pBindings->Invalidate( SID_TABLE_SPLIT_CELLS );
pBindings->Invalidate( SID_OPTIMIZE_TABLE );
Modified: openoffice/branches/sidebar/main/sd/source/ui/view/drviews2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/ui/view/drviews2.cxx?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/view/drviews2.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/view/drviews2.cxx Wed Feb 27 18:10:43 2013
@@ -135,12 +135,19 @@ void DrawViewShell::FuTemporary(SfxReque
case SID_ATTR_FILL_HATCH:
case SID_ATTR_FILL_BITMAP:
case SID_ATTR_FILL_SHADOW:
+ case SID_ATTR_FILL_TRANSPARENCE:
+ case SID_ATTR_FILL_FLOATTRANSPARENCE:
case SID_ATTR_LINE_STYLE:
case SID_ATTR_LINE_DASH:
case SID_ATTR_LINE_WIDTH:
case SID_ATTR_LINE_COLOR:
case SID_ATTR_LINEEND_STYLE:
+ case SID_ATTR_LINE_START:
+ case SID_ATTR_LINE_END:
+ case SID_ATTR_LINE_TRANSPARENCE:
+ case SID_ATTR_LINE_JOINT:
+ case SID_ATTR_LINE_CAP:
case SID_ATTR_TEXT_FITTOSIZE:
{
@@ -287,12 +294,17 @@ void DrawViewShell::FuTemporary(SfxReque
case SID_ATTR_FILL_GRADIENT:
case SID_ATTR_FILL_HATCH:
case SID_ATTR_FILL_BITMAP:
+ case SID_ATTR_FILL_TRANSPARENCE:
+ case SID_ATTR_FILL_FLOATTRANSPARENCE:
GetViewFrame()->GetDispatcher()->Execute( SID_ATTRIBUTES_AREA, SFX_CALLMODE_ASYNCHRON );
break;
case SID_ATTR_LINE_STYLE:
case SID_ATTR_LINE_DASH:
case SID_ATTR_LINE_WIDTH:
case SID_ATTR_LINE_COLOR:
+ case SID_ATTR_LINE_TRANSPARENCE:
+ case SID_ATTR_LINE_JOINT:
+ case SID_ATTR_LINE_CAP:
GetViewFrame()->GetDispatcher()->Execute( SID_ATTRIBUTES_LINE, SFX_CALLMODE_ASYNCHRON );
break;
case SID_ATTR_TEXT_FITTOSIZE:
Modified: openoffice/branches/sidebar/main/sd/source/ui/view/drviewsf.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/ui/view/drviewsf.cxx?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/view/drviewsf.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/view/drviewsf.cxx Wed Feb 27 18:10:43 2013
@@ -308,10 +308,15 @@ void DrawViewShell::GetAttrState( SfxIte
case SID_ATTR_FILL_HATCH:
case SID_ATTR_FILL_BITMAP:
case SID_ATTR_FILL_SHADOW:
+ case SID_ATTR_FILL_TRANSPARENCE:
+ case SID_ATTR_FILL_FLOATTRANSPARENCE:
case SID_ATTR_LINE_STYLE:
case SID_ATTR_LINE_DASH:
case SID_ATTR_LINE_WIDTH:
case SID_ATTR_LINE_COLOR:
+ case SID_ATTR_LINE_TRANSPARENCE:
+ case SID_ATTR_LINE_JOINT:
+ case SID_ATTR_LINE_CAP:
case SID_ATTR_TEXT_FITTOSIZE:
{
bAttr = sal_True;
Modified: openoffice/branches/sidebar/main/sd/source/ui/view/drviewsj.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sd/source/ui/view/drviewsj.cxx?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sd/source/ui/view/drviewsj.cxx (original)
+++ openoffice/branches/sidebar/main/sd/source/ui/view/drviewsj.cxx Wed Feb 27 18:10:43 2013
@@ -91,6 +91,8 @@ void DrawViewShell::GetMenuStateSel( Sfx
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_OBJECT_TITLE_DESCRIPTION ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ATTR_FILL_STYLE ) ||
+ SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ATTR_FILL_TRANSPARENCE ) ||
+ SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ATTR_FILL_FLOATTRANSPARENCE ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CHANGEBEZIER ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_CHANGEPOLYGON ) ||
SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_LINEEND_POLYGON ) ||
@@ -189,6 +191,8 @@ void DrawViewShell::GetMenuStateSel( Sfx
{
//rSet.DisableItem( SID_ATTRIBUTES_AREA ); // wieder raus!
rSet.DisableItem( SID_ATTR_FILL_STYLE );
+ rSet.DisableItem( SID_ATTR_FILL_TRANSPARENCE );
+ rSet.DisableItem( SID_ATTR_FILL_FLOATTRANSPARENCE );
}
if( (!pObj->ISA( SdrPathObj ) && !aInfoRec.bCanConvToPath) || pObj->ISA( SdrObjGroup ) ) // Solange es JOE fehlerhaft behandelt!
{ // JOE: Ein Gruppenobjekt kann eben u.U. in ein PathObj gewandelt werden
@@ -411,6 +415,8 @@ void DrawViewShell::GetMenuStateSel( Sfx
{
//rSet.DisableItem( SID_ATTRIBUTES_AREA );
rSet.DisableItem( SID_ATTR_FILL_STYLE );
+ rSet.DisableItem( SID_ATTR_FILL_TRANSPARENCE );
+ rSet.DisableItem( SID_ATTR_FILL_FLOATTRANSPARENCE );
}
if( !bEdgeObj )
rSet.DisableItem( SID_CONNECTION_DLG );
Modified: openoffice/branches/sidebar/main/svx/Package_inc.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/Package_inc.mk?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/Package_inc.mk (original)
+++ openoffice/branches/sidebar/main/svx/Package_inc.mk Wed Feb 27 18:10:43 2013
@@ -173,6 +173,7 @@ $(eval $(call gb_Package_add_file,svx_in
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdedtv.hxx,svx/svdedtv.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlinjoit.hxx,svx/xlinjoit.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlncapit.hxx,svx/xlncapit.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AffineMatrixItem.hxx,svx/AffineMatrixItem.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmbritm.hxx,svx/sxmbritm.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleGraphicShape.hxx,svx/AccessibleGraphicShape.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnstit.hxx,svx/xlnstit.hxx))
Modified: openoffice/branches/sidebar/main/svx/inc/helpid.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/inc/helpid.hrc?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/helpid.hrc (original)
+++ openoffice/branches/sidebar/main/svx/inc/helpid.hrc Wed Feb 27 18:10:43 2013
@@ -340,6 +340,8 @@
#define HID_PPROPERTYPANEL_LINE_VS_STYLE "SVX_HID_PPROPERTYPANEL_LINE_VS_STYLE"
#define HID_PPROPERTYPANEL_LINE_BTN_STYLE "SVX_HID_PPROPERTYPANEL_LINE_BTN_STYLE"
#define HID_PPROPERTYPANEL_TEXT_SPACING_VS "SVX_HID_PPROPERTYPANEL_TEXT_SPACING_VS"
+#define HID_PPROPERTYPANEL_LINE_LB_EDGESTYLE "SVX_HID_PPROPERTYPANEL_LINE_LB_EDGESTYLE"
+#define HID_PPROPERTYPANEL_LINE_LB_CAPSTYLE "SVX_HID_PPROPERTYPANEL_LINE_LB_CAPSTYLE"
//add for position and size
#define HID_PROPERTY_PANEL_POSIZE_MTR_FLD_WIDTH "SVX_HID_PROPERTY_PANEL_POSIZE_MTR_FLD_WIDTH"
#define HID_PROPERTY_PANEL_POSIZE_MTR_FLD_HEIGHT "SVX_HID_PROPERTY_PANEL_POSIZE_MTR_FLD_HEIGHT"
Added: openoffice/branches/sidebar/main/svx/inc/svx/AffineMatrixItem.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/inc/svx/AffineMatrixItem.hxx?rev=1450891&view=auto
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/svx/AffineMatrixItem.hxx (added)
+++ openoffice/branches/sidebar/main/svx/inc/svx/AffineMatrixItem.hxx Wed Feb 27 18:10:43 2013
@@ -0,0 +1,58 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+#ifndef _SVX_AFFINEMATRIXITEM_HXX
+#define _SVX_AFFINEMATRIXITEM_HXX
+
+#include <svx/svxdllapi.h>
+#include <svl/poolitem.hxx>
+#include <com/sun/star/geometry/AffineMatrix2D.hpp>
+
+//---------------------
+// class AffineMatrixItem
+//---------------------
+
+class SVX_DLLPUBLIC AffineMatrixItem : public SfxPoolItem
+{
+private:
+ com::sun::star::geometry::AffineMatrix2D maMatrix;
+
+public:
+ TYPEINFO();
+ AffineMatrixItem(const com::sun::star::geometry::AffineMatrix2D* pMatrix = 0);
+ AffineMatrixItem(SvStream& rIn);
+ AffineMatrixItem(const AffineMatrixItem&);
+ virtual ~AffineMatrixItem();
+
+ virtual int operator==(const SfxPoolItem&) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
+ virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
+ virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const;
+
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+
+ const com::sun::star::geometry::AffineMatrix2D& GetAffineMatrix2D() const;
+};
+
+#endif // _SVX_AFFINEMATRIXITEM_HXX
+
+// eof
Propchange: openoffice/branches/sidebar/main/svx/inc/svx/AffineMatrixItem.hxx
------------------------------------------------------------------------------
svn:executable = *
Modified: openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc (original)
+++ openoffice/branches/sidebar/main/svx/inc/svx/dialogs.hrc Wed Feb 27 18:10:43 2013
@@ -654,7 +654,7 @@
#define RID_SVXSTR_LINECAP_ROUND (RID_SVX_START + 587 )
#define RID_SVXSTR_LINECAP_SQUARE (RID_SVX_START + 588 )
-// string resources for XLineJoint item
+// string resources for com::sun::star::drawing::LineJoint item
#define RID_SVXSTR_LINEJOINT_NONE RID_SVXSTR_NONE
#define RID_SVXSTR_LINEJOINT_MIDDLE (RID_SVX_START + 589 )
#define RID_SVXSTR_LINEJOINT_BEVEL (RID_SVX_START + 590 )
Modified: openoffice/branches/sidebar/main/svx/inc/svx/svxids.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/inc/svx/svxids.hrc?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/svx/svxids.hrc (original)
+++ openoffice/branches/sidebar/main/svx/inc/svx/svxids.hrc Wed Feb 27 18:10:43 2013
@@ -1260,17 +1260,27 @@
#define SID_TRANSLITERATE_TITLE_CASE (SID_SVX_START+1103)
#define SID_TRANSLITERATE_TOGGLE_CASE (SID_SVX_START+1104)
-#define SID_SVX_AREA_TRANS_TYPE (SID_SVX_START+1105)
-#define SID_SVX_AREA_TRANSPARENCY (SID_SVX_START+1106)
-#define SID_SVX_AREA_TRANSP_GRADIENT (SID_SVX_START+1107)
-
-#define SID_ATTR_LINE_TRANSPARENCE (SID_SVX_START+1108)
-
-#define SID_FLIP_HORIZONTAL (SID_SVX_START+1109)
-#define SID_FLIP_VERTICAL (SID_SVX_START+1110)
+// new slots for panels
+#define SID_ATTR_FILL_TRANSPARENCE (SID_SVX_START+1105)
+#define SID_ATTR_FILL_FLOATTRANSPARENCE (SID_SVX_START+1106)
+#define SID_ATTR_LINE_TRANSPARENCE (SID_SVX_START+1107)
+#define SID_ATTR_TRANSFORM_MIRROR_HORIZONTAL (SID_SVX_START+1108)
+#define SID_ATTR_TRANSFORM_MIRROR_VERTICAL (SID_SVX_START+1109)
+#define SID_ATTR_LINE_JOINT (SID_SVX_START+1110)
+#define SID_ATTR_LINE_CAP (SID_SVX_START+1111)
+#define SID_ATTR_TRANSFORM_MATRIX (SID_SVX_START+1112)
+
+//#define SID_SVX_AREA_TRANS_TYPE (SID_SVX_START+1105)
+//#define SID_SVX_AREA_TRANSPARENCY (SID_SVX_START+1106)
+//#define SID_SVX_AREA_TRANSP_GRADIENT (SID_SVX_START+1107)
+//
+//#define SID_ATTR_LINE_TRANSPARENCE (SID_SVX_START+1108)
+//
+//#define SID_FLIP_HORIZONTAL (SID_SVX_START+1109)
+//#define SID_FLIP_VERTICAL (SID_SVX_START+1110)
// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
-#define SID_SVX_FIRSTFREE (SID_FLIP_VERTICAL + 1)
+#define SID_SVX_FIRSTFREE (SID_ATTR_TRANSFORM_MATRIX + 1)
// --------------------------------------------------------------------------
// Overflow check for slot IDs
Modified: openoffice/branches/sidebar/main/svx/inc/svx/xenum.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/inc/svx/xenum.hxx?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/svx/xenum.hxx (original)
+++ openoffice/branches/sidebar/main/svx/inc/svx/xenum.hxx Wed Feb 27 18:10:43 2013
@@ -25,14 +25,6 @@
#define _XENUM_HXX
enum XLineStyle { XLINE_NONE, XLINE_SOLID, XLINE_DASH };
-enum XLineJoint
-{
- XLINEJOINT_NONE, // no rounding
- XLINEJOINT_MIDDLE, // calc middle value between joints
- XLINEJOINT_BEVEL, // join edges with line
- XLINEJOINT_MITER, // extend till cut
- XLINEJOINT_ROUND // create arc
-};
enum XDashStyle { XDASH_RECT, XDASH_ROUND, XDASH_RECTRELATIVE,
XDASH_ROUNDRELATIVE };
enum XFillStyle { XFILL_NONE, XFILL_SOLID, XFILL_GRADIENT, XFILL_HATCH,
Modified: openoffice/branches/sidebar/main/svx/inc/svx/xlinjoit.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/inc/svx/xlinjoit.hxx?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/svx/xlinjoit.hxx (original)
+++ openoffice/branches/sidebar/main/svx/inc/svx/xlinjoit.hxx Wed Feb 27 18:10:43 2013
@@ -27,16 +27,17 @@
#include <svl/eitem.hxx>
#include <svx/xenum.hxx>
#include "svx/svxdllapi.h"
+#include <com/sun/star/drawing/LineJoint.hpp>
//---------------------
-// class LineStyleItem
+// class XLineJointItem
//---------------------
class SVX_DLLPUBLIC XLineJointItem : public SfxEnumItem
{
public:
TYPEINFO();
- XLineJointItem( XLineJoint eLineJoint = XLINEJOINT_ROUND );
+ XLineJointItem( com::sun::star::drawing::LineJoint eLineJoint = com::sun::star::drawing::LineJoint_ROUND );
XLineJointItem( SvStream& rIn );
virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
@@ -49,8 +50,8 @@ public:
SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric,
String &rText, const IntlWrapper * = 0 ) const;
- virtual sal_uInt16 GetValueCount() const;
- XLineJoint GetValue() const { return (XLineJoint) SfxEnumItem::GetValue(); }
+ virtual sal_uInt16 GetValueCount() const;
+ com::sun::star::drawing::LineJoint GetValue() const { return (com::sun::star::drawing::LineJoint) SfxEnumItem::GetValue(); }
};
#endif // _SVX_XLINJOIT_HXX
Modified: openoffice/branches/sidebar/main/svx/inc/svx/xlncapit.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/inc/svx/xlncapit.hxx?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/inc/svx/xlncapit.hxx (original)
+++ openoffice/branches/sidebar/main/svx/inc/svx/xlncapit.hxx Wed Feb 27 18:10:43 2013
@@ -28,7 +28,7 @@
#include <com/sun/star/drawing/LineCap.hpp>
//---------------------
-// class LineStyleItem
+// class XLineCapItem
//---------------------
class SVX_DLLPUBLIC XLineCapItem : public SfxEnumItem
Modified: openoffice/branches/sidebar/main/svx/sdi/svx.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/sdi/svx.sdi?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/sdi/svx.sdi (original)
+++ openoffice/branches/sidebar/main/svx/sdi/svx.sdi Wed Feb 27 18:10:43 2013
@@ -15132,3 +15132,562 @@ SfxVoidItem PrepareMailExport SID_MAIL_P
GroupId = GID_EXPLORER;
]
+//--------------------------------------------------------------------------
+
+SfxUInt16Item FillTransparence SID_ATTR_FILL_TRANSPARENCE
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_FORMAT;
+]
+
+//--------------------------------------------------------------------------
+
+XFillFloatTransparenceItem FillFloatTransparence SID_ATTR_FILL_FLOATTRANSPARENCE
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_FORMAT;
+]
+
+//--------------------------------------------------------------------------
+
+SfxUInt16Item LineTransparence SID_ATTR_LINE_TRANSPARENCE
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_FORMAT;
+]
+
+//--------------------------------------------------------------------------
+
+SfxBoolItem MirrorObjectHorizontal SID_ATTR_TRANSFORM_MIRROR_HORIZONTAL
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_EDIT;
+]
+
+//--------------------------------------------------------------------------
+
+SfxBoolItem MirrorObjectVertical SID_ATTR_TRANSFORM_MIRROR_VERTICAL
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_EDIT;
+]
+
+//--------------------------------------------------------------------------
+
+XLineJointItem LineJoint SID_ATTR_LINE_JOINT
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_FORMAT;
+]
+
+//--------------------------------------------------------------------------
+
+XLineCapItem LineCap SID_ATTR_LINE_CAP
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_FORMAT;
+]
+
+//--------------------------------------------------------------------------
+
+XLineStartItem LineStart SID_ATTR_LINE_START
+[
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_FORMAT;
+]
+
+//--------------------------------------------------------------------------
+
+XLineEndItem LineEnd SID_ATTR_LINE_END
+[
+ /* flags: */
+ AutoUpdate = FALSE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_FORMAT;
+]
+
+//--------------------------------------------------------------------------
+
+SfxUInt32Item SvxTransFormPosX SID_ATTR_TRANSFORM_POS_X
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_SPECIAL;
+]
+
+//--------------------------------------------------------------------------
+
+SfxUInt32Item SvxTransFormPosY SID_ATTR_TRANSFORM_POS_Y
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_SPECIAL;
+]
+
+//--------------------------------------------------------------------------
+
+SfxUInt32Item SvxTransFormWidth SID_ATTR_TRANSFORM_WIDTH
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_SPECIAL;
+]
+
+//--------------------------------------------------------------------------
+
+SfxUInt32Item SvxTransFormHeight SID_ATTR_TRANSFORM_HEIGHT
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_SPECIAL;
+]
+
+//--------------------------------------------------------------------------
+
+SfxUInt32Item TransAngle SID_ATTR_TRANSFORM_ANGLE
+[
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_FORMAT;
+]
+
+//--------------------------------------------------------------------------
+
+SfxUInt32Item TransRotX SID_ATTR_TRANSFORM_ROT_X
+[
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_FORMAT;
+]
+
+//--------------------------------------------------------------------------
+
+SfxUInt32Item TransRotY SID_ATTR_TRANSFORM_ROT_Y
+[
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_FORMAT;
+]
+
+//--------------------------------------------------------------------------
+
+SfxBoolItem ProtectPos SID_ATTR_TRANSFORM_PROTECT_POS
+[
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_FORMAT;
+]
+
+//--------------------------------------------------------------------------
+
+SfxBoolItem ProtectSize SID_ATTR_TRANSFORM_PROTECT_SIZE
+[
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = TRUE,
+ GroupId = GID_FORMAT;
+]
+
+//--------------------------------------------------------------------------
+
+SfxBoolItem SvxAutoWidth SID_ATTR_TRANSFORM_AUTOWIDTH
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_SPECIAL;
+]
+
+//--------------------------------------------------------------------------
+
+SfxBoolItem SvxAutoHeight SID_ATTR_TRANSFORM_AUTOHEIGHT
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_SPECIAL;
+]
+
+//--------------------------------------------------------------------------
+
+AffineMatrixItem SvxTransFormMatrix SID_ATTR_TRANSFORM_MATRIX
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_SPECIAL;
+]
+
+//--------------------------------------------------------------------------
+// eof
Modified: openoffice/branches/sidebar/main/svx/sdi/xoitems.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/sdi/xoitems.sdi?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/sdi/xoitems.sdi (original)
+++ openoffice/branches/sidebar/main/svx/sdi/xoitems.sdi Wed Feb 27 18:10:43 2013
@@ -142,6 +142,28 @@ enum SvxLineStyle
item SvxLineStyle XLineStyleItem;
+enum SvxLineJoint
+{
+ // com::sun::star::drawing::LineJoint
+ SVX_LINEJOINT_NONE, // no rounding
+ SVX_LINEJOINT_MIDDLE, // calc middle value between joints
+ SVX_LINEJOINT_BEVEL, // join edges with line
+ SVX_LINEJOINT_MITER, // extend till cut
+ SVX_LINEJOINT_ROUND // create arc
+};
+
+item SvxLineJoint XLineJointItem;
+
+enum SvxLineCap
+{
+ // com::sun::star::drawing::LineCap
+ SVX_LINECAP_BUTT,
+ SVX_LINECAP_ROUND,
+ SVX_LINECAP_SQUARE
+};
+
+item SvxLineCap XLineCapItem;
+
item INT32 XLineWidthItem;
item INT32 XFormTextStyleItem;
item INT32 XFormTextAdjustItem;
@@ -157,3 +179,21 @@ item INT32 XFormTextShadowItem; // SfxE
item INT32 XFormTextShadowColorItem; // XColorItem
item INT32 XFormTextShadowXValItem; // SfxMetricItem/SfxInt32Item
item INT32 XFormTextShadowYValItem; // SfxMetricItem/SfxInt32Item
+
+item XFillGradient XFillFloatTransparenceItem; // XFillGradient
+
+struct AffineMatrix2D
+{
+// com::sun::star::geometry::AffineMatrix2D
+// found no way to define doubles in *.sdi, so commenting out for now
+
+ float m00 MID_AFFINEMATRIX2D_M00;
+ float m01 MID_AFFINEMATRIX2D_M01;
+ float m02 MID_AFFINEMATRIX2D_M02;
+ float m10 MID_AFFINEMATRIX2D_M10;
+ float m11 MID_AFFINEMATRIX2D_M11;
+ float m12 MID_AFFINEMATRIX2D_M12;
+};
+item AffineMatrix2D AffineMatrixItem;
+
+// eof
Modified: openoffice/branches/sidebar/main/svx/source/sdr/attribute/sdrformtextattribute.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sdr/attribute/sdrformtextattribute.cxx?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sdr/attribute/sdrformtextattribute.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sdr/attribute/sdrformtextattribute.cxx Wed Feb 27 18:10:43 2013
@@ -56,27 +56,27 @@
namespace
{
- basegfx::B2DLineJoin impGetB2DLineJoin(XLineJoint eLineJoint)
+ basegfx::B2DLineJoin impGetB2DLineJoin(com::sun::star::drawing::LineJoint eLineJoint)
{
switch(eLineJoint)
{
- case XLINEJOINT_MIDDLE :
+ case com::sun::star::drawing::LineJoint_MIDDLE :
{
return basegfx::B2DLINEJOIN_MIDDLE;
}
- case XLINEJOINT_BEVEL :
+ case com::sun::star::drawing::LineJoint_BEVEL :
{
return basegfx::B2DLINEJOIN_BEVEL;
}
- case XLINEJOINT_MITER :
+ case com::sun::star::drawing::LineJoint_MITER :
{
return basegfx::B2DLINEJOIN_MITER;
}
- case XLINEJOINT_ROUND :
+ case com::sun::star::drawing::LineJoint_ROUND :
{
return basegfx::B2DLINEJOIN_ROUND;
}
- default :
+ default : // com::sun::star::drawing::LineJoint_NONE
{
return basegfx::B2DLINEJOIN_NONE; // XLINEJOINT_NONE
}
@@ -115,7 +115,7 @@ namespace
}
const sal_uInt32 nLineWidth = ((const XLineWidthItem&)(rSet.Get(XATTR_LINEWIDTH))).GetValue();
- const XLineJoint eLineJoint = ((const XLineJointItem&)(rSet.Get(XATTR_LINEJOINT))).GetValue();
+ const com::sun::star::drawing::LineJoint eLineJoint = ((const XLineJointItem&)(rSet.Get(XATTR_LINEJOINT))).GetValue();
const com::sun::star::drawing::LineCap eLineCap = ((const XLineCapItem&)(rSet.Get(XATTR_LINECAP))).GetValue();
return drawinglayer::attribute::LineAttribute(
Modified: openoffice/branches/sidebar/main/svx/source/sdr/primitive2d/sdrattributecreator.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sdr/primitive2d/sdrattributecreator.cxx?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sdr/primitive2d/sdrattributecreator.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sdr/primitive2d/sdrattributecreator.cxx Wed Feb 27 18:10:43 2013
@@ -137,29 +137,29 @@ namespace drawinglayer
}
}
- basegfx::B2DLineJoin XLineJointtoB2DLineJoin(XLineJoint eLineJoint)
+ basegfx::B2DLineJoin LineJointToB2DLineJoin(com::sun::star::drawing::LineJoint eLineJoint)
{
switch(eLineJoint)
{
- case XLINEJOINT_MIDDLE :
+ case com::sun::star::drawing::LineJoint_MIDDLE :
{
return basegfx::B2DLINEJOIN_MIDDLE;
}
- case XLINEJOINT_BEVEL :
+ case com::sun::star::drawing::LineJoint_BEVEL :
{
return basegfx::B2DLINEJOIN_BEVEL;
}
- case XLINEJOINT_MITER :
+ case com::sun::star::drawing::LineJoint_MITER :
{
return basegfx::B2DLINEJOIN_MITER;
}
- case XLINEJOINT_ROUND :
+ case com::sun::star::drawing::LineJoint_ROUND :
{
return basegfx::B2DLINEJOIN_ROUND;
}
- default :
+ default : // com::sun::star::drawing::LineJoint_NONE
{
- return basegfx::B2DLINEJOIN_NONE; // XLINEJOINT_NONE
+ return basegfx::B2DLINEJOIN_NONE;
}
}
}
@@ -238,7 +238,7 @@ namespace drawinglayer
{
const sal_uInt32 nWidth(((const XLineWidthItem&)(rSet.Get(XATTR_LINEWIDTH))).GetValue());
const Color aColor(((const XLineColorItem&)(rSet.Get(XATTR_LINECOLOR))).GetColorValue());
- const XLineJoint eJoint(((const XLineJointItem&)(rSet.Get(XATTR_LINEJOINT))).GetValue());
+ const com::sun::star::drawing::LineJoint eJoint(((const XLineJointItem&)(rSet.Get(XATTR_LINEJOINT))).GetValue());
const com::sun::star::drawing::LineCap eCap(((const XLineCapItem&)(rSet.Get(XATTR_LINECAP))).GetValue());
::std::vector< double > aDotDashArray;
double fFullDotDashLen(0.0);
@@ -254,7 +254,7 @@ namespace drawinglayer
}
return attribute::SdrLineAttribute(
- XLineJointtoB2DLineJoin(eJoint),
+ LineJointToB2DLineJoin(eJoint),
(double)nWidth,
(double)nTransparence * 0.01,
aColor.getBColor(),
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.cxx?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.cxx Wed Feb 27 18:10:43 2013
@@ -572,7 +572,7 @@ void SvxAreaTrGrPage::ExecuteValueModify
bool bEnable = true;
XFillFloatTransparenceItem aGradientItem(pPool,aTmpGradient, bEnable );
- mpBindings->GetDispatcher()->Execute( SID_SVX_AREA_TRANSP_GRADIENT, SFX_CALLMODE_RECORD, &aGradientItem, 0L );
+ mpBindings->GetDispatcher()->Execute( SID_ATTR_FILL_FLOATTRANSPARENCE, SFX_CALLMODE_RECORD, &aGradientItem, 0L );
}
IMPL_LINK(SvxAreaTrGrPage, ModifiedTrgrHdl_Impl, void *, pControl)
@@ -660,9 +660,8 @@ AreaPropertyPanel::AreaPropertyPanel(
maGradientListControl(SID_GRADIENT_LIST, *pBindings, *this),
maHatchListControl(SID_HATCH_LIST, *pBindings, *this),
maBitmapListControl(SID_BITMAP_LIST, *pBindings, *this),
- maTransTypeController(SID_SVX_AREA_TRANS_TYPE, *pBindings, *this),
- maTransController(SID_SVX_AREA_TRANSPARENCY, *pBindings, *this),
- maTransGradientController(SID_SVX_AREA_TRANSP_GRADIENT, *pBindings, *this),
+ maFillTransparenceController(SID_ATTR_FILL_TRANSPARENCE, *pBindings, *this),
+ maFillFloatTransparenceController(SID_ATTR_FILL_FLOATTRANSPARENCE, *pBindings, *this),
maImgAxial(SVX_RES(IMG_AXIAL)),
maImgElli(SVX_RES(IMG_ELLI)),
maImgQuad(SVX_RES(IMG_QUAD)),
@@ -683,8 +682,8 @@ AreaPropertyPanel::AreaPropertyPanel(
mpTrGrPage(),
mpFloatWinColor(),
mpPageColor(),
- mpGradientItem(),
- mpTransTypeItem(),
+ mpFloatTransparenceItem(),
+ mpTransparanceItem(),
mxFrame(rxFrame),
maContext(),
mpBindings(pBindings),
@@ -1222,122 +1221,184 @@ void AreaPropertyPanel::HandleContextCha
//////////////////////////////////////////////////////////////////////////////
+void AreaPropertyPanel::ImpUpdateTransparencies()
+{
+ if(mpTransparanceItem.get() || mpFloatTransparenceItem.get())
+ {
+ bool bZeroValue(false);
+
+ if(mpTransparanceItem.get())
+ {
+ const sal_uInt16 nValue(mpTransparanceItem->GetValue());
+
+ if(!nValue)
+ {
+ bZeroValue = true;
+ }
+ else if(nValue <= 100)
+ {
+ mpLBTransType->Enable();
+ mpLBTransType->SelectEntryPos(1);
+ mpBTNGradient->Hide();
+ mpMTRTransparent->Show();
+ mpMTRTransparent->Enable();
+ mpMTRTransparent->SetValue(nValue);
+ }
+
+ if(mpTrGrFloatWin)
+ {
+ mpTrGrFloatWin->EndPopupMode();
+ }
+ }
+
+ if(bZeroValue && mpFloatTransparenceItem.get())
+ {
+ if(mpFloatTransparenceItem->IsEnabled())
+ {
+ const XGradient& rGradient = mpFloatTransparenceItem->GetGradientValue();
+ const bool bHighContrast(GetSettings().GetStyleSettings().GetHighContrastMode());
+ sal_uInt16 nEntryPos(0);
+ Image* pImage = 0;
+
+ mpLBTransType->Enable();
+ mpMTRTransparent->Hide();
+ mpBTNGradient->Enable();
+ mpBTNGradient->Show();
+
+ switch(rGradient.GetGradientStyle())
+ {
+ case XGRAD_LINEAR:
+ {
+ nEntryPos = 2;
+ pImage = bHighContrast ? &maImgLinearH : &maImgLinear;
+ break;
+ }
+ case XGRAD_AXIAL:
+ {
+ nEntryPos = 3;
+ pImage = bHighContrast ? &maImgAxialH : &maImgAxial;
+ break;
+ }
+ case XGRAD_RADIAL:
+ {
+ nEntryPos = 4;
+ pImage = bHighContrast ? &maImgRadialH : &maImgRadial;
+ break;
+ }
+ case XGRAD_ELLIPTICAL:
+ {
+ nEntryPos = 5;
+ pImage = bHighContrast ? &maImgElliH : &maImgElli;
+ break;
+ }
+ case XGRAD_SQUARE:
+ {
+ nEntryPos = 6;
+ pImage = bHighContrast ? &maImgQuadH : &maImgQuad;
+ break;
+ }
+ case XGRAD_RECT:
+ {
+ nEntryPos = 7;
+ pImage = bHighContrast ? &maImgSquareH : &maImgSquare;
+ break;
+ }
+ }
+
+ mpLBTransType->SelectEntryPos(nEntryPos);
+ mpBTNGradient->SetItemImage(TBI_BTX_GRADIENT, *pImage);
+ bZeroValue = false;
+ }
+ else
+ {
+ bZeroValue = true;
+ }
+ }
+
+ if(bZeroValue)
+ {
+ mpLBTransType->Enable();
+ mpLBTransType->SelectEntryPos(0);
+ mpBTNGradient->Hide();
+ mpMTRTransparent->Enable();
+ mpMTRTransparent->Show();
+ mpMTRTransparent->SetValue(0);
+ }
+ }
+ else
+ {
+ // no transparency at all
+ mpLBTransType->SetNoSelection();
+ mpMTRTransparent->Disable();
+ mpMTRTransparent->Show();
+ mpBTNGradient->Disable();
+ mpBTNGradient->Hide();
+ }
+
+
+}
+
void AreaPropertyPanel::NotifyItemUpdate(
sal_uInt16 nSID,
SfxItemState eState,
const SfxPoolItem* pState)
{
XFillStyle eXFS;
- SfxObjectShell* pSh = SfxObjectShell::Current();
- //add ,,, 20090915
- if (nSID == SID_SVX_AREA_TRANS_TYPE)
- {
- if( eState >= SFX_ITEM_AVAILABLE)
- {
- mpTransTypeItem.reset(pState ? (SfxUInt16Item*)pState->Clone() : 0);
- sal_uInt16 m_nValue = mpTransTypeItem->GetValue();
- if(m_nValue>0 && m_nValue <= 100)
- {
- mpLBTransType->Enable();
- mpLBTransType->SelectEntryPos(1);
- mpBTNGradient->Hide();
- mpMTRTransparent->Show();
- mpMTRTransparent->Enable();
- mpMTRTransparent->SetValue(m_nValue);
- //Add
- if(mpTrGrFloatWin)
- mpTrGrFloatWin->EndPopupMode();
- }
- else
- {
- switch ( m_nValue )
- {
- case 0:
- mpLBTransType->Enable();
- mpLBTransType->SelectEntryPos(0);
- mpBTNGradient->Hide();
- mpMTRTransparent->Enable();
- mpMTRTransparent->Show();
- mpMTRTransparent->SetValue(0);
- //Add
- if(mpTrGrFloatWin)
- mpTrGrFloatWin->EndPopupMode();
- break;
- case 102:
- case 103:
- case 104:
- case 105:
- case 106:
- case 107:
- mpLBTransType->Enable();
- mpLBTransType->SelectEntryPos( m_nValue - 100 );
- mpMTRTransparent->Hide();
- mpBTNGradient->Enable();
- mpBTNGradient->Show();
- //for beta1
- switch ( m_nValue )
- {
- case 102:
- mpBTNGradient->SetItemImage(TBI_BTX_GRADIENT, GetSettings().GetStyleSettings().GetHighContrastMode()? maImgLinearH : maImgLinear); // high contrast
- break;
- case 103:
- mpBTNGradient->SetItemImage(TBI_BTX_GRADIENT,GetSettings().GetStyleSettings().GetHighContrastMode()? maImgAxialH : maImgAxial);
- break;
- case 104:
- mpBTNGradient->SetItemImage(TBI_BTX_GRADIENT,GetSettings().GetStyleSettings().GetHighContrastMode()? maImgRadialH : maImgRadial);
- break;
- case 105:
- mpBTNGradient->SetItemImage(TBI_BTX_GRADIENT,GetSettings().GetStyleSettings().GetHighContrastMode()? maImgElliH : maImgElli);
- break;
- case 106:
- mpBTNGradient->SetItemImage(TBI_BTX_GRADIENT,GetSettings().GetStyleSettings().GetHighContrastMode()? maImgQuadH : maImgQuad);
- break;
- case 107:
- mpBTNGradient->SetItemImage(TBI_BTX_GRADIENT,GetSettings().GetStyleSettings().GetHighContrastMode()? maImgSquareH : maImgSquare);
- break;
- }
- //end of new code
- break;
- }
- }
- }
- else
- {
- mpLBTransType->SetNoSelection();
- mpMTRTransparent->Disable();
- mpMTRTransparent->Show();
- mpBTNGradient->Disable();
- mpBTNGradient->Hide();
- }
- }
- //End of new code
- else if (nSID == SID_SVX_AREA_TRANSPARENCY)
- {
- if( eState == SFX_ITEM_AVAILABLE )
- {
- mpMTRTransparent->Enable();
+ SfxObjectShell* pSh = SfxObjectShell::Current();
+ bool bFillTransparenceChanged(false);
- }
- else if(eState == SFX_ITEM_DISABLED)
- mpLBTransType->Disable(); // 20090923
- }
- else if (nSID == SID_SVX_AREA_TRANSP_GRADIENT)
- {
- if( eState == SFX_ITEM_AVAILABLE )
- {
- mpBTNGradient->Enable();
+ if(SID_ATTR_FILL_TRANSPARENCE == nSID)
+ {
+ bFillTransparenceChanged = true;
+
+ if(eState >= SFX_ITEM_AVAILABLE)
+ {
+ const SfxUInt16Item* pItem = dynamic_cast< const SfxUInt16Item* >(pState);
- const XFillFloatTransparenceItem* pGradientItem = PTR_CAST(XFillFloatTransparenceItem, pState);
- if (pGradientItem)
+ if(pItem && (!mpTransparanceItem || *pItem != *mpTransparanceItem))
{
- mpGradientItem.reset((XFillFloatTransparenceItem*)pGradientItem->Clone());
- }
- }
- else if(eState == SFX_ITEM_DISABLED)
- mpLBTransType->Disable(); // 20090923
+ mpTransparanceItem.reset((SfxUInt16Item*)pItem->Clone());
+ }
+ else
+ {
+ mpTransparanceItem.reset();
+ }
+ }
+ else
+ {
+ mpTransparanceItem.reset();
+ }
+ }
+ else if(SID_ATTR_FILL_FLOATTRANSPARENCE == nSID)
+ {
+ bFillTransparenceChanged = true;
- }
- else if (nSID == SID_ATTR_FILL_STYLE )
+ if(eState >= SFX_ITEM_AVAILABLE)
+ {
+ const XFillFloatTransparenceItem* pItem = dynamic_cast< const XFillFloatTransparenceItem* >(pState);
+
+ if(pItem && (!mpFloatTransparenceItem || *pItem != *mpFloatTransparenceItem))
+ {
+ mpFloatTransparenceItem.reset((XFillFloatTransparenceItem*)pItem->Clone());
+ }
+ else
+ {
+ mpFloatTransparenceItem.reset();
+ }
+ }
+ else
+ {
+ mpFloatTransparenceItem.reset();
+ }
+ }
+
+ if(bFillTransparenceChanged)
+ {
+ // update transparency settings dependent of mpTransparanceItem and mpFloatTransparenceItem
+ ImpUpdateTransparencies();
+ }
+
+ if (nSID == SID_ATTR_FILL_STYLE )
{
if( eState == SFX_ITEM_DISABLED )
{
@@ -1753,10 +1814,10 @@ IMPL_LINK( AreaPropertyPanel, ClickTrGrH
if(nId == BTN_GRADIENT)
{
SvxAreaTrGrPage* pTrGrPage = GetTrGrPage();
- pTrGrPage->Rearrange(mpGradientItem.get());
+ pTrGrPage->Rearrange(mpFloatTransparenceItem.get());
pToolBox->SetItemDown( TBI_BTX_GRADIENT, true );
- const XGradient& rGradient = mpGradientItem->GetGradientValue();
+ const XGradient& rGradient = mpFloatTransparenceItem->GetGradientValue();
XGradientStyle eXGS(rGradient.GetGradientStyle());
Size aFloatSz = pTrGrPage->GetOutputSizePixel();
@@ -1836,7 +1897,7 @@ IMPL_LINK(AreaPropertyPanel, ChangeTrgrT
}
XFillTransparenceItem aLinearItem(nTrans);
- GetBindings()->GetDispatcher()->Execute( SID_SVX_AREA_TRANSPARENCY, SFX_CALLMODE_RECORD, &aLinearItem, 0L );
+ GetBindings()->GetDispatcher()->Execute( SID_ATTR_FILL_TRANSPARENCE, SFX_CALLMODE_RECORD, &aLinearItem, 0L );
if (nSelectType > 1) nSelectType = nSelectType-2;
@@ -1868,7 +1929,7 @@ IMPL_LINK(AreaPropertyPanel, ChangeTrgrT
if (bGradient) bEnable = true;
XFillFloatTransparenceItem aGradientItem(pPool,aTmpGradient, bEnable );
- GetBindings()->GetDispatcher()->Execute( SID_SVX_AREA_TRANSP_GRADIENT, SFX_CALLMODE_RECORD, &aGradientItem, 0L );
+ GetBindings()->GetDispatcher()->Execute( SID_ATTR_FILL_FLOATTRANSPARENCE, SFX_CALLMODE_RECORD, &aGradientItem, 0L );
return( 0L );
}
@@ -1883,7 +1944,7 @@ IMPL_LINK(AreaPropertyPanel, ModifyTrans
if (nTrans != 0 && nSelectType == 0)
mpLBTransType->SelectEntryPos(1);
XFillTransparenceItem aLinearItem(nTrans);
- GetBindings()->GetDispatcher()->Execute( SID_SVX_AREA_TRANSPARENCY, SFX_CALLMODE_RECORD, &aLinearItem, 0L );
+ GetBindings()->GetDispatcher()->Execute( SID_ATTR_FILL_TRANSPARENCE, SFX_CALLMODE_RECORD, &aLinearItem, 0L );
return 0L;
}
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.hxx?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.hxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/geometry/AreaPropertyPanel.hxx Wed Feb 27 18:10:43 2013
@@ -133,9 +133,8 @@ private:
::sfx2::sidebar::ControllerItem maGradientListControl;
::sfx2::sidebar::ControllerItem maHatchListControl;
::sfx2::sidebar::ControllerItem maBitmapListControl;
- ::sfx2::sidebar::ControllerItem maTransTypeController;
- ::sfx2::sidebar::ControllerItem maTransController;
- ::sfx2::sidebar::ControllerItem maTransGradientController;
+ ::sfx2::sidebar::ControllerItem maFillTransparenceController;
+ ::sfx2::sidebar::ControllerItem maFillFloatTransparenceController;
Image maImgAxial;
Image maImgElli;
@@ -163,8 +162,8 @@ private:
::boost::scoped_ptr< PropertyPanelPopuplWindow > mpFloatWinColor;
::boost::scoped_ptr< SvxColorPage > mpPageColor;
- ::boost::scoped_ptr< XFillFloatTransparenceItem > mpGradientItem;
- ::boost::scoped_ptr< SfxUInt16Item > mpTransTypeItem;
+ ::boost::scoped_ptr< XFillFloatTransparenceItem > mpFloatTransparenceItem;
+ ::boost::scoped_ptr< SfxUInt16Item > mpTransparanceItem;
cssu::Reference<css::frame::XFrame> mxFrame;
::sfx2::sidebar::EnumContext maContext;
@@ -202,6 +201,7 @@ private:
void SetupIcons(void);
void Initialize();
void Update();
+ void ImpUpdateTransparencies();
};
//////////////////////////////////////////////////////////////////////////////
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.cxx?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.cxx Wed Feb 27 18:10:43 2013
@@ -26,9 +26,6 @@
#include <GraphicPropertyPanel.hrc>
#include <svx/dialogs.hrc>
#include <svx/dialmgr.hxx>
-//#include <svl/intitem.hxx>
-//#include <sfx2/bindings.hxx>
-//#include <sfx2/dispatch.hxx>
#include <vcl/field.hxx>
#include <vcl/lstbox.hxx>
#include <svl/intitem.hxx>
@@ -301,9 +298,11 @@ void GraphicPropertyPanel::NotifyItemUpd
if( eState >= SFX_ITEM_AVAILABLE)
{
mpMtrBrightness->Enable();
- if(pState&&pState->ISA(SfxInt16Item))
+ const SfxInt16Item* pItem = dynamic_cast< const SfxInt16Item* >(pState);
+
+ if(pItem)
{
- sal_Int64 nBright = ((SfxInt16Item*)pState)->GetValue();
+ sal_Int64 nBright = pItem->GetValue();
mpMtrBrightness->SetValue(nBright);
}
}
@@ -319,9 +318,11 @@ void GraphicPropertyPanel::NotifyItemUpd
if( eState >= SFX_ITEM_AVAILABLE)
{
mpMtrContrast->Enable();
- if(pState&&pState->ISA(SfxInt16Item))
+ const SfxInt16Item* pItem = dynamic_cast< const SfxInt16Item* >(pState);
+
+ if(pItem)
{
- sal_Int64 nContrast = ((SfxInt16Item*)pState)->GetValue();
+ sal_Int64 nContrast = pItem->GetValue();
mpMtrContrast->SetValue(nContrast);
}
}
@@ -337,9 +338,11 @@ void GraphicPropertyPanel::NotifyItemUpd
if( eState >= SFX_ITEM_AVAILABLE)
{
mpMtrTrans->Enable();
- if(pState&&pState->ISA(SfxUInt16Item))
+ const SfxUInt16Item* pItem = dynamic_cast< const SfxUInt16Item* >(pState);
+
+ if(pItem)
{
- sal_Int64 nTrans = ((SfxUInt16Item*)pState)->GetValue();
+ sal_Int64 nTrans = pItem->GetValue();
mpMtrTrans->SetValue(nTrans);
}
}
@@ -355,9 +358,11 @@ void GraphicPropertyPanel::NotifyItemUpd
if( eState >= SFX_ITEM_AVAILABLE)
{
mpLBColorMode->Enable();
- if(pState&&pState->ISA(SfxUInt16Item))
+ const SfxUInt16Item* pItem = dynamic_cast< const SfxUInt16Item* >(pState);
+
+ if(pItem)
{
- sal_Int64 nTrans = ((SfxUInt16Item*)pState)->GetValue();
+ sal_Int64 nTrans = pItem->GetValue();
mpLBColorMode->SelectEntryPos(nTrans);
}
}
@@ -373,9 +378,11 @@ void GraphicPropertyPanel::NotifyItemUpd
if( eState >= SFX_ITEM_AVAILABLE)
{
mpMtrRed->Enable();
- if(pState&&pState->ISA(SfxInt16Item))
+ const SfxInt16Item* pItem = dynamic_cast< const SfxInt16Item* >(pState);
+
+ if(pItem)
{
- sal_Int64 nRed = ((SfxInt16Item*)pState)->GetValue();
+ sal_Int64 nRed = pItem->GetValue();
mpMtrRed->SetValue( nRed );
}
}
@@ -391,9 +398,11 @@ void GraphicPropertyPanel::NotifyItemUpd
if( eState >= SFX_ITEM_AVAILABLE)
{
mpMtrGreen->Enable();
- if(pState&&pState->ISA(SfxInt16Item))
+ const SfxInt16Item* pItem = dynamic_cast< const SfxInt16Item* >(pState);
+
+ if(pItem)
{
- sal_Int64 nGreen = ((SfxInt16Item*)pState)->GetValue();
+ sal_Int64 nGreen = pItem->GetValue();
mpMtrGreen->SetValue( nGreen );
}
}
@@ -409,9 +418,11 @@ void GraphicPropertyPanel::NotifyItemUpd
if( eState >= SFX_ITEM_AVAILABLE)
{
mpMtrBlue->Enable();
- if(pState&&pState->ISA(SfxInt16Item))
+ const SfxInt16Item* pItem = dynamic_cast< const SfxInt16Item* >(pState);
+
+ if(pItem)
{
- sal_Int64 nBlue = ((SfxInt16Item*)pState)->GetValue();
+ sal_Int64 nBlue = pItem->GetValue();
mpMtrBlue->SetValue( nBlue );
}
}
@@ -427,9 +438,11 @@ void GraphicPropertyPanel::NotifyItemUpd
if( eState >= SFX_ITEM_AVAILABLE)
{
mpMtrGamma->Enable();
- if(pState&&pState->ISA(SfxUInt32Item))
+ const SfxUInt32Item* pItem = dynamic_cast< const SfxUInt32Item* >(pState);
+
+ if(pItem)
{
- sal_Int64 nGamma = ((SfxUInt32Item*)pState)->GetValue();
+ sal_Int64 nGamma = pItem->GetValue();
mpMtrGamma->SetValue( nGamma );
}
}
Modified: openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.hxx?rev=1450891&r1=1450890&r2=1450891&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.hxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/geometry/GraphicPropertyPanel.hxx Wed Feb 27 18:10:43 2013
@@ -25,15 +25,7 @@
#include <vcl/ctrl.hxx>
#include <sfx2/sidebar/SidebarPanelBase.hxx>
#include <sfx2/sidebar/ControllerItem.hxx>
-//#include <sfx2/sectionpage.hxx>
-//#include <svx/svxdllapi.h>
#include <vcl/fixed.hxx>
-//#include <vcl/field.hxx>
-//#include <vcl/button.hxx>
-//#include <vcl/toolbox.hxx>
-//#include <svx/dlgctrl.hxx>
-//#include <svx/xbitmap.hxx>
-//#include <svx/xtable.hxx>
#include <boost/scoped_ptr.hpp>
//////////////////////////////////////////////////////////////////////////////