[Libreoffice-commits] .: chart2/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Nov 29 08:05:51 PST 2010
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 38 ----------
chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx | 2
chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx | 9 --
chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx | 1
chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx | 17 ----
chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx | 18 ----
6 files changed, 85 deletions(-)
New commits:
commit 1ca298d8ee4ad2379bdc2f2f88596d2a65e78995
Author: Timo Heino <eraggo at gmail.com>
Date: Mon Nov 29 16:25:02 2010 +0200
Removed (again) some commented out code.
Hopefully this helps!
Signed-off-by: Timo Heino <eraggo at gmail.com>
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index cd70397..4a6c9f6 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -118,41 +118,6 @@ OutputDevice * lcl_GetParentRefDevice( const uno::Reference< frame::XModel > & x
}
- /*
-void lcl_initOutliner( SdrOutliner* pTargetOutliner, SdrOutliner* pSourceOutliner )
-{
- //just an unsuccessful try to initialize the text edit outliner correctly
- //if( bInit )
- {
- pTargetOutliner->EraseVirtualDevice();
- pTargetOutliner->SetUpdateMode(FALSE);
- pTargetOutliner->SetEditTextObjectPool( pSourceOutliner->GetEditTextObjectPool() );
- pTargetOutliner->SetDefTab( pSourceOutliner->GetDefTab() );
- }
-
- pTargetOutliner->SetRefDevice( pSourceOutliner->GetRefDevice() );
- pTargetOutliner->SetForbiddenCharsTable( pSourceOutliner->GetForbiddenCharsTable() );
- pTargetOutliner->SetAsianCompressionMode( pSourceOutliner->GetAsianCompressionMode() );
- pTargetOutliner->SetKernAsianPunctuation( pSourceOutliner->IsKernAsianPunctuation() );
- pTargetOutliner->SetStyleSheetPool( pSourceOutliner->GetStyleSheetPool() );
- pTargetOutliner->SetRefMapMode( pSourceOutliner->GetRefMapMode() );
- pTargetOutliner->SetDefaultLanguage( pSourceOutliner->GetDefaultLanguage() );
- pTargetOutliner->SetHyphenator( pSourceOutliner->GetHyphenator() );
-
- USHORT nX, nY;
- pSourceOutliner->GetGlobalCharStretching( nX, nY );
- pTargetOutliner->SetGlobalCharStretching( nX, nY );
-
- *//*
- if ( !GetRefDevice() )
- {
- MapMode aMapMode(eObjUnit, Point(0,0), aObjUnit, aObjUnit);
- pTargetOutliner->SetRefMapMode(aMapMode);
- }
- *//*
-}
-*/
-
DrawViewWrapper::DrawViewWrapper( SdrModel* pSdrModel, OutputDevice* pOut, bool bPaintPageForEditMode)
: E3dView(pSdrModel, pOut)
, m_pMarkHandleProvider(NULL)
@@ -200,7 +165,6 @@ void DrawViewWrapper::ReInit()
bHlplVisible = false;
this->SetNoDragXorPolys(true);//for interactive 3D resize-dragging: paint only a single rectangle (not a simulated 3D object)
- //this->SetResizeAtCenter(true);//for interactive resize-dragging: keep the object center fix
//a correct work area is at least necessary for correct values in the position and size dialog
Rectangle aRect(Point(0,0), aOutputSize);
@@ -233,7 +197,6 @@ void DrawViewWrapper::SetMarkHandles()
SdrObject* DrawViewWrapper::getHitObject( const Point& rPnt ) const
{
SdrObject* pRet = NULL;
- //ULONG nOptions =SDRSEARCH_DEEP|SDRSEARCH_PASS2BOUND|SDRSEARCH_PASS3NEAREST;
ULONG nOptions = SDRSEARCH_DEEP | SDRSEARCH_TESTMARKABLE;
SdrPageView* pSdrPageView = this->GetPageView();
@@ -333,7 +296,6 @@ void DrawViewWrapper::attachParentReferenceDevice( const uno::Reference< frame::
SdrOutliner* DrawViewWrapper::getOutliner() const
{
-// lcl_initOutliner( m_apOutliner.get(), &GetModel()->GetDrawOutliner() );
return m_apOutliner.get();
}
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index 0713cc7..79aab2f 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -368,7 +368,6 @@ void AxisItemConverter::FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemS
break;
case SID_ATTR_NUMBERFORMAT_VALUE:
-// case SCHATTR_AXIS_NUMFMT:
{
if( m_pExplicitScale )
{
@@ -758,7 +757,6 @@ bool AxisItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rI
break;
case SID_ATTR_NUMBERFORMAT_VALUE:
-// case SCHATTR_AXIS_NUMFMT:
{
if( m_pExplicitScale )
{
diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
index 0dbbabf..dc7c3b4 100644
--- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
@@ -58,9 +58,6 @@ namespace
IPM_MAP_ENTRY( EE_CHAR_LANGUAGE, "CharLocale", MID_LANG_LOCALE )
IPM_MAP_ENTRY( EE_CHAR_LANGUAGE_CJK, "CharLocaleAsian", MID_LANG_LOCALE )
IPM_MAP_ENTRY( EE_CHAR_LANGUAGE_CTL, "CharLocaleComplex", MID_LANG_LOCALE )
-// IPM_MAP_ENTRY( EE_CHAR_FONTHEIGHT, "CharHeight", 0 )
-// IPM_MAP_ENTRY( EE_CHAR_ITALIC, "CharPosture", 0 )
-// IPM_MAP_ENTRY( EE_CHAR_WEIGHT, "CharWeight", 0 )
IPM_MAP_ENTRY( EE_CHAR_STRIKEOUT, "CharStrikeout", MID_CROSS_OUT )
IPM_MAP_ENTRY( EE_CHAR_WLM, "CharWordMode", 0 )
@@ -71,12 +68,6 @@ namespace
IPM_MAP_ENTRY( EE_PARA_WRITINGDIR, "WritingMode", 0 )
-// IPM_MAP_ENTRY( EE_CHAR_FONTHEIGHT_CJK, "CharHeightAsian", 0 )
-// IPM_MAP_ENTRY( EE_CHAR_FONTHEIGHT_CTL, "CharHeightComplex", 0 )
-// IPM_MAP_ENTRY( EE_CHAR_WEIGHT_CJK, "CharWeightAsian", 0 )
-// IPM_MAP_ENTRY( EE_CHAR_WEIGHT_CTL, "CharWeightComplex", 0 )
-// IPM_MAP_ENTRY( EE_CHAR_ITALIC_CJK, "CharPostureAsian", 0 )
-// IPM_MAP_ENTRY( EE_CHAR_ITALIC_CTL, "CharPostureComplex", 0 )
IPM_MAP_ENTRY( EE_PARA_ASIANCJKSPACING, "ParaIsCharacterDistance", 0 )
);
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index c53b312..ce8bcc6 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -75,7 +75,6 @@ namespace
{
static ::comphelper::ItemPropertyMapType aDataPointPropertyMap(
::comphelper::MakeItemPropertyMap
-// IPM_MAP_ENTRY( CHATTR_PIE_SEGMENT_OFFSET, "Offset", 0 )
IPM_MAP_ENTRY( SCHATTR_STYLE_SHAPE, "Geometry3D", 0 )
);
diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index 046007d..651489c 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -66,14 +66,9 @@ namespace
::comphelper::MakeItemPropertyMap
IPM_MAP_ENTRY( XATTR_FILLSTYLE, "FillStyle", 0 )
IPM_MAP_ENTRY( XATTR_FILLCOLOR, "Color", 0 )
-// IPM_MAP_ENTRY( XATTR_FILLTRANSPARENCE, "Transparency", 0 )
-// IPM_MAP_ENTRY( XATTR_FILLGRADIENT, "Gradient", 0 )
-// IPM_MAP_ENTRY( XATTR_FILLHATCH, "Hatch", 0 )
IPM_MAP_ENTRY( XATTR_LINECOLOR, "BorderColor", 0 )
IPM_MAP_ENTRY( XATTR_LINESTYLE, "BorderStyle", 0 )
IPM_MAP_ENTRY( XATTR_LINEWIDTH, "BorderWidth", 0 )
-// IPM_MAP_ENTRY( XATTR_LINEDASH, "BorderDash", 0 )
-// IPM_MAP_ENTRY( XATTR_LINETRANSPARENCE, "BorderTransparency", 0 )
IPM_MAP_ENTRY( XATTR_FILLBACKGROUND, "FillBackground", 0 )
IPM_MAP_ENTRY( XATTR_FILLBMP_POS, "FillBitmapRectanglePoint", 0 )
IPM_MAP_ENTRY( XATTR_FILLBMP_SIZEX, "FillBitmapSizeX", 0 )
@@ -92,10 +87,8 @@ namespace
static ::comphelper::ItemPropertyMapType aDataPointPropertyLineMap(
::comphelper::MakeItemPropertyMap
IPM_MAP_ENTRY( XATTR_LINECOLOR, "Color", 0 )
-// IPM_MAP_ENTRY( XATTR_LINETRANSPARENCE, "Transparency", 0 )
IPM_MAP_ENTRY( XATTR_LINESTYLE, "LineStyle", 0 )
IPM_MAP_ENTRY( XATTR_LINEWIDTH, "LineWidth", 0 )
-// IPM_MAP_ENTRY( XATTR_LINEDASH, "LineDash", 0 )
);
return aDataPointPropertyLineMap;
@@ -106,9 +99,7 @@ namespace
::comphelper::MakeItemPropertyMap
IPM_MAP_ENTRY( XATTR_LINESTYLE, "LineStyle", 0 )
IPM_MAP_ENTRY( XATTR_LINEWIDTH, "LineWidth", 0 )
-// IPM_MAP_ENTRY( XATTR_LINEDASH, "LineDash", 0 )
IPM_MAP_ENTRY( XATTR_LINECOLOR, "LineColor", 0 )
-// IPM_MAP_ENTRY( XATTR_LINETRANSPARENCE, "LineTransparence", 0 )
IPM_MAP_ENTRY( XATTR_LINEJOINT, "LineJoint", 0 )
);
@@ -120,10 +111,6 @@ namespace
::comphelper::MakeItemPropertyMap
IPM_MAP_ENTRY( XATTR_FILLSTYLE, "FillStyle", 0 )
IPM_MAP_ENTRY( XATTR_FILLCOLOR, "FillColor", 0 )
-// IPM_MAP_ENTRY( XATTR_FILLTRANSPARENCE, "FillTransparence", 0 )
-// IPM_MAP_ENTRY( XATTR_FILLBITMAP, "FillBitmapName", MID_NAME )
-// IPM_MAP_ENTRY( XATTR_FILLGRADIENT, "FillGradient", 0 )
-// IPM_MAP_ENTRY( XATTR_FILLHATCH, "FillHatch", 0 )
IPM_MAP_ENTRY( XATTR_FILLBACKGROUND, "FillBackground", 0 )
IPM_MAP_ENTRY( XATTR_FILLBMP_POS, "FillBitmapRectanglePoint", 0 )
IPM_MAP_ENTRY( XATTR_FILLBMP_SIZEX, "FillBitmapSizeX", 0 )
@@ -267,10 +254,6 @@ void GraphicPropertyItemConverter::FillSpecialItem(
USHORT nWhichId, SfxItemSet & rOutItemSet ) const
throw( uno::Exception )
{
-// if( m_eGraphicObjectType == LINE_DATA_POINT ||
-// m_eGraphicObjectType == LINE_PROPERTIES )
-// return;
-
switch( nWhichId )
{
// bitmap property
diff --git a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
index 393a1ab..1fc2f39 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
@@ -77,18 +77,6 @@ RegressionEquationItemConverter::RegressionEquationItemConverter(
m_aConverters.push_back( new CharacterPropertyItemConverter(
rPropertySet, rItemPool, pRefSize, C2U("ReferencePageSize")));
-// // CharacterProperties are not at the title but at its contained XFormattedString objects
-// // take the first formatted string in the sequence
-// uno::Reference< chart2::XTitle > xTitle( rPropertySet, uno::UNO_QUERY );
-// if( xTitle.is())
-// {
-// uno::Sequence< uno::Reference< chart2::XFormattedString > > aStringSeq( xTitle->getText());
-// if( aStringSeq.getLength() > 0 )
-// {
-// m_aConverters.push_back(
-// new FormattedStringsConverter( aStringSeq, rItemPool, pRefSize, rPropertySet ));
-// }
-// }
}
RegressionEquationItemConverter::~RegressionEquationItemConverter()
@@ -145,12 +133,6 @@ bool RegressionEquationItemConverter::ApplySpecialItem(
{
case SID_ATTR_NUMBERFORMAT_VALUE:
{
-// bool bUseSourceFormat =
-// (static_cast< const SfxBoolItem & >(
-// rItemSet.Get( SID_ATTR_NUMBERFORMAT_SOURCE )).GetValue() );
-
-// if( ! bUseSourceFormat )
-// {
uno::Any aValue( static_cast< sal_Int32 >(
static_cast< const SfxUInt32Item & >(
rItemSet.Get( nWhichId )).GetValue()));
More information about the Libreoffice-commits
mailing list