strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed commented-out code.

Browse source
This commit is contained in:
Ricardo Moreno 2010-11-08 12:01:47 -05:00 committed by Kohei Yoshida
parent 56b9f35f0e
commit 6a0632fe7e
12 changed files with 2 additions and 242 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
chart2/source/controller/dialogs/ChartTypeDialogController.cxx
View file

@ -66,11 +66,6 @@ using namespace ::com::sun::star::chart2;
#define SELECT_BITMAP(name) Bitmap( SchResId( bIsHighContrast ? name ## _HC : name ))
#define SELECT_IMAGE(name) Image( SchResId( bIsHighContrast ? name ## _HC : name ))
/*
( C2U( "com.sun.star.chart2.template.Surface" ), CHSTYLE_3D_SURFACE)
( C2U( "com.sun.star.chart2.template.Addin" ), CHSTYLE_ADDIN)
*/
ChartTypeParameter::ChartTypeParameter()
: nSubTypeIndex( 1 )
, bXAxisWithValues( false )

28
chart2/source/controller/dialogs/TabPages.hrc
View file

@ -62,32 +62,11 @@
#define FT_TEXTDIR 6038
#define LB_TEXTDIR 6039
/*
//Symbol-Tabpage (zum Teil sehr Aehnlich der SVX_AREA_TABPAGE) (obsolete)
//#define TP_SYMBOL 906
#define RBT_COLOR 1
#define RBT_GRADIENT 2
#define RBT_HATCHING 3
#define RBT_BITMAP 4
#define RBT_INVISIBLE 5
#define LB_COLOR 1
#define LB_GRADIENT 2
#define LB_HATCHING 3
#define LB_BITMAP 4
#define GRP_FILL 1
#define CTL_BITMAP_PREVIEW 6
*/
//------------
//from old chart tplabel.hrc
//#define TP_AXIS_LABEL 920
#define CB_AXIS_LABEL_SCHOW_DESCR 1
//#define FL_AXIS_LABEL_FORMATTING 2
#define FL_AXIS_LABEL_ORIENTATION 3
#define CT_AXIS_LABEL_DIAL 4
#define PB_AXIS_LABEL_TEXTSTACKED 5
@ -107,12 +86,8 @@
#define RB_AXIS_LABEL_AUTOORDER 17
#define FL_SEPARATOR 18
#define FT_AXIS_TEXTDIR 19
#define LB_AXIS_TEXTDIR 20
//#define TP_SCALE 903
#define FL_SCALE 1
#define TXT_MIN 1
@ -135,9 +110,6 @@
#define EDT_ORIGIN 4
#define MT_STEPHELP 10
//#define TP_AXIS_POSITIONS 904
#define FL_AXIS_LINE 1
#define FL_LABELS 2
#define FL_TICKS 3

13
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc
View file

@ -27,19 +27,6 @@
#include "ResourceIds.hrc"
/*
#define ED_MAINTITLE 1
#define ED_SUBTITLE 2
#define ED_X_AXIS 3
#define ED_Y_AXIS 4
#define ED_Z_AXIS 5
#define FT_MAINTITLE 1
#define FT_SUBTITLE 2
#define FT_TITLE_X_AXIS 3
#define FT_TITLE_Y_AXIS 4
#define FT_TITLE_Z_AXIS 5
*/
#define FT_TITLEDESCRIPTION 30
#define FL_VERTICAL 3

41
chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
View file

@ -229,47 +229,6 @@ FontList* ViewElementListProvider::getFontList() const
}
return m_pFontList;
}
/*
SfxPrinter* ObjectPropertiesDialogParameter::getPrinter()
{
//was old chart:
//SfxPrinter* SchChartDocShell::GetPrinter()
// OLE-Objekt: kein Printer anlegen ??? see old chart: :UpdateTablePointers
//@todo get printer from calc or other container
//return NULL;
SfxPrinter* pPrinter = NULL;
bool bOwnPrinter = true;
if (!pPrinter)
{
SfxBoolItem aItem(SID_PRINTER_NOTFOUND_WARN, TRUE);
// ItemSet mit speziellem Poolbereich anlegen
SfxItemSet* pSet = new SfxItemSet(GetPool(),
SID_PRINTER_NOTFOUND_WARN,
SID_PRINTER_NOTFOUND_WARN, 0);
pSet->Put(aItem);
pPrinter = new SfxPrinter(pSet); //@todo ->need to remember and delete
bOwnPrinter = TRUE;
MapMode aMapMode = pPrinter->GetMapMode();
aMapMode.SetMapUnit(MAP_100TH_MM);
pPrinter->SetMapMode(aMapMode);
if (pChDoc)
{
if (pPrinter != pChDoc->GetRefDevice())
pChDoc->SetRefDevice(pPrinter);
if (pPrinter != pChDoc->GetOutliner()->GetRefDevice())
pChDoc->GetOutliner()->SetRefDevice(pPrinter);
}
}
return pPrinter;
}
*/
//.............................................................................
} //namespace chart
//.............................................................................

