[Libreoffice-commits] core.git: 3 commits - include/vcl svtools/source vcl/inc vcl/unx

Khaled Hosny khaledhosny at eglug.org
Wed Feb 8 18:04:28 UTC 2017 

 include/vcl/helper.hxx                 |   62 ---------------------------------
 include/vcl/printerinfomanager.hxx     |    2 -
 svtools/source/control/ctrlbox.cxx     |    1 
 vcl/inc/unx/fontmanager.hxx            |    4 +-
 vcl/inc/unx/helper.hxx                 |   57 ++++++++++++++++++++++++++++++
 vcl/inc/unx/printergfx.hxx             |    2 -
 vcl/unx/generic/app/salinst.cxx        |    2 -
 vcl/unx/generic/fontmanager/helper.cxx |    2 -
 vcl/unx/generic/print/text_gfx.cxx     |    2 -
 vcl/unx/generic/printer/ppdparser.cxx  |    2 -
 10 files changed, 66 insertions(+), 70 deletions(-)

New commits:
commit b27324d219ea14249fcc0827658a955de54f4250
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Wed Feb 8 19:44:26 2017 +0200

    Outdated comment, we are returning a reference!
    
    Change-Id: I4061f9f421666064f918d8a46375f7f770626ab6

diff --git a/vcl/inc/unx/helper.hxx b/vcl/inc/unx/helper.hxx
index 889641d..a5f475e 100644
--- a/vcl/inc/unx/helper.hxx
+++ b/vcl/inc/unx/helper.hxx
@@ -36,8 +36,6 @@ namespace psp
 
 void getPrinterPathList( std::list< OUString >& rPathList, const char* pSubDir );
 
-// note: gcc 3.4.1 warns about visibility if we retunr a const OUString& here
-// seems to be a bug in gcc, now we return an object instead of a reference
 OUString const & getFontPath();
 
 // normalized path (equivalent to realpath)
@@ -48,8 +46,7 @@ void normPath( OString& rPath );
 void splitPath( OString& rOrgPath, OString& rDir, OString& rBase );
 
 enum class whichOfficePath { InstallationRootPath, UserPath, ConfigPath };
-// note: gcc 3.4.1 warns about visibility if we retunr a const OUString& here
-// seems to be a bug in gcc, now we return an object instead of a reference
+
 OUString const & getOfficePath( whichOfficePath ePath );
 
 } // namespace
commit 25912929cfba42099581c55380dbef18cb81b5b9
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Wed Feb 8 18:10:15 2017 +0200

    This is only used within vcl
    
    Change-Id: I64d7e39506495e9fcc78bb670b897338a01a9ae1

diff --git a/include/vcl/printerinfomanager.hxx b/include/vcl/printerinfomanager.hxx
index 4b1105d..f806339 100644
--- a/include/vcl/printerinfomanager.hxx
+++ b/include/vcl/printerinfomanager.hxx
@@ -24,9 +24,9 @@
 #include <unordered_map>
 
 #include <vcl/dllapi.h>
-#include <vcl/helper.hxx>
 #include <vcl/jobdata.hxx>
 #include <osl/file.hxx>
+#include <unx/helper.hxx>
 
 #include <cstdio>
 
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index d16372c..4aeaf50 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -24,7 +24,6 @@
 #include <vcl/builderfactory.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/field.hxx>
-#include <vcl/helper.hxx>
 #include <vcl/settings.hxx>
 #include <sal/macros.h>
 #include <comphelper/processfactory.hxx>
diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
index 55b6746..fa99dac 100644
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_VCL_INC_FONTMANAGER_HXX
 
 #include <vcl/dllapi.h>
-#include <vcl/helper.hxx>
+#include <unx/helper.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/vclenum.hxx>
 #include <com/sun/star/lang/Locale.hpp>
diff --git a/include/vcl/helper.hxx b/vcl/inc/unx/helper.hxx
similarity index 78%
rename from include/vcl/helper.hxx
rename to vcl/inc/unx/helper.hxx
index 1f89cba..889641d 100644
--- a/include/vcl/helper.hxx
+++ b/vcl/inc/unx/helper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_HELPER_HXX
-#define INCLUDED_VCL_HELPER_HXX
+#ifndef INCLUDED_VCL_INC_UNX_HELPER_HXX
+#define INCLUDED_VCL_INC_UNX_HELPER_HXX
 
 #include <list>
 
