[Libreoffice-commits] .: chart2/source
Michael Meeks
mmeeks at kemper.freedesktop.org
Tue Jan 25 07:04:27 PST 2011
chart2/source/controller/dialogs/DataBrowser.cxx | 3
chart2/source/controller/dialogs/DataBrowser.hxx | 2
chart2/source/controller/dialogs/DataBrowserModel.cxx | 1
chart2/source/controller/dialogs/ObjectNameProvider.cxx | 13 -
chart2/source/controller/dialogs/tp_DataSource.cxx | 5
chart2/source/controller/main/ChartController.cxx | 34 ---
chart2/source/controller/main/ChartController_Properties.cxx | 12 -
chart2/source/controller/main/CommandDispatch.cxx | 2
chart2/source/model/filter/XMLFilter.cxx | 18 --
chart2/source/model/template/ChartType.cxx | 6
chart2/source/tools/CharacterProperties.cxx | 96 -----------
chart2/source/tools/FillProperties.cxx | 43 ----
chart2/source/tools/LifeTime.cxx | 2
chart2/source/tools/WrappedIgnoreProperty.cxx | 1
chart2/source/view/axes/VAxisProperties.cxx | 9 -
chart2/source/view/axes/VCartesianCoordinateSystem.cxx | 12 -
chart2/source/view/axes/VPolarCoordinateSystem.cxx | 18 --
chart2/source/view/charttypes/BarChart.cxx | 14 -
chart2/source/view/charttypes/Splines.cxx | 7
chart2/source/view/charttypes/VSeriesPlotter.cxx | 18 --
chart2/source/view/diagram/VDiagram.cxx | 19 --
chart2/source/view/main/VLegend.cxx | 19 --
chart2/source/view/main/VTitle.cxx | 8
23 files changed, 10 insertions(+), 352 deletions(-)
New commits:
commit 9fc8723cbdf60cfaa1a885bb03249e1995014fb0
Author: Alfonso Eusebio <alfonso_eusebio at yahoo.co.uk>
Date: Tue Jan 25 15:04:20 2011 +0000
emoved lines of code that were commented out.
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 62f87db..31f2d8a 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -1201,8 +1201,6 @@ void DataBrowser::ColumnResized( USHORT nColId )
SetUpdateMode( bLastUpdateMode );
}
-// virtual void MouseMove( const MouseEvent& rEvt );
-
void DataBrowser::EndScroll()
{
BOOL bLastUpdateMode = GetUpdateMode();
@@ -1295,7 +1293,6 @@ IMPL_LINK( DataBrowser, SeriesHeaderGotFocus, impl::SeriesHeaderEdit*, pEdit )
GoToCell( 0, 0 );
else
{
- //DeactivateCell();
MakeFieldVisible( GetCurRow(), static_cast< sal_uInt16 >( pEdit->getStartColumn()), true /* bComplete */ );
ActivateCell();
m_aCursorMovedHdlLink.Call( this );
diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx
index 48f043b..1ebce00 100644
--- a/chart2/source/controller/dialogs/DataBrowser.hxx
+++ b/chart2/source/controller/dialogs/DataBrowser.hxx
@@ -109,8 +109,6 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > & xContext );
-// void setNumberFormatter();
-
// predicates to determine what actions are possible at the current cursor
// position. This depends on the implementation of the according mutators
// below. (They are used for enabling toolbar icons)
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index a96d6f2..c580d32 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -228,7 +228,6 @@ bool lcl_ShowCategories( const Reference< chart2::XDiagram > & /* xDiagram */ )
{
// show categories for all charts
return true;
-// return DiagramHelper::isCategoryDiagram( xDiagram );
}
bool lcl_ShowCategoriesAsDataLabel( const Reference< chart2::XDiagram > & xDiagram )
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 33f9fcc..b32ab04 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -574,13 +574,6 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID,
aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), lcl_getDataSeriesName( rObjectCID, xChartModel ) );
}
}
- /*
- else if( OBJECTTYPE_DIAGRAM == eObjectType )
- {
- //todo different names for different diagram types ???
- //or different names for series of diferent charttypes
- }
- */
else if( OBJECTTYPE_DATA_CURVE == eObjectType )
{
if( bVerbose )
@@ -611,12 +604,6 @@ rtl::OUString ObjectNameProvider::getHelpText( const rtl::OUString& rObjectCID,
if( nIndex != -1 )
{
sal_Unicode aDecimalSep( '.' );
- //@todo: enable this code when a localized decimal
- //separator is also available for the formula
-// SvtSysLocale aSysLocale;
-// OUString aSep( aSysLocale.GetLocaleData().getNumDecimalSep());
-// if( aSep.getLength() == 1 )
-// aDecimalSep = aSep.toChar();
double fR( xCalculator->getCorrelationCoefficient());
aRet = aRet.replaceAt(
nIndex, aWildcard.getLength(),
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 7433e72..3b2eb86 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -1037,11 +1037,6 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField )
xLabeledSeq->setValues( xNewSeq );
}
}
- else if( xLabeledSeq.is())
- {
- // values cannot be deleted. This would also delete the Role (for labels)
-// xLabeledSeq->setValues( Reference< data::XDataSequence >());
- }
}
}
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 0affb43..1de947f 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -483,7 +483,6 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
if( m_pDrawViewWrapper )
{
m_pDrawViewWrapper->UnmarkAll();
- //m_pDrawViewWrapper->hideMarkHandles(); todo??
m_pDrawViewWrapper->HideSdrPage();
}
}
@@ -555,9 +554,7 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
m_pDrawModelWrapper.reset();
aOldModelRef->removeListener( this );
- //@todo?? termination correct?
-// aOldModelRef->tryTermination();
-#ifdef TEST_ENABLE_MODIFY_LISTENER
+ #ifdef TEST_ENABLE_MODIFY_LISTENER
uno::Reference< util::XModifyBroadcaster > xMBroadcaster( aOldModelRef->getModel(),uno::UNO_QUERY );
if( xMBroadcaster.is())
xMBroadcaster->removeModifyListener( this );
@@ -699,19 +696,11 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
//change suspend mode
if(bSuspend)
{
- //aGuard.clear();
- //@todo ??? try to stop all what may prevent me from becoming disposed
- //aGuard.reset();
-
m_bSuspended = bSuspend;
return sal_True;
}
else
{
- //aGuard.clear();
- //@todo ??? redo what was made in section bSuspend==true
- //aGuard.reset();
-
m_bSuspended = bSuspend;
}
return sal_True;
@@ -1256,13 +1245,7 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
, const util::URL& /* aURL */ )
throw (uno::RuntimeException)
{
-// // TODO: add listener by URL !
-// SolarMutexGuard aGuard;
-// if( impl_isDisposedOrSuspended() )//@todo? allow adding of listeners in suspend mode?
-// return; //behave passive if already disposed or suspended
-
-// //--add listener
-// m_aLifeTimeManager.m_aListenerContainer.addInterface( ::getCppuType( & xControl ), xControl );
+ //@todo
}
void SAL_CALL ChartController
@@ -1270,13 +1253,7 @@ bool lcl_isFormatObjectCommand( const rtl::OString& aCommand )
, const util::URL& /* aURL */ )
throw (uno::RuntimeException)
{
-// // TODO: remove listener by URL !
-// SolarMutexGuard aGuard;
-// if( m_aLifeTimeManager.impl_isDisposed() )
-// return; //behave passive if already disposed or suspended
-
-// //--remove listener
-// m_aLifeTimeManager.m_aListenerContainer.removeInterface( ::getCppuType( & xControl ), xControl );
+ //@todo
}
//-----------------------------------------------------------------
@@ -1412,15 +1389,10 @@ void SAL_CALL ChartController::modified( const lang::EventObject& /* aEvent */ )
{
// the source can also be a subobject of the ChartModel
// @todo: change the source in ChartModel to always be the model itself ?
-// if( getModel() == aEvent.Source )
-
-
//todo? update menu states ?
}
//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
IMPL_LINK( ChartController, NotifyUndoActionHdl, SdrUndoAction*, pUndoAction )
{
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index 79ad260..605858f 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -209,13 +209,7 @@ namespace
sal_Int32 nDimensionCount = DiagramHelper::getDimension( xDiagram );
if( !ChartTypeHelper::isSupportingAreaProperties( xChartType, nDimensionCount ) )
eMapTo = wrapper::GraphicPropertyItemConverter::LINE_DATA_POINT;
- /*
- FILLED_DATA_POINT,
- LINE_DATA_POINT,
- LINE_PROPERTIES,
- FILL_PROPERTIES,
- LINE_AND_FILL_PROPERTIES
- */
+
bool bDataSeries = ( eObjectType == OBJECTTYPE_DATA_SERIES || eObjectType == OBJECTTYPE_DATA_LABELS );
//special color for pie chart:
@@ -734,8 +728,7 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const ::rtl:
bool bRet = false;
if( !rObjectCID.getLength() )
{
- //DBG_ERROR("empty ObjectID");
- return bRet;
+ return bRet;
}
try
{
@@ -746,7 +739,6 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const ::rtl:
ObjectType eObjectType = ObjectIdentifier::getObjectType( rObjectCID );
if( OBJECTTYPE_UNKNOWN==eObjectType )
{
- //DBG_ERROR("unknown ObjectType");
return bRet;
}
if( OBJECTTYPE_DIAGRAM_WALL==eObjectType || OBJECTTYPE_DIAGRAM_FLOOR==eObjectType )
diff --git a/chart2/source/controller/main/CommandDispatch.cxx b/chart2/source/controller/main/CommandDispatch.cxx
index 1480bcb..007e868 100644
--- a/chart2/source/controller/main/CommandDispatch.cxx
+++ b/chart2/source/controller/main/CommandDispatch.cxx
@@ -183,8 +183,6 @@ void CommandDispatch::fireStatusEventForURL(
tListenerMap::iterator aIt( m_aListeners.find( aURL.Complete ));
if( aIt != m_aListeners.end())
{
-// ::cppu::OInterfaceContainerHelper * pCntHlp = rBHelper.getContainer(
-// ::getCppuType( reinterpret_cast< Reference< frame::XStatusListener > * >(0)));
if( aIt->second )
{
::cppu::OInterfaceIteratorHelper aIntfIt( *((*aIt).second) );
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index ffbf216..9c6a8f6 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -81,11 +81,9 @@ LOCAL_CONST_STR( sXML_contentStreamName, "content.xml" );
LOCAL_CONST_STR( sXML_oldContentStreamName, "Content.xml" );
// soffice 6/7
-// LOCAL_CONST_STR( sXML_export_chart_meta_service, "com.sun.star.comp.Chart.XMLMetaExporter" );
LOCAL_CONST_STR( sXML_export_chart_styles_service, "com.sun.star.comp.Chart.XMLStylesExporter" );
LOCAL_CONST_STR( sXML_export_chart_content_service, "com.sun.star.comp.Chart.XMLContentExporter" );
-// LOCAL_CONST_STR( sXML_import_chart_meta_service, "com.sun.star.comp.Chart.XMLMetaImporter" );
LOCAL_CONST_STR( sXML_import_chart_styles_service, "com.sun.star.comp.Chart.XMLStylesImporter" );
LOCAL_CONST_STR( sXML_import_chart_content_service, "com.sun.star.comp.Chart.XMLContentImporter" );
LOCAL_CONST_STR( sXML_import_chart_old_content_service, "com.sun.star.office.sax.importer.Chart" );
@@ -130,10 +128,6 @@ uno::Reference< embed::XStorage > lcl_getWriteStorage(
RTL_CONSTASCII_STRINGPARAM( "Password" ))
|| rMediaDescriptor[i].Name.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( "RepairPackage" ))
- // || rMediaDescriptor[i].Name.equalsAsciiL(
- // RTL_CONSTASCII_STRINGPARAM( "StatusIndicator" ))
- // || rMediaDescriptor[i].Name.equalsAsciiL(
- // RTL_CONSTASCII_STRINGPARAM( "Unpacked" ))
)
{
aPropertiesForStorage.push_back( rMediaDescriptor[i] );
@@ -207,10 +201,6 @@ uno::Reference< embed::XStorage > lcl_getReadStorage(
RTL_CONSTASCII_STRINGPARAM( "Password" ))
|| rMediaDescriptor[i].Name.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( "RepairPackage" ))
-// || rMediaDescriptor[i].Name.equalsAsciiL(
-// RTL_CONSTASCII_STRINGPARAM( "StatusIndicator" ))
-// || rMediaDescriptor[i].Name.equalsAsciiL(
-// RTL_CONSTASCII_STRINGPARAM( "Unpacked" ))
)
{
aPropertiesForStorage.push_back( rMediaDescriptor[i] );
@@ -376,8 +366,6 @@ sal_Int32 XMLFilter::impl_Import(
if( ! xStorage.is())
return ERRCODE_SFX_GENERAL;
-// bool bOasis = (SotStorage::GetVersion( xStorage ) > SOFFICE_FILEFORMAT_60);
-
Reference< document::XGraphicObjectResolver > xGraphicObjectResolver;
uno::Reference< lang::XMultiServiceFactory > xServiceFactory( xFactory, uno::UNO_QUERY);
if( xServiceFactory.is())
@@ -524,8 +512,6 @@ sal_Int32 XMLFilter::impl_ImportStream(
if( aParserInput.aInputStream.is())
{
sal_Int32 nArgs = 0;
- //if( m_xStatusIndicator.is())
- // nArgs++;
if( xGraphicObjectResolver.is())
nArgs++;
if( xImportInfo.is())
@@ -534,8 +520,6 @@ sal_Int32 XMLFilter::impl_ImportStream(
uno::Sequence< uno::Any > aFilterCompArgs( nArgs );
nArgs = 0;
- //if( m_xStatusIndicator.is())
- // aFilterCompArgs[ nArgs++ ] <<= m_xStatusIndicator;
if( xGraphicObjectResolver.is())
aFilterCompArgs[nArgs++] <<= xGraphicObjectResolver;
if( xImportInfo.is())
@@ -711,8 +695,6 @@ sal_Int32 XMLFilter::impl_Export(
aFilterProperties[ nArgs++ ] <<= xGraphicObjectResolver;
}
-// bool bOasis = (SotStorage::GetVersion( xStorage ) > SOFFICE_FILEFORMAT_60);
-
// export meta information
if( bOasis )
nWarning |= impl_ExportStream(
diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx
index 3a4febf..a1f1d60 100644
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -139,12 +139,6 @@ Sequence< OUString > SAL_CALL ChartType::getSupportedOptionalRoles()
{
static Sequence< OUString > aDefaultOptRolesSeq;
-// if( aDefaultOptRolesSeq.getLength() == 0 )
-// {
-// aDefaultOptRolesSeq.realloc( 1 );
-// aDefaultOptRolesSeq[0] = C2U( "error-bars-y" );
-// }
-
return aDefaultOptRolesSeq;
}
diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx
index 41d1c62..eba89b6 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -113,13 +113,6 @@ void CharacterProperties::AddPropertiesToVector(
::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
- // CharBackColor
-// rOutProperties.push_back(
-// Property( C2U( "CharBackColor" ),
-// PROP_CHAR_BACKGROUND_COLOR,
-// ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
-// beans::PropertyAttribute::BOUND
-// | beans::PropertyAttribute::MAYBEDEFAULT));
// CharEscapement
rOutProperties.push_back(
Property( C2U( "CharEscapement" ),
@@ -184,30 +177,6 @@ void CharacterProperties::AddPropertiesToVector(
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
| beans::PropertyAttribute::MAYBEVOID ));
- // CharCaseMap (see style.CaseMap)
-// rOutProperties.push_back(
-// Property( C2U( "CharCaseMap" ),
-// PROP_CHAR_CASE_MAPPING,
-// ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
-// beans::PropertyAttribute::BOUND
-// | beans::PropertyAttribute::MAYBEDEFAULT ));
-
-
- // CharRotation
-// rOutProperties.push_back(
-// Property( C2U( "CharRotation" ),
-// PROP_CHAR_ROTATION,
-// ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
-// beans::PropertyAttribute::BOUND
-// | beans::PropertyAttribute::MAYBEDEFAULT ));
-
-// // CharScaleWidth
-// rOutProperties.push_back(
-// Property( C2U( "CharScaleWidth" ),
-// PROP_CHAR_SCALE_WIDTH,
-// ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
-// beans::PropertyAttribute::BOUND
-// | beans::PropertyAttribute::MAYBEDEFAULT ));
// CharEscapementHeight
rOutProperties.push_back(
Property( C2U( "CharEscapementHeight" ),
@@ -215,14 +184,6 @@ void CharacterProperties::AddPropertiesToVector(
::getCppuType( reinterpret_cast< const sal_Int8 * >(0)),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
-
- // CharCrossedOut
-// rOutProperties.push_back(
-// Property( C2U( "CharCrossedOut" ),
-// PROP_CHAR_CROSSED_OUT,
-// ::getBooleanCppuType(),
-// beans::PropertyAttribute::BOUND
-// | beans::PropertyAttribute::MAYBEDEFAULT ));
// CharStrikeout (see awt.FontStrikeout)
rOutProperties.push_back(
Property( C2U( "CharStrikeout" ),
@@ -237,13 +198,6 @@ void CharacterProperties::AddPropertiesToVector(
::getBooleanCppuType(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
- // CharFlash
-// rOutProperties.push_back(
-// Property( C2U( "CharFlash" ),
-// PROP_CHAR_FLASH,
-// ::getBooleanCppuType(),
-// beans::PropertyAttribute::BOUND
-// | beans::PropertyAttribute::MAYBEDEFAULT ));
// CharLocale
rOutProperties.push_back(
Property( C2U( "CharLocale" ),
@@ -280,42 +234,6 @@ void CharacterProperties::AddPropertiesToVector(
::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
-// // RubyText
-// rOutProperties.push_back(
-// Property( C2U( "RubyText" ),
-// PROP_CHAR_RUBY_TEXT,
-// ::getCppuType( reinterpret_cast< const OUString * >(0)),
-// beans::PropertyAttribute::BOUND
-// | beans::PropertyAttribute::MAYBEDEFAULT ));
-// // RubyAdjust (see text.RubyAdjust)
-// rOutProperties.push_back(
-// Property( C2U( "RubyAdjust" ),
-// PROP_CHAR_RUBY_ADJUST,
-// ::getCppuType( reinterpret_cast< const sal_Int16 * >(0)),
-// beans::PropertyAttribute::BOUND
-// | beans::PropertyAttribute::MAYBEDEFAULT ));
-// // RubyCharStyleName
-// rOutProperties.push_back(
-// Property( C2U( "RubyStyleName" ),
-// PROP_CHAR_RUBY_STYLE_NAME,
-// ::getCppuType( reinterpret_cast< const OUString * >(0)),
-// beans::PropertyAttribute::BOUND
-// | beans::PropertyAttribute::MAYBEDEFAULT ));
-// // RubyIsAbove
-// rOutProperties.push_back(
-// Property( C2U( "RubyIsAbove" ),
-// PROP_CHAR_RUBY_IS_ABOVE,
-// ::getBooleanCppuType(),
-// beans::PropertyAttribute::BOUND
-// | beans::PropertyAttribute::MAYBEDEFAULT ));
-// // CharNoHyphenation
-// rOutProperties.push_back(
-// Property( C2U( "InhibitHyphenation" ),
-// PROP_CHAR_INHIBIT_HYPHENATION,
-// ::getBooleanCppuType(),
-// beans::PropertyAttribute::BOUND
-// | beans::PropertyAttribute::MAYBEDEFAULT ));
-
// CharacterPropertiesAsian
// =====
// CharFontNameAsian
@@ -502,28 +420,14 @@ void CharacterProperties::AddDefaultsToMap(
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_POSTURE, awt::FontSlant_NONE );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_AUTO_KERNING, true );
::chart::PropertyHelper::setPropertyValueDefault< sal_Int16 >( rOutMap, PROP_CHAR_KERNING, 0 );
-
-// ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_CASE_MAPPING, style::CaseMap::NONE );
-// ::chart::PropertyHelper::setPropertyValueDefault< sal_Int16 >( rOutMap, PROP_CHAR_ROTATION, 0 );
-// ::chart::PropertyHelper::setPropertyValueDefault< sal_Int16 >( rOutMap, PROP_CHAR_SCALE_WIDTH, 71 );
-
-// ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_CROSSED_OUT, false );
::chart::PropertyHelper::setPropertyValueDefault< sal_Int16 >( rOutMap, PROP_CHAR_STRIKE_OUT, awt::FontStrikeout::NONE );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_WORD_MODE, false );
-// ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_FLASH, false );
-
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_LOCALE, aDefaultLocale );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_SHADOWED, false );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_CONTOURED, false );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_RELIEF, text::FontRelief::NONE );
-
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_EMPHASIS, text::FontEmphasis::NONE );
-// ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_RUBY_ADJUST, text::RubyAdjust_INDENT_BLOCK );
-// ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_RUBY_STYLE_NAME, ?? );
-// ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_RUBY_IS_ABOVE, true );
-// ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_INHIBIT_HYPHENATION, false );
-
// Asian (com.sun.star.style.CharacterPropertiesAsian)
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_ASIAN_CHAR_HEIGHT, fDefaultFontHeight );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_ASIAN_WEIGHT, awt::FontWeight::NORMAL );
diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx
index 7cf7c8e..fdacacd 100644
--- a/chart2/source/tools/FillProperties.cxx
+++ b/chart2/source/tools/FillProperties.cxx
@@ -77,15 +77,6 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s
| beans::PropertyAttribute::MAYBEVOID
| beans::PropertyAttribute::MAYBEDEFAULT ));
- //optional
-// rOutProperties.push_back(
-// Property( C2U( "FillTransparenceGradient" ),
-// FillProperties::PROP_FILL_TRANSPARENCE_GRADIENT,
-// ::getCppuType( reinterpret_cast< const awt::Gradient * >(0)),
-// beans::PropertyAttribute::BOUND
-// | beans::PropertyAttribute::MAYBEDEFAULT
-// | beans::PropertyAttribute::MAYBEVOID ));
-
rOutProperties.push_back(
Property( C2U( "FillGradientName" ),
FillProperties::PROP_FILL_GRADIENT_NAME,
@@ -101,15 +92,6 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
- //optional
-// rOutProperties.push_back(
-// Property( C2U( "FillGradient" ),
-// FillProperties::PROP_FILL_GRADIENT,
-// ::getCppuType( reinterpret_cast< const awt::Gradient * >(0)),
-// beans::PropertyAttribute::BOUND
-// | beans::PropertyAttribute::MAYBEDEFAULT
-// | beans::PropertyAttribute::MAYBEVOID ));
-
rOutProperties.push_back(
Property( C2U( "FillHatchName" ),
FillProperties::PROP_FILL_HATCH_NAME,
@@ -118,15 +100,6 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s
| beans::PropertyAttribute::MAYBEVOID
| beans::PropertyAttribute::MAYBEDEFAULT ));
- //optional
-// rOutProperties.push_back(
-// Property( C2U( "FillHatch" ),
-// FillProperties::PROP_FILL_HATCH,
-// ::getCppuType( reinterpret_cast< const drawing::Hatch * >(0)),
-// beans::PropertyAttribute::BOUND
-// | beans::PropertyAttribute::MAYBEDEFAULT
-// | beans::PropertyAttribute::MAYBEVOID ));
-
//bitmap properties see lcl_AddPropertiesToVector_only_BitmapProperties()
rOutProperties.push_back(
@@ -147,22 +120,6 @@ void lcl_AddPropertiesToVector_only_BitmapProperties( ::std::vector< ::com::sun:
| beans::PropertyAttribute::MAYBEVOID
| beans::PropertyAttribute::MAYBEDEFAULT ));
- //optional
-// rOutProperties.push_back(
-// Property( C2U( "FillBitmap" ),
-// FillProperties::PROP_FILL_BITMAP,
-// ::getCppuType( reinterpret_cast< const uno::Reference< awt::XBitmap > * >(0)),
-// beans::PropertyAttribute::BOUND
-// | beans::PropertyAttribute::MAYBEDEFAULT ));
-
- //optional
-// rOutProperties.push_back(
-// Property( C2U( "FillBitmapURL" ),
-// FillProperties::PROP_FILL_BITMAP_URL,
-// ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
-// beans::PropertyAttribute::BOUND
-// | beans::PropertyAttribute::MAYBEDEFAULT ));
-
rOutProperties.push_back(
Property( C2U( "FillBitmapOffsetX" ),
FillProperties::PROP_FILL_BITMAP_OFFSETX,
diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx
index f2d0566..8837a8a 100644
--- a/chart2/source/tools/LifeTime.cxx
+++ b/chart2/source/tools/LifeTime.cxx
@@ -247,7 +247,6 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert )
::getCppuType((const uno::Reference< util::XCloseListener >*)0) );;
if( pIC )
{
- //lang::EventObject aEvent( static_cast< util::XCloseable*>(xCloseable) );
lang::EventObject aEvent( xCloseable );
::cppu::OInterfaceIteratorHelper aIt( *pIC );
while( aIt.hasMoreElements() )
@@ -376,7 +375,6 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert )
::getCppuType((const uno::Reference< util::XCloseListener >*)0) );;
if( pIC )
{
- //lang::EventObject aEvent( static_cast< util::XCloseable*>(xCloseable) );
lang::EventObject aEvent( xCloseable );
::cppu::OInterfaceIteratorHelper aIt( *pIC );
while( aIt.hasMoreElements() )
diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx
index d1459ab..33ba7e7 100644
--- a/chart2/source/tools/WrappedIgnoreProperty.cxx
+++ b/chart2/source/tools/WrappedIgnoreProperty.cxx
@@ -96,7 +96,6 @@ beans::PropertyState WrappedIgnoreProperty::getPropertyState( const Reference< b
void WrappedIgnoreProperties::addIgnoreLineProperties( std::vector< WrappedProperty* >& rList )
{
rList.push_back( new WrappedIgnoreProperty( C2U( "LineStyle" ), uno::makeAny( drawing::LineStyle_SOLID ) ) );
-// rList.push_back( new WrappedIgnoreProperty( C2U( "LineDash" ), uno::makeAny( drawing::LineDash() ) ) );
rList.push_back( new WrappedIgnoreProperty( C2U( "LineDashName" ), uno::makeAny( rtl::OUString() ) ) );
rList.push_back( new WrappedIgnoreProperty( C2U( "LineColor" ), uno::makeAny( sal_Int32(0) ) ) );
rList.push_back( new WrappedIgnoreProperty( C2U( "LineTransparence" ), uno::makeAny( sal_Int16(0) ) ) );
diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index fa533f5..211435f 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -402,16 +402,7 @@ AxisLabelProperties::AxisLabelProperties()
, nRhythm( 1 )
, bRhythmIsFix(false)
{
- /*
- aLocale.Language = C2U( "en" );
- aLocale.Country = C2U( "US" );
-
- //aLocale.Language = C2U( "ar" );
- //aLocale.Country = C2U( "IR" );
- //aLocale.Language = C2U( "ja" );
- //aLocale.Country = C2U( "JP" );
- */
}
void AxisLabelProperties::init( const uno::Reference< XAxis >& xAxisModel )
diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
index 046f378..31437d9 100644
--- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
@@ -121,9 +121,6 @@ void VCartesianCoordinateSystem::createVAxisList(
{
m_aAxisMap.clear();
- //if(!m_xLogicTargetForAxes.is() || !m_xFinalTarget.is() || !m_xCooSysModel.is() )
- // return;
-
sal_Int32 nDimensionCount = m_xCooSysModel->getDimension();
bool bSwapXAndY = this->getPropertySwapXAndYAxis();
@@ -177,18 +174,11 @@ void VCartesianCoordinateSystem::createVAxisList(
if( aAxisProperties.m_pExplicitCategoriesProvider->hasComplexCategories() )
aAxisProperties.m_bComplexCategories = true;
}
- //-------------------
+
::boost::shared_ptr< VAxisBase > apVAxis( new VCartesianAxis(aAxisProperties,xNumberFormatsSupplier,nDimensionIndex,nDimensionCount) );
tFullAxisIndex aFullAxisIndex( nDimensionIndex, nAxisIndex );
m_aAxisMap[aFullAxisIndex] = apVAxis;
apVAxis->set3DWallPositions( m_eLeftWallPos, m_eBackWallPos, m_eBottomPos );
-
- //apVAxis->setExplicitScaleAndIncrement( this->getExplicitScale( nDimensionIndex, nAxisIndex ), this->getExplicitIncrement( nDimensionIndex, nAxisIndex ) );
- //apVAxis->initPlotter(m_xLogicTargetForAxes,m_xFinalTarget,m_xShapeFactory
- // , this->createCIDForAxis( xAxis, nDimensionIndex, nAxisIndex ) );
- //if(2==nDimensionCount)
- // apVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen );
- //apVAxis->setScales( this->getExplicitScales(nDimensionIndex,nAxisIndex), bSwapXAndY );
apVAxis->initAxisLabelProperties(rFontReferenceSize,rMaximumSpaceForLabels);
}
}
diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.cxx b/chart2/source/view/axes/VPolarCoordinateSystem.cxx
index c098ff5..b21438d 100644
--- a/chart2/source/view/axes/VPolarCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VPolarCoordinateSystem.cxx
@@ -81,13 +81,7 @@ void VPolarCoordinateSystem::createVAxisList(
)
{
m_aAxisMap.clear();
-
- //if(!m_xLogicTargetForAxes.is() || !m_xFinalTarget.is() || !m_xCooSysModel.is() )
- // return;
-
sal_Int32 nDimensionCount = m_xCooSysModel->getDimension();
-// bool bSwapXAndY = this->getPropertySwapXAndYAxis();
-
sal_Int32 nDimensionIndex = 0;
//create angle axis (dimension index 0)
@@ -103,20 +97,10 @@ void VPolarCoordinateSystem::createVAxisList(
aAxisProperties.init();
if(aAxisProperties.m_bDisplayLabels)
aAxisProperties.m_nNumberFormatKey = this->getNumberFormatKeyForAxis( xAxis, xNumberFormatsSupplier );
- //-------------------
+
::boost::shared_ptr< VAxisBase > apVAxis( VPolarAxis::createAxis( aAxisProperties,xNumberFormatsSupplier,nDimensionIndex,nDimensionCount) );
tFullAxisIndex aFullAxisIndex( nDimensionIndex, nAxisIndex );
m_aAxisMap[aFullAxisIndex] = apVAxis;
-
- //apVAxis->setExplicitScaleAndIncrement( this->getExplicitScale( nDimensionIndex, nAxisIndex ), this->getExplicitIncrement(nDimensionIndex, nAxisIndex) );
- //apVAxis->initPlotter(m_xLogicTargetForAxes,m_xFinalTarget,m_xShapeFactory
- // , this->createCIDForAxis( xAxis, nDimensionIndex, nAxisIndex ) );
- //VPolarAxis* pVPolarAxis = dynamic_cast< VPolarAxis* >( apVAxis.get() );
- //if( pVPolarAxis )
- // pVPolarAxis->setIncrements( this->getExplicitIncrements( nDimensionIndex, nAxisIndex ) );
- //if(2==nDimensionCount)
- // apVAxis->setTransformationSceneToScreen( m_aMatrixSceneToScreen );
- //apVAxis->setScales( this->getExplicitScales( nDimensionIndex, nAxisIndex ), bSwapXAndY );
apVAxis->initAxisLabelProperties(rFontReferenceSize,rMaximumSpaceForLabels);
}
}
diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx
index ef5fcfa..feaba78 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -54,10 +54,6 @@ using namespace ::com::sun::star;
using namespace ::rtl::math;
using namespace ::com::sun::star::chart2;
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-
BarChart::BarChart( const uno::Reference<XChartType>& xChartTypeModel
, sal_Int32 nDimensionCount )
: VSeriesPlotter( xChartTypeModel, nDimensionCount )
@@ -947,18 +943,8 @@ void BarChart::createShapes()
}
/* @todo remove series shapes if empty
- //remove and delete point-group-shape if empty
- if(!xSeriesGroupShape_Shapes->getCount())
- {
- (*aSeriesIter)->m_xShape.set(NULL);
- m_xLogicTarget->remove(xSeriesGroupShape_Shape);
- }
*/
- //remove and delete series-group-shape if empty
-
- //... todo
-
OSL_TRACE( "\nPPPPPPPPP<<<<<<<<<<<< bar chart :: createShapes():: skipped points: %d created points: %d", nSkippedPoints, nCreatedPoints );
}
diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx
index 019bab2..6112c81 100644
--- a/chart2/source/view/charttypes/Splines.cxx
+++ b/chart2/source/view/charttypes/Splines.cxx
@@ -307,8 +307,6 @@ void BVector(double x, sal_Int32 n, sal_Int32 k, double *b, const double *t)
} // anonymous namespace
//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
void SplineCalculater::CalculateCubicSplines(
const drawing::PolyPolygonShape3D& rInput
@@ -350,11 +348,6 @@ void SplineCalculater::CalculateCubicSplines(
for( sal_Int32 nIndex=1; nIndex<=nMaxIndexPoints; nIndex++ )
{
// The euclidian distance leads to curve loops for functions having single extreme points
- //aParameter[nIndex]=aParameter[nIndex-1]+
- //sqrt( (pOldX[nIndex]-pOldX[nIndex-1])*(pOldX[nIndex]-pOldX[nIndex-1])+
- //(pOldY[nIndex]-pOldY[nIndex-1])*(pOldY[nIndex]-pOldY[nIndex-1])+
- //(pOldZ[nIndex]-pOldZ[nIndex-1])*(pOldZ[nIndex]-pOldZ[nIndex-1]));
-
// use increment of 1 instead
aParameter[nIndex]=aParameter[nIndex-1]+1;
}
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 27cd04b..fc1fdde 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -90,8 +90,6 @@ using ::com::sun::star::uno::Sequence;
using rtl::OUString;
//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
VDataSeriesGroup::CachedYValues::CachedYValues()
: m_bValuesDirty(true)
@@ -145,8 +143,6 @@ sal_Int32 VDataSeriesGroup::getSeriesCount() const
}
//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
VSeriesPlotter::VSeriesPlotter( const uno::Reference<XChartType>& xChartTypeModel
, sal_Int32 nDimensionCount, bool bCategoryXAxis )
@@ -406,7 +402,7 @@ OUString VSeriesPlotter::getLabelTextForValue( VDataSeries& rDataSeries
{
sal_Unicode cDecSeparator = '.';//@todo get this locale dependent
aNumber = ::rtl::math::doubleToUString( fValue, rtl_math_StringFormat_G /*rtl_math_StringFormat*/
- , 3/*DecPlaces*/ , cDecSeparator /*,sal_Int32 const * pGroups*/ /*,sal_Unicode cGroupSeparator*/ ,false /*bEraseTrailingDecZeros*/ );
+ , 3/*DecPlaces*/ , cDecSeparator, false /*bEraseTrailingDecZeros*/ );
}
return aNumber;
}
@@ -684,7 +680,7 @@ double lcl_getErrorBarLogicLength(
uno::Reference< chart2::data::XDataSource > xErrorBarData( xProp, uno::UNO_QUERY );
if( xErrorBarData.is())
fResult = StatisticsHelper::getErrorFromDataSource(
- xErrorBarData, nIndex, bPositive /*, true */ /* y-error */ );
+ xErrorBarData, nIndex, bPositive);
}
break;
}
@@ -1042,7 +1038,6 @@ void VSeriesPlotter::createRegressionCurveEquationShapes(
if( bShowCorrCoeff )
{
-// xEquationProperties->getPropertyValue( C2U("Separator")) >>= aSep;
aFormula.append( aSep );
}
}
@@ -1093,15 +1088,6 @@ void VSeriesPlotter::createRegressionCurveEquationShapes(
xEquationTarget, aFormula.makeStringAndClear(),
aNames, aValues, ShapeFactory::makeTransformation( aScreenPosition2D ));
-// // adapt font sizes
-// awt::Size aOldRefSize;
-// if( xTitleProperties->getPropertyValue( C2U("ReferencePageSize")) >>= aOldRefSize )
-// {
-// uno::Reference< beans::XPropertySet > xShapeProp( xTextShape, uno::UNO_QUERY );
-// if( xShapeProp.is())
-// RelativeSizeHelper::adaptFontSizes( xShapeProp, aOldRefSize, m_aPageReferenceSize );
-// }
-
OSL_ASSERT( xTextShape.is());
if( xTextShape.is())
{
diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx
index 8c3a9fa..96ff733 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -198,8 +198,7 @@ void VDiagram::createShapes_2d()
m_xWall2D = uno::Reference< drawing::XShape >(
m_xShapeFactory->createInstance( C2U(
"com.sun.star.drawing.RectangleShape" ) ), uno::UNO_QUERY );
- //m_xWall2D->setPosition(m_aAvailablePosIncludingAxes);
- //m_xWall2D->setSize(m_aAvailableSizeIncludingAxes);
+
xGroupForWall->add(m_xWall2D);
uno::Reference< beans::XPropertySet > xProp( m_xWall2D, uno::UNO_QUERY );
if( xProp.is())
@@ -354,9 +353,7 @@ void VDiagram::adjustAspectRatio3d( const awt::Size& rAvailableSize )
double fW = rAvailableSize.Width;
double fH = rAvailableSize.Height;
-// double cx = fabs(cos(m_fXAnglePi));
double sx = fabs(sin(m_fXAnglePi));
-// double cy = fabs(cos(m_fYAnglePi));
double sy = fabs(sin(m_fYAnglePi));
double cz = fabs(cos(m_fZAnglePi));
double sz = fabs(sin(m_fZAnglePi));
@@ -420,20 +417,6 @@ void VDiagram::adjustAspectRatio3d( const awt::Size& rAvailableSize )
else
fScaleY = 1.0;//looking from top or bottom the height is irrelevant
- /*
- //fW*zoomfactor == fScaleX*cy*cz + fScaleY*sz*cy + fScaleZ*sy*cx;
- //fH*zoomfactor == fScaleY*cx*cz + fScaleX*sz*cy + fScaleZ*sx*cz;
- //==> fScaleY*(sz*cy*fH -cx*cz*fW) = fScaleX*(sz*cy*fW - cy*cz*fH) + fScaleZ*(sx*cz*fW - sy*cx*fH);
- double fDivide = sz*cy*fH -cx*cz*fW;
- if( !::basegfx::fTools::equalZero(fDivide) )
- {
- fScaleY = ( fScaleX*(sz*cy*fW - cy*cz*fH)
- + fScaleZ*(sx*cz*fW - sy*cx*fH) ) / fDivide;
- lcl_ensureScaleValue(fScaleY);
- }
- else
- fScaleY = 1.0;//looking from top or bottom hieght is irrelevant
- */
}
else if( fScaleY>0 && fScaleZ>0 )
{
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index 29560e4..b1624e4 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -88,25 +88,6 @@ double lcl_CalcViewFontSize(
if( (xProp->getPropertyValue( C2U( "ReferencePageSize" )) >>= aPropRefSize) &&
(aPropRefSize.Height > 0))
{
- // todo: find out if asian text is really used
-// Reference< beans::XPropertySetInfo >xInfo( xProp, uno::UNO_QUERY );
-// float fFontHeight2 = fFontHeight;
-// if( xInfo.is() &&
-// xInfo->hasPropertyByName(C2U("CharHeightAsian")) &&
-// (xProp->getPropertyValue(C2U("CharHeightAsian")) >>= fFontHeight2) &&
-// fFontHeight2 > fFontHeight )
-// {
-// fFontHeight = fFontHeight2;
-// }
-
-// if( xInfo.is() &&
-// xInfo->hasPropertyByName(C2U("CharHeightComplex")) &&
-// (xProp->getPropertyValue(C2U("CharHeightComplex")) >>= fFontHeight2) &&
-// fFontHeight2 > fFontHeight )
-// {
-// fFontHeight = fFontHeight2;
-// }
-
fResult = ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize );
}
}
diff --git a/chart2/source/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx
index 7c44b76..87ad939 100644
--- a/chart2/source/view/main/VTitle.cxx
+++ b/chart2/source/view/main/VTitle.cxx
@@ -162,17 +162,12 @@ void VTitle::createShapes(
{
drawing::TextHorizontalAdjust eHorizontalAdjust = drawing::TextHorizontalAdjust_CENTER;
drawing::TextVerticalAdjust eVerticalAdjust = drawing::TextVerticalAdjust_CENTER;
- //text::WritingMode eWritingMode = text::WritingMode_LR_TB;//@todo get correct one
aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextHorizontalAdjust"), uno::makeAny(eHorizontalAdjust) ) ); // drawing::TextHorizontalAdjust
aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextVerticalAdjust"), uno::makeAny(eVerticalAdjust) ) ); //drawing::TextVerticalAdjust
- //aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextWritingMode"), uno::makeAny(eWritingMode) ) ); //text::WritingMode
aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextAutoGrowHeight"), uno::makeAny(sal_True) ) ); // sal_Bool
aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextAutoGrowWidth"), uno::makeAny(sal_True) ) ); // sal_Bool
- ////aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextMaximumFrameWidth"), uno::makeAny(rSize.Width) ) ); //sal_Int32
- ////aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextMaximumFrameHeight"), uno::makeAny(rSize.Height) ) ); //sal_Int32
-
//set name/classified ObjectID (CID)
if( m_aCID.getLength() )
aValueMap.insert( tPropertyNameValueMap::value_type( C2U("Name"), uno::makeAny( m_aCID ) ) ); //CID rtl::OUString
@@ -237,11 +232,8 @@ void VTitle::createShapes(
bool bHasRefPageSize =
( xTitleProperties->getPropertyValue( C2U("ReferencePageSize")) >>= aOldRefSize );
- //for( nN=0; nN<aStringList.getLength();nN++ ) //portion wise fromatting does not work still
if( aStringList.getLength()>0 )
{
- //uno::Reference< beans::XPropertySet > xTargetProps( aCursorList[nN], uno::UNO_QUERY );
- //uno::Reference< beans::XPropertySet > xSourceProps( aStringList[nN], uno::UNO_QUERY );
uno::Reference< beans::XPropertySet > xTargetProps( xShape, uno::UNO_QUERY );
uno::Reference< beans::XPropertySet > xSourceProps( aStringList[0], uno::UNO_QUERY );
PropertyMapper::setMappedProperties( xTargetProps, xSourceProps, PropertyMapper::getPropertyNameMapForCharacterProperties() );
More information about the Libreoffice-commits
mailing list