summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-02-04 17:09:40 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-02-06 17:38:48 +0100
commitcac42d3f6aca864da439a83f123638accf2e97cd (patch)
tree99ad3f972ff7b6def78dbb0fe3a9231947fe917f
parent1f21015e1546086a2d945a3fb375f44a64ae338f (diff)
Remove dead code
Diffstat
-rw-r--r--chart2/source/controller/main/ChartController_Insert.cxx9
-rw-r--r--chart2/source/tools/LifeTime.cxx52
-rw-r--r--chart2/source/view/main/ChartView.cxx22
-rw-r--r--chart2/source/view/main/PropertyMapper.cxx24
-rw-r--r--sc/source/filter/starcalc/scflt.cxx68
-rw-r--r--sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx55
-rw-r--r--sc/source/filter/xml/XMLExportDataPilot.cxx10
-rw-r--r--sc/source/filter/xml/XMLExportDatabaseRanges.cxx30
-rw-r--r--sc/source/filter/xml/XMLTrackedChangesContext.cxx21
-rw-r--r--sc/source/filter/xml/xmlannoi.cxx12
-rw-r--r--sc/source/filter/xml/xmlcoli.cxx23
-rw-r--r--sc/source/filter/xml/xmlnexpi.cxx25
-rw-r--r--sc/source/filter/xml/xmlstyle.cxx28
-rw-r--r--sc/source/filter/xml/xmlsubti.cxx9
-rw-r--r--sc/source/filter/xml/xmlsubti.hxx1
-rw-r--r--sc/source/filter/xml/xmlwrap.cxx51
-rw-r--r--sc/source/ui/Accessibility/AccessibleText.cxx22
-rw-r--r--sc/source/ui/dbgui/tpsort.cxx7
-rw-r--r--sc/source/ui/drawfunc/fuconarc.cxx9
-rw-r--r--sc/source/ui/drawfunc/fusel.cxx49
-rw-r--r--sc/source/ui/formdlg/dwfunctr.cxx13
-rw-r--r--sc/source/ui/inc/datafdlg.hxx2
-rw-r--r--sc/source/ui/inc/tbinsert.hxx34
-rw-r--r--sc/source/ui/miscdlgs/datafdlg.cxx9
-rw-r--r--sc/source/ui/optdlg/tpusrlst.cxx21
-rw-r--r--sc/source/ui/unoobj/cellsuno.cxx63
-rw-r--r--sc/source/ui/vba/vbastyle.hxx30
-rw-r--r--sc/source/ui/vba/vbawindow.cxx13
-rw-r--r--sc/source/ui/view/gridwin4.cxx134
29 files changed, 1 insertions, 845 deletions
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index 6a55514ac522..50d5d6b7fda6 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -790,15 +790,6 @@ void ChartController::executeDispatch_InsertAxisTitle()
xTitle = TitleHelper::createTitle( eTitleType, ObjectNameProvider::getTitleNameByType(eTitleType), getModel(), m_xCC, apRefSizeProvider.get() );
aUndoGuard.commitAction();
}
-
- /*
- if( xTitle.is() )
- {
- OUString aTitleCID = ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, getModel() );
- select( uno::makeAny(aTitleCID) );
- executeDispatch_EditText();
- }
- */
}
catch( uno::RuntimeException& e)
{
diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx
index 5084e93f605c..51f49e71b7b1 100644
--- a/chart2/source/tools/LifeTime.cxx
+++ b/chart2/source/tools/LifeTime.cxx
@@ -490,58 +490,6 @@ LifeTimeGuard::~LifeTimeGuard()
}
}
-/*
-the XCloseable::close method has to be implemented in the following way:
-::close
-{
- //hold no mutex
-
- if( !m_aLifeTimeManager.g_close_startTryClose( bDeliverOwnership ) )
- return;
- //no mutex is acquired
-
- // At the end of this method may we must dispose ourself ...
- // and may nobody from outside hold a reference to us ...
- // then it's a good idea to do that by ourself.
- uno::Reference< uno::XInterface > xSelfHold( static_cast< ::cppu::OWeakObject* >(this) );
-
- //the listeners have had no veto
- //check wether we self can close
- {
- util::CloseVetoException aVetoException = util::CloseVetoException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "the model itself could not be closed" ) )
- , static_cast< ::cppu::OWeakObject* >(this));
-
- if( m_aLifeTimeManager.g_close_isNeedToCancelLongLastingCalls( bDeliverOwnership, aVetoException ) )
- {
- ////you can empty this block, if you never start longlasting calls or
- ////if your longlasting calls are per default not cancelable (check how you have constructed your LifeTimeManager)
-
- sal_Bool bLongLastingCallsAreCanceled = sal_False;
- try
- {
- //try to cancel running longlasting calls
- //// @todo
- }
- catch( uno::Exception& ex )
- {
- //// @todo
- //do not throw anything here!! (without endTryClose)
- }
- //if not successful canceled
- if(!bLongLastingCallsAreCanceled)
- {
- m_aLifeTimeManager.g_close_endTryClose( bDeliverOwnership, sal_True );
- throw aVetoException;
- }
- }
-
- }
- m_aLifeTimeManager.g_close_endTryClose_doClose();
-}
-*/
-
}//end namespace apphelper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index d4654624fef8..5416164100cd 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2499,27 +2499,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;
+ return false;
}
void ChartView::impl_refreshAddIn()
diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx
index 4b3948fc6b4d..99b1ec8a2f21 100644
--- a/chart2/source/view/main/PropertyMapper.cxx
+++ b/chart2/source/view/main/PropertyMapper.cxx
@@ -178,15 +178,9 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForCharacterProper
//shape property -- chart model object property
static tMakePropertyNameMap m_aShapePropertyMapForCharacterProperties =
tMakePropertyNameMap
-// ( C2U( "CharBackColor" ), C2U("TextBackgroundColor") )
-// ( C2U( "CharCaseMap" ), C2U("CaseMapping") )
( C2U( "CharColor" ), C2U("CharColor") )
( C2U( "CharContoured" ), C2U("CharContoured") )
-/////// ( C2U( "CharCrossedOut" ), C2U("CharCrossedOut") ) //setting this explicitly somehow conflicts with CharStrikeout
( C2U( "CharEmphasis" ), C2U("CharEmphasis") )//the service style::CharacterProperties describes a property called 'CharEmphasize' wich is nowhere implemented
-// ( C2U( "CharEscapement" ), C2U("CharEscapement") ) //#i98344# @future: add these to properties again, if the user interface offers the possibility to change them; then make sure that older wrong files are corrected on import
-// ( C2U( "CharEscapementHeight" ), C2U("CharEscapementHeight") ) //#i98344# @future: add these to properties again, if the user interface offers the possibility to change them; then make sure that older wrong files are corrected on import
-// ( C2U( "CharFlash" ), C2U("Flashing") )
( C2U( "CharFontFamily" ), C2U("CharFontFamily") )
( C2U( "CharFontFamilyAsian" ), C2U("CharFontFamilyAsian") )
@@ -211,13 +205,10 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForCharacterProper
( C2U( "CharLocale" ), C2U("CharLocale") )
( C2U( "CharLocaleAsian" ), C2U("CharLocaleAsian") )
( C2U( "CharLocaleComplex" ), C2U("CharLocaleComplex") )
-// ( C2U( "CharNoHyphenation" ), C2U("InhibitHyphenation") )
( C2U( "CharPosture" ), C2U("CharPosture") )
( C2U( "CharPostureAsian" ), C2U("CharPostureAsian") )
( C2U( "CharPostureComplex" ), C2U("CharPostureComplex") )
( C2U( "CharRelief" ), C2U("CharRelief") )
-// ( C2U( "CharRotation" ), C2U("Rotation") ) --> additional feature ...
-// ( C2U( "CharScaleWidth" ), C2U("CharScaleWidth") )
( C2U( "CharShadowed" ), C2U("CharShadowed") )
( C2U( "CharStrikeout" ), C2U("CharStrikeout") )
( C2U( "CharUnderline" ), C2U("CharUnderline") )
@@ -230,10 +221,6 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForCharacterProper
( C2U( "WritingMode" ), C2U("WritingMode") )
-// ( C2U( "RubyText" ), C2U("RubyText") )
-// ( C2U( "RubyAdjust" ), C2U("RubyAdjust") )
-// ( C2U( "RubyCharStyleName" ), C2U("RubyStyleName") )
-// ( C2U( "RubyIsAbove" ), C2U("RubyIsAbove") )
( C2U( "ParaIsCharacterDistance" ), C2U("ParaIsCharacterDistance") )
;
return m_aShapePropertyMapForCharacterProperties;
@@ -362,7 +349,6 @@ const tMakePropertyNameMap& PropertyMapper::getPropertyNameMapForFilledSeriesPro
//line properties
( C2U( "LineColor" ), C2U("BorderColor") )
( C2U( "LineDashName" ), C2U("BorderDashName") )
-// ( C2U( "LineJoint" ), C2U("LineJoint") )
( C2U( "LineStyle" ), C2U("BorderStyle") )
( C2U( "LineTransparence" ), C2U("BorderTransparency") )
( C2U( "LineWidth" ), C2U("BorderWidth") )
@@ -435,7 +421,6 @@ void PropertyMapper::getTextLabelMultiPropertyLists(
aValueMap.insert( tPropertyNameValueMap::value_type( C2U("LineStyle"), uno::makeAny(drawing::LineStyle_NONE) ) ); // drawing::LineStyle
aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextHorizontalAdjust"), uno::makeAny(drawing::TextHorizontalAdjust_CENTER) ) ); // drawing::TextHorizontalAdjust - needs to be overwritten
aValueMap.insert( tPropertyNameValueMap::value_type( C2U("TextVerticalAdjust"), uno::makeAny(drawing::TextVerticalAdjust_CENTER) ) ); //drawing::TextVerticalAdjust - needs to be overwritten
- //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
if( bName )
@@ -450,15 +435,6 @@ void PropertyMapper::getTextLabelMultiPropertyLists(
aValueMap.insert( tPropertyNameValueMap::value_type( C2U("ParaIsHyphenation"), uno::makeAny(sal_True) ) );
}
- /*
- //@todo ?: add paragraph properties:
- //(uno::makeAny(eParaAdjust)) //ParaAdjust - style::ParagraphAdjust
- //(uno::makeAny( (sal_Bool)rAxisLabelProperties.bLineBreakAllowed )) //ParaIsHyphenation - sal_Bool
- style::ParagraphAdjust eParaAdjust( style::ParagraphAdjust_LEFT );
- if( eHorizontalAdjust == drawing::TextHorizontalAdjust_RIGHT )
- eParaAdjust = style::ParagraphAdjust_RIGHT;
- */
-
PropertyMapper::getMultiPropertyListsFromValueMap( rPropNames, rPropValues, aValueMap );
}
diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index 875dd96aed1f..67cc01ca7cc2 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -29,10 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sc.hxx"
-
-
// INCLUDE ---------------------------------------------------------------
-
#include "scitems.hxx"
#include <editeng/eeitem.hxx>
@@ -328,27 +325,10 @@ void lcl_ReadChartTypeData(SvStream& rStream, Sc10ChartTypeData& rTypeData)
rStream.Read(&rTypeData.LabelText[i], sizeof(Sc10ChartText));
rStream.Read(&rTypeData.LeftTitle, sizeof(rTypeData.LeftTitle));
rStream.Read(&rTypeData.Reserved, sizeof(rTypeData.Reserved));
- //rStream.Read(&rTypeData, sizeof(rTypeData));
}
double lcl_PascalToDouble(sal_Char* tp6)
{
-// #i68483# bah! this was broken forever...
-// struct
-// {
-// sal_uInt8 be ; /* biased exponent */
-// sal_uInt16 v1 ; /* lower 16 bits of mantissa */
-// sal_uInt16 v2 ; /* next 16 bits of mantissa */
-// sal_uInt8 v3:7; /* upper 7 bits of mantissa */
-// sal_uInt8 s :1; /* sign bit */
-// } real;
-//
-// memcpy (&real, tp6, 6);
-// if (real.be == 0)
-// return 0.0;
-// return (((((128 +real.v3) * 65536.0) + real.v2) * 65536.0 + real.v1) *
-// ldexp ((real.s? -1.0: 1.0), real.be - (129+39)));
-
sal_uInt8* pnUnsigned = reinterpret_cast< sal_uInt8* >( tp6 );
// biased exponent
sal_uInt8 be = pnUnsigned[ 0 ];
@@ -408,7 +388,6 @@ String lcl_MakeOldPageStyleFormatName( USHORT i )
// Font
//--------------------------------------------
-
Sc10FontData::Sc10FontData(SvStream& rStream)
{
rStream >> Height;
@@ -443,12 +422,10 @@ Sc10FontCollection::Sc10FontCollection(SvStream& rStream) :
}
}
-
//--------------------------------------------
// Benannte-Bereiche
//--------------------------------------------
-
Sc10NameData::Sc10NameData(SvStream& rStream)
{
BYTE nLen;
@@ -490,12 +467,9 @@ Sc10NameCollection::Sc10NameCollection(SvStream& rStream) :
// Vorlagen
//--------------------------------------------
-
Sc10PatternData::Sc10PatternData(SvStream& rStream)
{
rStream.Read(Name, sizeof(Name));
- //rStream.Read(&ValueFormat, sizeof(ValueFormat));
- //rStream.Read(&LogFont, sizeof(LogFont));
lcl_ReadValueFormat(rStream, ValueFormat);
lcl_ReadLogFont(rStream, LogFont);
@@ -534,15 +508,12 @@ Sc10PatternCollection::Sc10PatternCollection(SvStream& rStream) :
}
}
-
//--------------------------------------------
// Datenbank
//--------------------------------------------
-
Sc10DataBaseData::Sc10DataBaseData(SvStream& rStream)
{
- //rStream.Read(&DataBaseRec, sizeof(DataBaseRec));
rStream.Read(&DataBaseRec.Name, sizeof(DataBaseRec.Name));
rStream >> DataBaseRec.Tab;
lcl_ReadBlockRect(rStream, DataBaseRec.Block);
@@ -1041,7 +1012,6 @@ ULONG Sc10Import::Import()
void Sc10Import::LoadFileHeader()
{
Sc10FileHeader FileHeader;
- //rStream.Read(&FileHeader, sizeof(FileHeader));
lcl_ReadFileHeader(rStream, FileHeader);
nError = rStream.GetError();
@@ -1084,7 +1054,6 @@ void Sc10Import::LoadEditStateInfo()
void Sc10Import::LoadProtect()
{
- //rStream.Read(&SheetProtect, sizeof(SheetProtect));
lcl_ReadSheetProtect(rStream, SheetProtect);
nError = rStream.GetError();
@@ -1115,10 +1084,6 @@ void Sc10Import::LoadScrZoom()
void Sc10Import::LoadPalette()
{
- //rStream.Read(TextPalette, sizeof(TextPalette));
- //rStream.Read(BackPalette, sizeof(BackPalette));
- //rStream.Read(RasterPalette, sizeof(RasterPalette));
- //rStream.Read(FramePalette, sizeof(FramePalette));
lcl_ReadPalette(rStream, TextPalette);
lcl_ReadPalette(rStream, BackPalette);
lcl_ReadPalette(rStream, RasterPalette);
@@ -1248,9 +1213,6 @@ void Sc10Import::LoadPatternCollection()
rItemSet.Put( SfxInt32Item( ATTR_ROTATE_VALUE, 27000 ) );
INT16 Margin = Max( ( USHORT ) 20, ( USHORT ) ( EJustify * 20 ) );
-// if( ( ( OJustify & ojBottomTop ) == ojBottomTop ) ||
-// ( ( OJustify & ojBottomTop ) == ojBottomTop ) )
-// vielleicht so?
if( ( ( OJustify & ojBottomTop ) == ojBottomTop ) )
rItemSet.Put( SvxMarginItem( 20, Margin, 20, Margin, ATTR_MARGIN ) );
else
@@ -1431,7 +1393,6 @@ void Sc10Import::LoadTables()
String aStr; // Universal-Konvertierungs-String
- //rStream.Read(&PageFormat, sizeof(PageFormat));
lcl_ReadPageFormat(rStream, PageFormat);
USHORT nAt = aPageCollection.InsertFormat(PageFormat);
@@ -1441,7 +1402,6 @@ void Sc10Import::LoadTables()
rStream >> DataBaseIndex;
- //rStream.Read(&TabProtect, sizeof(TabProtect));
lcl_ReadTabProtect(rStream, TabProtect);
ScTableProtection aProtection;
@@ -1487,18 +1447,6 @@ void Sc10Import::LoadTables()
aSc30ViewOpt.SetObjMode( VOBJ_TYPE_DRAW, eObjMode );
}
- /* wofuer wird das benoetigt? Da in SC 1.0 die Anzeigeflags pro Tabelle gelten und nicht pro View
- Dieses Flag in die ViewOptions eintragen bei Gelegenheit, Sollte der Stephan Olk machen
- USHORT nDisplayMask = 0xFFFF;
- USHORT nDisplayValue = 0;
- if (Tab == 0)
- nDisplayValue = Display;
- else
- {
- USHORT nDiff = Display ^ nDisplayValue;
- nDisplayMask &= ~nDiff;
- }
- */
//--------------------------------------------------------------------
rStream >> Visible;
@@ -1687,7 +1635,6 @@ void Sc10Import::LoadCol(SCCOL Col, SCTAB Tab)
/*double Value =*/ ScfTools::ReadLongDouble(rStream);
BYTE Len;
sal_Char s[256];
- //rStream.Read(&Value, sizeof(Value));
rStream >> Len;
rStream.Read(&s[1], Len);
s[0] = '=';
@@ -1761,13 +1708,10 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
pColData = aFont.pData;
for( i = 0 ; i < nLimit ; i++, pColData++ )
{
- //nEnd = aFont.pData[i].Row;
nEnd = static_cast<SCROW>(pColData->Row);
- //if ((nStart <= nEnd) && (aFont.pData[i].Value != 0))
if ((nStart <= nEnd) && (pColData->Value))
{
FontFamily eFam = FAMILY_DONTKNOW;
- //Sc10FontData* pFont = pFontCollection->At(aFont.pData[i].Value);
Sc10FontData* pFont = pFontCollection->At(pColData->Value);
switch (pFont->PitchAndFamily & 0xF0)
{
@@ -1795,9 +1739,7 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab)
pColData = aColor.pData;
for( i = 0 ; i < nLimit ; i++, pColData++ )
{
- //nEnd = aColor.pData[i].Row;
nEnd = static_cast<SCROW>(pColData->Row);
- //if ((nStart <= nEnd) && (aColor.pData[i].Value != 0))
if ((nStart <= nEnd) && (pColData->Value))
{
Color TextColor(COL_BLACK);
@@ -2196,7 +2138,6 @@ void Sc10Import::LoadAttr(Sc10ColAttr& rAttr)
rStream >> rAttr.pData[i].Row;
rStream >> rAttr.pData[i].Value;
}
- //rStream.Read(rAttr.pData, rAttr.Count * sizeof(Sc10ColData));
nError = rStream.GetError();
}
else
@@ -2367,7 +2308,6 @@ void Sc10Import::LoadObjects()
for (USHORT i = 0; (i < nAnz) && (nError == 0) && !rStream.IsEof() && !IsOleObject; i++)
{
rStream >> ObjectType;
- //rStream.Read(&GraphHeader, sizeof(GraphHeader));
lcl_ReadGraphHeader(rStream, GraphHeader);
double nPPTX = ScGlobal::nScreenPPTX;
@@ -2395,7 +2335,6 @@ void Sc10Import::LoadObjects()
case otImage :
{
Sc10ImageHeader ImageHeader;
- //rStream.Read(&ImageHeader, sizeof(ImageHeader));
lcl_ReadImageHeaer(rStream, ImageHeader);
// Achtung nun kommen die Daten (Bitmap oder Metafile)
@@ -2412,16 +2351,12 @@ void Sc10Import::LoadObjects()
Sc10ChartHeader ChartHeader;
Sc10ChartSheetData ChartSheetData;
Sc10ChartTypeData* pTypeData = new Sc10ChartTypeData;
- //rStream.Read(&ChartHeader, sizeof(ChartHeader));
lcl_ReadChartHeader(rStream, ChartHeader);
//! altes Metafile verwenden ??
rStream.SeekRel(ChartHeader.Size);
- //rStream.Read(&ChartSheetData, sizeof(ChartSheetData));
lcl_ReadChartSheetData(rStream, ChartSheetData);
-
- //rStream.Read(pTypeData, sizeof(Sc10ChartTypeData));
lcl_ReadChartTypeData(rStream, *pTypeData);
Rectangle aRect( Point(nStartX,nStartY), Size(nSizeX,nSizeY) );
@@ -2448,9 +2383,6 @@ void Sc10Import::LoadObjects()
}
}
-
-
-
//-----------------------------------------------------------------------------------------------
FltError ScFormatFilterPluginImpl::ScImportStarCalc10( SvStream& rStream, ScDocument* pDocument )
diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
index 9f129bd160dd..37c5af2cad1b 100644
--- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx
@@ -228,50 +228,9 @@ void ScChangeTrackingExportHelper::WriteDependings(ScChangeAction* pAction)
WriteDeleted(pEntry->GetAction());
pEntry = pEntry->GetNext();
}
- /*if (pAction->IsDeleteType())
- {
- ScChangeActionDel* pDelAction = static_cast<ScChangeActionDel*> (pAction);
- if (pDelAction)
- {
- const ScChangeActionCellListEntry* pCellEntry = pDelAction->GetFirstCellEntry();
- while (pCellEntry)
- {
- WriteGenerated(pCellEntry->GetContent());
- pCellEntry = pCellEntry->GetNext();
- }
- }
- }
- else if (pAction->GetType() == SC_CAT_MOVE)
- {
- ScChangeActionMove* pMoveAction = static_cast<ScChangeActionMove*> (pAction);
- if (pMoveAction)
- {
- const ScChangeActionCellListEntry* pCellEntry = pMoveAction->GetFirstCellEntry();
- while (pCellEntry)
- {
- WriteGenerated(pCellEntry->GetContent());
- pCellEntry = pCellEntry->GetNext();
- }
- }
- }*/
}
}
-/*void ScChangeTrackingExportHelper::WriteDependings(ScChangeAction* pAction)
-{
- pChangeTrack->GetDependents(pAction, *pDependings);
- if (pDependings->Count())
- {
- SvXMLElementExport aDependingsElem (rExport, XML_NAMESPACE_TABLE, XML_DEPENDENCIES, sal_True, sal_True);
- ScChangeAction* pDependAction = pDependings->First();
- while (pDependAction != NULL)
- {
- WriteDepending(pDependAction);
- pDependAction = pDependings->Next();
- }
- }
-}*/
-
void ScChangeTrackingExportHelper::WriteEmptyCell()
{
SvXMLElementExport aElemEmptyCell(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, sal_True, sal_True);
@@ -334,12 +293,6 @@ void ScChangeTrackingExportHelper::WriteValueCell(const ScBaseCell* pCell, const
{
SetValueAttributes(pValueCell->GetValue(), sValue);
SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, sal_True, sal_True);
-/* if (sValue.Len())
- {
- SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TEXT, XML_P, sal_True, sal_False);
- sal_Bool bPrevCharWasSpace(sal_True);
- rExport.GetTextParagraphExport()->exportText(sValue, bPrevCharWasSpace);
- }*/
}
}
@@ -599,7 +552,6 @@ void ScChangeTrackingExportHelper::AddDeletionAttributes(const ScChangeActionDel
{
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_TYPE, XML_TABLE);
nPosition = nStartSheet;
- //DBG_ERROR("not implemented feature");
}
break;
default :
@@ -793,13 +745,6 @@ void ScChangeTrackingExportHelper::CollectAndWriteChanges()
{
if (pChangeTrack)
{
-/* if (pChangeTrack->IsProtected())
- {
- rtl::OUStringBuffer aBuffer;
- SvXMLUnitConverter::encodeBase64(aBuffer, pChangeTrack->GetProtection());
- if (aBuffer.getLength())
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_PROTECTION_KEY, aBuffer.makeStringAndClear());
- }*/
SvXMLElementExport aCangeListElem(rExport, XML_NAMESPACE_TABLE, XML_TRACKED_CHANGES, sal_True, sal_True);
{
ScChangeAction* pAction = pChangeTrack->GetFirst();
diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx
index 8ca1779250ec..e921a899f35f 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.cxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx
@@ -29,8 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sc.hxx"
-
-
// INCLUDE ---------------------------------------------------------------
#include "XMLExportDataPilot.hxx"
#include <xmloff/xmltoken.hxx>
@@ -180,14 +178,6 @@ void ScXMLExportDataPilot::WriteDPFilter(const ScQueryParam& aQueryParam)
nQueryEntryCount = nEntries;
if (nQueryEntryCount)
{
- // There is never a target range in a data pilot.
-/* if (!aQueryParam.bInplace)
- {
- ScAddress aTargetAddress(aQueryParam.nDestCol, aQueryParam.nDestRow, aQueryParam.nDestTab);
- rtl::OUString sAddress;
- ScXMLConverter::GetStringFromAddress( sAddress, aTargetAddress, pDoc );
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, sAddress);
- }*/
if(!((aQueryParam.nCol1 == aQueryParam.nCol2) && (aQueryParam.nRow1 == aQueryParam.nRow2) &&
(static_cast<SCCOLROW>(aQueryParam.nCol1) == static_cast<SCCOLROW>(aQueryParam.nRow1)) &&
(aQueryParam.nCol1 == 0) && (aQueryParam.nTab == SCTAB_MAX)))
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index 1414193dc947..6c9abb9372fb 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -407,7 +407,6 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans::
uno::Sequence <table::TableSortField> aSortFields;
sal_Bool bBindFormatsToContent (sal_True);
sal_Bool bCopyOutputData (sal_False);
-// sal_Bool bIsCaseSensitive (sal_False);
sal_Bool bIsUserListEnabled (sal_False);
table::CellAddress aOutputPosition;
sal_Int32 nUserListIndex = 0;
@@ -419,9 +418,6 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans::
bBindFormatsToContent = ::cppu::any2bool(aSortProperties[i].Value);
else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_COPYOUT) == 0)
bCopyOutputData = ::cppu::any2bool(aSortProperties[i].Value);
-// no longer supported
-/* else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_ISCASE) == 0)
- bIsCaseSensitive = ::cppu::any2bool(aSortProperties[i].Value);*/
else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_ISULIST) == 0)
bIsUserListEnabled = ::cppu::any2bool(aSortProperties[i].Value);
else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_OUTPOS) == 0)
@@ -430,11 +426,6 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans::
aSortProperties[i].Value >>= nUserListIndex;
else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_SORTFLD) == 0)
aSortProperties[i].Value >>= aSortFields;
-// no longer supported
-/* else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_COLLLOC) == 0)
- aSortProperties[i].Value >>= aCollatorLocale;
- else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_COLLALG) == 0)
- aSortProperties[i].Value >>= sCollatorAlgorithm;*/
}
sal_Int32 nSortFields = aSortFields.getLength();
if (nSortFields > 0)
@@ -447,9 +438,6 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans::
ScRangeStringConverter::GetStringFromAddress( sOUCellAddress, aOutputPosition, pDoc, ::formula::FormulaGrammar::CONV_OOO );
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, sOUCellAddress);
}
-// no longer supported
-// if (bIsCaseSensitive)
-// rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE);
if (aSortFields[0].IsCaseSensitive)
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE);
@@ -460,13 +448,6 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans::
DBG_ASSERT(bCaseSensitive == aSortFields[i].IsCaseSensitive, "seems that it is now possible to have every field case sensitive");
}
#endif
-// no longer supported
-/* if (aCollatorLocale.Language.getLength())
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_LANGUAGE, aCollatorLocale.Language);
- if (aCollatorLocale.Country.getLength())
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_COUNTRY, aCollatorLocale.Country);
- if (sCollatorAlgorithm.getLength())
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ALGORITHM, sCollatorAlgorithm);*/
if (aSortFields[0].CollatorLocale.Language.getLength())
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_LANGUAGE, aSortFields[0].CollatorLocale.Language);
if (aSortFields[0].CollatorLocale.Country.getLength())
@@ -527,9 +508,6 @@ void ScXMLExportDatabaseRanges::WriteSubTotalDescriptor(const com::sun::star::un
if (nSubTotalFields > 0)
{
uno::Reference <beans::XPropertySet> xPropertySet (xSubTotalDescriptor, uno::UNO_QUERY);
-// sal_Bool bEnableUserSortList = sal_False;
-// sal_Bool bSortAscending = sal_True;
-// sal_Int32 nUserSortListIndex = 0;
if (xPropertySet.is())
{
if (!::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_BINDFMT)))))
@@ -538,9 +516,6 @@ void ScXMLExportDatabaseRanges::WriteSubTotalDescriptor(const com::sun::star::un
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_PAGE_BREAKS_ON_GROUP_CHANGE, XML_TRUE);
if (::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISCASE)))))
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE);
-// bSortAscending = ::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_SORTASCENDING))));
-// if (::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ENABLEUSERSORTLIST)))))
-// xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_USERSORTLISTINDEX))) >>= nUserSortListIndex;
}
SvXMLElementExport aElemSTRs(rExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULES, sal_True, sal_True);
rExport.CheckAttrList();
@@ -651,11 +626,6 @@ void ScXMLExportDatabaseRanges::WriteDatabaseRanges(const com::sun::star::uno::R
if (!::cppu::any2bool(xFilterProperties->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CONTHDR)))))
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CONTAINS_HEADER, XML_FALSE);
- // #98317#; there is no orientation on the filter
-/* table::TableOrientation eFilterOrient(table::TableOrientation_ROWS);
- if (::cppu::any2bool(xFilterProperties->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ORIENT)))))
- eFilterOrient = table::TableOrientation_ROWS;*/
-
sal_Bool bSortColumns(sal_True);
sal_Bool bFound(sal_False);
sal_Int32 nProperty(0);
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index 86a5f4a88a81..2dd91d15c91d 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -285,8 +285,6 @@ class ScXMLChangeCellContext : public SvXMLImportContext
double& rDateTimeValue;
double fValue;
sal_uInt16& rType;
-// sal_Bool bIsMatrix;
-// sal_Bool bIsCoveredMatrix;
sal_Bool bEmpty;
sal_Bool bFirstParagraph;
sal_Bool bString;
@@ -1293,7 +1291,6 @@ void ScXMLChangeCellContext::EndElement()
if (GetScImport().GetDocument())
rOldCell = new ScEditCell(pEditTextObj->CreateTextObject(), GetScImport().GetDocument(), GetScImport().GetDocument()->GetEditPool());
GetScImport().GetTextImport()->ResetCursor();
- // delete pEditTextObj;
pEditTextObj->release();
}
else
@@ -1307,24 +1304,6 @@ void ScXMLChangeCellContext::EndElement()
if (rType == NUMBERFORMAT_DATE || rType == NUMBERFORMAT_TIME)
rInputString = sText;
}
- else
- {
- // do nothing, this has to do later (on another place)
- /*ScAddress aCellPos;
- rOldCell = new ScFormulaCell(GetScImport().GetDocument(), aCellPos, sFormula);
- if (bString)
- static_cast<ScFormulaCell*>(rOldCell)->SetString(sValue);
- else
- static_cast<ScFormulaCell*>(rOldCell)->SetDouble(fValue);
- static_cast<ScFormulaCell*>(rOldCell)->SetInChangeTrack(sal_True);
- if (bIsCoveredMatrix)
- static_cast<ScFormulaCell*>(rOldCell)->SetMatrixFlag(MM_REFERENCE);
- else if (bIsMatrix && nMatrixRows && nMatrixCols)
- {
- static_cast<ScFormulaCell*>(rOldCell)->SetMatrixFlag(MM_FORMULA);
- static_cast<ScFormulaCell*>(rOldCell)->SetMatColsRows(static_cast<SCCOL>(nMatrixCols), static_cast<SCROW>(nMatrixRows));
- }*/
- }
}
}
else
diff --git a/sc/source/filter/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxx
index 6fcb70393eec..43e5d8b021fa 100644
--- a/sc/source/filter/xml/xmlannoi.cxx
+++ b/sc/source/filter/xml/xmlannoi.cxx
@@ -159,18 +159,6 @@ SvXMLImportContext *ScXMLAnnotationContext::CreateChildContext( USHORT nPrefix,
pContext = new ScXMLContentContext(GetScImport(), nPrefix,
rLName, xAttrList, maCreateDateStringBuffer);
}
-/* else if ((nPrefix == XML_NAMESPACE_TEXT) && IsXMLToken(rLName, XML_P) )
- {
- if (!bHasTextP)
- {
- bHasTextP = sal_True;
- maTextBuffer.setLength(0);
- }
- if(nParagraphCount)
- maTextBuffer.append(static_cast<sal_Unicode>('\n'));
- ++nParagraphCount;
- pContext = new ScXMLContentContext( GetScImport(), nPrefix, rLName, xAttrList, maTextBuffer);
- }*/
if( !pContext && pShapeContext )
pContext = pShapeContext->CreateChildContext(nPrefix, rLName, xAttrList);
diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx
index fa2cc817fa7a..3abfd93c4ce9 100644
--- a/sc/source/filter/xml/xmlcoli.cxx
+++ b/sc/source/filter/xml/xmlcoli.cxx
@@ -29,10 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sc.hxx"
-
-
// INCLUDE ---------------------------------------------------------------
-
#include "xmlcoli.hxx"
#include "xmlimprt.hxx"
#include "global.hxx"
@@ -114,26 +111,6 @@ SvXMLImportContext *ScXMLTableColContext::CreateChildContext( USHORT nPrefix,
::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
{
SvXMLImportContext *pContext = 0;
-/*
- const SvXMLTokenMap& rTokenMap = GetScImport().GetTableRowElemTokenMap();
- sal_Bool bHeader = sal_False;
- switch( rTokenMap.Get( nPrefix, rLName ) )
- {
- case XML_TOK_TABLE_ROW_CELL:
-// if( IsInsertCellPossible() )
- pContext = new ScXMLTableRowCellContext( GetScImport(), nPrefix,
- rLName, xAttrList//,
- //this
- );
- break;
- case XML_TOK_TABLE_ROW_COVERED_CELL:
-// if( IsInsertCellPossible() )
- pContext = new ScXMLTableRowCellContext( GetScImport(), nPrefix,
- rLName, xAttrList//,
- //this
- );
- break;
- }*/
if( !pContext )
pContext = new SvXMLImportContext( GetImport(), nPrefix, rLName );
diff --git a/sc/source/filter/xml/xmlnexpi.cxx b/sc/source/filter/xml/xmlnexpi.cxx
index 4d81085bcdfd..9748058e4be1 100644
--- a/sc/source/filter/xml/xmlnexpi.cxx
+++ b/sc/source/filter/xml/xmlnexpi.cxx
@@ -29,8 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sc.hxx"
-
-
// INCLUDE ---------------------------------------------------------------
#include <rtl/ustrbuf.hxx>
@@ -56,21 +54,6 @@ ScXMLNamedExpressionsContext::ScXMLNamedExpressionsContext( ScXMLImport& rImport
::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) :
SvXMLImportContext( rImport, nPrfx, rLName )
{
-/* sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
- for( sal_Int16 i=0; i < nAttrCount; ++i )
- {
- const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i ));
- rtl::OUString aLocalName;
- USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName(
- sAttrName, &aLocalName );
- const rtl::OUString& sValue(xAttrList->getValueByIndex( i ));
-
- const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetNamedRangeAttrTokenMap();
-
- switch( rAttrTokenMap.Get( nPrefix, aLocalName ) )
- {
- }
- }*/
rImport.LockSolarMutex();
}
@@ -175,10 +158,6 @@ SvXMLImportContext *ScXMLNamedRangeContext::CreateChildContext( USHORT nPrefix,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
{
-/* const SvXMLTokenMap& rTokenMap = GetScImport().GetTableElemTokenMap();
- switch( rTokenMap.Get( nPrefix, rLName ) )
- {
- }*/
return new SvXMLImportContext( GetImport(), nPrefix, rLName );
}
@@ -238,10 +217,6 @@ SvXMLImportContext *ScXMLNamedExpressionContext::CreateChildContext( USHORT nPre
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ )
{
-/* const SvXMLTokenMap& rTokenMap = GetScImport().GetTableElemTokenMap();
- switch( rTokenMap.Get( nPrefix, rLName ) )
- {
- }*/
return new SvXMLImportContext( GetImport(), nPrefix, rLName );;
}
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx
index d7d372328b11..3b2713e6c1fb 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -105,7 +105,6 @@ const XMLPropertyMapEntry aXMLScCellStylesProperties[] =
MAP( "ParaBottomMargin", XML_NAMESPACE_FO, XML_PADDING, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_ALLPADDING ),
MAP( "ParaBottomMargin", XML_NAMESPACE_FO, XML_PADDING_BOTTOM, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_BOTTOMPADDING ),
MAP( "ParaIndent", XML_NAMESPACE_FO, XML_MARGIN_LEFT, XML_TYPE_PROP_PARAGRAPH|XML_TYPE_MEASURE16, 0 ),
-// MAP( "ParaIsHyphenation", XML_NAMESPACE_FO, XML_HYPHENATE, XML_TYPE_PROP_TEXT|XML_TYPE_BOOL, 0 ),
MAP( "ParaLeftMargin", XML_NAMESPACE_FO, XML_PADDING_LEFT, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_LEFTPADDING ),
MAP( "ParaRightMargin", XML_NAMESPACE_FO, XML_PADDING_RIGHT, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_RIGHTPADDING ),
MAP( "ParaTopMargin", XML_NAMESPACE_FO, XML_PADDING_TOP, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_TOPPADDING ),
@@ -122,7 +121,6 @@ const XMLPropertyMapEntry aXMLScCellStylesProperties[] =
MAP( "ValidationXML", XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_BUILDIN_CMP_ONLY, CTF_SC_VALIDATION ),
MAP( "VertJustify", XML_NAMESPACE_STYLE, XML_VERTICAL_ALIGN, XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTJUSTIFY, 0),
MAP( SC_UNONAME_CELLVJUS_METHOD, XML_NAMESPACE_STYLE, XML_VERTICAL_JUSTIFY, XML_TYPE_PROP_TABLE_CELL|XML_SC_TYPE_VERTJUSTIFY_METHOD, 0 ),
-// MAP( "WritingMode", XML_NAMESPACE_STYLE, XML_WRITING_MODE, XML_TYPE_PROP_PARAGRAPH|XML_TYPE_TEXT_WRITING_MODE_WITH_DEFAULT, 0 ),
MAP_END()
};
@@ -132,7 +130,6 @@ const XMLPropertyMapEntry aXMLScColumnStylesProperties[] =
MAP( "IsManualPageBreak", XML_NAMESPACE_FO, XML_BREAK_BEFORE, XML_TYPE_PROP_TABLE_COLUMN|XML_SC_TYPE_BREAKBEFORE, 0),
MAP( "IsVisible", XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TYPE_PROP_TABLE_COLUMN|XML_SC_TYPE_EQUAL|MID_FLAG_SPECIAL_ITEM, CTF_SC_ISVISIBLE ),
MAP( "Width", XML_NAMESPACE_STYLE, XML_COLUMN_WIDTH, XML_TYPE_PROP_TABLE_COLUMN|XML_TYPE_MEASURE, 0 ),
-// MAP( "OptimalWidth", XML_NAMESPACE_STYLE, XML_USE_OPTIMAL_COLUMN_WIDTH, XML_TYPE_PROP_TABLE_COLUMN|XML_TYPE_BOOL, 0),
MAP_END()
};
@@ -543,31 +540,6 @@ void ScXMLRowExportPropertyMapper::ContextFilter(
uno::Reference< beans::XPropertySet > /* rPropSet */ ) const
{
//#108550#; don't filter the height, so other applications know the calculated height
-
-/* XMLPropertyState* pHeight = NULL;
- XMLPropertyState* pOptimalHeight = NULL;
-
- for( ::std::vector< XMLPropertyState >::iterator propertie = rProperties.begin();
- propertie != rProperties.end();
- ++propertie )
- {
- switch( getPropertySetMapper()->GetEntryContextId( propertie->mnIndex ) )
- {
- case CTF_SC_ROWHEIGHT: pHeight = propertie; break;
- case CTF_SC_ROWOPTIMALHEIGHT: pOptimalHeight = propertie; break;
- }
- }
- if ((pHeight && pOptimalHeight && ::cppu::any2bool( pOptimalHeight->maValue )) ||
- (pHeight && !pOptimalHeight))
- {
- pHeight->mnIndex = -1;
- pHeight->maValue.clear();
- }
- if (pOptimalHeight)
- {
- pOptimalHeight->mnIndex = -1;
- pOptimalHeight->maValue.clear();
- }*/
}
ScXMLColumnExportPropertyMapper::ScXMLColumnExportPropertyMapper(
diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx
index d7b592db5caa..9f7279b2691e 100644
--- a/sc/source/filter/xml/xmlsubti.cxx
+++ b/sc/source/filter/xml/xmlsubti.cxx
@@ -681,15 +681,6 @@ void ScMyTables::DeleteTable()
{
rImport.GetDocument()->RenameTab( static_cast<SCTAB>(nCurrentSheet),
sCurrentSheetName, sal_False, sal_True);
-
-/* rtl::OUString sErrorMessage(RTL_CONSTASCII_USTRINGPARAM("Could not create a table with the name "));
- sErrorMessage += sCurrentSheetName;
- sErrorMessage += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(". The new name is "));
- sErrorMessage += sCurrentName;
- uno::Sequence<rtl::OUString> aSeq(1);
- aSeq[0] = sErrorMessage;
- uno::Reference<xml::sax::XLocator> xLocator;
- rImport.SetError(XMLERROR_API | XMLERROR_FLAG_ERROR, aSeq, rtl::OUString(), xLocator);*/
}
}
}
diff --git a/sc/source/filter/xml/xmlsubti.hxx b/sc/source/filter/xml/xmlsubti.hxx
index 1091e6e242c2..32b02080a900 100644
--- a/sc/source/filter/xml/xmlsubti.hxx
+++ b/sc/source/filter/xml/xmlsubti.hxx
@@ -93,7 +93,6 @@ public:
void SetChangedCols(const sal_Int32 nValue);
};
-//*******************************************************************************************************************************
struct ScMatrixRange
{
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index e1dc0308a2c8..f210639d0477 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -29,10 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sc.hxx"
-
-
// INCLUDE ---------------------------------------------------------------
-
#include <rsc/rscsfx.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/objsh.hxx>
@@ -126,11 +123,6 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe
if ( !xStorage.is() && pMedium )
xStorage = pMedium->GetStorage();
- // Get data source ...
-
-// uno::Reference< uno::XInterface > xPipe;
-// uno::Reference< io::XActiveDataSource > xSource;
-
sal_Bool bEncrypted = sal_False;
rtl::OUString sStream(sDocName);
if( xStorage.is() )
@@ -167,32 +159,6 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe
return SCERR_IMPORT_UNKNOWN;
}
}
- // #99667#; no longer necessary
-/* else if ( pMedium )
- {
- // if there is a medium and if this medium has a load environment,
- // we get an active data source from the medium.
- pMedium->GetInStream()->Seek( 0 );
- xSource = pMedium->GetDataSource();
- DBG_ASSERT( xSource.is(), "got no data source from medium" );
- if( !xSource.is() )
- return sal_False;
-
- // get a pipe for connecting the data source to the parser
- xPipe = xServiceFactory->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe")) );
- DBG_ASSERT( xPipe.is(),
- "XMLReader::Read: com.sun.star.io.Pipe service missing" );
- if( !xPipe.is() )
- return sal_False;
-
- // connect pipe's output stream to the data source
- uno::Reference<io::XOutputStream> xPipeOutput( xPipe, uno::UNO_QUERY );
- xSource->setOutputStream( xPipeOutput );
-
- aParserInput.aInputStream =
- uno::Reference< io::XInputStream >( xPipe, uno::UNO_QUERY );
- }*/
else
return SCERR_IMPORT_UNKNOWN;
@@ -224,14 +190,6 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe
uno::Reference<xml::sax::XParser> xParser( xXMLParser, uno::UNO_QUERY );
xParser->setDocumentHandler( xDocHandler );
- // parse
-/* if( xSource.is() )
- {
- uno::Reference<io::XActiveDataControl> xSourceControl( xSource, uno::UNO_QUERY );
- if( xSourceControl.is() )
- xSourceControl->start();
- }*/
-
try
{
xParser->parseStream( aParserInput );
@@ -677,11 +635,6 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic
xOut = xStream->getOutputStream();
}
- // #99667#; no longer necessary
-/* else if ( pMedium )
- {
- xOut = pMedium->GetDataSink();
- }*/
// set Base URL
uno::Reference< beans::XPropertySet > xInfoSet;
@@ -761,10 +714,6 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic
pSharedData = pExport->GetSharedData();
- //stream is closed by SAX parser
- //if (xOut.is())
- // xOut->closeOutput();
- }
return bRet;
}
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index c1ddd833af9c..7c87520c53a4 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -32,7 +32,6 @@
#include "scitems.hxx"
#include <editeng/eeitem.hxx>
-
#include <memory>
#include "AccessibleText.hxx"
#include "AccessibleCell.hxx"
@@ -964,18 +963,6 @@ SvxViewForwarder* ScAccessibleCellTextData::GetViewForwarder()
SvxEditViewForwarder* ScAccessibleCellTextData::GetEditViewForwarder( sal_Bool /* bCreate */ )
{
//#102219#; there should no EditViewForwarder be, because the cell is now readonly in this interface
-/* if (!mpEditViewForwarder)
- {
- SCCOL nCol;
- SCROW nRow;
- EditView* pEditView;
- mpViewShell->GetViewData()->GetEditView( meSplitPos, pEditView, nCol, nRow );
-
- mpEditViewForwarder = new ScEditViewForwarder(pEditView, mpViewShell->GetWindowByPos(meSplitPos));
- }
- else if (bCreate)
- mpEditViewForwarder->GrabFocus();
- return mpEditViewForwarder;*/
return NULL;
}
@@ -1179,9 +1166,6 @@ SvxTextForwarder* ScAccessibleEditLineTextData::GetTextForwarder()
pEnginePool->FreezeIdRanges();
mpEditEngine = new ScFieldEditEngine( pEnginePool, NULL, TRUE );
mbEditEngineCreated = sal_True;
- // currently, GetPortions doesn't work if UpdateMode is FALSE,
- // this will be fixed (in EditEngine) by src600
- // pEditEngine->SetUpdateMode( FALSE );
mpEditEngine->EnableUndo( FALSE );
mpEditEngine->SetRefMapMode( MAP_100TH_MM );
mpForwarder = new SvxEditEngineForwarder(*mpEditEngine);
@@ -1402,9 +1386,6 @@ SvxTextForwarder* ScAccessiblePreviewHeaderCellTextData::GetTextForwarder()
pEnginePool->FreezeIdRanges();
pEditEngine = new ScFieldEditEngine( pEnginePool, NULL, TRUE );
}
- // currently, GetPortions doesn't work if UpdateMode is FALSE,
- // this will be fixed (in EditEngine) by src600
-// pEditEngine->SetUpdateMode( FALSE );
pEditEngine->EnableUndo( FALSE );
if (pDocShell)
pEditEngine->SetRefDevice(pDocShell->GetRefDevice());
@@ -1638,9 +1619,6 @@ SvxTextForwarder* ScAccessibleNoteTextData::GetTextForwarder()
pEnginePool->FreezeIdRanges();
mpEditEngine = new ScFieldEditEngine( pEnginePool, NULL, TRUE );
}
- // currently, GetPortions doesn't work if UpdateMode is FALSE,
- // this will be fixed (in EditEngine) by src600
-// pEditEngine->SetUpdateMode( FALSE );
mpEditEngine->EnableUndo( FALSE );
if (mpDocSh)
mpEditEngine->SetRefDevice(mpDocSh->GetRefDevice());
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 547afd8517ba..44676b136e14 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -31,8 +31,6 @@
#undef SC_DLLIMPLEMENTATION
-
-
#include <vcl/msgbox.hxx>
#include <i18npool/mslangid.hxx>
#include <svtools/collatorres.hxx>
@@ -331,7 +329,6 @@ BOOL ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
// -----------------------------------------------------------------------
// fuer Datenaustausch ohne Dialog-Umweg: (! noch zu tun !)
-// void ScTabPageSortFields::ActivatePage( const SfxItemSet& rSet )
void ScTabPageSortFields::ActivatePage()
{
@@ -618,9 +615,6 @@ ScTabPageSortOptions::~ScTabPageSortOptions()
void ScTabPageSortOptions::Init()
{
-// aStrAreaLabel = aFtAreaLabel.GetText();
-// aStrAreaLabel.Append( (sal_Unicode) ' ' );
-
// CollatorRessource has user-visible names for sort algorithms
pColRes = new CollatorRessource();
@@ -848,7 +842,6 @@ BOOL ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet )
// -----------------------------------------------------------------------
// fuer Datenaustausch ohne Dialog-Umweg: (! noch zu tun !)
-// void ScTabPageSortOptions::ActivatePage( const SfxItemSet& rSet )
void ScTabPageSortOptions::ActivatePage()
{
if ( pDlg )
diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx
index 664ab7c5c108..1ae109416bbf 100644
--- a/sc/source/ui/drawfunc/fuconarc.cxx
+++ b/sc/source/ui/drawfunc/fuconarc.cxx
@@ -109,18 +109,9 @@ BOOL FuConstArc::MouseButtonUp( const MouseEvent& rMEvt )
if ( pView->IsCreateObj() && rMEvt.IsLeft() )
{
- // Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
pView->EndCreateObj( SDRCREATE_NEXTPOINT );
bReturn = TRUE;
}
-/*
- else if ( pView->IsCreateObj() && rMEvt.IsRight() )
- {
- // Point aPnt( pWindow->PixelToLogic( rMEvt.GetPosPixel() ) );
- pView->EndCreateObj( SDRCREATE_FORCEEND );
- bReturn = TRUE;
- }
-*/
return (FuConstruct::MouseButtonUp(rMEvt) || bReturn);
}
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index 10a81e6de20a..5e1cb365614e 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -370,12 +370,6 @@ BOOL FuSelection::MouseMove(const MouseEvent& rMEvt)
// Event an den Manager weiterleiten
if( bVCAction )
{
- // GetSbxForm gibts nicht mehr - Basic-Controls sind tot
- //SdrPageView* pPgView = pView->GetPageViewByIndex(0);
- //ScDrawPage* pPage = (ScDrawPage*)pPgView->GetPage();
- //VCSbxForm* pForm = (VCSbxForm*)(SbxObject*)(pPage->GetSbxForm());
- //((VCManager*)(pForm->GetVCContainer()))->
- // MouseMove( pWindow, rMEvt );
bReturn = TRUE;
}
@@ -396,7 +390,6 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
SetMouseButtonCode(rMEvt.GetButtons());
BOOL bReturn = FuDraw::MouseButtonUp(rMEvt);
-// BOOL bOle = pViewShell->GetViewData()->IsOle();
BOOL bOle = pViewShell->GetViewFrame()->GetFrame().IsInPlace();
if (aDragTimer.IsActive() )
@@ -458,14 +451,6 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
}
}
-/*
- if ( pView->IsObjEdit() )
- {
- BOOL bShowCursor = TRUE;
-//! pOutlinerView = pView->GetOutlinerView(pWindow, bShowCursor);
- bReturn = TRUE;
- }
-*/
/**************************************************************************
* Ggf. OLE-Objekt beruecksichtigen
**************************************************************************/
@@ -510,7 +495,6 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
{
if (((SdrOle2Obj*) pObj)->GetObjRef().is())
{
- //HMHpView->HideMarkHdl();
pViewShell->ActivateObject( (SdrOle2Obj*) pObj, 0 );
}
}
@@ -551,13 +535,6 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
// Event an den Manager weiterleiten
if( bVCAction )
{
- // GetSbxForm gibts nicht mehr - Basic-Controls sind tot
- //SdrPageView* pPgView = pView->GetPageViewByIndex(0);
- //ScDrawPage* pPage = (ScDrawPage*)pPgView->GetPage();
- //VCSbxForm* pForm = (VCSbxForm*)(SbxObject*)(pPage->GetSbxForm());
- //((VCManager*)(pForm->GetVCContainer()))->
- // MouseButtonUp( pWindow, rMEvt );
- //HMHpView->ShowMarkHdl();
bVCAction = FALSE;
bReturn = TRUE;
}
@@ -606,27 +583,9 @@ BOOL FuSelection::KeyInput(const KeyEvent& rKEvt)
void FuSelection::Activate()
{
-/*
- SdrDragMode eMode;
- switch (aSfxRequest.GetSlot() )
- {
- case SID_OBJECT_SELECT:
- eMode = SDRDRAG_MOVE;
- break;
- case SID_OBJECT_ROTATE:
- eMode = SDRDRAG_ROTATE;
- break;
- case SID_OBJECT_MIRROR:
- eMode = SDRDRAG_MIRROR;
- break;
- }
- pView->SetDragMode(eMode);
-*/
FuDraw::Activate();
}
-
-
/*************************************************************************
|*
|* Function deaktivieren
@@ -638,10 +597,6 @@ void FuSelection::Deactivate()
/**************************************************************************
* Hide Cursor
**************************************************************************/
-// BOOL bShowCursor = FALSE;
-//! pOutlinerView = pView->GetOutlinerView(pWindow, bShowCursor);
-
-// pView->SetDragMode(SDRDRAG_MOVE);
FuDraw::Deactivate();
}
@@ -650,8 +605,4 @@ void FuSelection::Deactivate()
#pragma optimize ( "", on )
#endif
-
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 03e96e95aefd..4b6bfee38d46 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -29,10 +29,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sc.hxx"
-
-
// INCLUDE ---------------------------------------------------------------
-
#include <editeng/editview.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
@@ -735,16 +732,6 @@ SfxChildAlignment ScFunctionDockWin::CheckAlignment(SfxChildAlignment /* abla */
#************************************************************************/
void ScFunctionDockWin::Notify( SfxBroadcaster&, const SfxHint& /* rHint */ )
{
-// const SfxPoolItemHint *pPoolItemHint = PTR_CAST(SfxPoolItemHint, &rHint);
- /*
- if ( pPoolItemHint
- && ( pPoolItemHint->GetObject()->ISA( SvxColorTableItem ) ) )
- {
- // Die Liste der Farben hat sich geaendert
- pColorTable = ( (SvxColorTableItem*) pPoolItemHint->GetObject() )->GetColorTable();
- FillValueSet();
- }
- */
}
diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx
index 46cdd9a3e2c5..b9a338ff0289 100644
--- a/sc/source/ui/inc/datafdlg.hxx
+++ b/sc/source/ui/inc/datafdlg.hxx
@@ -71,8 +71,6 @@ private:
PushButton aBtnClose;
ScrollBar aSlider;
FixedText aFixedText;
- //FixedText aFixedText1;
- //Edit aEdit1;
ScTabViewShell* pTabViewShell;
ScDocument* pDoc;
diff --git a/sc/source/ui/inc/tbinsert.hxx b/sc/source/ui/inc/tbinsert.hxx
index 605710063872..7c0b0504d8c7 100644
--- a/sc/source/ui/inc/tbinsert.hxx
+++ b/sc/source/ui/inc/tbinsert.hxx
@@ -31,10 +31,6 @@
#include <sfx2/tbxctrl.hxx>
-//----------------------------------------------------------------------------
-//
-//----------------------------------------------------------------------------
-
class ScTbxInsertCtrl : public SfxToolBoxControl
{
USHORT nLastSlotId;
@@ -55,36 +51,6 @@ public:
const SfxPoolItem* pState );
};
-//----------------------------------------------------------------------------
-//
-//----------------------------------------------------------------------------
-/*
-class ScTbxInsertPopup : public SfxPopupWindow
-{
- SfxToolBoxManager aTbx;
- ResId aRIdWinTemp;
- ResId aRIdTbxTemp;
-
- Link aTbxClickHdl;
-
- DECL_LINK( TbxSelectHdl, ToolBox* );
- DECL_LINK( TbxClickHdl, ToolBox* );
-
-protected:
- virtual void PopupModeEnd();
-
-public:
- ScTbxInsertPopup( USHORT nId, WindowAlign eAlign,
- const ResId& rRIdWin, const ResId& rRIdTbx,
- SfxBindings& rBindings );
- ~ScTbxInsertPopup();
-
- virtual SfxPopupWindow* Clone() const;
- void StartSelection();
-};
-*/
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx
index 3e859e9676a5..ed9a01fa5ec6 100644
--- a/sc/source/ui/miscdlgs/datafdlg.cxx
+++ b/sc/source/ui/miscdlgs/datafdlg.cxx
@@ -37,7 +37,6 @@
#include "scresid.hxx"
#include "datafdlg.hrc"
#include "viewdata.hxx"
-//#include "document.hxx"
#include "docsh.hxx"
#include "refundo.hxx"
#include "undodat.hxx"
@@ -51,7 +50,6 @@ using ::rtl::OUStringBuffer;
//zhangyun
ScDataFormDlg::ScDataFormDlg( Window* pParent, ScTabViewShell* pTabViewShellOri) :
ModalDialog ( pParent, ScResId( RID_SCDLG_DATAFORM ) ),
- //
aBtnNew ( this, ScResId( BTN_DATAFORM_NEW ) ),
aBtnDelete ( this, ScResId( BTN_DATAFORM_DELETE ) ),
aBtnRestore ( this, ScResId( BTN_DATAFORM_RESTORE ) ),
@@ -173,7 +171,6 @@ ScDataFormDlg::ScDataFormDlg( Window* pParent, ScTabViewShell* pTabViewShellOri
Size nFixedSize(FIXED_WIDTH, CTRL_HEIGHT );
Size nEditSize(EDIT_WIDTH, CTRL_HEIGHT );
- //pFtArray = new FixedText(this);
aColLength = nEndCol - nStartCol + 1;
//new the controls
@@ -193,7 +190,6 @@ ScDataFormDlg::ScDataFormDlg( Window* pParent, ScTabViewShell* pTabViewShellOri
pEdits[nIndex]->SetSizePixel(nEditSize);
pFixedTexts[nIndex]->SetPosPixel(Point(FIXED_LEFT, nTop));
pEdits[nIndex]->SetPosPixel(Point(EDIT_LEFT, nTop));
- //pFixedTexts[nIndex]->SetText(String::CreateFromAscii("W4W-Filter Nr. "));
pFixedTexts[nIndex]->SetText(aFieldName);
pFixedTexts[nIndex]->Show();
pEdits[nIndex]->Show();
@@ -238,9 +234,6 @@ ScDataFormDlg::ScDataFormDlg( Window* pParent, ScTabViewShell* pTabViewShellOri
aSlider.SetEndScrollHdl( HDL( Impl_ScrollHdl ) );
SetButtonState();
-
- //end
- //FreeResource();
}
ScDataFormDlg::~ScDataFormDlg()
@@ -260,8 +253,6 @@ ScDataFormDlg::~ScDataFormDlg()
void ScDataFormDlg::FillCtrls(SCROW /*nCurrentRow*/)
{
- //ScViewData* pViewData = pTabViewShell->GetViewData();
-
String aFieldName;
for (sal_uInt16 i = 0; i < aColLength; ++i)
{
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 5da25e2e260e..3922f85db03d 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -31,10 +31,7 @@
#undef SC_DLLIMPLEMENTATION
-
-
//------------------------------------------------------------------
-
#include <vcl/msgbox.hxx>
#include "global.hxx"
@@ -97,7 +94,6 @@ ScTpUserLists::ScTpUserLists( Window* pParent,
aStrCopyList ( ScResId( STR_COPYLIST ) ),
aStrCopyFrom ( ScResId( STR_COPYFROM ) ),
aStrCopyErr ( ScResId( STR_COPYERR ) ),
- //
nWhichUserLists ( GetWhich( SID_SCUSERLISTS ) ),
pUserLists ( NULL ),
pDoc ( NULL ),
@@ -167,8 +163,6 @@ void ScTpUserLists::Init()
aFtCopyFrom.Disable();
aEdCopyFrom.Disable();
}
-
-// aLbLists.GrabFocus();
}
// -----------------------------------------------------------------------
@@ -232,8 +226,6 @@ void ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs )
aEdCopyFrom .Enable();
aBtnCopy .Enable();
}
-
-// aLbLists.GrabFocus();
}
// -----------------------------------------------------------------------
@@ -354,7 +346,6 @@ void ScTpUserLists::MakeListStr( String& rListStr )
xub_StrLen c = 0;
aInputStr.ConvertLineEnd( LINEEND_LF );
- //aStr.EraseAllChars( ' ' );
xub_StrLen nToken=rListStr.GetTokenCount(LF);
@@ -367,18 +358,6 @@ void ScTpUserLists::MakeListStr( String& rListStr )
aStr+=cDelimiter;
}
- /*
- // '\n' durch cDelimiter ersetzen:
- for ( c=0;
- (c < nLen) && (nFound != STRING_NOTFOUND);
- c++ )
- {
- nFound = aStr.Search( LF, nFound );
- if ( nFound != STRING_NOTFOUND )
- aStr[nFound] = cDelimiter;
- }
- */
-
aStr.EraseLeadingChars( cDelimiter );
aStr.EraseTrailingChars( cDelimiter );
nLen = aStr.Len();
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 98e960e01078..0df1277d46f6 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -526,7 +526,6 @@ const SfxItemPropertySet* lcl_GetColumnPropertySet()
{MAP_CHAR_LEN(SC_UNONAME_CELLHJUS), ATTR_HOR_JUSTIFY, &getCppuType((table::CellHoriJustify*)0), 0, MID_HORJUST_HORJUST },
{MAP_CHAR_LEN(SC_UNONAME_CELLHJUS_METHOD), ATTR_HOR_JUSTIFY_METHOD, &::getCppuType((const sal_Int32*)0), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_CELLTRAN), ATTR_BACKGROUND, &getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT },
-// {MAP_CHAR_LEN(SC_UNONAME_CELLFILT), SC_WID_UNO_CELLFILT,&getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_MANPAGE), SC_WID_UNO_MANPAGE, &getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_NEWPAGE), SC_WID_UNO_NEWPAGE, &getBooleanCppuType(), 0, 0 },
{MAP_CHAR_LEN(SC_UNONAME_WRAP), ATTR_LINEBREAK, &getBooleanCppuType(), 0, 0 },
@@ -1072,8 +1071,6 @@ void ScHelperFunctions::ApplyBorder( ScDocShell* pDocShell, const ScRangeList& r
BOOL lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange,
const uno::Sequence< uno::Sequence<uno::Any> >& aData )
{
-// BOOL bApi = TRUE;
-
ScDocument* pDoc = rDocShell.GetDocument();
SCTAB nTab = rRange.aStart.Tab();
SCCOL nStartCol = rRange.aStart.Col();
@@ -1185,8 +1182,6 @@ BOOL lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange,
const uno::Sequence< uno::Sequence<rtl::OUString> >& aData,
const ::rtl::OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar )
{
-// BOOL bApi = TRUE;
-
ScDocument* pDoc = rDocShell.GetDocument();
SCTAB nTab = rRange.aStart.Tab();
SCCOL nStartCol = rRange.aStart.Col();
@@ -1293,7 +1288,6 @@ String lcl_GetInputString( ScDocument* pDoc, const ScAddress& rPosition, BOOL bE
// LANGUAGE_ENGLISH_US the "General" format has index key 0,
// we don't have to query.
sal_uInt32 nNumFmt = bEnglish ?
-// pFormatter->GetStandardIndex(LANGUAGE_ENGLISH_US) :
0 :
pDoc->GetNumberFormat( rPosition );
@@ -1833,11 +1827,6 @@ beans::PropertyState ScCellRangesBase::GetOnePropertyState( USHORT nItemWhich, c
{
SfxItemState eState = pPattern->GetItemSet().GetItemState( nItemWhich, FALSE );
-// // if no rotate value is set, look at orientation
-// //! also for a fixed value of 0 (in case orientation is ambiguous)?
-// if ( nItemWhich == ATTR_ROTATE_VALUE && eState == SFX_ITEM_DEFAULT )
-// eState = pPattern->GetItemSet().GetItemState( ATTR_ORIENTATION, FALSE );
-
if ( nItemWhich == ATTR_VALUE_FORMAT && eState == SFX_ITEM_DEFAULT )
eState = pPattern->GetItemSet().GetItemState( ATTR_LANGUAGE_FORMAT, FALSE );
@@ -4884,7 +4873,6 @@ uno::Reference<table::XCell> ScCellRangeObj::GetCellByPosition_Impl(
}
throw lang::IndexOutOfBoundsException();
-// return NULL;
}
uno::Reference<table::XCell> SAL_CALL ScCellRangeObj::getCellByPosition(
@@ -4923,7 +4911,6 @@ uno::Reference<table::XCellRange> SAL_CALL ScCellRangeObj::getCellRangeByPositio
}
throw lang::IndexOutOfBoundsException();
-// return NULL;
}
uno::Reference<table::XCellRange> SAL_CALL ScCellRangeObj::getCellRangeByName(
@@ -4982,7 +4969,6 @@ uno::Reference<table::XCellRange> ScCellRangeObj::getCellRangeByName(
}
throw uno::RuntimeException();
-// return NULL;
}
// XColumnRowRange
@@ -5209,7 +5195,6 @@ uno::Sequence< uno::Sequence<uno::Any> > SAL_CALL ScCellRangeObj::getDataArray()
}
throw uno::RuntimeException(); // no other exceptions specified
-// return uno::Sequence< uno::Sequence<uno::Any> >(0);
}
void SAL_CALL ScCellRangeObj::setDataArray(
@@ -5271,7 +5256,6 @@ uno::Sequence< uno::Sequence<rtl::OUString> > SAL_CALL ScCellRangeObj::getFormul
}
throw uno::RuntimeException(); // no other exceptions specified
-// return uno::Sequence< uno::Sequence<rtl::OUString> >(0);
}
void SAL_CALL ScCellRangeObj::setFormulaArray(
@@ -8031,49 +8015,6 @@ void SAL_CALL ScTableSheetObj::addRanges( const uno::Sequence<table::CellRangeAd
ScDocFunc aFunc(*pDocSh);
aFunc.ApplyAttributes( aMarkData, aPattern, TRUE, TRUE );
}
-
- // don't use. We should use therefor a private interface, so we can also set the flags.
-/* else if (nTab > 0 && pDoc->IsImportingXML()) // make this sheet as an scenario and only if it is not the first sheet and only if it is ImportingXML,
- // because than no UNDO and repaint is necessary.
- {
- USHORT nRangeCount = (USHORT)rScenRanges.getLength();
- if (nRangeCount)
- {
- pDoc->SetScenario( nTab, TRUE );
-
- // default flags
- Color aColor( COL_LIGHTGRAY ); // Default
- USHORT nFlags = SC_SCENARIO_SHOWFRAME | SC_SCENARIO_PRINTFRAME | SC_SCENARIO_TWOWAY;
- String aComment;
-
- pDoc->SetScenarioData( nTab, aComment, aColor, nFlags );
- const table::CellRangeAddress* pAry = rScenRanges.getConstArray();
- for (USHORT i=0; i<nRangeCount; i++)
- {
- DBG_ASSERT( pAry[i].Sheet == nTab, "addRanges mit falscher Tab" );
- pDoc->ApplyFlagsTab( (USHORT)pAry[i].StartColumn, (USHORT)pAry[i].StartRow,
- (USHORT)pAry[i].EndColumn, (USHORT)pAry[i].EndRow, nTab, SC_MF_SCENARIO );
- }
- pDoc->SetActiveScenario( nTab, TRUE );
-
- // set to next visible tab
- USHORT j = nTab - 1;
- BOOL bFinished = FALSE;
- while (j < nTab && !bFinished)
- {
- if (pDoc->IsVisible(j))
- {
- pDoc->SetVisibleTab(j);
- bFinished = TRUE;
- }
- else
- --j;
- }
-
- ScDocFunc aFunc(*pDocSh);
- aFunc.SetTableVisible( nTab, FALSE, TRUE );
- }
- }*/
}
}
@@ -9011,8 +8952,6 @@ void ScTableRowObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr
else if ( pEntry->nWID == SC_WID_UNO_CELLFILT )
{
BOOL bFil = ScUnoHelpFunctions::GetBoolFromAny( aValue );
-// ScSizeMode eMode = bVis ? SC_SIZE_SHOW : SC_SIZE_DIRECT;
-// aFunc.SetWidthOrHeight( FALSE, 1, nRowArr, nTab, eMode, 0, TRUE, TRUE );
// SC_SIZE_DIRECT mit Groesse 0 blendet aus
pDoc->SetRowFiltered(nRow, nRow, nTab, bFil);
}
@@ -9290,7 +9229,6 @@ uno::Any SAL_CALL ScCellsEnumeration::nextElement() throw(container::NoSuchEleme
}
throw container::NoSuchElementException(); // no more elements
-// return uno::Any();
}
//------------------------------------------------------------------------
@@ -9390,7 +9328,6 @@ uno::Any SAL_CALL ScCellFormatsObj::getByIndex( sal_Int32 nIndex )
return uno::makeAny(xRange);
else
throw lang::IndexOutOfBoundsException();
-// return uno::Any();
}
uno::Type SAL_CALL ScCellFormatsObj::getElementType() throw(uno::RuntimeException)
diff --git a/sc/source/ui/vba/vbastyle.hxx b/sc/source/ui/vba/vbastyle.hxx
index f98ecac1a163..70b23a989287 100644
--- a/sc/source/ui/vba/vbastyle.hxx
+++ b/sc/source/ui/vba/vbastyle.hxx
@@ -59,36 +59,6 @@ public:
// XFormat
virtual void SAL_CALL setMergeCells( const css::uno::Any& MergeCells ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL getMergeCells( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);
-/*
- // XFormat
- virtual css::uno::Reference< ::ooo::vba::excel::XBorders > SAL_CALL Borders( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
- virtual css::uno::Reference< ::ooo::vba::excel::XFont > SAL_CALL Font( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
- virtual css::uno::Reference< ::ooo::vba::excel::XInterior > SAL_CALL Interior( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
- virtual void SAL_CALL setNumberFormat( const css::uno::Any& NumberFormat ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
- virtual css::uno::Any SAL_CALL getNumberFormat( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
- virtual void SAL_CALL setNumberFormatLocal( const css::uno::Any& NumberFormatLocal ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
- virtual css::uno::Any SAL_CALL getNumberFormatLocal( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
- virtual void SAL_CALL setIndentLevel( const css::uno::Any& IndentLevel ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
- virtual css::uno::Any SAL_CALL getIndentLevel( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
- virtual void SAL_CALL setHorizontalAlignment( const css::uno::Any& HorizontalAlignment ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
- virtual css::uno::Any SAL_CALL getHorizontalAlignment( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
- virtual void SAL_CALL setVerticalAlignment( const css::uno::Any& VerticalAlignment ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
- virtual css::uno::Any SAL_CALL getVerticalAlignment( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
- virtual void SAL_CALL setOrientation( const css::uno::Any& Orientation ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
- virtual css::uno::Any SAL_CALL getOrientation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
- virtual void SAL_CALL setShrinkToFit( const css::uno::Any& ShrinkToFit ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
- virtual css::uno::Any SAL_CALL getShrinkToFit( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
- virtual void SAL_CALL setWrapText( const css::uno::Any& WrapText ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
- virtual css::uno::Any SAL_CALL getWrapText( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
- virtual void SAL_CALL setLocked( const css::uno::Any& Locked ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
- virtual css::uno::Any SAL_CALL getLocked( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
- virtual void SAL_CALL setFormulaHidden( const css::uno::Any& FormulaHidden ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
-/ virtual css::uno::Any SAL_CALL getFormulaHidden( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
- virtual void SAL_CALL setMergeCells( const css::uno::Any& MergeCells ) throw (css::script::BasicErrorException, css::uno::RuntimeException) = 0;
- virtual css::uno::Any SAL_CALL getMergeCells( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) = 0;
- virtual void SAL_CALL setReadingOrder( const css::uno::Any& ReadingOrder ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
- virtual css::uno::Any SAL_CALL getReadingOrder( ) throw (css::script::BasicErrorException, css::uno::RuntimeException);;
-*/
// XHelperInterface
virtual rtl::OUString& getServiceImplName();
virtual css::uno::Sequence<rtl::OUString> getServiceNames();
diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx
index 7ff6186010e3..e79985db92a6 100644
--- a/sc/source/ui/vba/vbawindow.cxx
+++ b/sc/source/ui/vba/vbawindow.cxx
@@ -270,19 +270,6 @@ ScVbaWindow::ScrollWorkbookTabs( const uno::Any& /*Sheets*/, const uno::Any& /*P
{
// #TODO #FIXME need some implementation to scroll through the tabs
// but where is this done?
-/*
- sal_Int32 nSheets = 0;
- sal_Int32 nPosition = 0;
- throw uno::RuntimeException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("No Implemented" )), uno::Reference< uno::XInterface >() );
- sal_Bool bSheets = ( Sheets >>= nSheets );
- sal_Bool bPosition = ( Position >>= nPosition );
- if ( bSheets || bPosition ) // at least one param specified
- if ( bSheets )
- ;// use sheets
- else if ( bPosition )
- ; //use position
-*/
-
}
uno::Reference< beans::XPropertySet >
getPropsFromModel( const uno::Reference< frame::XModel >& xModel )
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index bcd93a33b892..588766d2e960 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -29,14 +29,10 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sc.hxx"
-
-
// INCLUDE ---------------------------------------------------------------
-
#include "scitems.hxx"
#include <editeng/eeitem.hxx>
-
#include <svtools/colorcfg.hxx>
#include <editeng/colritem.hxx>
#include <editeng/editview.hxx>
@@ -328,16 +324,6 @@ void ScGridWindow::PrePaint()
void ScGridWindow::Paint( const Rectangle& rRect )
{
- //TODO/LATER: how to get environment? Do we need that?!
- /*
- ScDocShell* pDocSh = pViewData->GetDocShell();
- SvInPlaceEnvironment* pEnv = pDocSh->GetIPEnv();
- if (pEnv && pEnv->GetRectsChangedLockCount())
- {
- Invalidate(rRect);
- return;
- }*/
-
ScDocument* pDoc = pViewData->GetDocument();
if ( pDoc->IsInInterpreter() )
{
@@ -1716,129 +1702,12 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects )
// -------------------------------------------------------------------------
-
-
-// -------------------------------------------------------------------------
-
void ScGridWindow::DrawCursor()
{
-// #114409#
-// SCTAB nTab = pViewData->GetTabNo();
-// SCCOL nX = pViewData->GetCurX();
-// SCROW nY = pViewData->GetCurY();
-//
-// // in verdeckten Zellen nicht zeichnen
-//
-// ScDocument* pDoc = pViewData->GetDocument();
-// const ScPatternAttr* pPattern = pDoc->GetPattern(nX,nY,nTab);
-// const ScMergeFlagAttr& rMerge = (const ScMergeFlagAttr&) pPattern->GetItem(ATTR_MERGE_FLAG);
-// if (rMerge.IsOverlapped())
-// return;
-//
-// // links/oben ausserhalb des Bildschirms ?
-//
-// BOOL bVis = ( nX>=pViewData->GetPosX(eHWhich) && nY>=pViewData->GetPosY(eVWhich) );
-// if (!bVis)
-// {
-// SCCOL nEndX = nX;
-// SCROW nEndY = nY;
-// ScDocument* pDoc = pViewData->GetDocument();
-// const ScMergeAttr& rMerge = (const ScMergeAttr&) pPattern->GetItem(ATTR_MERGE);
-// if (rMerge.GetColMerge() > 1)
-// nEndX += rMerge.GetColMerge()-1;
-// if (rMerge.GetRowMerge() > 1)
-// nEndY += rMerge.GetRowMerge()-1;
-// bVis = ( nEndX>=pViewData->GetPosX(eHWhich) && nEndY>=pViewData->GetPosY(eVWhich) );
-// }
-//
-// if ( bVis )
-// {
-// // hier kein Update, da aus Paint gerufen und laut Zaehler Cursor schon da
-// // wenn Update noetig, dann bei Hide/Showcursor vor dem Hoch-/Runterzaehlen
-//
-// MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL);
-//
-// Point aScrPos = pViewData->GetScrPos( nX, nY, eWhich, TRUE );
-// BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
-//
-// // completely right of/below the screen?
-// // (test with logical start position in aScrPos)
-// BOOL bMaybeVisible;
-// if ( bLayoutRTL )
-// bMaybeVisible = ( aScrPos.X() >= -2 && aScrPos.Y() >= -2 );
-// else
-// {
-// Size aOutSize = GetOutputSizePixel();
-// bMaybeVisible = ( aScrPos.X() <= aOutSize.Width() + 2 && aScrPos.Y() <= aOutSize.Height() + 2 );
-// }
-// if ( bMaybeVisible )
-// {
-// long nSizeXPix;
-// long nSizeYPix;
-// pViewData->GetMergeSizePixel( nX, nY, nSizeXPix, nSizeYPix );
-//
-// if ( bLayoutRTL )
-// aScrPos.X() -= nSizeXPix - 2; // move instead of mirroring
-//
-// BOOL bFix = ( pViewData->GetHSplitMode() == SC_SPLIT_FIX ||
-// pViewData->GetVSplitMode() == SC_SPLIT_FIX );
-// if ( pViewData->GetActivePart()==eWhich || bFix )
-// {
-// // old UNX version with two Invert calls causes flicker.
-// // if optimization is needed, a new flag should be added
-// // to InvertTracking
-//
-// aScrPos.X() -= 2;
-// aScrPos.Y() -= 2;
-// Rectangle aRect( aScrPos, Size( nSizeXPix + 3, nSizeYPix + 3 ) );
-//
-// Invert(Rectangle( aRect.Left(), aRect.Top(), aRect.Left()+2, aRect.Bottom() ));
-// Invert(Rectangle( aRect.Right()-2, aRect.Top(), aRect.Right(), aRect.Bottom() ));
-// Invert(Rectangle( aRect.Left()+3, aRect.Top(), aRect.Right()-3, aRect.Top()+2 ));
-// Invert(Rectangle( aRect.Left()+3, aRect.Bottom()-2, aRect.Right()-3, aRect.Bottom() ));
-// }
-// else
-// {
-// Rectangle aRect( aScrPos, Size( nSizeXPix - 1, nSizeYPix - 1 ) );
-// Invert( aRect );
-// }
-// }
-//
-// SetMapMode(aOld);
-// }
}
- // AutoFill-Anfasser:
-
void ScGridWindow::DrawAutoFillMark()
{
-// #114409#
-// if ( bAutoMarkVisible && aAutoMarkPos.Tab() == pViewData->GetTabNo() )
-// {
-// SCCOL nX = aAutoMarkPos.Col();
-// SCROW nY = aAutoMarkPos.Row();
-// SCTAB nTab = pViewData->GetTabNo();
-// ScDocument* pDoc = pViewData->GetDocument();
-// BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab );
-//
-// Point aFillPos = pViewData->GetScrPos( nX, nY, eWhich, TRUE );
-// long nSizeXPix;
-// long nSizeYPix;
-// pViewData->GetMergeSizePixel( nX, nY, nSizeXPix, nSizeYPix );
-// if ( bLayoutRTL )
-// aFillPos.X() -= nSizeXPix + 3;
-// else
-// aFillPos.X() += nSizeXPix - 2;
-//
-// aFillPos.Y() += nSizeYPix;
-// aFillPos.Y() -= 2;
-// Rectangle aFillRect( aFillPos, Size(6,6) );
-// // Anfasser von Zeichenobjekten sind 7*7
-//
-// MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL);
-// Invert( aFillRect );
-// SetMapMode(aOld);
-// }
}
// -------------------------------------------------------------------------
@@ -1887,7 +1756,4 @@ void ScGridWindow::DataChanged( const DataChangedEvent& rDCEvt )
}
}
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-08 11:36:38 +0000