Re: Bug 46808
On 11/16/2012 04:42 AM, José Guilherme Vanz wrote:
I'm analizing some things new to do and I started to do this bug:
https://bugs.freedesktop.org/show_bug.cgi?id=46808
A warning about that issue first: Noel Grandin already did a lot of
work there, transferred many old-style services to new-style. What is
left by now is probably mostly delicate corner cases, so what's left of
this issue might have become a bit tough by now.
Well, When I was working in some sources I found something like this:
published service PropertySet
{
interface com::sun::star::beans::XPropertySet;
[optional] interface com::sun::star::beans::XFastPropertySet;
[optional] interface com::sun::star::beans::XMultiPropertySet;
[optional] interface com::sun::star::beans::XPropertyAccess;
[optional] interface com::sun::star::beans::XPropertyState;
};
This service description is somewhat special. Normally, there is a
single implementation for a service, and client code uses the service by
instantiating a (the) implementation and calling its methods. See,
e.g., com.sun.star.uri.UriReferenceFactory, implemented in
stoc/util/stocservices.component (resp.
stoc/source/uriproc/UriReferenceFactory.cxx), and used via
UriReferenceFactory::create in places like
avmedia/source/framework/mediaitem.cxx.
com.sun.star.beans.PropertySet is more like documentation; it states
that if a service (or even some arbitrary object) supports the notion of
properties, then it should implement the interfaces listed here. In
this case here, that is somewhat self-evident, and the service is of
little value and not widely used anyway (I found just two .component
files mentioning it, chart2/source/chartcore.copmonent and
chart2/source/controller/chartcontroller.component).
The bug's description guides to do something like that:
service Foo { interface XBar; };
Transform for:
service Foo: XBar;
In this case, what I do with [optional] when transform for new style?
Where could I find more documentation of .idl files?
In general, when transferring an old-style service that includes
optional interfaces to new style, one needs to decide whether to include
those interfaces in the new-style service's (multiple-inheritance)
interface as mandatory or optional. For example,
http://cgit.freedesktop.org/libreoffice/core/commit/?id=d2c45d0460cf99aadde1aaec11e032f488fa277b
fdo#46808, Adapt i18n::Transliteration UNO service to new style
changed com.sun.star.i18n.Transliteration from old-style
service Transliteration {
interface XTransliteration;
[optional] interface XExtendedTransliteration;
};
to new-style
service Transliteration: XExtendedTransliteration;
as the implementation of the service implemented that additional
XExtendedTransliteration (which inherits from XTransliteration, adding
functionality that was found necessary over time) anyway.
For documentation on UNOIDL, see the Developer's Guide at
http://wiki.openoffice.org/wiki/Documentation/DevGuide/OpenOffice.org_Developers_Guide.
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build environment for official win32 builds
On Thu, Nov 15, 2012 at 11:44:38AM +0100, Enrico Weigelt enrico.weig...@vnc.biz wrote: I'd like to setup an win32 build environment which reproduces the official win32 builds for verifying my patches. What do I need for that ? See http://wiki.documentfoundation.org/Development/Windows_Build_Dependencies and use the configure options from distro-configs/LibreOfficeWin32.conf ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: trying to build on 10.7 with 10.4 sdk
Le 15/11/2012 12:25, Jonathan Aquilina a écrit : Hi Jonathan, When i got this mac it had 10.5 installed and has been upgraded since. The issue I am having when trying to build with 10.4 is When building on Snow Leopard with the 10.4 SDK, I previously had to use a patched GCC because of some version problem, it was detailed on the wiki at one point. However, since then, I have upgraded, and building on Mountain Lion using the 10.6 SDK doesn't give me that problem anymore. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remove unused methods from unicode
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1087 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/87/1087/1 Remove unused methods from unicode Change-Id: I12004788d58809fbf5c135f6badf5cc3c184bd17 Signed-off-by: Marcos Paulo de Souza marcos.souza@gmail.com --- M i18nutil/inc/i18nutil/unicode.hxx M i18nutil/source/utility/unicode.cxx M unusedcode.easy 3 files changed, 0 insertions(+), 15 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1087 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I12004788d58809fbf5c135f6badf5cc3c184bd17 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Platform ports vs. multiplatform
Hi Enrico, On Thu, 2012-11-15 at 20:57 +0100, Enrico Weigelt wrote: note that most of that can be handled by a proper file in ./distro-config/. yes, but at least according to debian/ubuntu build rules, that doenst seem to be enough. (debian's rule file is over 3k LOC) Ah - that does seem a tad unfortunate. I'm sure there are lots of good things in debian's rules file that we could fold into the core and make easier for distributors in an incremental fashion. Having not read the file - I've no concrete ideas there :-) but ... at least looking at how some of our .spec files re-order and re-group the scp2 break-down to get the packaging prettier lots could be improved in that bit alone. --disable-epm ? I'm talking about dropping it completely in my branch. By the way: what is this actually used for ? Not sure about the other distros, but Debian+friends dont seem to use it. Oh; EPM is used to build the generic cross-distribution packages that we ship for Linux. HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: reorganizing ./configure --help output ?
Hi Enrico, On Thu, 2012-11-15 at 22:16 +0100, Enrico Weigelt wrote: is it possible to reorganize the ./configure help options into several groups for easier reading ? Grief - the re-ordering is done by changing the order of the options in configure.in. That tends to generate -huge- patches and screws with the interdependency of various options (if we're not quite careful). The last monster attempt to sort that list in some other way (alphabetical?) broke a chunk of stuff for no significant gain (IMHO) :-) So it might be better to do that in a branch - though it'll be hellish to maintain ... ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
renamed --enable-packagekit to --enable-font-autoinstall
Michael Meeks has abandoned this change. Change subject: renamed --enable-packagekit to --enable-font-autoinstall .. Patch Set 2: Abandoned Renaming configure options has quite a large impact on the costs of all distributors - in general it's nice to keep this to whatever minimum is achievable. In this case it is a new option. So far the packagekit code only enables font installation (quite possible) - but in due course it will do much more: clipart, help etc. so I'd prefer to keep it as --enable-packagekit. Thanks ! :-) -- To view, visit https://gerrit.libreoffice.org/1085 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Idb951032a0de33d712cb1551a5696d88ebd29373 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Enrico Weigelt, metux IT service metuxitserv...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Adding icons to the template manager
Hi Alex, Alexander Wilms píše v Čt 15. 11. 2012 v 23:27 +0100: I pushed the icons already and now tried to compile it with your changes. The earlier issues are gone, but now the compiler is complaining about missing icon files: [build RES] sfxen-US f268: Error: The image(s) actionview026 actionview010 actionview025 actionview028 actionaction012 actionaction013 actiontemplates015 actiontemplates016 actiontemplates019 actiontemplates017 actiontemplates020 actiontemplates018 could not be found. Terminating compiler make[2]: *** [/home/alexander/libo/workdir/unxlngx6.pro/ResTarget/sfxen-US.res] Fehler 1 What's a bit strange are the high indexes like 026 etc. Do you know whether there's some documentation on how one is supposed to name the files? I tried to find something via Google, but to no avail :/ That's expected - the indexes are not count according to their position in the imagelist, but instead according to the IdList. Check sfx2/source/doc/templatedlg.hrc for the values, eg. #define TBI_TEMPLATE_REPOSITORY 26 ie. TBI_TEMPLATE_REPOSITORY will be actionview026, etc. Sorry - I forgot about this detail in the previous mail. All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: README.cross
README.cross | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) New commits: commit 3dab6fba4a53c12da0fc886cca61b9a89a311a4e Author: Miklos Vajna vmik...@suse.cz Date: Fri Nov 16 11:11:07 2012 +0100 README.cross: update Android arm configure options Change-Id: Ibcd1890f4ac82ef0548e90842604748027811b5d diff --git a/README.cross b/README.cross index d72954d..e706f1d 100644 --- a/README.cross +++ b/README.cross @@ -351,14 +351,12 @@ OS X 10.8 with Xcode 4.4.1: And here is an autogen.lastrun for Android when cross-compiling from Linux: +--with-distro=LibreOfficeAndroid +--build=x86_64-unknown-linux-gnu --with-android-ndk=/home/tml/android-ndk-r8b --with-android-ndk-toolchain-version=4.6 ---with-android-sdk=/home/tml/android-sdk-linux_x86 ---with-ant-home=/opt/apache-ant-1.8.2 ---build=x86_64-unknown-linux-gnu ---disable-zenity ---disable-python ---with-distro=LibreOfficeAndroid +--with-android-sdk=/home/tml/android-sdk-linux +--with-java-target-version=1.5 And here is an autogen.lastrun for Android when cross-compiling to x86 from Linux: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Build environment for official win32 builds
Hi Enrico, On Fri, 2012-11-16 at 11:22 +0100, Enrico Weigelt wrote: and use the configure options from distro-configs/LibreOfficeWin32.conf Thanks. Is there some specific reason for using MSVC instead of gcc ? Currently ABI backwards-compatibility for compiled extensions. There is some resistance to breaking that - also so far MSVC produces faster, smaller binaries (IIRC). Of course we can cross-compile to windows from Linux too using the mingw goodness - we even have a live tinderbox doing that. That's a great way to go about it. Is it possible to build w/ Qt or Gtk instead of native widget set ? Nope - we use those widgets sets only for theming - we use our own VCL widgets on all platforms really; and of course native dialogs - like the windows file dialog on windows wherever possible. HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build environment for official win32 builds
Is there some specific reason for using MSVC instead of gcc ? Currently ABI backwards-compatibility for compiled extensions. There are also some features in the code that don't compile with MinGW. They use API that MinGW does not provide headers for etc. Let me also point out that we definitely do not want to build *locally* on Windows with GCC (MinGW). MinGW makes sense to us only for cross-compilation. If one wants to build locally on a Windows machine, use MSVC. Note that when we say MinGW, we actually mean mingw-w64, a fork of MinGW that provides a more complete set of headers and import libraries for various Windows APIs. (Despite the w64 in the name, they do provide a tool-chain producing 32-bit code, too.) --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: [PATCH] fdo#50950 modify calc functions WEEKNUM(_ADD) to comply with ODFF1.2
Hi Winfried, a common question in ML, Ask and forums, is about the functions: SUMIFS 6.16.63, AVERAGEIFS 6.18.6, COUNTIFS 6.13.10 (OpenDocument-v1.2-part2) People often do not understand very well how to use SUMPRODUCT() or matrix formulas, and with them, is more complicate the use of regular expressions. I do not use MS in anyway but I think this functions are there, and if I not in a mistake, also will be introduced in AOO. I think they could be very helpful, and good for a best interoperability. Miguel Ángel. -- View this message in context: http://nabble.documentfoundation.org/PATCH-fdo-50950-modify-calc-functions-WEEKNUM-ADD-to-comply-with-ODFF1-2-tp4011230p4018927.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: offapi/org offapi/UnoApi_offapi.mk shell/source svtools/inc svtools/source
offapi/UnoApi_offapi.mk |1
offapi/org/freedesktop/PackageKit/SyncDbusSessionHelper.idl | 26 +
shell/source/sessioninstall/SyncDbusSessionHelper.hxx |2
svtools/inc/svtools/templdlg.hxx|2
svtools/source/contnr/templwin.cxx | 34
svtools/source/contnr/templwin.hrc |1
svtools/source/contnr/templwin.src |7 ++
7 files changed, 72 insertions(+), 1 deletion(-)
New commits:
commit b6c6fc8cedcc7ffc774b8e7373087c7b09479dff
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Thu Nov 15 00:54:30 2012 +0100
template pack installer
- so this adds a button to the templates dialog to install
https://launchpad.net/ubuntu/+source/libreoffice-templates/0.1.20120814-0ubuntu2
which is packed from
http://cgit.freedesktop.org/libreoffice/templates
- could be packed and used like that on other distros
- disabled when service is not available
Change-Id: I55d5bada25693070aae5e5f9e0e77bf8aa52e982
Reviewed-on: https://gerrit.libreoffice.org/1071
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 3d81584..3620e07 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -4293,6 +4293,7 @@ $(eval $(call
gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/xsd,\
))
$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/org/freedesktop/PackageKit,\
+SyncDbusSessionHelper \
XSyncDbusSessionHelper \
XModify \
XQuery \
diff --git a/offapi/org/freedesktop/PackageKit/SyncDbusSessionHelper.idl
b/offapi/org/freedesktop/PackageKit/SyncDbusSessionHelper.idl
new file mode 100644
index 000..72642aa
--- /dev/null
+++ b/offapi/org/freedesktop/PackageKit/SyncDbusSessionHelper.idl
@@ -0,0 +1,26 @@
+/* -*- 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/.
+ */
+#ifndef org_freedesktop_PackageKit_SyncDbusSessionHelper_idl
+#define org_freedesktop_PackageKit_SyncDbusSessionHelper_idl
+
+#include org/freedesktop/PackageKit/XSyncDbusSessionHelper.idl
+
+module org {
+module freedesktop {
+module PackageKit {
+
+service SyncDbusSessionHelper : XSyncDbusSessionHelper;
+
+} ; // PackageKit
+} ; // freedesktop
+} ; // org
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
index 6f86ecb..32c1ac1 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx
@@ -12,7 +12,7 @@
#include com/sun/star/lang/XMultiServiceFactory.hpp
#include com/sun/star/uno/XComponentContext.hpp
-#include org/freedesktop/PackageKit/XSyncDbusSessionHelper.hpp
+#include org/freedesktop/PackageKit/SyncDbusSessionHelper.hpp
#include cppuhelper/implbase1.hxx
namespace shell { namespace sessioninstall
diff --git a/svtools/inc/svtools/templdlg.hxx b/svtools/inc/svtools/templdlg.hxx
index ba195a5..ced95e2 100644
--- a/svtools/inc/svtools/templdlg.hxx
+++ b/svtools/inc/svtools/templdlg.hxx
@@ -47,6 +47,7 @@ private:
FixedHyperlink aMoreTemplatesLink;
FixedLine aLine;
PushButton aManageBtn;
+PushButton aPackageBtn;
PushButton aEditBtn;
OKButtonaOKBtn;
CancelButtonaCancelBtn;
@@ -60,6 +61,7 @@ private:
DECL_DLLPRIVATE_LINK( SendFocusHdl_Impl, void* );
DECL_DLLPRIVATE_LINK( OKHdl_Impl, PushButton* );
DECL_DLLPRIVATE_LINK( OrganizerHdl_Impl, void* );
+DECL_DLLPRIVATE_LINK( PackageHdl_Impl, void* );
DECL_DLLPRIVATE_LINK( UpdateHdl_Impl, Timer* );
DECL_DLLPRIVATE_LINK( OpenLinkHdl_Impl, void* );
diff --git a/svtools/source/contnr/templwin.cxx
b/svtools/source/contnr/templwin.cxx
index c6df373..f0e41cc 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -72,6 +72,7 @@
#include com/sun/star/system/SystemShellExecute.hpp
#include com/sun/star/system/SystemShellExecuteFlags.hpp
#include com/sun/star/task/InteractionHandler.hpp
+#include org/freedesktop/PackageKit/SyncDbusSessionHelper.hpp
#include unotools/localedatawrapper.hxx
#include com/sun/star/container/XNameContainer.hpp
#include vcl/waitobj.hxx
@@ -1425,6 +1426,7 @@ SvtDocumentTemplateDialog::SvtDocumentTemplateDialog(
Window* pParent ) :
aMoreTemplatesLink ( this, SvtResId(
[Libreoffice-commits] .: unotools/inc unotools/source
unotools/inc/unotools/intlwrapper.hxx|8 +---
unotools/inc/unotools/transliterationwrapper.hxx |8 ++--
unotools/source/config/lingucfg.cxx | 13 +++---
unotools/source/config/syslocaleoptions.cxx | 44 ++-
unotools/source/i18n/intlwrapper.cxx | 16
unotools/source/i18n/localedatawrapper.cxx | 19 +++--
unotools/source/i18n/textsearch.cxx |5 +-
unotools/source/i18n/transliterationwrapper.cxx | 22 +--
8 files changed, 63 insertions(+), 72 deletions(-)
New commits:
commit 2814ecb92f9dc1f60094cfa41ab1fa6eaa03471b
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 16 12:29:37 2012 +0100
converted to use LanguageTag
Change-Id: I25c5d965d953146e91903cf2ff8e6b58f978ad20
diff --git a/unotools/inc/unotools/intlwrapper.hxx
b/unotools/inc/unotools/intlwrapper.hxx
index a6ec4e3..aceba1d 100644
--- a/unotools/inc/unotools/intlwrapper.hxx
+++ b/unotools/inc/unotools/intlwrapper.hxx
@@ -47,15 +47,13 @@ class UNOTOOLS_DLLPUBLIC IntlWrapper
{
private:
-::com::sun::star::lang::Locale aLocale;
+LanguageTag aLanguageTag;
::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory xSMgr;
LocaleDataWrapper* pLocaleData;
CollatorWrapper*pCollator;
CollatorWrapper*pCaseCollator;
-LanguageTypeeLanguage;
-
voidImplNewLocaleData() const;
voidImplNewCollator( sal_Bool bCaseSensitive )
const;
@@ -71,8 +69,8 @@ public:
);
~IntlWrapper();
-LanguageTypegetLanguage() const { return eLanguage; }
-const ::com::sun::star::lang::Locale getLocale() const { return
aLocale; }
+LanguageTypegetLanguage() const { return
aLanguageTag.getLanguageType(); }
+const ::com::sun::star::lang::Locale getLocale() const { return
aLanguageTag.getLocale(); }
const LocaleDataWrapper*getLocaleData() const
{
diff --git a/unotools/inc/unotools/transliterationwrapper.hxx
b/unotools/inc/unotools/transliterationwrapper.hxx
index 3a0a8de..18b7072 100644
--- a/unotools/inc/unotools/transliterationwrapper.hxx
+++ b/unotools/inc/unotools/transliterationwrapper.hxx
@@ -22,6 +22,7 @@
#define _UNOTOOLS_TRANSLITERATIONWRAPPER_HXX
#include tools/string.hxx
#include tools/solar.h
+#include i18npool/languagetag.hxx
#include com/sun/star/i18n/XExtendedTransliteration.hpp
namespace com { namespace sun { namespace star {
@@ -37,9 +38,8 @@ class UNOTOOLS_DLLPUBLIC TransliterationWrapper
{
::com::sun::star::uno::Reference
::com::sun::star::i18n::XExtendedTransliteration xTrans;
-::com::sun::star::lang::Locale aLocale;
+LanguageTag aLanguageTag;
sal_uInt32 nType;
-sal_uInt16 nLanguage;
mutable sal_Bool bFirstCall;
// not implemented, prevent usage
@@ -57,8 +57,8 @@ public:
~TransliterationWrapper();
// get current Locale / Language
-const ::com::sun::star::lang::Locale getLocale() const { return aLocale;}
-sal_uInt16 getLanguage() const { return nLanguage; }
+const ::com::sun::star::lang::Locale getLocale() const { return
aLanguageTag.getLocale();}
+sal_uInt16 getLanguage() const { return aLanguageTag.getLanguageType(); }
sal_uInt32 getType() const { return nType; }
diff --git a/unotools/source/config/lingucfg.cxx
b/unotools/source/config/lingucfg.cxx
index 7407d82..7c1893b 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -29,6 +29,7 @@
#include rtl/instance.hxx
#include osl/mutex.hxx
#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include tools/debug.hxx
#include tools/string.hxx
#include unotools/lingucfg.hxx
@@ -61,7 +62,7 @@ static sal_Bool lcl_SetLocale( sal_Int16 rLanguage, const
uno::Any rVal )
lang::Locale aNew;
if (rVal = aNew) // conversion successful?
{
-sal_Int16 nNew = MsLangId::convertLocaleToLanguage( aNew );
+sal_Int16 nNew = LanguageTag( aNew ).getLanguageType( false);
if (nNew != rLanguage)
{
rLanguage = nNew;
@@ -75,7 +76,7 @@ static inline const OUString lcl_LanguageToCfgLocaleStr(
sal_Int16 nLanguage )
{
OUString aRes;
if (LANGUAGE_SYSTEM != nLanguage)
-aRes = MsLangId::convertLanguageToIsoString( nLanguage );
+aRes = LanguageTag( nLanguage ).getBcp47();
return aRes;
}
@@ -83,7 +84,7 @@ static sal_Int16 lcl_CfgAnyToLanguage( const uno::Any rVal )
{
OUString aTmp;
rVal = aTmp;
-return (aTmp.isEmpty()) ? LANGUAGE_SYSTEM :
MsLangId::convertIsoStringToLanguage( aTmp );
+return (aTmp.isEmpty()) ? LANGUAGE_SYSTEM : LanguageTag( aTmp
).getLanguageType();
}
RE: [PATCH] fdo#50950 modify calc functions WEEKNUM(_ADD) to comply with ODFF1.2
Hi Miguel, SUMIFS 6.16.63, AVERAGEIFS 6.18.6, COUNTIFS 6.13.10 The functions you name wait for license clearance to integrate the OOo code for these functions in LibO. fdo 41214 is about SUMIFS, AVERAGEIF(S) and COUNTIFS, you can read about all the details there. Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: unotools/source
unotools/source/config/syslocaleoptions.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5138bde880dcd9c7cf7f0d5ff57510d4d6702846
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 16 13:36:15 2012 +0100
merge failure
Change-Id: I5c716353b231d9c36972bce8c99d9c3c3e74b1e4
diff --git a/unotools/source/config/syslocaleoptions.cxx
b/unotools/source/config/syslocaleoptions.cxx
index e37725f..f3febee 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -123,8 +123,8 @@ public:
sal_BoolIsReadOnly( SvtSysLocaleOptions::EOption
eOption ) const;
const Locale GetRealLocale() { return
m_aRealLocale.getLocale(); }
const Locale GetRealUILocale() { return
m_aRealUILocale.getLocale(); }
-LanguageTypeGetRealLanguage() { return
m_eRealLanguage.getLanguageType(); }
-LanguageTypeGetRealUILanguage() { return
m_eRealUILanguage.getLanguageType(); }
+LanguageTypeGetRealLanguage() { return
m_eRealLocale.getLanguageType(); }
+LanguageTypeGetRealUILanguage() { return
m_eRealUILocale.getLanguageType(); }
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/JavaClassSet.mk |2 +- solenv/gbuild/JunitTest.mk|2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 60d2248aef20aa1363ef8624ff303c854c68dafe Author: Enrico Weigelt, metux ITS metuxitserv...@googlemail.com Date: Wed Nov 14 18:19:26 2012 +0100 fixed java classpath parameter (required for gcj) Change-Id: I0ad426a8791ab514978e01914f9f797b45d0c79a Reviewed-on: https://gerrit.libreoffice.org/1073 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index b5b7439..fab3ae4 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -47,7 +47,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(filter-out $(JARDEPS),$(4))) \ $(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \ $(gb_JavaClassSet_JAVACDEBUG) \ - -cp $(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2)) \ + -classpath $(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2)) \ -d $(call gb_JavaClassSet_get_classdir,$(2)) \ @$$RESPONSEFILE ) \ rm -f $$RESPONSEFILE ) \ diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index fbe87fd..6ed1f77 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -49,7 +49,7 @@ $(call gb_JunitTest_get_target,%) : mkdir -p $(call gb_JunitTest_get_userdir,$*) \ (DBGSV_ERROR_OUT=shell DISABLE_SAL_DBGBOX=t \ $(gb_JunitTest_JAVACOMMAND) \ --cp $(T_CP) \ +-classpath $(T_CP) \ $(DEFS) \ org.junit.runner.JUnitCore \ $(CLASSES) $@.log 21 || \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fixed java classpath parameter (required for gcj)
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1073 Approvals: Michael Stahl: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1073 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0ad426a8791ab514978e01914f9f797b45d0c79a Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Enrico Weigelt, metux IT service metuxitserv...@googlemail.com Gerrit-Reviewer: Enrico Weigelt, metux IT service metuxitserv...@googlemail.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: unotools/inc unotools/Library_utl.mk
unotools/Library_utl.mk |1 + unotools/inc/unotools/intlwrapper.hxx |1 + 2 files changed, 2 insertions(+) New commits: commit 9f7cf6c8e50d4eadd2aac2d2bec675f7d8d78d07 Author: Eike Rathke er...@redhat.com Date: Fri Nov 16 13:50:31 2012 +0100 correct include order and include languagetag.hxx Change-Id: If7b7d10765faba62907eca35f77b8e8d4a1e9391 diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index 7dafeda..ba34494 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Library_set_componentfile,utl,unotools/util/utl)) # add any additional include paths for this library here $(eval $(call gb_Library_set_include,utl,\ +-I$(SRCDIR)/unotools/inc \ $$(INCLUDE) \ )) diff --git a/unotools/inc/unotools/intlwrapper.hxx b/unotools/inc/unotools/intlwrapper.hxx index aceba1d..fa26250 100644 --- a/unotools/inc/unotools/intlwrapper.hxx +++ b/unotools/inc/unotools/intlwrapper.hxx @@ -25,6 +25,7 @@ #include unotools/calendarwrapper.hxx #include unotools/collatorwrapper.hxx #include i18npool/lang.h +#include i18npool/languagetag.hxx /** ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: unotools/source
unotools/source/config/syslocaleoptions.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 3f4c6698d56a345f7624ebc0aad4f0b041f0fc3e
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 16 13:56:37 2012 +0100
need more coffee
Change-Id: I0ca6898de11e42a36453e3f0fae8d86d84c9352f
diff --git a/unotools/source/config/syslocaleoptions.cxx
b/unotools/source/config/syslocaleoptions.cxx
index f3febee..b05837e 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -123,8 +123,8 @@ public:
sal_BoolIsReadOnly( SvtSysLocaleOptions::EOption
eOption ) const;
const Locale GetRealLocale() { return
m_aRealLocale.getLocale(); }
const Locale GetRealUILocale() { return
m_aRealUILocale.getLocale(); }
-LanguageTypeGetRealLanguage() { return
m_eRealLocale.getLanguageType(); }
-LanguageTypeGetRealUILanguage() { return
m_eRealUILocale.getLanguageType(); }
+LanguageTypeGetRealLanguage() { return
m_aRealLocale.getLanguageType(); }
+LanguageTypeGetRealUILanguage() { return
m_aRealUILocale.getLanguageType(); }
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bin/lo-generate-source-tarball
bin/lo-generate-source-tarball | 182 +
1 file changed, 182 insertions(+)
New commits:
commit 6527f30e24e889810c9a895508dec0c9e6309076
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Fri Nov 16 07:20:36 2012 -0600
add a script to generate the source tarball post submodule
To simplify things, we generate the source tarball with
all the submodules included.
so building from source should now be:
wget the tarball and untar
cd into the resulting directory
./autogen.sh + make
Change-Id: Ie8e65a81309cf11728c5144c9001f7d96670f815
diff --git a/bin/lo-generate-source-tarball b/bin/lo-generate-source-tarball
new file mode 100755
index 000..cbaace5
--- /dev/null
+++ b/bin/lo-generate-source-tarball
@@ -0,0 +1,182 @@
+#!/bin/env bash
+
+if [ -n $debug ] ; then
+set -x
+fi
+
+BIN_DIR=$(dirname $0)
+CORE_DIR=$(realpath $BIN_DIR/..)
+GEN_BZ2=false
+GEN_MD5=false
+GEN_XZ=false
+OUT_DIR=${CORE_DIR?}
+VERSION=
+
+usage()
+{
+cat EOF
+Usage: $0 [ --xz ] [ --bz2 ] [ --md5 ] [ --output-dir=output location ]
+ [ --core-dir=core-repo-location ] [--version=package_version] label
+
+--xz generate a package compressed with xz (default)
+--bz2generate a package compressed with bz2. Note if you specify
+ both --cz and --bz2, both are created. if you specify neither
+ --xz is impliied.
+--md5generate a md5 signature for the generated pacakge(s)
+--output-dir where to put the generated packages
+--core-dir location of the core repo to extract sources from.
+ by default this is one directory up from the position
+ of this script.
+--versionversion string used to generate the name of the pacakge
+ the source pacakge name is libreoffice-version.tar.[bz2|xz]
+
+EOF
+}
+while [ ${1} != ]; do
+parm=${1%%=*}
+arg=${1#*=}
+has_arg=
+if [ ${1} != ${parm?} ] ; then
+ has_arg=1
+else
+ arg=
+fi
+#echo parm=!${parm}!
+#echo arg=!${arg}!
+case ${parm} in
+-2|--bz2)
+ GEN_BZ2=true
+ ;;
+ -x|--xz)
+ GEN_XZ=true
+ ;;
+ -5|--md5)
+ GEN_MD5=true
+ ;;
+ -o|--output-dir)
+ if [ -z ${has_arg} ] ; then
+ shift;
+ arg=$1
+ fi
+ if [ -z ${arg} ] ; then
+ echo Missing argument for option $parm 12
+ exit -1
+ else
+ OUT_DIR=$arg
+ fi
+ ;;
+ -v|--version)
+ if [ -z ${has_arg} ] ; then
+ shift;
+ arg=$1
+ fi
+ if [ -z ${arg} ] ; then
+ echo Missing argument for option $parm 12
+ exit -1
+ else
+ VERSION=$arg
+ fi
+ ;;
+ -h|--help)
+ usage
+ exit 0
+ ;;
+-*)
+ echo Invalid option $1 12
+ exit -1
+ ;;
+ *)
+ if [ -z ${LABEL} ] ; then
+ LABEL=$parm
+ else
+ echo Too many arguments.. $@ 12
+ exit -1
+ fi
+ ;;
+esac
+shift
+done
+
+# we need a label
+if [ -z ${LABEL} ] ; then
+echo Missing argument. we need a git label as source 12
+exit 1
+fi
+
+# default to xz compression
+if ! ${GEN_BZ2?} ! ${GEN_XZ?} ; then
+GEN_XZ=true
+fi
+
+# --version= is mandatory
+if [ -z ${VERSION} ] ; then
+VERSION=${LABEL?}
+fi
+
+base_name=libreoffice-${VERSION}
+
+# --output-dir default to core-dir
+if [ -z ${OUT_DIR} ] ; then
+OUT_DIR=$CORE_DIR?}
+fi
+
+if [ ! -d ${CORE_DIR?} ] ; then
+echo Core repo directory $CORE_DIR does not exist or is not a directory
12
+exit 1
+fi
+
+if [ ! -d ${CORE_DIR?}/.git ] ; then
+echo Core repo $CORE_DIR is not a git repo 12
+exit 1
+fi
+
+if [ ! -d ${OUT_DIR?} ] ; then
+echo Output directory $OUT_DIR does not exist or is not a directory 12
+exit 1
+fi
+
+
+pushd ${CORE_DIR} /dev/null
+
+
+echo archiving core...
+git archive --format=tar --prefix=${base_name?} -o
${OUT_DIR}/${base_name}.tar ${LABEL?}
+
+
+concatenate_list=
+for module in dictionaries helcontent2 translations ; do
+if [ ! -f ${module?}/.git ] ; then
+ echo Warning: module $module is not present 12
+else
+ echo archiving ${module?}...
+ git archive --format=tar --prefix=${base_name?}/${module?} -o
${OUT_DIR}/${base_name}-${module?}.tar ${LABEL?}
+ concatenate_list=${concatenate_list?}
${OUT_DIR}/${base_name}-${module?}.tar
+fi
+done
+
+if [ -n ${concatenate_list?} ] ; then
+tar --concatenate --file=${OUT_DIR}/${base_name}.tar ${concatenate_list?}
+rm ${concatenate_list?}
+fi
+
+if ${GEN_BZ2?} ; then
+echo bzip2 compression...
+bzip2 -fkz ${OUT_DIR}/${base_name}.tar
+if ${GEN_MD5?} ;
[Libreoffice-commits] .: i18npool/inc i18npool/qa i18npool/source
i18npool/inc/i18npool/languagetag.hxx | 12 +
i18npool/qa/cppunit/test_languagetag.cxx| 30 ++
i18npool/source/languagetag/languagetag.cxx | 58
3 files changed, 100 insertions(+)
New commits:
commit 2eb9470c14b665f69c87035fe33a71860fcf2600
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 16 14:33:12 2012 +0100
added LanguageTag::reset() methods
Change-Id: Id78a989ab981d658dd8f331b030e00ce201c8bc9
diff --git a/i18npool/inc/i18npool/languagetag.hxx
b/i18npool/inc/i18npool/languagetag.hxx
index aaf4ca3..5666fd1 100644
--- a/i18npool/inc/i18npool/languagetag.hxx
+++ b/i18npool/inc/i18npool/languagetag.hxx
@@ -162,6 +162,16 @@ public:
*/
boolisSystemLocale() const;
+
+/** Reset with existing BCP 47 language tag string. See ctor. */
+voidreset( const rtl::OUString
rBcp47LanguageTag, bool bCanonicalize = false );
+
+/** Reset with Locale. */
+voidreset( const com::sun::star::lang::Locale
rLocale );
+
+/** Reset with LanguageType MS-LangID. */
+voidreset( LanguageType nLanguage );
+
private:
enum Decision
@@ -202,6 +212,8 @@ private:
rtl::OUString getScriptFromLangtag() const;
rtl::OUString getRegionFromLangtag() const;
+voidresetVars();
+
static bool isIsoLanguage( const rtl::OUString rLanguage );
static bool isIsoScript( const rtl::OUString rScript );
static bool isIsoCountry( const rtl::OUString rRegion );
diff --git a/i18npool/qa/cppunit/test_languagetag.cxx
b/i18npool/qa/cppunit/test_languagetag.cxx
index 3bb7163..deaeecd 100644
--- a/i18npool/qa/cppunit/test_languagetag.cxx
+++ b/i18npool/qa/cppunit/test_languagetag.cxx
@@ -165,6 +165,36 @@ void TestLanguageTag::testAllTags()
CPPUNIT_ASSERT( de_DE.getLanguageType() == LANGUAGE_GERMAN );
}
+// test reset() methods
+{
+LanguageTag aTag( LANGUAGE_DONTKNOW );
+lang::Locale aLocale;
+
+aTag.reset( LANGUAGE_GERMAN );
+aLocale = aTag.getLocale();
+CPPUNIT_ASSERT( aTag.getBcp47() == de-DE );
+CPPUNIT_ASSERT( aLocale.Language == de );
+CPPUNIT_ASSERT( aLocale.Country == DE );
+CPPUNIT_ASSERT( aLocale.Variant == );
+CPPUNIT_ASSERT( aTag.getLanguageType() == LANGUAGE_GERMAN );
+
+aTag.reset( en-US );
+aLocale = aTag.getLocale();
+CPPUNIT_ASSERT( aTag.getBcp47() == en-US );
+CPPUNIT_ASSERT( aLocale.Language == en );
+CPPUNIT_ASSERT( aLocale.Country == US );
+CPPUNIT_ASSERT( aLocale.Variant == );
+CPPUNIT_ASSERT( aTag.getLanguageType() == LANGUAGE_ENGLISH_US );
+
+aTag.reset( lang::Locale( de, DE, ) );
+aLocale = aTag.getLocale();
+CPPUNIT_ASSERT( aTag.getBcp47() == de-DE );
+CPPUNIT_ASSERT( aLocale.Language == de );
+CPPUNIT_ASSERT( aLocale.Country == DE );
+CPPUNIT_ASSERT( aLocale.Variant == );
+CPPUNIT_ASSERT( aTag.getLanguageType() == LANGUAGE_GERMAN );
+}
+
{
OUString s_uab( unreg-and-bad );
LanguageTag uab( s_uab, true );
diff --git a/i18npool/source/languagetag/languagetag.cxx
b/i18npool/source/languagetag/languagetag.cxx
index ad8b9c1..3e655ee 100644
--- a/i18npool/source/languagetag/languagetag.cxx
+++ b/i18npool/source/languagetag/languagetag.cxx
@@ -288,6 +288,64 @@ LanguageTag::~LanguageTag()
}
+void LanguageTag::resetVars()
+{
+lt_tag_unref( MPLANGTAG);
+mpImplLangtag = NULL;
+
+maLocale= lang::Locale();
+if (!maBcp47.isEmpty())
+maBcp47 = OUString();
+if (!maCachedLanguage.isEmpty())
+maCachedLanguage= OUString();
+if (!maCachedScript.isEmpty())
+maCachedScript = OUString();
+if (!maCachedCountry.isEmpty())
+maCachedCountry = OUString();
+mnLangID= LANGUAGE_DONTKNOW;
+meIsValid = DECISION_DONTKNOW;
+meIsIsoLocale = DECISION_DONTKNOW;
+meIsIsoODF = DECISION_DONTKNOW;
+mbSystemLocale = true;
+mbInitializedBcp47 = false;
+mbInitializedLocale = false;
+mbInitializedLangID = false;
+mbCachedLanguage= false;
+mbCachedScript = false;
+mbCachedCountry = false;
+}
+
+
+void LanguageTag::reset( const rtl::OUString rBcp47LanguageTag, bool
bCanonicalize )
+{
+resetVars();
+maBcp47 = rBcp47LanguageTag;
+mbSystemLocale = rBcp47LanguageTag.isEmpty();
+mbInitializedBcp47 = !mbSystemLocale;
+
+if (bCanonicalize)
+canonicalize();
+}
+
+
+void LanguageTag::reset( const com::sun::star::lang::Locale rLocale )
+{
+resetVars();
+maLocale= rLocale;
+mbSystemLocale = rLocale.Language.isEmpty();
+mbInitializedLocale = !mbSystemLocale;
+}
+
+
+void LanguageTag::reset( LanguageType
[Libreoffice-commits] .: unotools/source
unotools/source/config/syslocaleoptions.cxx |8
unotools/source/i18n/transliterationwrapper.cxx |4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 7ccdadb57c18e53e887ac294a26f3756e7843927
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 16 14:42:22 2012 +0100
use LanguageTag::reset()
Change-Id: I592cb042465ceda960a0b34dfe3eb6d669868acf
diff --git a/unotools/source/config/syslocaleoptions.cxx
b/unotools/source/config/syslocaleoptions.cxx
index b05837e..10c7574 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -291,11 +291,11 @@ void SvtSysLocaleOptions_Impl::MakeRealLocale()
if (m_aLocaleString.isEmpty())
{
LanguageType nLang = MsLangId::getSystemLanguage();
-m_aRealLocale = LanguageTag( nLang);
+m_aRealLocale.reset( nLang);
}
else
{
-m_aRealLocale = LanguageTag( m_aLocaleString);
+m_aRealLocale.reset( m_aLocaleString);
}
}
@@ -304,11 +304,11 @@ void SvtSysLocaleOptions_Impl::MakeRealUILocale()
if (m_aUILocaleString.isEmpty())
{
LanguageType nLang = MsLangId::getSystemUILanguage();
-m_aRealUILocale = LanguageTag( nLang);
+m_aRealUILocale.reset( nLang);
}
else
{
-m_aRealUILocale = LanguageTag( m_aUILocaleString);
+m_aRealUILocale.reset( m_aUILocaleString);
}
}
diff --git a/unotools/source/i18n/transliterationwrapper.cxx
b/unotools/source/i18n/transliterationwrapper.cxx
index 11f188e..a2c57fe 100644
--- a/unotools/source/i18n/transliterationwrapper.cxx
+++ b/unotools/source/i18n/transliterationwrapper.cxx
@@ -109,7 +109,7 @@ void TransliterationWrapper::setLanguageLocaleImpl(
sal_uInt16 nLang )
{
if( LANGUAGE_NONE == nLang )
nLang = LANGUAGE_SYSTEM;
-aLanguageTag = LanguageTag( nLang);
+aLanguageTag.reset( nLang);
}
@@ -175,7 +175,7 @@ void TransliterationWrapper::loadModuleByImplName(
com::sun::star::lang::Locale aLocale( aLanguageTag.getLocale());
// Reset LanguageTag, so the next call to loadModuleIfNeeded() forces
// new settings.
-aLanguageTag = LanguageTag( LANGUAGE_DONTKNOW);
+aLanguageTag.reset( LANGUAGE_DONTKNOW);
if ( xTrans.is() )
xTrans-loadModuleByImplName( rModuleName, aLocale );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - officecfg/registry sw/source
officecfg/registry/data/org/openoffice/Office/Common.xcu |2 +
sw/source/ui/docvw/edtwin.cxx| 24 +--
2 files changed, 24 insertions(+), 2 deletions(-)
New commits:
commit dcb080347ca127044313bbb3c11c37761cc2a7a2
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Fri Nov 16 13:37:04 2012 +0100
n#780277: select field when clicking it instead of having cursor before it
Change-Id: I93d623b62e9357a71bfca3403cc98092ef58c7e4
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 6a6d744..1565d13 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -3096,6 +3096,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
bExecDrawTextLink = sal_True;
}
+SwContentAtPos aFieldAtPos ( SwContentAtPos::SW_FIELD
);
+
// only try to select frame, if pointer already was
// switched accordingly
if ( aActHitType != SDRHIT_NONE !rSh.IsSelFrmMode()
@@ -3212,6 +3214,19 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
}
}
+// Are we selecting a field?
+else if ( rSh.GetContentAtPos( aDocPos, aFieldAtPos ) )
+{
+// select work, AdditionalMode if applicable
+if ( KEY_MOD1 == rMEvt.GetModifier()
!rSh.IsAddMode() )
+{
+rSh.EnterAddMode();
+rSh.SelWrd( aDocPos );
+rSh.LeaveAddMode();
+}
+else
+rSh.SelWrd( aDocPos );
+}
break;
}
case 2:
@@ -4333,7 +4348,8 @@ void SwEditWin::MouseButtonUp(const MouseEvent rMEvt)
}
else
{
-if ( !rSh.IsInSelect() rSh.ChgCurrPam( aDocPt ) )
+SwContentAtPos aFieldAtPos ( SwContentAtPos::SW_FIELD );
+if ( !rSh.IsInSelect() rSh.ChgCurrPam( aDocPt )
!rSh.GetContentAtPos( aDocPt, aFieldAtPos ) )
{
const sal_Bool bTmpNoInterrupt = bNoInterrupt;
bNoInterrupt = sal_False;
@@ -4377,8 +4393,12 @@ void SwEditWin::MouseButtonUp(const MouseEvent rMEvt)
SwContentAtPos::SW_INETATTR |
SwContentAtPos::SW_SMARTTAG | SwContentAtPos::SW_FORMCTRL);
-if( rSh.GetContentAtPos( aDocPt, aCntntAtPos, sal_True
) )
+if( rSh.GetContentAtPos( aDocPt, aCntntAtPos,
sal_False ) )
{
+// Do it again if we're not on a field to update
the cursor accordingly
+if ( SwContentAtPos::SW_FIELD !=
aCntntAtPos.eCntntAtPos )
+rSh.GetContentAtPos( aDocPt, aCntntAtPos,
sal_True );
+
sal_Bool bViewLocked = rSh.IsViewLocked();
if( !bViewLocked !rSh.IsReadOnlyAvailable()
aCntntAtPos.IsInProtectSect() )
commit ac1e59a1abea03d55286d6b2268572e1199c15ef
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Thu Nov 15 16:45:20 2012 +0100
CMIS: added OpenDataSpace default URL
Change-Id: Ief298ad4ce724a31edfba977609358893bf4365d
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu
b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 45f4cfe..4bc30ed 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -609,6 +609,7 @@
ithttps://apps.lotuslive.com/files/basic/cmis/my/servicedoc/it
ithttp://lt;hostgt;/servlet/cmis/repository/_Plt;Quickr place
namegt;_RMain.nsf/servicedoc/it
ithttp://lt;hostgt;/nuxeo/webservices/cmis/RepositoryService?wsdl/it
+ithttps://lt;hostgt;/cmis/atom/it
ithttp://ec2-184-72-233-127.compute-1.amazonaws.com/ot-cmis/services/RepositoryService?wsdl/it
ithttp://lt;hostgt;/_vti_bin/CMISSoapwsdl.aspx/it
/value
@@ -620,6 +621,7 @@
itLotus Live Files/it
itLotus Quickr Domino/it
itNuxeo 5.4/it
+itOpenDataSpace/it
itOpenText ELS 10.2.0/it
itSharePoint 2010/it
/value
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: config_host.mk.in configure.ac sd/Library_sd.mk sd/Library_sdui.mk sd/source
config_host.mk.in |2 +- configure.ac | 20 ++-- sd/Library_sd.mk |4 ++-- sd/Library_sdui.mk|4 ++-- sd/source/ui/dlg/RemoteDialog.cxx |6 +++--- sd/source/ui/remotecontrol/Server.cxx |6 +++--- 6 files changed, 21 insertions(+), 21 deletions(-) New commits: commit 0e682df529bb9216e009da39c449dab29ccf2807 Author: Enrico Weigelt, metux ITS metuxitserv...@googlemail.com Date: Fri Nov 16 00:00:58 2012 +0100 renamed --enable-bluetooth to --enable-sdremote-bluetooth The current configure option --enable-bluetooth is a bit misleading, it doesn't really tell what it's actually for. Therefore renamed it, so it's more clear that it's an sdremote backend using bluetooth. Change-Id: Ia8b46ee001ea112b80521baa502dcab2bb7e83aa Reviewed-on: https://gerrit.libreoffice.org/1086 Reviewed-by: Rene Engelhard rene.engelhard...@googlemail.com Tested-by: Rene Engelhard rene.engelhard...@googlemail.com diff --git a/config_host.mk.in b/config_host.mk.in index d099160..a5f8f40 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -171,7 +171,7 @@ export ENABLE_QUICKSTART_LIBPNG=@ENABLE_QUICKSTART_LIBPNG@ export ENABLE_RANDR=@ENABLE_RANDR@ export ENABLE_RELEASE_BUILD=@ENABLE_RELEASE_BUILD@ export ENABLE_SDREMOTE=@ENABLE_SDREMOTE@ -export ENABLE_BLUETOOTH=@ENABLE_BLUETOOTH@ +export ENABLE_SDREMOTE_BLUETOOTH=@ENABLE_SDREMOTE_BLUETOOTH@ export ENABLE_REPORTBUILDER=@ENABLE_REPORTBUILDER@ export ENABLE_SCRIPTING_BEANSHELL=@ENABLE_SCRIPTING_BEANSHELL@ export ENABLE_SCRIPTING_JAVASCRIPT=@ENABLE_SCRIPTING_JAVASCRIPT@ diff --git a/configure.ac b/configure.ac index 0127214..9b9b990 100644 --- a/configure.ac +++ b/configure.ac @@ -860,11 +860,11 @@ AC_ARG_ENABLE(sdremote, [Determines whether to enable Impress remote control.]), ,enable_sdremote=yes) -AC_ARG_ENABLE(bluetooth, -AS_HELP_STRING([--disable-bluetooth], +AC_ARG_ENABLE(sdremote-bluetooth, +AS_HELP_STRING([--disable-sdremote-bluetooth], [Determines whether to build sdremote with bluetooth support -(via dbus)]), -,enable_bluetooth=yes) + Requires: dbus]), +,enable_sdremote_bluetooth=yes) AC_ARG_ENABLE(gconf, AS_HELP_STRING([--disable-gconf], @@ -9524,12 +9524,12 @@ AC_MSG_CHECKING([whether to enable sd remotecontrol]) if test -n $enable_sdremote -a $enable_sdremote != no; then AC_MSG_RESULT([yes]) ENABLE_SDREMOTE=YES -AC_MSG_CHECKING([whether to enable bluetooth support]) -if test -n $enable_bluetooth -a $enable_bluetooth != no; then +AC_MSG_CHECKING([whether to enable sdremote via bluetooth support]) +if test -n $enable_sdremote_bluetooth -a $enable_sdremote_bluetooth != no; then if test $OS = LINUX; then if test $ENABLE_DBUS = TRUE; then AC_MSG_RESULT([yes]) -ENABLE_BLUETOOTH=YES +ENABLE_SDREMOTE_BLUETOOTH=YES dnl === dnl Check for system bluez dnl === @@ -9544,11 +9544,11 @@ if test -n $enable_sdremote -a $enable_sdremote != no; then fi else AC_MSG_RESULT([no, dbus disabled]) -ENABLE_BLUETOOTH=NO +ENABLE_SDREMOTE_BLUETOOTH=NO fi else AC_MSG_RESULT([no]) -ENABLE_BLUETOOTH=NO +ENABLE_SDREMOTE_BLUETOOTH=NO fi fi else @@ -9556,7 +9556,7 @@ else AC_MSG_RESULT([no]) fi AC_SUBST(ENABLE_SDREMOTE) -AC_SUBST(ENABLE_BLUETOOTH) +AC_SUBST(ENABLE_SDREMOTE_BLUETOOTH) dnl === dnl Check whether the gtk 2.0 libraries are available. diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index ae4b8a5..227a3c0 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -527,13 +527,13 @@ $(eval $(call gb_Library_add_defs,sd,\ -DENABLE_SDREMOTE \ )) -ifeq ($(ENABLE_BLUETOOTH),YES) +ifeq ($(ENABLE_SDREMOTE_BLUETOOTH),YES) $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/remotecontrol/BluetoothServer \ )) $(eval $(call gb_Library_add_defs,sd,\ --DENABLE_BLUETOOTH \ +-DENABLE_SDREMOTE_BLUETOOTH \ )) endif diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk index 9d4ec75..2304d49 100644 --- a/sd/Library_sdui.mk +++ b/sd/Library_sdui.mk @@ -42,9 +42,9 @@ $(eval $(call gb_Library_add_defs,sdui,\ -DENABLE_SDREMOTE \ )) -ifeq ($(ENABLE_BLUETOOTH),YES) +ifeq ($(ENABLE_SDREMOTE_BLUETOOTH),YES) $(eval $(call gb_Library_add_defs,sdui,\ --DENABLE_BLUETOOTH \ +-DENABLE_SDREMOTE_BLUETOOTH \ )) endif diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx index 1d52dc5..d5c66ca 100644 ---
[Libreoffice-commits] .: 2 commits - configure.ac
configure.ac |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit e3a8f1757434516117e9634babe7240ed50a0b38 Author: Rene Engelhard r...@debian.org Date: Fri Nov 16 14:43:46 2012 +0100 one more fix for ENABLE_SDREMOTE_BLUETOOTH logic Change-Id: I291eb59b54410f24a1a4b227bea2b55d3e3355b7 diff --git a/configure.ac b/configure.ac index 3858185..78440ae 100644 --- a/configure.ac +++ b/configure.ac @@ -9547,9 +9547,13 @@ if test -n $enable_sdremote -a $enable_sdremote != no; then ENABLE_SDREMOTE_BLUETOOTH=NO fi else +# FIXME: should this really be disabled in everything non-Linux? AC_MSG_RESULT([no]) ENABLE_SDREMOTE_BLUETOOTH=NO fi +else +AC_MSG_RESULT([no]) +ENABLE_SDREMOTE_BLUETOOTH=NO fi else ENABLE_SDREMOTE=NO commit e4c0363a87bed8d78dc6f8bf04c733f2c36ff8a4 Author: Rene Engelhard r...@debian.org Date: Fri Nov 16 14:23:32 2012 +0100 improve new enable_sdremote_bluetooth AC_MSG_CHECKING... Change-Id: Ic63e5d9406b39006e76e3044213d58405e4fa557 diff --git a/configure.ac b/configure.ac index 9b9b990..3858185 100644 --- a/configure.ac +++ b/configure.ac @@ -9524,7 +9524,7 @@ AC_MSG_CHECKING([whether to enable sd remotecontrol]) if test -n $enable_sdremote -a $enable_sdremote != no; then AC_MSG_RESULT([yes]) ENABLE_SDREMOTE=YES -AC_MSG_CHECKING([whether to enable sdremote via bluetooth support]) +AC_MSG_CHECKING([whether to enable bluetooth support in sdremote]) if test -n $enable_sdremote_bluetooth -a $enable_sdremote_bluetooth != no; then if test $OS = LINUX; then if test $ENABLE_DBUS = TRUE; then ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - extensions/source offapi/UnoApi_offapi.mk
extensions/source/plugin/inc/plugin/unx/sysplug.hxx |2
extensions/source/plugin/unx/sysplug.cxx| 74 ++--
offapi/UnoApi_offapi.mk |4 -
3 files changed, 42 insertions(+), 38 deletions(-)
New commits:
commit ef670259c7f770397e19c58fabda7b5e91b88291
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Nov 16 14:56:58 2012 +0100
Use sal/log.hxx instead of fprintf
...and some clean-up.
Change-Id: Ia958628a3d0fdada3f8e90cfc0b0ceaa45563206
diff --git a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
index 0dc6a6e..9f98564 100644
--- a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
@@ -37,8 +37,6 @@
class UnxPluginComm : public PluginComm, public PluginConnector
{
private:
-static int nConnCounter;
-
pid_t m_nCommPID;
public:
UnxPluginComm( const String mimetype,
diff --git a/extensions/source/plugin/unx/sysplug.cxx
b/extensions/source/plugin/unx/sysplug.cxx
index 24968fe..584bae0 100644
--- a/extensions/source/plugin/unx/sysplug.cxx
+++ b/extensions/source/plugin/unx/sysplug.cxx
@@ -33,8 +33,6 @@
#undef _LINUX_SOURCE_COMPAT
#endif
-#include cstdarg
-
#include sys/types.h
#include signal.h
#include sys/wait.h
@@ -50,8 +48,6 @@
return ::boost::shared_ptrSysPlugData();
}
-int UnxPluginComm::nConnCounter = 0;
-
UnxPluginComm::UnxPluginComm(
const String /*mimetype*/,
const String library,
@@ -60,13 +56,13 @@ UnxPluginComm::UnxPluginComm(
int nDescriptor2
) :
PluginComm( ::rtl::OUStringToOString( library,
osl_getThreadTextEncoding() ), false ),
-PluginConnector( nDescriptor2 )
+PluginConnector( nDescriptor2 ),
+m_nCommPID( 0 )
{
rtl::OString path;
if (!getPluginappPath(path))
{
-fprintf( stderr, cannot construct path to pluginapp.bin\n );
-m_nCommPID = -1;
+SAL_WARN(extensions.plugin, cannot construct path to
pluginapp.bin);
return;
}
@@ -83,50 +79,58 @@ UnxPluginComm::UnxPluginComm(
pArgs[3] = pWindow;
pArgs[4] = NULL;
-#if OSL_DEBUG_LEVEL 1
-m_nCommPID = 10;
-fprintf( stderr, Try to launch: %s %s %s %s, descriptors are %d, %d\n,
pArgs[0], pArgs[1], pArgs[2], pArgs[3], nDescriptor1, nDescriptor2 );
-#endif
+SAL_INFO(
+extensions.plugin,
+try to launch: pArgs[0] pArgs[1] pArgs[2]
+pArgs[3] , descriptors are nDescriptor1 ,
+ nDescriptor2);
-if( ! ( m_nCommPID = fork() ) )
+pid_t pid = fork();
+if( pid == 0 )
{
execvp( pArgs[0], const_cast char ** (pArgs) );
-fprintf( stderr, Error: could not exec %s\n, pArgs[0] );
+SAL_WARN(extensions.plugin, could not exec pArgs[0]);
_exit(255);
}
-if( m_nCommPID != -1 )
+if( pid == -1 )
+{
+SAL_WARN(extensions.plugin, fork failed);
+return;
+}
+
+m_nCommPID = pid;
+// wait for pluginapp.bin to start up
+if( ! WaitForMessage( 5000 ) )
{
-// wait for pluginapp.bin to start up
-if( ! WaitForMessage( 5000 ) )
-{
-fprintf( stderr, Timeout on command: %s %s %s %s\n, pArgs[0],
pArgs[1], pArgs[2], pArgs[3] );
-invalidate();
-}
-else
-{
-MediatorMessage* pMessage = GetNextMessage( sal_True );
-Respond( pMessage-m_nID,
- const_castchar*(init ack),8,
- NULL );
-delete pMessage;
-NPP_Initialize();
-}
+SAL_WARN(
+extensions.plugin,
+timeout on command: pArgs[0] pArgs[1]
+ pArgs[2] pArgs[3]);
+invalidate();
+}
+else
+{
+MediatorMessage* pMessage = GetNextMessage( sal_True );
+Respond( pMessage-m_nID,
+ const_castchar*(init ack),8,
+ NULL );
+delete pMessage;
+NPP_Initialize();
}
}
UnxPluginComm::~UnxPluginComm()
{
NPP_Shutdown();
-if( m_nCommPID != -1 m_nCommPID != 0 )
+if( m_nCommPID != 0 )
{
int status = 16777216;
pid_t nExit = waitpid( m_nCommPID, status, WUNTRACED );
-#if OSL_DEBUG_LEVEL 1
-fprintf( stderr, child %d (plugin app child %d) exited with status
%d\n, (int)nExit, (int)m_nCommPID, (int)WEXITSTATUS(status) );
-#else
-(void)nExit;
-#endif
+SAL_INFO(
+extensions.plugin,
+child nExit (plugin app child m_nCommPID
+ ) exited with status WEXITSTATUS(status));
}
}
commit 34b2748eb38f9487fdfcb81141b64844d3d2a734
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Nov 16 14:56:20 2012 +0100
[PUSHED] renamed --enable-bluetooth to --enable-sdremote-bluetooth
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1086 Approvals: Rene Engelhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1086 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia8b46ee001ea112b80521baa502dcab2bb7e83aa Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Enrico Weigelt, metux IT service metuxitserv...@googlemail.com Gerrit-Reviewer: Enrico Weigelt, metux IT service metuxitserv...@googlemail.com Gerrit-Reviewer: Rene Engelhard rene.engelhard...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Platform ports vs. multiplatform
Hi, yes, but at least according to debian/ubuntu build rules, that doenst seem to be enough. (debian's rule file is over 3k LOC) Ah - that does seem a tad unfortunate. I'm sure there are lots of good things in debian's rules file that we could fold into the core and make easier for distributors in an incremental fashion. Having not read the file - I've no concrete ideas there :-) but ... at least looking at how some of our .spec files re-order and re-group the scp2 break-down to get the packaging prettier lots could be improved in that bit alone. One thing we, IMHO, should do is splitting the whole thing into smaller parts, eg. building extensions or helpcontent out of tree, moving them to their completely own packages. That would make packager's life much easier. Another front is 3rdparty libraries. Optimally, as a packager, you want it to get its deps entirely from the system (or sysroot) - without having to tweak a lot of parameters - and _never_ let it download anything. Packaging then needs to run entirely through the distro's machinery. OTOH we've got platforms that don't know the concept of distros and package management/repositories. My approach to this is: having a separate 'workspace' system for handling all the things that usually distro build machines would do. Esentially rolling an own micro-distro (or multiple ones for several platforms). Such an micro-distro, eg. for win32/cygwin, would do things like: * proper toolchain setup, at least check if everything's correct, and guide the user through the setup (if it can't be done automatically) * deploy cygwin build environment and maybe pull in required packages * build missing dependencies (not yet in cygwin repos) and deploy them into the build environment * maybe provide some user friendly buildtime configuration (perhaps something windows-friendly counterpart of linux kernel's 'make menuconfig' ?) * build lo itself * create deployable packages (cygwin, msi, ...) install program (which maybe would just be a little wrapper around msi) Similarily, there could be such an 'workspace' for Debian+friends, which: * makes sure all required packages are installed (via apt-get calls) * builds the missing 3rdparty libs (that aren't in debian yet) into their own prefix (eg. /usr/lib/libreoffice/depend/), packaging to something like 'libreoffice-libraries', adding it to local aptrepo * drive the package build, w/ --with-system-*, adding proper pkg-config pathes and build proper deb packages * runs all package builds via pbuilder+friends --disable-epm ? I'm talking about dropping it completely in my branch. By the way: what is this actually used for ? Not sure about the other distros, but Debian+friends dont seem to use it. Oh; EPM is used to build the generic cross-distribution packages that we ship for Linux. Well, to have it really generic, you'll need to link statically against all libraries normally found on operating systems, down to libc. This leads to an huge increase in diskspace and memory consumption. Another drawback is that bugfixes (esp. security-related!) coming from their distro. I'd consider that as a workaround if you _really_ need very recent versions that aren't distro-packaged yet. At this point, I'd seriously raise the question why distros lag behind so far that people get interested in such an cross-dist package. cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] LibreOffice QA Call 2012-11-16 1400UTC
Wrong phone number, please call in at phone number from this page: http://www.talkyoo.net/main/telefonkonferenz_internationale_rufnummern Sorry, Joel On 11/15/2012 02:58 AM, Mas wrote: On Thu, Nov 15, 2012 at 5:02 AM, Bjoern Michaelsen bjoern.michael...@canonical.com mailto:bjoern.michael...@canonical.com wrote: On Wed, Nov 14, 2012 at 09:00:05PM -0800, Joel Madero wrote: Open invite to anyone wanting to join QA call. Approximately 1 hour long If I'm missing any items please reply, feel free to edit wiki as well. One addition to the agenda: AFIAK we have already meetbot/supybot running on IRC. QA might decide to use it to generate agendas and minutes: http://meetbot.debian.net/Manual.html Lets dicuss in the call. Best, Bjoern Thanks for the info Joel, -- -- Mas Walls Web Security Analyst | Senior Server Administrator Powserve.com / Gemini ISP Networks ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] LibreOffice QA Call 2012-11-16 1400UTC
Joel Madero píše v Pá 16. 11. 2012 v 06:12 -0800: Wrong phone number, please call in at phone number from this page: http://www.talkyoo.net/main/telefonkonferenz_internationale_rufnummern Here are more details from the older announcements. Dial-in numbers for countries outside Germany can be found at: http://www.talkyoo.net/main/telefonkonferenz_internationale_rufnummern Dial-in numbers inside Germany are: +49 40 18881000 (Hamburg, landline) +49 40 95069970 (Hamburg, landline) +49 89 60893 (Munich, landline) +49 1570 3336000 (vistream mobile network) Free Skype contact[*]: talkyoo_skype Room: Room number: 53 71 38 No participant PIN is required All calls will be recorded All participants can speak Comments and additions most welcome. [*] Talkyoo has to confirm your contact before you could call in. This might take several hours or even days. Please, start preparation on time. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: avmedia/source
avmedia/source/gstreamer/avmediagstreamer_0_10.component |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 61763f73998c600be321e5c415c0e3e179a790a0 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Nov 16 15:19:14 2012 +0100 Adapt component prefix for old GStreamer, too Change-Id: Ie9c46ab5d6e1b824a2b6927c8632bf57847c0274 diff --git a/avmedia/source/gstreamer/avmediagstreamer_0_10.component b/avmedia/source/gstreamer/avmediagstreamer_0_10.component index e8bd602..38d39c0 100644 --- a/avmedia/source/gstreamer/avmediagstreamer_0_10.component +++ b/avmedia/source/gstreamer/avmediagstreamer_0_10.component @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * -- -component loader=com.sun.star.loader.SharedLibrary xmlns=http://openoffice.org/2010/uno-components; +component loader=com.sun.star.loader.SharedLibrary prefix=avmediagst xmlns=http://openoffice.org/2010/uno-components; implementation name=com.sun.star.comp.media.Manager_GStreamer_0_10 service name=com.sun.star.comp.avmedia.Manager_GStreamer_0_10/ /implementation ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: reorganizing ./configure --help output ?
Hi, On Thu, 2012-11-15 at 22:16 +0100, Enrico Weigelt wrote: is it possible to reorganize the ./configure help options into several groups for easier reading ? Grief - the re-ordering is done by changing the order of the options in configure.in. That tends to generate -huge- patches and screws with the interdependency of various options (if we're not quite careful). Well, if you're just concerned about patch size - we could do that in smaller steps. Option declarations (AC_ARG_ENABLE[]+friends calls) already seem to be pretty separated from actual option handling, so this, IMHO shouldn't be such a big deal. The more interesting question to me right now is: how to add the separate section headers, so configure --help would look like: --enable-some-foo blaah MacOS-X target specific options --with-macosx-sdk . . cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build environment for official win32 builds
in addition to above points also there are also open questions around how we would run unit tests in a MinGW cross-compilation environment and how well gdb works on Windows; the MSVC C++ debugger is really quite good. What about native compiling (not crosscompile) on win32 using gcc ? cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeAndroidX86.conf
distro-configs/LibreOfficeAndroid.conf|2 ++ distro-configs/LibreOfficeAndroidX86.conf |2 ++ 2 files changed, 4 insertions(+) New commits: commit 25dd02d8b9ad66e06fb2f6e9d38e27753af2817d Author: Michael Meeks michael.me...@suse.com Date: Fri Nov 16 14:23:31 2012 + android: disable liblangtag for build and target. diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf index 70ecdcc..8b92ef8 100644 --- a/distro-configs/LibreOfficeAndroid.conf +++ b/distro-configs/LibreOfficeAndroid.conf @@ -9,6 +9,7 @@ --disable-gstreamer-0-10 --disable-gstreamer --disable-lockdown +--disable-liblangtag --disable-mozilla --disable-odk --disable-opengl @@ -22,3 +23,4 @@ --without-stlport --without-helppack-integration --without-myspell-dicts +--with-build-platform-configure-options=--disable-liblangtag diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf index f4ae136..e97242a 100644 --- a/distro-configs/LibreOfficeAndroidX86.conf +++ b/distro-configs/LibreOfficeAndroidX86.conf @@ -9,6 +9,7 @@ --disable-gnome-vfs --disable-gstreamer-0-10 --disable-gstreamer +--disable-liblangtag --disable-lockdown --disable-mozilla --disable-odk @@ -23,3 +24,4 @@ --without-stlport --without-helppack-integration --without-myspell-dicts +--with-build-platform-configure-options=--disable-liblangtag ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: android/Bootstrap android/experimental
android/Bootstrap/version.map |7 +++
android/experimental/DocumentLoader/Makefile |5 ++---
android/experimental/LibreOffice4Android/Makefile |5 ++---
3 files changed, 11 insertions(+), 6 deletions(-)
New commits:
commit 26b8cd2b3ef8fed72ba52e0b8f9b002f7cfd23c4
Author: Tor Lillqvist t...@iki.fi
Date: Fri Nov 16 16:17:27 2012 +0200
Reduce dynamic symbols and strip all local ones from the Android single .so
Use a version script (version map) that exports only the Java_* and
JNI_OnLoad symbols that the JNI machinery needs. No non-dynamic
symbols are needed (in the .so that goes into the .apk; the one kept
locally for debugging is not stripped).
Change-Id: Ie874e59c593ec9e5d08ba369612cef1a3ea85fe4
diff --git a/android/Bootstrap/version.map b/android/Bootstrap/version.map
new file mode 100644
index 000..1b65003
--- /dev/null
+++ b/android/Bootstrap/version.map
@@ -0,0 +1,7 @@
+dummy {
+global:
+Java_*;
+JNI_OnLoad;
+local:
+*;
+};
diff --git a/android/experimental/DocumentLoader/Makefile
b/android/experimental/DocumentLoader/Makefile
index 15c6a0a..afc5241 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -49,10 +49,9 @@ properties:
link-so:
# Build the single .so for this app
mkdir -p $(OBJLOCAL)
- $(CXX) -Wl,-Map,liblo-native-code.map -Wl,--gc-sections -Wl,--stats
-Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING
-shared -o $(OBJLOCAL)/liblo-native-code.so -I$(OUTDIR)/inc native-code.cxx
-L$(OUTDIR)/lib $(WHOLELIBS) $(LIBS) -lgnustl_static -landroid -llog -lz
+ $(CXX) -Wl,-Map,liblo-native-code.map -Wl,--gc-sections
-Wl,--version-script=../../Bootstrap/version.map -Wl,--stats
-Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING
-shared -o $(OBJLOCAL)/liblo-native-code.so -I$(OUTDIR)/inc native-code.cxx
-L$(OUTDIR)/lib $(WHOLELIBS) $(LIBS) -lgnustl_static -landroid -llog -lz
mkdir -p $(SODEST)
- cp $(OBJLOCAL)/liblo-native-code.so $(SODEST)
- $(STRIP) --strip-debug $(SODEST)/liblo-native-code.so
+ $(STRIP) -o $(SODEST)/liblo-native-code.so
$(OBJLOCAL)/liblo-native-code.so
copy-stuff:
# Then assets. Let the directory structure under assets mimic
diff --git a/android/experimental/LibreOffice4Android/Makefile
b/android/experimental/LibreOffice4Android/Makefile
index c823ebf..bbe1587 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -24,10 +24,9 @@ APP_PACKAGE=org.libreoffice
link-so:
# Build the single .so for this app
mkdir -p $(OBJLOCAL)
- $(CXX) -Wl,-Map,liblo-native-code.map -Wl,--gc-sections -Wl,--stats
-Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING
-shared -o $(OBJLOCAL)/liblo-native-code.so -I$(OUTDIR)/inc native-code.cxx
-L$(OUTDIR)/lib $(WHOLELIBS) $(LIBS) -lgnustl_static -landroid -llog -lz
+ $(CXX) -Wl,-Map,liblo-native-code.map -Wl,--gc-sections
-Wl,--version-script=../../Bootstrap/version.map -Wl,--stats
-Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING
-shared -o $(OBJLOCAL)/liblo-native-code.so -I$(OUTDIR)/inc native-code.cxx
-L$(OUTDIR)/lib $(WHOLELIBS) $(LIBS) -lgnustl_static -landroid -llog -lz
mkdir -p $(SODEST)
- cp $(OBJLOCAL)/liblo-native-code.so $(SODEST)
- $(STRIP) --strip-debug $(SODEST)/liblo-native-code.so
+ $(STRIP) -o $(SODEST)/liblo-native-code.so
$(OBJLOCAL)/liblo-native-code.so
copy-stuff:
# Then assets. Let the directory structure under assets mimic
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Build environment for official win32 builds
Hi, There are also some features in the code that don't compile with MinGW. They use API that MinGW does not provide headers for etc. Ok. Is there already some list of known issues ? Let me also point out that we definitely do not want to build *locally* on Windows with GCC (MinGW). MinGW makes sense to us only for cross-compilation. If one wants to build locally on a Windows machine, use MSVC. Why so ? Note that when we say MinGW, we actually mean mingw-w64, a fork of MinGW that provides a more complete set of headers and import libraries for various Windows APIs. (Despite the w64 in the name, they do provide a tool-chain producing 32-bit code, too.) Okay. Does it run under win32/cygwin ? cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] LibreOffice QA Call 2012-11-16 1400UTC
On Fri, Nov 16, 2012 at 9:17 AM, Petr Mladek pmla...@suse.cz wrote: Joel Madero píše v Pá 16. 11. 2012 v 06:12 -0800: Wrong phone number, please call in at phone number from this page: http://www.talkyoo.net/main/telefonkonferenz_internationale_rufnummern Here are more details from the older announcements. Dial-in numbers for countries outside Germany can be found at: http://www.talkyoo.net/main/telefonkonferenz_internationale_rufnummern Dial-in numbers inside Germany are: +49 40 18881000 (Hamburg, landline) +49 40 95069970 (Hamburg, landline) +49 89 60893 (Munich, landline) +49 1570 3336000 (vistream mobile network) Free Skype contact[*]: talkyoo_skype Room: Room number: 53 71 38 No participant PIN is required All calls will be recorded All participants can speak Comments and additions most welcome. [*] Talkyoo has to confirm your contact before you could call in. This might take several hours or even days. Please, start preparation on time. Best Regards, Petr Did the call start early? should have been 1400 UTC -- -- Masekela Walls Web Security Analyst | Senior Server Administrator Powserve.com / Gemini ISP Networks ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LO as an NPAPI browser plugin host?
There is a little-known(?) feature in LO that allows to plug browser plugins based on the NPAPI standard to display (multimedia) content inside LO documents. In Writer at least, it is available via Insert - Object - Plug-in The implementation is in extensions/source/plugin/ (which has platform-specific branches for aqua, unx, and win) and np_sdk/. And it appears to be horribly broken, see below for details. Given that standard multimedia content is already covered via Insert - Movie and Sound... (whose implementation is completely unrelated), the only relevant remaining use-case might be Flash content. But given that I at least was unable to get even that working (see below), I wonder whether this feature is actually used/missed by anybody, or whether we should just drop it completely from our codebase? (I vaguely remember that in the distant past it even worked to display Java applets via this plugin interface, by plugging a JRE's browser plugin. Given my findings below, I don't now it would even be worth to try to test that today.) Opinions anyone? The details: * I tried all this on Fedora 17 x86-64. * Running soffice with SAL_LOG=+WARN+INFO.extensions.plugin gives some useful output now, at least on Linux. * With totem-mozplugin-3.4.3-1.fc17.x86_64 installed, Firefox is able to open e.g., .ogg audio files or .flv videos. ** Trying the same with LO Writer's Insert - Object - Plug-in... fails (just specifying the .ogg/.flv file pathname, leaving Options blank). The SAL_INFO output indicates that libtotem-clone-plugin.so is loaded, but calling its NP_Initialize returns 3 (NPERR_INVALID_FUNCTABLE_ERROR) because the NPNetscapeFuncs struct created in extensions/source/plugin/unx/npnapi.cxx (based on an outdated definition of NPNetscapeFuncs in np_sdk/mozsrc/npupp.h) is too short (i.e., misses functions added by later NPAPI revisions and expected by the given libtotem-clone-plugin.so). ** In principle, it should work to update LO's NPAPI host interface to a recent NPAPI revision. I tried to make extensions/source/plugin/unx/ use contemporary xulrunner-devel-16.0.2-1.fc17.x86_64 NPAPI headers from --with-system-npapi-headers instead of the hack that is np_sdk/mozsrc/npupp.h, but quickly gave up: For one, that npupp.h hack is a wild mix of platform-specifics, OJI (Open JVM Integration) support, etc., so replacing it with a plain npapi.h include seems far from trivial. For another, this would require implementations of those additional functions in the NPNetscapeFuncs struct (for some it might do to add dummy implementations, in the hope that the relevant plugins do not call them anyway). * With the above rationale (Insert - Movie and Sound...), the totem plugin is likely not that relevant, anyway, so next I tried to get flash-plugin-11.2.202.251-release.x86_64 (from http://linuxdownload.adobe.com/linux/x86_64/) working. In Firefox, it is able to open .swf files (e.g., garth.swf from http://www.britarch.ac.uk/caf/wikka.php?wakka=TestSWF). ** Trying the same with LO fails again. This time, the SAL_INFO output indicates that libflashplayer.so is loaded and that calling its NP_Initialize returns 0 (i.e., the plugin is apparently satisfied with our dated NPAPI implementation, hurrah). However, libflashplayer.so (offloaded into a pluginapp.bin process of its own) crashes shortly after in a call to aPluginFuncs.newstream from extensions/source/plugin/unx/npnapi.cxx, for undebuggable reasons (as the plugin comes without source code). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LO as an NPAPI browser plugin host?
Hi Stephan, On Fri, 2012-11-16 at 16:08 +0100, Stephan Bergmann wrote: Given that standard multimedia content is already covered via Insert - Movie and Sound... (whose implementation is completely unrelated), the only relevant remaining use-case might be Flash content. But given that I at least was unable to get even that working (see below), I wonder whether this feature is actually used/missed by anybody, or whether we should just drop it completely from our codebase? (I vaguely remember that in the distant past it even worked to display Java applets via this plugin interface, by plugging a JRE's browser plugin. Given my findings below, I don't now it would even be worth to try to test that today.) I used to have it working in the go-oo at least and Florian had a patch to embed some flash application as a docking pane for some team pane. the patch is not even in an integrable state and there were some problems with focus to input text in the flash app. As far as I'm concerned, it's OK to drop it as that patch will never make its way in. -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] add --with-all-tarballs option to download all tarballs unco...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1088 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/1088/1 add --with-all-tarballs option to download all tarballs unconditionally - this is needed for packaging, so that all possible tarballs can be available in the complete source package Change-Id: I8e69b50ccc0333c6ba966f7f27d34f07d0e4a0cd --- M configure.ac 1 file changed, 276 insertions(+), 88 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1088 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8e69b50ccc0333c6ba966f7f27d34f07d0e4a0cd Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Björn Michaelsen bjoern.michael...@canonical.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] LibreOffice QA Call 2012-11-16 1400UTC
Mas píše v Pá 16. 11. 2012 v 10:06 -0500: On Fri, Nov 16, 2012 at 9:17 AM, Petr Mladek pmla...@suse.cz wrote: Joel Madero píše v Pá 16. 11. 2012 v 06:12 -0800: Wrong phone number, please call in at phone number from this page: http://www.talkyoo.net/main/telefonkonferenz_internationale_rufnummern Dial-in numbers inside Germany are: +49 40 18881000 (Hamburg, landline) +49 40 95069970 (Hamburg, landline) +49 89 60893 (Munich, landline) +49 1570 3336000 (vistream mobile network) Free Skype contact[*]: talkyoo_skype Room: Room number: 53 71 38 Did the call start early? should have been 1400 UTC It started at about 14:06 UTC. It means 15:06CET, see http://www.timeanddate.com/worldclock/ It seems that you tried it one hour later :-( I am sorry for this. Anywya, we are looking forward to hear you next time. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: LO as an NPAPI browser plugin host?
Hi Stephan, Stephan Bergmann schrieb: There is a little-known(?) feature in LO that allows to plug browser plugins based on the NPAPI standard to display (multimedia) content inside LO documents. In Writer at least, it is available via Insert - Object - Plug-in The implementation is in extensions/source/plugin/ (which has platform-specific branches for aqua, unx, and win) and np_sdk/. And it appears to be horribly broken, see below for details. It works fine here for Flash. I use LO3.6 on WinXP. I can insert a flash file via Insert-Object-Plug-in into a presentation. It works in edit mode and in presentation mode. So it is not horrible broken. After you have insert it and want to change something, you have to select it via Navigator. You have to activate the context menu via context key, because a mouse click on the flash activates the settings of the flash player. Given that standard multimedia content is already covered via Insert - Movie and Sound... (whose implementation is completely unrelated), the only relevant remaining use-case might be Flash content. But given that I at least was unable to get even that working (see below), I wonder whether this feature is actually used/missed by anybody, or whether we should just drop it completely from our codebase? (I vaguely remember that in the distant past it even worked to display Java applets via this plugin interface, by plugging a JRE's browser plugin. Given my findings below, I don't now it would even be worth to try to test that today.) Jave applets were disabled for security reasons a long time ago, I guess around OOo1 - OOo2. I would have to search for the exact time. Opinions anyone? Do not remove it, until there is another option for flash. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Calc / Kerning
On 11/15/2012 04:09 PM, Bernhard Schiffner wrote: Hi, (this is my first commit here so please be patient ...) I'am missing the kerning feature for cells showing the result of a formula. So, there is a technical reason why achieving that for formula result is very difficult, I'm afraid. Calc has two types of texts: 1) simple text, and 2) rich text. A simple non-formula cell can do either text, but a formula cell currently can only do simple text. When you type e.g. AV into a cell, that is simple text at the time the text is entered. As soon as you apply kerning, though, it becomes rich text. When you reference that in another cell via formula cell, that formula cell only extract that text as a simple text, thereby losing the kerning property. This is due to the same reason why referencing in a formula cell a text that consists of part bold, part non-bold, part italic, part non-italic etc. becomes simple text without any format runs. Of course, it is *possible* to support rich text properties in text that's a formula result, but that would require intimate knowledge of the inner working of Calc's cell text handling, and would probably requires a lot of code changes. Best, Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[libreoffice-users] - Scalc.java ported to C++ , uses DocumentLoader
Hi , I have been able to merge Scalc.java and DocumentLoader.cxx. The example expects soffice running just like in examples/cpp/DocumentLoader. Running Scalc would connect to soffice, load scalc.ods and populate data in cells, just like Scalc.java Is there any secure place to put this code for the benefit of users ? Wiki or being bundled with examples ? I posted this to users list and Tom Davies kindly suggested I try the DEV list. Thanks Neeraj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Roman Eisele b...@eikota.de changed: What|Removed |Added Depends on||57198 --- Comment #29 from Roman Eisele b...@eikota.de --- Added bug 57198 - “Mac OSX Daily installation package to small and invalid”. Tinderbox 27 seems to produce invalid daily builds. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - svl/source tools/source
svl/source/config/languageoptions.cxx |3 ++-
svl/source/items/srchitem.cxx |6 +++---
svl/source/numbers/numfmuno.cxx |8 +++-
svl/source/numbers/supservs.cxx |2 +-
svl/source/numbers/zforlist.cxx | 11 +--
svl/source/numbers/zformat.cxx|4 ++--
svl/source/numbers/zforscan.cxx |2 +-
tools/source/rc/resmgr.cxx|3 ++-
8 files changed, 19 insertions(+), 20 deletions(-)
New commits:
commit 59d33fcc19ec380f9af6e7c24a5e22e8e50428cc
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 16 15:57:22 2012 +0100
use LanguageTag
Change-Id: I28aff5533ec6cc31a3d6f3de3198452bd716ba62
diff --git a/svl/source/config/languageoptions.cxx
b/svl/source/config/languageoptions.cxx
index 5f7678a..c73318c 100644
--- a/svl/source/config/languageoptions.cxx
+++ b/svl/source/config/languageoptions.cxx
@@ -22,6 +22,7 @@
#include svl/cjkoptions.hxx
#include svl/ctloptions.hxx
#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include osl/mutex.hxx
#include rtl/instance.hxx
#include com/sun/star/i18n/ScriptType.hpp
@@ -200,7 +201,7 @@ LanguageType
SvtSystemLanguageOptions::GetWin16SystemLanguage()
{
if( m_sWin16SystemLocale.isEmpty() )
return LANGUAGE_NONE;
-return MsLangId::convertIsoStringToLanguage( m_sWin16SystemLocale );
+return LanguageTag( m_sWin16SystemLocale ).getLanguageType();
}
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index d68a887..0f0b8d2 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -28,7 +28,7 @@
#include com/sun/star/util/XReplaceDescriptor.hpp
#include com/sun/star/lang/Locale.hpp
#include svl/memberid.hrc
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
using namespace utl;
using namespace com::sun::star::beans;
@@ -428,7 +428,7 @@ bool SvxSearchItem::QueryValue( com::sun::star::uno::Any
rVal, sal_uInt8 nMembe
{
sal_Int16 nLocale;
if (!aSearchOpt.Locale.Language.isEmpty() ||
!aSearchOpt.Locale.Country.isEmpty() )
-nLocale = MsLangId::convertLocaleToLanguage( aSearchOpt.Locale
);
+nLocale = LanguageTag( aSearchOpt.Locale ).getLanguageType();
else
nLocale = LANGUAGE_NONE;
rVal = nLocale;
@@ -577,7 +577,7 @@ bool SvxSearchItem::PutValue( const
com::sun::star::uno::Any rVal, sal_uInt8 nM
}
else
{
-MsLangId::convertLanguageToLocale( (sal_Int16) nInt,
aSearchOpt.Locale );
+aSearchOpt.Locale = LanguageTag( nInt).getLocale();
}
}
break;
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index 29a469e..80ec23a 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -109,7 +109,7 @@ static LanguageType lcl_GetLanguage( const lang::Locale
rLocale )
if ( rLocale.Language.isEmpty() )
return LANGUAGE_SYSTEM;
-LanguageType eRet = MsLangId::convertLocaleToLanguage( rLocale );
+LanguageType eRet = LanguageTag( rLocale ).getLanguageType( false );
if ( eRet == LANGUAGE_NONE )
eRet = LANGUAGE_SYSTEM; //! or throw an exception?
@@ -757,8 +757,7 @@ uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue(
const rtl::OUString aPro
}
else if (aString.EqualsAscii( PROPERTYNAME_LOCALE ))
{
-lang::Locale aLocale( MsLangId::convertLanguageToLocale(
-pFormat-GetLanguage()));
+lang::Locale aLocale( LanguageTag(
pFormat-GetLanguage()).getLocale());
aRet = aLocale;
}
else if (aString.EqualsAscii( PROPERTYNAME_TYPE ))
@@ -893,8 +892,7 @@ uno::Sequencebeans::PropertyValue SAL_CALL
SvNumberFormatObj::getPropertyValue
bool bThousand, bRed;
sal_uInt16 nDecimals, nLeading;
pFormat-GetFormatSpecialInfo( bThousand, bRed, nDecimals, nLeading );
-lang::Locale aLocale( MsLangId::convertLanguageToLocale(
-pFormat-GetLanguage()));
+lang::Locale aLocale( LanguageTag(
pFormat-GetLanguage()).getLocale());
uno::Sequencebeans::PropertyValue aSeq(13);
beans::PropertyValue* pArray = aSeq.getArray();
diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx
index caadfe4..1edfbdf 100644
--- a/svl/source/numbers/supservs.cxx
+++ b/svl/source/numbers/supservs.cxx
@@ -101,7 +101,7 @@ void SAL_CALL
SvNumberFormatsSupplierServiceObject::initialize( const Sequence
{
Locale aLocale;
*pArgs = aLocale;
-eNewFormatterLanguage = MsLangId::convertLocaleToLanguage(
aLocale);
+eNewFormatterLanguage = LanguageTag( aLocale).getLanguageType(
false);
}
#ifdef DBG_UTIL
else
diff --git
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - sw/source
sw/source/ui/docvw/edtwin.cxx | 24 ++--
1 file changed, 22 insertions(+), 2 deletions(-)
New commits:
commit 90bb5281988d8088cd73a4134b162be1165bde61
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Fri Nov 16 13:37:04 2012 +0100
n#780277: select field when clicking it instead of having cursor before it
Change-Id: I93d623b62e9357a71bfca3403cc98092ef58c7e4
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 2afa975..712b31f 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -2974,6 +2974,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
bExecDrawTextLink = sal_True;
}
+SwContentAtPos aFieldAtPos ( SwContentAtPos::SW_FIELD
);
+
// only try to select frame, if pointer already was
// switched accordingly
if ( aActHitType != SDRHIT_NONE !rSh.IsSelFrmMode()
@@ -3090,6 +3092,19 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
}
}
+// Are we selecting a field?
+else if ( rSh.GetContentAtPos( aDocPos, aFieldAtPos ) )
+{
+// select work, AdditionalMode if applicable
+if ( KEY_MOD1 == rMEvt.GetModifier()
!rSh.IsAddMode() )
+{
+rSh.EnterAddMode();
+rSh.SelWrd( aDocPos );
+rSh.LeaveAddMode();
+}
+else
+rSh.SelWrd( aDocPos );
+}
break;
}
case 2:
@@ -4213,7 +4228,8 @@ void SwEditWin::MouseButtonUp(const MouseEvent rMEvt)
}
else
{
-if ( !rSh.IsInSelect() rSh.ChgCurrPam( aDocPt ) )
+SwContentAtPos aFieldAtPos ( SwContentAtPos::SW_FIELD );
+if ( !rSh.IsInSelect() rSh.ChgCurrPam( aDocPt )
!rSh.GetContentAtPos( aDocPt, aFieldAtPos ) )
{
const sal_Bool bTmpNoInterrupt = bNoInterrupt;
bNoInterrupt = sal_False;
@@ -4257,8 +4273,12 @@ void SwEditWin::MouseButtonUp(const MouseEvent rMEvt)
SwContentAtPos::SW_INETATTR |
SwContentAtPos::SW_SMARTTAG | SwContentAtPos::SW_FORMCTRL);
-if( rSh.GetContentAtPos( aDocPt, aCntntAtPos, sal_True
) )
+if( rSh.GetContentAtPos( aDocPt, aCntntAtPos,
sal_False ) )
{
+// Do it again if we're not on a field to update
the cursor accordingly
+if ( SwContentAtPos::SW_FIELD !=
aCntntAtPos.eCntntAtPos )
+rSh.GetContentAtPos( aDocPt, aCntntAtPos,
sal_True );
+
sal_Bool bViewLocked = rSh.IsViewLocked();
if( !bViewLocked !rSh.IsReadOnlyAvailable()
aCntntAtPos.IsInProtectSect() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/generic vcl/source
vcl/generic/glyphs/graphite_serverfont.cxx |6 +++---
vcl/source/app/i18nhelp.cxx|4 ++--
vcl/source/app/settings.cxx|5 +++--
vcl/source/gdi/outdev3.cxx |3 ++-
vcl/source/gdi/pdfwriter_impl.cxx |4 ++--
5 files changed, 12 insertions(+), 10 deletions(-)
New commits:
commit 2694fed55757e0827f16e881371d87ec9dcb74f9
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 16 17:44:48 2012 +0100
use LanguageTag
Change-Id: I48187540869ba8750e83b1c5e9aa5cb84b1a5c9c
diff --git a/vcl/generic/glyphs/graphite_serverfont.cxx
b/vcl/generic/glyphs/graphite_serverfont.cxx
index 838e694..87cd464 100644
--- a/vcl/generic/glyphs/graphite_serverfont.cxx
+++ b/vcl/generic/glyphs/graphite_serverfont.cxx
@@ -25,7 +25,7 @@
//
// Platform
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include sallayout.hxx
// Module
#include gcach_ftyp.hxx
@@ -70,8 +70,8 @@
GraphiteServerFontLayout::GraphiteServerFontLayout(ServerFont rServerFont) thro
rtl::OString aLang();
if (rServerFont.GetFontSelData().meLanguage != LANGUAGE_DONTKNOW)
{
-aLang = MsLangId::convertLanguageToIsoByteString(
-rServerFont.GetFontSelData().meLanguage );
+aLang = rtl::OUStringToOString( LanguageTag(
rServerFont.GetFontSelData().meLanguage ).getBcp47(),
+RTL_TEXTENCODING_UTF8 );
}
rtl::OString name = rtl::OUStringToOString(
rServerFont.GetFontSelData().maTargetName, RTL_TEXTENCODING_UTF8 );
diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx
index 0448bc7..895e862 100644
--- a/vcl/source/app/i18nhelp.cxx
+++ b/vcl/source/app/i18nhelp.cxx
@@ -22,7 +22,7 @@
#include unotools/localedatawrapper.hxx
#include unotools/transliterationwrapper.hxx
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include rtl/ustrbuf.hxx
@@ -65,7 +65,7 @@ utl::TransliterationWrapper
vcl::I18nHelper::ImplGetTransliterationWrapper() co
nModules |= i18n::TransliterationModules_IGNORE_CASE;
((vcl::I18nHelper*)this)-mpTransliterationWrapper = new
utl::TransliterationWrapper( m_xContext, (i18n::TransliterationModules)nModules
);
-
((vcl::I18nHelper*)this)-mpTransliterationWrapper-loadModuleIfNeeded(
MsLangId::convertLocaleToLanguage( maLocale ) );
+
((vcl::I18nHelper*)this)-mpTransliterationWrapper-loadModuleIfNeeded(
LanguageTag( maLocale ).getLanguageType() );
}
return *mpTransliterationWrapper;
}
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 72dc906..82440fd 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -22,6 +22,7 @@
#include tools/debug.hxx
#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include vcl/svapp.hxx
#include vcl/event.hxx
@@ -1439,7 +1440,7 @@ void AllSettings::SetLocale( const
::com::sun::star::lang::Locale rLocale )
if ( rLocale.Language.isEmpty() )
mpData-meLanguage = LANGUAGE_SYSTEM;
else
-mpData-meLanguage = MsLangId::convertLocaleToLanguage( rLocale );
+mpData-meLanguage = LanguageTag( rLocale ).getLanguageType( false);
if ( mpData-mpLocaleDataWrapper )
{
delete mpData-mpLocaleDataWrapper;
@@ -1468,7 +1469,7 @@ void AllSettings::SetLanguage( LanguageType eLang )
CopyData();
mpData-meLanguage = eLang;
-MsLangId::convertLanguageToLocale( GetLanguage(),
((AllSettings*)this)-mpData-maLocale );
+mpData-maLocale = LanguageTag( GetLanguage() ).getLocale();
if ( mpData-mpLocaleDataWrapper )
{
delete mpData-mpLocaleDataWrapper;
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 94837fc..d3cfb45 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -18,6 +18,7 @@
*/
#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include rtl/tencinfo.h
#include rtl/logfile.hxx
@@ -476,7 +477,7 @@ Font OutputDevice::GetDefaultFont( sal_uInt16 nType,
LanguageType eLang,
}
else
{
-MsLangId::convertLanguageToLocale( eLang, aLocale );
+aLocale = LanguageTag( eLang ).getLocale();
}
utl::DefaultFontConfiguration rDefaults =
utl::DefaultFontConfiguration::get();
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index 0e79d79..73c349c 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -43,7 +43,7 @@
#include tools/zcodec.hxx
#include tools/stream.hxx
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include vcl/virdev.hxx
#include vcl/bmpacc.hxx
@@ -11666,7 +11666,7 @@ bool PDFWriterImpl::setStructureAttributeNumerical(
enum PDFWriter::StructAttrib
{
if( eAttr == PDFWriter::Language )
{
-m_aStructure[ m_nCurrentStructElement ].m_aLocale =
Re: LO as an NPAPI browser plugin host?
On 11/16/2012 04:50 PM, Regina Henschel wrote: Stephan Bergmann schrieb: There is a little-known(?) feature in LO that allows to plug browser plugins based on the NPAPI standard to display (multimedia) content inside LO documents. In Writer at least, it is available via Insert - Object - Plug-in The implementation is in extensions/source/plugin/ (which has platform-specific branches for aqua, unx, and win) and np_sdk/. And it appears to be horribly broken, see below for details. It works fine here for Flash. I use LO3.6 on WinXP. I can insert a flash file via Insert-Object-Plug-in into a presentation. It works in edit mode and in presentation mode. So it is not horrible broken. The situation on Windows might be different indeed, given how the implementations of LO's plugin host interface, but likely also the plugins themselves, differ across platforms. Thanks for sharing. Given that standard multimedia content is already covered via Insert - Movie and Sound... (whose implementation is completely unrelated), the only relevant remaining use-case might be Flash content. But given that I at least was unable to get even that working (see below), I wonder whether this feature is actually used/missed by anybody, or whether we should just drop it completely from our codebase? (I vaguely remember that in the distant past it even worked to display Java applets via this plugin interface, by plugging a JRE's browser plugin. Given my findings below, I don't now it would even be worth to try to test that today.) Jave applets were disabled for security reasons a long time ago, I guess around OOo1 - OOo2. I would have to search for the exact time. Makes sense. Opinions anyone? Do not remove it, until there is another option for flash. And (just to be sure), you do make use of that feature, right? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: bin/lo-pack-sources
bin/lo-pack-sources | 31 ---
1 file changed, 20 insertions(+), 11 deletions(-)
New commits:
commit d0776ccbd5a7b69dc85fba214e0916f1b6bd2eb1
Author: Petr Mladek pmla...@suse.cz
Date: Fri Nov 16 18:31:28 2012 +0100
bin/lo-pack-sources: fix to work with submodules
I still want to use the same top level dir in all tarballs but not today :-)
Change-Id: Iddbc8f91a84c4c73133a0eb4305d8aef7dc5c043
diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index d04d5c9..c49ba6d 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -7,14 +7,20 @@ use strict;
use File::Copy;
use File::Temp qw/ tempfile tempdir /;
+my %piece_dir = (
+dictionaries = dictionaries,
+help = helpcontent2,
+translations = translations
+);
+
# get libreoffice-build version from the given libreoffice-build sources
sub get_config_version($)
{
my ($lo_core_dir) = @_;
my $version;
-open (CONFIGURE, $lo_core_dir/configure.in) ||
-die can't open \$lo_core_dir/configure.in\ for reading: $!\n;
+open (CONFIGURE, $lo_core_dir/configure.ac) ||
+die can't open \$lo_core_dir/configure.ac\ for reading: $!\n;
while (my $line = CONFIGURE) {
chomp $line;
@@ -283,7 +289,7 @@ sub generate_tarballs($$)
my $piece_dir = $source_dir;
foreach my $piece ( keys %{$p_piece_tarball_name} ) {
print \n--- Generating $piece ---\n;
-$piece_dir = $source_dir/clone/$piece if ($is_lo_core_dir);
+$piece_dir = $source_dir/$piece_dir{$piece} if ($is_lo_core_dir);
generate_piece_tarball($piece_dir, $release_version, $piece, $md5,
$bzip2, $xz, $p_piece_tarball_name-{$piece});
}
}
@@ -340,7 +346,6 @@ my $lo_core_tempdir;
my $force;
my $verbose=1;
my $is_lo_core_dir=0;
-my @pieces=(dictionaries, help, translations);
my %piece_tarball_name;
###
@@ -372,8 +377,10 @@ for my $arg (@ARGV) {
$pack_lo_pieces=0;
} elsif ($arg =~ m/--piece=(.*)/) {
# process just one piece and do not pack libreoffice-build
- @pieces=();
- push @pieces, $1;
+ die(Error: unknown piece: $1) unless (defined $piece_dir{$1});
+ my $dir = $piece_dir{$1};
+ %piece_dir=();
+ $piece_dir{$1} = $dir;
$pack_lo_core=0;
} elsif ($arg =~ /^-/ ) {
die Error: unknown option: $arg\n;
@@ -402,12 +409,12 @@ unless ( -d $source_dir ) {
$is_lo_core_dir=1 if (-f $source_dir/autogen.sh -f
$source_dir/config_host.mk.in);
# all tarballs are generated from the libreoffice-core directory
-if (@pieces 1 $is_lo_core_dir == 0 ) {
+if (%piece_dir 1 $is_lo_core_dir == 0 ) {
die Error: \$source_dir\ is not a valid libreoffice-core directory\n;
}
# just a single piece tarball can be generated from piece directory; version
must be explicitly set in this case
-if (@pieces == 1$is_lo_core_dir == 0! defined $set_version ) {
+if (%piece_dir == 1$is_lo_core_dir == 0! defined $set_version ) {
die Error: version must be set using the --set-version=version
option\n unless (defined $set_version);
}
@@ -444,11 +451,13 @@ if ($is_lo_core_dir) {
}
# define tarball names
-$lo_core_tarball_name = libreoffice-core-$release_version;
-foreach my $piece (@pieces) {
-if (-d $source_dir/clone/$piece) {
+$lo_core_tarball_name = libreoffice-$release_version;
+foreach my $piece (keys %piece_dir) {
+if (-f $source_dir/$piece_dir{$piece}/.git) {
+print Add piece $piece\n;
$piece_tarball_name{$piece} = libreoffice-$piece-$release_version;
} else {
+print did not found: $source_dir/$piece_dir{$piece}/.git\n;
print Warning: $piece sources are not available - skipping\n;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: LO as an NPAPI browser plugin host?
Hi Stephan, Stephan Bergmann schrieb: [..] Do not remove it, until there is another option for flash. And (just to be sure), you do make use of that feature, right? No. But I'm no example for a presentation user at all, because in my daily job there is no infrastructure to use it. I can only test whether it works. You need to ask presentation users. But that is a problem in general, how to get information whether there exists a group of users who actually use a feature. With regard to flash, you should keep in mind, that PowerPoint is able to play swf-files and therefore I think, LO should not drop it. So a transition way might be to first enable moviesound to show swf-files and then remove the way via plugin. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: i18npool/inc i18npool/source
i18npool/inc/i18npool/languagetag.hxx | 15 +++
i18npool/source/languagetag/languagetag.cxx | 14 ++
2 files changed, 29 insertions(+)
New commits:
commit 3eb4304af99265c898835cd307ba7d689038996b
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 16 18:44:19 2012 +0100
added LanguageTag::getIsoLanguageCountry() method
Change-Id: I8917c2958f021f11933d9da7fec8ef01609387c8
diff --git a/i18npool/inc/i18npool/languagetag.hxx
b/i18npool/inc/i18npool/languagetag.hxx
index 5666fd1..552110d 100644
--- a/i18npool/inc/i18npool/languagetag.hxx
+++ b/i18npool/inc/i18npool/languagetag.hxx
@@ -95,6 +95,21 @@ public:
*/
LanguageTypegetLanguageType( bool bResolveSystem =
true ) const;
+/** Obtain ISO strings for language and country.
+
+This is a convenience method for places that so far use only language
and
+country to replace the MsLangId::convert...IsoNames...() calls. Avoid
+use in new code.
+
+ATTENTION! May return empty strings if the language tag is not
+expressable in valid ISO codes!
+
+@see isIsoLocale()
+
+Always resolves an empty tag to the system locale.
+ */
+voidgetIsoLanguageCountry( rtl::OUString
rLanguage, rtl::OUString rCountry ) const;
+
/** Get ISO 639 language code, or BCP 47 language.
Always resolves an empty tag to the system locale.
diff --git a/i18npool/source/languagetag/languagetag.cxx
b/i18npool/source/languagetag/languagetag.cxx
index 3e655ee..f863ae2 100644
--- a/i18npool/source/languagetag/languagetag.cxx
+++ b/i18npool/source/languagetag/languagetag.cxx
@@ -618,6 +618,20 @@ LanguageType LanguageTag::getLanguageType( bool
bResolveSystem ) const
}
+void LanguageTag::getIsoLanguageCountry( rtl::OUString rLanguage,
rtl::OUString rCountry ) const
+{
+if (!isIsoLocale())
+{
+rLanguage = OUString();
+rCountry = OUString();
+return;
+}
+// After isIsoLocale() it's safe to call getLanguage() for ISO code.
+rLanguage = getLanguage();
+rCountry = getCountry();
+}
+
+
namespace
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmloff/source
xmloff/source/style/xmlnumfe.cxx | 15 ---
xmloff/source/style/xmlnumfi.cxx | 12 ++--
2 files changed, 14 insertions(+), 13 deletions(-)
New commits:
commit ec2e175384f89d183def1d53f33a6bb394278c87
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 16 18:55:33 2012 +0100
use LanguageTag
Change-Id: I568af42912ce1ec7701dc0043dfbd9d69243d533
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 295b2c9..a2f85a4 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -22,6 +22,7 @@
#include svl/zformat.hxx
#include svl/numuno.hxx
#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include tools/debug.hxx
#include rtl/math.hxx
#include unotools/calendarwrapper.hxx
@@ -243,7 +244,7 @@ SvXMLNumFmtExport::SvXMLNumFmtExport(
}
else
{
-lang::Locale aLocale( MsLangId::convertLanguageToLocale(
MsLangId::getSystemLanguage() ) );
+lang::Locale aLocale( LanguageTag( MsLangId::getSystemLanguage()
).getLocale() );
pCharClass = new CharClass(
comphelper::getComponentContext(rExport.getServiceFactory()), aLocale );
pLocaleData = new LocaleDataWrapper(
comphelper::getComponentContext(rExport.getServiceFactory()), aLocale );
@@ -278,7 +279,7 @@ SvXMLNumFmtExport::SvXMLNumFmtExport(
}
else
{
-lang::Locale aLocale( MsLangId::convertLanguageToLocale(
MsLangId::getSystemLanguage() ) );
+lang::Locale aLocale( LanguageTag( MsLangId::getSystemLanguage()
).getLocale() );
pCharClass = new CharClass(
comphelper::getComponentContext(rExport.getServiceFactory()), aLocale );
pLocaleData = new LocaleDataWrapper(
comphelper::getComponentContext(rExport.getServiceFactory()), aLocale );
@@ -342,7 +343,7 @@ void SvXMLNumFmtExport::AddLanguageAttr_Impl( sal_Int32
nLang )
if ( nLang != LANGUAGE_SYSTEM )
{
OUString aLangStr, aCountryStr;
-MsLangId::convertLanguageToIsoNames( (LanguageType)nLang, aLangStr,
aCountryStr );
+LanguageTag( (LanguageType)nLang ).getIsoLanguageCountry( aLangStr,
aCountryStr );
if (!aLangStr.isEmpty())
rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_LANGUAGE, aLangStr
);
@@ -798,7 +799,7 @@ sal_Bool SvXMLNumFmtExport::WriteTextWithCurrency_Impl(
const OUString rString,
sal_Bool bRet = sal_False;
-LanguageType nLang = MsLangId::convertLocaleToLanguage( rLocale );
+LanguageType nLang = LanguageTag( rLocale ).getLanguageType( false);
pFormatter-ChangeIntl( nLang );
String sCurString, sDummy;
pFormatter-GetCompatibilityCurrency( sCurString, sDummy );
@@ -841,7 +842,7 @@ static OUString lcl_GetDefaultCalendar( SvNumberFormatter*
pFormatter, LanguageT
CalendarWrapper* pCalendar = pFormatter-GetCalendar();
if (pCalendar)
{
-lang::Locale aLocale( MsLangId::convertLanguageToLocale( nLang ) );
+lang::Locale aLocale( LanguageTag( nLang ).getLocale() );
uno::SequenceOUString aCals = pCalendar-getAllCalendars( aLocale );
sal_Int32 nCnt = aCals.getLength();
@@ -1311,7 +1312,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const
SvNumberformat rFormat, sal_uInt
// automatic currency symbol is implemented as
part of
// normal text - search for the symbol
bCurrencyWritten = WriteTextWithCurrency_Impl(
*pElemStr,
-MsLangId::convertLanguageToLocale( nLang ) );
+LanguageTag( nLang ).getLocale() );
bAnyContent = sal_True;
}
else
@@ -1486,7 +1487,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const
SvNumberformat rFormat, sal_uInt
if ( nElemType == NF_KEY_ )
{
// write additional text element for separator
-pLocaleData-setLocale(
MsLangId::convertLanguageToLocale( nLang ) );
+pLocaleData-setLocale( LanguageTag( nLang
).getLocale() );
AddToTextElement_Impl(
pLocaleData-getLongDateDayOfWeekSep() );
}
}
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index abfbc36..f5b8c21 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -26,7 +26,7 @@
#include svl/zformat.hxx
#include svl/numuno.hxx
#include rtl/math.hxx
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include tools/color.hxx
#include tools/debug.hxx
#include rtl/ustrbuf.hxx
@@ -602,9 +602,9 @@ const LocaleDataWrapper SvXMLNumImpData::GetLocaleData(
LanguageType nLang )
pLocaleData = new LocaleDataWrapper(
comphelper::getComponentContext(
Re: Build environment for official win32 builds
On Fri, 2012-11-16 at 15:32 +0100, Enrico Weigelt wrote: in addition to above points also there are also open questions around how we would run unit tests in a MinGW cross-compilation environment and how well gdb works on Windows; the MSVC C++ debugger is really quite good. What about native compiling (not crosscompile) on win32 using gcc ? Anything is possible in LibreOffice :-) having said that - personally I'd want to see that adding support for this doesn't tangle the build system too badly - particularly wrt. confusing our mingw cross-compilation support. The real question is - what is the deliverable here ? building on windows under cygwin is -horribly- slow - if we can use the same compiler to cross-compile from Linux (as we can) and build around 50x faster - why would we want to do work maintenance to keep that going ? :-) But of course, if you want to do that port, maintain it, and you plan to ship binaries of your own from it (which will be bigger and slower than the official ones) then you're more than welcome to - and if the final patch looks sensible we'll merge it of course though I can't see us using it as I say. Hopefully (when fully finished) the move to gnumake will at least strip out one layer of (dmake) grief that makes such things more painful than they really need to be. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Calc / Kerning
On Fri, 2012-11-16 at 11:06 -0500, Kohei Yoshida wrote: On 11/15/2012 04:09 PM, Bernhard Schiffner wrote: (this is my first commit here so please be patient ...) Drat - it's not as easy as I had thought; which is a shame. I'am missing the kerning feature for cells showing the result of a formula. Right. So, there is a technical reason why achieving that for formula result is very difficult, I'm afraid. I guess part of the problem is the difference between ScStringCell and ScEditCell - but also the string types that we hand around inside the formula engine all being String or at best rtl::OUString which has no formatting. I imagine an EditTextObject is an extremely heavy-weight replacement too ;-) Of course, it is *possible* to support rich text properties in text that's a formula result, but that would require intimate knowledge of the inner working of Calc's cell text handling, and would probably requires a lot of code changes. I played with the competition quickly; it seems they don't do this either right ? Bernhard - anything else you're interested in hacking on that might be easier ? :-) ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: oox/source scripting/source sc/source toolkit/source xmlscript/source
oox/source/ole/axcontrol.cxx|6 --
oox/source/ole/vbacontrol.cxx | 10 --
sc/source/filter/inc/drawingfragment.hxx|2 +-
sc/source/filter/oox/drawingfragment.cxx|4
scripting/source/dlgprov/dlgevtatt.cxx |6 +++---
toolkit/source/awt/vclxwindows.cxx |4
toolkit/source/controls/dialogcontrol.cxx |9 +
xmlscript/source/xmldlg_imexp/imp_share.hxx |6 +++---
8 files changed, 12 insertions(+), 35 deletions(-)
New commits:
commit 41c77ac5e814e8f0080468ca79fe7c2473402720
Author: Noel Power noel.po...@suse.com
Date: Fri Nov 16 17:06:02 2012 +
targetted cleanup of misc. vba pieces.
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index f2b2bc8..e056fde 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -58,8 +58,6 @@
namespace oox {
namespace ole {
-//
-
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
@@ -73,10 +71,6 @@ using namespace ::com::sun::star::style;
using namespace ::com::sun::star::table;
using namespace ::com::sun::star::uno;
-using ::rtl::OUString;
-
-//
-
namespace {
const sal_uInt32 COMCTL_ID_SIZE = 0x12344321;
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index 91474c6..5e109b0 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -40,8 +40,6 @@
namespace oox {
namespace ole {
-//
-
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::frame;
@@ -49,11 +47,6 @@ using namespace ::com::sun::star::io;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-
-//
-
namespace {
const sal_uInt16 VBA_SITE_CLASSIDINDEX = 0x8000;
@@ -455,9 +448,6 @@ bool VbaFormControl::convertProperties( const Reference
XControlModel rxCtrl
PropertySet aPropSet( rxCtrlModel );
aPropSet.setProperties( aPropMap );
-// bind to control source and row source range
-mxSiteModel-bindToSources( rxCtrlModel, rConv );
-
// create and convert all embedded controls
if( !maControls.empty() ) try
{
diff --git a/sc/source/filter/inc/drawingfragment.hxx
b/sc/source/filter/inc/drawingfragment.hxx
index e8b1ed7..b34583a 100644
--- a/sc/source/filter/inc/drawingfragment.hxx
+++ b/sc/source/filter/inc/drawingfragment.hxx
@@ -31,9 +31,9 @@
#include com/sun/star/awt/Rectangle.hpp
#include com/sun/star/awt/Size.hpp
-#include oox/drawingml/shape.hxx
#include oox/drawingml/shapegroupcontext.hxx
#include oox/ole/axcontrol.hxx
+#include oox/drawingml/shape.hxx
#include oox/ole/vbaproject.hxx
#include oox/vml/vmldrawing.hxx
#include oox/vml/vmldrawingfragment.hxx
diff --git a/sc/source/filter/oox/drawingfragment.cxx
b/sc/source/filter/oox/drawingfragment.cxx
index afc0ca1..a65c224 100644
--- a/sc/source/filter/oox/drawingfragment.cxx
+++ b/sc/source/filter/oox/drawingfragment.cxx
@@ -49,10 +49,6 @@
namespace oox {
namespace xls {
-using ::rtl::OUString;
-
-//
-
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx
b/scripting/source/dlgprov/dlgevtatt.cxx
index f202278..40147ca 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -311,12 +311,12 @@ namespace dlgprov
sal_Int32 nControlCount = aControls.getLength();
Sequence Reference XInterface aObjects( nControlCount );
-Reference XInterface * pObjectsModify = aObjects.getArray();
+Reference XInterface * pObjects2 = aObjects.getArray();
const Reference XControl * pControls =
aControls.getConstArray();
-for ( sal_Int32 j = 0; j nControlCount; ++j )
+for ( sal_Int32 i2 = 0; i2 nControlCount; ++i2 )
{
-pObjectsModify[j] = Reference XInterface ( pControls[j],
UNO_QUERY );
+pObjects2[i2] = Reference XInterface ( pControls[i2],
UNO_QUERY );
}
nestedAttachEvents( aObjects, Helper, sDialogCodeName );
}
diff --git a/toolkit/source/awt/vclxwindows.cxx
b/toolkit/source/awt/vclxwindows.cxx
index aa69a69..3c97f1d 100644
---
Re: Calc / Kerning
Am Freitag, 16. November 2012, 18:17:09 schrieb Michael Meeks: On Fri, 2012-11-16 at 11:06 -0500, Kohei Yoshida wrote: On 11/15/2012 04:09 PM, Bernhard Schiffner wrote: (this is my first commit here so please be patient ...) Drat - it's not as easy as I had thought; which is a shame. I'am missing the kerning feature for cells showing the result of a formula. Right. So, there is a technical reason why achieving that for formula result is very difficult, I'm afraid. I guess part of the problem is the difference between ScStringCell and ScEditCell - but also the string types that we hand around inside the formula engine all being String or at best rtl::OUString which has no formatting. I imagine an EditTextObject is an extremely heavy-weight replacement too ;-) Of course, it is *possible* to support rich text properties in text that's a formula result, but that would require intimate knowledge of the inner working of Calc's cell text handling, and would probably requires a lot of code changes. I played with the competition quickly; it seems they don't do this either right ? Let's do it better. (See below.) Bernhard - anything else you're interested in hacking on that might be easier ? :-) For sure! :-) (My question raised from inserting spreadsheets into lowriter documents where the insertions were visible at the first glance, because of the use of advanced formating.) But understanding the problem as Kohei explained it I don't want to give up the idea itself. What about this: While it seems very bloated to carry all rich text formating _inside_ formula cells, it might be possible to create an overlay using advanced formating _outside_. Think of this as having a separate spreadsheet (linked 1:1 to the generating spreadsheet) with the only property to add formating to the pointed results. (Export as text - reformat) Do you see a chance to solve the problem this way? ATB, Michael. Thank you for all advice! Bernhard (Thinking a second time about the said, I start to like the idea of a special sheet type dedicated to layout problems.) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] startup: allow multiple tries to connect to other soffice in...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1089 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/89/1089/1 startup: allow multiple tries to connect to other soffice instance On startup if new soffice instance (S2) detects another soffice (S1), S2 will starts in 'connect to soffice S1 pipe' mode. Then S2 will establish a dialog with S1. But if S1 exits before dialog establishment, S2 will fail to start and return a IPC_STATUS_BOOTSTRAP_ERROR. This patch fixes this : if dialog establishment fails, S2 will go back to the is-there-any-other-soffice-running-? step (after 3 failures, IPC_STATUS_BOOTSTRAP_ERROR is returned). Change-Id: I2e099a5804e1e8dd535cfd31ef454cffa44efa62 --- M desktop/source/app/officeipcthread.cxx 1 file changed, 36 insertions(+), 16 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1089 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2e099a5804e1e8dd535cfd31ef454cffa44efa62 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Calc / Kerning
On 11/16/2012 02:18 PM, Bernhard Schiffner wrote: What about this: While it seems very bloated to carry all rich text formating _inside_ formula cells, it might be possible to create an overlay using advanced formating _outside_. Think of this as having a separate spreadsheet (linked 1:1 to the generating spreadsheet) with the only property to add formating to the pointed results. (Export as text - reformat) Do you see a chance to solve the problem this way? Sure. But this would require a re-design of a non-trivial part of the Calc core. Basically we would have to remove use of EditEngine and its friend and re-implement Calc's own rich-text handling framework. The question is, is this all worth the benefit? I personally think it's too risky just for a marginal gain, and goes back to what I'd said earlier: Of course, it is *possible* to support rich text properties in text that's a formula result, but that would require intimate knowledge of the inner working of Calc's cell text handling, and would probably requires a lot of code changes. It all comes down to risk/effort vs benefit. Kohei -- Kohei Yoshida, LibreOffice hacker, Calc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Build environment for official win32 builds
Hi, Anything is possible in LibreOffice :-) having said that - personally I'd want to see that adding support for this doesn't tangle the build system too badly - particularly wrt. confusing our mingw cross-compilation support. I have to admit, I haven't tried it yet, but _assuming_ it is just a normal GNU toolchain that just happens to produce win32 binaries, it should make things easier in the long run. Of course, we need to cleanly differentiate between normal and crosscompiling (IOW: not assuming crosscompile on mingw32 target). The real question is - what is the deliverable here ? building on windows under cygwin is -horribly- slow - if we can use the same compiler to cross-compile from Linux (as we can) and build around 50x faster - why would we want to do work maintenance to keep that going ? :-) Oh! Do you know where that slowdown is coming from ? But of course, if you want to do that port, maintain it, and you plan to ship binaries of your own from it (which will be bigger and slower than the official ones) Why so ? Is GCC on win32 _so_ bad compared to MSVC ? Hopefully (when fully finished) the move to gnumake will at least strip out one layer of (dmake) grief that makes such things more painful than they really need to be. Does this also mean kicking out autotools ? cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [libreoffice-users] - Scalc.java ported to C++ , uses DocumentLoader
Is there any secure place to put this code for the benefit of users ? Wiki or being bundled with examples ? I posted this to users list and Tom Davies kindly suggested I try the DEV list. Maybe push it to gerrit for review ? https://gerrit.libreoffice.org/ cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weig...@vnc.biz; www.vnc.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svtools/langsupport svtools/source
svtools/langsupport/langsupport.cxx | 11 ++-
svtools/source/control/fmtfield.cxx | 16 +++-
2 files changed, 9 insertions(+), 18 deletions(-)
New commits:
commit ee30270f590902e0971410dad7991d56a8506549
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 16 19:36:50 2012 +0100
use LanguageTag
Change-Id: I1d7ba0066ab871ac471a57bbbf0bbf07bc6350cc
diff --git a/svtools/langsupport/langsupport.cxx
b/svtools/langsupport/langsupport.cxx
index 3a05c9a..1d5cf7f 100644
--- a/svtools/langsupport/langsupport.cxx
+++ b/svtools/langsupport/langsupport.cxx
@@ -31,7 +31,7 @@
#include com/sun/star/lang/XMultiServiceFactory.hpp
#include comphelper/processfactory.hxx
#include cppuhelper/bootstrap.hxx
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include sal/main.h
#include svtools/langtab.hxx
#include tools/extendapplicationenvironment.hxx
@@ -76,14 +76,7 @@ SAL_IMPLEMENT_MAIN()
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();
+rtl::OUString sTag( LanguageTag( eLang).getBcp47());
std::cout rtl::OUStringToOString(sTag,
osl_getThreadTextEncoding()).getStr()
std::endl;
diff --git a/svtools/source/control/fmtfield.cxx
b/svtools/source/control/fmtfield.cxx
index 5619551..8bb336f 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -35,7 +35,7 @@
#include vcl/svapp.hxx
#include svl/zformat.hxx
#include svtools/fmtfield.hxx
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include com/sun/star/lang/Locale.hpp
#include com/sun/star/util/SearchOptions.hpp
#include com/sun/star/util/SearchAlgorithms.hpp
@@ -293,8 +293,8 @@ SvNumberFormatter*
FormattedField::StaticFormatter::GetFormatter()
if (!s_cFormatter)
{
// get the Office's locale and translate
-LanguageType eSysLanguage = MsLangId::convertLocaleToLanguage(
-SvtSysLocale().GetLocaleData().getLocale() );
+LanguageType eSysLanguage = LanguageTag(
+SvtSysLocale().GetLocaleData().getLocale()).getLanguageType(
false);
s_cFormatter = new SvNumberFormatter(
::comphelper::getProcessServiceFactory(),
eSysLanguage);
@@ -619,8 +619,8 @@ void FormattedField::SetFormatter(SvNumberFormatter*
pFormatter, sal_Bool bReset
if ( m_pFormatter )
{
// get the Office's locale and translate
-LanguageType eSysLanguage = MsLangId::convertLocaleToLanguage(
-SvtSysLocale().GetLocaleData().getLocale() );
+LanguageType eSysLanguage = LanguageTag(
+
SvtSysLocale().GetLocaleData().getLocale()).getLanguageType( false);
// get the standard numeric format for this language
m_nFormatKey = m_pFormatter-GetStandardFormat(
NUMBERFORMAT_NUMBER, eSysLanguage );
}
@@ -1144,8 +1144,7 @@ void DoubleNumericField::ResetConformanceTester()
sal_Unicode cSeparatorDecimal = '.';
if (pFormatEntry)
{
-Locale aLocale;
-MsLangId::convertLanguageToLocale( pFormatEntry-GetLanguage(),
aLocale );
+Locale aLocale( LanguageTag( pFormatEntry-GetLanguage()).getLocale());
LocaleDataWrapper aLocaleInfo( aLocale );
String sSeparator = aLocaleInfo.getNumThousandSep();
@@ -1236,8 +1235,7 @@ void DoubleCurrencyField::UpdateCurrencyFormat()
sal_uInt16 nDigits = GetDecimalDigits();
// build a new format string with the base class' and my own settings
-Locale aLocale;
-MsLangId::convertLanguageToLocale( eLanguage, aLocale );
+Locale aLocale( LanguageTag( eLanguage).getLocale());
LocaleDataWrapper aLocaleInfo( aLocale );
XubString sNewFormat;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cppcanvas/source
cppcanvas/source/mtfrenderer/implrenderer.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit c3bde3cd13e3af65290d5cdab7bf951a6325e370 Author: Eike Rathke er...@redhat.com Date: Fri Nov 16 20:53:55 2012 +0100 use LanguageTag Change-Id: I2f8fd72cb49298f59d5eb406f03a1fc4128d1c8d diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index b7f1677..e8f40bd 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -62,7 +62,7 @@ #include vcl/metric.hxx #include vcl/graphictools.hxx #include tools/poly.hxx -#include i18npool/mslangid.hxx +#include i18npool/languagetag.hxx #include implrenderer.hxx #include tools.hxx #include outdevstate.hxx @@ -872,7 +872,7 @@ namespace cppcanvas : rendering::PanoseProportion::ANYTHING; LanguageType aLang = rFont.GetLanguage(); -aFontRequest.Locale = MsLangId::convertLanguageToLocale(aLang, false); +aFontRequest.Locale = LanguageTag( aLang).getLocale( false); // setup state-local text transformation, // if the font be rotated ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: drawinglayer/source
drawinglayer/source/primitive2d/metafileprimitive2d.cxx |8 drawinglayer/source/primitive2d/textlayoutdevice.cxx|4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 032164972c7f4c720937e6117c0e147cfdd448b0 Author: Eike Rathke er...@redhat.com Date: Fri Nov 16 20:59:35 2012 +0100 use LanguageTag Change-Id: I28b1dbb21e40585aaf2451e12ffd4f03783d4c4b diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index 791801b..d168bef 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -48,7 +48,7 @@ #include drawinglayer/primitive2d/textprimitive2d.hxx #include drawinglayer/primitive2d/textlayoutdevice.hxx #include drawinglayer/primitive2d/textdecoratedprimitive2d.hxx -#include i18npool/mslangid.hxx +#include i18npool/languagetag.hxx #include drawinglayer/primitive2d/textlineprimitive2d.hxx #include drawinglayer/primitive2d/textstrikeoutprimitive2d.hxx #include drawinglayer/primitive2d/epsprimitive2d.hxx @@ -1312,7 +1312,7 @@ namespace // prepare FontColor and Locale const basegfx::BColor aFontColor(rProperty.getTextColor()); -const com::sun::star::lang::Locale aLocale(MsLangId::convertLanguageToLocale(rProperty.getLanguageType())); +const com::sun::star::lang::Locale aLocale(LanguageTag(rProperty.getLanguageType()).getLocale()); const bool bWordLineMode(rFont.IsWordLineMode()); const bool bDecoratedIsNeeded( @@ -1552,8 +1552,8 @@ namespace // strikeout with character const sal_Unicode aStrikeoutChar( drawinglayer::primitive2d::TEXT_STRIKEOUT_SLASH == aTextStrikeout ? '/' : 'X'); -const com::sun::star::lang::Locale aLocale(MsLangId::convertLanguageToLocale( -rProperty.getLanguageType())); +const com::sun::star::lang::Locale aLocale(LanguageTag( +rProperty.getLanguageType()).getLocale()); aTargetVector.push_back( new drawinglayer::primitive2d::TextCharacterStrikeoutPrimitive2D( diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx index 4e1e873..6640999 100644 --- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx +++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx @@ -24,7 +24,7 @@ #include vcl/virdev.hxx #include vcl/font.hxx #include vcl/metric.hxx -#include i18npool/mslangid.hxx +#include i18npool/languagetag.hxx #include drawinglayer/primitive2d/textprimitive2d.hxx #include vcl/svapp.hxx @@ -403,7 +403,7 @@ namespace drawinglayer aRetval.SetItalic(rFontAttribute.getItalic() ? ITALIC_NORMAL : ITALIC_NONE); aRetval.SetOutline(rFontAttribute.getOutline()); aRetval.SetPitch(rFontAttribute.getMonospaced() ? PITCH_FIXED : PITCH_VARIABLE); -aRetval.SetLanguage(MsLangId::convertLocaleToLanguage(rLocale)); +aRetval.SetLanguage(LanguageTag(rLocale).getLanguageType(false)); #ifdef WIN32 // for WIN32 systems, correct the FontWidth if FontScaling is used ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/killsdf' - solenv/bin
solenv/bin/uilangfilter.xslt | 20 +---
1 file changed, 17 insertions(+), 3 deletions(-)
New commits:
commit 50d6578f2cf1747d0471e1b6f9585c216ebfa7fe
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 14 13:02:29 2012 +
Resolves: fdo#57107 processing translatable child nodes twice
I'm rubbish with xslt.
Change-Id: Idc92a602aca7dc2a96cf185b1904e1373435a8a9
diff --git a/solenv/bin/uilangfilter.xslt b/solenv/bin/uilangfilter.xslt
index 42d066f..90abf11 100644
--- a/solenv/bin/uilangfilter.xslt
+++ b/solenv/bin/uilangfilter.xslt
@@ -13,19 +13,33 @@
xsl:template match=/
lxsl:text#10;/xsl:text
- xsl:apply-templates select=//*[*[not(self::col)]/@translatable='yes'] /
+ !--
+ What I want to do here is to extract all nodes that are translatable
+ except the columns of list and tree stores
+ --
+ xsl:apply-templates select=//*[not(self::col)][@translatable='yes'] /
+ !--
+ What I want to do here is to extract just the list and tree store
+ columns that that are translatable
+ --
xsl:apply-templates
select=interface/object[data/row/col[@id='0'][@translatable='yes']] /
/l
/xsl:template
-xsl:template match=*/*[not(self::col)][@translatable]
+!--
+Normal nodes
+--
+xsl:template match=*/*[not(self::col)][@translatable='yes']
xsl:text /xsl:text
t r=string g={str:tokenize(../@id,':')[1]} l={@name}
xsl:copy-of select=text() /
/txsl:text#10;/xsl:text
/xsl:template
-xsl:template match=col[@id='0']
+!--
+Column nodes
+--
+xsl:template match=col[@id='0'][@translatable='yes']
xsl:text /xsl:text
xsl:variable name=groupid select=../../../@id/
t r=stringlist g={str:tokenize($groupid,':')[1]}
l={count(preceding::col[@id='0'][../../../@id=$groupid])}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Calc / Kerning
Am Freitag, 16. November 2012, 14:25:46 schrieben Sie:
On 11/16/2012 02:18 PM, Bernhard Schiffner wrote:
What about this:
While it seems very bloated to carry all rich text formating _inside_
formula cells, it might be possible to create an overlay using advanced
formating _outside_.
Think of this as having a separate spreadsheet (linked 1:1 to the
generating spreadsheet) with the only property to add formating to the
pointed results. (Export as text - reformat)
Do you see a chance to solve the problem this way?
Sure. But this would require a re-design of a non-trivial part of the
Calc core. Basically we would have to remove use of EditEngine and its
friend and re-implement Calc's own rich-text handling framework.
That's not worth it.
State of the onion (IIUC):
- If you input a string into a cell you can apply rich text format by graphic
means.
- Most of the times (=function is parsed, ...) this rich text is
automatically transformed into an other, internal format more suited for
spreadsheet needs.
- This conversation is triggered too if you do format-cell.
- After this transformation is done there is no easy way back to RTF.
Questions:
1.) Is it possible to text-edit a text cell directly entering something like
{\b Bold}?
2.) Copy and paste from other rtf sources?
3.) Is there a way to do so by (external) software?
4.) What's about something like =cell(resulting_string, A1) be it API or
internal?
Thanks for the quick response and your patience!
Bernhard
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: i18npool/inc i18npool/source
i18npool/inc/i18npool/languagetag.hxx | 10 ++
i18npool/inc/i18npool/mslangid.hxx | 11 +--
i18npool/source/languagetag/languagetag.cxx | 43
3 files changed, 56 insertions(+), 8 deletions(-)
New commits:
commit 15e274a37c75eedb6e2fae07e4689cef67cdf2d7
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 16 22:31:09 2012 +0100
added LanguageTag::makeFallback()
Change-Id: I6a89dd2c5e34035ac1e6c9b7e4723d881c5ceaa9
diff --git a/i18npool/inc/i18npool/languagetag.hxx
b/i18npool/inc/i18npool/languagetag.hxx
index 552110d..c5ce232 100644
--- a/i18npool/inc/i18npool/languagetag.hxx
+++ b/i18npool/inc/i18npool/languagetag.hxx
@@ -187,6 +187,15 @@ public:
/** Reset with LanguageType MS-LangID. */
voidreset( LanguageType nLanguage );
+
+/** Fall back to a known locale.
+
+If the current tag does not represent a known (by us) locale, fall back
+to the most likely locale possible known.
+If the current tag is known, no change occurs.
+ */
+LanguageTagmakeFallback();
+
private:
enum Decision
@@ -213,6 +222,7 @@ private:
mutable boolmbCachedLanguage: 1;
mutable boolmbCachedScript : 1;
mutable boolmbCachedCountry : 1;
+boolmbIsFallback: 1;
voidconvertLocaleToBcp47();
voidconvertLocaleToLang();
diff --git a/i18npool/inc/i18npool/mslangid.hxx
b/i18npool/inc/i18npool/mslangid.hxx
index 574a07d..120d9c6 100644
--- a/i18npool/inc/i18npool/mslangid.hxx
+++ b/i18npool/inc/i18npool/mslangid.hxx
@@ -149,6 +149,14 @@ private:
const ::com::sun::star::lang::Locale rLocale );
+/** To be used only by LanguageTag. */
+I18NISOLANG_DLLPRIVATE static LanguageType lookupFallbackLanguage(
LanguageType nLang );
+
+/** To be used only by LanguageTag. */
+I18NISOLANG_DLLPRIVATE static ::com::sun::star::lang::Locale
lookupFallbackLocale(
+const ::com::sun::star::lang::Locale rLocale );
+
+
#if I18NPOOL_FORCE_LANGUAGETAG
public:
#endif
@@ -317,12 +325,9 @@ private:
I18NISOLANG_DLLPRIVATE static inline LanguageType simplifySystemLanguages(
LanguageType nLang );
// Several locale lookups with fall-back
-I18NISOLANG_DLLPRIVATE static LanguageType lookupFallbackLanguage(
LanguageType nLang );
I18NISOLANG_DLLPRIVATE static LanguageType lookupFallbackLanguage(
const ::com::sun::star::lang::Locale rLocale );
I18NISOLANG_DLLPRIVATE static ::com::sun::star::lang::Locale
lookupFallbackLocale( LanguageType nLang );
-I18NISOLANG_DLLPRIVATE static ::com::sun::star::lang::Locale
lookupFallbackLocale(
-const ::com::sun::star::lang::Locale rLocale );
};
diff --git a/i18npool/source/languagetag/languagetag.cxx
b/i18npool/source/languagetag/languagetag.cxx
index f863ae2..1dcc6bf 100644
--- a/i18npool/source/languagetag/languagetag.cxx
+++ b/i18npool/source/languagetag/languagetag.cxx
@@ -162,7 +162,8 @@ LanguageTag::LanguageTag( const rtl::OUString
rBcp47LanguageTag, bool bCanonic
mbInitializedLangID( false),
mbCachedLanguage( false),
mbCachedScript( false),
-mbCachedCountry( false)
+mbCachedCountry( false),
+mbIsFallback( false)
{
theDataRef::get().incRef();
@@ -185,7 +186,8 @@ LanguageTag::LanguageTag( const
com::sun::star::lang::Locale rLocale )
mbInitializedLangID( false),
mbCachedLanguage( false),
mbCachedScript( false),
-mbCachedCountry( false)
+mbCachedCountry( false),
+mbIsFallback( false)
{
theDataRef::get().incRef();
}
@@ -204,7 +206,8 @@ LanguageTag::LanguageTag( LanguageType nLanguage )
mbInitializedLangID( !mbSystemLocale),
mbCachedLanguage( false),
mbCachedScript( false),
-mbCachedCountry( false)
+mbCachedCountry( false),
+mbIsFallback( false)
{
theDataRef::get().incRef();
}
@@ -224,7 +227,8 @@ LanguageTag::LanguageTag( const rtl::OUString rLanguage,
const rtl::OUString r
mbInitializedLangID( false),
mbCachedLanguage( false),
mbCachedScript( false),
-mbCachedCountry( false)
+mbCachedCountry( false),
+mbIsFallback( false)
{
theDataRef::get().incRef();
}
@@ -249,7 +253,8 @@ LanguageTag::LanguageTag( const LanguageTag rLanguageTag )
mbInitializedLangID( rLanguageTag.mbInitializedLangID),
mbCachedLanguage( rLanguageTag.mbCachedLanguage),
mbCachedScript( rLanguageTag.mbCachedScript),
-mbCachedCountry( rLanguageTag.mbCachedCountry)
+mbCachedCountry( rLanguageTag.mbCachedCountry),
+mbIsFallback( rLanguageTag.mbIsFallback)
{
theDataRef::get().incRef();
}
@@ -276,6 +281,7 @@ LanguageTag
[Libreoffice-commits] .: framework/source
framework/source/fwi/helper/mischelper.cxx |4 ++--
framework/source/services/substitutepathvars.cxx |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 97760eb090ed7d5b9c05ac8ad02a27de1144ecc3
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 16 22:43:32 2012 +0100
use LanguageTag
Change-Id: I1f0516cc17741e8f87655ad251930a9da7bdb205
diff --git a/framework/source/fwi/helper/mischelper.cxx
b/framework/source/fwi/helper/mischelper.cxx
index 6292281..379ec36 100644
--- a/framework/source/fwi/helper/mischelper.cxx
+++ b/framework/source/fwi/helper/mischelper.cxx
@@ -26,7 +26,7 @@
#include tools/debug.hxx
#include vcl/settings.hxx
#include vcl/svapp.hxx
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include svtools/langtab.hxx
#include comphelper/processfactory.hxx
#include helper/mischelper.hxx
@@ -179,7 +179,7 @@ void FillLangItems( std::set OUString rLangItems,
if ( xLangGuesser.is() !rGuessedTextLang.isEmpty())
{
::com::sun::star::lang::Locale
aLocale(xLangGuesser-guessPrimaryLanguage( rGuessedTextLang, 0,
rGuessedTextLang.getLength()) );
-LanguageType nLang = MsLangId::convertLocaleToLanguageWithFallback(
aLocale );
+LanguageType nLang = LanguageTag( aLocale
).makeFallback().getLanguageType();
if (nLang != LANGUAGE_DONTKNOW nLang != LANGUAGE_NONE nLang !=
LANGUAGE_SYSTEM
IsScriptTypeMatchingToLanguage( nScriptType, nLang ))
rLangItems.insert( rLanguageTable.GetString( nLang ));
diff --git a/framework/source/services/substitutepathvars.cxx
b/framework/source/services/substitutepathvars.cxx
index 7db7b97..08dd17f 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -34,7 +34,7 @@
#include osl/security.hxx
#include osl/socket.hxx
#include osl/process.h
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include tools/urlobj.hxx
#include tools/resmgr.hxx
#include tools/wldcrd.hxx
@@ -1193,7 +1193,7 @@ void SubstitutePathVariables::SetPredefinedPathVariables(
PredefinedPathVariable
// Detect the language type of the current office
aPreDefPathVariables.m_eLanguageType = LANGUAGE_ENGLISH_US;
rtl::OUString aLocaleStr( utl::ConfigManager::getLocale() );
-aPreDefPathVariables.m_eLanguageType =
MsLangId::convertIsoStringToLanguage( aLocaleStr );
+aPreDefPathVariables.m_eLanguageType = LanguageTag( aLocaleStr
).getLanguageType();
// We used to have an else branch here with a LOG_ERROR, but that
// always fired in some unit tests when this code was built with
// debug=t, so it seems fairly pointless, especially as
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Change in core[feature/killsdf]: Delete empty x-comment from shells.src
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1090 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/90/1090/1 Delete empty x-comment from shells.src Change-Id: I7899b18d30f8093598761204e7fae6bae93f6e5f --- M sw/source/ui/shells/shells.src 1 file changed, 0 insertions(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/1090 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7899b18d30f8093598761204e7fae6bae93f6e5f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: feature/killsdf Gerrit-Owner: Zolnai Tamás zolnaitamas2...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: dictionaries
dictionaries |1 + 1 file changed, 1 insertion(+) New commits: commit 9e818a2381e75928fbd2a208f79ff67712bdad59 Author: Miklos Vajna vmik...@suse.cz Date: Fri Nov 16 23:17:54 2012 +0100 Add back lost dictionaries submodule This partially reverts commit 43cd14d317dd463a9e7c15fd6bcd6b289f96491f. Change-Id: Ibc53b327c8d3a048a4d595d181088dff2823b6a7 diff --git a/dictionaries b/dictionaries new file mode 16 index 000..028f440 --- /dev/null +++ b/dictionaries @@ -0,0 +1 @@ +Subproject commit 028f44069fd346ba07b3a0263ee340022eb44d6c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editeng.cxx |2 +-
editeng/source/editeng/editview.cxx |4 ++--
editeng/source/items/textitem.cxx |6 +++---
editeng/source/misc/svxacorr.cxx|2 +-
editeng/source/misc/unolingu.cxx| 10 +-
editeng/source/outliner/outlvw.cxx |4 ++--
6 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 378e437fbe313e87b7e56f8f0a1fc4009470679c
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 16 23:22:11 2012 +0100
use LanguageTag
Change-Id: If056193c803f70f8707373ed7ff7b1abbf953852
diff --git a/editeng/source/editeng/editeng.cxx
b/editeng/source/editeng/editeng.cxx
index f437564..8b191ea 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1362,7 +1362,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent
rKeyEvent, EditView* pEditVie
String aComplete;
LanguageType eLang =
pImpEditEngine-GetLanguage( EditPaM( aStart.GetNode(), aStart.GetIndex()+1));
-lang::Locale aLocale(
MsLangId::convertLanguageToLocale( eLang));
+lang::Locale aLocale( LanguageTag(
eLang).getLocale());
if
(!pImpEditEngine-xLocaleDataWrapper.isInitialized())
pImpEditEngine-xLocaleDataWrapper.init(
SvtSysLocale().GetLocaleData().getComponentContext(), aLocale, eLang);
diff --git a/editeng/source/editeng/editview.cxx
b/editeng/source/editeng/editview.cxx
index 1ed54fc..86084a7 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -27,7 +27,7 @@
#include com/sun/star/i18n/WordType.hpp
#include vcl/metric.hxx
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include svl/languageoptions.hxx
#include svtools/ctrltool.hxx
#include svtools/langtab.hxx
@@ -102,7 +102,7 @@ static LanguageType lcl_CheckLanguage(
nLang = nTmpLang;
}
if (nLang == LANGUAGE_NONE) // language not found by looking up the
sytem language...
-nLang = MsLangId::convertLocaleToLanguageWithFallback( aLocale );
+nLang = LanguageTag( aLocale ).makeFallback().getLanguageType();
if (nLang == LANGUAGE_SYSTEM)
nLang = nTmpLang;
if (nLang == LANGUAGE_DONTKNOW)
diff --git a/editeng/source/items/textitem.cxx
b/editeng/source/items/textitem.cxx
index 401ca6f..25f998b 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -37,7 +37,7 @@
#include tools/tenccvt.hxx
#include rtl/ustring.hxx
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include svl/itemset.hxx
#include svtools/langtab.hxx
@@ -2607,7 +2607,7 @@ bool SvxLanguageItem::QueryValue( uno::Any rVal,
sal_uInt8 nMemberId ) const
rVal = (sal_Int16)(GetValue());
break;
case MID_LANG_LOCALE:
-lang::Locale aRet( MsLangId::convertLanguageToLocale( GetValue(),
false));
+lang::Locale aRet( LanguageTag( GetValue()).getLocale( false));
rVal = aRet;
break;
}
@@ -2635,7 +2635,7 @@ bool SvxLanguageItem::PutValue( const uno::Any rVal,
sal_uInt8 nMemberId )
return sal_False;
if (!aLocale.Language.isEmpty() || !aLocale.Country.isEmpty())
-SetValue(MsLangId::convertLocaleToLanguage( aLocale ));
+SetValue( LanguageTag( aLocale ).getLanguageType( false));
else
SetValue(LANGUAGE_NONE);
}
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 3f2298a..d8ae94c 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1905,7 +1905,7 @@ sal_Bool
SvxAutoCorrect::FindInCplSttExceptList(LanguageType eLang,
String SvxAutoCorrect::GetAutoCorrFileName( LanguageType eLang,
sal_Bool bNewFile, sal_Bool bTst )
const
{
-String sRet, sExt( MsLangId::convertLanguageToIsoString( eLang ) );
+String sRet, sExt( LanguageTag( eLang ).getBcp47() );
sExt.Insert('_', 0);
sExt.AppendAscii( .dat );
if( bNewFile )
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 022ab11..4648636 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -40,7 +40,7 @@
#include comphelper/processfactory.hxx
#include cppuhelper/implbase1.hxx // helper for implementations
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include unotools/lingucfg.hxx
#include unotools/ucbhelper.hxx
#include unotools/localfilehelper.hxx
@@ -131,7 +131,7 @@ void ThesDummy_Impl::GetCfgLocales()
for (sal_Int32 i = 0; i nLen; ++i)
{
pLocale[i] = SvxCreateLocale(
-MsLangId::convertIsoStringToLanguage(
[Libreoffice-commits] .: Branch 'feature/killsdf' - sw/source
sw/source/ui/shells/shells.src |1 -
1 file changed, 1 deletion(-)
New commits:
commit 3777191e95400d76bd7dcd71ed1249a6a001317a
Author: Zolnai Tamás zolnaitamas2...@gamil.com
Date: Fri Nov 16 18:36:54 2012 +0100
Delete empty x-comment from shells.src
Change-Id: I7899b18d30f8093598761204e7fae6bae93f6e5f
Reviewed-on: https://gerrit.libreoffice.org/1090
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com
diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src
index da6af12..cab3649 100644
--- a/sw/source/ui/shells/shells.src
+++ b/sw/source/ui/shells/shells.src
@@ -119,7 +119,6 @@ QueryBox DLG_IMPORT_DBNAME
BUTTONS = WB_YES_NO ;
DEFBUTTON = WB_DEF_NO ;
Message [ en-US ] = Use database name as default database for the
document? ;
-Message [ x-comment ] = ;
};
String STR_PAGE
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[feature/killsdf]: Delete empty x-comment from shells.src
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1090 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1090 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7899b18d30f8093598761204e7fae6bae93f6e5f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: feature/killsdf Gerrit-Owner: Zolnai Tamás zolnaitamas2...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: linguistic/source
linguistic/source/convdicxml.cxx |6 +++---
linguistic/source/dicimp.cxx |8
linguistic/source/gciterator.cxx |6 +++---
linguistic/source/lngsvcmgr.cxx | 34 +-
linguistic/source/misc.cxx |9 -
5 files changed, 31 insertions(+), 32 deletions(-)
New commits:
commit 4767bbb00dc9eacce6f6d60fd4c55107333cee2d
Author: Eike Rathke er...@redhat.com
Date: Sat Nov 17 00:03:28 2012 +0100
use LanguageTag
Change-Id: I740e221ad16974c88b98c114850e663f25723b76
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index 09298f4..2daa2c8 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -20,7 +20,7 @@
#include tools/debug.hxx
#include tools/fsys.hxx
#include tools/string.hxx
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include tools/stream.hxx
#include osl/mutex.hxx
#include ucbhelper/content.hxx
@@ -225,7 +225,7 @@ void ConvDicXMLDictionaryContext_Impl::StartElement(
OUString aValue = rxAttrList-getValueByIndex(i);
if ( nPrefix == XML_NAMESPACE_TCD aLocalName == lang )
-nLanguage = MsLangId::convertIsoStringToLanguage( aValue );
+nLanguage = LanguageTag( aValue ).getLanguageType();
else if ( nPrefix == XML_NAMESPACE_TCD aLocalName ==
conversion-type )
nConversionType = GetConversionTypeFromText( aValue );
}
@@ -327,7 +327,7 @@ sal_uInt32 ConvDicXMLExport::exportDoc( enum
::xmloff::token::XMLTokenEnum /*eCl
_GetNamespaceMap().GetNameByKey( XML_NAMESPACE_TCD ) );
AddAttributeASCII( XML_NAMESPACE_TCD, package, org.openoffice.Office );
-OUString aIsoLang( MsLangId::convertLanguageToIsoString( rDic.nLanguage )
);
+OUString aIsoLang( LanguageTag( rDic.nLanguage ).getBcp47() );
AddAttribute( XML_NAMESPACE_TCD, lang, aIsoLang );
OUString aConvType( ConversionTypeToText( rDic.nConversionType ) );
AddAttribute( XML_NAMESPACE_TCD, conversion-type, aConvType );
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 71dd8f0..40c51e3 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -22,7 +22,7 @@
#include dicimp.hxx
#include hyphdsp.hxx
#include i18npool/lang.h
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include osl/mutex.hxx
#include tools/debug.hxx
#include tools/fsys.hxx
@@ -123,8 +123,8 @@ sal_Int16 ReadDicVersion( SvStreamPtr rpStream, sal_uInt16
nLng, sal_Bool bNe
if (aTagValue.equalsL(RTL_CONSTASCII_STRINGPARAM(none)))
nLng = LANGUAGE_NONE;
else
-nLng =
MsLangId::convertIsoStringToLanguage(rtl::OStringToOUString(
-aTagValue, RTL_TEXTENCODING_ASCII_US));
+nLng = LanguageTag(rtl::OStringToOUString(
+aTagValue,
RTL_TEXTENCODING_ASCII_US)).getLanguageType();
}
// type: negative / positive
@@ -424,7 +424,7 @@ sal_uLong DictionaryNeo::saveEntries(const OUString rURL)
else
{
rtl::OStringBuffer aLine(RTL_CONSTASCII_STRINGPARAM(lang: ));
-
aLine.append(rtl::OUStringToOString(MsLangId::convertLanguageToIsoString(nLanguage),
eEnc));
+aLine.append(rtl::OUStringToOString(LanguageTag(nLanguage).getBcp47(),
eEnc));
pStream-WriteLine(aLine.makeStringAndClear());
}
if (0 != (nErr = pStream-GetError()))
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index ce8efa7..4af3ab0 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -52,7 +52,7 @@
#include cppuhelper/implementationentry.hxx
#include cppuhelper/interfacecontainer.h
#include cppuhelper/factory.hxx
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include comphelper/processfactory.hxx
#include comphelper/extract.hxx
@@ -446,7 +446,7 @@ uno::Reference linguistic2::XProofreader
GrammarCheckingIterator::GetGrammarC
m_bGCServicesChecked = sal_True;
}
-const LanguageType nLang = MsLangId::convertLocaleToLanguage( rLocale );
+const LanguageType nLang = LanguageTag( rLocale ).getLanguageType( false);
GCImplNames_t::const_iterator aLangIt( m_aGCImplNamesByLang.find( nLang )
);
if (aLangIt != m_aGCImplNamesByLang.end()) // matching configured
language found?
{
@@ -1015,7 +1015,7 @@ void GrammarCheckingIterator::GetConfiguredGCSvcs_Impl()
{
// only the first entry is used, there should be only one
grammar checker per language
const OUString aImplName( aImplNames[0] );
-const LanguageType nLang =
MsLangId::convertIsoStringToLanguage( pElementNames[i] );
+const LanguageType nLang = LanguageTag( pElementNames[i]
).getLanguageType();
[Libreoffice-commits] Changes to 'feature/rb14'
New branch 'feature/rb14' available with the following commits: commit a5857a34ef9cc7466e3fc5b1e85df06fcd2ba5a4 Author: Michael Meeks michael.me...@suse.com Date: Thu Nov 15 17:28:16 2012 + re-base on ALv2 code. Includes: Patch contributed by: Jurgen Schmidt remove onlineregistration with dependencies http://svn.apache.org/viewvc?view=revisionrevision=1240245 Patch contributed by Pedro Giffuni Accept Google Chrome OS fonts as equivalent to MS fonts. http://svn.apache.org/viewvc?view=revisionrevision=1233155 http://svn.apache.org/viewvc?view=revisionrevision=1233408 Patch contributed by Andre Fischer Do not add targets for junit tests when junit is disabled. http://svn.apache.org/viewvc?view=revisionrevision=1241508 Patches contributed by Mathias Bauer (and others) gnumake4 work variously http://svn.apache.org/viewvc?view=revisionrevision=1394707 http://svn.apache.org/viewvc?view=revisionrevision=1394326 cws mba34issues01: #i114600#: remove forbidden characters from list of unencoded characters http://svn.apache.org/viewvc?view=revisionrevision=1172370 Patch contributed by Oliver Rainer-Wittman some clean up in JPEGReader due to memory constraints http://svn.apache.org/viewvc?view=revisionrevision=1299729 Patches contributed by Ariel Constenla-Haile i118707 - make toolbar control's popup window grab focus http://svn.apache.org/viewvc?view=revisionrevision=1225846 restore our encryption settings, icon themes, and dictionaries. remove OS/2 conditionals. commit ebac22c00ac1c28e8a88ffb8a81b905f9132486e Author: Andre Fische andre.f.fischer Andre fischerandre.f.fisc...@oracle.com Date: Wed Mar 9 11:16:39 2011 +0100 impress211: #i110990# Fixed slide show spanning multiple displays on Windows. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: canvas/source
canvas/source/cairo/cairo_canvasfont.cxx |4 ++-- canvas/source/vcl/canvasfont.cxx |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 8efe5ff8a0fcaa01cafbb156e9b20dc34c4c97d4 Author: Eike Rathke er...@redhat.com Date: Sat Nov 17 00:11:48 2012 +0100 use LanguageTag Change-Id: I7277f40dcba1e079ede32a01f526342a5cde435b diff --git a/canvas/source/cairo/cairo_canvasfont.cxx b/canvas/source/cairo/cairo_canvasfont.cxx index 44be8b3..0e8e58f 100644 --- a/canvas/source/cairo/cairo_canvasfont.cxx +++ b/canvas/source/cairo/cairo_canvasfont.cxx @@ -25,7 +25,7 @@ #include basegfx/numeric/ftools.hxx #include vcl/metric.hxx -#include i18npool/mslangid.hxx +#include i18npool/languagetag.hxx #include cairo_canvasfont.hxx #include cairo_textlayout.hxx @@ -57,7 +57,7 @@ namespace cairocanvas rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED ? PITCH_FIXED : PITCH_VARIABLE); - maFont-SetLanguage(MsLangId::convertLocaleToLanguage(rFontRequest.Locale)); +maFont-SetLanguage( LanguageTag( rFontRequest.Locale).getLanguageType( false)); // adjust to stretched/shrinked font if( !::rtl::math::approxEqual( rFontMatrix.m00, rFontMatrix.m11) ) diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx index 4981182..12fe309 100644 --- a/canvas/source/vcl/canvasfont.cxx +++ b/canvas/source/vcl/canvasfont.cxx @@ -22,7 +22,7 @@ #include rtl/math.hxx #include basegfx/numeric/ftools.hxx -#include i18npool/mslangid.hxx +#include i18npool/languagetag.hxx #include vcl/metric.hxx #include com/sun/star/rendering/PanoseProportion.hpp @@ -59,7 +59,7 @@ namespace vclcanvas rFontRequest.FontDescription.FontDescription.Proportion == rendering::PanoseProportion::MONO_SPACED ? PITCH_FIXED : PITCH_VARIABLE); - maFont-SetLanguage(MsLangId::convertLocaleToLanguage(rFontRequest.Locale)); +maFont-SetLanguage( LanguageTag( rFontRequest.Locale).getLanguageType( false)); // adjust to stretched/shrinked font if( !::rtl::math::approxEqual( rFontMatrix.m00, rFontMatrix.m11) ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/commontools/formattedcolumnvalue.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0ef605d9abc0639875c4e0757d2250bbe847bccb
Author: Eike Rathke er...@redhat.com
Date: Sat Nov 17 00:16:14 2012 +0100
use LanguageTag
Change-Id: I75839c1b4a0ddfa9ed5c4f44124c7eabf4005717
diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx
b/connectivity/source/commontools/formattedcolumnvalue.cxx
index 3298764..2a34ca2 100644
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -31,6 +31,7 @@
#include tools/diagnose_ex.h
#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include comphelper/numbers.hxx
#include comphelper/componentcontext.hxx
#include unotools/sharedunocomponent.hxx
@@ -164,8 +165,7 @@ namespace dbtools
if ( !bHaveFieldFormat )
{
// fall back to a format key as indicated by the field type
-Locale aSystemLocale;
-MsLangId::convertLanguageToLocale(
MsLangId::getSystemLanguage(), aSystemLocale );
+Locale aSystemLocale( LanguageTag(
MsLangId::getSystemLanguage() ).getLocale() );
Reference XNumberFormatTypes xNumTypes(
xNumberFormatsSupp-getNumberFormats(), UNO_QUERY_THROW );
_rData.m_nFormatKey = getDefaultNumberFormat( _rxColumn,
xNumTypes, aSystemLocale );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: lingucomponent/source
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx |8
+++-
lingucomponent/source/lingutil/lingutil.cxx|4 ++--
lingucomponent/source/spellcheck/spell/sspellimp.cxx |8
+++-
lingucomponent/source/thesaurus/libnth/nthesimp.cxx|8
+++-
4 files changed, 11 insertions(+), 17 deletions(-)
New commits:
commit 42455e14477b0923b7f0388c3c8672b0fbf8dfd5
Author: Eike Rathke er...@redhat.com
Date: Sat Nov 17 00:27:33 2012 +0100
use LanguageTag
Change-Id: I800638b4e4493988c30470359a78850c4149500b
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index ff2d267..4582a66 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@ -22,7 +22,7 @@
#include cppuhelper/factory.hxx // helper for factories
#include com/sun/star/registry/XRegistryKey.hpp
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include tools/debug.hxx
#include osl/mutex.hxx
@@ -172,8 +172,7 @@ Sequence Locale SAL_CALL Hyphenator::getLocales()
k = 0;
for (aItB = aLocaleNamesSet.begin(); aItB !=
aLocaleNamesSet.end(); ++aItB)
{
-Locale aTmp( MsLangId::convertLanguageToLocale(
-MsLangId::convertIsoStringToLanguage( *aItB )));
+Locale aTmp( LanguageTag( *aItB ).getLocale());
aSuppLocales[k++] = aTmp;
}
@@ -205,8 +204,7 @@ Sequence Locale SAL_CALL Hyphenator::getLocales()
{
aDicts[k].aPtr = NULL;
aDicts[k].eEnc = RTL_TEXTENCODING_DONTKNOW;
-aDicts[k].aLoc = MsLangId::convertLanguageToLocale(
-MsLangId::convertIsoStringToLanguage(
aDictIt-aLocaleNames[i] ));
+aDicts[k].aLoc = LanguageTag( aDictIt-aLocaleNames[i]
).getLocale();
aDicts[k].apCC = new CharClass( aDicts[k].aLoc );
// also both files have to be in the same directory
and the
// file names must only differ in the extension
(.aff/.dic).
diff --git a/lingucomponent/source/lingutil/lingutil.cxx
b/lingucomponent/source/lingutil/lingutil.cxx
index ca5f34b..5edd78a 100644
--- a/lingucomponent/source/lingutil/lingutil.cxx
+++ b/lingucomponent/source/lingutil/lingutil.cxx
@@ -203,7 +203,7 @@ void MergeNewStyleDicsAndOldStyleDics(
sal_Int32 nLocaleNames = aLocaleNames.getLength();
for (sal_Int32 k = 0; k nLocaleNames; ++k)
{
-LanguageType nLang = MsLangId::convertIsoStringToLanguage(
aLocaleNames[k] );
+LanguageType nLang = LanguageTag( aLocaleNames[k]
).getLanguageType();
aNewStyleLanguages.insert( nLang );
}
}
@@ -219,7 +219,7 @@ void MergeNewStyleDicsAndOldStyleDics(
DBG_ASSERT( nOldStyleDics, old style dictionary with more then one
language found!);
if (nOldStyleDics 0)
{
-LanguageType nLang = MsLangId::convertIsoStringToLanguage(
aIt2-aLocaleNames[0] );
+LanguageType nLang = LanguageTag( aIt2-aLocaleNames[0]
).getLanguageType();
if (nLang == LANGUAGE_DONTKNOW || nLang == LANGUAGE_NONE)
{
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 94d8fd0..c7d3add 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -34,7 +34,7 @@
#include linguistic/lngprops.hxx
#include linguistic/spelldta.hxx
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include unotools/pathoptions.hxx
#include unotools/lingucfg.hxx
#include unotools/useroptions.hxx
@@ -168,8 +168,7 @@ Sequence Locale SAL_CALL SpellChecker::getLocales()
k = 0;
for (aItB = aLocaleNamesSet.begin(); aItB !=
aLocaleNamesSet.end(); ++aItB)
{
-Locale aTmp( MsLangId::convertLanguageToLocale(
-MsLangId::convertIsoStringToLanguage( *aItB )));
+Locale aTmp( LanguageTag( *aItB ).getLocale());
aSuppLocales[k++] = aTmp;
}
@@ -203,8 +202,7 @@ Sequence Locale SAL_CALL SpellChecker::getLocales()
{
aDicts[k] = NULL;
aDEncs[k] = RTL_TEXTENCODING_DONTKNOW;
-aDLocs[k] = MsLangId::convertLanguageToLocale(
-MsLangId::convertIsoStringToLanguage(
aLocaleNames[i] ));
+aDLocs[k] = LanguageTag( aLocaleNames[i]
).getLocale();
//
[Libreoffice-commits] .: sfx2/source
sfx2/source/appl/linkmgr2.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 21675d2d49be13ba48d4fb444b618944a454bd9c
Author: Eike Rathke er...@redhat.com
Date: Sat Nov 17 00:39:07 2012 +0100
use LanguageTag
Change-Id: Ie060f2357a17be818d34c9393ac4ac606331d081
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 9564a18..4f8a7a2 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -34,7 +34,7 @@
#include svl/eitem.hxx
#include svl/intitem.hxx
#include unotools/localfilehelper.hxx
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include sfx2/request.hxx
#include fileobj.hxx
@@ -608,8 +608,7 @@ sal_Bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink )
{
// first only loop over the DocumentShells the shells and find those
// with the name:
-com::sun::star::lang::Locale aLocale;
-MsLangId::convertLanguageToLocale( LANGUAGE_SYSTEM, aLocale );
+com::sun::star::lang::Locale aLocale( LanguageTag(
LANGUAGE_SYSTEM).getLocale());
CharClass aCC( aLocale );
TypeId aType( TYPE(SfxObjectShell) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Switch from python to python3
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1091 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/1091/1 Switch from python to python3 Change-Id: I90ef17c6f5a678230539a80ab999fa5344e4fc8f --- M RepositoryExternal.mk M configure.ac M filter/prj/build.lst M pyuno/Library_pyuno_wrapper.mk M pyuno/prj/build.lst M scp2/InstallModule_python.mk M scp2/prj/build.lst M scp2/source/python/file_python.scp M scp2/source/python/module_python.scp M tail_build/prj/build.lst 10 files changed, 25 insertions(+), 17 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1091 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I90ef17c6f5a678230539a80ab999fa5344e4fc8f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: shell/source
shell/source/tools/lngconvex/lngconvex.cxx | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 577b95a96092b50b454ad2d5a12edc35120db1d6
Author: Eike Rathke er...@redhat.com
Date: Sat Nov 17 01:03:36 2012 +0100
use LanguageTag
Change-Id: I1ec1f619cb6b427b4376d28292d3412ba6eb67ee
diff --git a/shell/source/tools/lngconvex/lngconvex.cxx
b/shell/source/tools/lngconvex/lngconvex.cxx
index 473bf69..942ae75 100644
--- a/shell/source/tools/lngconvex/lngconvex.cxx
+++ b/shell/source/tools/lngconvex/lngconvex.cxx
@@ -53,7 +53,7 @@ typedef unsigned short WORD;
#include sal/main.h
#include tools/config.hxx
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include iostream
#include fstream
@@ -332,7 +332,9 @@ void add_group_entries(
rtl::OString iso_lang =
aConfig.GetKeyName(sal::static_int_castsal_uInt16(i));
rtl::OString key_value_utf8 =
aConfig.ReadKey(sal::static_int_castsal_uInt16(i));
iso_lang_identifier myiso_lang( iso_lang );
-LanguageType ltype =
MsLangId::convertIsoNamesToLanguage(myiso_lang.language(),
myiso_lang.country());
+LanguageType ltype = LanguageTag(
+OStringToOUString( myiso_lang.language(),
RTL_TEXTENCODING_UTF8),
+OStringToOUString( myiso_lang.country(),
RTL_TEXTENCODING_UTF8)).getLanguageType();
if( ( ltype 0x0200 ) == 0 map[ ltype ].empty() )
{
Substitutor.set_language(iso_lang_identifier(iso_lang));
@@ -459,7 +461,9 @@ void start_language_section(
std::string lang_section(LANGUAGE );
-LanguageType ltype =
MsLangId::convertIsoNamesToLanguage(iso_lang.language(), iso_lang.country());
+LanguageType ltype = LanguageTag(
+OStringToOUString( iso_lang.language(), RTL_TEXTENCODING_UTF8),
+OStringToOUString( iso_lang.country(),
RTL_TEXTENCODING_UTF8)).getLanguageType();
char buff[10];
int primLangID = PRIMARYLANGID(ltype);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: test/source
test/source/bootstrapfixture.cxx |8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) New commits: commit 715957c39a8e12a24dd592f55565be62da78c450 Author: Eike Rathke er...@redhat.com Date: Sat Nov 17 01:16:00 2012 +0100 we really don't need lang-conversion here Change-Id: I1f72ca29b2f5b286bfae906dc3ee16581a2b1c36 diff --git a/test/source/bootstrapfixture.cxx b/test/source/bootstrapfixture.cxx index a5ce0f0..e52ee2c 100644 --- a/test/source/bootstrapfixture.cxx +++ b/test/source/bootstrapfixture.cxx @@ -32,7 +32,6 @@ #include rtl/bootstrap.hxx #include cppuhelper/bootstrap.hxx #include comphelper/processfactory.hxx -#include i18npool/mslangid.hxx #include com/sun/star/lang/Locale.hpp #include com/sun/star/lang/XComponent.hpp @@ -71,15 +70,12 @@ void test::BootstrapFixture::setUp() test::BootstrapFixtureBase::setUp(); // force locale (and resource files loaded) to en-US -const LanguageType eLang=LANGUAGE_ENGLISH_US; -OUString aLang, aCountry; -MsLangId::convertLanguageToIsoNames(eLang, aLang, aCountry); -lang::Locale aLocale(aLang, aCountry, OUString()); +lang::Locale aLocale( en, US, ); ResMgr::SetDefaultLocale( aLocale ); SvtSysLocaleOptions aLocalOptions; -OUString aLangISO = MsLangId::convertLanguageToIsoString( LANGUAGE_ENGLISH_US ); +OUString aLangISO( en-US ); aLocalOptions.SetLocaleConfigString( aLangISO ); aLocalOptions.SetUILocaleConfigString( aLangISO ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/core/misc/userinformation.cxx |7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
New commits:
commit cd52a285c183db9da7a2e40a0c314f6258f1d7af
Author: Eike Rathke er...@redhat.com
Date: Sat Nov 17 01:33:52 2012 +0100
use LanguageTag
Change-Id: Iea2c5ae21c8d7c143f9f4a0e3c42c963cfc28d33
diff --git a/dbaccess/source/core/misc/userinformation.cxx
b/dbaccess/source/core/misc/userinformation.cxx
index 88d0c82..fc4e96a 100644
--- a/dbaccess/source/core/misc/userinformation.cxx
+++ b/dbaccess/source/core/misc/userinformation.cxx
@@ -21,7 +21,7 @@
#include userinformation.hxx
#include osl/diagnose.h
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include unotools/configmgr.hxx
using namespace ::utl;
@@ -30,10 +30,7 @@ using namespace ::com::sun::star::lang;
//--
UserInformation::UserInformation():
-m_aUserLocale(
-MsLangId::convertLanguageToLocale(
-MsLangId::convertIsoStringToLanguage(
-ConfigManager::getLocale(), '-')))
+m_aUserLocale( LanguageTag( ConfigManager::getLocale()).getLocale())
{}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ANN] LibreOffice 3.6.4 RC1 available
Dear Community, The Document Foundation is happy to announce the first release candidate of LibreOffice 3.6.4. The upcoming 3.6.4 will be the fourth in a series of frequent bugfix releases, for our feature-packed 3.6 branch. Please be aware that LibreOffice 3.6.4 RC1 is not ready for production use, you should continue to use LibreOffice 3.6.3 for that. The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test (and the announcement mail: http://lists.freedesktop.org/archives/libreoffice/2011-December/022464.html) For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/get-involved/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/Translation_for_3.5 or help with funding our operations: http://donate.libreoffice.org/ A list of known issues and fixed bugs with 3.6.4 RC1 is available from our wiki: http://wiki.documentfoundation.org/Releases/3.6.4/RC1 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. Yours, The Document Foundation Board of Directors The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint pgp1QULyNxt6o.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svx/source
svx/source/form/fmcontrollayout.cxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 2b0a014dce8bf811d82fdfb3c287a6e9dfab95de Author: Eike Rathke er...@redhat.com Date: Sat Nov 17 02:00:31 2012 +0100 use LanguageTag Change-Id: Ibe18dc1b768c928e8f53ff4bf98adab40d808025 diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx index f441dee..06e34f9 100644 --- a/svx/source/form/fmcontrollayout.cxx +++ b/svx/source/form/fmcontrollayout.cxx @@ -41,6 +41,7 @@ #include comphelper/processfactory.hxx #include i18npool/mslangid.hxx +#include i18npool/languagetag.hxx #include unotools/syslocale.hxx #include toolkit/helper/vclunohelper.hxx @@ -142,7 +143,7 @@ namespace svxform // determine the script type associated with the system locale const SvtSysLocale aSysLocale; const LocaleDataWrapper rSysLocaleData = aSysLocale.GetLocaleData(); -const sal_Int16 eSysLocaleScriptType = MsLangId::getScriptType( MsLangId::convertLocaleToLanguage( rSysLocaleData.getLocale() ) ); +const sal_Int16 eSysLocaleScriptType = MsLangId::getScriptType( LanguageTag( rSysLocaleData.getLocale() ).getLanguageType() ); // depending on this script type, use the right property from the document's style which controls the // default locale for document content @@ -185,7 +186,7 @@ namespace svxform } // retrieve a default font for this locale, and set it at the control -Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_SANS, MsLangId::convertLocaleToLanguage( aDocumentCharLocale ), DEFAULTFONT_FLAGS_ONLYONE ); +Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_SANS, LanguageTag( aDocumentCharLocale ).getLanguageType(), DEFAULTFONT_FLAGS_ONLYONE ); FontDescriptor aFontDesc = VCLUnoHelper::CreateFontDescriptor( aFont ); _rxModel-setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( FontDescriptor ) ), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/source
desktop/source/app/langselect.cxx|7 ---
desktop/source/deployment/gui/dp_gui_service.cxx |6 +++---
2 files changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 2a5afded31f8bf00a966fd7eaee3b4882541ff0e
Author: Eike Rathke er...@redhat.com
Date: Sat Nov 17 02:15:28 2012 +0100
use LanguageTag
Change-Id: I5e2a41eb94876302f61c261a350b6cf72db41a86
diff --git a/desktop/source/app/langselect.cxx
b/desktop/source/app/langselect.cxx
index 4bfa8b5..2b17083 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -38,6 +38,7 @@
#include tools/resid.hxx
#include tools/config.hxx
#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include comphelper/processfactory.hxx
#include com/sun/star/configuration/theDefaultProvider.hpp
#include com/sun/star/container/XNameAccess.hpp
@@ -230,14 +231,14 @@ bool LanguageSelection::prepareLanguage()
Reference XChangesBatch (xProp2,
UNO_QUERY_THROW)-commitChanges();
}
-MsLangId::setConfiguredSystemUILanguage(
MsLangId::convertLocaleToLanguage(loc) );
+MsLangId::setConfiguredSystemUILanguage(
LanguageTag(loc).getLanguageType( false) );
OUString sLocale;
xProp-getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(ooSetupSystemLocale)))
= sLocale;
if ( !sLocale.isEmpty() )
{
loc = LanguageSelection::IsoStringToLocale(sLocale);
-MsLangId::setConfiguredSystemLanguage(
MsLangId::convertLocaleToLanguage(loc) );
+MsLangId::setConfiguredSystemLanguage(
LanguageTag(loc).getLanguageType( false) );
}
else
MsLangId::setConfiguredSystemLanguage(
MsLangId::getSystemLanguage() );
@@ -269,7 +270,7 @@ void LanguageSelection::setDefaultLanguage(const OUString
sLocale)
// See #i42730# for rules for determining source of settings
// determine script type of locale
-LanguageType nLang = MsLangId::convertIsoStringToLanguage(sLocale);
+LanguageType nLang = LanguageTag(sLocale).getLanguageType();
sal_uInt16 nScriptType =
SvtLanguageOptions::GetScriptTypeOfLanguage(nLang);
switch (nScriptType)
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx
b/desktop/source/deployment/gui/dp_gui_service.cxx
index 6f067b9..a55d2f7 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -36,7 +36,7 @@
#include comphelper/processfactory.hxx
#include comphelper/servicedecl.hxx
#include comphelper/unwrapargs.hxx
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include vcl/svapp.hxx
#include vcl/msgbox.hxx
#include com/sun/star/lang/XServiceInfo.hpp
@@ -249,8 +249,8 @@ void ServiceImpl::startExecuteModal(
static_castOWeakObject *(this) );
AllSettings as = app-GetSettings();
as.SetUILanguage(
-MsLangId::convertIsoStringToLanguage(
-utl::ConfigManager::getLocale() ) );
+LanguageTag(
+utl::ConfigManager::getLocale() ).getLanguageType() );
app-SetSettings( as );
app-SetDisplayName(
utl::ConfigManager::getProductName() +
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: chart2/source
chart2/source/tools/CharacterProperties.cxx |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit feec7a873ff803f7815c2d85adc7143a89f203d6 Author: Eike Rathke er...@redhat.com Date: Sat Nov 17 02:28:07 2012 +0100 use LanguageTag Change-Id: I3057ceee83c8ac3e88d0358f3de44d36fb1cde6f diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx index 23bbdd2..029b071 100644 --- a/chart2/source/tools/CharacterProperties.cxx +++ b/chart2/source/tools/CharacterProperties.cxx @@ -45,6 +45,7 @@ // header for struct SvtLinguConfig #include unotools/lingucfg.hxx #include i18npool/mslangid.hxx +#include i18npool/languagetag.hxx #include vcl/outdev.hxx using namespace ::com::sun::star; @@ -409,11 +410,11 @@ void CharacterProperties::AddDefaultsToMap( using namespace ::com::sun::star::i18n::ScriptType; LanguageType nLang; -nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aDefaultLocale), LATIN); +nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag(aDefaultLocale).getLanguageType( false), LATIN); Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_LATIN_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 ); -nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage( aDefaultLocale_CJK), ASIAN); +nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag( aDefaultLocale_CJK).getLanguageType( false), ASIAN); Font aFontCJK = OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 ); -nLang = MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage( aDefaultLocale_CTL), COMPLEX); +nLang = MsLangId::resolveSystemLanguageByScriptType(LanguageTag( aDefaultLocale_CTL).getLanguageType( false), COMPLEX); Font aFontCTL = OutputDevice::GetDefaultFont( DEFAULTFONT_CTL_SPREADSHEET, nLang, DEFAULTFONT_FLAGS_ONLYONE, 0 ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_FONT_NAME, OUString( aFont.GetName() ) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source
cui/source/options/optgdlg.cxx | 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
New commits:
commit 4d79f55efd042cacfe252758228f8813552b4cbb
Author: Eike Rathke er...@redhat.com
Date: Sat Nov 17 02:39:59 2012 +0100
use LanguageTag
Change-Id: I4f49c5ada6b9dfb8fe143157470e7d73e04c3354
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 006be93..2bf4f0e 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -30,6 +30,7 @@
#include vcl/msgbox.hxx
#include vcl/mnemonic.hxx
#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include unotools/compatibility.hxx
#include unotools/useroptions.hxx
#include unotools/fontoptions.hxx
@@ -1255,7 +1256,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window*
pParent, const SfxItemSet rSe
LanguageType aLang = LANGUAGE_DONTKNOW;
for (sal_IntPtr i=0; iseqInstalledLanguages.getLength(); i++)
{
-aLang =
MsLangId::convertIsoStringToLanguage(seqInstalledLanguages[i]);
+aLang = LanguageTag(seqInstalledLanguages[i]).getLanguageType();
if (aLang != LANGUAGE_DONTKNOW)
{
//sal_uInt16 p = aUserInterfaceLB.InsertLanguage(aLang);
@@ -1551,7 +1552,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet
rSet )
if(!bCurrentDocCBChecked)
{
Any aValue;
-Locale aLocale = MsLangId::convertLanguageToLocale( eSelectLang,
false );
+Locale aLocale = LanguageTag( eSelectLang).getLocale( false );
aValue = aLocale;
OUString aPropName( DefaultLocale );
pLangConfig-aLinguConfig.SetProperty( aPropName, aValue );
@@ -1571,7 +1572,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet
rSet )
if(!bCurrentDocCBChecked)
{
Any aValue;
-Locale aLocale = MsLangId::convertLanguageToLocale( eSelectLang,
false );
+Locale aLocale = LanguageTag( eSelectLang).getLocale( false );
aValue = aLocale;
OUString aPropName( DefaultLocale_CJK );
pLangConfig-aLinguConfig.SetProperty( aPropName, aValue );
@@ -1591,7 +1592,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet
rSet )
if(!bCurrentDocCBChecked)
{
Any aValue;
-Locale aLocale = MsLangId::convertLanguageToLocale( eSelectLang,
false );
+Locale aLocale = LanguageTag( eSelectLang).getLocale( false );
aValue = aLocale;
OUString aPropName( DefaultLocale_CTL );
pLangConfig-aLinguConfig.SetProperty( aPropName, aValue );
@@ -1724,17 +1725,17 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet rSet
)
Locale aLocale;
aWestLang = aLocale;
-eCurLang = MsLangId::convertLocaleToLanguage( aLocale );
+eCurLang = LanguageTag( aLocale ).getLanguageType( false);
aCJKLang = pLangConfig-aLinguConfig.GetProperty(DefaultLocale_CJK);
aLocale = Locale();
aCJKLang = aLocale;
-eCurLangCJK = MsLangId::convertLocaleToLanguage( aLocale );
+eCurLangCJK = LanguageTag( aLocale ).getLanguageType( false);
aCTLLang = pLangConfig-aLinguConfig.GetProperty(DefaultLocale_CTL);
aLocale = Locale();
aCTLLang = aLocale;
-eCurLangCTL = MsLangId::convertLocaleToLanguage( aLocale );
+eCurLangCTL = LanguageTag( aLocale ).getLanguageType( false);
}
catch (const Exception)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: extensions/source
extensions/source/propctrlr/standardcontrol.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a92cae04ddf608948617843d8f992e9743421a7f Author: Eike Rathke er...@redhat.com Date: Sat Nov 17 03:10:04 2012 +0100 use LanguageTag Change-Id: I1279cf9266b90a8c0936788824ca277b6dd40a6c diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index 2927129..8d57aeb 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -41,7 +41,7 @@ #include svtools/colorcfg.hxx #include unotools/syslocale.hxx #include unotools/datetime.hxx -#include i18npool/mslangid.hxx +#include i18npool/languagetag.hxx #include vcl/button.hxx #include vcl/svapp.hxx //== @@ -262,7 +262,7 @@ namespace pcr // determine a default format Locale aSysLocale = SvtSysLocale().GetLocaleData().getLocale(); -LanguageType eSysLanguage = MsLangId::convertLocaleToLanguage( aSysLocale ); +LanguageType eSysLanguage = LanguageTag( aSysLocale ).getLanguageType( false); getTypedControlWindow()-SetFormatter( getTypedControlWindow()-StandardFormatter() ); SvNumberFormatter* pFormatter = getTypedControlWindow()-GetFormatter(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx |8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
New commits:
commit 08bece4ae2c1a10276f91c149b3e065d4da67806
Author: Eike Rathke er...@redhat.com
Date: Sat Nov 17 03:17:07 2012 +0100
use LanguageTag
Change-Id: I35eaada40120b6d7687e35475b48f832043ed3ba
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 1f531bd..a768dc3 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -23,7 +23,7 @@
#include ConversionHelper.hxx
#include ModelEventListener.hxx
#include MeasureHandler.hxx
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include i18nutil/paper.hxx
#include ooxml/OOXMLFastTokens.hxx
#include com/sun/star/document/XDocumentPropertiesSupplier.hpp
@@ -1143,8 +1143,7 @@ void DomainMapper::lcl_attribute(Id nName, Value val)
case NS_ooxml::LN_CT_Language_eastAsia: //90315
case NS_ooxml::LN_CT_Language_bidi: //90316
{
-LanguageType eLang = MsLangId::convertIsoStringToLanguage(
sStringValue );
-lang::Locale aLocale = MsLangId::convertLanguageToLocale( eLang );
+lang::Locale aLocale( LanguageTag( sStringValue).getLocale());
if (m_pImpl-GetTopContext())
m_pImpl-GetTopContext()-Insert(NS_ooxml::LN_CT_Language_val== nName ?
PROP_CHAR_LOCALE :
NS_ooxml::LN_CT_Language_eastAsia == nName ?
PROP_CHAR_LOCALE_ASIAN : PROP_CHAR_LOCALE_COMPLEX,
@@ -2301,8 +2300,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
case NS_sprm::LN_CRgLid1:// sprmCRgLid1language Asian
case NS_sprm::LN_CRgLid1_80: // sprmCRgLid1_80 older language Asian
{
-lang::Locale aLocale;
-MsLangId::convertLanguageToLocale( (LanguageType)nIntValue,
aLocale );
+lang::Locale aLocale( LanguageTag(
(LanguageType)nIntValue).getLocale());
PropertyIds aPropId;
switch (nSprmId)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: forms/source
forms/source/component/FormattedField.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit c90231291b5fa033ec3b079427c522177083a585
Author: Eike Rathke er...@redhat.com
Date: Sat Nov 17 03:30:11 2012 +0100
use LanguageTag
Change-Id: Ie3079b1acde5cc98e0cffb37e3ff696aac8fe5f2
diff --git a/forms/source/component/FormattedField.cxx
b/forms/source/component/FormattedField.cxx
index aabe359..91faaa6 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -43,7 +43,7 @@
#include vcl/svapp.hxx
#include tools/debug.hxx
#include tools/wintypes.hxx
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include rtl/textenc.h
#include com/sun/star/sdbc/DataType.hpp
#include com/sun/star/util/NumberFormat.hpp
@@ -150,7 +150,7 @@ Reference XNumberFormatsSupplier
StandardFormatsSupplier::get( const Referenc
// get the Office's locale
const Locale rSysLocale = SvtSysLocale().GetLocaleData().getLocale();
// translate
-eSysLanguage = MsLangId::convertLocaleToLanguage( rSysLocale );
+eSysLanguage = LanguageTag( rSysLocale ).getLanguageType( false);
}
StandardFormatsSupplier* pSupplier = new StandardFormatsSupplier( _rxORB,
eSysLanguage );
@@ -856,7 +856,7 @@ void OFormattedModel::write(const
ReferenceXObjectOutputStream _rxOutStream)
if (isA(aLocale, static_castLocale*(NULL)))
{
Locale* pLocale = (Locale*)aLocale.getValue();
-eFormatLanguage = MsLangId::convertLocaleToLanguage( *pLocale
);
+eFormatLanguage = LanguageTag( *pLocale ).getLanguageType(
false);
}
}
@@ -940,7 +940,7 @@ void OFormattedModel::read(const
ReferenceXObjectInputStream _rxInStream) thr
if (xFormats.is())
{
-Locale aDescriptionLanguage(
MsLangId::convertLanguageToLocale(eDescriptionLanguage));
+Locale aDescriptionLanguage(
LanguageTag(eDescriptionLanguage).getLocale());
nKey = xFormats-queryKey(sFormatDescription,
aDescriptionLanguage, sal_False);
if (nKey == (sal_Int32)-1)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: reportdesign/source
reportdesign/source/core/api/ReportComponent.cxx |7 ---
reportdesign/source/ui/misc/UITools.cxx |7 +++
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 3dd3fc17a6b8f5dbc3d795ac80ad737647ab553c
Author: Eike Rathke er...@redhat.com
Date: Sat Nov 17 03:46:20 2012 +0100
use LanguageTag
Change-Id: Ibb2788febb2af2c140f310104757439f72496e3f
diff --git a/reportdesign/source/core/api/ReportComponent.cxx
b/reportdesign/source/core/api/ReportComponent.cxx
index f710536..e463574 100644
--- a/reportdesign/source/core/api/ReportComponent.cxx
+++ b/reportdesign/source/core/api/ReportComponent.cxx
@@ -33,6 +33,7 @@
#include unotools/syslocale.hxx
#include unotools/lingucfg.hxx
#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
//
=
namespace reportdesign
@@ -83,11 +84,11 @@ OFormatProperties::OFormatProperties()
using namespace ::com::sun::star::i18n::ScriptType;
aLinguConfig.GetProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DefaultLocale)))
= aCharLocale;
-LanguageType eCurLang =
MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aCharLocale),
LATIN);
+LanguageType eCurLang =
MsLangId::resolveSystemLanguageByScriptType(LanguageTag(aCharLocale).getLanguageType(false),
LATIN);
aLinguConfig.GetProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DefaultLocale_CJK)))
= aCharLocaleAsian;
-LanguageType eCurLangCJK =
MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aCharLocaleAsian),
ASIAN);
+LanguageType eCurLangCJK =
MsLangId::resolveSystemLanguageByScriptType(LanguageTag(aCharLocaleAsian).getLanguageType(false),
ASIAN);
aLinguConfig.GetProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(DefaultLocale_CTL)))
= aCharLocaleComplex;
-LanguageType eCurLangCTL =
MsLangId::resolveSystemLanguageByScriptType(MsLangId::convertLocaleToLanguage(aCharLocaleComplex),
COMPLEX);
+LanguageType eCurLangCTL =
MsLangId::resolveSystemLanguageByScriptType(LanguageTag(aCharLocaleComplex).getLanguageType(false),
COMPLEX);
Font aLatin,aCJK,aCTL;
lcl_getDefaultFonts(aLatin,aCJK,aCTL,eCurLang,eCurLangCJK,eCurLangCTL);
diff --git a/reportdesign/source/ui/misc/UITools.cxx
b/reportdesign/source/ui/misc/UITools.cxx
index afa86cd..6fdf617 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -94,7 +94,7 @@
#include com/sun/star/report/Function.hpp
#include com/sun/star/sdb/XParametersSupplier.hpp
#include com/sun/star/sdb/SQLContext.hpp
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include dlgpage.hxx
#include vcl/msgbox.hxx
#include rptui_slotid.hrc
@@ -252,7 +252,7 @@ namespace
break;
}
-
_rItemSet.Put(SvxLanguageItem(MsLangId::convertLocaleToLanguageWithFallback(aLocale),_nLanguage));
+
_rItemSet.Put(SvxLanguageItem(LanguageTag(aLocale).makeFallback().getLanguageType(),_nLanguage));
_rItemSet.Put(SvxPostureItem(aFont.GetItalic(),_nPosture));
_rItemSet.Put(SvxWeightItem(aFont.GetWeight(),_nWeight));
@@ -546,8 +546,7 @@ namespace
if ( SFX_ITEM_SET == _rItemSet.GetItemState(
pItems[k].nWhich,sal_True,pItem) pItem-ISA(SvxLanguageItem))
{
const SvxLanguageItem* pFontItem = static_castconst
SvxLanguageItem*(pItem);
-lang::Locale aCharLocale;
-MsLangId::convertLanguageToLocale( pFontItem-GetLanguage(),
aCharLocale );
+lang::Locale aCharLocale( LanguageTag(
pFontItem-GetLanguage()).getLocale());
lcl_pushBack( _out_rProperties, pItems[k].sPropertyName,
uno::makeAny( aCharLocale ) );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6-4' - sc/source
sc/source/core/data/column3.cxx | 67
1 file changed, 35 insertions(+), 32 deletions(-)
New commits:
commit 13f85c24bd9e0d25af0dc1a4887d14449a8e5b55
Author: Eike Rathke er...@redhat.com
Date: Wed Nov 14 21:48:33 2012 +0100
resolved fdo#56278 broadcast deletion to dependent formula cells
Consolidated changes for fdo#56278 fdo#54074 fdo#53364 fdo#55059 (and
earlier i#99844 and i#101869). The replacement cell for the broadcaster
to inform listeners, if any, is transferred the broadcaster and owns it,
the remembered formula cell never does. When broadcasting the change use
the replacement cell instead of the remembered formula cell. Don't
fiddle around with ReleaseBroadcaster() at the remembered cell, we don't
delete twice and now also don't leak.
(cherry picked from commit 8165bfa2afbe828caf37df57b83cb31bef2559cb)
Reviewed-on: https://gerrit.libreoffice.org/1069
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
(cherry picked from commit a6e622029b8f1c450b9d535e94212bf0acf3)
Change-Id: I63351bfcd9d25cdb2c8618b2dbf45a9430e97daf
Reviewed-on: https://gerrit.libreoffice.org/1081
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Kohei Yoshida kohei.yosh...@gmail.com
Tested-by: Kohei Yoshida kohei.yosh...@gmail.com
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 475299d..a31 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -399,11 +399,13 @@ void ScColumn::DeleteRange( SCSIZE nStartIndex, SCSIZE
nEndIndex, sal_uInt16 nDe
// try to create a replacement note cell, if note or
broadcaster exists
ScNoteCell* pNoteCell = NULL;
SvtBroadcaster* pBC = pOldCell-GetBroadcaster();
-bool bKeepBC = pBC pBC-HasListeners();
-// #i99844# do not release broadcaster from old cell, it still
has to notify deleted content
-if (bKeepBC)
+if (pBC pBC-HasListeners())
{
pNoteCell = new ScNoteCell( pBC );
+// NOTE: the broadcaster here is transferred and released
+// only if it has listeners! If it does not, it will simply
+// be deleted when the cell is deleted and no replacement
+// cell is created.
pOldCell-ReleaseBroadcaster();
}
@@ -427,15 +429,10 @@ void ScColumn::DeleteRange( SCSIZE nStartIndex, SCSIZE
nEndIndex, sal_uInt16 nDe
else
{
aHint.GetAddress().SetRow( nOldRow );
-if(bKeepBC)
-aHint.SetCell( pNoteCell );
-else
-aHint.SetCell( pOldCell );
+aHint.SetCell( pNoteCell ? pNoteCell : pOldCell );
pDocument-Broadcast( aHint );
if (pNoteCell != pOldCell)
{
-// #i99844# after broadcasting, old cell has to forget
the broadcaster (owned by pNoteCell)
-pOldCell-ReleaseBroadcaster();
pOldCell-Delete();
}
}
@@ -456,7 +453,9 @@ void ScColumn::DeleteRange( SCSIZE nStartIndex, SCSIZE
nEndIndex, sal_uInt16 nDe
if (nFirst = nEndIndex)
aRemovedSegments.insert_back(nFirst, nEndIndex + 1, true);
-{
+// Remove segments from the column array, containing pDummyCell and formula
+// cell pointers to be deleted.
+{ // own scope for variables
RemovedSegments_t::const_iterator aIt(aRemovedSegments.begin());
RemovedSegments_t::const_iterator aEnd(aRemovedSegments.end());
// The indexes in aRemovedSegments denote cell positions in the
@@ -499,29 +498,33 @@ void ScColumn::DeleteRange( SCSIZE nStartIndex, SCSIZE
nEndIndex, sal_uInt16 nDe
}
// *** delete all formula cells ***
-
-// first, all cells stop listening, may save unneeded recalcualtions
-for ( FormulaCellVector::iterator aIt = aDelCells.begin(), aEnd =
aDelCells.end(); aIt != aEnd; ++aIt )
-(*aIt)-EndListeningTo( pDocument );
-
-// #i101869# if the note cell with the broadcaster was deleted in
EndListening,
-// forget the pointer to the broadcaster
-for ( FormulaCellVector::iterator aIt = aDelCells.begin(), aEnd =
aDelCells.end(); aIt != aEnd; ++aIt )
-{
-SCSIZE nIndex;
-if ( !Search( (*aIt)-aPos.Row(), nIndex ) )
-(*aIt)-ReleaseBroadcaster();
-}
-
-// broadcast SC_HINT_DYING for all cells and delete them
-for ( FormulaCellVector::iterator aIt = aDelCells.begin(), aEnd =
aDelCells.end(); aIt != aEnd; ++aIt )
+if (!aDelCells.empty())
{
-
[PUSHED] Change in core[libreoffice-3-6-4]: resolved fdo#56278 broadcast deletion to dependent formula c...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1081 Approvals: Markus Mohrhard: Looks good to me, but someone else must approve Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1081 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I63351bfcd9d25cdb2c8618b2dbf45a9430e97daf Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6-4 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Bug 6 depends on bug 56278, which changed state. Bug 56278 Summary: EDITING: Calculate formula: DEl or BS to empty a cell with a formula, does not result in updating a formula referencing that cell https://bugs.freedesktop.org/show_bug.cgi?id=56278 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Moved buttons for consistency and improved widget spacing
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1094 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/94/1094/1 Moved buttons for consistency and improved widget spacing Change-Id: Ia4faf04589503b1f299b3b53770f82b5d19fcd25 --- M cui/uiconfig/ui/insertoleobject.ui M cui/uiconfig/ui/insertrowcolumn.ui M cui/uiconfig/ui/zoomdialog.ui M helpcontent2 M sw/uiconfig/swriter/ui/sortdialog.ui M sw/uiconfig/swriter/ui/splittable.ui M sw/uiconfig/swriter/ui/stringinput.ui M sw/uiconfig/swriter/ui/titlepage.ui M sw/uiconfig/swriter/ui/wordcount.ui 9 files changed, 18 insertions(+), 139 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1094 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia4faf04589503b1f299b3b53770f82b5d19fcd25 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Alexander Wilms alexander.wi...@zoho.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] LibreOffice QA Call 2012-11-16 1400UTC
Joel Madero píše v Pá 16. 11. 2012 v 06:12 -0800: Wrong phone number, please call in at phone number from this page: http://www.talkyoo.net/main/telefonkonferenz_internationale_rufnummern Here are more details from the older announcements. Dial-in numbers for countries outside Germany can be found at: http://www.talkyoo.net/main/telefonkonferenz_internationale_rufnummern Dial-in numbers inside Germany are: +49 40 18881000 (Hamburg, landline) +49 40 95069970 (Hamburg, landline) +49 89 60893 (Munich, landline) +49 1570 3336000 (vistream mobile network) Free Skype contact[*]: talkyoo_skype Room: Room number: 53 71 38 No participant PIN is required All calls will be recorded All participants can speak Comments and additions most welcome. [*] Talkyoo has to confirm your contact before you could call in. This might take several hours or even days. Please, start preparation on time. Best Regards, Petr ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Blog on QA
On Wed, Nov 14, 2012 at 7:12 PM, Terrence Enger ten...@iseries-guru.comwrote: On Mon, 2012-11-12 at 13:34 +0100, Sophie Gautier wrote: Hi all, For information, I published a blog about QA http://sophiegautier.com/blog/index.php/2012/11/12/184-are-you-a-contributor-part-6-qa If you see anything missing, pleas add a comment. Thanks! Sophie, I notice that both your page and the wiki page QA/HowToBibisect [1] say that bibisect is strictly for Linux. Hoever, in August Norbert Thiebaud announced [2] bibisect for windows. Did his effort come to naught? Cheers, Terry. references ... [1] http://wiki.documentfoundation.org/QA/HowToBibisect [2] http://nabble.documentfoundation.org/Libreoffice-qa-bibisect-fro-windows-td4002219.html Nice Job, maybe you should make the font larger -- -- Masekela Walls Web Security Analyst | Senior Server Administrator Powserve.com / Gemini ISP Networks ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] LibreOffice QA Call 2012-11-16 1400UTC
On Fri, Nov 16, 2012 at 9:17 AM, Petr Mladek pmla...@suse.cz wrote: Joel Madero píše v Pá 16. 11. 2012 v 06:12 -0800: Wrong phone number, please call in at phone number from this page: http://www.talkyoo.net/main/telefonkonferenz_internationale_rufnummern Here are more details from the older announcements. Dial-in numbers for countries outside Germany can be found at: http://www.talkyoo.net/main/telefonkonferenz_internationale_rufnummern Dial-in numbers inside Germany are: +49 40 18881000 (Hamburg, landline) +49 40 95069970 (Hamburg, landline) +49 89 60893 (Munich, landline) +49 1570 3336000 (vistream mobile network) Free Skype contact[*]: talkyoo_skype Room: Room number: 53 71 38 No participant PIN is required All calls will be recorded All participants can speak Comments and additions most welcome. [*] Talkyoo has to confirm your contact before you could call in. This might take several hours or even days. Please, start preparation on time. Best Regards, Petr Did the call start early? should have been 1400 UTC -- -- Masekela Walls Web Security Analyst | Senior Server Administrator Powserve.com / Gemini ISP Networks ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
