[Libreoffice-commits] core.git: configure.ac
configure.ac |8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
New commits:
commit a207cbfb0606f9c487c10fedbfe0a4b3e6fd2933
Author: Aurimas Fišeras
AuthorDate: Thu Dec 8 23:34:29 2022 +0200
Commit: Adolfo Jayme Barrientos
CommitDate: Tue Dec 20 15:23:20 2022 +
Rename function to match what it does and remove obsolete comment
Change-Id: I6807dddc6dbe54ec582d839e5eebd2a6375bfe6d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143841
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/configure.ac b/configure.ac
index e0728bde7a89..65eb0373a285 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3997,11 +3997,9 @@ vs_versions_to_check()
fi
}
-win_get_env_from_vsvars32bat()
+win_get_env_from_vsdevcmdbat()
{
local WRAPPERBATCHFILEPATH="`mktemp -t wrpXX.bat`"
-# Also seems to be located in another directory under the same name:
vsvars32.bat
-#
https://github.com/bazelbuild/bazel/blob/master/src/main/native/build_windows_jni.sh#L56-L57
printf '@call "%s/../Common7/Tools/VsDevCmd.bat" /no_logo\r\n' "$(cygpath
-w $VC_PRODUCT_DIR)" > $WRAPPERBATCHFILEPATH
# use 'echo.%ENV%' syntax (instead of 'echo %ENV%') to avoid outputting
"ECHO is off." in case when ENV is empty or a space
printf '@setlocal\r\n@echo.%%%s%%\r\n@endlocal\r\n' "$1" >>
$WRAPPERBATCHFILEPATH
@@ -4033,9 +4031,9 @@ find_ucrt()
ide_env_dir="$VC_PRODUCT_DIR/../Common7/Tools/"
ide_env_file="${ide_env_dir}VsDevCmd.bat"
if test -f "$ide_env_file"; then
-PathFormat "$(win_get_env_from_vsvars32bat UniversalCRTSdkDir)"
+PathFormat "$(win_get_env_from_vsdevcmdbat UniversalCRTSdkDir)"
UCRTSDKDIR=$formatted_path
-UCRTVERSION=$(win_get_env_from_vsvars32bat UCRTVersion)
+UCRTVERSION=$(win_get_env_from_vsdevcmdbat UCRTVersion)
dnl Hack needed at least by tml:
if test "$UCRTVERSION" = 10.0.15063.0 \
-a ! -f "${UCRTSDKDIR}Include/10.0.15063.0/um/sqlext.h" \
[Libreoffice-commits] core.git: configure.ac
configure.ac | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) New commits: commit 53f117492db82285b190a40dd432e2bb10899457 Author: Aurimas Fišeras AuthorDate: Fri Dec 9 20:21:28 2022 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Fri Dec 9 23:11:47 2022 + configure.ac: update links to avoid redirects, fix broken links. Change-Id: I7269205ecaac450123e153ea549036abd9a567d4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143884 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/configure.ac b/configure.ac index 613604558eb8..6b5f50c2490e 100644 --- a/configure.ac +++ b/configure.ac @@ -1879,7 +1879,7 @@ libo_FUZZ_ARG_ENABLE(release-build, [Enable release build. Note that the "release build" choice is orthogonal to whether symbols are present, debug info is generated, or optimization is done. - See http://wiki.documentfoundation.org/Development/DevBuild]), + See https://wiki.documentfoundation.org/Development/DevBuild]), ,) AC_ARG_ENABLE(windows-build-signing, @@ -2587,7 +2587,7 @@ AC_ARG_WITH(bffvalidator, [Enables export validation for Microsoft Binary formats (doc, xls, ppt). Requires installed Microsoft Office Binary File Format Validator. Note: export-validation (--with-export-validation) is required to be turned on. - See https://www.microsoft.com/en-us/download/details.aspx?id=26794]), + See https://web.archive.org/web/20200804155745/https://www.microsoft.com/en-us/download/details.aspx?id=26794]), ,with_bffvalidator=no) libo_FUZZ_ARG_WITH(junit, @@ -3537,7 +3537,7 @@ if test $_os = Darwin; then if test "$enable_macosx_code_signing" = yes; then # By default use the first suitable certificate (?). -# http://stackoverflow.com/questions/13196291/difference-between-mac-developer-and-3rd-party-mac-developer-application +# https://stackoverflow.com/questions/13196291/difference-between-mac-developer-and-3rd-party-mac-developer-application # says that the "Mac Developer" certificate is useful just for self-testing. For distribution # outside the Mac App Store, use the "Developer ID Application" one, and for distribution in # the App Store, the "3rd Party Mac Developer" one. I think it works best to the @@ -6980,7 +6980,7 @@ if test "$GXX" = "yes" -a -z "$COM_IS_CLANG"; then AC_MSG_RESULT([ok (g++ $_gpp_version)]) fi -dnl see https://code.google.com/p/android/issues/detail?id=41770 +dnl see https://issuetracker.google.com/issues/36962819 glibcxx_threads=no AC_LANG_PUSH([C++]) AC_REQUIRE_CPP @@ -9134,7 +9134,7 @@ if test "$enable_epm" = "yes"; then if $EPM | grep "ESP Package Manager" >/dev/null 2>/dev/null; then AC_MSG_RESULT([yes]) else -AC_MSG_ERROR([no. Install ESP Package Manager (http://www.msweet.org/projects.php?Z2) and/or specify the path to the right epm]) +AC_MSG_ERROR([no. Install ESP Package Manager (https://jimjag.github.io/epm/) and/or specify the path to the right epm]) fi AC_MSG_CHECKING([epm version]) EPM_VERSION=`$EPM | grep 'ESP Package Manager' | cut -d' ' -f4 | $SED -e s/v//` @@ -9143,7 +9143,7 @@ if test "$enable_epm" = "yes"; then AC_MSG_RESULT([OK, >= 3.7]) else AC_MSG_RESULT([too old. epm >= 3.7 is required.]) -AC_MSG_ERROR([Install ESP Package Manager (http://www.msweet.org/projects.php?Z2) and/or specify the path to the right epm]) +AC_MSG_ERROR([Install ESP Package Manager (https://jimjag.github.io/epm/) and/or specify the path to the right epm]) fi fi fi @@ -9508,7 +9508,7 @@ cd /opt/lo/bin wget https://dev-www.libreoffice.org/bin/cygwin/nasm.exe chmod +x nasm -or get and install one from http://www.nasm.us/ +or get and install one from https://www.nasm.us/ Then re-run autogen.sh @@ -9518,7 +9518,7 @@ Alternatively, you can install the 'new' nasm where ever you want and make sure _EOS else cat << _EOS -consult https://github.com/libjpeg-turbo/libjpeg-turbo/blob/master/BUILDING.md +consult https://github.com/libjpeg-turbo/libjpeg-turbo/blob/main/BUILDING.md _EOS fi @@ -9545,7 +9545,7 @@ if test "$SYSTEM_CLUCENE" = TRUE; then save_CPPFLAGS=$CPPFLAGS CXXFLAGS="$CXXFLAGS $CLUCENE_CFLAGS" CPPFLAGS="$CPPFLAGS $CLUCENE_CFLAGS" -dnl http://sourceforge.net/tracker/index.php?func=detail=3392466_id=80013=558446 +dnl https://sourceforge.net/p/clucene/bugs/200/ dnl https://bugz
[Libreoffice-commits] core.git: unotools/source
unotools/source/i18n/resmgr.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 405ab5c3307948bfcf12670d7ac6df0b86fb8832 Author: Aurimas Fišeras AuthorDate: Wed May 4 14:03:39 2022 +0300 Commit: Adolfo Jayme Barrientos CommitDate: Wed May 4 16:06:41 2022 +0200 Fix typo in cbc34f69ec6363cd234ad2b1dfe09bfb531238db Signed-off-by: Aurimas Fišeras Change-Id: Iee5c7aec7817bc7af5f45d192165fe30301788d0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133823 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx index faa35ffe5c9e..641fa61be6dc 100644 --- a/unotools/source/i18n/resmgr.cxx +++ b/unotools/source/i18n/resmgr.cxx @@ -23,7 +23,7 @@ // workdir/UnpackedTarball/boost/boost/locale/format.hpp using "std::auto_ptr d;", but must // come very early here in case is already (indirectly) included earlier: #include -#if HAVE_LIBPP +#if HAVE_LIBCPP #define _LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR #elif defined _MSC_VER #define _HAS_AUTO_PTR_ETC 1
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - tools/qa
tools/qa/cppunit/test_config.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 116d3264cc83a429853b79f37e4b237e1248b5bc
Author: Aurimas Fišeras
AuthorDate: Thu May 9 18:40:44 2019 +0300
Commit: Andras Timar
CommitDate: Tue Sep 17 08:30:50 2019 +0200
Remove temporary config.ini after the test
Change-Id: I7bc0c6554b4d5e870a49740b2b7243d9a9246ca8
Signed-off-by: Aurimas Fišeras
Reviewed-on: https://gerrit.libreoffice.org/72063
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit c3f82afd56a8d34420a489065a786cf67b6f290d)
Reviewed-on: https://gerrit.libreoffice.org/79034
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/tools/qa/cppunit/test_config.cxx b/tools/qa/cppunit/test_config.cxx
index 4f392a3c7b50..28ca9347a32f 100644
--- a/tools/qa/cppunit/test_config.cxx
+++ b/tools/qa/cppunit/test_config.cxx
@@ -35,6 +35,8 @@ public:
osl::File::copy(maOriginalConfigFile, maConfigFile);
}
+virtual void tearDown() override { osl::File::remove(maConfigFile); }
+
void testHasGroup()
{
Config aConfig(maConfigFile);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: tools/qa
tools/qa/cppunit/test_config.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit c3f82afd56a8d34420a489065a786cf67b6f290d
Author: Aurimas Fišeras
AuthorDate: Thu May 9 18:40:44 2019 +0300
Commit: Michael Stahl
CommitDate: Fri May 10 10:59:04 2019 +0200
Remove temporary config.ini after the test
Change-Id: I7bc0c6554b4d5e870a49740b2b7243d9a9246ca8
Signed-off-by: Aurimas Fišeras
Reviewed-on: https://gerrit.libreoffice.org/72063
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/tools/qa/cppunit/test_config.cxx b/tools/qa/cppunit/test_config.cxx
index 8002ff99dff7..a9f0558529b1 100644
--- a/tools/qa/cppunit/test_config.cxx
+++ b/tools/qa/cppunit/test_config.cxx
@@ -35,6 +35,8 @@ public:
osl::File::copy(maOriginalConfigFile, maConfigFile);
}
+virtual void tearDown() override { osl::File::remove(maConfigFile); }
+
void testHasGroup()
{
Config aConfig(maConfigFile);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - wizards/source
wizards/source/euro/Init.xba | 26 +++---
wizards/source/euro/euro.src |7 +--
2 files changed, 20 insertions(+), 13 deletions(-)
New commits:
commit 244f4abc04aa6773879f19b38f4aa899689978cc
Author: Aurimas Fišeras auri...@members.fsf.org
Date: Sat Aug 23 12:12:12 2014 +0300
added LTL Lithuanian Litas to Euro Converter
Reviewed-on: https://gerrit.libreoffice.org/11090
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
(cherry picked from commit 0b3e1d9b222bf045b03746f1c162bf8077a24a1b)
adapt SBCOUNTRYCOUNT
(cherry picked from commit 375228c2c811412b516fe29bf263a520f4e9be1a)
ditch unused sCurrUNKNOWN and sCurrSYSUNKNOWN strings
(cherry picked from commit 99e1b398f28ee8eb2fc2d6bf5db8362170f32e69)
increment SBCOUNTRYCOUNT again, we have 19 currencies 0..18
(cherry picked from commit dfb48f77ba011661e03b6eb942234adb4e6630d7)
Change-Id: Id4eeb42bbbaec979f60b57ddab2794b38f1e3157
Reviewed-on: https://gerrit.libreoffice.org/12952
Reviewed-by: Adolfo Jayme Barrientos fit...@ubuntu.com
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/wizards/source/euro/Init.xba b/wizards/source/euro/Init.xba
index 33d9eb8..ccd63b7 100644
--- a/wizards/source/euro/Init.xba
+++ b/wizards/source/euro/Init.xba
@@ -90,15 +90,14 @@ Public sCurrMALTESE as String
Public sCurrSLOVAK as String
Public sCurrESTONIAN as String
Public sCurrLATVIAN as String
-Public sCurrUNKNOWN as String
-Public sCurrSYSUNKNOWN as String
+Public sCurrLITHUANIAN as String
Public sPrgsRETRIEVAL as String
Public sPrgsCONVERTING as String
Public sPrgsUNPROTECT as String
Public sInclusiveSubDir as String
-Public Const SBCOUNTRYCOUNT = 17
+Public Const SBCOUNTRYCOUNT = 19
Public CurMimeType as String
Public CurCellCount as Long
Public oSheets as Object
@@ -134,8 +133,8 @@ Public CurExtension(2) as String
Public Currfactor as Double
Public CurrSymbolList(2) as String
Public CurrLanguage as String
-Public CurrValue(17,5)
-Public LangIDValue(17,2,2) as String
+Public CurrValue(18,5)
+Public LangIDValue(18,2,2) as String
Public PreName as String
Public Separator as String
Public BitmapDir as String
@@ -216,8 +215,7 @@ Dim LocWorkPath as String
sCurrSLOVAK = GetResText(1515)
sCurrESTONIAN = GetResText(1516)
sCurrLATVIAN = GetResText(1517)
- sCurrUNKNOWN = GetResText(1518)
- sCurrSYSUNKNOWN = GetResText(1519)
+ sCurrLITHUANIAN = GetResText(1518)
.cmdCancel.Label = sCANCEL
.cmdHelp.Label = sHELP
.cmdBack.Label = GetResText(1002)
@@ -392,6 +390,11 @@ Sub InitializeLanguages()
LangIDValue(17,1,1) = quot;LVquot;
LangIDValue(17,1,2) = quot;-64Bquot;
+apos; CURRENCIES_LITHUANIAN
+LangIDValue(18,0,0) = quot;ltquot;
+LangIDValue(18,0,1) = quot;LTquot;
+LangIDValue(18,0,2) = quot;-427quot;
+
End Sub
@@ -562,6 +565,15 @@ Dim i as Integer
CurrValue(17,4) = quot;Lsquot;
CurrValue(17,5) = quot;LVLquot;
+ CurrValue(18,0) = sCurrLITHUANIAN
+ apos; real conversion rate
+ CurrValue(18,1) = 3.45280
+ apos; rounded conversion rate
+ CurrValue(18,2) = 3.5
+ CurrValue(18,3) = quot;Ltquot;
+ CurrValue(18,4) = quot;Ltquot;
+ CurrValue(18,5) = quot;LTLquot;
+
i = -1
CurrSymbolList(0) = quot;quot;
CurrSymbolList(1) = quot;quot;
diff --git a/wizards/source/euro/euro.src b/wizards/source/euro/euro.src
index bf795ba..0f1b44b 100644
--- a/wizards/source/euro/euro.src
+++ b/wizards/source/euro/euro.src
@@ -412,12 +412,7 @@ Text [ en-US ] = Latvian Lats;
String CURRENCIES + 18
{
-Text [ en-US ] = The currency set for the document is not a European
currency!;
-};
-
-String CURRENCIES + 19
-{
-Text [ en-US ] = The language set for your operating system is not a language
of the European Monetary Union.;
+Text [ en-US ] = Lithuanian Litas;
};
String STEP_LASTPAGE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - i18npool/source
i18npool/source/localedata/data/lt_LT.xml |9 - 1 file changed, 8 insertions(+), 1 deletion(-) New commits: commit 20105f4984421fdf98b5978e88025605069c9d31 Author: Aurimas FiÅ¡eras auri...@members.fsf.org Date: Sat Aug 23 11:56:42 2014 +0300 added EUR as default currency to Lithuanian locale Change-Id: I08c82639da2acd5830fa69044b252217b69c5e62 Reviewed-on: https://gerrit.libreoffice.org/11089 Reviewed-by: Thomas Arnhold tho...@arnhold.org Tested-by: Thomas Arnhold tho...@arnhold.org (cherry picked from commit a150d06bc5cda4f18364256af859fd3e1ee70b4b) Signed-off-by: Andras Timar andras.ti...@collabora.com diff --git a/i18npool/source/localedata/data/lt_LT.xml b/i18npool/source/localedata/data/lt_LT.xml index a7f8717..97839ab 100644 --- a/i18npool/source/localedata/data/lt_LT.xml +++ b/i18npool/source/localedata/data/lt_LT.xml @@ -413,7 +413,14 @@ /Calendar /LC_CALENDAR LC_CURRENCY -Currency default=true usedInCompatibleFormatCodes=true +Currency default=true usedInCompatibleFormatCodes=false + CurrencyIDEUR/CurrencyID + CurrencySymbolâ¬/CurrencySymbol + BankSymbolEUR/BankSymbol + CurrencyNameEuras/CurrencyName + DecimalPlaces2/DecimalPlaces +/Currency +Currency default=false usedInCompatibleFormatCodes=true CurrencyIDLTL/CurrencyID CurrencySymbolLt/CurrencySymbol BankSymbolLTL/BankSymbol ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - officecfg/registry sc/source
officecfg/registry/data/org/openoffice/Office/Calc.xcu | 11 +++
sc/source/core/tool/interpr2.cxx |3 ++-
2 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 2894cd72dd356cb113cd229a12e2a2c3bb398bd8
Author: Aurimas Fišeras auri...@members.fsf.org
Date: Sat Aug 23 11:50:56 2014 +0300
added Lithuanian LTL to EUROCONVERT(), CONVERT()
Change-Id: Iefde129177df827c4b6508ff190f20e1e1973221
Reviewed-on: https://gerrit.libreoffice.org/11088
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
(cherry picked from commit 21c8b5815a21b6586fe13b12d00a9fb432c2aef4)
Reviewed-on: https://gerrit.libreoffice.org/12463
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/officecfg/registry/data/org/openoffice/Office/Calc.xcu
b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
index 190766e..a62d065 100644
--- a/officecfg/registry/data/org/openoffice/Office/Calc.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
@@ -217,6 +217,17 @@
value0.702804/value
/prop
/node
+node oor:name=CR19 oor:op=replace
+ prop oor:name=FromUnit
+valueEUR/value
+ /prop
+ prop oor:name=ToUnit
+valueLTL/value
+ /prop
+ prop oor:name=Factor
+value3.45280/value
+ /prop
+/node
/node
node oor:name=Calculate
node oor:name=Other
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index d13f1e6..8867c0a 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2563,7 +2563,8 @@ static bool lclConvertMoney( const OUString aSearchUnit,
double rfRate, int r
{ CYP, 0.585274, 2 },
{ SKK, 30.1260, 2 },
{ EEK, 15.6466, 2 },
-{ LVL, 0.702804, 2 }
+{ LVL, 0.702804, 2 },
+{ LTL, 3.45280, 2 }
};
const size_t nConversionCount = sizeof( aConvertTable ) / sizeof(
aConvertTable[0] );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - officecfg/registry sc/source
officecfg/registry/data/org/openoffice/Office/Calc.xcu | 11 +++
sc/source/core/tool/interpr2.cxx |3 ++-
2 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit a1a76a362ab8ad23e54791da2711b76907f1edad
Author: Aurimas Fišeras auri...@members.fsf.org
Date: Sat Aug 23 11:50:56 2014 +0300
added Lithuanian LTL to EUROCONVERT(), CONVERT()
Change-Id: Iefde129177df827c4b6508ff190f20e1e1973221
Reviewed-on: https://gerrit.libreoffice.org/11088
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
(cherry picked from commit 21c8b5815a21b6586fe13b12d00a9fb432c2aef4)
Reviewed-on: https://gerrit.libreoffice.org/12463
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/officecfg/registry/data/org/openoffice/Office/Calc.xcu
b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
index 190766e..a62d065 100644
--- a/officecfg/registry/data/org/openoffice/Office/Calc.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
@@ -217,6 +217,17 @@
value0.702804/value
/prop
/node
+node oor:name=CR19 oor:op=replace
+ prop oor:name=FromUnit
+valueEUR/value
+ /prop
+ prop oor:name=ToUnit
+valueLTL/value
+ /prop
+ prop oor:name=Factor
+value3.45280/value
+ /prop
+/node
/node
node oor:name=Calculate
node oor:name=Other
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 51453dd..64d321c 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2797,7 +2797,8 @@ static bool lclConvertMoney( const OUString aSearchUnit,
double rfRate, int r
{ CYP, 0.585274, 2 },
{ SKK, 30.1260, 2 },
{ EEK, 15.6466, 2 },
-{ LVL, 0.702804, 2 }
+{ LVL, 0.702804, 2 },
+{ LTL, 3.45280, 2 }
};
static const size_t nConversionCount = sizeof( aConvertTable ) / sizeof(
aConvertTable[0] );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - i18npool/source
i18npool/source/localedata/data/lt_LT.xml |9 - 1 file changed, 8 insertions(+), 1 deletion(-) New commits: commit 15ee0f0611f019b7b9893bfa8dfab06c5dbdfb06 Author: Aurimas FiÅ¡eras auri...@members.fsf.org Date: Sat Aug 23 11:56:42 2014 +0300 added EUR as default currency to Lithuanian locale Change-Id: I08c82639da2acd5830fa69044b252217b69c5e62 Reviewed-on: https://gerrit.libreoffice.org/11089 Reviewed-by: Thomas Arnhold tho...@arnhold.org Tested-by: Thomas Arnhold tho...@arnhold.org (cherry picked from commit a150d06bc5cda4f18364256af859fd3e1ee70b4b) Signed-off-by: Andras Timar andras.ti...@collabora.com diff --git a/i18npool/source/localedata/data/lt_LT.xml b/i18npool/source/localedata/data/lt_LT.xml index a7f8717..97839ab 100644 --- a/i18npool/source/localedata/data/lt_LT.xml +++ b/i18npool/source/localedata/data/lt_LT.xml @@ -413,7 +413,14 @@ /Calendar /LC_CALENDAR LC_CURRENCY -Currency default=true usedInCompatibleFormatCodes=true +Currency default=true usedInCompatibleFormatCodes=false + CurrencyIDEUR/CurrencyID + CurrencySymbolâ¬/CurrencySymbol + BankSymbolEUR/BankSymbol + CurrencyNameEuras/CurrencyName + DecimalPlaces2/DecimalPlaces +/Currency +Currency default=false usedInCompatibleFormatCodes=true CurrencyIDLTL/CurrencyID CurrencySymbolLt/CurrencySymbol BankSymbolLTL/BankSymbol ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/27/3427/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/76/1776/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/76/1776/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/27/3427/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/76/1776/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/75/1775/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/75/1775/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/88/11088/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/75/1775/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/88/11088/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/31/3831/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/74/1774/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/74/1774/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/30/10430/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/70/1470/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/31/3831/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/14/1514/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/14/1514/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/89/11089/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/90/11090/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/29/10429/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/90/11090/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/89/11089/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/29/10429/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/36/3736/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/36/3736/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/changes/15/1815/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/changes/15/1815/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/localedata/data/lt_LT.xml |9 - 1 file changed, 8 insertions(+), 1 deletion(-) New commits: commit a150d06bc5cda4f18364256af859fd3e1ee70b4b Author: Aurimas FiÅ¡eras auri...@members.fsf.org Date: Sat Aug 23 11:56:42 2014 +0300 added EUR as default currency to Lithuanian locale Change-Id: I08c82639da2acd5830fa69044b252217b69c5e62 Reviewed-on: https://gerrit.libreoffice.org/11089 Reviewed-by: Thomas Arnhold tho...@arnhold.org Tested-by: Thomas Arnhold tho...@arnhold.org diff --git a/i18npool/source/localedata/data/lt_LT.xml b/i18npool/source/localedata/data/lt_LT.xml index a7f8717..97839ab 100644 --- a/i18npool/source/localedata/data/lt_LT.xml +++ b/i18npool/source/localedata/data/lt_LT.xml @@ -413,7 +413,14 @@ /Calendar /LC_CALENDAR LC_CURRENCY -Currency default=true usedInCompatibleFormatCodes=true +Currency default=true usedInCompatibleFormatCodes=false + CurrencyIDEUR/CurrencyID + CurrencySymbolâ¬/CurrencySymbol + BankSymbolEUR/BankSymbol + CurrencyNameEuras/CurrencyName + DecimalPlaces2/DecimalPlaces +/Currency +Currency default=false usedInCompatibleFormatCodes=true CurrencyIDLTL/CurrencyID CurrencySymbolLt/CurrencySymbol BankSymbolLTL/BankSymbol ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/source
wizards/source/euro/Init.xba | 24
wizards/source/euro/euro.src |7 ++-
2 files changed, 26 insertions(+), 5 deletions(-)
New commits:
commit 0b3e1d9b222bf045b03746f1c162bf8077a24a1b
Author: Aurimas Fišeras auri...@members.fsf.org
Date: Sat Aug 23 12:12:12 2014 +0300
added LTL Lithuanian Litas to Euro Converter
Change-Id: Id4eeb42bbbaec979f60b57ddab2794b38f1e3157
Reviewed-on: https://gerrit.libreoffice.org/11090
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/wizards/source/euro/Init.xba b/wizards/source/euro/Init.xba
index 33d9eb8..69226ed 100644
--- a/wizards/source/euro/Init.xba
+++ b/wizards/source/euro/Init.xba
@@ -90,6 +90,7 @@ Public sCurrMALTESE as String
Public sCurrSLOVAK as String
Public sCurrESTONIAN as String
Public sCurrLATVIAN as String
+Public sCurrLITHUANIAN as String
Public sCurrUNKNOWN as String
Public sCurrSYSUNKNOWN as String
@@ -134,8 +135,8 @@ Public CurExtension(2) as String
Public Currfactor as Double
Public CurrSymbolList(2) as String
Public CurrLanguage as String
-Public CurrValue(17,5)
-Public LangIDValue(17,2,2) as String
+Public CurrValue(18,5)
+Public LangIDValue(18,2,2) as String
Public PreName as String
Public Separator as String
Public BitmapDir as String
@@ -216,8 +217,9 @@ Dim LocWorkPath as String
sCurrSLOVAK = GetResText(1515)
sCurrESTONIAN = GetResText(1516)
sCurrLATVIAN = GetResText(1517)
- sCurrUNKNOWN = GetResText(1518)
- sCurrSYSUNKNOWN = GetResText(1519)
+ sCurrLITHUANIAN = GetResText(1518)
+ sCurrUNKNOWN = GetResText(1519)
+ sCurrSYSUNKNOWN = GetResText(1520)
.cmdCancel.Label = sCANCEL
.cmdHelp.Label = sHELP
.cmdBack.Label = GetResText(1002)
@@ -392,6 +394,11 @@ Sub InitializeLanguages()
LangIDValue(17,1,1) = quot;LVquot;
LangIDValue(17,1,2) = quot;-64Bquot;
+apos; CURRENCIES_LITHUANIAN
+LangIDValue(18,0,0) = quot;ltquot;
+LangIDValue(18,0,1) = quot;LTquot;
+LangIDValue(18,0,2) = quot;-427quot;
+
End Sub
@@ -562,6 +569,15 @@ Dim i as Integer
CurrValue(17,4) = quot;Lsquot;
CurrValue(17,5) = quot;LVLquot;
+ CurrValue(18,0) = sCurrLITHUANIAN
+ apos; real conversion rate
+ CurrValue(18,1) = 3.45280
+ apos; rounded conversion rate
+ CurrValue(18,2) = 3.5
+ CurrValue(18,3) = quot;Ltquot;
+ CurrValue(18,4) = quot;Ltquot;
+ CurrValue(18,5) = quot;LTLquot;
+
i = -1
CurrSymbolList(0) = quot;quot;
CurrSymbolList(1) = quot;quot;
diff --git a/wizards/source/euro/euro.src b/wizards/source/euro/euro.src
index bf795ba..2280b75 100644
--- a/wizards/source/euro/euro.src
+++ b/wizards/source/euro/euro.src
@@ -412,11 +412,16 @@ Text [ en-US ] = Latvian Lats;
String CURRENCIES + 18
{
-Text [ en-US ] = The currency set for the document is not a European
currency!;
+Text [ en-US ] = Lithuanian Litas;
};
String CURRENCIES + 19
{
+Text [ en-US ] = The currency set for the document is not a European
currency!;
+};
+
+String CURRENCIES + 20
+{
Text [ en-US ] = The language set for your operating system is not a language
of the European Monetary Union.;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sc/source
officecfg/registry/data/org/openoffice/Office/Calc.xcu | 11 +++
sc/source/core/tool/interpr2.cxx |3 ++-
2 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 21c8b5815a21b6586fe13b12d00a9fb432c2aef4
Author: Aurimas Fišeras auri...@members.fsf.org
Date: Sat Aug 23 11:50:56 2014 +0300
added Lithuanian LTL to EUROCONVERT(), CONVERT()
Change-Id: Iefde129177df827c4b6508ff190f20e1e1973221
Reviewed-on: https://gerrit.libreoffice.org/11088
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/officecfg/registry/data/org/openoffice/Office/Calc.xcu
b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
index 190766e..a62d065 100644
--- a/officecfg/registry/data/org/openoffice/Office/Calc.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
@@ -217,6 +217,17 @@
value0.702804/value
/prop
/node
+node oor:name=CR19 oor:op=replace
+ prop oor:name=FromUnit
+valueEUR/value
+ /prop
+ prop oor:name=ToUnit
+valueLTL/value
+ /prop
+ prop oor:name=Factor
+value3.45280/value
+ /prop
+/node
/node
node oor:name=Calculate
node oor:name=Other
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index e695d57..ac6d71e 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2795,7 +2795,8 @@ static bool lclConvertMoney( const OUString aSearchUnit,
double rfRate, int r
{ CYP, 0.585274, 2 },
{ SKK, 30.1260, 2 },
{ EEK, 15.6466, 2 },
-{ LVL, 0.702804, 2 }
+{ LVL, 0.702804, 2 },
+{ LTL, 3.45280, 2 }
};
static const size_t nConversionCount = sizeof( aConvertTable ) / sizeof(
aConvertTable[0] );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/win32/filepicker/WinFileOpenImpl.cxx | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
New commits:
commit a37d99eb176d0a302f92af287cc0d19ba2663bbc
Author: Aurimas Fišeras auri...@members.fsf.org
Date: Mon Jul 21 10:43:42 2014 +0300
Revert Cleaning: remove use of old edt1 from dlg.h (Windows)
This commit introduced fdo#74295.
This reverts commit e9fd9c25269abe171e5f693a8c70b33ab5a01c85.
Change-Id: I884c25aee137819810bdbc76ad85f2b580b2d626
Reviewed-on: https://gerrit.libreoffice.org/10429
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index ef11558..1305bb1 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -584,7 +584,7 @@ void SAL_CALL CWinFileOpenImpl::InitControlLabel(HWND hWnd)
// Our approach is to align all static text controls with the
// static text control File name of the FileOpen dialog,
// all checkboxes and all list/comboboxes will be left aligned with
-// the standard combobox cmb13 (defined in MS platform sdk dlgs.h)
+// the standard combobox edt1 (defined in MS platform sdk dlgs.h)
// and all push buttons will be left aligned with the standard
// OK button
@@ -689,6 +689,8 @@ void CWinFileOpenImpl::EnlargeStdControlLabels() const
HWND hFilterBoxLabel = GetDlgItem(m_hwndFileOpenDlg, stc2);
HWND hFileNameBoxLabel = GetDlgItem(m_hwndFileOpenDlg, stc3);
HWND hFileNameBox = GetDlgItem(m_hwndFileOpenDlg, cmb13);
+if (!hFileNameBox)
+hFileNameBox = GetDlgItem(m_hwndFileOpenDlg, edt1); // under Win98 it
is edt1 instead of cmb13
HWND hFilterBox = GetDlgItem(m_hwndFileOpenDlg, cmb1);
HWND hOkButton = GetDlgItem(m_hwndFileOpenDlg, IDOK);
@@ -983,11 +985,15 @@ void SAL_CALL CWinFileOpenImpl::InitialSetDefaultName()
// open dialog (reason: see above setDefaultName)
if (m_bInitialSelChanged m_defaultName.getLength())
{
-// from W2k there is a combobox instead
+sal_Int32 edt1Id = edt1;
+
+// under W2k the there is a combobox instead
// of an edit field for the file name edit field
-// So the control id of this box is cmb13 and not
-// edt1 as before
-HWND hwndEdt1 = GetDlgItem(m_hwndFileOpenDlg, cmb13);
+// the control id of this box is cmb13 and not
+// edt1 as before so we must use this id
+edt1Id = cmb13;
+
+HWND hwndEdt1 = GetDlgItem(m_hwndFileOpenDlg, edt1Id);
SetWindowText(hwndEdt1,
reinterpret_castLPCTSTR(m_defaultName.getStr()));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/win32/filepicker/WinFileOpenImpl.cxx | 19 +--
1 file changed, 9 insertions(+), 10 deletions(-)
New commits:
commit bb4ffcdf9a3682f13f0145055f81921a764c36f3
Author: Aurimas Fišeras auri...@members.fsf.org
Date: Mon Jul 21 11:11:22 2014 +0300
win32 fpicker: correctly set the default file name
Correctly set the default file name in win2k+
See fdo#74295 for more details.
Change-Id: I30117a8e1e50b157fee96f4777b0c3f11630165c
Reviewed-on: https://gerrit.libreoffice.org/10430
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index 1305bb1..d852249 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -584,7 +584,7 @@ void SAL_CALL CWinFileOpenImpl::InitControlLabel(HWND hWnd)
// Our approach is to align all static text controls with the
// static text control File name of the FileOpen dialog,
// all checkboxes and all list/comboboxes will be left aligned with
-// the standard combobox edt1 (defined in MS platform sdk dlgs.h)
+// the standard combobox edt1/cmb13 (defined in MS platform sdk dlgs.h)
// and all push buttons will be left aligned with the standard
// OK button
@@ -690,7 +690,7 @@ void CWinFileOpenImpl::EnlargeStdControlLabels() const
HWND hFileNameBoxLabel = GetDlgItem(m_hwndFileOpenDlg, stc3);
HWND hFileNameBox = GetDlgItem(m_hwndFileOpenDlg, cmb13);
if (!hFileNameBox)
-hFileNameBox = GetDlgItem(m_hwndFileOpenDlg, edt1); // under Win98 it
is edt1 instead of cmb13
+hFileNameBox = GetDlgItem(m_hwndFileOpenDlg, edt1); // since Win2k it
is cmb13 or edt1
HWND hFilterBox = GetDlgItem(m_hwndFileOpenDlg, cmb1);
HWND hOkButton = GetDlgItem(m_hwndFileOpenDlg, IDOK);
@@ -985,16 +985,15 @@ void SAL_CALL CWinFileOpenImpl::InitialSetDefaultName()
// open dialog (reason: see above setDefaultName)
if (m_bInitialSelChanged m_defaultName.getLength())
{
-sal_Int32 edt1Id = edt1;
-
-// under W2k the there is a combobox instead
+// under W2k by default there is a combobox instead
// of an edit field for the file name edit field
// the control id of this box is cmb13 and not
-// edt1 as before so we must use this id
-edt1Id = cmb13;
-
-HWND hwndEdt1 = GetDlgItem(m_hwndFileOpenDlg, edt1Id);
-SetWindowText(hwndEdt1,
reinterpret_castLPCTSTR(m_defaultName.getStr()));
+// edt1 as before.
+// However, edt1 is still possible. See fdo#74295
+HWND hFileNameBox = GetDlgItem(m_hwndFileOpenDlg, cmb13);
+if (!hFileNameBox)
+hFileNameBox = GetDlgItem(m_hwndFileOpenDlg, edt1);
+SetWindowText(hFileNameBox,
reinterpret_castLPCTSTR(m_defaultName.getStr()));
}
m_bInitialSelChanged = sal_False;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - fpicker/source
fpicker/source/win32/filepicker/WinFileOpenImpl.cxx | 17 +++--
1 file changed, 11 insertions(+), 6 deletions(-)
New commits:
commit 6466d0fec06e095bc596593357846802a24bb4af
Author: Aurimas Fišeras auri...@members.fsf.org
Date: Mon Jul 21 10:43:42 2014 +0300
fdo#74295 win32 fpicker: correctly set the default file name
Revert Cleaning: remove use of old edt1 from dlg.h (Windows)
This reverts commit e9fd9c25269abe171e5f693a8c70b33ab5a01c85.
Reviewed-on: https://gerrit.libreoffice.org/10429
Reviewed-on: https://gerrit.libreoffice.org/10430
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
(cherry picked from commit a37d99eb176d0a302f92af287cc0d19ba2663bbc)
(cherry picked from commit bb4ffcdf9a3682f13f0145055f81921a764c36f3)
Signed-off-by: Andras Timar andras.ti...@collabora.com
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index 7879f09..4f6c069 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -584,7 +584,7 @@ void SAL_CALL CWinFileOpenImpl::InitControlLabel(HWND hWnd)
// Our approach is to align all static text controls with the
// static text control File name of the FileOpen dialog,
// all checkboxes and all list/comboboxes will be left aligned with
-// the standard combobox cmb13 (defined in MS platform sdk dlgs.h)
+// the standard combobox edt1/cmb13 (defined in MS platform sdk dlgs.h)
// and all push buttons will be left aligned with the standard
// OK button
@@ -689,6 +689,8 @@ void CWinFileOpenImpl::EnlargeStdControlLabels() const
HWND hFilterBoxLabel = GetDlgItem(m_hwndFileOpenDlg, stc2);
HWND hFileNameBoxLabel = GetDlgItem(m_hwndFileOpenDlg, stc3);
HWND hFileNameBox = GetDlgItem(m_hwndFileOpenDlg, cmb13);
+if (!hFileNameBox)
+hFileNameBox = GetDlgItem(m_hwndFileOpenDlg, edt1); // since Win2k it
is cmb13 or edt1
HWND hFilterBox = GetDlgItem(m_hwndFileOpenDlg, cmb1);
HWND hOkButton = GetDlgItem(m_hwndFileOpenDlg, IDOK);
@@ -983,12 +985,15 @@ void SAL_CALL CWinFileOpenImpl::InitialSetDefaultName()
// open dialog (reason: see above setDefaultName)
if (m_bInitialSelChanged m_defaultName.getLength())
{
-// from W2k there is a combobox instead
+// under W2k by default there is a combobox instead
// of an edit field for the file name edit field
-// So the control id of this box is cmb13 and not
-// edt1 as before
-HWND hwndEdt1 = GetDlgItem(m_hwndFileOpenDlg, cmb13);
-SetWindowText(hwndEdt1,
reinterpret_castLPCTSTR(m_defaultName.getStr()));
+// the control id of this box is cmb13 and not
+// edt1 as before.
+// However, edt1 is still possible. See fdo#74295
+HWND hFileNameBox = GetDlgItem(m_hwndFileOpenDlg, cmb13);
+if (!hFileNameBox)
+hFileNameBox = GetDlgItem(m_hwndFileOpenDlg, edt1);
+SetWindowText(hFileNameBox,
reinterpret_castLPCTSTR(m_defaultName.getStr()));
}
m_bInitialSelChanged = sal_False;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - fpicker/source
fpicker/source/win32/filepicker/WinFileOpenImpl.cxx | 17 +++--
1 file changed, 11 insertions(+), 6 deletions(-)
New commits:
commit 1a72abae4863c5f60c96b5fda2dcad8f46551fbd
Author: Aurimas Fišeras auri...@members.fsf.org
Date: Mon Jul 21 10:43:42 2014 +0300
fdo#74295 win32 fpicker: correctly set the default file name
Revert Cleaning: remove use of old edt1 from dlg.h (Windows)
This reverts commit e9fd9c25269abe171e5f693a8c70b33ab5a01c85.
Reviewed-on: https://gerrit.libreoffice.org/10429
Reviewed-on: https://gerrit.libreoffice.org/10430
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
(cherry picked from commit a37d99eb176d0a302f92af287cc0d19ba2663bbc)
(cherry picked from commit bb4ffcdf9a3682f13f0145055f81921a764c36f3)
Signed-off-by: Andras Timar andras.ti...@collabora.com
(cherry picked from commit 6466d0fec06e095bc596593357846802a24bb4af)
Signed-off-by: Andras Timar andras.ti...@collabora.com
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index ee2760b..66e6caa 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -584,7 +584,7 @@ void SAL_CALL CWinFileOpenImpl::InitControlLabel(HWND hWnd)
// Our approach is to align all static text controls with the
// static text control File name of the FileOpen dialog,
// all checkboxes and all list/comboboxes will be left aligned with
-// the standard combobox cmb13 (defined in MS platform sdk dlgs.h)
+// the standard combobox edt1/cmb13 (defined in MS platform sdk dlgs.h)
// and all push buttons will be left aligned with the standard
// OK button
//-
@@ -689,6 +689,8 @@ void CWinFileOpenImpl::EnlargeStdControlLabels() const
HWND hFilterBoxLabel = GetDlgItem(m_hwndFileOpenDlg, stc2);
HWND hFileNameBoxLabel = GetDlgItem(m_hwndFileOpenDlg, stc3);
HWND hFileNameBox = GetDlgItem(m_hwndFileOpenDlg, cmb13);
+if (!hFileNameBox)
+hFileNameBox = GetDlgItem(m_hwndFileOpenDlg, edt1); // since Win2k it
is cmb13 or edt1
HWND hFilterBox = GetDlgItem(m_hwndFileOpenDlg, cmb1);
HWND hOkButton = GetDlgItem(m_hwndFileOpenDlg, IDOK);
@@ -983,12 +985,15 @@ void SAL_CALL CWinFileOpenImpl::InitialSetDefaultName()
// open dialog (reason: see above setDefaultName)
if (m_bInitialSelChanged m_defaultName.getLength())
{
-// from W2k there is a combobox instead
+// under W2k by default there is a combobox instead
// of an edit field for the file name edit field
-// So the control id of this box is cmb13 and not
-// edt1 as before
-HWND hwndEdt1 = GetDlgItem(m_hwndFileOpenDlg, cmb13);
-SetWindowText(hwndEdt1,
reinterpret_castLPCTSTR(m_defaultName.getStr()));
+// the control id of this box is cmb13 and not
+// edt1 as before.
+// However, edt1 is still possible. See fdo#74295
+HWND hFileNameBox = GetDlgItem(m_hwndFileOpenDlg, cmb13);
+if (!hFileNameBox)
+hFileNameBox = GetDlgItem(m_hwndFileOpenDlg, edt1);
+SetWindowText(hFileNameBox,
reinterpret_castLPCTSTR(m_defaultName.getStr()));
}
m_bInitialSelChanged = sal_False;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc vcl/inc xmloff/inc
sw/inc/pch/precompiled_msword.hxx |2 +- vcl/inc/pch/precompiled_vcl.hxx |7 +-- xmloff/inc/pch/precompiled_xo.hxx |1 + 3 files changed, 7 insertions(+), 3 deletions(-) New commits: commit 596c3b459d2e1976ac4ac4e10f152c6353e79e36 Author: Aurimas Fišeras auri...@members.fsf.org Date: Thu May 9 09:50:56 2013 +0300 Update pch Change-Id: I7c0c9158eb17cb79ffceae6770b4c513d57b3817 Reviewed-on: https://gerrit.libreoffice.org/3831 Reviewed-by: Thomas Arnhold tho...@arnhold.org Tested-by: Thomas Arnhold tho...@arnhold.org diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx index 461e572..854d2ce 100644 --- a/sw/inc/pch/precompiled_msword.hxx +++ b/sw/inc/pch/precompiled_msword.hxx @@ -91,6 +91,7 @@ #include cstdio #include cstring #include ctype.h +#include doctok/sprmids.hxx #include editeng/adjustitem.hxx #include editeng/autokernitem.hxx #include editeng/blinkitem.hxx @@ -265,7 +266,6 @@ #include vcl/virdev.hxx #include vcl/wmf.hxx #include vector -#include doctok/sprmids.hxx #include xmloff/odffields.hxx /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index e92c80d..8b49d62 100644 --- a/vcl/inc/pch/precompiled_vcl.hxx +++ b/vcl/inc/pch/precompiled_vcl.hxx @@ -65,6 +65,8 @@ #include com/sun/star/lang/XServiceName.hpp #include com/sun/star/lang/XSingleServiceFactory.hpp #include com/sun/star/linguistic2/LinguServiceManager.hpp +#include com/sun/star/packages/zip/ZipFileAccess.hpp +#include com/sun/star/rendering/CanvasFactory.hpp #include com/sun/star/rendering/XCanvas.hpp #include com/sun/star/rendering/XSpriteCanvas.hpp #include com/sun/star/script/XInvocation.hpp @@ -207,11 +209,11 @@ #include com/sun/star/geometry/RealRectangle2D.hpp #include com/sun/star/geometry/RealSize2D.hpp #include com/sun/star/graphic/GraphicProvider.hpp +#include com/sun/star/graphic/Primitive2DTools.hpp +#include com/sun/star/graphic/SvgTools.hpp #include com/sun/star/graphic/XGraphic.hpp #include com/sun/star/graphic/XGraphicProvider.hpp #include com/sun/star/graphic/XGraphicRenderer.hpp -#include com/sun/star/graphic/XPrimitive2DRenderer.hpp -#include com/sun/star/graphic/XSvgParser.hpp #include com/sun/star/i18n/BreakIterator.hpp #include com/sun/star/i18n/CharacterClassification.hpp #include com/sun/star/i18n/CharacterIteratorMode.hpp @@ -235,6 +237,7 @@ #include com/sun/star/lang/XServiceInfo.hpp #include com/sun/star/lang/XTypeProvider.hpp #include com/sun/star/lang/XUnoTunnel.hpp +#include com/sun/star/rendering/CanvasFactory.hpp #include com/sun/star/rendering/ColorComponentTag.hpp #include com/sun/star/rendering/ColorSpaceType.hpp #include com/sun/star/rendering/IntegerBitmapLayout.hpp diff --git a/xmloff/inc/pch/precompiled_xo.hxx b/xmloff/inc/pch/precompiled_xo.hxx index 8b0f1e7..6da19725 100644 --- a/xmloff/inc/pch/precompiled_xo.hxx +++ b/xmloff/inc/pch/precompiled_xo.hxx @@ -39,6 +39,7 @@ #include boost/scoped_ptr.hpp #include boost/shared_ptr.hpp #include boost/unordered_map.hpp +#include cassert #include com/sun/star/animations/AnimationAdditiveMode.hpp #include com/sun/star/animations/AnimationCalcMode.hpp #include com/sun/star/animations/AnimationColorSpace.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/inc sc/inc writerfilter/inc
oox/inc/pch/precompiled_oox.hxx |1 + sc/inc/pch/precompiled_sc.hxx |1 + writerfilter/inc/pch/precompiled_writerfilter.hxx |2 ++ 3 files changed, 4 insertions(+) New commits: commit cf685e9299ab9d196b7f90803f03d4fea8d16091 Author: Aurimas Fišeras auri...@members.fsf.org Date: Thu May 2 09:52:32 2013 +0300 Update pch Change-Id: Ia400389ca7c4fbe752e19ca2d38f2fee00f6ee7d Reviewed-on: https://gerrit.libreoffice.org/3736 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx index f9ea8b6..1125be4 100644 --- a/oox/inc/pch/precompiled_oox.hxx +++ b/oox/inc/pch/precompiled_oox.hxx @@ -283,6 +283,7 @@ #include com/sun/star/text/SizeType.hpp #include com/sun/star/text/TextContentAnchorType.hpp #include com/sun/star/text/VertOrientation.hpp +#include com/sun/star/text/WrapTextMode.hpp #include com/sun/star/text/WritingMode.hpp #include com/sun/star/text/XNumberingRulesSupplier.hpp #include com/sun/star/text/XSimpleText.hpp diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index bb42081..a913837 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -53,6 +53,7 @@ #include formula/grammar.hxx #include formula/opcode.hxx #include formula/token.hxx +#include formula/vectortoken.hxx #include i18nlangtag/lang.h #include i18nlangtag/mslangid.hxx #include rtl/math.hxx diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx b/writerfilter/inc/pch/precompiled_writerfilter.hxx index 6e840a6..641211a 100644 --- a/writerfilter/inc/pch/precompiled_writerfilter.hxx +++ b/writerfilter/inc/pch/precompiled_writerfilter.hxx @@ -71,6 +71,7 @@ #include com/sun/star/form/XFormComponent.hpp #include com/sun/star/form/XFormsSupplier.hpp #include com/sun/star/frame/XFrame.hpp +#include com/sun/star/frame/XModel.hpp #include com/sun/star/graphic/GraphicProvider.hpp #include com/sun/star/graphic/XGraphic.hpp #include com/sun/star/graphic/XGraphicProvider.hpp @@ -146,6 +147,7 @@ #include com/sun/star/uri/UriReferenceFactory.hpp #include com/sun/star/util/XNumberFormatsSupplier.hpp #include com/sun/star/util/XRefreshable.hpp +#include com/sun/star/view/XFormLayerAccess.hpp #include com/sun/star/xml/sax/Parser.hpp #include com/sun/star/xml/sax/SAXException.hpp #include com/sun/star/xml/sax/XParser.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Compilation fails with --enable-pch after global header move
Hello, after global header move compilation of LibreOffice master fails with an error. I ran ./bin/update_pch.sh but it does not help. I build with these options: ./configure --enable-hardlink-deliver --enable-pch --disable-odk --without-help --without-java --with-lang=lt In file included from ~/libreoffice-git/svtools/inc/pch/precompiled_svt.hxx:428:0: ~/libreoffice-git/include/vcl/controllayout.hxx:58:5: error: reference to ‘Pair’ is ambiguous In file included from ~/libreoffice-git/include/vcl/mapmod.hxx:23:0, from ~/libreoffice-git/include/vcl/bitmap.hxx:26, from ~/libreoffice-git/include/vcl/graph.hxx:26, from ~/libreoffice-git/include/svtools/DocumentToGraphicRenderer.hxx:29, from ~/libreoffice-git/svtools/inc/pch/precompiled_svt.hxx:17: ~/libreoffice-git/include/tools/gen.hxx:33:23: error: candidates are: class Pair In file included from ~/libreoffice-git/workdir/unxlngx6.pro/UnoApiHeadersTarget/offapi/normal/com/sun/star/awt/grid/XSortableGridData.hdl:6:0, from ~/libreoffice-git/workdir/unxlngx6.pro/UnoApiHeadersTarget/offapi/normal/com/sun/star/awt/grid/XSortableGridData.hpp:6, from ~/libreoffice-git/svtools/inc/pch/precompiled_svt.hxx:98: ~/libreoffice-git/workdir/unxlngx6.pro/UnoApiHeadersTarget/udkapi/normal/com/sun/star/beans/Pair.hdl:16:63: error: templateclass typeparam_T, class typeparam_U struct com::sun::star::beans::Pair In file included from ~/libreoffice-git/svtools/inc/pch/precompiled_svt.hxx:428:0: ~/libreoffice-git/include/vcl/controllayout.hxx:58:5: error: ‘Pair’ does not name a type make[1]: *** [~/libreoffice-git/workdir/unxlngx6.pro/PrecompiledHeader/nodebug/precompiled_svt.hxx.gch] Error 1 make[1]: *** Waiting for unfinished jobs... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dbaccess/inc dictionaries oox/inc sal/inc sc/inc sd/inc svtools/inc sw/inc vcl/inc writerfilter/inc
dbaccess/inc/pch/precompiled_dbu.hxx |2 +- dictionaries |2 +- oox/inc/pch/precompiled_oox.hxx |3 ++- sal/inc/pch/precompiled_sal.hxx |2 -- sc/inc/pch/precompiled_sc.hxx |1 + sd/inc/pch/precompiled_sd.hxx |2 ++ svtools/inc/pch/precompiled_svt.hxx | 11 +-- sw/inc/pch/precompiled_sw.hxx |2 ++ vcl/inc/pch/precompiled_vcl.hxx |1 + writerfilter/inc/pch/precompiled_writerfilter.hxx |4 10 files changed, 15 insertions(+), 15 deletions(-) New commits: commit c75eeddfb892918c13a19f7c534b73e423ff8d89 Author: Aurimas Fišeras auri...@members.fsf.org Date: Tue Apr 16 17:26:06 2013 +0300 Update pch Change-Id: Ice80350184f7a514d5beab0a5e1da5b98d5733e4 Reviewed-on: https://gerrit.libreoffice.org/3427 Reviewed-by: Thomas Arnhold tho...@arnhold.org Tested-by: Thomas Arnhold tho...@arnhold.org diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx b/dbaccess/inc/pch/precompiled_dbu.hxx index 4826fec..3573e6b 100644 --- a/dbaccess/inc/pch/precompiled_dbu.hxx +++ b/dbaccess/inc/pch/precompiled_dbu.hxx @@ -108,6 +108,7 @@ #include com/sun/star/form/XSubmitListener.hpp #include com/sun/star/form/runtime/XFormController.hpp #include com/sun/star/frame/Desktop.hpp +#include com/sun/star/frame/Frame.hpp #include com/sun/star/frame/FrameSearchFlag.hpp #include com/sun/star/frame/TaskCreator.hpp #include com/sun/star/frame/UICommandDescription.hpp @@ -333,7 +334,6 @@ #include framework/undomanagerhelper.hxx #include functional #include i18nlangtag/mslangid.hxx -#include jvmaccess/virtualmachine.hxx #include limits #include list #include map diff --git a/dictionaries b/dictionaries index faf63ac..b32611e 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit faf63ac08a9f3f1463a7f119083964f76b71141c +Subproject commit b32611e23a1f35f16f4c37bbbdc02027157424d1 diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx index 674f9f9..5818c074 100644 --- a/oox/inc/pch/precompiled_oox.hxx +++ b/oox/inc/pch/precompiled_oox.hxx @@ -278,6 +278,7 @@ #include com/sun/star/text/ControlCharacter.hpp #include com/sun/star/text/GraphicCrop.hpp #include com/sun/star/text/HoriOrientation.hpp +#include com/sun/star/text/PositionAndSpaceMode.hpp #include com/sun/star/text/RelOrientation.hpp #include com/sun/star/text/SizeType.hpp #include com/sun/star/text/TextContentAnchorType.hpp @@ -318,6 +319,7 @@ #include comphelper/stl_types.hxx #include comphelper/storagehelper.hxx #include comphelper/string.hxx +#include config_oox.h #include cppuhelper/implbase1.hxx #include cppuhelper/implbase2.hxx #include cppuhelper/implementationentry.hxx @@ -332,7 +334,6 @@ #include list #include map #include math.h -#include openssl/evp.h #include osl/diagnose.h #include osl/file.hxx #include osl/mutex.hxx diff --git a/sal/inc/pch/precompiled_sal.hxx b/sal/inc/pch/precompiled_sal.hxx index 24ff7af..5e89b28 100644 --- a/sal/inc/pch/precompiled_sal.hxx +++ b/sal/inc/pch/precompiled_sal.hxx @@ -24,9 +24,7 @@ #include cstdio #include cstdlib #include cstring -#include deque #include float.h -#include functional #include limits.h #include list #include sstream diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index 857dcfd..deefbe6 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -210,6 +210,7 @@ #include com/sun/star/embed/ElementModes.hpp #include com/sun/star/embed/EmbedMisc.hpp #include com/sun/star/embed/EmbedStates.hpp +#include com/sun/star/embed/MSOLEObjectSystemCreator.hpp #include com/sun/star/embed/NoVisualAreaSizeException.hpp #include com/sun/star/embed/XClassifiedObject.hpp #include com/sun/star/embed/XComponentSupplier.hpp diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 113c2bd..0094aca 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -188,6 +188,7 @@ #include com/sun/star/embed/ElementModes.hpp #include com/sun/star/embed/EmbedMisc.hpp #include com/sun/star/embed/EmbedStates.hpp +#include com/sun/star/embed/MSOLEObjectSystemCreator.hpp #include com/sun/star/embed/NoVisualAreaSizeException.hpp #include com/sun/star/embed/StorageFactory.hpp #include com/sun/star/embed/XEmbedObjectClipboardCreator.hpp @@ -411,6 +412,7 @@ #include editeng/lrspitem.hxx #include editeng/lspcitem.hxx #include editeng/measfld.hxx +#include editeng/numdef.hxx #include editeng/numitem.hxx #include editeng/outliner.hxx #include editeng/outlobj.hxx diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx index 6159679..4252097 100644 --- a/svtools/inc/pch/precompiled_svt.hxx +++ b/svtools/inc/pch/precompiled_svt.hxx @@ -139,6 +139,7 @@ #include
[PATCH] fdo#57203: Launching .vbs before LibO causes error Unknown option: -Embedding and command line help appears
Hello,
this patch should fix fdo#57203 in LibreOffice 3.6.
However, I only tested it on Ubuntu against libreoffice/core.
From f41f5ae0055e23c3c1d01a4fdc473b6d9bb09a6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aurimas=20Fi=C5=A1eras?= auri...@members.fsf.org
Date: Sun, 16 Dec 2012 13:41:31 +0200
Subject: fdo#57203 Unknown option: -Embedding
Ignore this option on Windows. It is appended when LibreOffice is called by COM+
Change-Id: I32cbfa276a6699eda99b87580cf9ef23366c40bc
---
desktop/source/app/cmdlineargs.cxx | 9 +
1 file changed, 9 insertions(+)
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 2320a18..d6b9dc7 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -502,6 +502,15 @@ bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString aArg
return true;
}
#endif
+#ifdef WIN32
+/* fdo#57203 ignore -Embedding on Windows
+ when LibreOffice is launched by COM+
+ */
+else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( Embedding )) )
+{
+return true;
+}
+#endif
else if ( oArg.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(infilter=)))
{
m_infilter.push_back(oArg.copy(RTL_CONSTASCII_LENGTH(infilter=)));
--
1.8.0
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Fwd: Re: [PUSHED] ure: Some fixes to documentation (part 4)
Hello, all of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. Aurimas Fišeras. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] UNO api spelling fix ...
2011.01.27 12:40, Michael Meeks rašė: Hi Aurimas, I was chasing down a compilation problem in extensions, and I noticed that somehow we changed the (incorrectly spelled) UNO enumeration value 'Cancelled' to 'Canceled' (which is correct) as part of your huge, and much appreciated cleanup of the API documentation there. I reviewed the whole patch again and didn't see the mistake (which is worrying) ;-) and I'm sure you didn't mean to do it: I didn't see the mistake either. And of course I didn't mean to do it. I didn't compile-test my changes because I didn't manage to set up compilation when I tried several weeks ago. Is it possible at all to compile API documentation only using ure git tree? Aurimas. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PATCH] ure: Fix more typos in documentation
2010.10.18 12:37, Michael Meeks rašė: Hi Aurimas, On Sun, 2010-10-17 at 17:44 +0300, Aurimas Fišeras wrote: There are files where both spellings are used in the same file. Which spelling should be used in this case? Much as I hate to say it (being English), we should use the US spellings consistently where possible :-) OK, here is the remaining part of that patch that changed spelling. From 446eb51004b077eb12052643fcb17f6a54130602 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aurimas=20Fi=C5=A1eras?= auri...@gmail.com Date: Mon, 18 Oct 2010 17:45:46 +0300 Subject: Use en-US spelling for consistency --- offapi/com/sun/star/awt/MenuItemStyle.idl |2 +- offapi/com/sun/star/awt/SystemPointer.idl |4 ++-- offapi/com/sun/star/awt/UnoControlButtonModel.idl |2 +- .../sun/star/awt/UnoControlCurrencyFieldModel.idl |2 +- .../com/sun/star/awt/UnoControlDateFieldModel.idl |2 +- .../sun/star/awt/UnoControlFormattedFieldModel.idl |2 +- .../sun/star/awt/UnoControlNumericFieldModel.idl |2 +- .../com/sun/star/awt/UnoControlScrollBarModel.idl |2 +- .../com/sun/star/awt/UnoControlSpinButtonModel.idl |2 +- .../com/sun/star/awt/UnoControlTimeFieldModel.idl |2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/offapi/com/sun/star/awt/MenuItemStyle.idl b/offapi/com/sun/star/awt/MenuItemStyle.idl index 2db5bd7..006bf19 100644 --- a/offapi/com/sun/star/awt/MenuItemStyle.idl +++ b/offapi/com/sun/star/awt/MenuItemStyle.idl @@ -48,7 +48,7 @@ published constants MenuItemStyle //- -/** specifies an item which can be checked dependent on the neighbouring +/** specifies an item which can be checked dependent on the neighboring items. */ const short RADIOCHECK = 2; diff --git a/offapi/com/sun/star/awt/SystemPointer.idl b/offapi/com/sun/star/awt/SystemPointer.idl index 5fbe3d8..9a769fc 100644 --- a/offapi/com/sun/star/awt/SystemPointer.idl +++ b/offapi/com/sun/star/awt/SystemPointer.idl @@ -287,7 +287,7 @@ published constants SystemPointer //- -/** specifies a mouse pointer which symbolizes moving a bezier weight. +/** specifies a mouse pointer which symbolizes moving a Bezier weight. */ const long MOVEBEZIERWEIGHT = 39; @@ -389,7 +389,7 @@ published constants SystemPointer //- -/** specifies a mouse pointer which symbolizes drawing a bezier. +/** specifies a mouse pointer which symbolizes drawing a Bezier. */ const long DRAW_BEZIER = 56; diff --git a/offapi/com/sun/star/awt/UnoControlButtonModel.idl b/offapi/com/sun/star/awt/UnoControlButtonModel.idl index eaaea08..f7fdfed 100644 --- a/offapi/com/sun/star/awt/UnoControlButtonModel.idl +++ b/offapi/com/sun/star/awt/UnoControlButtonModel.idl @@ -201,7 +201,7 @@ published service UnoControlButtonModel //- -/** specifies whether the control should show repeating behaviour. +/** specifies whether the control should show repeating behavior. pNormally, when you click a button with the mouse, you need to release the mouse button, and press it again. With this property diff --git a/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl b/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl index 8a9fa07..9d062d1 100644 --- a/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl +++ b/offapi/com/sun/star/awt/UnoControlCurrencyFieldModel.idl @@ -164,7 +164,7 @@ published service UnoControlCurrencyFieldModel //- -/** specifies whether the mouse should show repeating behaviour, i.e. +/** specifies whether the mouse should show repeating behavior, i.e. repeatedly trigger an action when keeping pressed. @since OOo 2.0.0 diff --git a/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl b/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl index 3eefcac..84a9aa5 100644 --- a/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl +++ b/offapi/com/sun/star/awt/UnoControlDateFieldModel.idl @@ -198,7 +198,7 @@ published service UnoControlDateFieldModel //- -/** specifies whether the mouse should show repeating behaviour, i.e. +/** specifies whether the mouse should show repeating behavior, i.e. repeatedly trigger an action when keeping pressed. @since OOo 2.0.0 diff --git a/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl b/offapi/com/sun/star/awt/UnoControlFormattedFieldModel.idl index a4766d1..05ee9d4 100644