@@ -34,27 +34,27 @@ namespace osl { class File; }
 namespace psp
 {
 
-void VCL_DLLPUBLIC getPrinterPathList( std::list< OUString >& rPathList, const char* pSubDir );
+void getPrinterPathList( std::list< OUString >& rPathList, const char* pSubDir );
 
 // note: gcc 3.4.1 warns about visibility if we retunr a const OUString& here
 // seems to be a bug in gcc, now we return an object instead of a reference
-VCL_DLLPUBLIC OUString const & getFontPath();
+OUString const & getFontPath();
 
 // normalized path (equivalent to realpath)
-void VCL_DLLPUBLIC normPath( OString& rPath );
+void normPath( OString& rPath );
 
 // splits rOrgPath into dirname and basename
 // rOrgPath will be subject to normPath
-void VCL_DLLPUBLIC splitPath( OString& rOrgPath, OString& rDir, OString& rBase );
+void splitPath( OString& rOrgPath, OString& rDir, OString& rBase );
 
 enum class whichOfficePath { InstallationRootPath, UserPath, ConfigPath };
 // note: gcc 3.4.1 warns about visibility if we retunr a const OUString& here
 // seems to be a bug in gcc, now we return an object instead of a reference
-VCL_DLLPUBLIC OUString const & getOfficePath( whichOfficePath ePath );
+OUString const & getOfficePath( whichOfficePath ePath );
 
 } // namespace
 
 
-#endif // INCLUDED_VCL_HELPER_HXX
+#endif // INCLUDED_VCL_INC_UNX_HELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/printergfx.hxx b/vcl/inc/unx/printergfx.hxx
index 820f047..152573e 100644
--- a/vcl/inc/unx/printergfx.hxx
+++ b/vcl/inc/unx/printergfx.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_GENERIC_PRINTERGFX_HXX
 #define INCLUDED_VCL_INC_GENERIC_PRINTERGFX_HXX
 
-#include <vcl/helper.hxx>
+#include <unx/helper.hxx>
 #include "sallayout.hxx"
 #include "osl/file.hxx"
 #include "tools/gen.hxx"
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index 7794135..cf433df 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -33,9 +33,9 @@
 #include <unx/sm.hxx>
 #include <unx/i18n_im.hxx>
 #include <unx/saldisp.hxx>
+#include <unx/helper.hxx>
 
 #include <vcl/inputtypes.hxx>
-#include <vcl/helper.hxx>
 
 #include "salwtype.hxx"
 #include <sal/macros.h>
diff --git a/vcl/unx/generic/fontmanager/helper.cxx b/vcl/unx/generic/fontmanager/helper.cxx
index d79c0bc..0377ead 100644
--- a/vcl/unx/generic/fontmanager/helper.cxx
+++ b/vcl/unx/generic/fontmanager/helper.cxx
@@ -29,7 +29,7 @@
 #include <rtl/bootstrap.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/urlobj.hxx>
-#include <vcl/helper.hxx>
+#include <unx/helper.hxx>
 #include <vcl/ppdparser.hxx>
 #include <memory>
 
diff --git a/vcl/unx/generic/print/text_gfx.cxx b/vcl/unx/generic/print/text_gfx.cxx
index 36f1776..bbb8ade 100644
--- a/vcl/unx/generic/print/text_gfx.cxx
+++ b/vcl/unx/generic/print/text_gfx.cxx
@@ -24,7 +24,7 @@
 
 #include "unx/printergfx.hxx"
 #include "unx/fontmanager.hxx"
-#include <vcl/helper.hxx>
+#include <unx/helper.hxx>
 
 #include "osl/thread.h"
 
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index a2d99e5..429cd54 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -22,10 +22,10 @@
 #include <comphelper/string.hxx>
 #include <vcl/ppdparser.hxx>
 #include <vcl/strhelper.hxx>
-#include <vcl/helper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
+#include <unx/helper.hxx>
 #include "unx/cupsmgr.hxx"
 
 #include "tools/urlobj.hxx"
commit c419d2f1b03750903422ffbeb9509bf8e158e6f8
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Wed Feb 8 18:03:47 2017 +0200

    Move the typedef where it is used
    
    Change-Id: I275e96ce3761b61b62748a1e75f1a7a88640e7cf

diff --git a/include/vcl/helper.hxx b/include/vcl/helper.hxx
index fc58895..1f89cba 100644
--- a/include/vcl/helper.hxx
+++ b/include/vcl/helper.hxx
@@ -34,8 +34,6 @@ namespace osl { class File; }
 namespace psp
 {
 
-typedef int fontID;
-
 void VCL_DLLPUBLIC getPrinterPathList( std::list< OUString >& rPathList, const char* pSubDir );
 
 // note: gcc 3.4.1 warns about visibility if we retunr a const OUString& here
diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
index dc714f80..55b6746 100644
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -48,6 +48,8 @@ class FontSelectPattern;
 namespace psp {
 class PPDParser;
 
+typedef int fontID;
+
 /*
  *  the difference between FastPrintFontInfo and PrintFontInfo
  *  is that the information in FastPrintFontInfo can usually

More information about the Libreoffice-commits mailing list