14
chart2/source/controller/inc/HelpIds.hrc
View file

@ -48,7 +48,6 @@
#define HID_SCH_CTL_DATA (HID_SCH_START + 10)
#define HID_SCH_CT_INDICATE (HID_SCH_START + 11)
// #define HID_SCH_CT_REGRESS (HID_SCH_START + 12)
//for chart type dialog:
#define HID_SCH_CTL_TYPE (HID_SCH_START + 13)
@ -56,11 +55,6 @@
#define HID_SCH_NUM_OF_LINES (HID_SCH_START + 43)
#define HID_SCH_SERIES_LIST (HID_SCH_START + 15)
#define HID_SCH_DATA_RANGES_LIST (HID_SCH_START + 16)
//
//#define HID_SCH_CTL_LIGHT (HID_SCH_START + 17)
//#define HID_SCH_CT_INDICATE2 (HID_SCH_START + 18)
//#define HID_SCH_CT_REGRESS2 (HID_SCH_START + 19)
#define HID_SCH_TBI_DATA_INSERT_ROW (HID_SCH_START + 23)
#define HID_SCH_TBI_DATA_INSERT_COL (HID_SCH_START + 24)
@ -74,14 +68,6 @@
#define HID_SCH_ALIGNMENT_CTR_DIAL (HID_SCH_START + 35)
#define HID_SCH_ALIGNMENT_STACKED (HID_SCH_START + 36)
#define HID_SCH_ALIGNMENT_DEGREES (HID_SCH_START + 37)
/*
#define HID_SCH_LAYOUT (HID_SCH_START + 38)
#define HID_SCH_TBX_EDIT_FIELD (HID_SCH_START + 39)
#define HID_SCH_DIAGRAM_Y_AXIS (HID_SCH_START + 40)//war mal 3
#define HID_SCH_DEF_COLOR (HID_SCH_START + 41)
*/
#define HID_SCH_TP_AXIS_LABEL (HID_SCH_START + 42)
#define HID_SCH_CHART_AUTO_FORMAT (HID_SCH_START + 44)

3
chart2/source/controller/main/SelectionHelper.hxx
View file

