[Libreoffice-commits] core.git: 2 commits - sc/source svl/source

[Stephan Bergmann]

 sc/source/filter/starcalc/scflt.cxx                |    2 +-
 sc/source/filter/starcalc/scflt.hxx                |    6 +++---
 svl/source/passwordcontainer/passwordcontainer.cxx |    2 +-
 svl/source/passwordcontainer/passwordcontainer.hxx |    8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit de4787b543d15a67bcf0828203e76061da5f4914
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Nov 1 18:10:37 2017 +0100

    passwordcontainer.hxx is only included from svl/source/passwordcontainer
    
    ...but itself includes svl/source/passwordcontainer/syscreds.hxx, which only
    happens to work because of -I$(dir $(3)) in gb_CObject__command_pattern (in
    solenv/gbuild/platform/com_{GCC,MSC}_class.mk).  Clean that up by moving the
    file.
    
    Change-Id: I7a04f757becf8113d1dccae9b78870e57ad3fbe5
    Reviewed-on: https://gerrit.libreoffice.org/44171
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index 2905f63e115e..c2e8b7100028 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <passwordcontainer.hxx>
+#include "passwordcontainer.hxx"
 
 #include <unotools/pathoptions.hxx>
 #include <cppuhelper/factory.hxx>
diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/passwordcontainer/passwordcontainer.hxx
similarity index 98%
rename from svl/source/inc/passwordcontainer.hxx
rename to svl/source/passwordcontainer/passwordcontainer.hxx
index bda69d6a745f..67ad63e72722 100644
--- a/svl/source/inc/passwordcontainer.hxx
+++ b/svl/source/passwordcontainer/passwordcontainer.hxx
@@ -16,8 +16,8 @@
  *   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_SVL_SOURCE_INC_PASSWORDCONTAINER_HXX
-#define INCLUDED_SVL_SOURCE_INC_PASSWORDCONTAINER_HXX
+#ifndef INCLUDED_SVL_SOURCE_PASSWORDCONTAINER_PASSWORDCONTAINER_HXX
+#define INCLUDED_SVL_SOURCE_PASSWORDCONTAINER_PASSWORDCONTAINER_HXX
 
 #include <vector>
 #include <map>
@@ -39,7 +39,7 @@
 #include <rtl/ref.hxx>
 #include <osl/mutex.hxx>
 
-#include <syscreds.hxx>
+#include "syscreds.hxx"
 
 #define MEMORY_RECORD         0
 #define PERSISTENT_RECORD     1
@@ -366,6 +366,6 @@ public:
 };
 
 
-#endif // INCLUDED_SVL_SOURCE_INC_PASSWORDCONTAINER_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit f9da456711619c3fe501000945290d887fc4a468
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Nov 1 18:07:24 2017 +0100

    scflt.hxx is only included from sc/source/filter/starcalc
    
    ...but itself includes sc/source/filter/starcalc/collect.hxx, which only happens
    to work because of -I$(dir $(3)) in gb_CObject__command_pattern (in
    solenv/gbuild/platform/com_{GCC,MSC}_class.mk).  Clean that up by moving the
    file.
    
    Change-Id: I55db90a7039e6c1e3fdaa28c1df58347e117a87f
    Reviewed-on: https://gerrit.libreoffice.org/44170
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index 84ecf76a0c84..f1e74b1544c8 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -58,7 +58,7 @@
 #include <stlsheet.hxx>
 #include <stlpool.hxx>
 #include <filter.hxx>
-#include <scflt.hxx>
+#include "scflt.hxx"
 #include <formulacell.hxx>
 #include <scfobj.hxx>
 #include <docoptio.hxx>
diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/starcalc/scflt.hxx
similarity index 99%
rename from sc/source/filter/inc/scflt.hxx
rename to sc/source/filter/starcalc/scflt.hxx
index 6dd4a27438dc..aeb10e086250 100644
--- a/sc/source/filter/inc/scflt.hxx
+++ b/sc/source/filter/starcalc/scflt.hxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SC_SOURCE_FILTER_INC_SCFLT_HXX
-#define INCLUDED_SC_SOURCE_FILTER_INC_SCFLT_HXX
+#ifndef INCLUDED_SC_SOURCE_FILTER_STARCALC_SCFLT_HXX
+#define INCLUDED_SC_SOURCE_FILTER_STARCALC_SCFLT_HXX
 
 #include <memory>
 #include <viewopti.hxx>
-#include <collect.hxx>
+#include "collect.hxx"
 #include <tools/solar.h>
 
 // Error numbers