[Libreoffice-commits] core.git: 2 commits - basctl/source basegfx/source bridges/source embeddedobj/source extensions/source include/sfx2 include/vcl sc/source svgio/source
Jochen Nitschke
j.nitschke+logerrit at ok.de
Wed May 3 07:10:59 UTC 2017
basctl/source/basicide/localizationmgr.cxx | 5 -----
basegfx/source/range/b1drange.cxx | 5 -----
basegfx/source/tuple/b2i64tuple.cxx | 7 -------
basegfx/source/tuple/b3ituple.cxx | 7 -------
bridges/source/cpp_uno/shared/component.cxx | 3 ---
embeddedobj/source/msole/olecomponent.hxx | 3 ---
extensions/source/propctrlr/fontitemids.hxx | 8 --------
extensions/source/propctrlr/propcontroller.cxx | 5 -----
include/sfx2/sidebar/ControllerItem.hxx | 10 +---------
include/vcl/vclptr.hxx | 2 --
sc/source/core/tool/interpr5.cxx | 4 ----
svgio/source/svgreader/svgpaint.cxx | 7 -------
12 files changed, 1 insertion(+), 65 deletions(-)
New commits:
commit d93f33c8c9ca0eb5a50fc454f069d799d59ef86f
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date: Tue May 2 15:12:19 2017 +0200
remove unused includes
from <com/sun/star/frame/XFrame.hpp> we only use <.../XComponent.hpp>
Change-Id: I5e3daf848e52cff62e10f9b5e91106894e16a175
Reviewed-on: https://gerrit.libreoffice.org/37160
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx
index 82e003117510..183a6f900d78 100644
--- a/include/sfx2/sidebar/ControllerItem.hxx
+++ b/include/sfx2/sidebar/ControllerItem.hxx
@@ -21,15 +21,7 @@
#include <sfx2/ctrlitem.hxx>
-#include <cppuhelper/basemutex.hxx>
-#include <unotools/cmdoptions.hxx>
-#include <vcl/image.hxx>
-
-#include <com/sun/star/frame/XFrame.hpp>
-
-
-class SfxViewFrame;
-class ToolBox;
+#include <com/sun/star/lang/XComponent.hpp>
namespace sfx2 { namespace sidebar {
commit 58ac61478aa01c72ab99ff372656539c58545348
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date: Tue May 2 18:55:29 2017 +0200
remove empty namespaces
Change-Id: I3eae0ecc1ffc5500d3c55abc6554822f5432a50a
Reviewed-on: https://gerrit.libreoffice.org/37173
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index bfca283dceb3..436a75a4580e 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -96,11 +96,6 @@ void LocalizationMgr::handleTranslationbar ()
// TODO: -> export from toolkit
-namespace
-{
-
-
-}
bool isLanguageDependentProperty( const OUString& aName )
{
diff --git a/basegfx/source/range/b1drange.cxx b/basegfx/source/range/b1drange.cxx
index bcfbba2ec37f..fbe7a39d9808 100644
--- a/basegfx/source/range/b1drange.cxx
+++ b/basegfx/source/range/b1drange.cxx
@@ -18,10 +18,5 @@
*/
#include <basegfx/range/b1drange.hxx>
-#include <basegfx/numeric/ftools.hxx>
-
-namespace basegfx
-{
-} // end of namespace basegfx
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/tuple/b2i64tuple.cxx b/basegfx/source/tuple/b2i64tuple.cxx
index ef37869e63d9..ba316ff916f9 100644
--- a/basegfx/source/tuple/b2i64tuple.cxx
+++ b/basegfx/source/tuple/b2i64tuple.cxx
@@ -18,12 +18,5 @@
*/
#include <basegfx/tuple/b2i64tuple.hxx>
-#include <rtl/instance.hxx>
-
-namespace { struct EmptyTuple : public rtl::Static<basegfx::B2I64Tuple, EmptyTuple> {}; }
-
-namespace basegfx
-{
-} // end of namespace basegfx
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/tuple/b3ituple.cxx b/basegfx/source/tuple/b3ituple.cxx
index f0409215791d..fef2359c7c9d 100644
--- a/basegfx/source/tuple/b3ituple.cxx
+++ b/basegfx/source/tuple/b3ituple.cxx
@@ -18,12 +18,5 @@
*/
#include <basegfx/tuple/b3ituple.hxx>
-#include <rtl/instance.hxx>
-
-namespace { struct EmptyTuple : public rtl::Static<basegfx::B3ITuple, EmptyTuple> {}; }
-
-namespace basegfx
-{
-} // end of namespace basegfx
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/shared/component.cxx b/bridges/source/cpp_uno/shared/component.cxx
index 0e5759239d5b..e58092064513 100644
--- a/bridges/source/cpp_uno/shared/component.cxx
+++ b/bridges/source/cpp_uno/shared/component.cxx
@@ -35,9 +35,6 @@
#include "uno/mapping.h"
#include "cppu/EnvDcp.hxx"
-namespace bridges { namespace cpp_uno { namespace shared {
-
-} } }
namespace {
diff --git a/embeddedobj/source/msole/olecomponent.hxx b/embeddedobj/source/msole/olecomponent.hxx
index 6665895c28e2..088c3108bbf9 100644
--- a/embeddedobj/source/msole/olecomponent.hxx
+++ b/embeddedobj/source/msole/olecomponent.hxx
@@ -40,9 +40,6 @@
#include <vector>
-namespace com { namespace sun { namespace star {
-}}}
-
namespace cppu {
class OMultiTypeInterfaceContainerHelper;
}
diff --git a/extensions/source/propctrlr/fontitemids.hxx b/extensions/source/propctrlr/fontitemids.hxx
index a7a93961cee5..cc955dfcc750 100644
--- a/extensions/source/propctrlr/fontitemids.hxx
+++ b/extensions/source/propctrlr/fontitemids.hxx
@@ -46,14 +46,6 @@
#define CFID_FIRST_ITEM_ID CFID_FONT
#define CFID_LAST_ITEM_ID CFID_FONTLIST
-
-namespace pcr
-{
-
-
-} // namespace pcr
-
-
#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FONTITEMIDS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 143c7e855083..296bcfb2f20b 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -1400,11 +1400,6 @@ namespace pcr
}
- namespace
- {
- }
-
-
void OPropertyBrowserController::focusGained( const Reference< XPropertyControl >& Control )
{
m_aControlObservers.notifyEach( &XPropertyControlObserver::focusGained, Control );
diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx
index 2e79b17cf5bb..a6dc702675f9 100644
--- a/include/vcl/vclptr.hxx
+++ b/include/vcl/vclptr.hxx
@@ -92,8 +92,6 @@ template<typename T> constexpr bool isIncompleteOrDerivedFromVclReferenceBase(
*
* @param reference_type must be a subclass of vcl::Window
*/
-namespace detail {
-}
template <class reference_type>
class VclPtr
{
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 491c90388e12..2b8e65bb8752 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -1189,10 +1189,6 @@ void ScInterpreter::ScAdd()
CalculateAddSub(false);
}
-namespace {
-
-}
-
void ScInterpreter::CalculateAddSub(bool _bSub)
{
ScMatrixRef pMat1 = nullptr;
diff --git a/svgio/source/svgreader/svgpaint.cxx b/svgio/source/svgreader/svgpaint.cxx
index fdf44be8d812..725dd9174a70 100644
--- a/svgio/source/svgreader/svgpaint.cxx
+++ b/svgio/source/svgreader/svgpaint.cxx
@@ -19,11 +19,4 @@
#include <svgpaint.hxx>
-namespace svgio
-{
- namespace svgreader
- {
- } // end of namespace svgreader
-} // end of namespace svgio
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list