@ -44,8 +44,7 @@ namespace chart
class ObjectIdentifier;
//-----------------------------------------------------------------------------
/**
*/
class Selection
{
public: //methods

22
chart2/source/view/axes/VAxisProperties.cxx
View file

@ -453,28 +453,6 @@ void AxisLabelProperties::init( const uno::Reference< XAxis >& xAxisModel )
}
}
/*
sal_Int16 getSwappedWritingMode( sal_Int16 nWritingMode )
{
//LR_TB == LT
//RL_TB == RT (Arabic, Hebrew)
//TB_RL == TR (Japanese, Chinese, Korean)
// ?? TL (Mongolian) see also text::WritingMode2
switch(nWritingMode)
{
case text::WritingMode2::RL_TB:
return text::WritingMode2::TB_RL;
case text::WritingMode2::TB_RL:
return text::WritingMode2::RL_TB;
case text::WritingMode2::LR_TB:
return text::WritingMode2::TB_LR;
default:
return text::WritingMode2::LR_TB;
}
}
*/
sal_Bool AxisLabelProperties::getIsStaggered() const
{
if( STAGGER_ODD == eStaggering || STAGGER_EVEN == eStaggering )

15
chart2/source/view/inc/PlotterBase.hxx
View file

@ -34,9 +34,6 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/drawing/Position3D.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
/*
#include <com/sun/star/lang/XComponent.hpp>
*/
//----
#include <vector>
@ -44,9 +41,6 @@
//---- chart2
#include <com/sun/star/chart2/ExplicitScaleData.hpp>
#include <com/sun/star/chart2/XTransformation.hpp>
/*
#include <com/sun/star/chart2/XPlotter.hpp>
*/
//----
#include <cppuhelper/implbase1.hxx>
@ -87,14 +81,7 @@ public:
virtual void SAL_CALL createShapes() = 0;
static bool isValidPosition( const ::com::sun::star::drawing::Position3D& rPos );
/*
virtual ::rtl::OUString SAL_CALL getCoordinateSystemTypeID( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException);
*/
//-------------------------------------------------------------------------
//-------------------------------------------------------------------------
//-------------------------------------------------------------------------
private: //methods
//no default constructor
PlotterBase();
@ -113,8 +100,6 @@ protected: //member
::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory;
ShapeFactory* m_pShapeFactory;
//::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC;
rtl::OUString m_aCID;
sal_Int32 m_nDimension;

19
chart2/source/view/inc/PlottingPositionHelper.hxx
View file

@ -151,10 +151,6 @@ enum NormalAxis
};
class PolarPlottingPositionHelper : public PlottingPositionHelper
/*
, public ::cppu::WeakImplHelper1<
::com::sun::star::chart2::XTransformation >
*/
{
public:
PolarPlottingPositionHelper( NormalAxis eNormalAxis=NormalAxis_Z );
@ -198,21 +194,6 @@ public:
inline bool isMathematicalOrientationAngle() const;
inline bool isMathematicalOrientationRadius() const;
/*
// ____ XTransformation ____
/// @see ::com::sun::star::chart2::XTransformation
virtual ::com::sun::star::uno::Sequence< double > SAL_CALL transform(
const ::com::sun::star::uno::Sequence< double >& rSourceValues )
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
/// @see ::com::sun::star::chart2::XTransformation
virtual sal_Int32 SAL_CALL getSourceDimension()
throw (::com::sun::star::uno::RuntimeException);
/// @see ::com::sun::star::chart2::XTransformation
virtual sal_Int32 SAL_CALL getTargetDimension()
throw (::com::sun::star::uno::RuntimeException);
*/
public:
//Offset for radius axis in absolute logic scaled values (1.0 == 1 category)
double m_fRadiusOffset;

29
chart2/source/view/main/NumberFormatterWrapper.cxx
View file

@ -58,15 +58,6 @@ FixedNumberFormatter::~FixedNumberFormatter()
{
}
/*
sal_Int32 FixedNumberFormatter::getTextAndColor( double fUnscaledValueForText, rtl::OUString& rLabel ) const
{
sal_Int32 nLabelColor = Color(COL_BLUE).GetColor(); //@todo get this from somewheres
rLabel = getFormattedString( fUnscaledValueForText, nLabelColor );
return nLabelColor;
}
*/
rtl::OUString FixedNumberFormatter::getFormattedString( double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const
{
return m_aNumberFormatterWrapper.getFormattedString(
@ -145,26 +136,6 @@ rtl::OUString NumberFormatterWrapper::getFormattedString(
return aRet;
}
// to get the language type use MsLangId::convertLocaleToLanguage( rNumberFormat.aLocale )
/*
uno::Reference< i18n::XNumberFormatCode > xNumberFormatCode(
m_xCC->getServiceManager()->createInstanceWithContext( C2U(
"com.sun.star.i18n.NumberFormatMapper" ), m_xCC ), uno::UNO_QUERY );
i18n::NumberFormatCode aNumberFormatCode = xNumberFormatCode->getDefault (
i18n::KNumberFormatType::MEDIUM,
i18n::KNumberFormatUsage::SCIENTIFIC_NUMBER,
aLocale );
uno::Sequence< i18n::NumberFormatCode > aListOfNumberFormatCode = xNumberFormatCode->getAllFormatCode(
i18n::KNumberFormatUsage::SCIENTIFIC_NUMBER,
aLocale );
i18n::NumberFormatCode aNumberFormatCode0 = aListOfNumberFormatCode[0];
i18n::NumberFormatCode aNumberFormatCode1 = aListOfNumberFormatCode[1];
*/
//.............................................................................
} //namespace chart
//.............................................................................

21
chart2/source/view/main/PlottingPositionHelper.cxx
View file

@ -642,27 +642,6 @@ double PlottingPositionHelper::getBaseValueY() const
return m_aScales[1].Origin;
}
/*
// ____ XTransformation ____
uno::Sequence< double > SAL_CALL PolarPlottingPositionHelper::transform(
const uno::Sequence< double >& rSourceValues )
throw (uno::RuntimeException, lang::IllegalArgumentException)
{
uno::Sequence< double > aSourceValues(3);
return aSourceValues;
}
sal_Int32 SAL_CALL PolarPlottingPositionHelper::getSourceDimension() throw (uno::RuntimeException)
{
return 3;
}
sal_Int32 SAL_CALL PolarPlottingPositionHelper::getTargetDimension() throw (uno::RuntimeException)
{
return 3;
}
*/
//.............................................................................
} //namespace chart
//.............................................................................

34
chart2/source/view/main/PropertyMapper.cxx
View file

@ -174,26 +174,6 @@ uno::Any* PropertyMapper::getValuePointerForLimitedSpace( tAnySequence& rPropVal
, bLimitedHeight ? C2U("TextMaximumFrameHeight") : C2U("TextMaximumFrameWidth") );
}
/*
//set some properties from service style::CharacterProperties:
//-------- tabpage: Characters -----------
//FontType eg. Albany UNO_NAME_EDIT_CHAR_FONTNAME == UNO_NAME_EDIT_CHAR_FONTSTYLENAME //UNO_NAME_CHAR_FONT
//FontStyle eg. italic UNO_NAME_EDIT_CHAR_POSTURE UNO_NAME_CHAR_POSTURE awt::FontSlant NONE OBLIQUE ITALIC DONTKNOW REVERSE_OBLIQUE REVERSE_ITALIC
//Fontsize (Pointsize eg. 12) UNO_NAME_EDIT_CHAR_HEIGHT == UNO_NAME_CHAR_HEIGHT
//? UNO_NAME_EDIT_CHAR_WEIGHT == UNO_NAME_CHAR_WEIGHT
//Language UNO_NAME_EDIT_CHAR_LOCALE lang::Locale
//-------- tabpage: Font Effect -----------
//Underline UNO_NAME_CHAR_UNDERLINE sal_Int16 awt::FontUnderline_NONE _SINGLE _DOUBLE _DOTTED _DONTKNOW _DASH ...
//Underline-color ??? 'CharUnderlineColor' + CharUnderlineHasColor
//Strikeout eg. double "CharStrikeout" sal_Int16 awt::FontStrikeout_NONE _SINGLE _DOUBLE ...
//Strikeout by word yes/no "CharWordMode" bool
//Fontcolor UNO_NAME_EDIT_CHAR_COLOR sal_Int32 UNO_NAME_CHAR_COLOR
//ReliefType without/graved/emboss "CharRelief" sal_Int16 text::FontRelief_NONE FontRelief_EMBOSSED FontRelief_ENGRAVED
//Outline "CharContoured" bool
//Shadows UNO_NAME_CHAR_SHADOWED bool
*/
//static
const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForCharacterProperties()
{
@ -342,18 +322,7 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForTextShapeProper
tMakePropertyNameMap
( PropertyMapper::getPropertyNameMapForCharacterProperties() )
( PropertyMapper::getPropertyNameMapForFillProperties() )
( PropertyMapper::getPropertyNameMapForLineProperties() )
// ( PropertyMapper::getPropertyNameMapForParagraphProperties() )
// some text properties
// ( C2U( "TextHorizontalAdjust" ), C2U( "TextHorizontalAdjust" ) )
// ( C2U( "TextVerticalAdjust" ), C2U( "TextVerticalAdjust" ) )
// ( C2U( "TextAutoGrowHeight" ), C2U( "TextAutoGrowHeight" ) )
// ( C2U( "TextAutoGrowWidth" ), C2U( "TextAutoGrowWidth" ) )
// ( C2U( "TextLeftDistance" ), C2U( "TextLeftDistance" ) )
// ( C2U( "TextRightDistance" ), C2U( "TextRightDistance" ) )
// ( C2U( "TextUpperDistance" ), C2U( "TextUpperDistance" ) )
// ( C2U( "TextLowerDistance" ), C2U( "TextLowerDistance" ) )
;
( PropertyMapper::getPropertyNameMapForLineProperties() );
return m_aShapePropertyMapForTextShapeProperties;
}
@ -366,7 +335,6 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForLineSeriesPrope
tMakePropertyNameMap
( C2U( "LineColor" ), C2U("Color") )
( C2U( "LineDashName" ), C2U("LineDashName") )
// ( C2U( "LineJoint" ), C2U("LineJoint") )
( C2U( "LineStyle" ), C2U("LineStyle") )
( C2U( "LineTransparence" ), C2U("Transparency") )
( C2U( "LineWidth" ), C2U("LineWidth") )