Hi,
I have removed some commented out code form** */xmloff*.
My code is under the LGPLv3+/MPL dual license.
Regards,
Balint Dozsa
From c0253742c53c585267252c5dfb9c0f3d5ea1c46f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A1lint=20D=C3=B3zsa?= <dozsabal...@gmail.com>
Date: Tue, 8 Mar 2011 11:57:24 +0100
Subject: [PATCH] Remove commented out code
---
xmloff/source/forms/layerexport.cxx | 7 +-----
xmloff/source/forms/layerimport.hxx | 21 ------------------
xmloff/source/forms/propertyimport.cxx | 1 -
xmloff/source/meta/MetaImportComponent.cxx | 1 -
xmloff/source/meta/xmlmetae.cxx | 1 -
xmloff/source/meta/xmlversion.cxx | 2 -
xmloff/source/script/XMLEventsImportContext.cxx | 14 ------------
.../source/script/XMLStarBasicContextFactory.cxx | 12 ----------
xmloff/source/style/FillStyleContext.cxx | 2 -
xmloff/source/style/ImageStyle.cxx | 23 +++----------------
xmloff/source/style/XMLPageExport.cxx | 9 -------
xmloff/source/style/impastp4.cxx | 4 ---
xmloff/source/style/impastpl.hxx | 3 --
xmloff/source/style/styleexp.cxx | 3 --
xmloff/source/style/xmlexppr.cxx | 10 +-------
xmloff/source/style/xmlimppr.cxx | 10 --------
xmloff/source/style/xmlnumi.cxx | 4 ---
xmloff/source/style/xmlstyle.cxx | 1 -
xmloff/source/style/xmltabe.cxx | 4 ---
xmloff/source/table/XMLTableExport.cxx | 6 +----
20 files changed, 7 insertions(+), 131 deletions(-)
diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx
index a01e640..337a1ce 100644
--- a/xmloff/source/forms/layerexport.cxx
+++ b/xmloff/source/forms/layerexport.cxx
@@ -780,12 +780,7 @@ namespace xmloff
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")),
::rtl::OUString()
);
- // #110680#
- //Reference< XInterface > xFormatsSupplierUntyped =
- // ::comphelper::getProcessServiceFactory()->createInstanceWithArguments(
- // SERVICE_NUMBERFORMATSSUPPLIER,
- // aSupplierArgs
- // );
+
Reference< XInterface > xFormatsSupplierUntyped =
m_rContext.getServiceFactory()->createInstanceWithArguments(
SERVICE_NUMBERFORMATSSUPPLIER,
diff --git a/xmloff/source/forms/layerimport.hxx b/xmloff/source/forms/layerimport.hxx
index 2a87dce..47d7703 100644
--- a/xmloff/source/forms/layerimport.hxx
+++ b/xmloff/source/forms/layerimport.hxx
@@ -55,27 +55,6 @@ namespace xmloff
class OAttribute2Property;
//=====================================================================
- //= ControlReference
- //=====================================================================
- /// a structure containing a property set (the referred control) and a string (the list of referring controls)
-/* struct ControlReference
- {
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
- xReferredControl;
- ::rtl::OUString
- sReferringControls;
-
- ControlReference(
- const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxReferredControl,
- const ::rtl::OUString& _rReferringControls)
- :xReferredControl(_rxReferredControl)
- ,sReferringControls(_rReferringControls)
- {
- }
- };
-*/
-
- //=====================================================================
//= OFormLayerXMLImport_Impl
//=====================================================================
class OFormLayerXMLImport_Impl
diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx
index c80daed..fe90c90 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -460,7 +460,6 @@ void OSinglePropertyContext::StartElement(const Reference< sax::XAttributeList >
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
const ::rtl::OUString& rAttrName = _rxAttrList->getNameByIndex( i );
- //const ::rtl::OUString& rValue = _rxAttrList->getValueByIndex( i );
::rtl::OUString aLocalName;
sal_uInt16 nPrefix =
diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx
index acf9351..9994867 100644
--- a/xmloff/source/meta/MetaImportComponent.cxx
+++ b/xmloff/source/meta/MetaImportComponent.cxx
@@ -113,7 +113,6 @@ uno::Reference< uno::XInterface > SAL_CALL XMLMetaImportComponent_createInstance
throw( uno::Exception )
{
// #110680#
- // return (cppu::OWeakObject*)new XMLMetaImportComponent;
return (cppu::OWeakObject*)new XMLMetaImportComponent(rSMgr);
}
diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx
index e4c2afa..78892f2 100644
--- a/xmloff/source/meta/xmlmetae.cxx
+++ b/xmloff/source/meta/xmlmetae.cxx
@@ -351,7 +351,6 @@ SvXMLMetaExport::~SvXMLMetaExport()
void SvXMLMetaExport::Export()
{
-// exportDom(xDOM, mrExport); // this would not work (root node, namespaces)
uno::Reference< xml::sax::XSAXSerializable> xSAXable(mxDocProps,
uno::UNO_QUERY);
if (xSAXable.is()) {
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index 51e87ab..e5e2def 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -383,7 +383,6 @@ void SAL_CALL XMLVersionListPersistence::store( const uno::Reference< embed::XSt
Reference< XDocumentHandler > xHandler( xWriter, uno::UNO_QUERY );
- // XMLVersionListExport aExp( pList, sVerName, xHandler );
XMLVersionListExport aExp( xServiceFactory, rVersions, sVerName, xHandler );
aExp.exportDoc( ::xmloff::token::XML_VERSION );
@@ -445,7 +444,6 @@ uno::Sequence< util::RevisionTag > SAL_CALL XMLVersionListPersistence::load( con
"XMLReader::Read: com.sun.star.xml.sax.Parser service missing" );
// get filter
- // Reference< XDocumentHandler > xFilter = new XMLVersionListImport( pList );
Reference< XDocumentHandler > xFilter = new XMLVersionListImport( xServiceFactory, aVersions );
// connect parser and filter
diff --git a/xmloff/source/script/XMLEventsImportContext.cxx b/xmloff/source/script/XMLEventsImportContext.cxx
index 928dac8..bda7a9c 100644
--- a/xmloff/source/script/XMLEventsImportContext.cxx
+++ b/xmloff/source/script/XMLEventsImportContext.cxx
@@ -87,15 +87,6 @@ XMLEventsImportContext::~XMLEventsImportContext()
{
// // if, for whatever reason, the object gets destroyed prematurely,
// // we need to delete the collected events
-// EventsVector::iterator aEnd = aCollectEvents.end();
-// for(EventsVector::iterator aIter = aCollectEvents.begin();
-// aIter != aEnd;
-// aIter++)
-// {
-// EventNameValuesPair* pPair = &(*aIter);
-// delete pPair;
-// }
-// aCollectEvents.clear();
}
@@ -175,8 +166,6 @@ void XMLEventsImportContext::SetEvents(
++aIter)
{
AddEventValues(aIter->first, aIter->second);
-// EventNameValuesPair* pPair = &(*aIter);
-// delete pPair;
}
aCollectEvents.clear();
}
@@ -235,9 +224,6 @@ void XMLEventsImportContext::AddEventValues(
}
else
{
-// EventNameValuesPair* aPair = new EventNameValuesPair(rEventName,
-// rValues);
-// aCollectEvents.push_back(*aPair);
EventNameValuesPair aPair(rEventName, rValues);
aCollectEvents.push_back(aPair);
}
diff --git a/xmloff/source/script/XMLStarBasicContextFactory.cxx b/xmloff/source/script/XMLStarBasicContextFactory.cxx
index a69f9af..5a45202 100644
--- a/xmloff/source/script/XMLStarBasicContextFactory.cxx
+++ b/xmloff/source/script/XMLStarBasicContextFactory.cxx
@@ -80,18 +80,6 @@ SvXMLImportContext* XMLStarBasicContextFactory::CreateContext(
if (XML_NAMESPACE_SCRIPT == nPrefix)
{
-// if (IsXMLToken(sLocalName, XML_LIBRARY))
-// {
-// sLibraryVal = xAttrList->getValueByIndex(nAttr);
-// }
-// if (IsXMLToken(sLocalName, XML_LOCATION))
-// {
-// sLibraryVal = xAttrList->getValueByIndex(nAttr);
-// if ( IsXMLToken( sLibraryVal, XML_APPLICATION ) )
-// sLibraryVal =
-// OUString(RTL_CONSTASCII_USTRINGPARAM("StarOffice"));
-// }
-// else
if (IsXMLToken(sLocalName, XML_MACRO_NAME))
{
sMacroNameVal = xAttrList->getValueByIndex(nAttr);
diff --git a/xmloff/source/style/FillStyleContext.cxx b/xmloff/source/style/FillStyleContext.cxx
index 163373e..df48b16 100644
--- a/xmloff/source/style/FillStyleContext.cxx
+++ b/xmloff/source/style/FillStyleContext.cxx
@@ -57,8 +57,6 @@ XMLGradientStyleContext::XMLGradientStyleContext( SvXMLImport& rImport, sal_uInt
const uno::Reference< xml::sax::XAttributeList >& xAttrList)
: SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList)
{
- // set Family
-// SetFamily( XML_STYLE_FAMILY_FILLSTYLE_GRADIENT_ID );
// start import
XMLGradientStyleImport aGradientStyle( GetImport() );
diff --git a/xmloff/source/style/ImageStyle.cxx b/xmloff/source/style/ImageStyle.cxx
index 3b78ea7..307d944 100644
--- a/xmloff/source/style/ImageStyle.cxx
+++ b/xmloff/source/style/ImageStyle.cxx
@@ -56,8 +56,6 @@ enum SvXMLTokenMapAttrs
XML_TOK_IMAGE_TYPE,
XML_TOK_IMAGE_SHOW,
XML_TOK_IMAGE_ACTUATE,
- /* XML_TOK_IMAGE_SIZEW,
- XML_TOK_IMAGE_SIZEH,*/
XML_TOK_TABSTOP_END=XML_TOK_UNKNOWN
};
@@ -108,18 +106,7 @@ sal_Bool XMLImageStyle::ImpExportXML( const OUString& rStrName, const uno::Any&
rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED );
rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_ACTUATE, XML_ONLOAD );
}
-/*
- // size
- awt::Size aSize = xBitmap->getSize();
-
- rUnitConverter.convertNumber( aOut, aSize.Width );
- aStrValue = aOut.makeStringAndClear();
- AddAttribute( XML_NAMESPACE_SVG, XML_WIDTH, aStrValue );
-
- rUnitConverter.convertNumber( aOut, aSize.Height );
- aStrValue = aOut.makeStringAndClear();
- AddAttribute( XML_NAMESPACE_SVG, XML_HEIGHT, aStrValue );
-*/
+
// Do Write
SvXMLElementExport aElem( rExport, XML_NAMESPACE_DRAW, XML_FILL_IMAGE, sal_True, sal_True );
@@ -160,8 +147,6 @@ sal_Bool XMLImageStyle::ImpImportXML( const uno::Reference< xml::sax::XAttribute
{ XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_IMAGE_TYPE },
{ XML_NAMESPACE_XLINK, XML_SHOW, XML_TOK_IMAGE_SHOW },
{ XML_NAMESPACE_XLINK, XML_ACTUATE, XML_TOK_IMAGE_ACTUATE },
- /*{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_IMAGE_URL },
- { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_IMAGE_URL },*/
XML_TOKEN_MAP_END
};
@@ -181,18 +166,18 @@ sal_Bool XMLImageStyle::ImpImportXML( const uno::Reference< xml::sax::XAttribute
{
rStrName = rStrValue;
bHasName = sal_True;
- }
+ }
break;
case XML_TOK_IMAGE_DISPLAY_NAME:
{
aDisplayName = rStrValue;
- }
+ }
break;
case XML_TOK_IMAGE_URL:
{
aStrURL = rImport.ResolveGraphicObjectURL( rStrValue, sal_False );
bHasHRef = sal_True;
- }
+ }
break;
case XML_TOK_IMAGE_TYPE:
// ignore
diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx
index ad3e022..cf87f74 100644
--- a/xmloff/source/style/XMLPageExport.cxx
+++ b/xmloff/source/style/XMLPageExport.cxx
@@ -149,13 +149,6 @@ sal_Bool XMLPageExport::exportStyle(
GetExport().EncodeStyleName( sNextName ) );
}
}
-// OUString sPageMaster = GetExport().GetAutoStylePool()->Find(
-// XML_STYLE_FAMILY_PAGE_MASTER,
-// xPropSet );
-// if( sPageMaster.getLength() )
-// GetExport().AddAttribute( XML_NAMESPACE_STYLE,
-// XML_PAGE_MASTER_NAME,
-// sPageMaster );
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
XML_MASTER_PAGE, sal_True, sal_True );
@@ -262,8 +255,6 @@ void XMLPageExport::exportDefaultStyle()
}
}
- // if ( xPropStates.size() != 0 &&
- // ( xPropStates.size() != 1 || xPropStates[0].mnIndex != -1 ) )
if( bExport )
{
//<style:default-page-layout>
diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx
index 0a4ec52..f237101 100644
--- a/xmloff/source/style/impastp4.cxx
+++ b/xmloff/source/style/impastp4.cxx
@@ -175,10 +175,6 @@ void SvXMLAutoStylePoolP_Impl::GetRegisteredNames(
// if not added, yet.
//
-/*OUString SvXMLAutoStylePoolP_Impl::Add( sal_Int32 nFamily,
- const OUString& rParent,
- const vector< XMLPropertyState >& rProperties,
- sal_Bool bCache )*/
sal_Bool SvXMLAutoStylePoolP_Impl::Add(OUString& rName, sal_Int32 nFamily,
const OUString& rParent,
const ::std::vector< XMLPropertyState >& rProperties,
diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index d11198c..8f425e2 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
@@ -191,9 +191,6 @@ public:
com::sun::star::uno::Sequence<sal_Int32>& aFamilies,
com::sun::star::uno::Sequence<rtl::OUString>& aNames );
-// ::rtl::OUString Add( sal_Int32 nFamily, const ::rtl::OUString& rParent,
-// const ::std::vector< XMLPropertyState >& rProperties,
-// sal_Bool bCache = sal_False );
sal_Bool Add( ::rtl::OUString& rName, sal_Int32 nFamily,
const ::rtl::OUString& rParent,
const ::std::vector< XMLPropertyState >& rProperties,
diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx
index 6efc7d1..bba1d54 100644
--- a/xmloff/source/style/styleexp.cxx
+++ b/xmloff/source/style/styleexp.cxx
@@ -367,13 +367,10 @@ sal_Bool XMLStyleExport::exportDefaultStyle(
XML_DEFAULT_STYLE,
sal_True, sal_True );
// <style:properties>
- //::std::vector< XMLPropertyState > xPropStates =
- // rPropMapper->FilterDefaults( xPropSet );
::std::vector< XMLPropertyState > xPropStates =
rPropMapper->FilterDefaults( xPropSet );
rPropMapper->exportXML( GetExport(), xPropStates,
XML_EXPORT_FLAG_IGN_WS );
-// exportStyleContent( rStyle );
}
return sal_True;
}
diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index 7ee5039..1f636bd 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -727,14 +727,6 @@ vector< XMLPropertyState > SvXMLExportPropertyMapper::_Filter(
ContextFilter( aPropStateArray, xPropSet );
// Have to do if we change from a vector to a list or something like that
- /*vector< XMLPropertyState >::iterator aItr = aPropStateArray.begin();
- while (aItr != aPropStateArray.end())
- {
- if (aItr->mnIndex == -1)
- aItr = aPropStateArray.erase(aItr);
- else
- aItr++;
- }*/
if( bDelInfo )
delete pFilterInfo;
@@ -1106,7 +1098,7 @@ void SvXMLExportPropertyMapper::_exportXML(
MID_FLAG_MERGE_ATTRIBUTE ) != 0 )
{
aValue = rAttrList.getValueByName( sName );
- bRemove = sal_True; //aValue.getLength() != 0;
+ bRemove = sal_True;
}
if( maPropMapper->exportXML( aValue, rProperty, rUnitConverter ) )
diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx
index 4739d71..5e073df 100644
--- a/xmloff/source/style/xmlimppr.cxx
+++ b/xmloff/source/style/xmlimppr.cxx
@@ -344,16 +344,6 @@ void SvXMLImportPropertyMapper::importXML(
}
finished( rProperties, nStartIdx, nEndIdx );
-
- // Have to do if we change from a vector to a list or something like that
- /*std::vector <XMLPropertyState>::iterator aItr = rProperties.begin();
- while (aItr != rProperties.end())
- {
- if (aItr->mnIndex == -1)
- aItr = rProperties.erase(aItr);
- else
- aItr++;
- }*/
}
/** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_IMPORT flag set */
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 1bf7d3e..df9398f 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -560,7 +560,6 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
aFDesc.Pitch = eBulletFontPitch;
aFDesc.CharSet = eBulletFontEncoding;
aFDesc.Weight = WEIGHT_DONTKNOW;
- //aFDesc.Transparant = sal_True;
sal_Bool bStarSymbol = sal_False;
if( aFDesc.Name.equalsIgnoreAsciiCase( sStarBats ) )
{
@@ -603,7 +602,6 @@ Sequence<beans::PropertyValue> SvxXMLListLevelStyleContext_Impl::GetProperties(
else if( xBase64Stream.is() )
{
sStr = GetImport().ResolveGraphicObjectURLFromBase64( xBase64Stream );
-// xBase64Stream = 0;
}
if( sStr.getLength() )
@@ -1348,7 +1346,6 @@ void SvxXMLListStyleContext::SetDefaultStyle(
if( !bOrdered )
{
// TODO: Bullet-Font
- //aNumFmt.SetBulletFont( &SwNumRule::GetDefBulletFont() );
awt::FontDescriptor aFDesc;
aFDesc.Name = OUString(
#if defined UNX
@@ -1361,7 +1358,6 @@ void SvxXMLListStyleContext::SetDefaultStyle(
aFDesc.Pitch = PITCH_DONTKNOW ;
aFDesc.CharSet = RTL_TEXTENCODING_SYMBOL ;
aFDesc.Weight = WEIGHT_DONTKNOW;
- //aFDesc.Transparant = sal_True;
pProps->Name =
OUString(RTL_CONSTASCII_USTRINGPARAM( XML_UNO_NAME_NRULE_BULLET_FONT ));
(pProps++)->Value <<= aFDesc;
diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx
index 21fabba..2c700ae 100644
--- a/xmloff/source/style/xmlstyle.cxx
+++ b/xmloff/source/style/xmlstyle.cxx
@@ -866,7 +866,6 @@ SvXMLImportContext *SvXMLStylesContext::CreateChildContext( sal_uInt16 nPrefix,
SvXMLStyleContext *pStyle =
CreateStyleChildContext( nPrefix, rLocalName, xAttrList );
-// DBG_ASSERT( pStyle->GetFamily(), "Style without a family" );
if( pStyle )
{
if( !pStyle->IsTransient() )
diff --git a/xmloff/source/style/xmltabe.cxx b/xmloff/source/style/xmltabe.cxx
index e271877..d5a79c9 100644
--- a/xmloff/source/style/xmltabe.cxx
+++ b/xmloff/source/style/xmltabe.cxx
@@ -124,10 +124,6 @@ void SvxXMLTabStopExport::Export( const uno::Any& rAny )
{
const ::com::sun::star::style::TabStop* pTabs = aSeq.getConstArray();
const sal_Int32 nTabs = aSeq.getLength();
-
- // ignore default tab stop here
- //if( 1 == nTabs && style::TabAlign_DEFAULT == pTabs[0].Alignment )
- // return;
SvXMLElementExport rElem( rExport, XML_NAMESPACE_STYLE, XML_TAB_STOPS,
sal_True, sal_True );
diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx
index 58ba22f..e70d1e8 100644
--- a/xmloff/source/table/XMLTableExport.cxx
+++ b/xmloff/source/table/XMLTableExport.cxx
@@ -185,11 +185,7 @@ XMLTableExport::XMLTableExport(SvXMLExport& rExp, const rtl::Reference< SvXMLExp
mrExport.GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_ROW,
OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME)),
mxRowExportPropertySetMapper.get(),
- OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX)));
-// mrExport.GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_TABLE
-// OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME)),
-// xTableStylesExportPropertySetMapper,
-// OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX)));
+ OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX)));
mrExport.GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_CELL,
OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)),
mxCellExportPropertySetMapper.get(),
--
1.7.1
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
