Repository.mk | 2
svl/qa/unit/makefile.mk | 95 ---------------------------------
svl/qa/unit/version.map | 34 ------------
svtools/Executable_langsupport.mk | 61 +++++++++++++++++++++
svtools/Module_svtools.mk | 7 ++
svtools/langsupport/langsupport.cxx | 101 ++++++++++++++++++++++++++++++++++++
6 files changed, 171 insertions(+), 129 deletions(-)
New commits:
commit 2b2bdcf84fc1ea41c4d9e69d53ba9f1177da9bdd
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri May 25 11:28:55 2012 +0100
add a little devtool to list the languages supported for spellchecking
Change-Id: Iad21ad040e797690a80f94e2eec8e38b8bffadb2
diff --git a/Repository.mk b/Repository.mk
index a7d7e53..ebefb94 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -98,6 +98,7 @@ $(eval $(call gb_Helper_register_executables,OOO,\
gengal \
guiloader \
guistdio \
+ langsupport \
odbcconfig \
officeloader \
quickstart \
@@ -127,6 +128,7 @@ $(eval $(call
gb_Helper_register_static_libraries,PLAINLIBS, \
else
$(eval $(call gb_Helper_register_executables,OOO,\
+ langsupport \
soffice.bin \
unopkg.bin \
gengal.bin \
diff --git a/svtools/Executable_langsupport.mk
b/svtools/Executable_langsupport.mk
new file mode 100644
index 0000000..5e3f11c
--- /dev/null
+++ b/svtools/Executable_langsupport.mk
@@ -0,0 +1,61 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., Caolán McNamara <caol...@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Executable_Executable,langsupport))
+
+$(eval $(call gb_Executable_set_targettype_gui,langsupport,YES))
+
+$(eval $(call gb_Executable_set_include,langsupport,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/svtools/inc \
+ -I$(SRCDIR)/svtools/inc/svtools \
+ -I$(SRCDIR)/svtools/source/inc \
+))
+
+$(eval $(call gb_Executable_use_api,langsupport,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Executable_use_libraries,langsupport,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ i18nisolang1 \
+ sal \
+ svt \
+ tl \
+ ucbhelper \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,langsupport,\
+ svtools/langsupport/langsupport \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/svtools/Module_svtools.mk b/svtools/Module_svtools.mk
index 2b0c9c8..c7f1122 100644
--- a/svtools/Module_svtools.mk
+++ b/svtools/Module_svtools.mk
@@ -41,6 +41,13 @@ $(eval $(call gb_Module_add_targets,svtools,\
Executable_bmpsum \
Executable_g2g \
))
+
+ifeq ($(GUI),UNX)
+$(eval $(call gb_Module_add_targets,svtools,\
+ Executable_langsupport \
+))
+endif
+
endif
$(eval $(call gb_Module_add_check_targets,svtools,\
diff --git a/svtools/langsupport/langsupport.cxx
b/svtools/langsupport/langsupport.cxx
new file mode 100644
index 0000000..1728fd1
--- /dev/null
+++ b/svtools/langsupport/langsupport.cxx
@@ -0,0 +1,101 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (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.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ * Caolán McNamara <caol...@redhat.com>
+ * Portions created by the Initial Developer are Copyright (C) 2011 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Caolán McNamara <caol...@redhat.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <comphelper/processfactory.hxx>
+#include <cppuhelper/bootstrap.hxx>
+#include <i18npool/mslangid.hxx>
+#include <sal/main.h>
+#include <svtools/langtab.hxx>
+#include <tools/extendapplicationenvironment.hxx>
+#include <ucbhelper/contentbroker.hxx>
+#include <vcl/svapp.hxx>
+#include <iostream>
+
+using namespace com::sun::star;
+
+SAL_IMPLEMENT_MAIN()
+{
+ tools::extendApplicationEnvironment();
+
+ uno::Reference<uno::XComponentContext> xContext =
+ cppu::defaultBootstrap_InitialComponentContext();
+
+ uno::Reference<lang::XMultiComponentFactory> xFactory =
+ xContext->getServiceManager();
+
+ uno::Reference<lang::XMultiServiceFactory> xSFactory(xFactory,
+ uno::UNO_QUERY_THROW);
+
+ comphelper::setProcessServiceFactory(xSFactory);
+
+ InitVCL(xSFactory);
+
+ {
+ SvtLanguageTable aTable;
+
+ sal_uInt32 nCount = aTable.GetEntryCount();
+ for (sal_uInt32 i = 0; i < nCount; ++i)
+ {
+ LanguageType eLang = aTable.GetTypeAtIndex(i);
+
+ if (eLang >= LANGUAGE_USER1 && eLang <= LANGUAGE_USER9)
+ continue;
+
+ if (eLang == LANGUAGE_DONTKNOW ||
+ eLang == LANGUAGE_NONE ||
+ eLang == LANGUAGE_HID_HUMAN_INTERFACE_DEVICE ||
+ eLang == LANGUAGE_SYSTEM)
+ {
+ continue;
+ }
+
+ lang::Locale aLocale;
+
+ MsLangId::convertLanguageToLocale(eLang, aLocale);
+
+ rtl::OUStringBuffer aBuf(aLocale.Language);
+ if (!aLocale.Country.isEmpty())
+ aBuf.append('-').append(aLocale.Country);
+ rtl::OUString sTag = aBuf.makeStringAndClear();
+
+ std::cout << rtl::OUStringToOString(sTag,
osl_getThreadTextEncoding()).getStr()
+ << std::endl;
+ }
+ }
+
+ DeInitVCL();
+
+ uno::Reference< lang::XComponent >(xContext,
uno::UNO_QUERY_THROW)->dispose();
+
+ return 0;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit c7489ede3869a9701d1081677bc8f040a78ec77b
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri May 25 10:26:18 2012 +0100
drop dead makefile.mk and version.map
Change-Id: I2a15f9685655b7c46893fcfe2d1ae102596522ca
diff --git a/svl/qa/unit/makefile.mk b/svl/qa/unit/makefile.mk
deleted file mode 100644
index 25ceb7a..0000000
--- a/svl/qa/unit/makefile.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (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.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-# Novell, Inc.
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-
-PRJ=..$/..
-PRJNAME=svl
-TARGET=qa_unit
-
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE : settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS) -I../../inc
-
-SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)$/svl.obj
-SHL1STDLIBS= \
- $(UNOTOOLSLIB) \
- $(SVLLIB) \
- $(TOOLSLIB) \
- $(I18NISOLANGLIB) \
- $(UCBHELPERLIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SOTLIB) \
- $(SALLIB) \
- $(CPPUNITLIB)
-
-SHL1IMPLIB = i$(SHL1TARGET)
-DEF1NAME = $(SHL1TARGET)
-SHL1VERSIONMAP=version.map
-
-.INCLUDE: target.mk
-
-.IF "$(OS)" == "WNT"
-my_file = file:///
-.ELSE
-my_file = file://
-.END
-
-ALLTAR: test
-
-$(MISC)$/$(TARGET)$/types.rdb .ERRREMOVE : $(SOLARBINDIR)$/types.rdb
- $(MKDIRHIER) $(@:d)
- $(GNUCOPY) $? $@
-
-$(MISC)/$(TARGET)/udkapi.rdb .ERRREMOVE : $(SOLARBINDIR)$/udkapi.rdb
- $(MKDIRHIER) $(@:d)
- $(GNUCOPY) $? $@
-
-#Make a services.rdb with the services we know we need to get up and running
-$(MISC)/$(TARGET)/services.rdb .ERRREMOVE : $(MISC)/$(TARGET)/udkapi.rdb
makefile.mk
- $(MKDIRHIER) $(@:d)
- $(REGCOMP) -register -br $(MISC)/$(TARGET)/udkapi.rdb -r $@ -wop \
- -c i18npool.uno$(DLLPOST)
-
-#Tweak things so that we use the .res files in the solver
-STAR_RESOURCEPATH:=$(PWD)/$(BIN)$(PATH_SEPERATOR)$(SOLARBINDIR)
-.EXPORT : STAR_RESOURCEPATH
-
-test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb
$(MISC)$/$(TARGET)$/types.rdb $(MISC)/$(TARGET)/udkapi.rdb
- @echo ----------------------------------------------------------
- @echo - start unit test \#1 on library $(SHL1TARGETN)
- @echo In the environment: STAR_RESOURCEPATH=$$STAR_RESOURCEPATH
- @echo ----------------------------------------------------------
- $(CPPUNITTESTER) $(SHL1TARGETN) \
- -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb \
- -env:UNO_TYPES="$(my_file)$(PWD)/$(MISC)/$(TARGET)/types.rdb
$(my_file)$(PWD)/$(MISC)/$(TARGET)/udkapi.rdb" \
- -env:BRAND_BASE_DIR="$(my_file)$(PWD)/$(MISC)/$(TARGET)" \
- -env:UNO_USER_PACKAGES_CACHE="$(my_file)$(PWD)/$(MISC)/$(TARGET)"
diff --git a/svl/qa/unit/version.map b/svl/qa/unit/version.map
deleted file mode 100644
index 3308588..0000000
--- a/svl/qa/unit/version.map
+++ /dev/null
@@ -1,34 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-UDK_3_0_0 {
- global:
- cppunitTestPlugIn;
-
- local:
- *;
-};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
