Hi,
This patch removes commented out code from the calc/chart2 directories.
Hopefully, next time around I'll be able to do something more "functional".
By the way, I haven't compiled the code as I've been just removing commented
lines.
Regards,
Alfonso
P.S.: I sent a subscription request to the distribution list some time ago but I
haven't received any reply for now. I guess there's a backlog of stuff.
From c92963ed3e10cc1c91264ed363964ea73f6e1633 Mon Sep 17 00:00:00 2001
From: Alfonso Eusebio <alfonso_eusebio@yahoo.co.uk>
Date: Mon, 24 Jan 2011 23:07:13 +0000
Subject: [PATCH] Removed commented out code from calc-chart2
Removed lines of code that where commented out.
---
chart2/source/controller/dialogs/DataBrowser.cxx | 3 -
chart2/source/controller/dialogs/DataBrowser.hxx | 2 -
.../source/controller/dialogs/DataBrowserModel.cxx | 1 -
.../controller/dialogs/ObjectNameProvider.cxx | 13 ---
chart2/source/controller/dialogs/tp_DataSource.cxx | 5 -
chart2/source/controller/main/ChartController.cxx | 34 +-------
.../controller/main/ChartController_Properties.cxx | 12 +--
.../controller/main/ChartController_TextEdit.cxx | 18 +----
.../controller/main/ChartController_Tools.cxx | 45 ---------
.../controller/main/ChartController_Window.cxx | 47 ++---------
chart2/source/controller/main/CommandDispatch.cxx | 2 -
chart2/source/controller/main/SelectionHelper.cxx | 9 --
chart2/source/inc/OPropertySet.hxx | 33 -------
chart2/source/model/filter/XMLFilter.cxx | 18 ----
chart2/source/model/template/ChartType.cxx | 6 --
chart2/source/model/template/ChartType.hxx | 12 ---
chart2/source/model/template/ScatterChartType.cxx | 7 --
chart2/source/tools/CachedDataSequence.cxx | 8 --
chart2/source/tools/CharacterProperties.cxx | 96 --------------------
chart2/source/tools/DataSourceHelper.cxx | 14 ---
chart2/source/tools/FillProperties.cxx | 43 ---------
chart2/source/tools/LifeTime.cxx | 2 -
chart2/source/tools/OPropertySet.cxx | 79 ----------------
chart2/source/tools/WrappedIgnoreProperty.cxx | 7 --
chart2/source/tools/WrappedPropertySet.cxx | 4 -
chart2/source/view/axes/TickmarkHelper.cxx | 6 --
chart2/source/view/axes/VAxisProperties.cxx | 9 --
.../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/ChartView.cxx | 64 +-------------
chart2/source/view/main/ShapeFactory.cxx | 49 +----------
chart2/source/view/main/VLegend.cxx | 19 ----
chart2/source/view/main/VTitle.cxx | 8 --
37 files changed, 21 insertions(+), 742 deletions(-)
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 d41fa82..5d090e7 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -577,13 +577,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 )
@@ -614,12 +607,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 d5cbb4d..2c18ac9 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;
@@ -1257,13 +1246,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
@@ -1271,13 +1254,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
}
//-----------------------------------------------------------------
@@ -1417,15 +1394,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 dff8e65..93a9925 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/ChartController_TextEdit.cxx
b/chart2/source/controller/main/ChartController_TextEdit.cxx
index 083eacf..20e65db 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -58,10 +58,8 @@ namespace chart
{
//.............................................................................
using namespace ::com::sun::star;
-//using namespace ::com::sun::star::chart2;
//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
void SAL_CALL ChartController::executeDispatch_EditText( const Point* pMousePixel )
{
@@ -69,7 +67,6 @@ void SAL_CALL ChartController::executeDispatch_EditText( const Point* pMousePixe
}
//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
void ChartController::StartTextEdit( const Point* pMousePixel )
{
@@ -81,10 +78,6 @@ void ChartController::StartTextEdit( const Point* pMousePixel )
m_xUndoManager->preAction( getModel());
SdrOutliner* pOutliner = m_pDrawViewWrapper->getOutliner();
- //pOutliner->SetRefDevice(m_pChartWindow);
- //pOutliner->SetStyleSheetPool((SfxStyleSheetPool*)pStyleSheetPool);
- //pOutliner->SetDefaultLanguage( eLang );
- //pOutliner->SetHyphenator( xHyphenator );
//#i77362 change notification for changes on additional shapes are missing
uno::Reference< beans::XPropertySet > xChartViewProps( m_xChartView, uno::UNO_QUERY );
@@ -103,11 +96,7 @@ void ChartController::StartTextEdit( const Point* pMousePixel )
if(bEdit)
{
// set undo manager at topmost shell ( SdDrawTextObjectBar )
- /*
- if( pViewSh )
- pViewSh->GetViewFrame()->GetDispatcher()->GetShell( 0 )->
- SetUndoManager(&pOutliner->GetUndoManager());
- */
+
m_pDrawViewWrapper->SetEditMode();
// #i12587# support for shapes in chart
@@ -188,7 +177,6 @@ bool ChartController::EndTextEdit()
}
//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter()
{
@@ -236,8 +224,6 @@ void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter()
// attributes become unique (sel. has to be erased anyway)
pOutlinerView->InsertText(String());
- //SfxUndoManager& rUndoMgr = pOutliner->GetUndoManager();
- //rUndoMgr.EnterListAction( String( SchResId( STR_UNDO_INSERT_SPECCHAR )), String(
SchResId( STR_UNDO_INSERT_SPECCHAR )));
pOutlinerView->InsertText(aString, TRUE);
ESelection aSel = pOutlinerView->GetSelection();
@@ -245,8 +231,6 @@ void SAL_CALL ChartController::executeDispatch_InsertSpecialCharacter()
aSel.nStartPos = aSel.nEndPos;
pOutlinerView->SetSelection(aSel);
- //rUndoMgr.LeaveListAction();
-
// show changes
pOutliner->SetUpdateMode(TRUE);
pOutlinerView->ShowCursor();
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx
b/chart2/source/controller/main/ChartController_Tools.cxx
index a6353c9..221c2b5 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -155,51 +155,6 @@ bool lcl_deleteDataCurve(
return bResult;
}
-// void lcl_CopyPageContentToPage(
-// const Reference< drawing::XDrawPage > & xSourcePage,
-// const Reference< drawing::XDrawPage > & xDestPage )
-// {
-// try
-// {
-// Reference< container::XIndexAccess > xSourceIA( xSourcePage, uno::UNO_QUERY_THROW );
-// sal_Int32 nCount( xSourceIA->getCount());
-// for( sal_Int32 i=0; i<nCount; ++i )
-// {
-// Reference< drawing::XShape > xShape;
-// if( xSourceIA->getByIndex( i ) >>= xShape )
-// xDestPage->add( xShape );
-// }
-// }
-// catch( const uno::Exception & ex )
-// {
-// ASSERT_EXCEPTION( ex );
-// }
-// }
-
-// // copies all shapes on all pages of xSource to the only page of xDestination
-// void lcl_CopyShapesToChart(
-// const Reference< frame::XModel > & xSource, const Reference< frame::XModel > & xDestination
)
-// {
-// try
-// {
-// Reference< drawing::XDrawPageSupplier > xDestPGSupp( xDestination, uno::UNO_QUERY_THROW
);
-// Reference< drawing::XDrawPage > xDestPage( xDestPGSupp->getDrawPage());
-// Reference< drawing::XDrawPagesSupplier > xSourcePGsSupp( xSource, uno::UNO_QUERY_THROW
);
-// Reference< drawing::XDrawPages > xSourcePages( xSourcePGsSupp->getDrawPages());
-
-// sal_Int32 nCount( xSourcePages->getCount());
-// for( sal_Int32 i=0; i<nCount; ++i )
-// {
-// Reference< drawing::XDrawPage > xSourcePage( xSourcePages->getByIndex( i ),
uno::UNO_QUERY_THROW );
-// lcl_CopyPageContentToPage( xSourcePage, xDestPage );
-// }
-// }
-// catch( const uno::Exception & ex )
-// {
-// ASSERT_EXCEPTION( ex );
-// }
-// }
-
} // anonymous namespace
diff --git a/chart2/source/controller/main/ChartController_Window.cxx
b/chart2/source/controller/main/ChartController_Window.cxx
index b0882f8..94eccaf 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -509,7 +509,7 @@ void ChartController::execute_Paint( const Rectangle& rRect )
try
{
uno::Reference< frame::XModel > xModel( getModel() );
- //DBG_ASSERT( xModel.is(), "ChartController::execute_Paint: have no model to paint");
+
if( !xModel.is() )
return;
@@ -558,8 +558,6 @@ bool isDoubleClick( const MouseEvent& rMEvt )
}
//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
void ChartController::startDoubleClickWaiting()
{
@@ -767,8 +765,6 @@ void ChartController::execute_MouseMove( const MouseEvent& rMEvt )
pDrawViewWrapper->MovAction( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
}
- //?? pDrawViewWrapper->GetPageView()->DragPoly();
-
impl_SetMousePointer( rMEvt );
}
void ChartController::execute_Tracking( const TrackingEvent& /* rTEvt */ )
@@ -920,7 +916,6 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt )
execute_DoubleClick( &aMousePixel );
}
- //@todo ForcePointer(&rMEvt);
pWindow->ReleaseMouse();
if( m_aSelection.isSelectionDifferentFromBeforeMouseDown() )
@@ -974,21 +969,18 @@ void ChartController::execute_Resize()
}
void ChartController::execute_Activate()
{
- ///// pDrawViewWrapper->SetEditMode(TRUE);
+
}
void ChartController::execute_Deactivate()
{
- /*
- pDrawViewWrapper->SetEditMode(FALSE);
- this->ReleaseMouse();
- */
+
}
void ChartController::execute_GetFocus()
{
}
void ChartController::execute_LoseFocus()
{
- //this->ReleaseMouse();
+
}
void ChartController::execute_Command( const CommandEvent& rCEvt )
@@ -1087,7 +1079,6 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
}
}
- //const sal_Int32 nIdBeforeFormat = nUniqueId;
if( bIsPoint )
{
if( bHasDataLabelAtPoint )
@@ -1139,10 +1130,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
if( bHasYErrorBars )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++,
C2U(".uno:FormatYErrorBars") );
- //if( nIdBeforeFormat != nUniqueId )
- xPopupMenu->insertSeparator( -1 );
-
- //const sal_Int32 nIdBeforeInsert = nUniqueId;
+ xPopupMenu->insertSeparator( -1 );
if( !bHasDataLabelsAtSeries )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++,
C2U(".uno:InsertDataLabels") );
@@ -1155,10 +1143,6 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
if( !bHasYErrorBars )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++,
C2U(".uno:InsertYErrorBars") );
- //if( nIdBeforeInsert != nUniqueId )
- // xPopupMenu->insertSeparator( -1 );
-
- //const sal_Int32 nIdBeforeDelete = nUniqueId;
if( bHasDataLabelsAtSeries || ( bHasDataLabelsAtPoints &&
bHasFormattedDataPointsOtherThanSelected ) )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++,
C2U(".uno:DeleteDataLabels") );
@@ -1174,8 +1158,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
if( bHasFormattedDataPointsOtherThanSelected )
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId++,
C2U(".uno:ResetAllDataPoints"));
- //if( nIdBeforeDelete != nUniqueId )
- xPopupMenu->insertSeparator( -1 );
+ xPopupMenu->insertSeparator( -1 );
lcl_insertMenuCommand( xPopupMenu, xMenuEx, nUniqueId, C2U(".uno:ArrangeRow"));
uno::Reference< awt::XPopupMenu > xArrangePopupMenu(
@@ -1328,7 +1311,6 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
KeyCode aKeyCode( rKEvt.GetKeyCode());
sal_uInt16 nCode = aKeyCode.GetCode();
-// bool bShift = aKeyCode.IsShift();
bool bAlternate = aKeyCode.IsMod2();
if( m_apAccelExecute.get() )
@@ -1348,8 +1330,6 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
}
}
- //if( m_pDrawViewWrapper->IsAction() );
-
// keyboard accessibility
ObjectType eObjectType = ObjectIdentifier::getObjectType( m_aSelection.getSelectedCID() );
if( ! bReturn )
@@ -1562,21 +1542,6 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
}
}
- /* old chart:
- // Ctrl-Shift-R: Repaint
- if (!bReturn && GetWindow())
- {
- KeyCode aKeyCode = rKEvt.GetKeyCode();
-
- if (aKeyCode.IsMod1() && aKeyCode.IsShift()
- && aKeyCode.GetCode() == KEY_R)
- {
- // 3D-Kontext wieder zerstoeren
- GetWindow()->Invalidate();
- bReturn = TRUE;
- }
- }
- */
return bReturn;
}
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/controller/main/SelectionHelper.cxx
b/chart2/source/controller/main/SelectionHelper.cxx
index 6cd6218..7cab148 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -51,7 +51,6 @@ namespace chart
{
//.............................................................................
using namespace ::com::sun::star;
-//using namespace ::com::sun::star::chart2;
namespace
{
@@ -333,8 +332,6 @@ bool Selection::isAdditionalShapeSelected() const
}
//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
//static
bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject
@@ -607,12 +604,6 @@ bool SelectionHelper::getMarkHandles( SdrHdlList& rHdlList )
//if a child with name MarkHandles exsists
//this child is marked instead of the logical selected object
-/*
- //if a special mark object was found
- //that object should be used for marking only
- if( m_pMarkObj != m_pSelectedObj)
- return false;
-*/
//if a special mark object was found
//that object should be used to create handles from
if( m_pMarkObj && m_pMarkObj != m_pSelectedObj)
diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx
index 815ef6a..fbb27c5 100644
--- a/chart2/source/inc/OPropertySet.hxx
+++ b/chart2/source/inc/OPropertySet.hxx
@@ -56,14 +56,10 @@ class OOO_DLLPUBLIC_CHARTTOOLS OPropertySet :
// includes beans::XPropertySet, XMultiPropertySet and XFastPropertySet
public ::cppu::OPropertySetHelper,
// includes uno::XWeak (and XInterface, esp. ref-counting)
-// public virtual ::cppu::OWeakObject,
-
-// public virtual ::com::sun::star::lang::XServiceInfo,
public ::com::sun::star::lang::XTypeProvider,
public ::com::sun::star::beans::XPropertyState,
public ::com::sun::star::beans::XMultiPropertyStates,
public ::com::sun::star::style::XStyleSupplier
-// public ::com::sun::star::beans::XFastPropertyState
{
public:
OPropertySet( ::osl::Mutex & rMutex );
@@ -206,20 +202,6 @@ protected:
// ____ XInterface ____
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type&
aType )
throw (::com::sun::star::uno::RuntimeException);
-// virtual void SAL_CALL acquire() throw ();
-// virtual void SAL_CALL release() throw ();
-
-
- // ____ XServiceInfo ____
-// virtual ::rtl::OUString SAL_CALL
-// getImplementationName()
-// throw (::com::sun::star::uno::RuntimeException);
-// virtual sal_Bool SAL_CALL
-// supportsService( const ::rtl::OUString& ServiceName )
-// throw (::com::sun::star::uno::RuntimeException);
-// virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
-// getSupportedServiceNames()
-// throw (::com::sun::star::uno::RuntimeException);
// ____ XTypeProvider ____
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL
@@ -271,21 +253,6 @@ protected:
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
- // ____ XFastPropertyState ____
-// virtual ::com::sun::star::beans::PropertyState SAL_CALL getFastPropertyState( sal_Int32
nHandle )
-// throw (::com::sun::star::beans::UnknownPropertyException,
-// ::com::sun::star::uno::RuntimeException);
-// virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL
getFastPropertyStates( const ::com::sun::star::uno::Sequence< sal_Int32 >& aHandles )
-// throw (::com::sun::star::beans::UnknownPropertyException,
-// ::com::sun::star::uno::RuntimeException);
-// virtual void SAL_CALL setFastPropertyToDefault( sal_Int32 nHandle )
-// throw (::com::sun::star::beans::UnknownPropertyException,
-// ::com::sun::star::uno::RuntimeException);
-// virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyDefault( sal_Int32 nHandle )
-// throw (::com::sun::star::beans::UnknownPropertyException,
-// ::com::sun::star::lang::WrappedTargetException,
-// ::com::sun::star::uno::RuntimeException);
-
// ____ XMultiPropertySet ____
virtual void SAL_CALL setPropertyValues(
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames,
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 34919a7..9cb4d18 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/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx
index 26052c6..3e400b7 100644
--- a/chart2/source/model/template/ChartType.hxx
+++ b/chart2/source/model/template/ChartType.hxx
@@ -139,23 +139,11 @@ protected:
getPropertySetInfo()
throw (::com::sun::star::uno::RuntimeException);
-// virtual sal_Bool SAL_CALL convertFastPropertyValue
-// ( ::com::sun::star::uno::Any & rConvertedValue,
-// ::com::sun::star::uno::Any & rOldValue,
-// sal_Int32 nHandle,
-// const ::com::sun::star::uno::Any& rValue )
-// throw (::com::sun::star::lang::IllegalArgumentException);
-
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations
DECLARE_XTYPEPROVIDER()
- // not implemented
-// ____ XCloneable ____
-// virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL
createClone()
-// throw (::com::sun::star::uno::RuntimeException);
-
protected:
::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >
m_xModifyEventForwarder;
diff --git a/chart2/source/model/template/ScatterChartType.cxx
b/chart2/source/model/template/ScatterChartType.cxx
index 56a8992..46f3618 100644
--- a/chart2/source/model/template/ScatterChartType.cxx
+++ b/chart2/source/model/template/ScatterChartType.cxx
@@ -217,13 +217,6 @@ uno::Sequence< ::rtl::OUString > SAL_CALL
ScatterChartType::getSupportedOptional
{
static uno::Sequence< ::rtl::OUString > aOptRolesSeq;
-// if( aOptRolesSeq.getLength() == 0 )
-// {
-// aOptRolesSeq.realloc( 2 );
-// aOptRolesSeq[0] = C2U( "error-bars-x" );
-// aOptRolesSeq[1] = C2U( "error-bars-y" );
-// }
-
return aOptRolesSeq;
}
diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx
index c8014de..3a8f855 100644
--- a/chart2/source/tools/CachedDataSequence.cxx
+++ b/chart2/source/tools/CachedDataSequence.cxx
@@ -312,14 +312,6 @@ Sequence< OUString > SAL_CALL CachedDataSequence::getTextualData()
// \--
}
-// void SAL_CALL CachedDataSequence::setTextualData( const Sequence< OUString >& aData )
-// throw (uno::RuntimeException)
-// {
-// // /--
-// MutexGuard aGuard( GetMutex() );
-// Impl_setTextualData( aData );
-// // \--
-// }
// ________ XDataSequence ________
Sequence< Any > SAL_CALL CachedDataSequence::getData()
diff --git a/chart2/source/tools/CharacterProperties.cxx
b/chart2/source/tools/CharacterProperties.cxx
index c93a5c3..d2d5827 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/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index c607448..2ed6c68 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -371,9 +371,7 @@ bool DataSourceHelper::allArgumentsForRectRangeDetected(
{
bool bHasDataRowSource = false;
bool bHasFirstCellAsLabel = false;
-// bool bHasHasCategories = false;
bool bHasCellRangeRepresentation = false;
-// bool bHasSequenceMapping = false;
uno::Reference< data::XDataProvider > xDataProvider( xChartDocument->getDataProvider() );
if( !xDataProvider.is() )
@@ -399,24 +397,12 @@ bool DataSourceHelper::allArgumentsForRectRangeDetected(
bHasFirstCellAsLabel =
(aProperty.Value.hasValue() &&
aProperty.Value.isExtractableTo(::getBooleanCppuType()));
}
-// else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "HasCategories" )
))
-// {
-// bHasHasCategories =
-// (aProperty.Value.hasValue() &&
aProperty.Value.isExtractableTo(::getBooleanCppuType()));
-// }
else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
"CellRangeRepresentation" ) ))
{
::rtl::OUString aRange;
bHasCellRangeRepresentation =
(aProperty.Value.hasValue() && (aProperty.Value >>= aRange) &&
aRange.getLength() > 0);
}
-// else if( aProperty.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "SequenceMapping" ) ))
-// {
-// bHasSequenceMapping =
-// (aProperty.Value.hasValue() && aProperty.Value.isExtractableTo(
-// ::getCppuType( reinterpret_cast<
-// const uno::Sequence< sal_Int32 > * >(0))));
-// }
}
}
catch( const uno::Exception & ex )
diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx
index 1038b56..7fb3141 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(
@@ -148,22 +121,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/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx
index 709690e..ffb7740 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -40,8 +40,6 @@
using namespace ::com::sun::star;
using ::com::sun::star::style::XStyleSupplier;
-// using ::com::sun::star::beans::XFastPropertyState;
-
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Any;
@@ -98,10 +96,6 @@ Any SAL_CALL OPropertySet::queryInterface( const uno::Type& aType )
{
return ::cppu::queryInterface(
aType,
-// static_cast< uno::XInterface * >(
-// static_cast< uno::XWeak * >( this )),
-// static_cast< uno::XWeak * >( this ),
-// static_cast< lang::XServiceInfo * >( this ),
static_cast< lang::XTypeProvider * >( this ),
static_cast< beans::XPropertySet * >( this ),
static_cast< beans::XMultiPropertySet * >( this ),
@@ -109,44 +103,8 @@ Any SAL_CALL OPropertySet::queryInterface( const uno::Type& aType )
static_cast< beans::XPropertyState * >( this ),
static_cast< beans::XMultiPropertyStates * >( this ),
static_cast< XStyleSupplier * >( this ) );
-// static_cast< XFastPropertyState * >( this ) );
}
-// void SAL_CALL OPropertySet::acquire() throw ()
-// {
-// OWeakObject::acquire();
-// }
-
-// void SAL_CALL OPropertySet::release() throw ()
-// {
-// OWeakObject::release();
-// }
-
-
-// ____ XServiceInfo ____
-// OUString SAL_CALL
-// OPropertySet::getImplementationName()
-// throw (uno::RuntimeException)
-// {
-// return OUString( RTL_CONSTASCII_USTRINGPARAM( "property::OPropertySet" ));
-// }
-
-// sal_Bool SAL_CALL
-// OPropertySet::supportsService( const OUString& ServiceName )
-// throw (uno::RuntimeException)
-// {
-// return ( 0 == ServiceName.reverseCompareToAsciiL(
-// RTL_CONSTASCII_STRINGPARAM( "com.sun.star.beans.PropertySet" )));
-// }
-
-// Sequence< OUString > SAL_CALL
-// OPropertySet::getSupportedServiceNames()
-// throw (uno::RuntimeException)
-// {
-// Sequence< OUString > aServiceNames( 1 );
-// aServiceNames[ 0 ] = OUString( RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.beans.PropertySet" ));
-// return aServiceNames;
-// }
#define LCL_PROP_CPPUTYPE(t) (::getCppuType( reinterpret_cast< const Reference<t> *>(0)))
@@ -164,8 +122,6 @@ Sequence< uno::Type > SAL_CALL
{
::std::vector< uno::Type > aTypes;
-// aTypes.push_back( LCL_PROP_CPPUTYPE( uno::XWeak ));
-// aTypes.push_back( LCL_PROP_CPPUTYPE( lang::XServiceInfo ));
aTypes.push_back( LCL_PROP_CPPUTYPE( lang::XTypeProvider ));
aTypes.push_back( LCL_PROP_CPPUTYPE( beans::XPropertySet ));
aTypes.push_back( LCL_PROP_CPPUTYPE( beans::XMultiPropertySet ));
@@ -173,7 +129,6 @@ Sequence< uno::Type > SAL_CALL
aTypes.push_back( LCL_PROP_CPPUTYPE( beans::XPropertyState ));
aTypes.push_back( LCL_PROP_CPPUTYPE( beans::XMultiPropertyStates ));
aTypes.push_back( LCL_PROP_CPPUTYPE( XStyleSupplier ));
-// aTypes.push_back( LCL_PROP_CPPUTYPE( XFastPropertyState ));
aTypeList = ::chart::ContainerHelper::ContainerToSequence( aTypes );
}
@@ -467,40 +422,6 @@ void SAL_CALL OPropertySet::setStyle( const Reference< style::XStyle >& xStyle
)
0 );
}
-// ____ XFastPropertyState ____
-// beans::PropertyState OPropertySet::SAL_CALL getFastPropertyState( sal_Int32 nHandle )
-// throw (beans::UnknownPropertyException,
-// uno::RuntimeException)
-// {
-// return m_pImplProperties->GetPropertyStateByHandle( nHandle );
-// }
-
-// uno::Sequence< beans::PropertyState > OPropertySet::SAL_CALL getFastPropertyStates(
-// const uno::Sequence< sal_Int32 >& aHandles )
-// throw (beans::UnknownPropertyException,
-// uno::RuntimeException)
-// {
-// ::std::vector< sal_Int32 > aHandleVec(
-// aHandles.getConstArray(),
-// aHandles.getConstArray() + aHandles.getLength() );
-
-// return m_pImplProperties->GetPropertyStatesByHandle( aHandleVec );
-// }
-
-// void OPropertySet::SAL_CALL setFastPropertyToDefault( sal_Int32 nHandle )
-// throw (beans::UnknownPropertyException,
-// uno::RuntimeException)
-// {
-// m_pImplProperties->SetPropertyToDefault( nHandle );
-// }
-
-// uno::Any OPropertySet::SAL_CALL getFastPropertyDefault( sal_Int32 nHandle )
-// throw (beans::UnknownPropertyException,
-// lang::WrappedTargetException,
-// uno::RuntimeException)
-// {
-// return GetDefaultValue( nHandle );
-// }
// ____ XMultiPropertySet ____
void SAL_CALL OPropertySet::setPropertyValues(
diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx
b/chart2/source/tools/WrappedIgnoreProperty.cxx
index fd5167f..85e257f 100644
--- a/chart2/source/tools/WrappedIgnoreProperty.cxx
+++ b/chart2/source/tools/WrappedIgnoreProperty.cxx
@@ -97,7 +97,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) ) ) );
@@ -119,20 +118,14 @@ void
WrappedIgnoreProperties::addIgnoreFillProperties_without_BitmapProperties(
rList.push_back( new WrappedIgnoreProperty( C2U( "FillColor" ), uno::makeAny( sal_Int32(-1) )
) );
rList.push_back( new WrappedIgnoreProperty( C2U( "FillTransparence" ), uno::makeAny(
sal_Int16(0) ) ) );
rList.push_back( new WrappedIgnoreProperty( C2U( "FillTransparenceGradientName" ),
uno::makeAny( ::rtl::OUString() ) ) );
-// rList.push_back( new WrappedIgnoreProperty( C2U( "FillTransparenceGradient" ), uno::makeAny(
awt::Gradient() ) ) );
rList.push_back( new WrappedIgnoreProperty( C2U( "FillGradientName" ), uno::makeAny(
::rtl::OUString() ) ) );
-// rList.push_back( new WrappedIgnoreProperty( C2U( "FillGradient" ), uno::makeAny(
awt::Gradient() ) ) );
rList.push_back( new WrappedIgnoreProperty( C2U( "FillHatchName" ), uno::makeAny(
::rtl::OUString() ) ) );
-// rList.push_back( new WrappedIgnoreProperty( C2U( "FillHatch" ), uno::makeAny(
drawing::Hatch() ) ) );
rList.push_back( new WrappedIgnoreProperty( C2U( "FillBackground" ), uno::makeAny(
sal_Bool(sal_False) ) ) );
}
//static
void WrappedIgnoreProperties::addIgnoreFillProperties_only_BitmapProperties( ::std::vector<
WrappedProperty* >& rList )
{
-// rList.push_back( new WrappedIgnoreProperty( C2U( "FillBitmapName" ), uno::makeAny(
::rtl::OUString() ) ) );
-// rList.push_back( new WrappedIgnoreProperty( C2U( "FillBitmap" ), uno::makeAny(
uno::Reference< awt::XBitmap > (0) ) ) );
-// rList.push_back( new WrappedIgnoreProperty( C2U( "FillBitmapURL" ), uno::makeAny(
::rtl::OUString() ) ) );
rList.push_back( new WrappedIgnoreProperty( C2U( "FillBitmapOffsetX" ), uno::makeAny(
sal_Int16(0) ) ) );
rList.push_back( new WrappedIgnoreProperty( C2U( "FillBitmapOffsetY" ), uno::makeAny(
sal_Int16(0) ) ) );
rList.push_back( new WrappedIgnoreProperty( C2U( "FillBitmapPositionOffsetX" ), uno::makeAny(
sal_Int16(0) ) ) );
diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx
index 9ebcac3..9f8de41 100644
--- a/chart2/source/tools/WrappedPropertySet.cxx
+++ b/chart2/source/tools/WrappedPropertySet.cxx
@@ -208,7 +208,6 @@ void SAL_CALL WrappedPropertySet::addPropertyChangeListener( const OUString& rPr
else
xInnerPropertySet->addPropertyChangeListener( rPropertyName, xListener );
}
-// m_aBoundListenerContainer.addInterface( (sal_Int32)nHandle, xListener );
}
void SAL_CALL WrappedPropertySet::removePropertyChangeListener( const OUString& rPropertyName,
const Reference< beans::XPropertyChangeListener >& aListener )
throw (beans::UnknownPropertyException,
lang::WrappedTargetException, uno::RuntimeException)
@@ -270,8 +269,6 @@ void SAL_CALL WrappedPropertySet::setPropertyValues( const Sequence< OUString >&
}
}
//todo: store unknown properties elsewhere
-// if( bUnknownProperty )
-// throw beans::UnknownPropertyException();
}
Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyValues( const Sequence< OUString >&
rNameSeq )
throw (uno::RuntimeException)
@@ -432,7 +429,6 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyDefaults( const Sequence
}
//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
::cppu::IPropertyArrayHelper& WrappedPropertySet::getInfoHelper()
{
diff --git a/chart2/source/view/axes/TickmarkHelper.cxx b/chart2/source/view/axes/TickmarkHelper.cxx
index aa616ca..1ca80c2 100644
--- a/chart2/source/view/axes/TickmarkHelper.cxx
+++ b/chart2/source/view/axes/TickmarkHelper.cxx
@@ -337,8 +337,6 @@ TickInfo* EquidistantTickIter::nextInfo()
}
//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
//static
double TickmarkHelper::getMinimumAtIncrement( double fMin, const ExplicitIncrementData& rIncrement
)
@@ -380,8 +378,6 @@ double TickmarkHelper::getMaximumAtIncrement( double fMax, const ExplicitIncreme
}
//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
TickmarkHelper::TickmarkHelper(
const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement )
@@ -525,7 +521,6 @@ double* TickmarkHelper::getMinorTick( sal_Int32 nTick, sal_Int32 nDepth
{
//check validity of arguments
{
- //DBG_ASSERT( fStartParentTick < fNextParentTick, "fStartParentTick >= fNextParentTick");
if(fStartParentTick >= fNextParentTick)
return NULL;
if(nDepth>m_rIncrement.SubIncrements.getLength() || nDepth<=0)
@@ -729,7 +724,6 @@ void TickmarkHelper::addSubTicks( sal_Int32 nDepth, uno::Sequence< uno::Sequence
//-----------------------------------------------------------------------------
TickmarkHelper_2D::TickmarkHelper_2D(
const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement
- //, double fStrech_SceneToScreen, double fOffset_SceneToScreen )
, const B2DVector& rStartScreenPos, const B2DVector& rEndScreenPos
, const B2DVector& rAxisLineToLabelLineShift )
: TickmarkHelper( rScale, rIncrement )
diff --git a/chart2/source/view/axes/VAxisProperties.cxx
b/chart2/source/view/axes/VAxisProperties.cxx
index 8ada4f5..c34e44b 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -403,16 +403,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 011c6ea..5c19534 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;
}
@@ -1044,7 +1040,6 @@ void VSeriesPlotter::createRegressionCurveEquationShapes(
if( bShowCorrCoeff )
{
-// xEquationProperties->getPropertyValue( C2U("Separator")) >>= aSep;
aFormula.append( aSep );
}
}
@@ -1095,15 +1090,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/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 7277cec..733974a 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -394,7 +394,6 @@ APPHELPER_XSERVICEINFO_IMPL(ChartView,CHART_VIEW_SERVICE_IMPLEMENTATION_NAME)
}
//-----------------------------------------------------------------
-//-----------------------------------------------------------------
::basegfx::B3DHomMatrix createTransformationSceneToScreen(
const ::basegfx::B2IRectangle& rDiagramRectangleWithoutAxes )
@@ -465,7 +464,6 @@ struct AxisUsage
void addCoordinateSystem( VCoordinateSystem* pCooSys, sal_Int32 nDimensionIndex, sal_Int32
nAxisIndex );
::std::vector< VCoordinateSystem* > getCoordinateSystems( sal_Int32 nDimensionIndex, sal_Int32
nAxisIndex );
sal_Int32 getMaxAxisIndexForDimension( sal_Int32 nDimensionIndex );
- //tFullAxisIndex getDimensionAndIndexForCooSys( VCoordinateSystem* pCooSys );
ScaleAutomatism aScaleAutomatism;
@@ -484,19 +482,6 @@ AxisUsage::~AxisUsage()
aCoordinateSystems.clear();
}
-/*
-tFullScaleIndex AxisUsage::getDimensionAndIndexForCooSys( VCoordinateSystem* pCooSys )
-{
- tFullScaleIndex aRet(0,0);
-
- tCoordinateSystemMap::const_iterator aFound( aCoordinateSystems.find(pCooSys) );
- if(aFound!=aCoordinateSystems.end())
- aRet = aFound->second;
-
- return aRet;
-}
-*/
-
void AxisUsage::addCoordinateSystem( VCoordinateSystem* pCooSys, sal_Int32 nDimensionIndex,
sal_Int32 nAxisIndex )
{
if(!pCooSys)
@@ -1345,7 +1330,6 @@ awt::Rectangle ChartView::impl_createDiagramAndContent(
SeriesPlotterContainer&
//return the used rectangle
awt::Rectangle aUsedOuterRect( rAvailablePos.X, rAvailablePos.Y, 0, 0 );
-// sal_Int32 nDiagramIndex = 0;//todo if more than one diagam is supported
uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( m_xChartModel ) );
if( !xDiagram.is())
return aUsedOuterRect;
@@ -1559,24 +1543,6 @@ awt::Rectangle ChartView::impl_createDiagramAndContent(
SeriesPlotterContainer&
m_bPointsWereSkipped = m_bPointsWereSkipped || pSeriesPlotter->PointsWereSkipped();
}
- /*
- uno::Reference< drawing::XShape > xDiagramPlusAxes_KeepRatio( xDiagramPlusAxes_Shapes,
uno::UNO_QUERY );
-
- awt::Size aNewSize( rAvailableSize );
- awt::Point aNewPos( rAvailablePos );
- if( bKeepAspectRatio )
- {
- awt::Size aCurrentSize( xDiagramPlusAxes_KeepRatio->getSize());
-
- aNewSize = ShapeFactory::calculateNewSizeRespectingAspectRatio(
- rAvailableSize, aCurrentSize );
- aNewPos = ShapeFactory::calculateTopLeftPositionToCenterObject(
- rAvailablePos, rAvailableSize, aNewSize );
- }
-
- xDiagramPlusAxes_KeepRatio->setPosition( aNewPos );
- xDiagramPlusAxes_KeepRatio->setSize( aNewSize );
- */
for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd;
aPlotterIter++ )
{
VSeriesPlotter* pSeriesPlotter = *aPlotterIter;
@@ -1586,8 +1552,6 @@ awt::Rectangle ChartView::impl_createDiagramAndContent(
SeriesPlotterContainer&
if( bUseFixedInnerSize )
{
- //if( !bIsPieOrDonut )
- // aConsumedOuterRect = ::basegfx::B2IRectangle(
ShapeFactory::getRectangleOfShape(xBoundingShape) );
aUsedOuterRect = awt::Rectangle( aConsumedOuterRect.getMinX(),
aConsumedOuterRect.getMinY(), aConsumedOuterRect.getWidth(), aConsumedOuterRect.getHeight() );
}
else
@@ -1643,8 +1607,6 @@ awt::Rectangle ChartView::impl_createDiagramAndContent(
SeriesPlotterContainer&
}
//-------------------------------------------------------------
-//-------------------------------------------------------------
-//-------------------------------------------------------------
sal_Bool ChartView::getExplicitValuesForAxis(
uno::Reference< XAxis > xAxis
@@ -2542,25 +2504,7 @@ void lcl_removeEmptyGroupShapes( const Reference< drawing::XShapes>& xParent
)
bool ChartView::impl_AddInDrawsAllByItself()
{
bool bRet = false;
- /*
- uno::Reference< beans::XPropertySet > xProp( m_xChartModel, uno::UNO_QUERY );
- if( xProp.is()) try
- {
- uno::Reference< util::XRefreshable > xAddIn;
- xProp->getPropertyValue( C2U( "AddIn" ) ) >>= xAddIn;
- if( xAddIn.is() )
- {
- rtl::OUString aBaseDiagram;
- xProp->getPropertyValue( C2U( "BaseDiagram" ) ) >>= aBaseDiagram;
- if(aBaseDiagram.getLength())
- bRet = true;
- }
- }
- catch( uno::Exception& e )
- {
- ASSERT_EXCEPTION( e );
- }
- */
+
return bRet;
}
@@ -2634,8 +2578,6 @@ void ChartView::createShapes()
// todo: it would be nicer to just pass the page m_xDrawPage and format it,
// but the draw page does not support XPropertySet
formatPage( m_xChartModel, aPageSize, xPageShapes, m_xShapeFactory );
-
- //sal_Int32 nYDistance =
static_cast<sal_Int32>(aPageSize.Height*lcl_getPageLayoutDistancePercentage());
awt::Rectangle aRemainingSpace( 0, 0, aPageSize.Width, aPageSize.Height );
//create the group shape for diagram and axes first to have title and legends on top of it
@@ -2805,8 +2747,6 @@ void ChartView::impl_updateView()
if( m_bViewDirty && !m_bInViewUpdate )
{
m_bInViewUpdate = true;
- //bool bOldRefreshAddIn = m_bRefreshAddIn;
- //m_bRefreshAddIn = false;
try
{
impl_notifyModeChangeListener(C2U("invalid"));
@@ -2857,8 +2797,6 @@ void ChartView::impl_updateView()
}
impl_notifyModeChangeListener(C2U("valid"));
-
- //m_bRefreshAddIn = bOldRefreshAddIn;
}
}
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index dca76c9..55061ef 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -187,7 +187,6 @@ uno::Any createPolyPolygon_Cube(
//fWidthH stands for Half Width
const double fWidthH = rSize.DirectionX >=0.0? rSize.DirectionX/2.0 : -rSize.DirectionX/2.0;
const double fHeight = rSize.DirectionY;
-// const double fDepth = rSize.DirectionZ >=0.0? rSize.DirectionZ : -rSize.DirectionZ ;
const double fHeightSign = fHeight >= 0.0 ? 1.0 : -1.0;
@@ -216,7 +215,6 @@ uno::Any createPolyPolygon_Cube(
for(sal_Int32 nN = nPointCount; nN--;)
*pInnerSequenceZ++ = 0.0;
- //*pInnerSequenceZ++ = -fDepth/2.0;
if(nPointCount == 5)
{
@@ -787,8 +785,6 @@ uno::Reference<drawing::XShape>
}
//------------------------------------------------------------------------------------------------------------
-//------------------------------------------------------------------------------------------------------------
-//------------------------------------------------------------------------------------------------------------
void appendAndCloseBezierCoords( drawing::PolyPolygonBezierCoords& rReturn, const
drawing::PolyPolygonBezierCoords& rAdd, sal_Bool bAppendInverse )
{
@@ -954,26 +950,6 @@ drawing::PolyPolygonBezierCoords getRingBezierCoords(
fStartAngleRadian, fWidthAngleRadian, fUnitCircleInnerRadius,
aTransformationFromUnitCircle, fAngleSubdivisionRadian );
appendAndCloseBezierCoords( aReturn, aInnerArc, sal_True );
- //fill rMarkHandlePoints
- /*
- {
- rMarkHandlePoints.realloc(1);
- rMarkHandlePoints[0].realloc(6);
- sal_Int32 nHandleCount=0;
- sal_Int32 nOuterArcCount = aOuterArc.Coordinates[0].getLength();
- if(nOuterArcCount>0)
- rMarkHandlePoints[0][nHandleCount++]=aOuterArc.Coordinates[0][0];
- if(nOuterArcCount>1)
- rMarkHandlePoints[0][nHandleCount++]=aOuterArc.Coordinates[0][nOuterArcCount-1];
- sal_Int32 nInnerArcCount = aInnerArc.Coordinates[0].getLength();
- if(nInnerArcCount>0)
- rMarkHandlePoints[0][nHandleCount++]=aInnerArc.Coordinates[0][0];
- if(nInnerArcCount>1)
- rMarkHandlePoints[0][nHandleCount++]=aInnerArc.Coordinates[0][nInnerArcCount-1];
- rMarkHandlePoints[0].realloc(nHandleCount);
- }
- */
-
return aReturn;
}
@@ -1019,19 +995,6 @@ uno::Reference< drawing::XShape >
, aTransformationFromUnitCircle, fAngleSubdivisionRadian );
xProp->setPropertyValue( C2U( "PolyPolygonBezier" ), uno::makeAny( aCoords ) );
-
- //add shape for markhandles
- /*
- drawing::PointSequenceSequence aMarkHandlePoints(1); to be filled within
getRingBezierCoords
- if( xGroup.is() )
- {
- VLineProperties aHandleLineProperties;
- aHandleLineProperties.LineStyle = uno::makeAny( drawing::LineStyle_NONE );
- uno::Reference< drawing::XShape > xHandleShape =
- this->createLine2D( xGroup, aMarkHandlePoints, &aHandleLineProperties );
- this->setShapeName( xHandleShape, C2U("HandlesOnly") );
- }
- */
}
catch( uno::Exception& e )
{
@@ -1126,8 +1089,6 @@ uno::Reference< drawing::XShape >
}
//------------------------------------------------------------------------------------------------------------
-//------------------------------------------------------------------------------------------------------------
-//------------------------------------------------------------------------------------------------------------
uno::Reference< drawing::XShape >
ShapeFactory::createStripe( const uno::Reference< drawing::XShapes >& xTarget
@@ -1495,7 +1456,7 @@ drawing::PolyPolygonShape3D createPolyPolygon_Symbol( const
drawing::Position3D&
break;
}
}
- //return uno::Any( &aPP, ::getCppuType((const drawing::PolyPolygonShape3D*)0) );
+
return aPP;
}
@@ -1782,7 +1743,6 @@ uno::Reference< drawing::XShape >
if(rLineProperties.Color.hasValue())
xProp->setPropertyValue( C2U( UNO_NAME_LINECOLOR )
, rLineProperties.Color );
- //, uno::makeAny( sal_Int32( Color(COL_RED).GetColor()) ) );
}
catch( uno::Exception& e )
{
@@ -1806,11 +1766,8 @@ uno::Reference< drawing::XShape >
//create shape
uno::Reference< drawing::XShape > xShape(
m_xShapeFactory->createInstance( C2U(
- //"com.sun.star.drawing.LineShape") ), uno::UNO_QUERY );
"com.sun.star.drawing.PolyLineShape") ), uno::UNO_QUERY );
- //"com.sun.star.drawing.PolyLinePathShape") ), uno::UNO_QUERY );
- //"com.sun.star.drawing.PolyPolygonPathShape") ), uno::UNO_QUERY );
- //"com.sun.star.drawing.PolyPolygonShape") ), uno::UNO_QUERY );
+
xTarget->add(xShape);
//set properties
@@ -1865,7 +1822,7 @@ uno::Any ShapeFactory::makeTransformation( const awt::Point&
rScreenPosition2D,
::basegfx::B2DHomMatrix aM;
//As autogrow is active the rectangle is automatically expanded to that side
//to which the text is not adjusted.
- // aM.scale( 1, 1 ); Oops? A scale with this parameters is neutral, line commented out
+
aM.rotate( fRotationAnglePi );
aM.translate( rScreenPosition2D.X, rScreenPosition2D.Y );
uno::Any aATransformation = uno::makeAny( B2DHomMatrixToHomogenMatrix3(aM) );
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index 7ab8a67..d334f54 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() );
--
1.7.1
Context
- [Libreoffice] [PATCH] Removed commented out code from calc-chart2 · Alfonso Eusebio
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.