summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-09-30 11:06:04 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-10-01 06:57:19 +0000
commite209d115d41e25f5658dd52ae94ceb873b33013f (patch)
tree58b49bdcc833ec48bc8542f81b7918f50e07bb6d /xmloff
parent8e27c68847c6461c7bc0bdbff44412d6bfb0b1e8 (diff)
remove old standalone Sun bug numbers
Sun bug numbers without any accompanying text are completely useless. Fixed with git grep -lP '//\s*#\d+#\s*$' | xargs perl -i -ne'/\/\/\s*#\d+#\s*$/d or print' And then hand-checking the result to restore places where it deleted code. And then some more grepping and hand-editing to kill the others. Change-Id: Ia96ce4466db8bb8da363ebf41f0ae7f45f28bf29 Reviewed-on: https://gerrit.libreoffice.org/19023 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/inc/MetaImportComponent.hxx1
-rw-r--r--xmloff/inc/SchXMLExport.hxx1
-rw-r--r--xmloff/inc/SchXMLImport.hxx1
-rw-r--r--xmloff/inc/XMLEmbeddedObjectImportContext.hxx2
-rw-r--r--xmloff/source/chart/SchXMLExport.cxx3
-rw-r--r--xmloff/source/chart/SchXMLImport.cxx5
-rw-r--r--xmloff/source/draw/sdxmlexp.cxx2
-rw-r--r--xmloff/source/draw/sdxmlexp_impl.hxx1
-rw-r--r--xmloff/source/draw/sdxmlimp.cxx1
-rw-r--r--xmloff/source/draw/sdxmlimp_impl.hxx1
-rw-r--r--xmloff/source/draw/shapeexport.cxx1
-rw-r--r--xmloff/source/draw/shapeimport.cxx1
-rw-r--r--xmloff/source/draw/ximpshap.cxx4
-rw-r--r--xmloff/source/draw/ximpshap.hxx2
-rw-r--r--xmloff/source/meta/MetaImportComponent.cxx2
-rw-r--r--xmloff/source/meta/xmlversion.cxx1
-rw-r--r--xmloff/source/text/XMLChangeElementImportContext.cxx2
-rw-r--r--xmloff/source/text/XMLChangeElementImportContext.hxx2
-rw-r--r--xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx1
-rw-r--r--xmloff/source/text/XMLTextFrameContext.cxx1
-rw-r--r--xmloff/source/text/txtimp.cxx1
-rw-r--r--xmloff/source/text/txtparae.cxx1
22 files changed, 0 insertions, 37 deletions
diff --git a/xmloff/inc/MetaImportComponent.hxx b/xmloff/inc/MetaImportComponent.hxx
index 7738f044d849..fa20849a8d2b 100644
--- a/xmloff/inc/MetaImportComponent.hxx
+++ b/xmloff/inc/MetaImportComponent.hxx
@@ -33,7 +33,6 @@ private:
::com::sun::star::document::XDocumentProperties> mxDocProps;
public:
- // #110680#
// XMLMetaImportComponent() throw();
XMLMetaImportComponent(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext
diff --git a/xmloff/inc/SchXMLExport.hxx b/xmloff/inc/SchXMLExport.hxx
index 41e179de4cad..dc07b786596b 100644
--- a/xmloff/inc/SchXMLExport.hxx
+++ b/xmloff/inc/SchXMLExport.hxx
@@ -50,7 +50,6 @@ protected:
virtual void _ExportContent() SAL_OVERRIDE;
public:
- // #110680#
SchXMLExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
OUString const & implementationName,
diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx
index 01e6e1d46893..648db1a0d304 100644
--- a/xmloff/inc/SchXMLImport.hxx
+++ b/xmloff/inc/SchXMLImport.hxx
@@ -169,7 +169,6 @@ protected:
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE;
public:
- // #110680#
SchXMLImport(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
OUString const & implementationName, SvXMLImportFlags nImportFlags );
diff --git a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
index 046df42ff448..0c6fba36f7a7 100644
--- a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
+++ b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx
@@ -34,14 +34,12 @@ class XMLEmbeddedObjectImportContext : public SvXMLImportContext
::com::sun::star::lang::XComponent > xComp;
OUString sFilterService;
- // #100592#
OUString sCLSID;
public:
TYPEINFO_OVERRIDE();
const OUString& GetFilterServiceName() const { return sFilterService; }
- // #100592#
const OUString& GetFilterCLSID() const { return sCLSID; }
XMLEmbeddedObjectImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 4e034c7ba40f..568e3e938c74 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -3755,7 +3755,6 @@ OUString SAL_CALL SchXMLExport_getImplementationName() throw()
Reference< uno::XInterface > SAL_CALL SchXMLExport_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
{
- // #110680#
// #103997# removed some flags from EXPORT_ALL
return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_getImplementationName(), SvXMLExportFlags::ALL ^ ( SvXMLExportFlags::SETTINGS | SvXMLExportFlags::MASTERSTYLES | SvXMLExportFlags::SCRIPTS )));
}
@@ -3797,7 +3796,6 @@ OUString SAL_CALL SchXMLExport_Styles_getImplementationName() throw()
Reference< uno::XInterface > SAL_CALL SchXMLExport_Styles_createInstance(const Reference< lang::XMultiServiceFactory >& rSMgr) throw( uno::Exception )
{
- // #110680#
return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Styles_getImplementationName(), SvXMLExportFlags::STYLES ));
}
@@ -3833,7 +3831,6 @@ OUString SAL_CALL SchXMLExport_Content_getImplementationName() throw()
Reference< uno::XInterface > SAL_CALL SchXMLExport_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
{
- // #110680#
return static_cast<cppu::OWeakObject*>(new SchXMLExport( comphelper::getComponentContext(rSMgr), SchXMLExport_Content_getImplementationName(), SvXMLExportFlags::AUTOSTYLES | SvXMLExportFlags::CONTENT | SvXMLExportFlags::FONTDECLS ));
}
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index a8e1ea4a81e4..40a4608d8704 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -502,7 +502,6 @@ Reference< chart2::XDataSeries > SchXMLImportHelper::GetNewDataSeries(
return xResult;
}
-// #110680#
SchXMLImport::SchXMLImport(
const Reference< uno::XComponentContext >& xContext,
OUString const & implementationName, SvXMLImportFlags nImportFlags ) :
@@ -671,7 +670,6 @@ OUString SAL_CALL SchXMLImport_getImplementationName() throw()
Reference< uno::XInterface > SAL_CALL SchXMLImport_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
{
- // #110680#
return static_cast<cppu::OWeakObject*>(new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_getImplementationName(), SvXMLImportFlags::ALL));
}
@@ -691,7 +689,6 @@ OUString SAL_CALL SchXMLImport_Styles_getImplementationName() throw()
Reference< uno::XInterface > SAL_CALL SchXMLImport_Styles_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
{
- // #110680#
return static_cast<cppu::OWeakObject*>(new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_Styles_getImplementationName(), SvXMLImportFlags::STYLES ));
}
@@ -709,7 +706,6 @@ OUString SAL_CALL SchXMLImport_Content_getImplementationName() throw()
Reference< uno::XInterface > SAL_CALL SchXMLImport_Content_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
{
- // #110680#
return static_cast<cppu::OWeakObject*>(new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_Content_getImplementationName(), SvXMLImportFlags::CONTENT | SvXMLImportFlags::AUTOSTYLES | SvXMLImportFlags::FONTDECLS ));
}
@@ -727,7 +723,6 @@ OUString SAL_CALL SchXMLImport_Meta_getImplementationName() throw()
Reference< uno::XInterface > SAL_CALL SchXMLImport_Meta_createInstance(const Reference< lang::XMultiServiceFactory > & rSMgr) throw( uno::Exception )
{
- // #110680#
return static_cast<cppu::OWeakObject*>(new SchXMLImport( comphelper::getComponentContext(rSMgr), SchXMLImport_Meta_getImplementationName(), SvXMLImportFlags::META ));
}
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 5e4abe4fc7ee..b778bfa35b64 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -388,7 +388,6 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI
maPresRect.SetSize(aLayoutSize);
}
-// #110680#
SdXMLExport::SdXMLExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
OUString const & implementationName,
@@ -1739,7 +1738,6 @@ void SdXMLExport::SetProgress(sal_Int32 nProg)
GetStatusIndicator()->setValue(nProg);
}
-// #82003#
void SdXMLExport::_ExportMeta()
{
diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx
index d8311e1c591f..30ea0952d715 100644
--- a/xmloff/source/draw/sdxmlexp_impl.hxx
+++ b/xmloff/source/draw/sdxmlexp_impl.hxx
@@ -122,7 +122,6 @@ class SdXMLExport : public SvXMLExport
virtual void _ExportFontDecls() SAL_OVERRIDE;
virtual void _ExportMasterStyles() SAL_OVERRIDE;
virtual void _ExportContent() SAL_OVERRIDE;
- // #82003#
virtual void _ExportMeta() SAL_OVERRIDE;
ImpXMLEXPPageMasterInfo* ImpGetOrCreatePageMasterInfo( com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > xMasterPage );
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 4de2b980d23c..d161888b40e4 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -282,7 +282,6 @@ SERVICE( XMLDrawMetaImportOasis, "com.sun.star.comp.Draw.XMLOasisMetaImporter",
SERVICE( XMLImpressSettingsImportOasis, "com.sun.star.comp.Impress.XMLOasisSettingsImporter", "XMLImpressSettingsImportOasis", false, SvXMLImportFlags::SETTINGS )
SERVICE( XMLDrawSettingsImportOasis, "com.sun.star.comp.Draw.XMLOasisSettingsImporter", "XMLImpressSettingsImportOasis", true, SvXMLImportFlags::SETTINGS )
-// #110680#
SdXMLImport::SdXMLImport(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext,
OUString const & implementationName,
diff --git a/xmloff/source/draw/sdxmlimp_impl.hxx b/xmloff/source/draw/sdxmlimp_impl.hxx
index 8088a5fc2756..65aeb5bcc24e 100644
--- a/xmloff/source/draw/sdxmlimp_impl.hxx
+++ b/xmloff/source/draw/sdxmlimp_impl.hxx
@@ -280,7 +280,6 @@ public:
bool IsDraw() const { return mbIsDraw; }
bool IsImpress() const { return !mbIsDraw; }
- // #80365#
virtual void SetStatistics(
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats) SAL_OVERRIDE;
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 66b82273ccd4..e7d42ddb02be 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -2837,7 +2837,6 @@ void XMLShapeExport::ImpExportOLE2Shape(
if(bExportEmbedded && !bIsEmptyPresObj)
{
- // #100592#
if(bInternal)
{
// embedded XML
diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx
index 7a050867e66a..0c9d4644f5c7 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -1109,7 +1109,6 @@ void XMLShapeImportHelper::endPage( com::sun::star::uno::Reference< com::sun::st
mpPageContext = pNextContext;
}
-// #88546#
/** defines if the import should increment the progress bar or not */
void XMLShapeImportHelper::enableHandleProgressBar( bool bEnable )
{
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 3a05256e5c90..7984878295cd 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -449,7 +449,6 @@ void SdXMLShapeContext::AddShape(uno::Reference< drawing::XShape >& xShape)
OSL_FAIL( "SdXMLShapeContext::AddShape(), exception caught!" );
}
- // #107848#
if(!mbTemporaryShape && (!GetImport().HasTextImport()
|| !GetImport().GetTextImport()->IsInsideDeleteContext()))
{
@@ -2001,7 +2000,6 @@ void SdXMLConnectorShapeContext::processAttribute( sal_uInt16 nPrefix, const OUS
void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XAttributeList>& xAttrList)
{
- // #107928#
// For security reasons, do not add empty connectors. There may have been an error in EA2
// that created empty, far set off connectors (e.g. 63 meters below top of document). This
// is not guaranteed, but it's definitely safe to not add empty connectors.
@@ -2818,7 +2816,6 @@ void SdXMLObjectShapeContext::EndElement()
}
}
- // #100592#
if( mxBase64Stream.is() )
{
OUString aPersistName( GetImport().ResolveEmbeddedObjectURLFromBase64() );
@@ -2862,7 +2859,6 @@ SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLocalName,
const uno::Reference<xml::sax::XAttributeList>& xAttrList )
{
- // #100592#
SvXMLImportContext* pContext = NULL;
if((XML_NAMESPACE_OFFICE == nPrefix) && IsXMLToken(rLocalName, XML_BINARY_DATA))
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index fdf1e7056da3..4161694b66b1 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -448,7 +448,6 @@ private:
OUString maCLSID;
OUString maHref;
- // #100592#
::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream;
public:
@@ -464,7 +463,6 @@ public:
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE;
virtual void EndElement() SAL_OVERRIDE;
- // #100592#
virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName,
const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE;
diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx
index 0ddd4f57b852..6ec29e387146 100644
--- a/xmloff/source/meta/MetaImportComponent.cxx
+++ b/xmloff/source/meta/MetaImportComponent.cxx
@@ -29,7 +29,6 @@
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-// #110680#
XMLMetaImportComponent::XMLMetaImportComponent(
const uno::Reference< uno::XComponentContext >& xContext) throw()
: SvXMLImport(xContext, ""), mxDocProps()
@@ -91,7 +90,6 @@ uno::Reference< uno::XInterface > SAL_CALL XMLMetaImportComponent_createInstance
const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
throw( uno::Exception )
{
- // #110680#
return static_cast<cppu::OWeakObject*>(new XMLMetaImportComponent( comphelper::getComponentContext(rSMgr)));
}
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index fa316026add5..8812f8e7041b 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -39,7 +39,6 @@ using namespace ::com::sun::star;
const char XMLN_VERSIONSLIST[] = "VersionList.xml";
-// #110897#
XMLVersionListExport::XMLVersionListExport(
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext,
const com::sun::star::uno::Sequence < com::sun::star::util::RevisionTag >& rVersions,
diff --git a/xmloff/source/text/XMLChangeElementImportContext.cxx b/xmloff/source/text/XMLChangeElementImportContext.cxx
index 08420ec92e90..8ec1685882b2 100644
--- a/xmloff/source/text/XMLChangeElementImportContext.cxx
+++ b/xmloff/source/text/XMLChangeElementImportContext.cxx
@@ -82,7 +82,6 @@ SvXMLImportContext* XMLChangeElementImportContext::CreateChildContext(
return pContext;
}
-// #107848#
void XMLChangeElementImportContext::StartElement( const Reference< XAttributeList >& )
{
if(bAcceptContent)
@@ -91,7 +90,6 @@ void XMLChangeElementImportContext::StartElement( const Reference< XAttributeLis
}
}
-// #107848#
void XMLChangeElementImportContext::EndElement()
{
if(bAcceptContent)
diff --git a/xmloff/source/text/XMLChangeElementImportContext.hxx b/xmloff/source/text/XMLChangeElementImportContext.hxx
index 92e9209a0f29..d6fb8333df61 100644
--- a/xmloff/source/text/XMLChangeElementImportContext.hxx
+++ b/xmloff/source/text/XMLChangeElementImportContext.hxx
@@ -76,12 +76,10 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList> & xAttrList) SAL_OVERRIDE;
- // #107848#
// Start- and EndElement are needed here to set the inside_deleted_section
// flag at the corresponding TextImportHelper
virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) SAL_OVERRIDE;
- // #107848#
virtual void EndElement() SAL_OVERRIDE;
};
diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
index 9129b62d28cf..108b49d55b47 100644
--- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
@@ -240,7 +240,6 @@ void XMLIndexBibliographyConfigurationContext::CreateAndInsert(bool)
{
if (aServices[i].equals(sFieldMaster_Bibliography))
// here we should use a method which compares in reverse order if available
- // #85282#
bFound = true;
else
i++;
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 4368407e05a0..df621d46812c 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -770,7 +770,6 @@ void XMLTextFrameContext_Impl::Create( bool /*bHRefOrBase64*/ )
}
}
- // #107848#
// Make adding the shape to Z-Ordering dependent from if we are
// inside a inside_deleted_section (redlining). That is necessary
// since the shape will be removed again later. It would lead to
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 0e014cc396f9..2374feec9f8e 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -563,7 +563,6 @@ struct XMLTextImportHelper::Impl
bool m_bOrganizerMode : 1;
bool m_bBodyContentStarted : 1;
- // #107848#
/// Are we inside a <text:deletion> element (deleted redline section)
bool m_bInsideDeleteContext : 1;
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 5ef925efbda9..be7ea98a9611 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2615,7 +2615,6 @@ XMLShapeExportFlags XMLTextParagraphExport::addTextFrameAttributes(
}
else
{
- // #92210#
nShapeFeatures |= XMLShapeExportFlags::NO_WS;
}