here is more commented code removal.
Regards
Ricardo
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 999a6bc..8f87b6a 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -2708,22 +2708,6 @@ void SbaXDataBrowserController::initializeParser() const
{ // (only if the statement isn't native)
// (it is allowed to use the PROPERTY_ISPASSTHROUGH : _after_ loading a form it is
valid)
xFormSet->getPropertyValue(PROPERTY_SINGLESELECTQUERYCOMPOSER) >>= m_xParser;
-/*
- const Reference<XMultiServiceFactory>
xFactory(::dbtools::getConnection(getRowSet()),UNO_QUERY);
- if ( xFactory.is() )
-
m_xParser.set(xFactory->createInstance(SERVICE_NAME_SINGLESELECTQUERYCOMPOSER),UNO_QUERY);
-*/
- }
-/*
- // initialize the parser with the current sql-statement of the form
- if ( m_xParser.is() )
- {
-
m_xParser->setElementaryQuery(::comphelper::getString(xFormSet->getPropertyValue(PROPERTY_ACTIVECOMMAND)));
-
m_xParser->setFilter(::comphelper::getString(xFormSet->getPropertyValue(PROPERTY_FILTER)));
-
m_xParser->setHavingClause(::comphelper::getString(xFormSet->getPropertyValue(PROPERTY_HAVING_CLAUSE)));
-
m_xParser->setOrder(::comphelper::getString(xFormSet->getPropertyValue(PROPERTY_ORDER)));
- }
-*/
}
catch(Exception&)
{
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 62353cd..8c9d992 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -1500,20 +1500,6 @@ sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt )
nAction = DND_ACTION_COPY;
}
-/*
- // check formats
- SvDataObjectRef xDataObj = SvDataObject::PasteDragServer( rEvt );
- if (!xDataObj.Is())
- return sal_False;
-
- const SvDataTypeList& rTypeList = xDataObj->GetTypeList();
- if
((rTypeList.Get(Exchange::RegisterFormatName(String::CreateFromAscii(SBA_DATAEXCHANGE_FORMAT)))) )
- {
- bAllow = (GetOptions() & OPT_INSERT) && rEvt.GetColumnId() > 0 && rEvt.GetRow() >= 0;
- ((BrowserDropEvent&)rEvt).SetAction(DROP_COPY);
- }
-
-*/
return (DND_ACTION_NONE != nAction) ? nAction : FmGridControl::AcceptDrop(rEvt);
}
diff --git a/dbaccess/source/ui/dlg/queryfilter.src b/dbaccess/source/ui/dlg/queryfilter.src
index fcabfdc..d916100 100644
--- a/dbaccess/source/ui/dlg/queryfilter.src
+++ b/dbaccess/source/ui/dlg/queryfilter.src
@@ -30,15 +30,6 @@
#endif
#include "dbaccess_helpid.hrc"
-/*
-#define STRLST_AND_OR \
- StringList [ en-US ] = \
- {\
- < "AND" ; Default ; > ; \
- < "OR" ; Default ; > ; \
- };\
-*/
-
ModalDialog DLG_FILTERCRIT
{
OutputSize = TRUE ;
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index 12a6744..b448624 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -111,7 +111,6 @@ void OWizNameMatching::Reset()
m_bFirstTime = sal_False;
}
- // m_CTRL_LEFT.Clear();
}
// -----------------------------------------------------------------------
void OWizNameMatching::ActivatePage( )
@@ -228,7 +227,6 @@ IMPL_LINK( OWizNameMatching, ButtonClickHdl, Button *, pButton )
if(pButton == &m_ibColumn_down && (nThumbPos+nVisibleSize+1) < nPos)
{
m_CTRL_LEFT.GetVScroll()->DoScrollAction(SCROLL_LINEDOWN);
- // m_CTRL_LEFT.MakeVisible(pEntry,sal_True);
}
TableListClickHdl(&m_CTRL_LEFT);
@@ -357,19 +355,11 @@ public:
}
virtual void Paint(const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry);
- //virtual void InitViewData( SvLBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* pViewData);
};
//------------------------------------------------------------------------
-/*
-void OColumnString::InitViewData( SvLBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* pViewData)
-{
- SvLBoxString::InitViewData(pView,pEntry,pViewData);
-}
-*/
-//------------------------------------------------------------------------
void OColumnString::Paint(const Point& rPos, SvLBox& rDev, sal_uInt16 /*nFlags*/, SvLBoxEntry*
/*pEntry*/ )
{
if(m_bReadOnly)
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx
b/dbaccess/source/ui/tabledesign/TableController.cxx
index 702d2c6..cb4d9af 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -349,7 +349,6 @@ sal_Bool OTableController::doSaveDoc(sal_Bool _bSaveAs)
{
String aName = String(ModuleRes(STR_TBL_TITLE));
aDefaultName = aName.GetToken(0,' ');
- //aDefaultName = getPrivateTitle();
aDefaultName = ::dbtools::createUniqueName(xTables,aDefaultName);
}
@@ -582,8 +581,6 @@ sal_Bool OTableController::Construct(Window* pParent)
{
setView( * new OTableDesignView( pParent, getORB(), *this ) );
OTableController_BASE::Construct(pParent);
-// m_pView->Construct();
-// m_pView->Show();
return sal_True;
}
// -----------------------------------------------------------------------------
@@ -646,10 +643,7 @@ sal_Bool SAL_CALL OTableController::suspend(sal_Bool /*_bSuspend*/) throw(
Runti
}
}
}
-/*
- if ( bCheck )
- OSingleDocumentController::suspend(_bSuspend);
-*/
+
return bCheck;
}
// -----------------------------------------------------------------------------
@@ -912,7 +906,6 @@ void OTableController::loadData()
{
pActFieldDescr->SetName(sName);
pActFieldDescr->SetFormatKey(nFormatKey);
- // pActFieldDescr->SetPrimaryKey(pPrimary->GetValue());
pActFieldDescr->SetDescription(sDescription);
pActFieldDescr->SetHelpText(sHelpText);
pActFieldDescr->SetAutoIncrement(bIsAutoIncrement);
@@ -1110,7 +1103,6 @@ void OTableController::alterColumns()
// Normally, sdbcx::Column objects are expected to have a TypeName property
}
- //
xColumn->getPropertyValue(PROPERTY_ISCURRENCY,::cppu::bool2any(pField->IsCurrency()));
// check if something changed
if((nType != pField->GetType() ||
sTypeName != pField->GetTypeName() ||
@@ -1458,7 +1450,6 @@ void OTableController::assignTable()
}
}
}
- //updateTitle();
}
// -----------------------------------------------------------------------------
sal_Bool OTableController::isAddAllowed() const
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx
b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 8996e0f..82eed7c 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -676,13 +676,6 @@ void SAL_CALL OFieldExpressionControl::elementInserted(const
container::Containe
for(++aFind;aFind != aEnd;++aFind)
if ( *aFind != NO_GROUP )
++*aFind;
-
- //::std::vector<sal_Int32>::reverse_iterator aRIter = m_aGroupPositions.rbegin();
- //::std::vector<sal_Int32>::reverse_iterator aREnd = m_aGroupPositions.rend();
- //for (; aRIter != aREnd && *aRIter != NO_GROUP; ++aRIter)
- // continue;
- //if ( aRIter != aREnd )
- // m_aGroupPositions.erase(m_aGroupPositions.begin() +
(m_aGroupPositions.size() - 1 - (aRIter - m_aGroupPositions.rbegin())));
}
}
Invalidate();
@@ -712,7 +705,6 @@ void SAL_CALL OFieldExpressionControl::elementRemoved(const container::Container
for(++aFind;aFind != aEnd;++aFind)
if ( *aFind != NO_GROUP )
--*aFind;
- //PaintCell(*this,GetFieldRect(FIELD_EXPRESSION),FIELD_EXPRESSION);
Invalidate();
}
}
@@ -754,7 +746,6 @@ void OFieldExpressionControl::Command(const CommandEvent& rEvt)
if ( nColId == HANDLE_ID )
{
- //long nRow = GetRowAtYPosPixel(rEvt.GetMousePosPixel().Y());
PopupMenu aContextMenu(ModuleRes(RID_GROUPSROWPOPUPMENU));
sal_Bool bEnable = sal_False;
long nIndex = FirstSelectedRow();
@@ -764,10 +755,6 @@ void OFieldExpressionControl::Command(const CommandEvent& rEvt)
bEnable = sal_True;
nIndex = NextSelectedRow();
}
- //aContextMenu.EnableItem( SID_CUT, IsDeleteAllowed() && bEnable);
- //aContextMenu.EnableItem( SID_COPY, bEnable);
- //TransferableDataHelper
aTransferData(TransferableDataHelper::CreateFromSystemClipboard(GetParent()));
- //aContextMenu.EnableItem( SID_PASTE,
aTransferData.HasFormat(SOT_FORMATSTR_ID_RPT_GRPED) );
aContextMenu.EnableItem( SID_DELETE, IsDeleteAllowed() && bEnable );
switch (aContextMenu.Execute(this, rEvt.GetMousePosPixel()))
{
@@ -985,11 +972,6 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent
,OPropertyChangeListener(m_aMutex)
,m_aFL2(this, ModuleRes(FL_SEPARATOR2) )
,m_aMove(this, ModuleRes(FT_MOVELABEL) )
-/*
- ,m_aPB_Up(this, ModuleRes(PB_UP) )
- ,m_aPB_Down(this, ModuleRes(PB_DOWN) )
- ,m_aPB_Delete(this, ModuleRes(PB_DELETE) )
-*/
,m_aToolBox(this, ModuleRes(TB_TOOLBOX) )
,m_aFL3(this, ModuleRes(FL_SEPARATOR3) )
@@ -1049,7 +1031,6 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent
Size aOutSize(nMaxTextWidth + m_aHeader.GetSizePixel().Width() +
3*aSpace.Width(),aSpace.Height());
SetMinOutputSizePixel(aOutSize);
SetOutputSizePixel(aOutSize);
-// Resize();
m_pReportListener = new
OPropertyChangeMultiplexer(this,m_pController->getReportDefinition().get());
m_pReportListener->addProperty(PROPERTY_COMMAND);
@@ -1058,21 +1039,12 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent
m_pFieldExpression->lateInit();
fillColumns();
m_pFieldExpression->Show();
-
- //m_aHelpWindow.SetReadOnly();
+
m_aHelpWindow.SetControlBackground( GetSettings().GetStyleSettings().GetFaceColor() );
- //BTN m_aPB_Up.SetClickHdl(LINK(this,OGroupsSortingDialog,ClickHdl));
- //BTN m_aPB_Down.SetClickHdl(LINK(this,OGroupsSortingDialog,ClickHdl));
- //BTN m_aPB_Delete.SetClickHdl(LINK(this,OGroupsSortingDialog,ClickHdl));
m_pFieldExpression->SetZOrder(&m_aFL2, WINDOW_ZORDER_BEHIND);
m_aMove.SetZOrder(m_pFieldExpression, WINDOW_ZORDER_BEHIND);
- //BTN m_aPB_Up.SetZOrder(&m_aMove, WINDOW_ZORDER_BEHIND);
- //BTN m_aPB_Down.SetZOrder(&m_aPB_Up, WINDOW_ZORDER_BEHIND);
- // set Hi contrast bitmaps
- //BTN m_aPB_Up.SetModeImage( ModuleRes(IMG_UP_H),BMP_COLOR_HIGHCONTRAST);
- //BTN m_aPB_Down.SetModeImage( ModuleRes(IMG_DOWN_H),BMP_COLOR_HIGHCONTRAST);
m_aToolBox.SetStyle(m_aToolBox.GetStyle()|WB_LINESPACING);
m_aToolBox.SetSelectHdl(LINK(this, OGroupsSortingDialog, OnFormatAction));
m_aToolBox.SetImageListProvider(this);
@@ -1264,9 +1236,7 @@ IMPL_LINK( OGroupsSortingDialog, OnFormatAction, ToolBox*,
/*NOTINTERESTEDIN*/ )
//BTN if ( _pButton == &m_aPB_Delete )
if ( nCommand == SID_RPT_GROUPSORT_DELETE )
{
- // m_pFieldExpression->DeleteCurrentRow();
Application::PostUserEvent( LINK(m_pFieldExpression, OFieldExpressionControl,
DelayedDelete) );
- // UpdateData( );
}
else
{
@@ -1276,7 +1246,6 @@ IMPL_LINK( OGroupsSortingDialog, OnFormatAction, ToolBox*,
/*NOTINTERESTEDIN*/ )
m_pFieldExpression->moveGroups(aClipboardList,nIndex,sal_False);
m_pFieldExpression->DeactivateCell();
m_pFieldExpression->GoToRow(nIndex);
- //long nCurRow = m_pFieldExpression->GetCurRow();
m_pFieldExpression->ActivateCell(nIndex, m_pFieldExpression->GetCurColumnId());
DisplayData(nIndex);
}
@@ -1460,15 +1429,6 @@ void OGroupsSortingDialog::Resize()
m_aFL.SetSizePixel(Size(aTotalOutputSize.Width() -
aSpace.Width(),m_aFL.GetSizePixel().Height()));
m_aFL2.SetSizePixel(Size(aTotalOutputSize.Width() -
aSpace.Width(),m_aFL2.GetSizePixel().Height()));
m_aFL3.SetSizePixel(Size(aTotalOutputSize.Width() -
aSpace.Width(),m_aFL3.GetSizePixel().Height()));
-
-//BTN sal_Int32 nPos = aTotalOutputSize.Width() - aSpace.Width() -
m_aPB_Up.GetSizePixel().Width();
-//BTN m_aPB_Delete.SetPosPixel(Point(nPos,m_aPB_Delete.GetPosPixel().Y()));
-//BTN
-//BTN nPos -= (m_aPB_Up.GetSizePixel().Width() + LogicToPixel( Size( UNRELATED_CONTROLS,
0 ), MAP_APPFONT ).Width());
-//BTN m_aPB_Down.SetPosPixel(Point(nPos,m_aPB_Down.GetPosPixel().Y()));
-//BTN
-//BTN nPos -= (m_aPB_Up.GetSizePixel().Width() + LogicToPixel( Size( RELATED_CONTROLS, 0
), MAP_APPFONT ).Width());
-//BTN m_aPB_Up.SetPosPixel(Point(nPos,m_aPB_Up.GetPosPixel().Y()));
sal_Int32 nPos = aTotalOutputSize.Width() - aSpace.Width() - m_aToolBox.GetSizePixel().Width();
m_aToolBox.SetPosPixel(Point(nPos,m_aToolBox.GetPosPixel().Y()));
@@ -1482,7 +1442,7 @@ void OGroupsSortingDialog::checkButtons(sal_Int32 _nRow)
sal_Int32 nRowCount = m_pFieldExpression->GetRowCount();
sal_Bool bEnabled = nGroupCount > 1;
- if (bEnabled && _nRow > 0 /* && _nRow < nGroupCount */ )
+ if (bEnabled && _nRow > 0 )
{
m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_UP, sal_True);
}
@@ -1490,7 +1450,7 @@ void OGroupsSortingDialog::checkButtons(sal_Int32 _nRow)
{
m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_UP, sal_False);
}
- if (bEnabled && _nRow < (nRowCount - 1) /* && _nRow < (nGroupCount - 1) */ )
+ if (bEnabled && _nRow < (nRowCount - 1) )
{
m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_DOWN, sal_True);
}
@@ -1498,20 +1458,15 @@ void OGroupsSortingDialog::checkButtons(sal_Int32 _nRow)
{
m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_DOWN, sal_False);
}
- //BTN m_aPB_Up.Enable(bEnable && _nRow > 0 );
- //BTN m_aPB_Down.Enable(bEnable && _nRow < (m_pFieldExpression->GetRowCount()-1) );
- // m_aToolBox.EnableItem(SID_RPT_GROUPSORT_MOVE_DOWN, bEnable && _nRow < (-1) );
sal_Int32 nGroupPos = m_pFieldExpression->getGroupPosition(_nRow);
if ( nGroupPos != NO_GROUP )
{
sal_Bool bEnableDelete = nGroupCount > 0;
- //BTN m_aPB_Delete.Enable(bEnableDelete );
m_aToolBox.EnableItem(SID_RPT_GROUPSORT_DELETE, bEnableDelete);
}
else
{
- //BTN m_aPB_Delete.Enable( sal_False );
m_aToolBox.EnableItem(SID_RPT_GROUPSORT_DELETE, sal_False);
}
}
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 0c1760b..5bed53a 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -419,7 +419,6 @@ sal_Int8 NavigatorTree::AcceptDrop( const AcceptDropEvent& _rEvt )
// -------------------------------------------------------------------------
sal_Int8 NavigatorTree::ExecuteDrop( const ExecuteDropEvent& /*_rEvt*/ )
{
- // _rEvt.mnAction;
return DND_ACTION_NONE;
}
// -------------------------------------------------------------------------
@@ -852,21 +851,23 @@ void NavigatorTree::UserData::_propertyChanged(const
beans::PropertyChangeEvent&
++nPos;
m_pTree->traverseSection(pMemFunSection(&aGroupHelper),pEntry,bFooterOn ?
SID_GROUPFOOTER : SID_GROUPHEADER,nPos);
}
- //else
- // m_pTree->removeEntry(m_pTree->GetEntry(pEntry,nPos));
+
}
+
else if ( PROPERTY_EXPRESSION == _rEvent.PropertyName)
{
::rtl::OUString sNewName;
_rEvent.NewValue >>= sNewName;
m_pTree->SetEntryText(pEntry,sNewName);
}
+
else if ( PROPERTY_DATAFIELD == _rEvent.PropertyName || PROPERTY_LABEL ==
_rEvent.PropertyName || PROPERTY_NAME == _rEvent.PropertyName )
{
uno::Reference<beans::XPropertySet> xProp(_rEvent.Source,uno::UNO_QUERY);
m_pTree->SetEntryText(pEntry,lcl_getName(xProp));
}
}
+
catch(uno::Exception)
{}
}
@@ -937,10 +938,6 @@ ONavigator::ONavigator( Window* _pParent
m_pImpl.reset(new ONavigatorImpl(_rController,this));
- //Size aSpace = LogicToPixel( Size( 7, 120), MAP_APPFONT );
- //Size aOutSize(nMaxTextWidth + m_aHeader.GetSizePixel().Width() +
3*aSpace.Width(),aSpace.Height());
- //SetMinOutputSizePixel(aOutSize);
- //SetOutputSizePixel(aOutSize);
FreeResource();
m_pImpl->m_pNavigatorTree->Show();
m_pImpl->m_pNavigatorTree->GrabFocus();
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index d7c99d8..0911f95 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -66,11 +66,6 @@ using namespace ::com::sun::star::chart2;
#define SELECT_BITMAP(name) Bitmap( SchResId( bIsHighContrast ? name ## _HC : name ))
#define SELECT_IMAGE(name) Image( SchResId( bIsHighContrast ? name ## _HC : name ))
-/*
- ( C2U( "com.sun.star.chart2.template.Surface" ), CHSTYLE_3D_SURFACE)
- ( C2U( "com.sun.star.chart2.template.Addin" ), CHSTYLE_ADDIN)
-*/
-
ChartTypeParameter::ChartTypeParameter()
: nSubTypeIndex( 1 )
, bXAxisWithValues( false )
diff --git a/chart2/source/controller/dialogs/TabPages.hrc
b/chart2/source/controller/dialogs/TabPages.hrc
index 3424957..a641bff 100644
--- a/chart2/source/controller/dialogs/TabPages.hrc
+++ b/chart2/source/controller/dialogs/TabPages.hrc
@@ -62,32 +62,11 @@
#define FT_TEXTDIR 6038
#define LB_TEXTDIR 6039
-/*
-//Symbol-Tabpage (zum Teil sehr Aehnlich der SVX_AREA_TABPAGE) (obsolete)
-//#define TP_SYMBOL 906
-#define RBT_COLOR 1
-#define RBT_GRADIENT 2
-#define RBT_HATCHING 3
-#define RBT_BITMAP 4
-#define RBT_INVISIBLE 5
-#define LB_COLOR 1
-#define LB_GRADIENT 2
-#define LB_HATCHING 3
-#define LB_BITMAP 4
-
-#define GRP_FILL 1
-#define CTL_BITMAP_PREVIEW 6
-*/
-
//------------
//from old chart tplabel.hrc
-
//#define TP_AXIS_LABEL 920
#define CB_AXIS_LABEL_SCHOW_DESCR 1
-
-//#define FL_AXIS_LABEL_FORMATTING 2
-
#define FL_AXIS_LABEL_ORIENTATION 3
#define CT_AXIS_LABEL_DIAL 4
#define PB_AXIS_LABEL_TEXTSTACKED 5
@@ -107,12 +86,8 @@
#define RB_AXIS_LABEL_AUTOORDER 17
#define FL_SEPARATOR 18
-
#define FT_AXIS_TEXTDIR 19
#define LB_AXIS_TEXTDIR 20
-
-//#define TP_SCALE 903
-
#define FL_SCALE 1
#define TXT_MIN 1
@@ -135,9 +110,6 @@
#define EDT_ORIGIN 4
#define MT_STEPHELP 10
-
-//#define TP_AXIS_POSITIONS 904
-
#define FL_AXIS_LINE 1
#define FL_LABELS 2
#define FL_TICKS 3
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc
b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc
index da7edf4..235b482 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hrc
@@ -27,19 +27,6 @@
#include "ResourceIds.hrc"
-/*
-#define ED_MAINTITLE 1
-#define ED_SUBTITLE 2
-#define ED_X_AXIS 3
-#define ED_Y_AXIS 4
-#define ED_Z_AXIS 5
-#define FT_MAINTITLE 1
-#define FT_SUBTITLE 2
-#define FT_TITLE_X_AXIS 3
-#define FT_TITLE_Y_AXIS 4
-#define FT_TITLE_Z_AXIS 5
-*/
-
#define FT_TITLEDESCRIPTION 30
#define FL_VERTICAL 3
diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
index 19ca372..e7edfa8 100644
--- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
+++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
@@ -229,47 +229,6 @@ FontList* ViewElementListProvider::getFontList() const
}
return m_pFontList;
}
-
-/*
-SfxPrinter* ObjectPropertiesDialogParameter::getPrinter()
-{
- //was old chart:
- //SfxPrinter* SchChartDocShell::GetPrinter()
-
- // OLE-Objekt: kein Printer anlegen ??? see old chart: :UpdateTablePointers
- //@todo get printer from calc or other container
- //return NULL;
-
- SfxPrinter* pPrinter = NULL;
- bool bOwnPrinter = true;
- if (!pPrinter)
- {
- SfxBoolItem aItem(SID_PRINTER_NOTFOUND_WARN, TRUE);
- // ItemSet mit speziellem Poolbereich anlegen
- SfxItemSet* pSet = new SfxItemSet(GetPool(),
- SID_PRINTER_NOTFOUND_WARN,
- SID_PRINTER_NOTFOUND_WARN, 0);
- pSet->Put(aItem);
- pPrinter = new SfxPrinter(pSet); //@todo ->need to remember and delete
- bOwnPrinter = TRUE;
-
- MapMode aMapMode = pPrinter->GetMapMode();
- aMapMode.SetMapUnit(MAP_100TH_MM);
- pPrinter->SetMapMode(aMapMode);
-
- if (pChDoc)
- {
- if (pPrinter != pChDoc->GetRefDevice())
- pChDoc->SetRefDevice(pPrinter);
-
- if (pPrinter != pChDoc->GetOutliner()->GetRefDevice())
- pChDoc->GetOutliner()->SetRefDevice(pPrinter);
- }
- }
- return pPrinter;
-}
-*/
-
//.............................................................................
} //namespace chart
//.............................................................................
diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc
index 244b3d7..8004b96 100644
--- a/chart2/source/controller/inc/HelpIds.hrc
+++ b/chart2/source/controller/inc/HelpIds.hrc
@@ -48,7 +48,6 @@
#define HID_SCH_CTL_DATA (HID_SCH_START + 10)
#define HID_SCH_CT_INDICATE (HID_SCH_START + 11)
-// #define HID_SCH_CT_REGRESS (HID_SCH_START + 12)
//for chart type dialog:
#define HID_SCH_CTL_TYPE (HID_SCH_START + 13)
@@ -56,11 +55,6 @@
#define HID_SCH_NUM_OF_LINES (HID_SCH_START + 43)
#define HID_SCH_SERIES_LIST (HID_SCH_START + 15)
#define HID_SCH_DATA_RANGES_LIST (HID_SCH_START + 16)
-//
-
-//#define HID_SCH_CTL_LIGHT (HID_SCH_START + 17)
-//#define HID_SCH_CT_INDICATE2 (HID_SCH_START + 18)
-//#define HID_SCH_CT_REGRESS2 (HID_SCH_START + 19)
#define HID_SCH_TBI_DATA_INSERT_ROW (HID_SCH_START + 23)
#define HID_SCH_TBI_DATA_INSERT_COL (HID_SCH_START + 24)
@@ -74,14 +68,6 @@
#define HID_SCH_ALIGNMENT_CTR_DIAL (HID_SCH_START + 35)
#define HID_SCH_ALIGNMENT_STACKED (HID_SCH_START + 36)
#define HID_SCH_ALIGNMENT_DEGREES (HID_SCH_START + 37)
-/*
-#define HID_SCH_LAYOUT (HID_SCH_START + 38)
-
-#define HID_SCH_TBX_EDIT_FIELD (HID_SCH_START + 39)
-#define HID_SCH_DIAGRAM_Y_AXIS (HID_SCH_START + 40)//war mal 3
-
-#define HID_SCH_DEF_COLOR (HID_SCH_START + 41)
-*/
#define HID_SCH_TP_AXIS_LABEL (HID_SCH_START + 42)
#define HID_SCH_CHART_AUTO_FORMAT (HID_SCH_START + 44)
diff --git a/chart2/source/controller/main/SelectionHelper.hxx
b/chart2/source/controller/main/SelectionHelper.hxx
index dbbb6c0..fe7e743 100644
--- a/chart2/source/controller/main/SelectionHelper.hxx
+++ b/chart2/source/controller/main/SelectionHelper.hxx
@@ -44,8 +44,7 @@ namespace chart
class ObjectIdentifier;
//-----------------------------------------------------------------------------
-/**
-*/
+
class Selection
{
public: //methods
diff --git a/chart2/source/view/axes/VAxisProperties.cxx
b/chart2/source/view/axes/VAxisProperties.cxx
index 4933d9d..8ada4f5 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -453,28 +453,6 @@ void AxisLabelProperties::init( const uno::Reference< XAxis >& xAxisModel )
}
}
-/*
-sal_Int16 getSwappedWritingMode( sal_Int16 nWritingMode )
-{
- //LR_TB == LT
- //RL_TB == RT (Arabic, Hebrew)
- //TB_RL == TR (Japanese, Chinese, Korean)
- // ?? TL (Mongolian) see also text::WritingMode2
-
- switch(nWritingMode)
- {
- case text::WritingMode2::RL_TB:
- return text::WritingMode2::TB_RL;
- case text::WritingMode2::TB_RL:
- return text::WritingMode2::RL_TB;
- case text::WritingMode2::LR_TB:
- return text::WritingMode2::TB_LR;
- default:
- return text::WritingMode2::LR_TB;
- }
-}
-*/
-
sal_Bool AxisLabelProperties::getIsStaggered() const
{
if( STAGGER_ODD == eStaggering || STAGGER_EVEN == eStaggering )
diff --git a/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx
index 97ecdea..94a5571 100644
--- a/chart2/source/view/inc/PlotterBase.hxx
+++ b/chart2/source/view/inc/PlotterBase.hxx
@@ -34,9 +34,6 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/drawing/Position3D.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-/*
-#include <com/sun/star/lang/XComponent.hpp>
-*/
//----
#include <vector>
@@ -44,9 +41,6 @@
//---- chart2
#include <com/sun/star/chart2/ExplicitScaleData.hpp>
#include <com/sun/star/chart2/XTransformation.hpp>
-/*
-#include <com/sun/star/chart2/XPlotter.hpp>
-*/
//----
#include <cppuhelper/implbase1.hxx>
@@ -87,10 +81,6 @@ public:
virtual void SAL_CALL createShapes() = 0;
static bool isValidPosition( const ::com::sun::star::drawing::Position3D& rPos );
- /*
- virtual ::rtl::OUString SAL_CALL getCoordinateSystemTypeID( ) throw
(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const
::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >&
xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException);
- */
//-------------------------------------------------------------------------
//-------------------------------------------------------------------------
@@ -113,8 +103,6 @@ protected: //member
::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory;
ShapeFactory* m_pShapeFactory;
- //::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>
m_xCC;
-
rtl::OUString m_aCID;
sal_Int32 m_nDimension;
diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx
b/chart2/source/view/inc/PlottingPositionHelper.hxx
index 7bca3bf..ee08824 100644
--- a/chart2/source/view/inc/PlottingPositionHelper.hxx
+++ b/chart2/source/view/inc/PlottingPositionHelper.hxx
@@ -151,10 +151,6 @@ enum NormalAxis
};
class PolarPlottingPositionHelper : public PlottingPositionHelper
- /*
- , public ::cppu::WeakImplHelper1<
- ::com::sun::star::chart2::XTransformation >
- */
{
public:
PolarPlottingPositionHelper( NormalAxis eNormalAxis=NormalAxis_Z );
@@ -198,21 +194,6 @@ public:
inline bool isMathematicalOrientationAngle() const;
inline bool isMathematicalOrientationRadius() const;
-
- /*
- // ____ XTransformation ____
- /// @see ::com::sun::star::chart2::XTransformation
- virtual ::com::sun::star::uno::Sequence< double > SAL_CALL transform(
- const ::com::sun::star::uno::Sequence< double >& rSourceValues )
- throw (::com::sun::star::lang::IllegalArgumentException,
- ::com::sun::star::uno::RuntimeException);
- /// @see ::com::sun::star::chart2::XTransformation
- virtual sal_Int32 SAL_CALL getSourceDimension()
- throw (::com::sun::star::uno::RuntimeException);
- /// @see ::com::sun::star::chart2::XTransformation
- virtual sal_Int32 SAL_CALL getTargetDimension()
- throw (::com::sun::star::uno::RuntimeException);
- */
public:
//Offset for radius axis in absolute logic scaled values (1.0 == 1 category)
double m_fRadiusOffset;
diff --git a/chart2/source/view/main/NumberFormatterWrapper.cxx
b/chart2/source/view/main/NumberFormatterWrapper.cxx
index 8e377ff..07059e5 100644
--- a/chart2/source/view/main/NumberFormatterWrapper.cxx
+++ b/chart2/source/view/main/NumberFormatterWrapper.cxx
@@ -58,15 +58,6 @@ FixedNumberFormatter::~FixedNumberFormatter()
{
}
-/*
-sal_Int32 FixedNumberFormatter::getTextAndColor( double fUnscaledValueForText, rtl::OUString&
rLabel ) const
-{
- sal_Int32 nLabelColor = Color(COL_BLUE).GetColor(); //@todo get this from somewheres
- rLabel = getFormattedString( fUnscaledValueForText, nLabelColor );
- return nLabelColor;
-}
-*/
-
rtl::OUString FixedNumberFormatter::getFormattedString( double fValue, sal_Int32& rLabelColor,
bool& rbColorChanged ) const
{
return m_aNumberFormatterWrapper.getFormattedString(
@@ -147,23 +138,6 @@ rtl::OUString NumberFormatterWrapper::getFormattedString(
// to get the language type use MsLangId::convertLocaleToLanguage( rNumberFormat.aLocale )
-/*
- uno::Reference< i18n::XNumberFormatCode > xNumberFormatCode(
- m_xCC->getServiceManager()->createInstanceWithContext( C2U(
- "com.sun.star.i18n.NumberFormatMapper" ), m_xCC ), uno::UNO_QUERY );
-
- i18n::NumberFormatCode aNumberFormatCode = xNumberFormatCode->getDefault (
- i18n::KNumberFormatType::MEDIUM,
- i18n::KNumberFormatUsage::SCIENTIFIC_NUMBER,
- aLocale );
-
- uno::Sequence< i18n::NumberFormatCode > aListOfNumberFormatCode =
xNumberFormatCode->getAllFormatCode(
- i18n::KNumberFormatUsage::SCIENTIFIC_NUMBER,
- aLocale );
-
- i18n::NumberFormatCode aNumberFormatCode0 = aListOfNumberFormatCode[0];
- i18n::NumberFormatCode aNumberFormatCode1 = aListOfNumberFormatCode[1];
-*/
//.............................................................................
} //namespace chart
diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx
b/chart2/source/view/main/PlottingPositionHelper.cxx
index 6bf218c..a5218e6 100644
--- a/chart2/source/view/main/PlottingPositionHelper.cxx
+++ b/chart2/source/view/main/PlottingPositionHelper.cxx
@@ -642,27 +642,6 @@ double PlottingPositionHelper::getBaseValueY() const
return m_aScales[1].Origin;
}
-/*
-// ____ XTransformation ____
-uno::Sequence< double > SAL_CALL PolarPlottingPositionHelper::transform(
- const uno::Sequence< double >& rSourceValues )
- throw (uno::RuntimeException, lang::IllegalArgumentException)
-{
- uno::Sequence< double > aSourceValues(3);
- return aSourceValues;
-}
-
-sal_Int32 SAL_CALL PolarPlottingPositionHelper::getSourceDimension() throw (uno::RuntimeException)
-{
- return 3;
-}
-
-sal_Int32 SAL_CALL PolarPlottingPositionHelper::getTargetDimension() throw (uno::RuntimeException)
-{
- return 3;
-}
-*/
-
//.............................................................................
} //namespace chart
//.............................................................................
diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx
index 1ef4818..db40e8e 100644
--- a/chart2/source/view/main/PropertyMapper.cxx
+++ b/chart2/source/view/main/PropertyMapper.cxx
@@ -174,26 +174,6 @@ uno::Any* PropertyMapper::getValuePointerForLimitedSpace( tAnySequence&
rPropVal
, bLimitedHeight ? C2U("TextMaximumFrameHeight") : C2U("TextMaximumFrameWidth") );
}
-/*
-//set some properties from service style::CharacterProperties:
-//-------- tabpage: Characters -----------
-//FontType eg. Albany UNO_NAME_EDIT_CHAR_FONTNAME ==
UNO_NAME_EDIT_CHAR_FONTSTYLENAME //UNO_NAME_CHAR_FONT
-//FontStyle eg. italic UNO_NAME_EDIT_CHAR_POSTURE UNO_NAME_CHAR_POSTURE
awt::FontSlant NONE OBLIQUE ITALIC DONTKNOW REVERSE_OBLIQUE REVERSE_ITALIC
-//Fontsize (Pointsize eg. 12) UNO_NAME_EDIT_CHAR_HEIGHT == UNO_NAME_CHAR_HEIGHT
- //? UNO_NAME_EDIT_CHAR_WEIGHT == UNO_NAME_CHAR_WEIGHT
-//Language UNO_NAME_EDIT_CHAR_LOCALE lang::Locale
-
-//-------- tabpage: Font Effect -----------
-//Underline UNO_NAME_CHAR_UNDERLINE sal_Int16 awt::FontUnderline_NONE
_SINGLE _DOUBLE _DOTTED _DONTKNOW _DASH ...
-//Underline-color ??? 'CharUnderlineColor' + CharUnderlineHasColor
-//Strikeout eg. double "CharStrikeout" sal_Int16 awt::FontStrikeout_NONE _SINGLE
_DOUBLE ...
-//Strikeout by word yes/no "CharWordMode" bool
-//Fontcolor UNO_NAME_EDIT_CHAR_COLOR sal_Int32 UNO_NAME_CHAR_COLOR
-//ReliefType without/graved/emboss "CharRelief" sal_Int16 text::FontRelief_NONE
FontRelief_EMBOSSED FontRelief_ENGRAVED
-//Outline "CharContoured" bool
-//Shadows UNO_NAME_CHAR_SHADOWED bool
-*/
-
//static
const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForCharacterProperties()
{
@@ -343,17 +323,6 @@ const tMakePropertyNameMap&
PropertyMapper::getPropertyNameMapForTextShapeProper
( PropertyMapper::getPropertyNameMapForCharacterProperties() )
( PropertyMapper::getPropertyNameMapForFillProperties() )
( PropertyMapper::getPropertyNameMapForLineProperties() )
-// ( PropertyMapper::getPropertyNameMapForParagraphProperties() )
- // some text properties
-// ( C2U( "TextHorizontalAdjust" ), C2U( "TextHorizontalAdjust" ) )
-// ( C2U( "TextVerticalAdjust" ), C2U( "TextVerticalAdjust" ) )
-// ( C2U( "TextAutoGrowHeight" ), C2U( "TextAutoGrowHeight" ) )
-// ( C2U( "TextAutoGrowWidth" ), C2U( "TextAutoGrowWidth" ) )
-// ( C2U( "TextLeftDistance" ), C2U( "TextLeftDistance" ) )
-// ( C2U( "TextRightDistance" ), C2U( "TextRightDistance" ) )
-// ( C2U( "TextUpperDistance" ), C2U( "TextUpperDistance" ) )
-// ( C2U( "TextLowerDistance" ), C2U( "TextLowerDistance" ) )
- ;
return m_aShapePropertyMapForTextShapeProperties;
}
@@ -366,7 +335,6 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForLineSeriesPrope
tMakePropertyNameMap
( C2U( "LineColor" ), C2U("Color") )
( C2U( "LineDashName" ), C2U("LineDashName") )
-// ( C2U( "LineJoint" ), C2U("LineJoint") )
( C2U( "LineStyle" ), C2U("LineStyle") )
( C2U( "LineTransparence" ), C2U("Transparency") )
( C2U( "LineWidth" ), C2U("LineWidth") )
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 57de6f8..ec3a371 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -101,13 +101,6 @@ class ScTokenArray;
// constants and data types internal to compiler
-/*
- OpCode eOp; // OpCode
- formula::StackVar eType; // type of data
- USHORT nRefCnt; // reference count
- BOOL bRaw; // not cloned yet and trimmed to real size
- */
-
#define SC_TOKEN_FIX_MEMBERS \
OpCode eOp; \
formula::StackVar eType; \
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index ed12028..d760afe 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -176,14 +176,6 @@ namespace com { namespace sun { namespace star {
} } }
#include <svl/zforlist.hxx>
-/*
-#ifdef _ZFORLIST_DECLARE_TABLE
-class SvNumberFormatterIndexTable;
-#else
-class Table;
-typedef Table SvNumberFormatterIndexTable;
-#endif
-*/
#define SC_DOC_NEW 0xFFFF
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index a1fc0fa..839c0c6 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -551,9 +551,6 @@ class ScGlobal
static ImageList* pOutlineBitmaps;
static ImageList* pOutlineBitmapsHC;
-// static Bitmap* pAnchorBitmap;
-// static Bitmap* pGrayAnchorBitmap;
-
static ScFunctionList* pStarCalcFunctionList;
static ScFunctionMgr* pStarCalcFunctionMgr;
@@ -640,9 +637,6 @@ public:
@param bHC false = standard symbols; true = high contrast symbols. */
static ImageList* GetOutlineSymbols( bool bHC );
-// static const Bitmap& GetAnchorBitmap();
-// static const Bitmap& GetGrayAnchorBitmap();
-
static bool HasStarCalcFunctionList();
static ScFunctionList* GetStarCalcFunctionList();
static ScFunctionMgr* GetStarCalcFunctionMgr();
diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx
index 7471fdb..a83a63f 100644
--- a/sc/source/core/data/cell2.cxx
+++ b/sc/source/core/data/cell2.cxx
@@ -553,7 +553,6 @@ BOOL ScFormulaCell::GetMatrixOrigin( ScAddress& rPos ) const
case MM_FORMULA :
rPos = aPos;
return TRUE;
-// break;
case MM_REFERENCE :
{
pCode->Reset();
@@ -863,7 +862,6 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
else if ( nCol > MAXCOL )
nCol = MAXCOL;
aPos.SetCol( nCol );
-// bPosChanged = TRUE;
}
}
if ( nDy && nCol >= nCol1 && nCol <= nCol2 &&
@@ -877,7 +875,6 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
else if ( nRow > MAXROW )
nRow = MAXROW;
aPos.SetRow( nRow );
-// bPosChanged = TRUE;
}
}
if ( nDz && nCol >= nCol1 && nCol <= nCol2 &&
@@ -892,14 +889,12 @@ void ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
else if ( nTab > nMaxTab )
nTab = nMaxTab;
aPos.SetTab( nTab );
-// bPosChanged = TRUE;
}
}
}
else if ( r.In( aPos ) )
{
aOldPos.Set( nCol - nDx, nRow - nDy, nTab - nDz );
-// bPosChanged = TRUE;
}
BOOL bHasRefs = FALSE;
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index a514be0..5129f60 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -340,7 +340,6 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, BOOL bLoadRefCounts )
ppPoolDefaults[ ATTR_PAGE_FORMULAS - ATTR_STARTINDEX ] = new SfxBoolItem(
ATTR_PAGE_FORMULAS, FALSE );
ppPoolDefaults[ ATTR_PAGE_NULLVALS - ATTR_STARTINDEX ] = new SfxBoolItem(
ATTR_PAGE_NULLVALS, TRUE );
ppPoolDefaults[ ATTR_PAGE_SCALETO - ATTR_STARTINDEX ] = new ScPageScaleToItem( 1, 1 );
-// ppPoolDefaults[ ATTR_ITEM_DOUBLE - ATTR_STARTINDEX ] = new ScDoubleItem(
ATTR_ITEM_DOUBLE, 0 );
SetDefaults( ppPoolDefaults );
@@ -1023,25 +1022,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation(
}
}
break;
-
-/*
- case ATTR_PAGE_HEADERLEFT:
- rText = "SID_SCATTR_PAGE_HEADERLEFT";
- break;
-
- case ATTR_PAGE_FOOTERLEFT:
- rText = "SID_SCATTR_PAGE_FOOTERLEFT";
- break;
-
- case ATTR_PAGE_HEADERRIGHT:
- rText = "SID_SCATTR_PAGE_HEADERRIGHT";
- break;
-
- case ATTR_PAGE_FOOTERRIGHT:
- rText = "SID_SCATTR_PAGE_FOOTERRIGHT";
- break;
-*/
-
+
default:
if ( !pIntl )
pIntl = ScGlobal::GetScIntlWrapper();
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 7438362..f1c91d3 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -883,10 +883,7 @@ BOOL ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData*
pOnlyM
pTab[nNewPos]->SetTabBgColor(pTab[nOldPos]->GetTabBgColor());
SCsTAB nDz;
-/* if (nNewPos < nOldPos)
- nDz = ((short)nNewPos) - (short)nOldPos + 1;
- else
-*/ nDz = ((short)nNewPos) - (short)nOldPos;
+ nDz = ((short)nNewPos) - (short)nOldPos;
pTab[nNewPos]->UpdateReference(URM_COPY, 0, 0, nNewPos , MAXCOL, MAXROW,
nNewPos, 0, 0, nDz, NULL);
diff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx
index bdf2e19..a7414c5 100644
--- a/sc/source/core/tool/chartpos.cxx
+++ b/sc/source/core/tool/chartpos.cxx
@@ -125,7 +125,6 @@ void ScChartPositioner::GlueState()
}
return;
}
-// ULONG nOldPos = aRangeListRef->GetCurPos();
pR = aRangeListRef->First();
nStartCol = pR->aStart.Col();
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 08f0481..927047a 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -489,20 +489,7 @@ double ScInterpreter::BinomKoeff(double n, double k)
k--;
n--;
}
-/*
- double f1 = n; // Zaehler
- double f2 = k; // Nenner
- n--;
- k--;
- while (k > 0.0)
- {
- f2 *= k;
- f1 *= n;
- k--;
- n--;
- }
- nVal = f1 / f2;
-*/
+
}
return nVal;
}
@@ -672,48 +659,12 @@ double ScInterpreter::GetFDist(double x, double fF1, double fF2)
double alpha = fF2/2.0;
double beta = fF1/2.0;
return (GetBetaDist(arg, alpha, beta));
-/*
- double Z = (pow(fF,1.0/3.0)*(1.0-2.0/(9.0*fF2)) - (1.0-2.0/(9.0*fF1))) /
- sqrt(2.0/(9.0*fF1) + pow(fF,2.0/3.0)*2.0/(9.0*fF2));
- return (0.5-gauss(Z));
-*/
}
double ScInterpreter::GetTDist(double T, double fDF)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetTDist" );
return 0.5 * GetBetaDist(fDF/(fDF+T*T), fDF/2.0, 0.5);
-/*
- USHORT DF = (USHORT) fDF;
- double A = T / sqrt(DF);
- double B = 1.0 + A*A;
- double R;
- if (DF == 1)
- R = 0.5 + atan(A)/F_PI;
- else if (DF % 2 == 0)
- {
- double S0 = A/(2.0 * sqrt(B));
- double C0 = S0;
- for (USHORT i = 2; i <= DF-2; i+=2)
- {
- C0 *= (1.0 - 1.0/(double)i)/B;
- S0 += C0;
- }
- R = 0.5 + S0;
- }
- else
- {
- double S1 = A / (B * F_PI);
- double C1 = S1;
- for (USHORT i = 3; i <= DF-2; i+=2)
- {
- C1 *= (1.0 - 1.0/(double)i)/B;
- S1 += C1;
- }
- R = 0.5 + atan(A)/F_PI + S1;
- }
- return 1.0 - R;
-*/
}
// for LEGACY.CHIDIST, returns right tail, fDF=degrees of freedom
@@ -2629,11 +2580,6 @@ void ScInterpreter::ScFTest()
fF2 = fCount1-1.0;
}
PushDouble(2.0*GetFDist(fF, fF1, fF2));
-/*
- double Z = (pow(fF,1.0/3.0)*(1.0-2.0/(9.0*fF2)) - (1.0-2.0/(9.0*fF1))) /
- sqrt(2.0/(9.0*fF1) + pow(fF,2.0/3.0)*2.0/(9.0*fF2));
- PushDouble(1.0-2.0*gauss(Z));
-*/
}
void ScInterpreter::ScChiTest()
@@ -2688,25 +2634,6 @@ void ScInterpreter::ScChiTest()
else
fDF = (double)(nC1-1)*(double)(nR1-1);
PushDouble(GetChiDist(fChi, fDF));
-/*
- double fX, fS, fT, fG;
- fX = 1.0;
- for (double fi = fDF; fi >= 2.0; fi -= 2.0)
- fX *= fChi/fi;
- fX *= exp(-fChi/2.0);
- if (fmod(fDF, 2.0) != 0.0)
- fX *= sqrt(2.0*fChi/F_PI);
- fS = 1.0;
- fT = 1.0;
- fG = fDF;
- while (fT >= 1.0E-7)
- {
- fG += 2.0;
- fT *= fChi/fG;
- fS += fT;
- }
- PushDouble(1.0 - fX*fS);
-*/
}
void ScInterpreter::ScKurt()
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index e0ecf26..7b8f0e8 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1576,13 +1576,11 @@ BOOL ScInterpreter::PopDoubleRefOrSingleRef( ScAddress& rAdr )
PopDoubleRef( aRange, TRUE );
return DoubleRefToPosSingleRef( aRange, rAdr );
}
- //break;
case svSingleRef :
{
PopSingleRef( rAdr );
return TRUE;
}
- //break;
default:
PopError();
SetError( errNoRef );
@@ -2243,12 +2241,10 @@ const String& ScInterpreter::GetString()
case svError:
PopError();
return EMPTY_STRING;
- //break;
case svMissing:
case svEmptyCell:
Pop();
return EMPTY_STRING;
- //break;
case svDouble:
{
double fVal = PopDouble();
@@ -2258,10 +2254,8 @@ const String& ScInterpreter::GetString()
pFormatter->GetInputLineString(fVal, nIndex, aTempStr);
return aTempStr;
}
- //break;
case svString:
return PopString();
- //break;
case svSingleRef:
{
ScAddress aAdr;
@@ -2275,7 +2269,6 @@ const String& ScInterpreter::GetString()
else
return EMPTY_STRING;
}
- //break;
case svDoubleRef:
{ // generate position dependent SingleRef
ScRange aRange;
@@ -2302,7 +2295,6 @@ const String& ScInterpreter::GetString()
PopExternalDoubleRef(pMat);
return GetStringFromMatrix(pMat);
}
- //break;
case svMatrix:
{
ScMatrixRef pMat = PopMatrix();
@@ -3451,17 +3443,6 @@ void ScInterpreter::ScTableOp()
pDok->DecInterpreterTableOpLevel();
}
-
-/*
-
-void ScInterpreter::ScErrCell()
-{
-RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScErrCell" );
- double fErrNum = GetDouble();
- PushError((USHORT) fErrNum);
-}
-*/
-
void ScInterpreter::ScDBArea()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScDBArea" );
@@ -3597,7 +3578,6 @@ ScInterpreter::ScInterpreter( ScFormulaCell* pCell, ScDocument* pDoc,
meVolaileType(NOT_VOLATILE)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScTTT" );
-// pStack = new ScToken*[ MAXSTACK ];
BYTE cMatFlag = pMyFormulaCell->GetMatrixFlag();
bMatrixFormula = ( cMatFlag == MM_FORMULA || cMatFlag == MM_FAKE );
@@ -3638,7 +3618,6 @@ void ScInterpreter::GlobalExit() // static
StackVar ScInterpreter::Interpret()
{
-// StackPrinter __stack_printer__("ScInterpreter::Interpret");
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::Interpret" );
short nRetTypeExpr = NUMBERFORMAT_UNDEFINED;
ULONG nRetIndexExpr = 0;
@@ -3746,7 +3725,6 @@ StackVar ScInterpreter::Interpret()
case ocNeg : ScNeg(); break;
case ocPercentSign : ScPercentSign(); break;
case ocPi : ScPi(); break;
-// case ocDefPar : ScDefPar(); break;
case ocRandom : ScRandom(); break;
case ocTrue : ScTrue(); break;
case ocFalse : ScFalse(); break;
@@ -4007,7 +3985,6 @@ StackVar ScInterpreter::Interpret()
case ocBetaInv : ScBetaInv(); break;
case ocExternal : ScExternal(); break;
case ocTableOp : ScTableOp(); break;
-// case ocErrCell : ScErrCell(); break;
case ocStop : break;
case ocErrorType : ScErrorType(); break;
case ocCurrent : ScCurrent(); break;
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index e930a86..6181118 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -876,17 +876,6 @@ XclExpTbxControlObj::XclExpTbxControlObj( XclExpObjectManager& rRoot,
Reference<
bool XclExpTbxControlObj::SetMacroLink( const ScriptEventDescriptor& rEvent )
{
return XclMacroHelper::SetMacroLink( rEvent, meEventType );
-/*
- String aMacroName = XclControlHelper::ExtractFromMacroDescriptor( rEvent, meEventType );
- if( aMacroName.Len() )
- {
- sal_uInt16 nExtSheet = GetLocalLinkManager().FindExtSheet( EXC_EXTSH_OWNDOC );
- sal_uInt16 nNameIdx = GetNameManager().InsertMacroCall( aMacroName, true, false );
- mxMacroLink = GetFormulaCompiler().CreateNameXFormula( nExtSheet, nNameIdx );
- return true;
- }
- return false;
-*/
}
void XclExpTbxControlObj::WriteSubRecs( XclExpStream& rStrm )
diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx
index 0f0d985..ebb6dab 100644
--- a/sc/source/filter/excel/xltoolbar.cxx
+++ b/sc/source/filter/excel/xltoolbar.cxx
@@ -257,21 +257,6 @@ bool TBC::ImportToolBarControl( CTBWrapper& rWrapper, const
css::uno::Reference<
if ( tbcd.get() )
{
std::vector< css::beans::PropertyValue > props;
-/*
- if ( bBuiltin )
- {
- rtl::OUString sCommand = helper.MSOCommandToOOCommand( cmdId );
- if ( sCommand.getLength() > 0 )
- {
- beans::PropertyValue aProp;
-
- aProp.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CommandURL") );
- aProp.Value <<= sCommand;
- props.push_back( aProp );
- }
-
- }
-*/
bool bBeginGroup = false;
if ( ! tbcd->ImportToolBarControl( helper, props, bBeginGroup, bIsMenuToolbar ) )
return false;
Context
- [Libreoffice] [libreoffice] [PATCH] Commented-out code for the day · Ricardo Moreno
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.