Date: prev next · Thread: first prev next last
2012 Archives by date, by thread · List index


Hello lo-devs,

this patch removes the unused (according to OpenGrok) GetIsoFallback
function from the tools module.

regards Marcel

---
 rsc/source/parser/rscdb.cxx     |    1 -
 tools/Library_tl.mk             |    1 -
 tools/Package_inc.mk            |    1 -
 tools/inc/tools/isofallback.hxx |   40 ----------------------
 tools/source/rc/isofallback.cxx |   70
---------------------------------------
 tools/source/rc/resmgr.cxx      |    2 -
 6 files changed, 0 insertions(+), 115 deletions(-)
 delete mode 100644 tools/inc/tools/isofallback.hxx
 delete mode 100644 tools/source/rc/isofallback.cxx


diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 2a36f69..3c8d93d 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -35,7 +35,6 @@
 
 #include <tools/fsys.hxx>
 #include <tools/rc.h>
-#include <tools/isofallback.hxx>
 #include <rtl/strbuf.hxx>
 #include <sal/macros.h>
 
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 8dc9215..30bf9fd 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -95,7 +95,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
     tools/source/misc/extendapplicationenvironment \
     tools/source/misc/getprocessworkingdir \
     tools/source/misc/solarmutex \
-    tools/source/rc/isofallback \
     tools/source/rc/rc \
     tools/source/rc/resary \
     tools/source/rc/resmgr \
diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk
index c17aedd..91642c4 100644
--- a/tools/Package_inc.mk
+++ b/tools/Package_inc.mk
@@ -53,7 +53,6 @@ $(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetdef.hxx,tools/inetdef.
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetmime.hxx,tools/inetmime.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetmsg.hxx,tools/inetmsg.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/inetstrm.hxx,tools/inetstrm.hxx))
-$(eval $(call gb_Package_add_file,tools_inc,inc/tools/isofallback.hxx,tools/isofallback.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/line.hxx,tools/line.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/link.hxx,tools/link.hxx))
 $(eval $(call gb_Package_add_file,tools_inc,inc/tools/list.hxx,tools/list.hxx))
diff --git a/tools/inc/tools/isofallback.hxx b/tools/inc/tools/isofallback.hxx
deleted file mode 100644
index 4a23462..0000000
--- a/tools/inc/tools/isofallback.hxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _ISOFALLBACK_HXX
-#define _ISOFALLBACK_HXX
-
-#include <rtl/string.hxx>
-#include "tools/toolsdllapi.h"
-
-// Return true if valid fallback found
-TOOLS_DLLPUBLIC bool GetIsoFallback(rtl::OString& rLanguage);
-
-#endif //_ISOFALLBACK_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/source/rc/isofallback.cxx b/tools/source/rc/isofallback.cxx
deleted file mode 100644
index 3c134df..0000000
--- a/tools/source/rc/isofallback.cxx
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#include <tools/isofallback.hxx>
-
-// -----------------------------------------------------------------------
-
-// Return true if valid fallback found
-bool GetIsoFallback(rtl::OString& rLanguage)
-{
-    rLanguage = rLanguage.trim();
-    if (!rLanguage.isEmpty())
-    {
-        sal_Int32 nSepPos = rLanguage.indexOf('-');
-        if (nSepPos == -1)
-        {
-            if (rLanguage.equalsL(RTL_CONSTASCII_STRINGPARAM("en")))
-            {
-                // en -> ""
-                rLanguage = rtl::OString();
-                return false;
-            }
-            else
-            {
-                // de -> en-US ;
-                rLanguage = rtl::OString(RTL_CONSTASCII_STRINGPARAM("en-US"));
-                return true;
-            }
-        }
-        else if( !(nSepPos == 1 && (rLanguage.toChar() == 'x' || rLanguage.toChar() == 'X')) )
-        {
-            // de-CH -> de ;
-            // try erase from -
-            sal_Int32 nIndex = 0;
-            rLanguage = rLanguage.getToken(0, '-', nIndex);
-            return true;
-        }
-    }
-    // "" -> ""; x-no-translate -> ""
-    rLanguage = rtl::OString();
-    return false;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index a4c3a86..647b738 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -51,8 +51,6 @@
 #include <i18npool/mslangid.hxx>
 #include <tools/simplerm.hxx>
 
-#include <tools/isofallback.hxx>
-
 #include <functional>
 #include <algorithm>
 #include <boost/unordered_map.hpp>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.