From 5b1337f7b2e1f79d78d4bf6559bd84f1ebb934bf Mon Sep 17 00:00:00 2001 From: Andrea Gelmini Date: Fri, 15 May 2015 13:27:19 +0200 Subject: tdf#62475: partial handmade fixes Change-Id: Ib9af202c43b916b9af4b4e18db35d470a8692fe4 Reviewed-on: https://gerrit.libreoffice.org/15712 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos --- svx/source/accessibility/AccessibleFrameSelector.cxx | 4 ++-- svx/source/accessibility/charmapacc.cxx | 2 +- svx/source/dialog/databaseregistrationui.cxx | 2 +- svx/source/dialog/dialcontrol.cxx | 2 +- svx/source/dialog/docrecovery.cxx | 4 ++-- svx/source/dialog/framelink.cxx | 4 ++-- svx/source/dialog/framelinkarray.cxx | 4 ++-- svx/source/dialog/frmdirlbox.cxx | 2 +- svx/source/dialog/frmsel.cxx | 2 +- svx/source/dialog/orienthelper.cxx | 2 +- svx/source/fmcomp/dbaexchange.cxx | 2 +- svx/source/fmcomp/dbaobjectex.cxx | 2 +- svx/source/fmcomp/xmlexchg.cxx | 2 +- svx/source/form/dataaccessdescriptor.cxx | 2 +- svx/source/form/databaselocationinput.cxx | 2 +- svx/source/form/datalistener.cxx | 2 +- svx/source/form/datanavi.cxx | 2 +- svx/source/form/dbcharsethelper.cxx | 4 ++-- svx/source/form/delayedevent.cxx | 2 +- svx/source/form/filtnav.cxx | 2 +- svx/source/form/fmcontrolbordermanager.cxx | 2 +- svx/source/form/fmcontrollayout.cxx | 2 +- svx/source/form/fmdocumentclassification.cxx | 2 +- svx/source/form/fmexpl.cxx | 2 +- svx/source/form/fmscriptingenv.cxx | 2 +- svx/source/form/fmservs.cxx | 2 +- svx/source/form/fmtextcontroldialogs.cxx | 2 +- svx/source/form/fmtextcontrolfeature.cxx | 2 +- svx/source/form/fmtextcontrolshell.cxx | 2 +- svx/source/form/formcontrolfactory.cxx | 2 +- svx/source/form/formcontroller.cxx | 2 +- svx/source/form/formcontrolling.cxx | 2 +- svx/source/form/formdispatchinterceptor.cxx | 2 +- svx/source/form/formfeaturedispatcher.cxx | 2 +- svx/source/form/formtoolbars.cxx | 2 +- svx/source/form/legacyformcontroller.cxx | 2 +- svx/source/form/navigatortree.cxx | 2 +- svx/source/form/navigatortreemodel.cxx | 2 +- svx/source/form/sdbdatacolumn.cxx | 2 +- svx/source/form/sqlparserclient.cxx | 2 +- svx/source/form/stringlistresource.cxx | 2 +- svx/source/form/xfm_addcondition.cxx | 2 +- svx/source/inc/AccessibleFrameSelector.hxx | 4 ++-- svx/source/inc/datalistener.hxx | 2 +- svx/source/inc/datanavi.hxx | 2 +- svx/source/inc/delayedevent.hxx | 2 +- svx/source/inc/docrecovery.hxx | 4 ++-- svx/source/inc/filtnav.hxx | 2 +- svx/source/inc/fmcontrolbordermanager.hxx | 2 +- svx/source/inc/fmcontrollayout.hxx | 2 +- svx/source/inc/fmdocumentclassification.hxx | 2 +- svx/source/inc/fmexch.hxx | 2 +- svx/source/inc/fmexpl.hxx | 2 +- svx/source/inc/fmscriptingenv.hxx | 2 +- svx/source/inc/fmslotinvalidator.hxx | 2 +- svx/source/inc/fmtextcontroldialogs.hxx | 2 +- svx/source/inc/fmtextcontrolfeature.hxx | 2 +- svx/source/inc/fmtextcontrolshell.hxx | 2 +- svx/source/inc/formcontrolfactory.hxx | 2 +- svx/source/inc/formcontroller.hxx | 2 +- svx/source/inc/formcontrolling.hxx | 2 +- svx/source/inc/formdispatchinterceptor.hxx | 2 +- svx/source/inc/formfeaturedispatcher.hxx | 2 +- svx/source/inc/formtoolbars.hxx | 2 +- svx/source/inc/frmselimpl.hxx | 2 +- svx/source/inc/sdbdatacolumn.hxx | 2 +- svx/source/inc/sqlparserclient.hxx | 2 +- svx/source/inc/stringlistresource.hxx | 2 +- svx/source/inc/xfm_addcondition.hxx | 2 +- svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx | 2 +- svx/source/tbxctrls/tbxcolor.cxx | 2 +- svx/source/tbxctrls/tbxcolorupdate.cxx | 2 +- svx/source/unodraw/shapepropertynotifier.cxx | 2 +- 73 files changed, 80 insertions(+), 80 deletions(-) (limited to 'svx/source') diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index 5378d7de937b..40c175fb3976 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -577,7 +577,7 @@ void AccFrameSelector::Invalidate() -} // namespace a11y -} // namespace svx +} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index 1a7a09812eb1..69aff5d6feb8 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -854,7 +854,7 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getBackground( ) throw (RuntimeException, -} // namespace svx +} diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx index 089faad66941..c57588219a2e 100644 --- a/svx/source/dialog/databaseregistrationui.cxx +++ b/svx/source/dialog/databaseregistrationui.cxx @@ -45,6 +45,6 @@ namespace svx return nResult; } -} // namespace svx +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index 3dac04e87da2..21755f8d25fc 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -543,6 +543,6 @@ void DialControlWrapper::SetControlValue( sal_Int32 nValue ) -} // namespace svx +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index f431a55334b0..e3f1ab32cfba 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -1377,7 +1377,7 @@ void BrokenRecoveryDialog::impl_askForSavePath() } } - } // namespace DocRecovery -} // namespace svx + } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index 851028690638..e7e93b8a74c4 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -1525,7 +1525,7 @@ void DrawDiagFrameBorders( -} // namespace frame -} // namespace svx +} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx index 6a3371941812..615970dbcfc5 100644 --- a/svx/source/dialog/framelinkarray.cxx +++ b/svx/source/dialog/framelinkarray.cxx @@ -1343,7 +1343,7 @@ void Array::DrawArray( OutputDevice& rDev, const Color* pForceColor ) const -} // namespace frame -} // namespace svx +} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx index 3614cff40362..bc2239f70942 100644 --- a/svx/source/dialog/frmdirlbox.cxx +++ b/svx/source/dialog/frmdirlbox.cxx @@ -110,6 +110,6 @@ void FrameDirListBoxWrapper::SetControlValue( SvxFrameDirection eValue ) -} // namespace svx +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 7d606d2fe640..a87ee3a73560 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -1265,6 +1265,6 @@ FrameBorderIterBase< Cont, Iter, Pred >& FrameBorderIterBase< Cont, Iter, Pred > -} // namespace svx +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx index 89ecc71dfed8..d622c8b4b66d 100644 --- a/svx/source/dialog/orienthelper.cxx +++ b/svx/source/dialog/orienthelper.cxx @@ -183,6 +183,6 @@ void OrientStackedWrapper::SetControlValue( bool bValue ) -} // namespace svx +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index 570177f3fe02..270e41a6a53f 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -686,7 +686,7 @@ namespace svx } -} // namespace svx +} diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx index c2a66f28216c..38d4a1e0d4c3 100644 --- a/svx/source/fmcomp/dbaobjectex.cxx +++ b/svx/source/fmcomp/dbaobjectex.cxx @@ -145,7 +145,7 @@ namespace svx } -} // namespace svx +} diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx index 22b1a3ccc684..3b6f0431e69e 100644 --- a/svx/source/fmcomp/xmlexchg.cxx +++ b/svx/source/fmcomp/xmlexchg.cxx @@ -57,6 +57,6 @@ namespace svx return rThis.m_aDescriptor; } -} // namespace svx +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx index 4cb371d81b86..cdc419b8551e 100644 --- a/svx/source/form/dataaccessdescriptor.cxx +++ b/svx/source/form/dataaccessdescriptor.cxx @@ -399,7 +399,7 @@ namespace svx } -} // namespace svx +} diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index b7069a27b317..b10c94b79dee 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -290,7 +290,7 @@ namespace svx } -} // namespace svx +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/datalistener.cxx b/svx/source/form/datalistener.cxx index 18f2900436f0..813f51a73612 100644 --- a/svx/source/form/datalistener.cxx +++ b/svx/source/form/datalistener.cxx @@ -83,7 +83,7 @@ namespace svxform } -} // namespace svxform +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index c5712e17d6e1..2e70850ffa6b 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -3441,6 +3441,6 @@ namespace svxform { } -} // namespace svxform +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/dbcharsethelper.cxx b/svx/source/form/dbcharsethelper.cxx index aa26c27aaaac..fe88160c9457 100644 --- a/svx/source/form/dbcharsethelper.cxx +++ b/svx/source/form/dbcharsethelper.cxx @@ -43,8 +43,8 @@ namespace svxform { namespace charset_helper return _rEncs.size(); } -} // namespace charset_helper -} // namespace svxform +} +} diff --git a/svx/source/form/delayedevent.cxx b/svx/source/form/delayedevent.cxx index 0a226d24a010..f06fc1d0c3ea 100644 --- a/svx/source/form/delayedevent.cxx +++ b/svx/source/form/delayedevent.cxx @@ -55,7 +55,7 @@ namespace svxform } -} // namespace svxform +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 405cae05229a..98e1f45a3277 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -2000,7 +2000,7 @@ FmFilterNavigatorWinMgr::FmFilterNavigatorWinMgr( vcl::Window *_pParent, sal_uIn } -} // namespace svxform +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx index c1752360dab1..8cbe36f4872e 100644 --- a/svx/source/form/fmcontrolbordermanager.cxx +++ b/svx/source/form/fmcontrolbordermanager.cxx @@ -421,7 +421,7 @@ namespace svxform } -} // namespace svxform +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx index 5ecc273cd9bd..661b481697d9 100644 --- a/svx/source/form/fmcontrollayout.cxx +++ b/svx/source/form/fmcontrollayout.cxx @@ -309,7 +309,7 @@ namespace svxform } -} // namespace svxform +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx index ade7433a9217..c937685c9cd3 100644 --- a/svx/source/form/fmdocumentclassification.cxx +++ b/svx/source/form/fmdocumentclassification.cxx @@ -193,7 +193,7 @@ namespace svxform } -} // namespace svxform +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index 44c636aeef96..11ee1c18c162 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -619,7 +619,7 @@ namespace svxform } -} // namespace svxform +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 0d27ca92e242..a0d81a5bf3b8 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -999,7 +999,7 @@ namespace svxform } -} // namespace svxform +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmservs.cxx b/svx/source/form/fmservs.cxx index 37fa3cfda0ef..3f8d2ac789e3 100644 --- a/svx/source/form/fmservs.cxx +++ b/svx/source/form/fmservs.cxx @@ -67,6 +67,6 @@ namespace svxform REGISTER_SERVICE(FmXGridControl, FM_SUN_CONTROL_GRIDCONTROL); }; -} // namespace svxform +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx index 9126dd8a90d5..a859c3598d82 100644 --- a/svx/source/form/fmtextcontroldialogs.cxx +++ b/svx/source/form/fmtextcontroldialogs.cxx @@ -84,7 +84,7 @@ namespace svx AddTabPage("labelTP_TABULATOR", RID_SVXPAGE_TABULATOR); } -} // namespace svx +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmtextcontrolfeature.cxx b/svx/source/form/fmtextcontrolfeature.cxx index d88f567843db..75ff5755f604 100644 --- a/svx/source/form/fmtextcontrolfeature.cxx +++ b/svx/source/form/fmtextcontrolfeature.cxx @@ -110,7 +110,7 @@ namespace svx } -} // namespace svx +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 917ce8589cb8..e19ff158d38a 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -1364,7 +1364,7 @@ namespace svx } -} // namespace svx +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index 5827999cfc39..9aae5dea5ee1 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -717,7 +717,7 @@ namespace svxform } -} // namespace svxform +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 3cce6bd0820e..861c33ff2649 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -4268,6 +4268,6 @@ void SAL_CALL FormController::columnChanged( const EventObject& /*_event*/ ) thr implInvalidateCurrentControlDependentFeatures(); } -} // namespace svxform +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx index 0df82ee887d3..e2ef294cc503 100644 --- a/svx/source/form/formcontrolling.cxx +++ b/svx/source/form/formcontrolling.cxx @@ -510,7 +510,7 @@ namespace svx } -} // namespace svx +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx index 318fa8e116cd..2fae8dbac936 100644 --- a/svx/source/form/formdispatchinterceptor.cxx +++ b/svx/source/form/formdispatchinterceptor.cxx @@ -182,7 +182,7 @@ namespace svxform } -} // namespace svxform +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx index 791543657ac6..664f6a1239ad 100644 --- a/svx/source/form/formfeaturedispatcher.cxx +++ b/svx/source/form/formfeaturedispatcher.cxx @@ -205,7 +205,7 @@ namespace svx } -} // namespace svx +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx index 898b522cbcd4..b7dcb073da7b 100644 --- a/svx/source/form/formtoolbars.cxx +++ b/svx/source/form/formtoolbars.cxx @@ -94,7 +94,7 @@ namespace svxform } -} // namespace svxform +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx index da0d3d618e2f..010fd70718db 100644 --- a/svx/source/form/legacyformcontroller.cxx +++ b/svx/source/form/legacyformcontroller.cxx @@ -197,7 +197,7 @@ namespace svxform return aServices; } -} // namespace svxform +} ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL LegacyFormController_NewInstance_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _rxORB ) diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 9003b2577f39..938c166b6156 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -2178,7 +2178,7 @@ namespace svxform } -} // namespace svxform +} diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index 95bc82438dcb..f00b331e84ce 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -962,7 +962,7 @@ namespace svxform } -} // namespace svxform +} diff --git a/svx/source/form/sdbdatacolumn.cxx b/svx/source/form/sdbdatacolumn.cxx index 676d4cc11a09..a98122243570 100644 --- a/svx/source/form/sdbdatacolumn.cxx +++ b/svx/source/form/sdbdatacolumn.cxx @@ -273,7 +273,7 @@ namespace svxform } -} // namespace svxform +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/sqlparserclient.cxx b/svx/source/form/sqlparserclient.cxx index bb8d7d458199..6f2ced18f938 100644 --- a/svx/source/form/sqlparserclient.cxx +++ b/svx/source/form/sqlparserclient.cxx @@ -47,7 +47,7 @@ namespace svxform return std::shared_ptr< OSQLParseNode >(m_pParser->predicateTree(_rErrorMessage, _rStatement, _rxFormatter, _rxField)); } -} // namespace svxform +} diff --git a/svx/source/form/stringlistresource.cxx b/svx/source/form/stringlistresource.cxx index cea9e09a230c..81c87f98e1be 100644 --- a/svx/source/form/stringlistresource.cxx +++ b/svx/source/form/stringlistresource.cxx @@ -44,7 +44,7 @@ namespace svx } -} // namespace svx +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index 6b4bdb5bfd72..eaf48e26b6a2 100644 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx @@ -162,7 +162,7 @@ namespace svxform } -} // namespace svxformv +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx index f1a5c9140052..09bc230734e0 100644 --- a/svx/source/inc/AccessibleFrameSelector.hxx +++ b/svx/source/inc/AccessibleFrameSelector.hxx @@ -127,8 +127,8 @@ private: -} // namespace a11y -} // namespace svx +} +} #endif diff --git a/svx/source/inc/datalistener.hxx b/svx/source/inc/datalistener.hxx index 32132b24d2ae..e6ceeb22e198 100644 --- a/svx/source/inc/datalistener.hxx +++ b/svx/source/inc/datalistener.hxx @@ -65,7 +65,7 @@ namespace svxform }; -} // namespace svxform +} #endif // INCLUDED_SVX_SOURCE_INC_DATALISTENER_HXX diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index fb50d78f7640..5dba115d44eb 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -669,7 +669,7 @@ namespace svxform }; -} // namespace svxform +} #endif // INCLUDED_SVX_SOURCE_INC_DATANAVI_HXX diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx index b339fe9f6913..2ccaca72b11c 100644 --- a/svx/source/inc/delayedevent.hxx +++ b/svx/source/inc/delayedevent.hxx @@ -74,7 +74,7 @@ namespace svxform }; -} // namespace svxform +} #endif // INCLUDED_SVX_SOURCE_INC_DELAYEDEVENT_HXX diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 207295015903..6fe45661967e 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -613,8 +613,8 @@ class BrokenRecoveryDialog : public ModalDialog /** @short TODO */ void impl_askForSavePath(); }; - } // namespace DocRecovery -} // namespace svx + } +} #endif diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index 63c4426c89b2..5633f02ec3b8 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -349,7 +349,7 @@ public: }; -} // namespace svxform +} #endif // INCLUDED_SVX_SOURCE_INC_FILTNAV_HXX diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx index b4dee519966c..796e9df671cf 100644 --- a/svx/source/inc/fmcontrolbordermanager.hxx +++ b/svx/source/inc/fmcontrolbordermanager.hxx @@ -242,7 +242,7 @@ namespace svxform }; -} // namespace svxform +} #endif // INCLUDED_SVX_SOURCE_INC_FMCONTROLBORDERMANAGER_HXX diff --git a/svx/source/inc/fmcontrollayout.hxx b/svx/source/inc/fmcontrollayout.hxx index b717c8f6cb37..3f4c5fc60fd6 100644 --- a/svx/source/inc/fmcontrollayout.hxx +++ b/svx/source/inc/fmcontrollayout.hxx @@ -60,7 +60,7 @@ namespace svxform } -} // namespace svxform +} #endif // INCLUDED_SVX_SOURCE_INC_FMCONTROLLAYOUT_HXX diff --git a/svx/source/inc/fmdocumentclassification.hxx b/svx/source/inc/fmdocumentclassification.hxx index b79066a60028..b41349eb3963 100644 --- a/svx/source/inc/fmdocumentclassification.hxx +++ b/svx/source/inc/fmdocumentclassification.hxx @@ -63,7 +63,7 @@ namespace svxform }; -} // namespace svxform +} #endif // INCLUDED_SVX_SOURCE_INC_FMDOCUMENTCLASSIFICATION_HXX diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx index 814c4fbe7f25..227cbd42b621 100644 --- a/svx/source/inc/fmexch.hxx +++ b/svx/source/inc/fmexch.hxx @@ -251,7 +251,7 @@ namespace svxform } -} // namespace svxform +} #endif diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index a10c207feafa..0e9afbcef127 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -588,7 +588,7 @@ namespace svxform }; -} // namespace svxform +} #endif // INCLUDED_SVX_SOURCE_INC_FMEXPL_HXX diff --git a/svx/source/inc/fmscriptingenv.hxx b/svx/source/inc/fmscriptingenv.hxx index 9e9e7db31a3b..cc875e407ec4 100644 --- a/svx/source/inc/fmscriptingenv.hxx +++ b/svx/source/inc/fmscriptingenv.hxx @@ -83,7 +83,7 @@ namespace svxform PFormScriptingEnvironment createDefaultFormScriptingEnvironment( FmFormModel& _rFormModel ); -} // namespace svxform +} #endif // INCLUDED_SVX_SOURCE_INC_FMSCRIPTINGENV_HXX diff --git a/svx/source/inc/fmslotinvalidator.hxx b/svx/source/inc/fmslotinvalidator.hxx index 62bbdbff5154..783e7263c2b6 100644 --- a/svx/source/inc/fmslotinvalidator.hxx +++ b/svx/source/inc/fmslotinvalidator.hxx @@ -32,7 +32,7 @@ namespace svx protected: ~ISlotInvalidator() {} }; -} // namespace svx +} #endif // INCLUDED_SVX_SOURCE_INC_FMSLOTINVALIDATOR_HXX diff --git a/svx/source/inc/fmtextcontroldialogs.hxx b/svx/source/inc/fmtextcontroldialogs.hxx index f8012557d624..f3269a7779a3 100644 --- a/svx/source/inc/fmtextcontroldialogs.hxx +++ b/svx/source/inc/fmtextcontroldialogs.hxx @@ -49,7 +49,7 @@ namespace svx TextControlParaAttribDialog(vcl::Window* _pParent, const SfxItemSet& _rCoreSet); }; -} // namespace svx +} #endif // INCLUDED_SVX_SOURCE_INC_FMTEXTCONTROLDIALOGS_HXX diff --git a/svx/source/inc/fmtextcontrolfeature.hxx b/svx/source/inc/fmtextcontrolfeature.hxx index dda2ebeab4db..33e16412a8e3 100644 --- a/svx/source/inc/fmtextcontrolfeature.hxx +++ b/svx/source/inc/fmtextcontrolfeature.hxx @@ -84,7 +84,7 @@ namespace svx }; -} // namespace svx +} #endif // INCLUDED_SVX_SOURCE_INC_FMTEXTCONTROLFEATURE_HXX diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx index b1765ab0cc6a..416895bb6162 100644 --- a/svx/source/inc/fmtextcontrolshell.hxx +++ b/svx/source/inc/fmtextcontrolshell.hxx @@ -203,7 +203,7 @@ namespace svx }; -} // namespace svx +} #endif // INCLUDED_SVX_SOURCE_INC_FMTEXTCONTROLSHELL_HXX diff --git a/svx/source/inc/formcontrolfactory.hxx b/svx/source/inc/formcontrolfactory.hxx index 0952008b2464..5b6dcf2228a1 100644 --- a/svx/source/inc/formcontrolfactory.hxx +++ b/svx/source/inc/formcontrolfactory.hxx @@ -102,7 +102,7 @@ namespace svxform }; -} // namespace svxform +} #endif // INCLUDED_SVX_SOURCE_INC_FORMCONTROLFACTORY_HXX diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index 45d74e6b46e3..5ae418cff4f1 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -570,7 +570,7 @@ namespace svxform DECL_LINK( OnDeactivated, void* ); }; -} // namespace svxform +} #endif // INCLUDED_SVX_SOURCE_INC_FORMCONTROLLER_HXX diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx index 5927e4a505dc..60134c9f3c5a 100644 --- a/svx/source/inc/formcontrolling.hxx +++ b/svx/source/inc/formcontrolling.hxx @@ -220,7 +220,7 @@ namespace svx }; -} // namespace svx +} #endif // INCLUDED_SVX_SOURCE_INC_FORMCONTROLLING_HXX diff --git a/svx/source/inc/formdispatchinterceptor.hxx b/svx/source/inc/formdispatchinterceptor.hxx index 529a941c2d02..c6b3c0874918 100644 --- a/svx/source/inc/formdispatchinterceptor.hxx +++ b/svx/source/inc/formdispatchinterceptor.hxx @@ -103,7 +103,7 @@ namespace svxform }; -} // namespace svxform +} #endif // INCLUDED_SVX_SOURCE_INC_FORMDISPATCHINTERCEPTOR_HXX diff --git a/svx/source/inc/formfeaturedispatcher.hxx b/svx/source/inc/formfeaturedispatcher.hxx index 964eff888c39..8c860e4a0a38 100644 --- a/svx/source/inc/formfeaturedispatcher.hxx +++ b/svx/source/inc/formfeaturedispatcher.hxx @@ -118,7 +118,7 @@ namespace svx }; -} // namespace svx +} #endif diff --git a/svx/source/inc/formtoolbars.hxx b/svx/source/inc/formtoolbars.hxx index 0e1111f0f563..bd745d9dfa4e 100644 --- a/svx/source/inc/formtoolbars.hxx +++ b/svx/source/inc/formtoolbars.hxx @@ -65,7 +65,7 @@ namespace svxform } }; -} // namespace svxform +} #endif // INCLUDED_SVX_SOURCE_INC_FORMTOOLBARS_HXX diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx index 762c3cc54459..4b516e83139b 100644 --- a/svx/source/inc/frmselimpl.hxx +++ b/svx/source/inc/frmselimpl.hxx @@ -292,7 +292,7 @@ typedef FrameBorderIterBase< const FrameBorderPtrVec, FrameBorderPtrVec::const_i typedef FrameBorderIterBase< FrameBorderPtrVec, FrameBorderPtrVec::iterator, FrameBorderSelected_Pred > SelFrameBorderIter; -} // namespace svx +} #endif diff --git a/svx/source/inc/sdbdatacolumn.hxx b/svx/source/inc/sdbdatacolumn.hxx index 37bd498c6031..d5270accec0b 100644 --- a/svx/source/inc/sdbdatacolumn.hxx +++ b/svx/source/inc/sdbdatacolumn.hxx @@ -128,7 +128,7 @@ namespace svxform #endif // INCLUDED_SVX_SOURCE_INC_SDBDATACOLUMN_HXX -} // namespace svxform +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx index 85924e4696b0..f7cc610394be 100644 --- a/svx/source/inc/sqlparserclient.hxx +++ b/svx/source/inc/sqlparserclient.hxx @@ -59,7 +59,7 @@ namespace svxform }; -} // namespace svxform +} #endif // INCLUDED_SVX_SOURCE_INC_SQLPARSERCLIENT_HXX diff --git a/svx/source/inc/stringlistresource.hxx b/svx/source/inc/stringlistresource.hxx index 76f23d3ac690..1d45b4e35678 100644 --- a/svx/source/inc/stringlistresource.hxx +++ b/svx/source/inc/stringlistresource.hxx @@ -67,7 +67,7 @@ namespace svx }; -} // namespace svx +} #endif // INCLUDED_SVX_SOURCE_INC_STRINGLISTRESOURCE_HXX diff --git a/svx/source/inc/xfm_addcondition.hxx b/svx/source/inc/xfm_addcondition.hxx index c3a4db2cae87..6ea9a95c3315 100644 --- a/svx/source/inc/xfm_addcondition.hxx +++ b/svx/source/inc/xfm_addcondition.hxx @@ -72,7 +72,7 @@ namespace svxform }; -} // namespace svxform +} #endif // INCLUDED_SVX_SOURCE_INC_XFM_ADDCONDITION_HXX diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx index cd2422ef2bf1..20e605a388f3 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx @@ -73,7 +73,7 @@ private: DECL_LINK(PredefinedValuesHandler, void*); }; -} // namespace svx +} #endif diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx index 899a411273ab..52c91fe71336 100644 --- a/svx/source/tbxctrls/tbxcolor.cxx +++ b/svx/source/tbxctrls/tbxcolor.cxx @@ -98,7 +98,7 @@ namespace svx } -} // namespace svx +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx index 5f1a186c26f1..47840407348c 100644 --- a/svx/source/tbxctrls/tbxcolorupdate.cxx +++ b/svx/source/tbxctrls/tbxcolorupdate.cxx @@ -192,6 +192,6 @@ namespace svx } } } -} // namespace svx +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx index 1e6af1a8b5a4..28ab0d5136ed 100644 --- a/svx/source/unodraw/shapepropertynotifier.cxx +++ b/svx/source/unodraw/shapepropertynotifier.cxx @@ -174,7 +174,7 @@ namespace svx } -} // namespace svx +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit