[Libreoffice-commits] core.git: svx/inc svx/source

[Jochen Nitschke]

 svx/inc/sxonitm.hxx           |   31 -------------------------------
 svx/inc/sxraitm.hxx           |   31 -------------------------------
 svx/source/svdraw/svdattr.cxx |    2 --
 svx/source/svdraw/svdobj.cxx  |    6 ++----
 4 files changed, 2 insertions(+), 68 deletions(-)

New commits:
commit 8f412d7445c3e8b7277757f454a97b84341e55e9
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Sun Aug 20 22:25:23 2017 +0200

    drop pointless headers
    
    Change-Id: Ia4e26760d4fad655bbd20714fa0abcad0921605a
    Reviewed-on: https://gerrit.libreoffice.org/41369
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/svx/inc/sxonitm.hxx b/svx/inc/sxonitm.hxx
deleted file mode 100644
index 820e398130a0..000000000000
--- a/svx/inc/sxonitm.hxx
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SVX_INC_SXONITM_HXX
-#define INCLUDED_SVX_INC_SXONITM_HXX
-
-#include <svx/svddef.hxx>
-#include <svl/stritem.hxx>
-
-inline SfxStringItem makeSdrObjectNameItem(const OUString& rStr) {
-    return SfxStringItem(SDRATTR_OBJECTNAME,rStr);
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/sxraitm.hxx b/svx/inc/sxraitm.hxx
deleted file mode 100644
index e6b44c1d0d86..000000000000
--- a/svx/inc/sxraitm.hxx
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SVX_INC_SXRAITM_HXX
-#define INCLUDED_SVX_INC_SXRAITM_HXX
-
-#include <svx/svddef.hxx>
-#include <svx/sdangitm.hxx>
-
-inline SdrAngleItem makeSdrRotateAngleItem(long nAngle) {
-    return SdrAngleItem(SDRATTR_ROTATEANGLE, nAngle);
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index d38a8e6bf5be..0a6d5a791472 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -86,9 +86,7 @@
 #include <svx/sxmtritm.hxx>
 #include <svx/sxmuitm.hxx>
 #include <sxoneitm.hxx>
-#include <sxonitm.hxx>
 #include <sxopitm.hxx>
-#include <sxraitm.hxx>
 #include <sxreaitm.hxx>
 #include <sxreoitm.hxx>
 #include <sxroaitm.hxx>
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index c41aae438575..947f70a29f4e 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -98,9 +98,7 @@
 #include <sxlogitm.hxx>
 #include <sxmovitm.hxx>
 #include <sxoneitm.hxx>
-#include <sxonitm.hxx>
 #include <sxopitm.hxx>
-#include <sxraitm.hxx>
 #include <sxreoitm.hxx>
 #include <sxrooitm.hxx>
 #include <sxsaitm.hxx>
@@ -2135,7 +2133,7 @@ void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr) const
     lcl_SetItem(rAttr,false,SdrYesNoItem(SDRATTR_OBJSIZEPROTECT, IsResizeProtect()));
     lcl_SetItem(rAttr,false,SdrObjPrintableItem(IsPrintable()));
     lcl_SetItem(rAttr,false,SdrObjVisibleItem(IsVisible()));
-    lcl_SetItem(rAttr,false,makeSdrRotateAngleItem(GetRotateAngle()));
+    lcl_SetItem(rAttr,false,SdrAngleItem(SDRATTR_ROTATEANGLE, GetRotateAngle()));
     lcl_SetItem(rAttr,false,SdrShearAngleItem(GetShearAngle()));
     lcl_SetItem(rAttr,false,SdrOneSizeWidthItem(rSnap.GetWidth()-1));
     lcl_SetItem(rAttr,false,SdrOneSizeHeightItem(rSnap.GetHeight()-1));
@@ -2151,7 +2149,7 @@ void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr) const
 
     if (!aName.isEmpty())
     {
-        lcl_SetItem(rAttr, false, makeSdrObjectNameItem(aName));
+        lcl_SetItem(rAttr, false, SfxStringItem(SDRATTR_OBJECTNAME, aName));
     }
 
     lcl_SetItem(rAttr,false,SdrLayerIdItem(GetLayer()));