diff options
author | Khaled Hosny <khaledhosny@eglug.org> | 2017-02-08 18:10:15 +0200 |
---|---|---|
committer | Khaled Hosny <khaledhosny@eglug.org> | 2017-02-08 20:04:03 +0200 |
commit | 25912929cfba42099581c55380dbef18cb81b5b9 (patch) | |
tree | 11e4ac9ae52bf0f7ed0d53c12379eacad11de205 /include | |
parent | c419d2f1b03750903422ffbeb9509bf8e158e6f8 (diff) |
This is only used within vcl
Change-Id: I64d7e39506495e9fcc78bb670b897338a01a9ae1
Diffstat (limited to 'include')
-rw-r--r-- | include/vcl/helper.hxx | 60 | ||||
-rw-r--r-- | include/vcl/printerinfomanager.hxx | 2 |
2 files changed, 1 insertions, 61 deletions
diff --git a/include/vcl/helper.hxx b/include/vcl/helper.hxx deleted file mode 100644 index 1f89cbabdeaf..000000000000 --- a/include/vcl/helper.hxx +++ /dev/null @@ -1,60 +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_VCL_HELPER_HXX -#define INCLUDED_VCL_HELPER_HXX - -#include <list> - -#include <vcl/dllapi.h> -#include <vcl/vclevent.hxx> - -#include <rtl/ustring.hxx> - - -// forwards -namespace osl { class File; } - -namespace psp -{ - -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 -// seems to be a bug in gcc, now we return an object instead of a reference -VCL_DLLPUBLIC OUString const & getFontPath(); - -// normalized path (equivalent to realpath) -void VCL_DLLPUBLIC 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 ); - -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 ); - -} // namespace - - -#endif // INCLUDED_VCL_HELPER_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/printerinfomanager.hxx b/include/vcl/printerinfomanager.hxx index 4b1105df4337..f80633945b23 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> |