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 --- extensions/source/propctrlr/browserlistbox.cxx | 1 - extensions/source/propctrlr/browserview.hxx | 1 - extensions/source/propctrlr/composeduiupdate.cxx | 1 - extensions/source/propctrlr/defaulthelpprovider.hxx | 1 - extensions/source/propctrlr/editpropertyhandler.hxx | 1 - extensions/source/propctrlr/enumrepresentation.hxx | 1 - extensions/source/propctrlr/eventhandler.hxx | 1 - extensions/source/propctrlr/fontdialog.cxx | 2 -- extensions/source/propctrlr/fontdialog.hxx | 1 - extensions/source/propctrlr/formcomponenthandler.cxx | 2 -- extensions/source/propctrlr/formcomponenthandler.hxx | 1 - extensions/source/propctrlr/formcontroller.hxx | 1 - extensions/source/propctrlr/formlinkdialog.cxx | 1 - extensions/source/propctrlr/formmetadata.cxx | 1 - extensions/source/propctrlr/handlerhelper.hxx | 1 - extensions/source/propctrlr/inspectorhelpwindow.hxx | 1 - extensions/source/propctrlr/linedescriptor.hxx | 1 - extensions/source/propctrlr/newdatatype.cxx | 1 - extensions/source/propctrlr/objectinspectormodel.cxx | 1 - extensions/source/propctrlr/pcrunodialogs.cxx | 2 -- extensions/source/propctrlr/pcrunodialogs.hxx | 1 - extensions/source/propctrlr/propcontroller.cxx | 2 -- extensions/source/propctrlr/propcontrolobserver.hxx | 1 - extensions/source/propctrlr/propertycomposer.hxx | 1 - extensions/source/propctrlr/propertycontrolextender.cxx | 1 - extensions/source/propctrlr/propertycontrolextender.hxx | 1 - extensions/source/propctrlr/propertyeditor.cxx | 3 --- extensions/source/propctrlr/propertyinfo.hxx | 1 - extensions/source/propctrlr/propeventtranslation.hxx | 1 - extensions/source/propctrlr/proplinelistener.hxx | 1 - extensions/source/propctrlr/pushbuttonnavigation.hxx | 1 - extensions/source/propctrlr/selectlabeldialog.hxx | 1 - extensions/source/propctrlr/standardcontrol.hxx | 1 - extensions/source/propctrlr/stringrepresentation.cxx | 1 - extensions/source/propctrlr/submissionhandler.hxx | 1 - extensions/source/propctrlr/taborder.hxx | 2 -- extensions/source/propctrlr/unourl.hxx | 1 - extensions/source/propctrlr/usercontrol.hxx | 1 - extensions/source/propctrlr/xsddatatypes.hxx | 1 - 39 files changed, 46 deletions(-) (limited to 'extensions/source/propctrlr') diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 76bc7941064d..0c14e3f5aeb3 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -1276,5 +1276,4 @@ namespace pcr } // namespace pcr - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx index 7e09dd24ff44..5be841cc2faa 100644 --- a/extensions/source/propctrlr/browserview.hxx +++ b/extensions/source/propctrlr/browserview.hxx @@ -64,7 +64,6 @@ namespace pcr }; - } // namespace pcr diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx index be669773863f..8181405d8411 100644 --- a/extensions/source/propctrlr/composeduiupdate.cxx +++ b/extensions/source/propctrlr/composeduiupdate.cxx @@ -223,7 +223,6 @@ namespace pcr } - void CachedInspectorUI::checkDisposed() const { if ( isDisposed() ) diff --git a/extensions/source/propctrlr/defaulthelpprovider.hxx b/extensions/source/propctrlr/defaulthelpprovider.hxx index e1b1c6a59f9a..0bac31f580c3 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.hxx +++ b/extensions/source/propctrlr/defaulthelpprovider.hxx @@ -34,7 +34,6 @@ namespace pcr { - //= DefaultHelpProvider typedef ::cppu::WeakImplHelper < css::inspection::XPropertyControlObserver diff --git a/extensions/source/propctrlr/editpropertyhandler.hxx b/extensions/source/propctrlr/editpropertyhandler.hxx index e8e04da8f641..a7fe7a551f2e 100644 --- a/extensions/source/propctrlr/editpropertyhandler.hxx +++ b/extensions/source/propctrlr/editpropertyhandler.hxx @@ -27,7 +27,6 @@ namespace pcr { - //= EditPropertyHandler class EditPropertyHandler; diff --git a/extensions/source/propctrlr/enumrepresentation.hxx b/extensions/source/propctrlr/enumrepresentation.hxx index fe8d7da6e9af..f88ae0365e67 100644 --- a/extensions/source/propctrlr/enumrepresentation.hxx +++ b/extensions/source/propctrlr/enumrepresentation.hxx @@ -32,7 +32,6 @@ namespace pcr { - //= IPropertyEnumRepresentation class SAL_NO_VTABLE IPropertyEnumRepresentation : public salhelper::SimpleReferenceObject diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx index fb4e0befc9f9..e33c6f3f2e32 100644 --- a/extensions/source/propctrlr/eventhandler.hxx +++ b/extensions/source/propctrlr/eventhandler.hxx @@ -37,7 +37,6 @@ namespace pcr { - //= EventDescription typedef sal_Int32 EventId; diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index 21ccc921856d..4d73a202a2e8 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -396,7 +396,6 @@ namespace pcr } - // font wordline mode eState = _rSet.GetItemState(CFID_WORDLINEMODE); @@ -409,7 +408,6 @@ namespace pcr } - // text color eState = _rSet.GetItemState(CFID_CHARCOLOR); diff --git a/extensions/source/propctrlr/fontdialog.hxx b/extensions/source/propctrlr/fontdialog.hxx index 458905115fe2..707a35e4d2f8 100644 --- a/extensions/source/propctrlr/fontdialog.hxx +++ b/extensions/source/propctrlr/fontdialog.hxx @@ -29,7 +29,6 @@ namespace pcr { - //= ControlCharacterDialog class ControlCharacterDialog : public SfxTabDialog diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index f0602f9fc02b..b544f622c4f2 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -993,7 +993,6 @@ namespace pcr } - LineDescriptor aDescriptor; aDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) ); aDescriptor.DisplayName = sDisplayName; @@ -1004,7 +1003,6 @@ namespace pcr aDescriptor.Control.clear(); - bool bNeedDefaultStringIfVoidAllowed = false; TypeClass eType = aProperty.Type.getTypeClass(); diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx index c6f7586104e3..b3e6c76504a8 100644 --- a/extensions/source/propctrlr/formcomponenthandler.hxx +++ b/extensions/source/propctrlr/formcomponenthandler.hxx @@ -42,7 +42,6 @@ namespace pcr { - //= ComponentClassification enum ComponentClassification diff --git a/extensions/source/propctrlr/formcontroller.hxx b/extensions/source/propctrlr/formcontroller.hxx index 49decd0f0a81..b08276bef45a 100644 --- a/extensions/source/propctrlr/formcontroller.hxx +++ b/extensions/source/propctrlr/formcontroller.hxx @@ -30,7 +30,6 @@ namespace pcr { - //= ServiceDescriptor struct ServiceDescriptor diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index c499dcb6b72e..fbd6eb28fd6f 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -46,7 +46,6 @@ #include - namespace pcr { diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index 8bb948ff06b5..8df6deee9e15 100644 --- a/extensions/source/propctrlr/formmetadata.cxx +++ b/extensions/source/propctrlr/formmetadata.cxx @@ -549,7 +549,6 @@ namespace pcr } - const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo(sal_Int32 _nId) { // Initialization diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx index afe4c0cf44af..ada62ff30687 100644 --- a/extensions/source/propctrlr/handlerhelper.hxx +++ b/extensions/source/propctrlr/handlerhelper.hxx @@ -41,7 +41,6 @@ namespace pcr { - //= PropertyHandlerHelper class PropertyHandlerHelper diff --git a/extensions/source/propctrlr/inspectorhelpwindow.hxx b/extensions/source/propctrlr/inspectorhelpwindow.hxx index 1b27429a9323..11ba385a040e 100644 --- a/extensions/source/propctrlr/inspectorhelpwindow.hxx +++ b/extensions/source/propctrlr/inspectorhelpwindow.hxx @@ -27,7 +27,6 @@ namespace pcr { - //= InspectorHelpWindow class InspectorHelpWindow : public vcl::Window diff --git a/extensions/source/propctrlr/linedescriptor.hxx b/extensions/source/propctrlr/linedescriptor.hxx index 2f1f564fc465..00b4e37fec23 100644 --- a/extensions/source/propctrlr/linedescriptor.hxx +++ b/extensions/source/propctrlr/linedescriptor.hxx @@ -27,7 +27,6 @@ namespace pcr { - //= OLineDescriptor struct OLineDescriptor : public css::inspection::LineDescriptor diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx index 64c69c2087ef..d7c6d2041971 100644 --- a/extensions/source/propctrlr/newdatatype.cxx +++ b/extensions/source/propctrlr/newdatatype.cxx @@ -25,7 +25,6 @@ namespace pcr { - //= NewDataTypeDialog diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx index a31a5bcbe912..65b60ab8c10a 100644 --- a/extensions/source/propctrlr/objectinspectormodel.cxx +++ b/extensions/source/propctrlr/objectinspectormodel.cxx @@ -220,7 +220,6 @@ namespace pcr } // namespace pcr - extern "C" void SAL_CALL createRegistryInfo_ObjectInspectorModel() { ::pcr::OAutoRegistration< ::pcr::ObjectInspectorModel > aObjectInspectorModelRegistration; diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx index d45d3e5d3a22..d14964f58416 100644 --- a/extensions/source/propctrlr/pcrunodialogs.cxx +++ b/extensions/source/propctrlr/pcrunodialogs.cxx @@ -162,8 +162,6 @@ namespace pcr } - - } // namespace pcr diff --git a/extensions/source/propctrlr/pcrunodialogs.hxx b/extensions/source/propctrlr/pcrunodialogs.hxx index 15499438f091..65db4dd16f37 100644 --- a/extensions/source/propctrlr/pcrunodialogs.hxx +++ b/extensions/source/propctrlr/pcrunodialogs.hxx @@ -29,7 +29,6 @@ namespace pcr { - //= OTabOrderDialog class OTabOrderDialog; diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 80a24fdd3abd..7a478149a8cc 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -1141,7 +1141,6 @@ namespace pcr _rDescriptor.assignFrom( handler->second->describePropertyLine( _rProperty.Name, this ) ); - _rDescriptor.xPropertyHandler = handler->second; _rDescriptor.sName = _rProperty.Name; _rDescriptor.aValue = _rDescriptor.xPropertyHandler->getPropertyValue( _rProperty.Name ); @@ -1747,5 +1746,4 @@ namespace pcr } // namespace pcr - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propcontrolobserver.hxx b/extensions/source/propctrlr/propcontrolobserver.hxx index 61ba188e72fa..982e812475b3 100644 --- a/extensions/source/propctrlr/propcontrolobserver.hxx +++ b/extensions/source/propctrlr/propcontrolobserver.hxx @@ -26,7 +26,6 @@ namespace pcr { - //= IPropertyControlObserver /** non-UNO version of the XPropertyControlObserver diff --git a/extensions/source/propctrlr/propertycomposer.hxx b/extensions/source/propctrlr/propertycomposer.hxx index a05298b40746..5d86adc8e502 100644 --- a/extensions/source/propctrlr/propertycomposer.hxx +++ b/extensions/source/propctrlr/propertycomposer.hxx @@ -41,7 +41,6 @@ namespace pcr { - //= PropertyComposer typedef ::cppu::WeakComponentImplHelper < css::inspection::XPropertyHandler diff --git a/extensions/source/propctrlr/propertycontrolextender.cxx b/extensions/source/propctrlr/propertycontrolextender.cxx index 6f90086f9695..3c9cfc39d69c 100644 --- a/extensions/source/propctrlr/propertycontrolextender.cxx +++ b/extensions/source/propctrlr/propertycontrolextender.cxx @@ -126,7 +126,6 @@ namespace pcr } - } // namespace pcr diff --git a/extensions/source/propctrlr/propertycontrolextender.hxx b/extensions/source/propctrlr/propertycontrolextender.hxx index efdcb18e59ee..aa615184f77c 100644 --- a/extensions/source/propctrlr/propertycontrolextender.hxx +++ b/extensions/source/propctrlr/propertycontrolextender.hxx @@ -32,7 +32,6 @@ namespace pcr { - //= PropertyControlExtender struct PropertyControlExtender_Data; diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index 095fd326da14..0d7113cc1d34 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -344,8 +344,6 @@ namespace pcr } - - void OPropertyEditor::SetHelpText( const OUString& _rHelpText ) { sal_uInt16 nCount = m_aTabControl->GetPageCount(); @@ -532,5 +530,4 @@ namespace pcr } // namespace pcr - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/propctrlr/propertyinfo.hxx b/extensions/source/propctrlr/propertyinfo.hxx index dc5dba484fe9..7b1ee3b2b2de 100644 --- a/extensions/source/propctrlr/propertyinfo.hxx +++ b/extensions/source/propctrlr/propertyinfo.hxx @@ -30,7 +30,6 @@ namespace pcr { - //= IPropertyInfoService class SAL_NO_VTABLE IPropertyInfoService diff --git a/extensions/source/propctrlr/propeventtranslation.hxx b/extensions/source/propctrlr/propeventtranslation.hxx index 0eff3c10a42b..dcf52e4d10b2 100644 --- a/extensions/source/propctrlr/propeventtranslation.hxx +++ b/extensions/source/propctrlr/propeventtranslation.hxx @@ -28,7 +28,6 @@ namespace pcr { - //= PropertyEventTranslation typedef ::cppu::WeakImplHelper < css::beans::XPropertyChangeListener diff --git a/extensions/source/propctrlr/proplinelistener.hxx b/extensions/source/propctrlr/proplinelistener.hxx index 447f3c99ee75..cd9ee5f3fca3 100644 --- a/extensions/source/propctrlr/proplinelistener.hxx +++ b/extensions/source/propctrlr/proplinelistener.hxx @@ -27,7 +27,6 @@ namespace pcr { - class IPropertyLineListener { public: diff --git a/extensions/source/propctrlr/pushbuttonnavigation.hxx b/extensions/source/propctrlr/pushbuttonnavigation.hxx index a293c3ecb134..6a8ee54248bd 100644 --- a/extensions/source/propctrlr/pushbuttonnavigation.hxx +++ b/extensions/source/propctrlr/pushbuttonnavigation.hxx @@ -28,7 +28,6 @@ namespace pcr { - //= PushButtonNavigation class PushButtonNavigation diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx index 0d993c46c14e..36ede0e9d998 100644 --- a/extensions/source/propctrlr/selectlabeldialog.hxx +++ b/extensions/source/propctrlr/selectlabeldialog.hxx @@ -33,7 +33,6 @@ namespace pcr { - // OSelectLabelDialog class OSelectLabelDialog diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index 9988994041ae..a339c7112a72 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -44,7 +44,6 @@ namespace pcr { - //= ListLikeControlWithModifyHandler /** Very small helper class which adds a SetModifyHdl to a ListBox-derived class, diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx index 1be13ed9f42b..10618afd9feb 100644 --- a/extensions/source/propctrlr/stringrepresentation.cxx +++ b/extensions/source/propctrlr/stringrepresentation.cxx @@ -614,7 +614,6 @@ bool StringRepresentation::convertStringToGenericValue( const OUString& _rString } // pcr - // component helper namespace namespace comp_StringRepresentation { diff --git a/extensions/source/propctrlr/submissionhandler.hxx b/extensions/source/propctrlr/submissionhandler.hxx index 1969013405c7..7a64cc35ba07 100644 --- a/extensions/source/propctrlr/submissionhandler.hxx +++ b/extensions/source/propctrlr/submissionhandler.hxx @@ -36,7 +36,6 @@ namespace pcr { - //= SubmissionHelper class SubmissionHelper : public EFormsHelper diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx index 48decec8e889..c254ade89c9c 100644 --- a/extensions/source/propctrlr/taborder.hxx +++ b/extensions/source/propctrlr/taborder.hxx @@ -40,7 +40,6 @@ namespace pcr { - //= TabOrderListBox class TabOrderListBox : public SvTreeListBox @@ -59,7 +58,6 @@ namespace pcr }; - //= TabOrderDialog class TabOrderDialog : public ModalDialog diff --git a/extensions/source/propctrlr/unourl.hxx b/extensions/source/propctrlr/unourl.hxx index 5dccb7a860da..809d168ad494 100644 --- a/extensions/source/propctrlr/unourl.hxx +++ b/extensions/source/propctrlr/unourl.hxx @@ -28,7 +28,6 @@ namespace pcr { - //= UnoURL class UnoURL diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx index 2c21bf7cefaa..b320a9345040 100644 --- a/extensions/source/propctrlr/usercontrol.hxx +++ b/extensions/source/propctrlr/usercontrol.hxx @@ -32,7 +32,6 @@ namespace pcr { - //= NumberFormatSampleField class NumberFormatSampleField : public FormattedField diff --git a/extensions/source/propctrlr/xsddatatypes.hxx b/extensions/source/propctrlr/xsddatatypes.hxx index b08c65eed05c..0732abb1f5ae 100644 --- a/extensions/source/propctrlr/xsddatatypes.hxx +++ b/extensions/source/propctrlr/xsddatatypes.hxx @@ -38,7 +38,6 @@ namespace pcr { - //= XSDDataType class XSDDataType : public salhelper::SimpleReferenceObject -- cgit