From a238b1f8d304bf1e2ffb357937f3ec888ee8ac89 Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Tue, 9 Feb 2016 18:16:42 +1100 Subject: Remove excess newlines A ridiculously fast way of doing this is: for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \ --exclude-dir=workdir --exclude-dir=instdir '^ {3,}' .) do perl -0777 -i -pe 's/^ {3,}/ /gm' $i done Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c Reviewed-on: https://gerrit.libreoffice.org/22224 Tested-by: Jenkins Reviewed-by: Chris Sherlock --- reportdesign/source/core/api/FixedLine.cxx | 1 - reportdesign/source/core/api/FixedText.cxx | 2 -- reportdesign/source/core/api/FormattedField.cxx | 1 - reportdesign/source/core/api/Function.cxx | 1 - reportdesign/source/core/api/ImageControl.cxx | 1 - reportdesign/source/core/api/ReportComponent.cxx | 1 - reportdesign/source/core/api/Shape.cxx | 2 -- reportdesign/source/core/api/Tools.cxx | 1 - reportdesign/source/core/api/services.cxx | 1 - reportdesign/source/core/inc/conditionupdater.hxx | 1 - reportdesign/source/core/sdr/RptModel.cxx | 4 ---- reportdesign/source/core/sdr/RptObject.cxx | 4 ---- reportdesign/source/core/sdr/RptObjectListener.cxx | 4 ---- reportdesign/source/core/sdr/RptPage.cxx | 3 --- reportdesign/source/core/sdr/UndoActions.cxx | 1 - reportdesign/source/core/sdr/UndoEnv.cxx | 4 ---- reportdesign/source/filter/xml/xmlAutoStyle.cxx | 1 - reportdesign/source/filter/xml/xmlExport.cxx | 1 - reportdesign/source/filter/xml/xmlFixedContent.cxx | 1 - reportdesign/source/filter/xml/xmlHelper.hxx | 1 - reportdesign/source/filter/xml/xmlImage.cxx | 2 -- reportdesign/source/filter/xml/xmlReport.cxx | 2 -- reportdesign/source/filter/xml/xmlSection.cxx | 1 - reportdesign/source/filter/xml/xmlStyleImport.cxx | 2 -- reportdesign/source/filter/xml/xmlfilter.cxx | 2 -- reportdesign/source/filter/xml/xmlfilter.hxx | 1 - reportdesign/source/ui/inc/ReportComponentHandler.hxx | 1 - reportdesign/source/ui/inc/ViewsWindow.hxx | 1 - reportdesign/source/ui/inc/metadata.hxx | 1 - reportdesign/source/ui/inspection/metadata.cxx | 2 -- reportdesign/source/ui/misc/RptUndo.cxx | 1 - reportdesign/source/ui/misc/rptuiservices.cxx | 1 - reportdesign/source/ui/misc/toolboxcontroller.cxx | 1 - reportdesign/source/ui/report/DesignView.cxx | 4 ---- reportdesign/source/ui/report/FixedTextColor.cxx | 3 --- reportdesign/source/ui/report/FormattedFieldBeautifier.cxx | 1 - reportdesign/source/ui/report/ReportController.cxx | 1 - reportdesign/source/ui/report/ReportControllerObserver.cxx | 7 ------- reportdesign/source/ui/report/ReportSection.cxx | 1 - reportdesign/source/ui/report/SectionView.cxx | 3 --- reportdesign/source/ui/report/ViewsWindow.cxx | 1 - reportdesign/source/ui/report/dlgedfac.cxx | 3 --- reportdesign/source/ui/report/dlgedfunc.cxx | 13 ------------- reportdesign/source/ui/report/propbrw.cxx | 7 ------- 44 files changed, 98 deletions(-) (limited to 'reportdesign/source') diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx index 8c2b7fc306ca..3adbba16ddda 100644 --- a/reportdesign/source/core/api/FixedLine.cxx +++ b/reportdesign/source/core/api/FixedLine.cxx @@ -566,7 +566,6 @@ void SAL_CALL OFixedLine::setPrintRepeatedValues( sal_Bool /*_printrepeatedvalue } - } // namespace reportdesign diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx index bbd1da439322..a58030bb346c 100644 --- a/reportdesign/source/core/api/FixedText.cxx +++ b/reportdesign/source/core/api/FixedText.cxx @@ -180,7 +180,6 @@ void SAL_CALL OFixedText::setDataField( const OUString& /*_datafield*/ ) throw ( } - sal_Bool SAL_CALL OFixedText::getPrintWhenGroupChange() throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -323,7 +322,6 @@ OUString SAL_CALL OFixedText::getShapeType( ) throw (uno::RuntimeException, std } - } // namespace reportdesign diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx index eefc18b4a774..04e078d6a747 100644 --- a/reportdesign/source/core/api/FormattedField.cxx +++ b/reportdesign/source/core/api/FormattedField.cxx @@ -212,7 +212,6 @@ void SAL_CALL OFormattedField::setConditionalPrintExpression( const OUString& _c } - // XCloneable uno::Reference< util::XCloneable > SAL_CALL OFormattedField::createClone( ) throw (uno::RuntimeException, std::exception) { diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx index 3210d6c379bf..e79decb3a943 100644 --- a/reportdesign/source/core/api/Function.cxx +++ b/reportdesign/source/core/api/Function.cxx @@ -201,7 +201,6 @@ void SAL_CALL OFunction::setParent( const uno::Reference< uno::XInterface >& Par } - } // namespace reportdesign diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx index 92bd06598397..faf823eabafa 100644 --- a/reportdesign/source/core/api/ImageControl.cxx +++ b/reportdesign/source/core/api/ImageControl.cxx @@ -334,7 +334,6 @@ void SAL_CALL OImageControl::setConditionalPrintExpression( const OUString& _con } - // XCloneable uno::Reference< util::XCloneable > SAL_CALL OImageControl::createClone( ) throw (uno::RuntimeException, std::exception) { diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx index 2d474f168049..f66e5e97d52f 100644 --- a/reportdesign/source/core/api/ReportComponent.cxx +++ b/reportdesign/source/core/api/ReportComponent.cxx @@ -135,5 +135,4 @@ OReportComponentProperties::~OReportComponentProperties() } // namespace reportdesign - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx index 0ff1778939fe..5b37df61d77e 100644 --- a/reportdesign/source/core/api/Shape.cxx +++ b/reportdesign/source/core/api/Shape.cxx @@ -505,8 +505,6 @@ void SAL_CALL OShape::setCustomShapeGeometry( const uno::Sequence< beans::Proper } - - }// namespace reportdesign diff --git a/reportdesign/source/core/api/Tools.cxx b/reportdesign/source/core/api/Tools.cxx index 94ee95709733..e4350305d84c 100644 --- a/reportdesign/source/core/api/Tools.cxx +++ b/reportdesign/source/core/api/Tools.cxx @@ -62,7 +62,6 @@ uno::Reference< util::XCloneable > cloneObject(const uno::Reference< report::XRe } - } // namespace reportdesign diff --git a/reportdesign/source/core/api/services.cxx b/reportdesign/source/core/api/services.cxx index 7f499f2ff12d..0b1260b60f0e 100644 --- a/reportdesign/source/core/api/services.cxx +++ b/reportdesign/source/core/api/services.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; - // registry functions namespace { diff --git a/reportdesign/source/core/inc/conditionupdater.hxx b/reportdesign/source/core/inc/conditionupdater.hxx index e1e6e82f16f9..7e6e0dc50ddf 100644 --- a/reportdesign/source/core/inc/conditionupdater.hxx +++ b/reportdesign/source/core/inc/conditionupdater.hxx @@ -32,7 +32,6 @@ namespace rptui { - //= ConditionUpdater class ConditionUpdater : public ::boost::noncopyable diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx index 797441b6945c..9de5227d1c8b 100644 --- a/reportdesign/source/core/sdr/RptModel.cxx +++ b/reportdesign/source/core/sdr/RptModel.cxx @@ -45,7 +45,6 @@ using namespace reportdesign; using namespace com::sun::star; - OReportModel::OReportModel(::reportdesign::OReportDefinition* _pReportDefinition) : SdrModel(SvtPathOptions().GetPalettePath(),nullptr,_pReportDefinition, false, false) ,m_pController(nullptr) @@ -79,7 +78,6 @@ SdrPage* OReportModel::AllocPage(bool /*bMasterPage*/) } - void OReportModel::SetChanged( bool bChanged ) { SdrModel::SetChanged( bChanged ); @@ -87,8 +85,6 @@ void OReportModel::SetChanged( bool bChanged ) } - - void OReportModel::SetModified(bool _bModified) { if ( m_pController ) diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index c7fd48ffec2b..00c6d9898c28 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -576,8 +576,6 @@ void OCustomShape::impl_setUnoShape( const uno::Reference< uno::XInterface >& rx } - - OUnoObject::OUnoObject(const OUString& _sComponentName ,const OUString& rModelName ,sal_uInt16 _nObjectType) @@ -705,7 +703,6 @@ void OUnoObject::NbcMove( const Size& rSize ) } - void OUnoObject::NbcResize(const Point& rRef, const Fraction& xFract, const Fraction& yFract) { SdrUnoObj::NbcResize( rRef, xFract, yFract ); @@ -991,7 +988,6 @@ void OOle2Obj::NbcMove( const Size& rSize ) } - void OOle2Obj::NbcResize(const Point& rRef, const Fraction& xFract, const Fraction& yFract) { SdrOle2Obj::NbcResize( rRef, xFract, yFract ); diff --git a/reportdesign/source/core/sdr/RptObjectListener.cxx b/reportdesign/source/core/sdr/RptObjectListener.cxx index efee1a77273c..563a9fcf5d98 100644 --- a/reportdesign/source/core/sdr/RptObjectListener.cxx +++ b/reportdesign/source/core/sdr/RptObjectListener.cxx @@ -26,14 +26,12 @@ namespace rptui // OObjectListener - OObjectListener::OObjectListener(OObjectBase* _pObject) :m_pObject(_pObject) { } - OObjectListener::~OObjectListener() { } @@ -54,8 +52,6 @@ void SAL_CALL OObjectListener::propertyChange( const css::beans::PropertyChange } - - // DlgEdHint diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx index c374cb30aef3..9cf104983180 100644 --- a/reportdesign/source/core/sdr/RptPage.cxx +++ b/reportdesign/source/core/sdr/RptPage.cxx @@ -40,7 +40,6 @@ OReportPage::OReportPage( OReportModel& _rModel } - OReportPage::OReportPage( const OReportPage& rPage ) :SdrPage( rPage ) ,rModel(rPage.rModel) @@ -51,13 +50,11 @@ OReportPage::OReportPage( const OReportPage& rPage ) } - OReportPage::~OReportPage() { } - SdrPage* OReportPage::Clone() const { return Clone(nullptr); diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index 90bfc195c1c2..c029bae1a6f4 100644 --- a/reportdesign/source/core/sdr/UndoActions.cxx +++ b/reportdesign/source/core/sdr/UndoActions.cxx @@ -82,7 +82,6 @@ namespace rptui } - OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod,sal_uInt16 nCommentID) :SdrUndoAction(_rMod) { diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index b24dcb3739a5..c2ad558b7f27 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -61,7 +61,6 @@ namespace rptui using namespace report; - struct PropertyInfo { bool bIsReadonlyOrTransient; @@ -89,7 +88,6 @@ struct ObjectInfo typedef ::std::map< Reference< XPropertySet >, ObjectInfo, ::comphelper::OInterfaceCompare< XPropertySet > > PropertySetInfoCache; - class OXUndoEnvironmentImpl: private boost::noncopyable { public: @@ -117,7 +115,6 @@ OXUndoEnvironmentImpl::OXUndoEnvironmentImpl(OReportModel& _rModel) : m_rModel(_ } - OXUndoEnvironment::OXUndoEnvironment(OReportModel& _rModel) :m_pImpl(new OXUndoEnvironmentImpl(_rModel) ) { @@ -542,7 +539,6 @@ void OXUndoEnvironment::TogglePropertyListening(const Reference< XInterface > & } - void OXUndoEnvironment::switchListening( const Reference< XIndexAccess >& _rxContainer, bool _bStartListening ) { OSL_PRECOND( _rxContainer.is(), "OXUndoEnvironment::switchListening: invalid container!" ); diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.cxx b/reportdesign/source/filter/xml/xmlAutoStyle.cxx index 500ca9715530..837db62b36f8 100644 --- a/reportdesign/source/filter/xml/xmlAutoStyle.cxx +++ b/reportdesign/source/filter/xml/xmlAutoStyle.cxx @@ -80,7 +80,6 @@ OXMLAutoStylePoolP::~OXMLAutoStylePoolP() } - } // namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index ad723749fc9b..b1e901779d6f 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -155,7 +155,6 @@ namespace rptxml } - class OSpecialHandleXMLExportPropertyMapper : public SvXMLExportPropertyMapper { public: diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index 82df4ab0660c..4f89a2acf3a1 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -106,7 +106,6 @@ void OXMLCharContent::InsertString(const OUString& _sString) } - OXMLFixedContent::OXMLFixedContent( ORptFilter& rImport, sal_uInt16 nPrfx, const OUString& rLName ,OXMLCell& _rCell diff --git a/reportdesign/source/filter/xml/xmlHelper.hxx b/reportdesign/source/filter/xml/xmlHelper.hxx index cd901bd67af3..01f164b2a92d 100644 --- a/reportdesign/source/filter/xml/xmlHelper.hxx +++ b/reportdesign/source/filter/xml/xmlHelper.hxx @@ -31,7 +31,6 @@ #define CTF_RPT_NUMBERFORMAT (XML_DB_CTF_START + 1) - class SvXMLStylesContext; class SvXMLTokenMap; namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx index 9564825c606d..7133cd9f6a6b 100644 --- a/reportdesign/source/filter/xml/xmlImage.cxx +++ b/reportdesign/source/filter/xml/xmlImage.cxx @@ -39,7 +39,6 @@ namespace rptxml using namespace ::com::sun::star::xml::sax; - OXMLImage::OXMLImage( ORptFilter& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList > & _xAttrList @@ -112,7 +111,6 @@ OXMLImage::~OXMLImage() } - } // namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx index 36d8fdf3658b..abd6fbbf03b6 100644 --- a/reportdesign/source/filter/xml/xmlReport.cxx +++ b/reportdesign/source/filter/xml/xmlReport.cxx @@ -109,7 +109,6 @@ OXMLReport::~OXMLReport() } - void OXMLReport::impl_initRuntimeDefaults() const { OSL_PRECOND( m_xComponent.is(), "OXMLReport::impl_initRuntimeDefaults: no component!" ); @@ -127,7 +126,6 @@ void OXMLReport::impl_initRuntimeDefaults() const } - SvXMLImportContext* OXMLReport::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx index 0119d239f1d0..9c8e41df34a0 100644 --- a/reportdesign/source/filter/xml/xmlSection.cxx +++ b/reportdesign/source/filter/xml/xmlSection.cxx @@ -50,7 +50,6 @@ namespace rptxml } - OXMLSection::OXMLSection( ORptFilter& rImport, sal_uInt16 nPrfx, const OUString& _sLocalName, const uno::Reference< xml::sax::XAttributeList > & _xAttrList diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx index 2edc59fb7cc8..2888c8b36cb3 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.cxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx @@ -48,7 +48,6 @@ using namespace ::com::sun::star::container; using namespace xmloff::token; - class OSpecialHanldeXMLImportPropertyMapper : public SvXMLImportPropertyMapper { public: @@ -146,7 +145,6 @@ void OControlStyleContext::SetAttribute( sal_uInt16 nPrefixKey, } - OReportStylesContext::OReportStylesContext( ORptFilter& rImport, sal_uInt16 nPrfx , const OUString& rLName , diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 5335864c5f2a..db17d7e1ad50 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -351,7 +351,6 @@ Sequence< OUString > ORptMetaImportHelper::getSupportedServiceNames_Static( ) t } - ORptFilter::ORptFilter( const uno::Reference< XComponentContext >& _rxContext, SvXMLImportFlags nImportFlags ) :SvXMLImport(_rxContext, getImplementationName_Static(), nImportFlags) { @@ -373,7 +372,6 @@ ORptFilter::ORptFilter( const uno::Reference< XComponentContext >& _rxContext, S } - ORptFilter::~ORptFilter() throw() { } diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx index d6134eb9023c..24a47dd8bba4 100644 --- a/reportdesign/source/filter/xml/xmlfilter.hxx +++ b/reportdesign/source/filter/xml/xmlfilter.hxx @@ -60,7 +60,6 @@ using namespace ::com::sun::star::report; using namespace ::com::sun::star::xml::sax; - class ORptFilter : public SvXMLImport { public: diff --git a/reportdesign/source/ui/inc/ReportComponentHandler.hxx b/reportdesign/source/ui/inc/ReportComponentHandler.hxx index be013a6e8ed7..d91a6cc23fe2 100644 --- a/reportdesign/source/ui/inc/ReportComponentHandler.hxx +++ b/reportdesign/source/ui/inc/ReportComponentHandler.hxx @@ -87,7 +87,6 @@ namespace rptui void operator =(ReportComponentHandler &) = delete; - // override WeakComponentImplHelperBase::disposing() // This function is called upon disposing the component, // if your component needs special work when it becomes diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index 29b50ab86882..385e1d898982 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -44,7 +44,6 @@ namespace rptui class OSectionView; - struct RectangleLess : public ::std::binary_function< Rectangle, Rectangle, bool> { enum CompareMode { POS_LEFT,POS_RIGHT,POS_UPPER,POS_DOWN,POS_CENTER_HORIZONTAL,POS_CENTER_VERTICAL }; diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx index 9f43de7cc73d..3f980ab74e85 100644 --- a/reportdesign/source/ui/inc/metadata.hxx +++ b/reportdesign/source/ui/inc/metadata.hxx @@ -144,7 +144,6 @@ namespace rptui #define PROPERTY_ID_VERTICALALIGN 42 - } // namespace rptui diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index e8cf8cf221e4..6cff81182202 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -201,7 +201,6 @@ namespace rptui } - const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo(sal_Int32 _nId) { // intialisierung @@ -303,7 +302,6 @@ namespace rptui } - } // namespace pcr diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx index 70a7b4328e73..dd08cb65273e 100644 --- a/reportdesign/source/ui/misc/RptUndo.cxx +++ b/reportdesign/source/ui/misc/RptUndo.cxx @@ -394,5 +394,4 @@ void OGroupUndo::Redo() } // rptui - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/misc/rptuiservices.cxx b/reportdesign/source/ui/misc/rptuiservices.cxx index 2715df93b3b9..e7e8440cc51d 100644 --- a/reportdesign/source/ui/misc/rptuiservices.cxx +++ b/reportdesign/source/ui/misc/rptuiservices.cxx @@ -35,7 +35,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; - // registry functions namespace { diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index 6589bf28e5ec..95eaccae5092 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -277,5 +277,4 @@ throw (uno::RuntimeException, std::exception) } // rptui - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index b15399dcf340..eb2cdb072f2e 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -303,8 +303,6 @@ OUString ODesignView::GetInsertObjString() const } - - void ODesignView::Cut() { Copy(); @@ -312,14 +310,12 @@ void ODesignView::Cut() } - void ODesignView::Copy() { m_aScrollWindow->Copy(); } - void ODesignView::Paste() { m_aScrollWindow->Paste(); diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx index b0ef99ae216a..21fbaa477435 100644 --- a/reportdesign/source/ui/report/FixedTextColor.cxx +++ b/reportdesign/source/ui/report/FixedTextColor.cxx @@ -150,7 +150,6 @@ namespace rptui } - // XPropertyChangeListener uno::Reference FixedTextColor::getXControl(const uno::Reference< report::XFixedText >& _xFixedText) throw(uno::RuntimeException) { @@ -196,8 +195,6 @@ namespace rptui } - - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx index ab8d82491255..649d7fc6a39d 100644 --- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx +++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx @@ -47,7 +47,6 @@ namespace rptui using namespace ::com::sun::star; - FormattedFieldBeautifier::FormattedFieldBeautifier(const OReportController& _aController) :m_rReportController(_aController) ,m_nTextColor(-1) diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 05d22cedf130..6a70c7109138 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -4214,7 +4214,6 @@ OSectionWindow* OReportController::getSectionWindow(const css::uno::Reference< c } - void OReportController::openZoomDialog() { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index 6916809e8230..c9596b290708 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -60,7 +60,6 @@ public: }; - OXReportControllerObserverImpl::OXReportControllerObserverImpl() :m_nLocks(0) ,m_bReadOnly(false) @@ -68,10 +67,6 @@ public: } - - - - OXReportControllerObserver::OXReportControllerObserver(const OReportController& _rController) :m_pImpl(new OXReportControllerObserverImpl ) ,m_aFormattedFieldBeautifier(_rController) @@ -246,7 +241,6 @@ void OXReportControllerObserver::TogglePropertyListening(const uno::Reference< u } - void OXReportControllerObserver::switchListening( const uno::Reference< container::XIndexAccess >& _rxContainer, bool _bStartListening ) { OSL_PRECOND( _rxContainer.is(), "OXReportControllerObserver::switchListening: invalid container!" ); @@ -408,5 +402,4 @@ void SAL_CALL OXReportControllerObserver::elementRemoved(const container::Contai } // namespace rptui - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index a4e96364610f..3e87c0f64da8 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -402,7 +402,6 @@ void OReportSection::MouseButtonUp( const MouseEvent& rMEvt ) } - void OReportSection::MouseMove( const MouseEvent& rMEvt ) { m_pFunc->MouseMove( rMEvt ); diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx index 810db1386e8b..bb01d282d17e 100644 --- a/reportdesign/source/ui/report/SectionView.cxx +++ b/reportdesign/source/ui/report/SectionView.cxx @@ -49,13 +49,11 @@ OSectionView::OSectionView( SdrModel* pModel, OReportSection* _pSectionWindow, O } - OSectionView::~OSectionView() { } - void OSectionView::MarkListHasChanged() { SdrView::MarkListHasChanged(); @@ -69,7 +67,6 @@ void OSectionView::MarkListHasChanged() } - void OSectionView::MakeVisible( const Rectangle& rRect, vcl::Window& rWin ) { // visible area diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 59d92af9209e..7d71809713cb 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -362,7 +362,6 @@ void OViewsWindow::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType ) } - void OViewsWindow::SetMode( DlgEdMode eNewMode ) { ::std::for_each(m_aSections.begin(),m_aSections.end(), diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx index 57d470256c8f..f1c57ca559e2 100644 --- a/reportdesign/source/ui/report/dlgedfac.cxx +++ b/reportdesign/source/ui/report/dlgedfac.cxx @@ -31,21 +31,18 @@ namespace rptui using namespace ::com::sun::star; - DlgEdFactory::DlgEdFactory() { SdrObjFactory::InsertMakeObjectHdl( LINK(this, DlgEdFactory, MakeObject) ); } - DlgEdFactory::~DlgEdFactory() { SdrObjFactory::RemoveMakeObjectHdl( LINK(this, DlgEdFactory, MakeObject) ); } - IMPL_STATIC_LINK_TYPED( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory, void ) { diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index cd743ae9dfa5..a8f7cede94d1 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -60,15 +60,12 @@ namespace rptui using namespace ::com::sun::star; - - IMPL_LINK_NOARG_TYPED( DlgEdFunc, ScrollTimeout, Timer *, void ) { ForceScroll( m_pParent->PixelToLogic( m_pParent->GetPointerPosPixel() ) ); } - void DlgEdFunc::ForceScroll( const Point& rPos ) { aScrollTimer.Stop(); @@ -163,7 +160,6 @@ DlgEdFunc::~DlgEdFunc() } - bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt ) { m_aMDPos = m_pParent->PixelToLogic( rMEvt.GetPosPixel() ); @@ -223,7 +219,6 @@ bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt ) } - bool DlgEdFunc::MouseButtonUp( const MouseEvent& /*rMEvt*/ ) { bool bHandled = false; @@ -653,14 +648,12 @@ DlgEdFuncInsert::DlgEdFuncInsert( OReportSection* _pParent ) : } - DlgEdFuncInsert::~DlgEdFuncInsert() { m_rView.SetEditMode(); } - bool DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt ) { if ( DlgEdFunc::MouseButtonDown(rMEvt) ) @@ -754,7 +747,6 @@ bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt ) } - bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt ) { if ( DlgEdFunc::MouseMove(rMEvt ) ) @@ -790,20 +782,17 @@ bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt ) } - DlgEdFuncSelect::DlgEdFuncSelect( OReportSection* _pParent ) : DlgEdFunc( _pParent ) { } - DlgEdFuncSelect::~DlgEdFuncSelect() { } - bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt ) { m_bSelectionMode = false; @@ -849,7 +838,6 @@ bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt ) } - bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt ) { if ( DlgEdFunc::MouseButtonUp( rMEvt ) ) @@ -873,7 +861,6 @@ bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt ) } - bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt ) { if ( DlgEdFunc::MouseMove(rMEvt ) ) diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index a11250bbf968..77a6c077939b 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -68,7 +68,6 @@ using namespace container; using namespace ::comphelper; - namespace { static bool lcl_shouldEnableHelpSection( const Reference< XComponentContext >& _rxContext ) @@ -87,9 +86,6 @@ namespace // PropBrw - - - PropBrw::PropBrw(const Reference< XComponentContext >& _xORB, vcl::Window* pParent, ODesignView* _pDesignView) :DockingWindow(pParent,WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_3DLOOK|WB_ROLLABLE)) ,m_xORB(_xORB) @@ -180,7 +176,6 @@ PropBrw::PropBrw(const Reference< XComponentContext >& _xORB, vcl::Window* pPare } - PropBrw::~PropBrw() { disposeOnce(); @@ -282,7 +277,6 @@ bool PropBrw::Close() } - uno::Sequence< Reference > PropBrw::CreateCompPropSet(const SdrMarkList& _rMarkList) { const size_t nMarkCount = _rMarkList.GetMarkCount(); @@ -331,7 +325,6 @@ void PropBrw::implSetNewObject( const uno::Sequence< Reference } - OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference >& _aObjects ) { OUString aName; -- cgit