diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 18:50:37 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 14:50:17 -0600 |
commit | 224f6c17f7119ca65716a73f21244ddd3e26a653 (patch) | |
tree | de43420dbf2bd2227fbe5b24ee1cb6acd65b9fb6 /formula | |
parent | 7986dcfdcad22d7203f256fb9a4ad53bda4ca422 (diff) |
Remove visual noise from formula
Change-Id: Ie7503623ad9bec1806345f65b435c7bd94a08c2b
Reviewed-on: https://gerrit.libreoffice.org/8263
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'formula')
-rw-r--r-- | formula/source/core/api/FormulaOpCodeMapperObj.cxx | 4 | ||||
-rw-r--r-- | formula/source/core/api/services.cxx | 2 | ||||
-rw-r--r-- | formula/source/core/api/token.cxx | 4 | ||||
-rw-r--r-- | formula/source/core/inc/core_resource.hrc | 4 | ||||
-rw-r--r-- | formula/source/core/inc/core_resource.hxx | 14 | ||||
-rw-r--r-- | formula/source/core/resource/core_resource.cxx | 10 | ||||
-rw-r--r-- | formula/source/ui/dlg/ControlHelper.hxx | 8 | ||||
-rw-r--r-- | formula/source/ui/dlg/FormulaHelper.cxx | 10 | ||||
-rw-r--r-- | formula/source/ui/dlg/formdlgs.src | 2 | ||||
-rw-r--r-- | formula/source/ui/dlg/formula.cxx | 16 | ||||
-rw-r--r-- | formula/source/ui/dlg/funcpage.cxx | 6 | ||||
-rw-r--r-- | formula/source/ui/dlg/funcpage.hxx | 6 | ||||
-rw-r--r-- | formula/source/ui/dlg/parawin.cxx | 2 | ||||
-rw-r--r-- | formula/source/ui/dlg/parawin.hxx | 4 | ||||
-rw-r--r-- | formula/source/ui/dlg/parawin.src | 4 | ||||
-rw-r--r-- | formula/source/ui/dlg/structpg.cxx | 2 | ||||
-rw-r--r-- | formula/source/ui/dlg/structpg.hxx | 6 | ||||
-rw-r--r-- | formula/source/ui/inc/ForResId.hrc | 2 | ||||
-rw-r--r-- | formula/source/ui/inc/ModuleHelper.hxx | 16 | ||||
-rw-r--r-- | formula/source/ui/resource/ModuleHelper.cxx | 16 |
20 files changed, 69 insertions, 69 deletions
diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx b/formula/source/core/api/FormulaOpCodeMapperObj.cxx index 5661f9f698be..f57114e51d49 100644 --- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx +++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx @@ -112,8 +112,8 @@ SAL_WNODEPRECATED_DECLARATIONS_POP -// ============================================================================= + } // formula -// ============================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/formula/source/core/api/services.cxx b/formula/source/core/api/services.cxx index de97b4f0ae83..0b51f5a138bd 100644 --- a/formula/source/core/api/services.cxx +++ b/formula/source/core/api/services.cxx @@ -29,7 +29,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; -//*************************************************************************************** + // registry functions namespace { diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index 9d40ef9a35b1..99ae90e439ee 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -253,7 +253,7 @@ bool FormulaToken::TextEqual( const FormulaToken& rToken ) const { return *this == rToken; } -// ========================================================================== + // real implementations of virtual functions @@ -1338,7 +1338,7 @@ bool FormulaTokenIterator::IsEndOfPath() const } -// ========================================================================== + // real implementations of virtual functions diff --git a/formula/source/core/inc/core_resource.hrc b/formula/source/core/inc/core_resource.hrc index 5253e653926a..b824f05cd9bc 100644 --- a/formula/source/core/inc/core_resource.hrc +++ b/formula/source/core/inc/core_resource.hrc @@ -22,11 +22,11 @@ #include <svl/solar.hrc> -//------------------------------------------------------------------------------ + #define RID_CORE_STRINGS_START RID_FORMULA_START #define RID_CORE_OTHER_START RID_FORMULA_START -//------------------------------------------------------------------------------ + //- String-IDs #define RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF (RID_CORE_OTHER_START + 0) #define RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML (RID_CORE_OTHER_START + 1) diff --git a/formula/source/core/inc/core_resource.hxx b/formula/source/core/inc/core_resource.hxx index a16749b777aa..2bac3468e3fc 100644 --- a/formula/source/core/inc/core_resource.hxx +++ b/formula/source/core/inc/core_resource.hxx @@ -24,13 +24,13 @@ #include <osl/mutex.hxx> class ResMgr; -//......................................................................... + namespace formula { - //================================================================== + //= ResourceManager //= handling resources within the FORMULA-Core library - //================================================================== + class ResourceManager { friend class OModuleClient; @@ -54,9 +54,9 @@ namespace formula static ResMgr* getResManager(); }; - //========================================================================= + //= OModuleClient - //========================================================================= + /** base class for objects which uses any global module-specific resources */ class OModuleClient @@ -67,9 +67,9 @@ namespace formula }; -//......................................................................... + } // formula -//......................................................................... + #endif // _FORMULA_CORE_RESOURCE_HXX_ diff --git a/formula/source/core/resource/core_resource.cxx b/formula/source/core/resource/core_resource.cxx index 36435b18fde6..ecfacde8babb 100644 --- a/formula/source/core/resource/core_resource.cxx +++ b/formula/source/core/resource/core_resource.cxx @@ -27,13 +27,13 @@ #include <rtl/instance.hxx> #include <svl/solar.hrc> -//......................................................................... + namespace formula { - //================================================================== + //= ResourceManager - //================================================================== + namespace { // access safety @@ -74,8 +74,8 @@ namespace formula return m_pImpl; } -//......................................................................... + } // formula -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx index fe62907592c8..86e2453256b9 100644 --- a/formula/source/ui/dlg/ControlHelper.hxx +++ b/formula/source/ui/dlg/ControlHelper.hxx @@ -24,7 +24,7 @@ namespace formula { -//============================================================================ + // class ValWnd class ValWnd : public Window { @@ -41,7 +41,7 @@ private: Rectangle aRectOut; }; -//============================================================================ + // class EditBox class EditBox : public Control { @@ -74,7 +74,7 @@ public: void UpdateOldSel(); }; -//============================================================================ + // class ArgEdit class ArgEdit : public RefEdit @@ -96,7 +96,7 @@ private: }; -//============================================================================ + // class ArgInput class ArgInput diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx index 6db3c75039a8..8dcb6b254f18 100644 --- a/formula/source/ui/dlg/FormulaHelper.cxx +++ b/formula/source/ui/dlg/FormulaHelper.cxx @@ -26,7 +26,7 @@ namespace formula namespace { - //============================================================================ + class OEmptyFunctionDescription : public IFunctionDescription { public: @@ -48,9 +48,9 @@ namespace formula virtual bool isParameterOptional(sal_uInt32 ) const { return false; } }; } -//=================================================================== + // class FormulaHelper - static Method -//=================================================================== + #define FUNC_NOTFOUND 0xffff @@ -392,8 +392,8 @@ sal_Int32 FormulaHelper::GetArgStart( const OUString& rStr, sal_Int32 nStart, sa return nStart; } -// ============================================================================= + } // formula -// ============================================================================= + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src index 83ef11b56343..f7aae91eed81 100644 --- a/formula/source/ui/dlg/formdlgs.src +++ b/formula/source/ui/dlg/formdlgs.src @@ -23,7 +23,7 @@ #define STD_MASKCOLOR Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; } - //--------------------------------------------------------------------------- + TabPage RID_FORMULATAB_FUNCTION { Hide = TRUE ; diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 86100c4daaf1..d0f9d01c5c0c 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -1009,16 +1009,16 @@ IMPL_LINK( FormulaDlg_Impl, BtnHdl, PushButton*, pBtn ) aMEFormula.Invalidate(); aMEFormula.Update(); } - //... + return 0; } -// -------------------------------------------------------------------------- + // Functions for 1. Page -// -------------------------------------------------------------------------- + @@ -1057,9 +1057,9 @@ IMPL_LINK_NOARG(FormulaDlg_Impl, DblClkHdl) } -// -------------------------------------------------------------------------- + // Functions for right Page -// -------------------------------------------------------------------------- + void FormulaDlg_Impl::SetData(sal_Int32 nFStart, sal_Int32 nNextFStart, sal_Int32 nNextFEnd, sal_Int32& PrivStart, sal_Int32& PrivEnd) { sal_Int32 nFEnd; @@ -1634,7 +1634,7 @@ const FormulaHelper& FormulaDlg_Impl::GetFormulaHelper() const { return m_aFormulaHelper; } -//============================================================================ + FormulaModalDialog::FormulaModalDialog( Window* pParent , bool _bSupportFunctionResult , bool _bSupportResult @@ -1718,9 +1718,9 @@ void FormulaModalDialog::StoreFormEditData(FormEditData* pData) m_pImpl->StoreFormEditData(pData); } -// -------------------------------------------------------------------------- + // Initialisation / General functions for Dialog -// -------------------------------------------------------------------------- + FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent , bool _bSupportFunctionResult diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index b73556ecf408..f38d110b98d5 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -27,7 +27,7 @@ #include "formdlgs.hrc" #include "ForResId.hrc" #include "ModuleHelper.hxx" -//============================================================================ + namespace formula { @@ -59,7 +59,7 @@ bool FormulaListBox::PreNotify( NotifyEvent& rNEvt ) -//============================================================================ + inline sal_uInt16 Lb2Cat( sal_uInt16 nLbPos ) { @@ -70,7 +70,7 @@ inline sal_uInt16 Lb2Cat( sal_uInt16 nLbPos ) return nLbPos; } -//============================================================================ + FuncPage::FuncPage(Window* pParent,const IFunctionManager* _pFunctionManager): TabPage(pParent,ModuleRes(RID_FORMULATAB_FUNCTION)), diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index eb2985b66cd4..9c4efbca498e 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -33,7 +33,7 @@ #include <boost/shared_ptr.hpp> #include <vector> #include "formula/omoduleclient.hxx" -//============================================================================ + namespace formula { @@ -41,7 +41,7 @@ class IFunctionDescription; class IFunctionManager; class IFunctionCategory; -//============================================================================ + class FormulaListBox : public ListBox { protected: @@ -57,7 +57,7 @@ public: typedef const IFunctionDescription* TFunctionDesc; -//============================================================================ + class FuncPage : public TabPage { private: diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index ebcbd737566b..ee4e63f5750c 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -34,7 +34,7 @@ #define PAIRED_VAR_ARGS (VAR_ARGS + VAR_ARGS) namespace formula { -//============================================================================ + ParaWin::ParaWin(Window* pParent,IControlReferenceHandler* _pDlg,Point aPos): TabPage (pParent,ModuleRes(RID_FORMULATAB_PARAMETER)), diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx index 463068968f70..3aacd91bb7c2 100644 --- a/formula/source/ui/dlg/parawin.hxx +++ b/formula/source/ui/dlg/parawin.hxx @@ -35,9 +35,9 @@ namespace formula { -//============================================================================ + #define NOT_FOUND 0xffff -//============================================================================ + class IFunctionDescription; class IControlReferenceHandler; diff --git a/formula/source/ui/dlg/parawin.src b/formula/source/ui/dlg/parawin.src index 44ebc5c34510..5b282799868c 100644 --- a/formula/source/ui/dlg/parawin.src +++ b/formula/source/ui/dlg/parawin.src @@ -22,7 +22,7 @@ #include "helpids.hrc" #define STD_MASKCOLOR Color { Red=0xFFFF; Green=0x0000; Blue=0xFFFF; } - //--------------------------------------------------------------------------- + #define FT_ARGBLOCK( y ) \ Pos = MAP_APPFONT (6 , y ) ; \ @@ -54,7 +54,7 @@ TabStop = FALSE ; \ QuickHelpText [ en-US ] = "Select"; \ - //--------------------------------------------------------------------------- + // jetzt alles zusammen diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx index 5928a4dc249c..15acbea0ab1c 100644 --- a/formula/source/ui/dlg/structpg.cxx +++ b/formula/source/ui/dlg/structpg.cxx @@ -81,7 +81,7 @@ void StructListBox::LoseFocus() SvTreeListBox::LoseFocus(); } -//============================================================================== + StructPage::StructPage(Window* pParent): TabPage(pParent,ModuleRes(RID_FORMULATAB_STRUCT)), diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx index 11cf636b35ed..1dea99e40913 100644 --- a/formula/source/ui/dlg/structpg.hxx +++ b/formula/source/ui/dlg/structpg.hxx @@ -30,9 +30,9 @@ #include "formula/IFunctionDescription.hxx" #include "formula/omoduleclient.hxx" -//============================================================================ -//============================================================================ + + namespace formula { @@ -64,7 +64,7 @@ public: void LoseFocus(); }; -//============================================================================ + class StructPage : public TabPage , public IStructHelper diff --git a/formula/source/ui/inc/ForResId.hrc b/formula/source/ui/inc/ForResId.hrc index d1ae039f8f17..853114bc58ce 100644 --- a/formula/source/ui/inc/ForResId.hrc +++ b/formula/source/ui/inc/ForResId.hrc @@ -54,7 +54,7 @@ #define RID_FORMULATAB_PARAMETER (RID_PAGE_START + 3) #define RID_FORMULADLG_FORMULA_MODAL (RID_PAGE_START + 4) -// ----------------------------------------------------------------------- + #endif // FORMULA_FORRESID_HRC diff --git a/formula/source/ui/inc/ModuleHelper.hxx b/formula/source/ui/inc/ModuleHelper.hxx index fb89aaec4828..18bdb611d2c5 100644 --- a/formula/source/ui/inc/ModuleHelper.hxx +++ b/formula/source/ui/inc/ModuleHelper.hxx @@ -22,13 +22,13 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <tools/resmgr.hxx> -//......................................................................... + namespace formula { -//......................................................................... - //========================================================================= + + //= OModule - //========================================================================= + class OModuleClient; class OModuleImpl; class OModule @@ -59,9 +59,9 @@ namespace formula static void ensureImpl(); }; - //========================================================================= + //= ModuleRes - //========================================================================= + /** specialized ResId, using the resource manager provided by the global module */ class ModuleRes : public ::ResId @@ -69,9 +69,9 @@ namespace formula public: ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { } }; -//......................................................................... + } // namespace formula -//......................................................................... + #endif // FORMULA_MODULE_HELPER_RPT_HXX_ diff --git a/formula/source/ui/resource/ModuleHelper.cxx b/formula/source/ui/resource/ModuleHelper.cxx index 6b360d0fa77a..57a32c41c084 100644 --- a/formula/source/ui/resource/ModuleHelper.cxx +++ b/formula/source/ui/resource/ModuleHelper.cxx @@ -31,14 +31,14 @@ ::osl::MutexGuard aGuard(theOModuleMutex::get()); \ ensureImpl() -//......................................................................... + namespace formula { -//......................................................................... + using namespace ::com::sun::star; -//========================================================================= + //= OModuleImpl -//========================================================================= + /** implementation for <type>OModule</type>. not threadsafe, has to be guarded by it's owner */ class OModuleImpl @@ -85,9 +85,9 @@ ResMgr* OModuleImpl::getResManager() return m_pResources; } -//========================================================================= + //= OModule -//========================================================================= + namespace { // access safety @@ -128,8 +128,8 @@ void OModule::ensureImpl() s_pImpl = new OModuleImpl(); } -//......................................................................... + } // namespace formula -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |