[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/bin
config_host.mk.in |1
configure.ac | 42 +++---
solenv/bin/modules/installer.pm |6 ++-
solenv/bin/modules/installer/systemactions.pm |7 +++-
4 files changed, 14 insertions(+), 42 deletions(-)
New commits:
commit f927282853407ff6bcf1dc58b1dc86dcb015be0f
Author: Bryan Quigley
Date: Mon Mar 13 10:49:03 2017 -0400
Remove last use of md5sum (in building)
Switch to using sha256sum for checking if files change. Not for
security, just so we don't need to check for md5sum.
We also change the Windows installer to rely on the perm md5
digest instead of the environment variable. The code to do this was
already in directory.pm
Change-Id: I24aed542c6201abf030fdd62116aec3f8ea3513b
Reviewed-on: https://gerrit.libreoffice.org/35140
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/config_host.mk.in b/config_host.mk.in
index ae7792504735..5796b56d184b 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -376,7 +376,6 @@ export MARIADB_LIBS=$(gb_SPACE)@MARIADB_LIBS@
export LIBMARIADB=@LIBMARIADB@
export LIBMARIADB_PATH=@LIBMARIADB_PATH@
export BUNDLE_MARIADB=@BUNDLE_MARIADB@
-export MD5SUM=@MD5SUM@
export MDDS_CFLAGS=$(gb_SPACE)@MDDS_CFLAGS@
export MDDS_LIBS=$(gb_SPACE)@MDDS_LIBS@
export MERGELIBS=@MERGELIBS@
diff --git a/configure.ac b/configure.ac
index c81983c042c9..d6eb7765a28d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11867,38 +11867,6 @@ AC_SUBST(WGET)
AC_SUBST(CURL)
#
-# check for md5sum
-#
-MD5SUM=
-
-for i in md5 md5sum /usr/local/bin/md5sum gmd5sum /usr/sfw/bin/md5sum
/opt/sfw/bin/gmd5sum /opt/local/bin/md5sum; do
-if test "$i" = "md5"; then
-eval "$i -x" > /dev/null 2>&1
-else
-eval "$i --version" > /dev/null 2>&1
-fi
-ret=$?
-if test $ret -eq 0; then
-MD5SUM=$i
-break
-fi
-done
-
-if test "$MD5SUM" = "md5"; then
-if md5 -r < /dev/null > /dev/null 2>/dev/null; then
-MD5SUM="$MD5SUM -r"
-elif md5 -n < /dev/null > /dev/null 2>/dev/null; then
-MD5SUM="$MD5SUM -n"
-fi
-fi
-
-if test -z "$MD5SUM"; then
-AC_MSG_ERROR([no md5sum found!])
-fi
-
-AC_SUBST(MD5SUM)
-
-#
# check for sha256sum
#
SHA256SUM=
@@ -12694,12 +12662,12 @@ AC_SUBST(LO_PATH)
libo_FUZZ_SUMMARY
-# Generate a configuration md5 we can use for deps
+# Generate a configuration sha256 we can use for deps
if test -f config_host.mk; then
-config_md5=`$MD5SUM config_host.mk | sed "s/ .*//"`
+config_sha256=`$SHA256SUM config_host.mk | sed "s/ .*//"`
fi
if test -f config_host_lang.mk; then
-config_lang_md5=`$MD5SUM config_host_lang.mk | sed "s/ .*//"`
+config_lang_sha256=`$SHA256SUM config_host_lang.mk | sed "s/ .*//"`
fi
CFLAGS=$my_original_CFLAGS
@@ -12757,7 +12725,7 @@ fi
# touch the config timestamp file
if test ! -f config_host.mk.stamp; then
echo > config_host.mk.stamp
-elif test "$config_md5" = `$MD5SUM config_host.mk | sed "s/ .*//"`; then
+elif test "$config_sha256" = `$SHA256SUM config_host.mk | sed "s/ .*//"`; then
echo "Host Configuration unchanged - avoiding scp2 stamp update"
else
echo > config_host.mk.stamp
@@ -12766,7 +12734,7 @@ fi
# touch the config lang timestamp file
if test ! -f config_host_lang.mk.stamp; then
echo > config_host_lang.mk.stamp
-elif test "$config_lang_md5" = `$MD5SUM config_host_lang.mk | sed "s/ .*//"`;
then
+elif test "$config_lang_sha256" = `$SHA256SUM config_host_lang.mk | sed "s/
.*//"`; then
echo "Language Configuration unchanged - avoiding scp2 stamp update"
else
echo > config_host_lang.mk.stamp
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index a29beb09efb2..3d88b9986e14 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -466,8 +466,10 @@ sub run {
if (length($loglanguagestring) > $installer::globals::max_lang_length)
{
my $number_of_languages =
installer::systemactions::get_number_of_langs($loglanguagestring);
-chomp(my $shorter = `echo $loglanguagestring | $ENV{'MD5SUM'} |
sed -e "s/ .*//g"`);
-my $id = substr($shorter, 0, 8); # taking only the first 8 digits
+#replace this in the same it was done in
installer/windows/directory.pm
+#chomp(my $shorter = `echo $loglanguagestring | $ENV{'MD5SUM'} |
sed -e "s/ .*//g"`);
+#my $id = substr($shorter, 0, 8); # taking only the first 8 digits
+my $id =
installer::windows::msiglobal::calculate_id($loglanguagestring, 8);
[Libreoffice-commits] core.git: config_host.mk.in configure.ac download.lst Makefile.fetch
Makefile.fetch|8 +-- config_host.mk.in |1 configure.ac | 31 ++ download.lst | 115 ++ 4 files changed, 151 insertions(+), 4 deletions(-) New commits: commit faef35d8653003786f9a0ea2ae1a2330fd15d632 Author: Bryan Quigley Date: Fri Feb 24 11:05:48 2017 -0500 Move file download verification from md5sum to sha256sum This leaves all the md5sum parts in place for now, but switches to using sha256sum. Tries both shasum -a 256 and sha256sum. Change-Id: I393d0dde56521f6e9e76f3d5a8d15c6c830fd683 Reviewed-on: https://gerrit.libreoffice.org/34633 Tested-by: Jenkins Reviewed-by: Norbert Thiebaud diff --git a/Makefile.fetch b/Makefile.fetch index d2c073e..3091c5e 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -21,9 +21,9 @@ endef endif -ifneq (,$(MD5SUM)) +ifneq (,$(SHA256SUM)) define fetch_Download__checksum_command -&& SUM=`$(MD5SUM) $1 | sed "s/ .*//"` \ +&& SUM=`$(SHA256SUM) $1 | sed "s/ .*//"` \ && if test "$$SUM" != "$2"; then \ echo ERROR: expected checksum for $1 is $2 2>&1 | tee -a $(fetch_LOGFILE); \ false; \ @@ -35,7 +35,7 @@ fetch_Download__checksum_command := endif -# fetch__Download_item url tarball-name md5sum +# fetch__Download_item url tarball-name sha256sum define fetch__Download_item $(if $(wildcard $(TARFILE_LOCATION)/$2),, \ cd $(TARFILE_LOCATION)/tmp \ @@ -52,7 +52,7 @@ $(filter 32,$(words $(shell echo $(1) | sed -e 's/./& /g'))) endef define fetch_Download__subst_var -$(subst _DLL,_MD5SUM,$(subst _TARBALL,_MD5SUM,$(subst _PACK,_MD5SUM,$(subst _JAR,_MD5SUM,$(1) +$(subst _DLL,_SHA256SUM,$(subst _TARBALL,_SHA256SUM,$(subst _PACK,_SHA256SUM,$(subst _JAR,_SHA256SUM,$(1) endef # fetch_Download_item url variable-name diff --git a/config_host.mk.in b/config_host.mk.in index 68309d3..176546e 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -476,6 +476,7 @@ export SDKDIRNAME=@SDKDIRNAME@ export SDKDIRNAME_FOR_BUILD=@SDKDIRNAME_FOR_BUILD@ export SERF_CFLAGS=$(gb_SPACE)@SERF_CFLAGS@ export SERF_LIBS=$(gb_SPACE)@SERF_LIBS@ +export SHA256SUM=@SHA256SUM@ export SHOWINCLUDES_PREFIX=@SHOWINCLUDES_PREFIX@ export SOLARINC=@SOLARINC@ export SORT=@SORT@ diff --git a/configure.ac b/configure.ac index 9b4f742..9480220 100644 --- a/configure.ac +++ b/configure.ac @@ -11853,6 +11853,37 @@ fi AC_SUBST(MD5SUM) +# +# check for sha256sum +# +SHA256SUM= + +for i in shasum /usr/local/bin/shasum /usr/sfw/bin/shasum /opt/sfw/bin/shasum /opt/local/bin/shasum; do +eval "$i -a 256 --version" > /dev/null 2>&1 +ret=$? +if test $ret -eq 0; then +SHA256SUM="$i -a 256" +break +fi +done + +if test -z "$SHA256SUM"; then +for i in sha256sum /usr/local/bin/sha256sum /usr/sfw/bin/sha256sum /opt/sfw/bin/sha256sum /opt/local/bin/sha256sum; do +eval "$i --version" > /dev/null 2>&1 +ret=$? +if test $ret -eq 0; then +SHA256SUM=$i +break +fi +done +fi + +if test -z "$SHA256SUM"; then +AC_MSG_ERROR([no sha256sum found!]) +fi + +AC_SUBST(SHA256SUM) + dnl === dnl Dealing with l10n options dnl === diff --git a/download.lst b/download.lst index 5c2f4c4..ec11dfc 100644 --- a/download.lst +++ b/download.lst @@ -1,180 +1,295 @@ +export ABW_SHA256SUM := 7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199 export ABW_MD5SUM := 7a3815b506d064313ba309617b6f5a0b export ABW_TARBALL := libabw-0.1.1.tar.bz2 +export APACHE_COMMONS_LOGGING_SHA256SUM := 49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81 export APACHE_COMMONS_LOGGING_MD5SUM := ce977548f1cbf46918e93cd38ac35163 export APACHE_COMMONS_LOGGING_TARBALL := commons-logging-1.2-src.tar.gz +export APR_SHA256SUM := 1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb export APR_MD5SUM := 98492e965963f852ab29f9e61b2ad700 export APR_TARBALL := apr-1.5.2.tar.gz +export APR_UTIL_SHA256SUM := 976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19 export APR_UTIL_MD5SUM := 866825c04da827c6e5f53daff5569f42 export APR_UTIL_TARBALL := apr-util-1.5.4.tar.gz +export BOOST_SHA256SUM := beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0 export BOOST_MD5SUM := 1c837ecd990bb022d07e7aab32b09847 export BOOST_TARBALL := boost_1_63_0.tar.bz2 +export BREAKPAD_SHA256SUM := 7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9 export BREAKPAD_TARBALL := breakpad.zip export BREAKPAD_MD5SUM := 415ce291aa6f2ee1d5db7b62bf62ade8 +export BSH_SHA256SUM := 9e93c73e23aff644b17dfff65674c14150e7f3b38b19635e622235e01c96 export BSH_TARBALL := beeca87be4
Re: sha1sum problem
I'm going to look at adding the SHA256SUM for all the files in download.lst. It looks like we can add them without breaking anything. Then we can test out how we want to switch or if we need to support both for a bit (platform dependent?). Thoughts? Bryan (Of course, technically my SHA256SUMs will be based on the existing HTTP download and MD5SUM...) On Fri, Feb 24, 2017 at 10:25 AM, Stephan Bergmann wrote: > On 02/24/2017 03:47 PM, Norbert Thiebaud wrote: >> >> The situation with checksum of 'external' files is much worse that you >> thought. >> They are actually checked with md5. >> That being said they are not truly external, since they are hosted on >> the project infrastructure > > > ...but downloaded via plain HTTP > >> and the original motivation was not so much malicious injection >> detection but faulty transfer. >> using sha1 there would actually be an 'improvement' :-) >> >> I guess we could convert that to shasum -a 256 > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Usage of ActiveX in Libre Office
On Thu, Feb 2, 2017 at 11:49 AM, wrote: > Hi, > > I did today a quick test on a Windows 7 (32Bit) computer. > > AOO 4.1.1 was de-installed completely first and I verified that COM and OLE > didn't worked anymore. > After that LOO 5.2.5.1 was installed with deactivated ActiveX support. > > Both COM and OLE are working. Automation through our ERP is working and I > could embed a calc document into MSWord and edit it. > > So sorry for upsetting the apple cart. Quite the contrary. Thank you a ton for doing this testing! This means we can move forward with removing that bit knowing it shouldn't break your ERP (or anyone's). Thanks a bunch! Bryan > cheers > Jörgen > > > Am 30.01.2017 um 16:37 schrieb Bryan Quigley: >> >> To test most* of what I proposed to remove: During Install disable the >> ActiveX control. (Ideally with a fresh install) >> >> AFAICT OLE is actually also separate (but if it's not we don't want to >> break that). It works fine on Linux (and I don't have a copy of MS >> Office to test with on Windows). >> >>> ActiveX is more likely a marketing buzzword used for many aspects of the >>> COM technology. >> >> Yes, I've found that a lot. Not a clear line in the sand for what it is. >> >> Thanks both if you can test! >> Bryan >> >> *We'd still want to confirm with an actual build to be sure. >> >> On Fri, Jan 27, 2017 at 6:24 PM, wrote: >>> >>> Hi, >>> >>> Am 27.01.2017 um 18:03 schrieb Bryan Quigley: >>>> >>>> Looking back over my previous attempt, I think you might not be >>>> affected. (In any case COM/ATL support would not be dropped) >>> >>> >>>> The other problem was not having good test cases for making changes to >>>> the code. I do note in my original release notes "We specifically >>>> want feedback if you use ActiveX to embed LibreOffice components into >>>> your application." Our original intention was to remove the plugin >>>> that allows you to embed LibreOffice inside other applications (like >>>> IE) using ActiveX. Without test cases that worked, we weren't able to >>>> ensure we wouldn't break something. >>> >>> Ah, maybe we were talking about different things. >>> Do you mean the ability i.e. to put an LO calc document as object into a >>> MS >>> word document, and when activating the object the LO menu appears and >>> take >>> over control? I was talking about the pure automation through COM, >>> remotely >>> working on LO documents or gathering information. >>> >>> ActiveX is more likely a marketing buzzword used for many aspects of the >>> COM >>> technology. >>> >>> So, no, we don't use that OLE stuff. I can remember from the early days >>> of >>> OLE it was slow and had poor stability, so I never used that. >>> >>> Best regards >>> Jörgen > > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Usage of ActiveX in Libre Office
I believe it's just the ActiveX plugin which was designed to view LibreOffice documents through IE. Unfortunately, we did not have a test case for other COM automation to confirm if that's the case. On Tue, Jan 31, 2017 at 11:47 AM, Lionel Elie Mamane wrote: > I think what he meant is that rewriting their ERP to another API to > drive LibreOffice would be quite some work for them, and not gonna > happen except if forced kicking and screaming. > > In principle, I like to support these kinds of universal (in this case > "universal on a platform") APIs; are we deprecating / yanking only > ActiveX or the whole COM Automation / OLE / ... bridge (insofar as > these differ, I'm a bit lost in the Microsoft terminology)? > > On Fri, Jan 27, 2017 at 09:19:33PM +0100, Heiko Tietze wrote: >> It would be much nicer to have a Pascal bridge rather than to support >> the proprietary ActiveX protocol. Some references are on the >> Freepascal wiki http://wiki.freepascal.org/Office_Automation >> >> 2017-01-23 15:42 GMT+01:00 : >> > We are recently switched from AOO to LO. In the release notes a possible >> > removal of ActiveX is announced. >> > You are asking for information about the use case so here we are: >> > >> > We are using in our company a selfmade ERP system which is grown for more >> > than 15 years now. For historical reasons the system is written in Delphi. >> > At the beginning MS Office was used as "office frontend", since about 10 >> > years OOo/AOO/LO. The main workflow is using calc for business calculation >> > and writer as a kind of report tool. Most information from the main >> > database >> > is delivered via ActiveX to calc. After working in calc the information are >> > read back and used to create documents in writer. The complete project and >> > document management (and many more) is done by our ERP. >> > >> > I know there are others and probably more elegant ways and about once a >> > year >> > we are discussing to change that and finding the "big solution" - but this >> > is a huge and expensive project. >> > >> > Removing ActiveX from LO will be a showstopper and nail us to the last >> > supported release - or bring us back to AOO, who knows. >> > >> > Best regards >> > Joergen Pisarz >> > ___ >> > LibreOffice mailing list >> > LibreOffice@lists.freedesktop.org >> > https://lists.freedesktop.org/mailman/listinfo/libreoffice >> ___ >> LibreOffice mailing list >> LibreOffice@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/libreoffice > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Usage of ActiveX in Libre Office
To test most* of what I proposed to remove: During Install disable the ActiveX control. (Ideally with a fresh install) AFAICT OLE is actually also separate (but if it's not we don't want to break that). It works fine on Linux (and I don't have a copy of MS Office to test with on Windows). >ActiveX is more likely a marketing buzzword used for many aspects of the COM >technology. Yes, I've found that a lot. Not a clear line in the sand for what it is. Thanks both if you can test! Bryan *We'd still want to confirm with an actual build to be sure. On Fri, Jan 27, 2017 at 6:24 PM, wrote: > Hi, > > Am 27.01.2017 um 18:03 schrieb Bryan Quigley: >> >> Looking back over my previous attempt, I think you might not be >> affected. (In any case COM/ATL support would not be dropped) > > >> The other problem was not having good test cases for making changes to >> the code. I do note in my original release notes "We specifically >> want feedback if you use ActiveX to embed LibreOffice components into >> your application." Our original intention was to remove the plugin >> that allows you to embed LibreOffice inside other applications (like >> IE) using ActiveX. Without test cases that worked, we weren't able to >> ensure we wouldn't break something. > > Ah, maybe we were talking about different things. > Do you mean the ability i.e. to put an LO calc document as object into a MS > word document, and when activating the object the LO menu appears and take > over control? I was talking about the pure automation through COM, remotely > working on LO documents or gathering information. > > ActiveX is more likely a marketing buzzword used for many aspects of the COM > technology. > > So, no, we don't use that OLE stuff. I can remember from the early days of > OLE it was slow and had poor stability, so I never used that. > > Best regards > Jörgen ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Usage of ActiveX in Libre Office
Hi. On Fri, Jan 27, 2017 at 11:07 AM, wrote: > Hi, > Am 25.01.2017 um 20:43 schrieb Bryan Quigley: >> >> Welcome and thanks for responding to notice! >> >> You're the first person (AFAICT) who has written in response to the >> deprecation notice. My original intention was to remove it from the >> 5.2 release if we got no responses to that notice (that obviously >> hasn't happened). >> >> At this point the soonest release we could remove it from is 5.4 >> (which might be around Aug 2017). It's far from scheduled though. >> >> We really don't have much data to base this decision on, so I'll ask >> you instead. Knowing keeping support has an impact on LibreOffice >> development, when do you think is reasonable for ActiveX support to be >> removed? > > > IMHO ActiveX (aka COM) is a major technology in Windows, even if it will not > be developed further because of .NET. Looking back over my previous attempt, I think you might not be affected. (In any case COM/ATL support would not be dropped) > A lot of software packages using this > technology and I believe it will never be removed from Windows. Even if it > disappears completely from internet services it will stay under the hood of > Windows. > But I also thought in the late 1970's that Pascal is the best programming > language ever and will be the #1 in the future. Or when Java was introduced > that this technology will die fast. So don't give too much on my opinion... > > So I can't answer the question. If the automation bridge is removed, we will > stay with the last supported version of LO until we decide to get a new ERP. > > I didn't look into the code and I don't know how ActiveX is implemented. But > if it doesn't need to be touched when something in UNO changes, is there a > need to remove it? It has been getting touched, but if I remember correctly we don't have good coverage there. I would suggest testing newer builds of LibreOffice to make sure it keeps working as you expect. The other problem was not having good test cases for making changes to the code. I do note in my original release notes "We specifically want feedback if you use ActiveX to embed LibreOffice components into your application." Our original intention was to remove the plugin that allows you to embed LibreOffice inside other applications (like IE) using ActiveX. Without test cases that worked, we weren't able to ensure we wouldn't break something. I don't currently have time to pursue this right now, but would be interested in testing some custom builds to ensure that we remove the right part of ActiveX while your use case keeps working? Kind regards, Bryan > >> What Windows version are you running? > > > Windows 7 > >> >> Kind regards, >> Bryan >> >> [The whole original thread - quite long] >> >> https://lists.freedesktop.org/archives/libreoffice/2015-December/071580.html > > Best regards > Jörgen Pisarz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Usage of ActiveX in Libre Office
I don't believe it would be affected, but it would need to be tested to be sure.
Thanks,
Bryan
On Wed, Jan 25, 2017 at 3:43 PM, sos wrote:
> Bryan,
> Please clarify, will stuff like
>
> oShell = CreateObject("WScript.Shell")
>
> Still working after removing ActiveX?
> If not: then lots off API code will been broken and this will been a BIG
> regression ?
>
> Greetz
>
> Fernand
>
>
> Sent from my Samsung Galaxy smartphone.
>
> Original message
> From: Bryan Quigley
> Date: 25/01/2017 20:43 (GMT+01:00)
> To: libreoffice@lists.freedesktop.org, libroffice@artavi.de
> Subject: re: Usage of ActiveX in Libre Office
>
> Welcome and thanks for responding to notice!
>
> You're the first person (AFAICT) who has written in response to the
> deprecation notice. My original intention was to remove it from the
> 5.2 release if we got no responses to that notice (that obviously
> hasn't happened).
>
> At this point the soonest release we could remove it from is 5.4
> (which might be around Aug 2017). It's far from scheduled though.
>
> We really don't have much data to base this decision on, so I'll ask
> you instead. Knowing keeping support has an impact on LibreOffice
> development, when do you think is reasonable for ActiveX support to be
> removed?
>
> What Windows version are you running?
>
> Kind regards,
> Bryan
>
> [The whole original thread - quite long]
> https://lists.freedesktop.org/archives/libreoffice/2015-December/071580.html
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Makefile.fetch
Makefile.fetch |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 424897ba348093ab1697c676a3e44b9060c5b2da Author: Bryan Quigley Date: Wed Jan 25 15:13:25 2017 -0500 Stop working around broken IPv6 site This basically reverts 324212ce01c10a8811d25c95d1ae6a83d8214f3d which forced wget to only use IPv4. dev-www.libreoffice.org's IPv6 support was broken for a while. It appears to be back to working. Change-Id: Ib235ddd5719089eaf9d4559bd913571fc46069d1 Reviewed-on: https://gerrit.libreoffice.org/33558 Reviewed-by: jan iversen Tested-by: jan iversen diff --git a/Makefile.fetch b/Makefile.fetch index db62719..a350b2f 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -11,7 +11,7 @@ fetch_LOGFILE := $(TARFILE_LOCATION)/fetch.log ifneq (,$(WGET)) define fetch_Download__wget_command -&& bash -c '$(WGET) --progress=dot:mega -4 -Q 0 -P "." -l 0 -nd -nH -N --no-use-server-timestamps $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ]' +&& bash -c '$(WGET) --progress=dot:mega -Q 0 -P "." -l 0 -nd -nH -N --no-use-server-timestamps $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ]' endef else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
re: Usage of ActiveX in Libre Office
Welcome and thanks for responding to notice! You're the first person (AFAICT) who has written in response to the deprecation notice. My original intention was to remove it from the 5.2 release if we got no responses to that notice (that obviously hasn't happened). At this point the soonest release we could remove it from is 5.4 (which might be around Aug 2017). It's far from scheduled though. We really don't have much data to base this decision on, so I'll ask you instead. Knowing keeping support has an impact on LibreOffice development, when do you think is reasonable for ActiveX support to be removed? What Windows version are you running? Kind regards, Bryan [The whole original thread - quite long] https://lists.freedesktop.org/archives/libreoffice/2015-December/071580.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: compilerplugins/clang sdext/Library_PresenterScreen.mk sdext/source
compilerplugins/clang/store/constantfunction.cxx |4
sdext/Library_PresenterScreen.mk |1
sdext/source/presenter/PresenterPaneBorderManager.cxx | 507 --
sdext/source/presenter/PresenterPaneBorderManager.hxx | 154 -
sdext/source/presenter/PresenterWindowManager.cxx | 68 --
5 files changed, 1 insertion(+), 733 deletions(-)
New commits:
commit 71cf1aefca1ecf10272308d7c75201bd39d3b0f6
Author: Bryan Quigley
Date: Wed May 4 15:04:53 2016 -0400
Remove unneeded Pane code in Presenter Console
This code hasn't been touched (on purpose) in years, it appears
to have been used to resize part of the console. (It's prefed off)
Change-Id: Iaaeaa8a95c71ae91299bbeeea24869bf2a237b6b
Reviewed-on: https://gerrit.libreoffice.org/24663
Tested-by: Jenkins
Reviewed-by: jan iversen
Tested-by: jan iversen
diff --git a/compilerplugins/clang/store/constantfunction.cxx
b/compilerplugins/clang/store/constantfunction.cxx
index 891eb53..b7a0b9d 100644
--- a/compilerplugins/clang/store/constantfunction.cxx
+++ b/compilerplugins/clang/store/constantfunction.cxx
@@ -344,10 +344,6 @@ bool ConstantFunction::VisitFunctionDecl(const
FunctionDecl * pFunctionDecl) {
if (aFunctionName == "sdext::presenter::PresenterFrameworkObserver::True")
{
return true;
}
-// hidden behind the ENABLE_PANE_RESIZING macro
-if (aFunctionName ==
"sdext::presenter::PresenterWindowManager::UpdateWindowList") {
-return true;
-}
// callback, sw/source/core/doc/tblrwcl.cxx
if (aFunctionName == "lcl_DelOtherBox") {
return true;
diff --git a/sdext/Library_PresenterScreen.mk b/sdext/Library_PresenterScreen.mk
index d67158d..7edc2b2 100644
--- a/sdext/Library_PresenterScreen.mk
+++ b/sdext/Library_PresenterScreen.mk
@@ -43,7 +43,6 @@ $(eval $(call
gb_Library_add_exception_objects,PresenterScreen,\
sdext/source/presenter/PresenterPaintManager \
sdext/source/presenter/PresenterPane \
sdext/source/presenter/PresenterPaneBase \
-sdext/source/presenter/PresenterPaneBorderManager \
sdext/source/presenter/PresenterPaneBorderPainter \
sdext/source/presenter/PresenterPaneContainer \
sdext/source/presenter/PresenterPaneFactory \
diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx
b/sdext/source/presenter/PresenterPaneBorderManager.cxx
deleted file mode 100644
index acfba8a..000
--- a/sdext/source/presenter/PresenterPaneBorderManager.cxx
+++ /dev/null
@@ -1,507 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-// The body of this file is only used when PresenterWindowManager defines
-// the preprocessor symbol ENABLE_PANE_RESIZING, which by default is not the
-// case.
-#ifdef ENABLE_PANE_RESIZING
-
-#include "PresenterPaneBorderManager.hxx"
-#include "PresenterController.hxx"
-#include "PresenterPaintManager.hxx"
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-
-namespace sdext { namespace presenter {
-
-//= Service ===
-
-OUString PresenterPaneBorderManager::getImplementationName_static()
-{
-return OUString("com.sun.star.comp.Draw.PresenterPaneBorderManager");
-}
-
-Sequence
PresenterPaneBorderManager::getSupportedServiceNames_static()
-{
-static const OUString sServiceName(
-"com.sun.star.drawing.PresenterPaneBorderManager");
-return Sequence(&sServiceName, 1);
-}
-
-Reference PresenterPaneBorderManager::Create (const
Reference& rxContext)
-{
-return Reference(static_cast(
-new PresenterPaneBorderManager(rxContext, NULL)));
-}
-
-//= PresenterPaneBorderManager
-
-PresenterPaneBorderManager::PresenterPaneBorderManager (
-const Reference& rxContext,
-const ::rtl::Reference& rpPresenterCont
[Libreoffice-commits] core.git: configmgr/qa include/sfx2 officecfg/registry sc/uiconfig sd/uiconfig sfx2/sdi sfx2/source sw/inc sw/source sw/uiconfig
configmgr/qa/unit/data.xcd |8
include/sfx2/sfxsids.hrc |2
include/sfx2/viewsh.hxx |2
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |8
sc/uiconfig/scalc/menubar/menubar.xml|1
sd/uiconfig/sdraw/menubar/menubar.xml|1
sd/uiconfig/simpress/menubar/menubar.xml |1
sfx2/sdi/sfx.sdi | 19 -
sfx2/sdi/viwslots.sdi|5
sfx2/source/view/ipclient.cxx|2
sfx2/source/view/viewimp.hxx |1
sfx2/source/view/viewsh.cxx | 110
--
sw/inc/helpid.h |1
sw/source/uibase/docvw/docvw.hrc |2
sw/source/uibase/docvw/docvw.src |6
sw/source/uibase/docvw/romenu.cxx|6
sw/uiconfig/sglobal/menubar/menubar.xml |1
sw/uiconfig/sweb/menubar/menubar.xml |1
sw/uiconfig/swform/menubar/menubar.xml |1
sw/uiconfig/swreport/menubar/menubar.xml |1
sw/uiconfig/swriter/menubar/menubar.xml |1
sw/uiconfig/swxform/menubar/menubar.xml |1
22 files changed, 10 insertions(+), 171 deletions(-)
New commits:
commit 4b3c211cfb4f64f0f31461aa2e623d64224c4423
Author: Bryan Quigley
Date: Fri Apr 29 15:55:22 2016 -0400
Remove Edit -> Plug-in as no longer used
This functionality seems to only have been used with NPAPI plugins.
They've been previously removed. Per the help text, if it is still
used by anything, you can use the context menu instead.
MN_READONLY_PLUGINOFF also appeared to be unused, so removed.
More code might be removable, but would affect activate on click/visible.
Change-Id: I12d5bf54edd3a2f716912179b87e798b47b3cc3d
Reviewed-on: https://gerrit.libreoffice.org/24500
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd
index 4cc86ab..12eedc2 100644
--- a/configmgr/qa/unit/data.xcd
+++ b/configmgr/qa/unit/data.xcd
@@ -2421,14 +2421,6 @@
1
-
-
- P~lug-in
-
-
- 1
-
-
Horizontal Line
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 2e3743b..c722c51 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -154,7 +154,7 @@
#define SID_BOOKMARK_URL(SID_SFX_START + 1311)
#define SID_EDITDOC (SID_SFX_START + 1312)
#define SID_BROWSER_MODE(SID_SFX_START + 1313)
-#define SID_PLUGINS_ACTIVE (SID_SFX_START + 1314)
+// FREE (was SID_PLUGINS_ACTIVE) (SID_SFX_START + 1314)
#define SID_BROWSER (SID_SFX_START + 1318)
#define SID_MACROEXECMODE (SID_SFX_START + 1319)
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 8abf52c..865f758 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -315,7 +315,7 @@ public:
SAL_DLLPRIVATE void ExecPrint_Impl(SfxRequest &);
SAL_DLLPRIVATE void ExecMisc_Impl(SfxRequest &);
SAL_DLLPRIVATE void GetState_Impl(SfxItemSet&);
-SAL_DLLPRIVATE void CheckIPClient_Impl( SfxInPlaceClient*, const
Rectangle& );
+SAL_DLLPRIVATE void CheckIPClient_Impl( SfxInPlaceClient* );
SAL_DLLPRIVATE void PushSubShells_Impl( bool bPush=true );
SAL_DLLPRIVATE void PopSubShells_Impl() { PushSubShells_Impl( false ); }
SAL_DLLPRIVATE void TakeOwnership_Impl();
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 52fc8f1..8e28bf8 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2634,14 +2634,6 @@
1
-
-
- Plug-in
-
-
- 1
-
-
Horizontal Line
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml
b/sc/uiconfig/scalc/menubar/menubar.xml
index 44b5272..39fabaa 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/me
[Libreoffice-commits] core.git: sysui/desktop
sysui/desktop/apparmor/program.oosplash|9 ---
sysui/desktop/apparmor/program.senddoc |4 +--
sysui/desktop/apparmor/program.soffice.bin | 11 +
sysui/desktop/apparmor/program.xpdfimport |2 -
sysui/desktop/share/apparmor.sh| 33 +++--
5 files changed, 32 insertions(+), 27 deletions(-)
New commits:
commit 577fbba417454da8cd461da71fee8b97896d2497
Author: Bryan Quigley
Date: Tue Apr 12 15:08:51 2016 -0400
tdf#99251 Update AppArmor Profiles
Make them less resrictive when executing other exes
This lets the splash screen work again.
Modify AppArmor.sh to be more useful.
Change-Id: Icf06910c845d9389b9b75c1623037e1d07489728
Reviewed-on: https://gerrit.libreoffice.org/24043
Tested-by: Jenkins
Reviewed-by: Björn Michaelsen
diff --git a/sysui/desktop/apparmor/program.oosplash
b/sysui/desktop/apparmor/program.oosplash
index 99ba58e..fef54b7 100644
--- a/sysui/desktop/apparmor/program.oosplash
+++ b/sysui/desktop/apparmor/program.oosplash
@@ -1,6 +1,6 @@
# --
#
-#Copyright (C) 2015 Canonical Ltd.
+#Copyright (C) 2016 Canonical Ltd.
#
#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
@@ -20,10 +20,11 @@ profile libreoffice-oopslash INSTDIR-program/oosplash {
/etc/passwd r,
/etc/nsswitch.confr,
/run/nscd/passwd r,
- /usr/lib{,32,64}/ure/bin/javaldx Cx,
+ /usr/lib{,32,64}/ure/bin/javaldx rmpux,
/usr/share/libreoffice/program/* r,
- INSTDIR-program/soffice.bin rmPUx,
- INSTDIR-program/javaldx rmPUx,
+ INSTDIR-program/** r,
+ INSTDIR-program/soffice.bin rmpx,
+ INSTDIR-program/javaldx rmpux,
owner @{HOME}/.Xauthority r,
owner @{HOME}/.config/libreoffice{,dev}/?/user/uno_packages/cache/log.txt rw,
unix peer=(addr=@/tmp/.ICE-unix/* label=unconfined),
diff --git a/sysui/desktop/apparmor/program.senddoc
b/sysui/desktop/apparmor/program.senddoc
index f258114..42c2740 100644
--- a/sysui/desktop/apparmor/program.senddoc
+++ b/sysui/desktop/apparmor/program.senddoc
@@ -1,6 +1,6 @@
# --
#
-#Copyright (C) 2015 Canonical Ltd.
+#Copyright (C) 2016 Canonical Ltd.
#
#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
@@ -27,7 +27,7 @@ profile libreoffice-senddoc
INSTDIR-/usr/lib{,32,64}/libreoffice/program/senddoc
/bin/unamermix,
/usr/bin/xdg-open Cxr -> sanitized_helper,
/dev/null rw,
- INSTDIR-program/uri-encode rmPUx,
+ INSTDIR-program/uri-encode rmpux,
/usr/share/libreoffice/share/config/* r,
owner @{HOME}/.config/libreoffice{,dev}/?/user/uno_packages/cache/log.txt rw,
}
diff --git a/sysui/desktop/apparmor/program.soffice.bin
b/sysui/desktop/apparmor/program.soffice.bin
index e62216c..285b499 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -1,6 +1,6 @@
# --
#
-#Copyright (C) 2015 Canonical Ltd.
+#Copyright (C) 2016 Canonical Ltd.
#
#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
@@ -33,7 +33,7 @@
@{libreoffice_ext} += [jJ][pP][eE][gG]
@{libreoffice_ext} += [pP][nN][gG]
@{libreoffice_ext} += [sS][vV][gG]
-@{libreoffice_ext} += [sS][vV][gG][zZ]
+@{libreoffice_ext} += [sS][vV][gG][zZ]99251
@{libreoffice_ext} += [tT][iI][fF]
@{libreoffice_ext} += [tT][iI][fF][fF]
@@ -50,7 +50,7 @@
#Impress/Draw
@{libreoffice_ext} += [pP][pP][tTsS]{,x,X}
@{libreoffice_ext} += [pP][oO][tT]{,m,M}
-@{libreoffice_ext} += [sS][wW][fF]
+@{libreoffice_ext} += [sS][wW][fF] #Flash
@{libreoffice_ext} += [pP][sS][dD] #Photoshop
#Math
@@ -122,10 +122,11 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
/usr/lib{,32,64}/jvm/** r,
INSTDIR-**ra,
INSTDIR-**.so rm,
+ INSTDIR-share/uno_packages/cache/* rw,
INSTDIR-program/soffice.bin rmix,
- INSTDIR-program/xpdfimportrPx,
+ INSTDIR-program/xpdfimportrpx,
/usr/bin/xdg-open rPUx,
- INSTDIR-program/senddoc rPx,
+ INSTDIR-program/senddoc rpx,
/usr/share/java/**.jarr,
/usr/share/hunspell/ r,
diff --git a/sysui/desktop/apparmor/program.xpdfimport
b/sysui/desktop/apparmor/program.xpdfimport
index a83827f..ba0e1d2 100644
--- a/sysui/desktop/apparmor/program.xpdfimport
+++ b/sysui/desktop/apparmor/program.xpdfimport
@@ -1,6 +
[Libreoffice-commits] core.git: shell/Package_scripts_kde.mk shell/Package_scripts.mk shell/Package_scripts_tde.mk shell/source sysui/desktop
shell/Package_scripts.mk |2
shell/Package_scripts_kde.mk |4 -
shell/Package_scripts_tde.mk |4 -
shell/source/unix/exec/shellexec.cxx | 47 --
shell/source/unix/misc/kde4-open-url.sh| 21 --
shell/source/unix/misc/open-url.sh | 96 -
shell/source/unix/misc/tde-open-url.sh | 25 ---
sysui/desktop/apparmor/program.open-url| 30 -
sysui/desktop/apparmor/program.soffice.bin |2
9 files changed, 3 insertions(+), 228 deletions(-)
New commits:
commit cafd3adcbaa6714dc3674788401cf0f58fbbcb5e
Author: Bryan Quigley
Date: Wed Jan 6 15:11:09 2016 -0500
Just use xdg-open
Remove kde4/tde/open-url.sh and have LO just use xdg-open.
It's available on TDE builds as well as any recent KDE. We recently
did this just for gnome-open-url and have had no reported issues.
Change-Id: I4e1ee6caef368051af92023fa382b6fed9d9397e
Reviewed-on: https://gerrit.libreoffice.org/21173
Tested-by: Jenkins
Reviewed-by: Michael Stahl
Reviewed-by: Jan-Marek Glogowski
diff --git a/shell/Package_scripts.mk b/shell/Package_scripts.mk
index 1b310ca..6962fe5 100644
--- a/shell/Package_scripts.mk
+++ b/shell/Package_scripts.mk
@@ -9,6 +9,4 @@
$(eval $(call
gb_Package_Package,shell_scripts,$(SRCDIR)/shell/source/unix/misc))
-$(eval $(call
gb_Package_add_file,shell_scripts,$(LIBO_BIN_FOLDER)/open-url,open-url.sh))
-
# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/Package_scripts_kde.mk b/shell/Package_scripts_kde.mk
index b9168d6..4dc1cf5 100644
--- a/shell/Package_scripts_kde.mk
+++ b/shell/Package_scripts_kde.mk
@@ -9,8 +9,4 @@
$(eval $(call
gb_Package_Package,shell_scripts_kde,$(SRCDIR)/shell/source/unix/misc))
-ifeq ($(ENABLE_KDE4),TRUE)
-$(eval $(call
gb_Package_add_file,shell_scripts_kde,$(LIBO_BIN_FOLDER)/kde4-open-url,kde4-open-url.sh))
-endif
-
# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/Package_scripts_tde.mk b/shell/Package_scripts_tde.mk
index 0df..d73d824 100644
--- a/shell/Package_scripts_tde.mk
+++ b/shell/Package_scripts_tde.mk
@@ -9,8 +9,4 @@
$(eval $(call
gb_Package_Package,shell_scripts_tde,$(SRCDIR)/shell/source/unix/misc))
-ifeq ($(ENABLE_TDE),TRUE)
-$(eval $(call
gb_Package_add_file,shell_scripts_tde,$(LIBO_BIN_FOLDER)/tde-open-url,tde-open-url.sh))
-endif
-
# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/source/unix/exec/shellexec.cxx
b/shell/source/unix/exec/shellexec.cxx
index 7dadfd2..89481bf 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -153,52 +153,9 @@ void SAL_CALL ShellExec::execute( const OUString&
aCommand, const OUString& aPar
// the CWD) on stderr and SystemShellExecuteException.
aBuffer.append("open --");
#else
-// The url launchers are expected to be in the
$BRAND_BASE_DIR/LIBO_LIBEXEC_FOLDER
-// directory:
-css::uno::Reference< css::util::XMacroExpander > exp =
css::util::theMacroExpander::get(m_xContext);
-OUString aProgramURL;
-try {
-aProgramURL = exp->expandMacros( "$BRAND_BASE_DIR/"
LIBO_LIBEXEC_FOLDER "/");
-} catch (css::lang::IllegalArgumentException &)
-{
-throw SystemShellExecuteException(
-"Could not expand $BRAND_BASE_DIR path",
-static_cast < XSystemShellExecute * > (this), ENOENT );
-}
-
-OUString aProgram;
-if ( FileBase::E_None !=
FileBase::getSystemPathFromFileURL(aProgramURL, aProgram))
-{
-throw SystemShellExecuteException(
-"Cound not convert executable path",
-static_cast < XSystemShellExecute * > (this), ENOENT );
-}
-
-OString aTmp = OUStringToOString(aProgram,
osl_getThreadTextEncoding());
-escapeForShell(aBuffer, aTmp);
-
-#ifdef SOLARIS
-if ( m_aDesktopEnvironment.getLength() == 0 )
- m_aDesktopEnvironment = OString("GNOME");
-#endif
-
-// Respect the desktop environment - if there is an executable named
-// -open-url, pass the url to this one instead
-// of the default "open-url" script.
-if ( !m_aDesktopEnvironment.isEmpty() )
-{
-OString
aDesktopEnvironment(m_aDesktopEnvironment.toAsciiLowerCase());
-OStringBuffer aCopy(aTmp);
-
-aCopy.append(aDesktopEnvironment + "-open-url");
-
-if ( 0 == access( aCopy.getStr(), X_OK) )
-{
-aBuffer.append(aDesktopEnvironment + "-");
-}
-}
+// Just use xdg-open on non-Mac
-aBuffer.append("open-url");
+aBuffer.append("/usr/bin/xdg-open");
#endif
Re: Old/Obsolete file format import still needed?
>However if the filter is broken, lack significant features or otherwise call >for support, that makes it a candidate for removal. I'll try to find some more in the wild instances of these formats and determine just how bad the support is. OS/2 Metafile was the worst in my previous testing so I'll look there first. > As JanI says, cf. the ESC minutes - being the swiss-army-knife of file > formats that loads ~anything you can throw at it is quite important. Understood. Sorry I missed those ESC minutes. > Anyhow - I share your concern wrt. the attack surface that all these > old file filters provide for us; I attach a prototype patch that adds an > 'EXOTIC' annotation to our filter descriptions. It is missing a UI > Interaction Handler piece (cf. the hole with the notes and so on in > there ;-) - we'll need a new request type I guess. > > My ideal would be to pop up a dialog saying: > > "You're asking LibreOffice to open a very unusual file-type. > Unless you are certain that this file is indeed a Word Pro> file it is safest to not open it. > > [ ] - never show this again > > [ this is an unusual file ] [get me out of here ]" > > Of some kind =) is that something you'd be interested in working on ? Thanks for the first pass code. I generally don't find dialouges like that to be super useful (many users just click right through). However, in labeling them Exotic we could add a configuration option to let system administrators disable them all in one go for a secure site, etc. I'll look into that more. Thanks again both, Bryan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Old/Obsolete file format import still needed?
Hi all, While working on the easyhack[1] to remove export of obsolete formats I came across a few that I think we might want to drop import support from as well. I cam across them again recently looking at another cleanup bug[2]. They are: Mac Pict (obsolete since Mac OS X) https://en.wikipedia.org/wiki/PICT PBM,PGM,PPM From their website (below) there might be some users who still like using this file format. But given the likely user I'm guessing they will all just manually use ppmtojpeg to make it a jpeg before importing into LibreOffice. https://en.wikipedia.org/wiki/Netpbm_format http://netpbm.sourceforge.net/doc/#formats OS/2 Metafile (.MET) Known bug - With MET files you can not export them as an image (a different filetype) using "Save as image". You can still export a new image by saving the whole document. In most cases I would expect a dedicated image program to be able to do a better job with the above. I was hoping to get some usage statistics about these formats, but haven't found any (suggestions welcome). There also might be a security benefit by not having to consider these formats (less import code to harden). Thoughts? Bryan [1] https://bugs.documentfoundation.org/show_bug.cgi?id=92925 [2] https://bugs.documentfoundation.org/show_bug.cgi?id=38844 P.S. Please copy me on replies. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/inc sd/sdi sd/source
sd/inc/app.hrc |1
sd/inc/helpids.h |1
sd/sdi/drviewsh.sdi|5 ---
sd/sdi/sdraw.sdi | 20
sd/source/ui/dlg/navigatr.cxx | 64 -
sd/source/ui/dlg/navigatr.src | 12 ---
sd/source/ui/inc/navigatr.hrc |1
sd/source/ui/inc/navigatr.hxx |4 --
sd/source/ui/view/drviewsd.cxx |3 -
9 files changed, 14 insertions(+), 97 deletions(-)
New commits:
commit e69c4f978228fb443cf0f6d2a6679cb5a4c82940
Author: Bryan Quigley
Date: Wed Feb 3 15:02:43 2016 -0500
Remove pointer (pen) from Navigator window
It doesn't appear to have worked since LibreOffice 5.0,
and the best use case (to use it during a live slideshow)
has been removed per bug 96414.
Change-Id: I25dbaa0b9ab86a2a7324b9c496473bf29a5f6ac2
Reviewed-on: https://gerrit.libreoffice.org/22087
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 928a19f..0c05093 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -325,7 +325,6 @@
#define SID_NAVIGATOR_STATE (SID_SD_START+288)
#define SID_NAVIGATOR_INIT (SID_SD_START+289)
// FREE
-#define SID_NAVIGATOR_PEN (SID_SD_START+291)
#define SID_NAVIGATOR_PAGE (SID_SD_START+292)
#define SID_NAVIGATOR_OBJECT(SID_SD_START+293)
#define SID_ANIMATOR_INIT (SID_SD_START+294)
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index c24b662..fdc48b2 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -28,7 +28,6 @@
#define HID_SD_NAVIGATOR
"SD_HID_SD_NAVIGATOR"
#define HID_SD_NAVIGATOR_TBX
"SD_HID_SD_NAVIGATOR_TBX"
#define HID_SD_NAVIGATOR_LB
"SD_HID_SD_NAVIGATOR_LB"
-#define HID_SD_NAVIGATOR_TBI_PEN
"SD_HID_SD_NAVIGATOR_TBI_PEN"
#define HID_SD_NAVIGATOR_TBI_FIRST
"SD_HID_SD_NAVIGATOR_TBI_FIRST"
#define HID_SD_NAVIGATOR_TBI_PREV
"SD_HID_SD_NAVIGATOR_TBI_PREV"
#define HID_SD_NAVIGATOR_TBI_NEXT
"SD_HID_SD_NAVIGATOR_TBI_NEXT"
diff --git a/sd/sdi/drviewsh.sdi b/sd/sdi/drviewsh.sdi
index b97d2b3..228467b 100644
--- a/sd/sdi/drviewsh.sdi
+++ b/sd/sdi/drviewsh.sdi
@@ -106,11 +106,6 @@ interface ImpressEditView : DrawView
ExecMethod = ExecAnimationWin ;
StateMethod = GetAnimationWinState ;
]
-SID_NAVIGATOR_PEN // ole : no, status : ?
-[
-ExecMethod = ExecNavigatorWin ;
-StateMethod = GetNavigatorWinState ;
-]
SID_PRESENTATION_DLG
[
ExecMethod = FuTemporary ;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index ab32aa7..48fcbd1 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -3418,26 +3418,6 @@ SfxStringItem NavigatorPageName SID_NAVIGATOR_PAGENAME
GroupId = GID_EDIT;
]
-SfxBoolItem NavigatorPen SID_NAVIGATOR_PEN
-
-[
-/* flags: */
-AutoUpdate = FALSE,
-FastCall = FALSE,
-ReadOnlyDoc = TRUE,
-Toggle = FALSE,
-Container = FALSE,
-RecordAbsolute = FALSE,
-RecordPerSet;
-
-Readonly = FALSE,
-
-/* config: */
-AccelConfig = FALSE,
-MenuConfig = FALSE,
-ToolBoxConfig = FALSE,
-GroupId = GID_EDIT;
-]
SfxUInt32Item NavigatorState SID_NAVIGATOR_STATE
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 32098f7..bbee98c 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -266,49 +266,22 @@ sd::DrawDocShell* SdNavigatorWin::GetDrawDocShell( const
SdDrawDocument* pDoc )
IMPL_LINK_NOARG_TYPED(SdNavigatorWin, SelectToolboxHdl, ToolBox *, void)
{
sal_uInt16 nId = maToolbox->GetCurItemId();
-sal_uInt16 nSId = 0;
PageJump ePage = PAGE_NONE;
-switch( nId )
-{
-case TBI_PEN:
-{
-if( nId == TBI_PEN )
-{
-nSId = SID_NAVIGATOR_PEN;
-}
+if( nId == TBI_FIRST )
+ePage = PAGE_FIRST;
+else if( nId == TBI_PREVIOUS )
+ePage = PAGE_PREVIOUS;
+else if( nId == TBI_NEXT )
+ePage = PAGE_NEXT;
+else if( nId == TBI_LAST )
+ePage = PAGE_LAST;
-if( nSId > 0 )
-{
-SfxBoolItem aItem( nSId, true );
-mpBindings->GetDispatcher()->Execute(
-nSId, SfxCallMode::SLOT |SfxCallMode::RECORD, &aItem, 0L );
-}
-}
-break;
-
-case TBI_FIRST:
-case TBI_PREVIOUS:
-case TBI_NEXT:
-case TBI_LAST:
-{
-if( nId == TBI_FIRST )
-ePage = PAGE_FIRST;
-else if( nId == TBI_PREVIOUS )
-
[Libreoffice-commits] core.git: sd/inc sd/source sd/uiconfig
sd/inc/drawdoc.hxx|1
sd/source/core/drawdoc.cxx|6 -
sd/source/ui/dlg/present.cxx |4 -
sd/source/ui/func/fusldlg.cxx |8 --
sd/source/ui/slideshow/slideshow.cxx | 25 ---
sd/source/ui/slideshow/slideshowimpl.cxx | 85 --
sd/source/ui/view/drviewsd.cxx| 41 ++--
sd/uiconfig/simpress/ui/presentationdialog.ui | 15
8 files changed, 10 insertions(+), 175 deletions(-)
New commits:
commit 2503a1e99df463aef1bf87c94b7b4a8ee3554efe
Author: Bryan Quigley
Date: Wed Jan 27 12:19:28 2016 -0500
tdf#96414 Remove showing navigator during slideshow
This isn't very user-friendly and the presenter console
does a much better job of this.
Change-Id: I621863b585d763fb65ed8637c3dab7b7f5ea7aed
Reviewed-on: https://gerrit.libreoffice.org/22062
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 9208e6c..f3a599a 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -126,7 +126,6 @@ namespace sd
bool mbAnimationAllowed;
sal_Int32 mnPauseTimeout;
bool mbShowPauseLogo;
-bool mbStartWithNavigator;
PresentationSettings();
PresentationSettings( const PresentationSettings& r );
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 6702e9d..62235b5 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -126,8 +126,7 @@ PresentationSettings::PresentationSettings()
mbFullScreen( true ),
mbAnimationAllowed( true ),
mnPauseTimeout( 10 ),
-mbShowPauseLogo( false ),
-mbStartWithNavigator(false)
+mbShowPauseLogo( false )
{
}
@@ -144,8 +143,7 @@ PresentationSettings::PresentationSettings( const
PresentationSettings& r )
mbFullScreen( r.mbFullScreen ),
mbAnimationAllowed( r.mbAnimationAllowed ),
mnPauseTimeout( r.mnPauseTimeout ),
-mbShowPauseLogo( r.mbShowPauseLogo ),
-mbStartWithNavigator( r.mbStartWithNavigator )
+mbShowPauseLogo( r.mbShowPauseLogo )
{
}
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index 3fe2206..14ee529 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -58,7 +58,6 @@ SdStartPresentationDlg::SdStartPresentationDlg( vcl::Window*
pWindow,
get( aCbxManuel,"manualslides" );
get( aCbxMousepointer, "pointervisible");
get( aCbxPen, "pointeraspen" );
-get( aCbxNavigator, "navigatorvisible" );
get( aCbxAnimationAllowed, "animationsallowed" );
get( aCbxChangePage,"changeslidesbyclick" );
get( aCbxAlwaysOnTop, "alwaysontop" );
@@ -118,7 +117,6 @@ SdStartPresentationDlg::SdStartPresentationDlg(
vcl::Window* pWindow,
aCbxManuel->Check( static_cast( rOutAttrs.Get(
ATTR_PRESENT_MANUEL ) ).GetValue() );
aCbxMousepointer->Check( static_cast( rOutAttrs.Get(
ATTR_PRESENT_MOUSE ) ).GetValue() );
aCbxPen->Check( static_cast( rOutAttrs.Get(
ATTR_PRESENT_PEN ) ).GetValue() );
-aCbxNavigator->Check( static_cast( rOutAttrs.Get(
ATTR_PRESENT_NAVIGATOR ) ).GetValue() );
aCbxAnimationAllowed->Check( static_cast(
rOutAttrs.Get( ATTR_PRESENT_ANIMATION_ALLOWED ) ).GetValue() );
aCbxChangePage->Check( static_cast( rOutAttrs.Get(
ATTR_PRESENT_CHANGE_PAGE ) ).GetValue() );
aCbxAlwaysOnTop->Check( static_cast( rOutAttrs.Get(
ATTR_PRESENT_ALWAYS_ON_TOP ) ).GetValue() );
@@ -170,7 +168,6 @@ void SdStartPresentationDlg::dispose()
aCbxManuel.clear();
aCbxMousepointer.clear();
aCbxPen.clear();
-aCbxNavigator.clear();
aCbxAnimationAllowed.clear();
aCbxChangePage.clear();
aCbxAlwaysOnTop.clear();
@@ -301,7 +298,6 @@ void SdStartPresentationDlg::GetAttr( SfxItemSet& rAttr )
rAttr.Put( SfxBoolItem ( ATTR_PRESENT_MANUEL, aCbxManuel->IsChecked() ) );
rAttr.Put( SfxBoolItem ( ATTR_PRESENT_MOUSE, aCbxMousepointer->IsChecked()
) );
rAttr.Put( SfxBoolItem ( ATTR_PRESENT_PEN, aCbxPen->IsChecked() ) );
-rAttr.Put( SfxBoolItem ( ATTR_PRESENT_NAVIGATOR,
aCbxNavigator->IsChecked() ) );
rAttr.Put( SfxBoolItem ( ATTR_PRESENT_ANIMATION_ALLOWED,
aCbxAnimationAllowed->IsChecked() ) );
rAttr.Put( SfxBoolItem ( ATTR_PRESENT_CHANGE_PAGE,
aCbxChangePage->IsChecked() ) );
rAttr.Put( SfxBoolItem ( ATTR_PRESENT_ALWAYS_ON_TOP,
aCbxAlwaysOnTop->IsChecked() ) );
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index f3c2f09..8cf501b 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -97,7 +97,6 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
[Libreoffice-commits] core.git: scp2/source
scp2/source/activex/module_activex.ulf |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 09ffa9515ed7baa7e91d591fa24bf112c7c74b1c Author: Bryan Quigley Date: Mon Jan 18 00:14:13 2016 -0500 Show that ActiveX support is deprecated This just adds deprecated before activex support and mentions to the user to check the release notes for more details. Change-Id: I4bb7d577fb8f9e2618691e5418b1ddc4a4330ae2 Reviewed-on: https://gerrit.libreoffice.org/21563 Tested-by: Jenkins Tested-by: jan iversen Reviewed-by: jan iversen diff --git a/scp2/source/activex/module_activex.ulf b/scp2/source/activex/module_activex.ulf index 9bc08c6..eb8a045 100644 --- a/scp2/source/activex/module_activex.ulf +++ b/scp2/source/activex/module_activex.ulf @@ -20,7 +20,7 @@ en-US = "ActiveX Control" [STR_DESC_MODULE_OPTIONAL_ACTIVEXCONTROL] -en-US = "Component to enable Microsoft Internet Explorer to display %PRODUCTNAME documents." +en-US = "Deprecated Component (see release notes) to enable Microsoft Internet Explorer to display %PRODUCTNAME documents." ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Deprecation (was Re: Remove ActiveX from LibreOffice)
Hi Jim, I'm not convinced that anyone is actually using the ActiveX functionality to embed other applications into LibreOffice, AFAICT no one has mentioned it actually currently working. Nor has anyone said they want to work on it. Having said that I will go ahead with marking it deprecated but *not* specifying a time to remove it. This way we give people possibly more notice but also enable some future developer to remove the support. In a way, we table the decision on timing until we have more data. I'm also going to see about modifying the Windows installer to warn in some way about ActiveX support. Kind regards, Bryan On Wed, Jan 13, 2016 at 1:36 AM, James E Lang wrote: > But Bryan, Rick is pointing out that ActiveX usage is not limited to > browsers only. If its usage is deprecated then I assume there is a > functionally equivalent alternative but the *effective* life cycle of > applications that use ActiveX is almost certain to stretch past the start of > LO 6. > > I would define effective life cycle of an application as being AT LEAST two > half lives of the application beyond the first release of the application > that replaces the final LEGITIMATE release with an 18 month minimum (36 > months if there is no subsequent application update release). > > All support for Windows XP has been discontinued by Microsoft yet many > computers still use it. Requiring a Windows XP upgrade to support EXISTING > functionality in LO is quite possibly premature even now. > > Depreciation means to me that products should cease requiring use of > something in ongoing development cycles but that for its effective life > cycle its use WRT previously developed programs will not be abridged. > > I'm told that ActiveX has been a security nightmare since it was first > released. That's probably a better reason to not support it than citing its > depreciation status. > > I realize that on volunteer projects such as LO such standards are a bit of > a burden but they warrant at least a nodding recognition. > > -- > Jim > > -Original Message- > From: Bryan Quigley > To: "Rick C. Hodgin" > Cc: Chris Sherlock , Ashod Nakashian > , libreoffice > Sent: Tue, 12 Jan 2016 20:27 > Subject: Re: Remove ActiveX from LibreOffice > > Hi Rick, > > ActiveX is deprecated by Microsoft and will be less useful (or not at > all) on newer MS browsers. I'm unsure if it ever worked (or was > supposed to) let you embed ActiveX controls into LibreOffice itself. > > Kind regards, > Bryan > > On Mon, Jan 11, 2016 at 10:08 PM, Rick C. Hodgin > wrote: >> Why are you removing ActiveX from LibreOffice? Excel supports it, and it >> is >> desirable for integration with Windows apps like C#, Visual Basic, Visual >> FoxPro. It allows those other apps to integrate the app directly into >> their >> app. >> >> I have tried to use it previously, but could not find documentation for >> it. >> If it's an unused feature, I'd suggest that's why than for other reasons. >> >> Best regards, >> Rick C. Hodgin >> >> >> >> >> Original Message >> From: Chris Sherlock >> Sent: Mon, 11/01/2016 08:21 PM >> To: Ashod Nakashian >> CC: libreoffice ; Bryan Quigley >> Subject: Re: Remove ActiveX from LibreOffice >> >> That sounds pretty reasonable to me. >> >> Out of interest, just how “integrated” is this with the code? If someone >> wanted to create an external project on GitHub or some place like this, >> would it be feasible? >> >> I guess I’m trying to understand how much of core it touches… to >> reimplement >> an ActiveX control outside of the main tree, would a developer need to >> fork >> LibreOffice entirely, or could they maintain their codebranch entirely >> seperately and update the control if necessary after we do our changes to >> the main codebase? >> >> I’m definitely for removing all vestiges of ActiveX from LO, but the more >> I >> think about it the more I can see that some corporation somewhere might be >> affected, far more so than the remove of NPAPI… giving them the option of >> a >> control that can be maintained outside of the main project would be nice >> :-) >> >> Chris >> >> On 12 Jan 2016, at 9:37 AM, Ashod Nakashian wrote: >> >> >> >> On Mon, Jan 11, 2016 at 2:32 PM, Bryan Quigley wrote: >>> >>> >>> Anywhere else we should post this? >>> >> >> Ideally the note would show up unintrusively upon loading/using the >> ActiveX >> itself. Unfortunately we
[Libreoffice-commits] core.git: filter/Configuration_filter.mk filter/Library_gie.mk filter/source svtools/source vcl/source
filter/Configuration_filter.mk |3 filter/Library_gie.mk|1 filter/source/config/fragments/filters/draw_met_Export.xcu | 30 filter/source/config/fragments/filters/impress_met_Export.xcu| 30 filter/source/config/fragments/internalgraphicfilters/met_Export.xcu | 27 filter/source/graphicfilter/eos2met/eos2met.cxx | 2586 -- svtools/source/filter/exportdialog.cxx |3 vcl/source/filter/FilterConfigCache.cxx |1 vcl/source/filter/graphicfilter.cxx |5 9 files changed, 2686 deletions(-) New commits: commit a0537ec8038562152b07d11d51833c9488428f19 Author: Bryan Quigley Date: Thu Dec 10 10:14:10 2015 -0500 tdf#92925 Remove MET (OS/2) export MET Files were used with OS/2 and are not used anymore. I did test import which this patch did not remove. However, with MET files you can not export them as an image using "Save as image" (this patch didn't cause or fix that). You can still use the export of the whole document to convert the MET file. Change-Id: Ie818ef963db14166be354379d4b2991a3b72b645 Reviewed-on: https://gerrit.libreoffice.org/20622 Tested-by: Jenkins Reviewed-by: Chris Sherlock diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index b46d39f..579dc80 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -717,7 +717,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_drawgraphics_f draw_gif_Export \ draw_html_Export \ draw_jpg_Export \ - draw_met_Export \ draw_png_Export \ draw_svg_Export \ draw_tif_Export \ @@ -757,7 +756,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_impressgraphic impress_gif_Export \ impress_html_Export \ impress_jpg_Export \ - impress_met_Export \ impress_png_Export \ impress_svg_Export \ impress_tif_Export \ @@ -828,7 +826,6 @@ $(eval $(call filter_Configuration_add_internal_filters,fcfg_langpack,fcfg_inter gif_Import \ jpg_Export \ jpg_Import \ - met_Export \ met_Import \ pbm_Import \ pcd_Import_Base \ diff --git a/filter/Library_gie.mk b/filter/Library_gie.mk index e72efd6..d39504b2 100644 --- a/filter/Library_gie.mk +++ b/filter/Library_gie.mk @@ -40,7 +40,6 @@ $(eval $(call gb_Library_use_libraries,gie,\ $(eval $(call gb_Library_add_exception_objects,gie,\ filter/source/graphicfilter/egif/egif \ filter/source/graphicfilter/etiff/etiff \ - filter/source/graphicfilter/eos2met/eos2met \ filter/source/graphicfilter/eps/eps \ filter/source/graphicfilter/egif/giflzwc \ filter/source/graphicfilter/itiff/ccidecom \ diff --git a/filter/source/config/fragments/filters/draw_met_Export.xcu b/filter/source/config/fragments/filters/draw_met_Export.xcu deleted file mode 100644 index fd72ca0..000 --- a/filter/source/config/fragments/filters/draw_met_Export.xcu +++ /dev/null @@ -1,30 +0,0 @@ - - -EXPORT ALIEN SUPPORTSSELECTION -com.sun.star.svtools.SvFilterOptionsDialog - - - -MET - OS/2 Metafile - -0 -met_OS2_Metafile - -com.sun.star.drawing.DrawingDocument - diff --git a/filter/source/config/fragments/filters/impress_met_Export.xcu b/filter/source/config/fragments/filters/impress_met_Export.xcu deleted file mode 100644 index 7bda339..000 --- a/filter/source/config/fragments/filters/impress_met_Export.xcu +++ /dev/null @@ -1,30 +0,0 @@ - - -EXPORT ALIEN SUPPORTSSELECTION -com.sun.star.svtools.SvFilterOptionsDialog - - - -MET - OS/2 Metafile - -0 -met_OS2_Metafile - -com.sun.star.presentation.PresentationDocument - diff --git a/filter/source/config/fragments/internalgraphicfilters/met_Export.xcu b/filter/source/config/fragments/internalgraphicfilters/met_Export.xcu deleted file mode 100644 index abc5cb6..000 --- a/filter/source/config/fragments/internalgraphicfilters/met_Export.xcu +++ /dev/null @@ -1,27 +0,0 @@ - - -met_OS2_Metafile -eme - -com.sun.star.svtools.SvFilterOptionsDialog - -MET - OS/2 Metafile - -EXPORT - diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx deleted file mode 100644 index b0c44d0..000 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ /dev/null @@ -1,2586 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of
Re: Remove ActiveX from LibreOffice
Hi Rick, ActiveX is deprecated by Microsoft and will be less useful (or not at all) on newer MS browsers. I'm unsure if it ever worked (or was supposed to) let you embed ActiveX controls into LibreOffice itself. Kind regards, Bryan On Mon, Jan 11, 2016 at 10:08 PM, Rick C. Hodgin wrote: > Why are you removing ActiveX from LibreOffice? Excel supports it, and it is > desirable for integration with Windows apps like C#, Visual Basic, Visual > FoxPro. It allows those other apps to integrate the app directly into their > app. > > I have tried to use it previously, but could not find documentation for it. > If it's an unused feature, I'd suggest that's why than for other reasons. > > Best regards, > Rick C. Hodgin > > > > > Original Message > From: Chris Sherlock > Sent: Mon, 11/01/2016 08:21 PM > To: Ashod Nakashian > CC: libreoffice ; Bryan Quigley > Subject: Re: Remove ActiveX from LibreOffice > > That sounds pretty reasonable to me. > > Out of interest, just how “integrated” is this with the code? If someone > wanted to create an external project on GitHub or some place like this, > would it be feasible? > > I guess I’m trying to understand how much of core it touches… to reimplement > an ActiveX control outside of the main tree, would a developer need to fork > LibreOffice entirely, or could they maintain their codebranch entirely > seperately and update the control if necessary after we do our changes to > the main codebase? > > I’m definitely for removing all vestiges of ActiveX from LO, but the more I > think about it the more I can see that some corporation somewhere might be > affected, far more so than the remove of NPAPI… giving them the option of a > control that can be maintained outside of the main project would be nice :-) > > Chris > > On 12 Jan 2016, at 9:37 AM, Ashod Nakashian wrote: > > > > On Mon, Jan 11, 2016 at 2:32 PM, Bryan Quigley wrote: >> >> >> Anywhere else we should post this? >> > > Ideally the note would show up unintrusively upon loading/using the ActiveX > itself. Unfortunately we can't show a message box or some such UI, in case > the ActiveX is used non-interactively (in which case it'd block forever, > becoming unusable). > > So the next best thing to do is include the note in the installation, which > should be hard to miss if made prominent (unless automated in silent mode). > > This would get the attention of possibly the users, if not the developers > (who might not even test out new versions as they come out, and expect > things to work as before). Users can contact developers, I expect, or at > least plan accordingly. Regardless, all we want is to give advance warning > before the day someone installs a newer version and be met with the surprise > of missing ActiveX altogether. > > The installation and release notes seem to be the most reasonable places, if > not upon using the ActiveX itself. Unless others have better ideas. > > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Remove ActiveX from LibreOffice
I propose we add it to the 5.1 release notes (and 5.2 notes too) as: Intent to Remove ActiveX support in the 5.2 release. If this change negatively affects your Windows application please email the LibreOffice development list with your use case and plan for moving off of ActiveX. We specifically only want feedback if use ActiveX to embed LibreOffice components into your application. If no response, one week after 5.1.2 (Apr 10) is released let's make the call to remove it (and update the release notes). If we do get responses we can obviously decide to change the plan as needed. Anywhere else we should post this? Thoughts? Bryan [1] https://wiki.documentfoundation.org/ReleaseNotes/5.1#Feature_removal_.2F_deprecation [2] https://wiki.documentfoundation.org/ReleaseNotes/5.2 On Sun, Jan 10, 2016 at 11:54 PM, Chris Sherlock wrote: > >> On 11 Jan 2016, at 10:41 AM, Bryan Quigley wrote: >> >> To look at this issue from another POV.. If someone showed up today >> with an issue with a LO ActiveX control embedded in their application >> that didn't work - what would our response be? It's an outdated >> technology that we're not investing in. >> > > It probably shows a lack of adoption, but it doesn’t look like anyone > actually has reported issues with it... > >>> My position on ActiveX is to leave it (lest we break applications in the >>> wild,) and to *announce its deprecation* with two goals: first, solicit the >>> feedback of LO ActiveX consumers and, if so inclined to continue using it, >>> help in its support. And second, to flag a date in the future when ActiveX >>> will be completely removed from LO codebase, pending sufficient reason and >>> support by its consumers. >> >> I'm happy with this. I'd say a quicker timeframe is fine though. >> From the announce, if no one has found an application that uses >> LO-embedded ActiveX remove it in a month or something. I expect that >> if there are some users they might not hear until the install the >> version without it regardless of what we do. > > Perhaps it should be announced in the release notes, with an actual version > where it will be removed. > > Chris ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Remove ActiveX from LibreOffice
I missed a couple of posts being off list, and some from Gerrit comments. >(1)And the cost of maintaining it is currently near zero, no? I don't think so, it's likely more of a maintenance cost than NPAPI was. I'm not an expert but it makes our Windows builds more complex. >(2)As Michael accurately noted, ActiveX is for more than browser embedding. >It's a generic framework for cross-language modules, which IE simply >capitalized on. From my admittedly limited understanding (I'm much more a Linux dev) users can still use the more modern Active Template Library [3] to accomplish the same goal. I purposely didn't try to remove any of this support. To look at this issue from another POV.. If someone showed up today with an issue with a LO ActiveX control embedded in their application that didn't work - what would our response be? It's an outdated technology that we're not investing in. >My position on ActiveX is to leave it (lest we break applications in the > wild,) and to *announce its deprecation* with two goals: first, solicit the > feedback of LO ActiveX consumers and, if so inclined to continue using it, > help in its support. And second, to flag a date in the future when ActiveX > will be completely removed from LO codebase, pending sufficient reason and > support by its consumers. I'm happy with this. I'd say a quicker timeframe is fine though. From the announce, if no one has found an application that uses LO-embedded ActiveX remove it in a month or something. I expect that if there are some users they might not hear until the install the version without it regardless of what we do. Kind regards, Bryan [1] https://gerrit.libreoffice.org/#/c/21024/ [2] http://lists.freedesktop.org/archives/libreoffice/2016-January/071789.html [3] https://en.wikipedia.org/wiki/Active_Template_Library On Wed, Dec 30, 2015 at 3:02 PM, Bryan Quigley wrote: > Hi there, > > Recently it was decided to remove the rest of NPAPI support [1] which > got me thinking about the other Windows specific plugin tech - > ActiveX. > > It seems ActiveX is very much no longer recommended by Microsoft and > it seems to not work by default for IE10/11 on Windows 7 and up. Any > objections to removing? > > AFAICT this would just be removing embedding LO into IE. > > Kind regards, > Bryan > > [1] https://gerrit.libreoffice.org/#/c/20658/ and ESC discussion > here: > http://lists.freedesktop.org/archives/libreoffice/2015-December/071504.html > [2] > https://blogs.windows.com/msedgedev/2015/05/06/a-break-from-the-past-part-2-saying-goodbye-to-activex-vbscript-attachevent/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: filter/Configuration_filter.mk filter/source svtools/source
filter/Configuration_filter.mk|2 filter/source/config/fragments/filters/draw_svm_Export.xcu| 30 -- filter/source/config/fragments/filters/impress_svm_Export.xcu | 30 -- svtools/source/filter/exportdialog.cxx|3 - 4 files changed, 65 deletions(-) New commits: commit 4feaf73a4da939be741516edd3636d1a3c3fc0e2 Author: Bryan Quigley Date: Tue Dec 8 11:51:55 2015 -0500 tdf#92925 Remove SVM export from Impress/Draw There's no good reason to export a Draw/Impress document as an SVM. It can still be used as a fallback in exporting an image in any document (including Impress/Draw) though so leaving support to export images as SVM. Change-Id: I3eb5fbd241fe7535b316c2559bbfd09fec3680c7 Reviewed-on: https://gerrit.libreoffice.org/20475 Tested-by: Jenkins Reviewed-by: jan iversen diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index 998487a..b46d39f 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -720,7 +720,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_drawgraphics_f draw_met_Export \ draw_png_Export \ draw_svg_Export \ - draw_svm_Export \ draw_tif_Export \ draw_wmf_Export \ )) @@ -761,7 +760,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_impressgraphic impress_met_Export \ impress_png_Export \ impress_svg_Export \ - impress_svm_Export \ impress_tif_Export \ impress_wmf_Export \ )) diff --git a/filter/source/config/fragments/filters/draw_svm_Export.xcu b/filter/source/config/fragments/filters/draw_svm_Export.xcu deleted file mode 100644 index c636a25..000 --- a/filter/source/config/fragments/filters/draw_svm_Export.xcu +++ /dev/null @@ -1,30 +0,0 @@ - - -EXPORT ALIEN SUPPORTSSELECTION -com.sun.star.svtools.SvFilterOptionsDialog - - - -SVM - StarView Metafile - -0 -svm_StarView_Metafile - -com.sun.star.drawing.DrawingDocument - diff --git a/filter/source/config/fragments/filters/impress_svm_Export.xcu b/filter/source/config/fragments/filters/impress_svm_Export.xcu deleted file mode 100644 index 79e250c..000 --- a/filter/source/config/fragments/filters/impress_svm_Export.xcu +++ /dev/null @@ -1,30 +0,0 @@ - - -EXPORT ALIEN SUPPORTSSELECTION -com.sun.star.svtools.SvFilterOptionsDialog - - - -SVM - StarView Metafile - -0 -svm_StarView_Metafile - -com.sun.star.presentation.PresentationDocument - diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index 3b303fe..6ae9509 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -54,7 +54,6 @@ #define FORMAT_EPS 14 #define FORMAT_MET 15 #define FORMAT_SVG 16 -#define FORMAT_SVM 17 #define UNIT_DEFAULT-1 #define UNIT_INCH 0 @@ -89,8 +88,6 @@ static sal_Int16 GetFilterFormat(const OUString& rExt) nFormat = FORMAT_MET; else if ( rExt == "SVG" ) nFormat = FORMAT_SVG; -else if ( rExt == "SVM" ) -nFormat = FORMAT_SVM; return nFormat; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: distro-configs/LibreOfficeCoverity.conf postprocess/Rdb_services.mk scp2/InstallModule_ooo.mk
distro-configs/LibreOfficeCoverity.conf |1 - postprocess/Rdb_services.mk |6 -- scp2/InstallModule_ooo.mk |1 - 3 files changed, 8 deletions(-) New commits: commit 054b25c9ce96eb50d80177cb48cd9b10513806c3 Author: Bryan Quigley Date: Wed Dec 30 21:01:45 2015 -0500 Remove missed NPAPI items These were missed during the removal of NPAPI. Change-Id: Ie6233a755cd8f2995692fb8790bd65055d100251 Reviewed-on: https://gerrit.libreoffice.org/21015 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/distro-configs/LibreOfficeCoverity.conf b/distro-configs/LibreOfficeCoverity.conf index 63f55c4..bcbdab2 100644 --- a/distro-configs/LibreOfficeCoverity.conf +++ b/distro-configs/LibreOfficeCoverity.conf @@ -8,7 +8,6 @@ --enable-option-checking=fatal --with-system-libs --with-system-headers ---without-system-npapi-headers --without-system-libcmis --without-system-cppunit --without-system-libmwaw diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 1974b59..51c9eba 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -321,12 +321,6 @@ $(eval $(call gb_Rdb_add_components,services,\ endif # DESKTOP -ifeq ($(ENABLE_NPAPI_FROM_BROWSER),TRUE) -$(eval $(call gb_Rdb_add_components,services,\ - extensions/source/plugin/pl \ -)) -endif - ifeq ($(ENABLE_PDFIMPORT),TRUE) $(eval $(call gb_Rdb_add_components,services,\ sdext/source/pdfimport/pdfimport \ diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 91b11a3..c9e4199 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -20,7 +20,6 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ ENABLE_GTK \ ENABLE_MACOSX_SANDBOX \ - ENABLE_NPAPI_FROM_BROWSER \ ENABLE_ONLINE_UPDATE \ ENABLE_TDE \ SYSTEM_CURL \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Remove ActiveX from LibreOffice
>I've reported tdf#90386 last year, which was about IE8 didn't render >embedded LibreOffice properly. From that bug, does that mean it doesn't really work properly anyway since LO 4.4/IE8? >Eventually it obsoletes, but I prefer to consider this when facing some >directly related event. >( i.e EOL of Windows7, new toolchain ceasing ActiveX support, or security issue which lacks of engineer resource ) . Microsoft recently changed their policy (going into effect Jan 2016), to obsolete all but the latest IE on said platform. Which means for the great majority of (supported) users IE11 is the only supported version. [1] https://support.microsoft.com/en-us/gp/microsoft-internet-explorer/en-us >> On 31 Dec 2015, at 7:02 AM, Bryan Quigley wrote: >> >> Hi there, >> >> Recently it was decided to remove the rest of NPAPI support [1] which >> got me thinking about the other Windows specific plugin tech - >> ActiveX. >> >> It seems ActiveX is very much no longer recommended by Microsoft and >> it seems to not work by default for IE10/11 on Windows 7 and up. Any >> objections to removing? >> >> AFAICT this would just be removing embedding LO into IE. >> >> Kind regards, >> Bryan >> >> [1] https://gerrit.libreoffice.org/#/c/20658/ and ESC discussion >> here: >> http://lists.freedesktop.org/archives/libreoffice/2015-December/071504.html >> [2] >> https://blogs.windows.com/msedgedev/2015/05/06/a-break-from-the-past-part-2-saying-goodbye-to-activex-vbscript-attachevent/ >> ___ >> LibreOffice mailing list >> LibreOffice@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/libreoffice > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Remove ActiveX from LibreOffice
Hi there, Recently it was decided to remove the rest of NPAPI support [1] which got me thinking about the other Windows specific plugin tech - ActiveX. It seems ActiveX is very much no longer recommended by Microsoft and it seems to not work by default for IE10/11 on Windows 7 and up. Any objections to removing? AFAICT this would just be removing embedding LO into IE. Kind regards, Bryan [1] https://gerrit.libreoffice.org/#/c/20658/ and ESC discussion here: http://lists.freedesktop.org/archives/libreoffice/2015-December/071504.html [2] https://blogs.windows.com/msedgedev/2015/05/06/a-break-from-the-past-part-2-saying-goodbye-to-activex-vbscript-attachevent/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: scp2/source shell/Module_shell.mk shell/Package_scripts_gnome.mk shell/source sysui/desktop
scp2/source/ooo/file_ooo.scp |7 ---
shell/Module_shell.mk |1 -
shell/Package_scripts_gnome.mk | 14 --
shell/source/unix/misc/gnome-open-url.sh |4
shell/source/unix/misc/senddoc.sh |2 --
sysui/desktop/apparmor/program.senddoc |1 -
sysui/desktop/apparmor/program.soffice.bin |1 -
7 files changed, 30 deletions(-)
New commits:
commit eaa7f30102df4df01171e5daf83cdddae1bb0cda
Author: Bryan Quigley
Date: Wed Dec 2 00:02:59 2015 -0500
Remove gnome-open support
Gnome-open has been deprecate for some time. xdg-open replaces it.
Change-Id: I7fc0f32a1f2fbadbe3d1cee58d0089213665c3a5
Reviewed-on: https://gerrit.libreoffice.org/20347
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 9dc5038..ad78407 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -61,13 +61,6 @@ End
#if defined UNX && ! defined MACOSX && ! defined LIBO_HEADLESS
-File gid_File_Bin_Gnome_Open_Url
-BIN_FILE_BODY;
-Dir = FILELIST_DIR;
-Name = "shell_scripts_gnome.filelist";
-Styles = (FILELIST, PACKED);
-End
-
File gid_File_shell_scripts
BIN_FILE_BODY;
Dir = FILELIST_DIR;
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 44d0a61..d0a3318 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -106,7 +106,6 @@ ifeq ($(USING_X11),TRUE)
$(eval $(call gb_Module_add_targets,shell,\
Library_recentfile \
Package_scripts \
- Package_scripts_gnome \
Package_scripts_kde \
Package_scripts_tde \
))
diff --git a/shell/Package_scripts_gnome.mk b/shell/Package_scripts_gnome.mk
deleted file mode 100644
index 794ed87..000
--- a/shell/Package_scripts_gnome.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call
gb_Package_Package,shell_scripts_gnome,$(SRCDIR)/shell/source/unix/misc))
-
-$(eval $(call
gb_Package_add_file,shell_scripts_gnome,$(LIBO_BIN_FOLDER)/gnome-open-url,gnome-open-url.sh))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/shell/source/unix/misc/gnome-open-url.sh
b/shell/source/unix/misc/gnome-open-url.sh
deleted file mode 100755
index bffe6f2..000
--- a/shell/source/unix/misc/gnome-open-url.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# use xdg-open or gnome-open if available, falling back to our own open-url
-xdg-open "$1" 2>/dev/null || gnome-open "$1" 2>/dev/null || `dirname
"$0"`/open-url "$1" 2>/dev/null
diff --git a/shell/source/unix/misc/senddoc.sh
b/shell/source/unix/misc/senddoc.sh
index a642546..169af25 100755
--- a/shell/source/unix/misc/senddoc.sh
+++ b/shell/source/unix/misc/senddoc.sh
@@ -389,8 +389,6 @@ case `basename "$MAILER" | sed 's/-.*$//'` in
MAILER=${DESKTOP_LAUNCH}
elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open ] ; then
MAILER=/usr/bin/kde-open
-elif [ -n "$GNOME_DESKTOP_SESSION_ID" -a -x /usr/bin/gnome-open ] ;
then
-MAILER=/usr/bin/gnome-open
elif [ -x /usr/bin/xdg-open ] ; then
MAILER=/usr/bin/xdg-open
else
diff --git a/sysui/desktop/apparmor/program.senddoc
b/sysui/desktop/apparmor/program.senddoc
index deb1fff..f258114 100644
--- a/sysui/desktop/apparmor/program.senddoc
+++ b/sysui/desktop/apparmor/program.senddoc
@@ -26,7 +26,6 @@ profile libreoffice-senddoc
INSTDIR-/usr/lib{,32,64}/libreoffice/program/senddoc
/bin/grep rmix,
/bin/unamermix,
/usr/bin/xdg-open Cxr -> sanitized_helper,
- /usr/bin/gnome-open Cxr -> sanitized_helper,
/dev/null rw,
INSTDIR-program/uri-encode rmPUx,
/usr/share/libreoffice/share/config/* r,
diff --git a/sysui/desktop/apparmor/program.soffice.bin
b/sysui/desktop/apparmor/program.soffice.bin
index c74fcc6..bbb0100 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -122,7 +122,6 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
/usr/lib{,32,64}/jvm/** r,
INSTDIR-**ra,
INSTDIR-**.so rm,
- INSTDIR-program/gnome-open-urlrmPUx, #This doesn't seem to be used on
my install
INSTDIR-program/soffice.bin rmix,
INSTDIR-program/xpdfimportrPx,
INSTDIR-program/open-url rPx,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/Configuration_filter.mk filter/Library_gie.mk filter/source svtools/source vcl/source
filter/Configuration_filter.mk |9 filter/Library_gie.mk|3 filter/source/config/fragments/filters/draw_pbm_Export.xcu | 30 - filter/source/config/fragments/filters/draw_pgm_Export.xcu | 30 - filter/source/config/fragments/filters/draw_ppm_Export.xcu | 30 - filter/source/config/fragments/filters/impress_pbm_Export.xcu| 30 - filter/source/config/fragments/filters/impress_pgm_Export.xcu| 30 - filter/source/config/fragments/filters/impress_ppm_Export.xcu| 30 - filter/source/config/fragments/internalgraphicfilters/pbm_Export.xcu | 27 - filter/source/config/fragments/internalgraphicfilters/pgm_Export.xcu | 27 - filter/source/config/fragments/internalgraphicfilters/ppm_Export.xcu | 27 - filter/source/graphicfilter/epbm/epbm.cxx| 205 filter/source/graphicfilter/epgm/epgm.cxx| 224 - filter/source/graphicfilter/eppm/eppm.cxx| 234 -- svtools/source/filter/exportdialog.cxx | 31 - vcl/source/filter/FilterConfigCache.cxx |3 vcl/source/filter/graphicfilter.cxx | 15 17 files changed, 985 deletions(-) New commits: commit 2ac0bd278d739382d8e534f5bbae34e55757a844 Author: Bryan Quigley Date: Wed Dec 2 16:01:13 2015 -0500 tdf#92925 Remove PBM, PGM, and PPM Export Remove export for all the netpbm formats. Import still works but these filetypes don't preserve good quality anyway. Change-Id: If4b47f749275a9d3d663f61872f448e01112f6b5 Reviewed-on: https://gerrit.libreoffice.org/20361 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index a2a3cd1..ae1a871 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -776,10 +776,7 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_drawgraphics_f draw_html_Export \ draw_jpg_Export \ draw_met_Export \ - draw_pbm_Export \ - draw_pgm_Export \ draw_png_Export \ - draw_ppm_Export \ draw_svg_Export \ draw_svm_Export \ draw_tif_Export \ @@ -820,10 +817,7 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_impressgraphic impress_html_Export \ impress_jpg_Export \ impress_met_Export \ - impress_pbm_Export \ - impress_pgm_Export \ impress_png_Export \ - impress_ppm_Export \ impress_svg_Export \ impress_svm_Export \ impress_tif_Export \ @@ -896,18 +890,15 @@ $(eval $(call filter_Configuration_add_internal_filters,fcfg_langpack,fcfg_inter jpg_Import \ met_Export \ met_Import \ - pbm_Export \ pbm_Import \ pcd_Import_Base \ pcd_Import_Base4 \ pcd_Import_Base16 \ pct_Import \ pcx_Import \ - pgm_Export \ pgm_Import \ png_Export \ png_Import \ - ppm_Export \ ppm_Import \ psd_Import \ ras_Import \ diff --git a/filter/Library_gie.mk b/filter/Library_gie.mk index 1bbe381..e72efd6 100644 --- a/filter/Library_gie.mk +++ b/filter/Library_gie.mk @@ -41,9 +41,6 @@ $(eval $(call gb_Library_add_exception_objects,gie,\ filter/source/graphicfilter/egif/egif \ filter/source/graphicfilter/etiff/etiff \ filter/source/graphicfilter/eos2met/eos2met \ - filter/source/graphicfilter/epbm/epbm \ - filter/source/graphicfilter/epgm/epgm \ - filter/source/graphicfilter/eppm/eppm \ filter/source/graphicfilter/eps/eps \ filter/source/graphicfilter/egif/giflzwc \ filter/source/graphicfilter/itiff/ccidecom \ diff --git a/filter/source/config/fragments/filters/draw_pbm_Export.xcu b/filter/source/config/fragments/filters/draw_pbm_Export.xcu deleted file mode 100644 index 582211b..000 --- a/filter/source/config/fragments/filters/draw_pbm_Export.xcu +++ /dev/null @@ -1,30 +0,0 @@ - - -EXPORT ALIEN SUPPORTSSELECTION -com.sun.star.svtools.SvFilterOptionsDialog - - - -PBM - Portable Bitmap - -0 -pbm_Portable_Bitmap - -com.sun.star.drawing.DrawingDocument - diff --git a/filter/source/config/fragments/filters/draw_pgm_Export.xcu b/filter/source/config/fragments/filters/draw_pgm_Export.xcu deleted file mode 100644 index 5fc5021..000 --- a/filter/source/config/fragments/filters/draw_pgm_Export.xcu +++ /dev/null @@ -1,30 +0,0 @@ - - -EXPORT ALIEN SUPPORTSSELECTION -com.sun.star.svtools.SvFilterOptionsDialog - - - -PGM - Portable Gr
[Libreoffice-commits] core.git: filter/Configuration_filter.mk filter/Library_gie.mk filter/source svtools/source
filter/Configuration_filter.mk |3 filter/Library_gie.mk|1 filter/source/config/fragments/filters/draw_xpm_Export.xcu | 30 - filter/source/config/fragments/filters/impress_xpm_Export.xcu| 30 - filter/source/config/fragments/internalgraphicfilters/xpm_Export.xcu | 27 - filter/source/graphicfilter/expm/expm.cxx| 261 -- svtools/source/filter/exportdialog.cxx |3 7 files changed, 355 deletions(-) New commits: commit 630ec7110ec822d1d380d5181bcbb2570a129a21 Author: Bryan Quigley Date: Tue Dec 1 16:46:11 2015 -0500 tdf#92925 Remove XPM export XPM was used to create icons but isn't used much anymore. Import supoort was tested and still works. Change-Id: I50b15bc0938c114a432e93781a92e9db38810f49 Reviewed-on: https://gerrit.libreoffice.org/20341 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index 759787f..a2a3cd1 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -784,7 +784,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_drawgraphics_f draw_svm_Export \ draw_tif_Export \ draw_wmf_Export \ - draw_xpm_Export \ )) # fcfg_impressgraphics @@ -829,7 +828,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_impressgraphic impress_svm_Export \ impress_tif_Export \ impress_wmf_Export \ - impress_xpm_Export \ )) # fcfg_writergraphics @@ -925,7 +923,6 @@ $(eval $(call filter_Configuration_add_internal_filters,fcfg_langpack,fcfg_inter wmf_Export \ wmf_Import \ xbm_Import \ - xpm_Export \ xpm_Import \ mov_Import \ )) diff --git a/filter/Library_gie.mk b/filter/Library_gie.mk index 8ca4f7a..1bbe381 100644 --- a/filter/Library_gie.mk +++ b/filter/Library_gie.mk @@ -39,7 +39,6 @@ $(eval $(call gb_Library_use_libraries,gie,\ $(eval $(call gb_Library_add_exception_objects,gie,\ filter/source/graphicfilter/egif/egif \ - filter/source/graphicfilter/expm/expm \ filter/source/graphicfilter/etiff/etiff \ filter/source/graphicfilter/eos2met/eos2met \ filter/source/graphicfilter/epbm/epbm \ diff --git a/filter/source/config/fragments/filters/draw_xpm_Export.xcu b/filter/source/config/fragments/filters/draw_xpm_Export.xcu deleted file mode 100644 index 5047166..000 --- a/filter/source/config/fragments/filters/draw_xpm_Export.xcu +++ /dev/null @@ -1,30 +0,0 @@ - - -EXPORT ALIEN SUPPORTSSELECTION - - - - -XPM - X PixMap - -0 -xpm_XPM - -com.sun.star.drawing.DrawingDocument - diff --git a/filter/source/config/fragments/filters/impress_xpm_Export.xcu b/filter/source/config/fragments/filters/impress_xpm_Export.xcu deleted file mode 100644 index acbd457..000 --- a/filter/source/config/fragments/filters/impress_xpm_Export.xcu +++ /dev/null @@ -1,30 +0,0 @@ - - -EXPORT ALIEN SUPPORTSSELECTION - - - - -XPM - X PixMap - -0 -xpm_XPM - -com.sun.star.presentation.PresentationDocument - diff --git a/filter/source/config/fragments/internalgraphicfilters/xpm_Export.xcu b/filter/source/config/fragments/internalgraphicfilters/xpm_Export.xcu deleted file mode 100644 index c10a670..000 --- a/filter/source/config/fragments/internalgraphicfilters/xpm_Export.xcu +++ /dev/null @@ -1,27 +0,0 @@ - - -xpm_XPM -exp - -com.sun.star.svtools.SvFilterOptionsDialog - -XPM - X PixMap - -EXPORT - diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx deleted file mode 100644 index 524f1dd..000 --- a/filter/source/graphicfilter/expm/expm.cxx +++ /dev/null @@ -1,261 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. Y
[Libreoffice-commits] core.git: filter/Configuration_filter.mk filter/Library_gie.mk filter/source svtools/source
filter/Configuration_filter.mk |3 filter/Library_gie.mk|1 filter/source/config/fragments/filters/draw_ras_Export.xcu | 30 - filter/source/config/fragments/filters/impress_ras_Export.xcu| 30 - filter/source/config/fragments/internalgraphicfilters/ras_Export.xcu | 27 filter/source/graphicfilter/eras/eras.cxx| 282 -- svtools/source/filter/exportdialog.cxx |3 7 files changed, 376 deletions(-) New commits: commit 9027629b0e09b3b024a5821bb791308039bb5d8b Author: Bryan Quigley Date: Tue Dec 1 17:04:14 2015 -0500 tdf#92925 Remove RAS export RAS was last used on Sun's now defunct SunOS. Import was tested and still works. Change-Id: I9fb9b7965279391922f19ec1f9e4a53134d41f5c Reviewed-on: https://gerrit.libreoffice.org/20342 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index 0f3081e..759787f 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -780,7 +780,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_drawgraphics_f draw_pgm_Export \ draw_png_Export \ draw_ppm_Export \ - draw_ras_Export \ draw_svg_Export \ draw_svm_Export \ draw_tif_Export \ @@ -826,7 +825,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_impressgraphic impress_pgm_Export \ impress_png_Export \ impress_ppm_Export \ - impress_ras_Export \ impress_svg_Export \ impress_svm_Export \ impress_tif_Export \ @@ -914,7 +912,6 @@ $(eval $(call filter_Configuration_add_internal_filters,fcfg_langpack,fcfg_inter ppm_Export \ ppm_Import \ psd_Import \ - ras_Export \ ras_Import \ sgf_Import \ sgv_Import \ diff --git a/filter/Library_gie.mk b/filter/Library_gie.mk index f68f3f9..8ca4f7a 100644 --- a/filter/Library_gie.mk +++ b/filter/Library_gie.mk @@ -47,7 +47,6 @@ $(eval $(call gb_Library_add_exception_objects,gie,\ filter/source/graphicfilter/eppm/eppm \ filter/source/graphicfilter/eps/eps \ filter/source/graphicfilter/egif/giflzwc \ - filter/source/graphicfilter/eras/eras \ filter/source/graphicfilter/itiff/ccidecom \ filter/source/graphicfilter/itiff/itiff \ filter/source/graphicfilter/itiff/lzwdecom \ diff --git a/filter/source/config/fragments/filters/draw_ras_Export.xcu b/filter/source/config/fragments/filters/draw_ras_Export.xcu deleted file mode 100644 index 2854a68..000 --- a/filter/source/config/fragments/filters/draw_ras_Export.xcu +++ /dev/null @@ -1,30 +0,0 @@ - - -EXPORT ALIEN SUPPORTSSELECTION - - - - -RAS - Sun Raster Image - -0 -ras_Sun_Rasterfile - -com.sun.star.drawing.DrawingDocument - diff --git a/filter/source/config/fragments/filters/impress_ras_Export.xcu b/filter/source/config/fragments/filters/impress_ras_Export.xcu deleted file mode 100644 index dc116d3..000 --- a/filter/source/config/fragments/filters/impress_ras_Export.xcu +++ /dev/null @@ -1,30 +0,0 @@ - - -EXPORT ALIEN SUPPORTSSELECTION - - - - -RAS - Sun Raster Image - -0 -ras_Sun_Rasterfile - -com.sun.star.presentation.PresentationDocument - diff --git a/filter/source/config/fragments/internalgraphicfilters/ras_Export.xcu b/filter/source/config/fragments/internalgraphicfilters/ras_Export.xcu deleted file mode 100644 index 5333add..000 --- a/filter/source/config/fragments/internalgraphicfilters/ras_Export.xcu +++ /dev/null @@ -1,27 +0,0 @@ - - -ras_Sun_Rasterfile -era - -com.sun.star.svtools.SvFilterOptionsDialog - -RAS - Sun Raster Image - -EXPORT - diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx deleted file mode 100644 index ea4c144..000 --- a/filter/source/graphicfilter/eras/eras.cxx +++ /dev/null @@ -1,282 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information rega
[Libreoffice-commits] core.git: filter/Configuration_filter.mk filter/Library_gie.mk filter/source svtools/source
filter/Configuration_filter.mk |3 filter/Library_gie.mk|1 filter/source/config/fragments/filters/draw_pct_Export.xcu | 30 filter/source/config/fragments/filters/impress_pct_Export.xcu| 30 filter/source/config/fragments/internalgraphicfilters/pct_Export.xcu | 27 filter/source/graphicfilter/epict/epict.cxx | 2269 -- svtools/source/filter/exportdialog.cxx |3 7 files changed, 2363 deletions(-) New commits: commit f3f653e106a3ff9d33280a1786ece974d7a77735 Author: Bryan Quigley Date: Tue Nov 17 13:49:13 2015 -0500 tdf#92925 Remove PCT export Mac PICT was replaced (by PDF) after Apple moved from Mac Classic. I tested import and it still works Change-Id: I931036d3946240280d406bd4abbcef6e0f86d894 Reviewed-on: https://gerrit.libreoffice.org/20029 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index bf6dc92..0f3081e 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -777,7 +777,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_drawgraphics_f draw_jpg_Export \ draw_met_Export \ draw_pbm_Export \ - draw_pct_Export \ draw_pgm_Export \ draw_png_Export \ draw_ppm_Export \ @@ -824,7 +823,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_impressgraphic impress_jpg_Export \ impress_met_Export \ impress_pbm_Export \ - impress_pct_Export \ impress_pgm_Export \ impress_png_Export \ impress_ppm_Export \ @@ -907,7 +905,6 @@ $(eval $(call filter_Configuration_add_internal_filters,fcfg_langpack,fcfg_inter pcd_Import_Base \ pcd_Import_Base4 \ pcd_Import_Base16 \ - pct_Export \ pct_Import \ pcx_Import \ pgm_Export \ diff --git a/filter/Library_gie.mk b/filter/Library_gie.mk index f2b42cd..f68f3f9 100644 --- a/filter/Library_gie.mk +++ b/filter/Library_gie.mk @@ -47,7 +47,6 @@ $(eval $(call gb_Library_add_exception_objects,gie,\ filter/source/graphicfilter/eppm/eppm \ filter/source/graphicfilter/eps/eps \ filter/source/graphicfilter/egif/giflzwc \ - filter/source/graphicfilter/epict/epict \ filter/source/graphicfilter/eras/eras \ filter/source/graphicfilter/itiff/ccidecom \ filter/source/graphicfilter/itiff/itiff \ diff --git a/filter/source/config/fragments/filters/draw_pct_Export.xcu b/filter/source/config/fragments/filters/draw_pct_Export.xcu deleted file mode 100644 index d96b22c..000 --- a/filter/source/config/fragments/filters/draw_pct_Export.xcu +++ /dev/null @@ -1,30 +0,0 @@ - - -EXPORT ALIEN SUPPORTSSELECTION -com.sun.star.svtools.SvFilterOptionsDialog - - - -PCT - Mac Pict - -0 -pct_Mac_Pict - -com.sun.star.drawing.DrawingDocument - diff --git a/filter/source/config/fragments/filters/impress_pct_Export.xcu b/filter/source/config/fragments/filters/impress_pct_Export.xcu deleted file mode 100644 index 84883ed..000 --- a/filter/source/config/fragments/filters/impress_pct_Export.xcu +++ /dev/null @@ -1,30 +0,0 @@ - - -EXPORT ALIEN SUPPORTSSELECTION -com.sun.star.svtools.SvFilterOptionsDialog - - - -PCT - Mac Pict - -0 -pct_Mac_Pict - -com.sun.star.presentation.PresentationDocument - diff --git a/filter/source/config/fragments/internalgraphicfilters/pct_Export.xcu b/filter/source/config/fragments/internalgraphicfilters/pct_Export.xcu deleted file mode 100644 index 707a4e2..000 --- a/filter/source/config/fragments/internalgraphicfilters/pct_Export.xcu +++ /dev/null @@ -1,27 +0,0 @@ - - -pct_Mac_Pict -ept - -com.sun.star.svtools.SvFilterOptionsDialog - -PCT - Mac Pict - -EXPORT - diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx deleted file mode 100644 index 2d4248d..000 --- a/filter/source/graphicfilter/epict/epict.cxx +++ /dev/null @@ -1,2269 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/outdev.hxx |3 --
include/vcl/window.hxx |6
vcl/source/outdev/wallpaper.cxx | 57 +++-
3 files changed, 10 insertions(+), 56 deletions(-)
New commits:
commit fe4412c8850bd1212dce786510dd61ddd6c43b36
Author: Bryan Quigley
Date: Thu Oct 8 16:23:28 2015 -0400
Unused code removal DrawGradientWallpaper
Doesn't appear needed on Linux and tests have shown it isn't
needed on Windows or Mac either.
Change-Id: Iaaba6dcc4783557a4165d635b57a256402b0b4d2
Reviewed-on: https://gerrit.libreoffice.org/19259
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index f4cbc5f..33908fc 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -999,9 +999,6 @@ public:
virtual voidErase();
virtual voidErase( const Rectangle& rRect ) {
DrawWallpaper( rRect, GetBackground() ); }
-protected:
-virtual voidDrawGradientWallpaper( long nX, long nY, long
nWidth, long nHeight, const Wallpaper& rWallpaper );
-
private:
SAL_DLLPRIVATE void DrawWallpaper( long nX, long nY, long nWidth,
long nHeight, const Wallpaper& rWallpaper );
SAL_DLLPRIVATE void DrawColorWallpaper( long nX, long nY, long
nWidth, long nHeight, const Wallpaper& rWallpaper );
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 308760b..9e0bbbc 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -812,12 +812,6 @@ protected:
virtual voidClipToPaintRegion( Rectangle& rDstRect
) override;
virtual boolUsePolyPolygonForComplexGradient()
override;
-virtual void DrawGradientWallpaper(long nX, long nY, long nWidth, long
nHeight,
- const Wallpaper& rWallpaper) override
-{
-OutputDevice::DrawGradientWallpaper(nX, nY, nWidth, nHeight,
rWallpaper);
-}
-
virtual void ApplySettings(vcl::RenderContext& rRenderContext);
public:
boolHasMirroredGraphics() const override;
diff --git a/vcl/source/outdev/wallpaper.cxx b/vcl/source/outdev/wallpaper.cxx
index 175f0d1..1819f93 100644
--- a/vcl/source/outdev/wallpaper.cxx
+++ b/vcl/source/outdev/wallpaper.cxx
@@ -60,8 +60,6 @@ void OutputDevice::DrawWallpaper( long nX, long nY,
if( rWallpaper.IsBitmap() )
DrawBitmapWallpaper( nX, nY, nWidth, nHeight, rWallpaper );
-else if( rWallpaper.IsGradient() )
-DrawGradientWallpaper( nX, nY, nWidth, nHeight, rWallpaper );
else
DrawColorWallpaper( nX, nY, nWidth, nHeight, rWallpaper );
}
@@ -119,7 +117,6 @@ void OutputDevice::DrawBitmapWallpaper( long nX, long nY,
const WallpaperStyle eStyle = rWallpaper.GetStyle();
const bool bOldMap = mbMap;
bool bDrawn = false;
-bool bDrawGradientBackground = false;
bool bDrawColorBackground = false;
if( pCached )
@@ -134,34 +131,24 @@ void OutputDevice::DrawBitmapWallpaper( long nX, long nY,
// draw background
if( bTransparent )
{
-if( rWallpaper.IsGradient() )
-bDrawGradientBackground = true;
-else
+if( !pCached && !rWallpaper.GetColor().GetTransparency() )
{
-if( !pCached && !rWallpaper.GetColor().GetTransparency() )
-{
-ScopedVclPtrInstance< VirtualDevice > aVDev( *this );
-aVDev->SetBackground( rWallpaper.GetColor() );
-aVDev->SetOutputSizePixel( Size( nBmpWidth, nBmpHeight ) );
-aVDev->DrawBitmapEx( Point(), aBmpEx );
-aBmpEx = aVDev->GetBitmap( Point(),
aVDev->GetOutputSizePixel() );
-}
-
-bDrawColorBackground = true;
+ScopedVclPtrInstance< VirtualDevice > aVDev( *this );
+aVDev->SetBackground( rWallpaper.GetColor() );
+aVDev->SetOutputSizePixel( Size( nBmpWidth, nBmpHeight ) );
+aVDev->DrawBitmapEx( Point(), aBmpEx );
+aBmpEx = aVDev->GetBitmap( Point(), aVDev->GetOutputSizePixel() );
}
+
+bDrawColorBackground = true;
}
else if( eStyle != WallpaperStyle::Tile && eStyle != WallpaperStyle::Scale
)
{
-if( rWallpaper.IsGradient() )
-bDrawGradientBackground = true;
-else
-bDrawColorBackground = true;
+bDrawColorBackground = true;
}
// background of bitmap?
-if( bDrawGradientBackground )
-DrawGradientWallpaper( nX, nY, nWidth, nHeight, rWallpaper );
-else if( bDrawColorBackground && bTransparent )
+if( bDrawColorBackground && bTransparent )
{
DrawColorWallpaper( nX, nY, nWidth, nHeight, rWallpaper );
bDrawColorBackgroun
[Libreoffice-commits] core.git: Makefile.fetch
Makefile.fetch |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 324212ce01c10a8811d25c95d1ae6a83d8214f3d Author: Bryan Quigley Date: Fri Oct 2 00:40:15 2015 -0400 Workaround broken ipv6 site This just forces wget to use ipv4 when downloading more context here: http://lists.freedesktop.org/archives/libreoffice/2015-October/070412.html Change-Id: Id7e6a2ccd2301aa0fd1456d20309fe4936b4a20b Reviewed-on: https://gerrit.libreoffice.org/19090 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/Makefile.fetch b/Makefile.fetch index 87c8b8a..8429228 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -11,7 +11,7 @@ fetch_LOGFILE := $(TARFILE_LOCATION)/fetch.log ifneq (,$(WGET)) define fetch_Download__wget_command -&& $(WGET) --progress=dot:mega -Q 0 -P "." -l 0 -nd -nH -N $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ] +&& $(WGET) --progress=dot:mega -4 -Q 0 -P "." -l 0 -nd -nH -N $1/$2 2>&1 | tee -a $(fetch_LOGFILE) && [ $$PIPESTATUS -eq 0 ] endef else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sysui/desktop
sysui/desktop/apparmor/program.oosplash|2 +-
sysui/desktop/apparmor/program.soffice.bin |2 --
sysui/desktop/share/apparmor.sh|6 +-
3 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 3de49e44c517f3482bc2a7989399a31443d07fdd
Author: Bryan Quigley
Date: Tue Sep 29 15:47:46 2015 -0400
Update apparmor profiles for 5.0/5.1
Java's position was moved. Add workaround instructions
to use with debs built upstream (not ubuntu/debian version)
Change-Id: Ia42426aabbcfabb2ca46d811d8b742e23b33d4b6
Reviewed-on: https://gerrit.libreoffice.org/18999
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sysui/desktop/apparmor/program.oosplash
b/sysui/desktop/apparmor/program.oosplash
index 80d6f58..99ba58e 100644
--- a/sysui/desktop/apparmor/program.oosplash
+++ b/sysui/desktop/apparmor/program.oosplash
@@ -23,7 +23,7 @@ profile libreoffice-oopslash INSTDIR-program/oosplash {
/usr/lib{,32,64}/ure/bin/javaldx Cx,
/usr/share/libreoffice/program/* r,
INSTDIR-program/soffice.bin rmPUx,
- INSTDIR-ure/bin/javaldx rmPUx,
+ INSTDIR-program/javaldx rmPUx,
owner @{HOME}/.Xauthority r,
owner @{HOME}/.config/libreoffice{,dev}/?/user/uno_packages/cache/log.txt rw,
unix peer=(addr=@/tmp/.ICE-unix/* label=unconfined),
diff --git a/sysui/desktop/apparmor/program.soffice.bin
b/sysui/desktop/apparmor/program.soffice.bin
index 1ae2cc6..c74fcc6 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -127,8 +127,6 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
INSTDIR-program/xpdfimportrPx,
INSTDIR-program/open-url rPx,
INSTDIR-program/senddoc rPx,
- /usr/lib{,32,64}/ure/ r,
- /usr/lib{,32,64}/ure/** rm,
/usr/share/java/**.jarr,
/usr/share/hunspell/ r,
diff --git a/sysui/desktop/share/apparmor.sh b/sysui/desktop/share/apparmor.sh
index 848c113..88baff8 100755
--- a/sysui/desktop/share/apparmor.sh
+++ b/sysui/desktop/share/apparmor.sh
@@ -19,9 +19,13 @@ PROFILESFROM=$2 #Where the profile files are
INSTALLTO=$3 #Where should the apparmor profiles live (to be be linked to)
INSTALL=$4 #True means try to run sudo to link (doesn't reload profiles)
-#For example to get this to work on Ubuntu 15.04 with stock LibreOffice:
+#For example to get this to work on Ubuntu 15.10 with stock LibreOffice:
# ./sysui/desktop/share/apparmor.sh /usr/lib/libreoffice/
sysui/desktop/apparmor/ /mnt/store/git/libo/instdir/apparmor-testing/ true
+#For example on Ubuntu 15.10, with built debs from the LibreOffice website
+# At the current time you need run /opt/libreofficedev5.1/program/soffice.bin
directly - splash screen doesn't work
+# ./sysui/desktop/share/apparmor.sh /opt/libreofficedev5.1/
sysui/desktop/apparmor/ /mnt/store/git/libo/instdir/apparmor-testing/ true
+
mkdir -p $INSTALLTO
#Need to convert / to . for profile names
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Default LO to show no splash screen?
Hi all, LibreOffice starts up much faster then it once did, to the point I think the splash screen on startup actually makes it seem like it takes longer. Thoughts on removing the splash screen? Thanks! Bryan P.S. Last time I looked at this I believe there was a specific use case for the splash screen loading dialogue, but from the code I --nologo would always win... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/insertplugin.ui | 133 ++-- 1 file changed, 74 insertions(+), 59 deletions(-) New commits: commit 9a6415a88b991eda9fd30dff8c59879afa853b99 Author: Bryan Quigley Date: Mon Sep 21 17:54:14 2015 -0400 Add warning to Add Plug-in Dialog box Change-Id: I990309d9daa2dc03dceb8c4e82a87ee16b596873 Reviewed-on: https://gerrit.libreoffice.org/18756 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/cui/uiconfig/ui/insertplugin.ui b/cui/uiconfig/ui/insertplugin.ui index 0bf7ad0..c20100a 100644 --- a/cui/uiconfig/ui/insertplugin.ui +++ b/cui/uiconfig/ui/insertplugin.ui @@ -12,6 +12,63 @@ False vertical 12 + + +False +end + + +gtk-ok +True +True +True +True +True +True + + +False +True +0 + + + + +gtk-cancel +True +True +True +True + + +False +True +1 + + + + +gtk-help +True +True +True +True + + +False +True +2 +True + + + + +False +True +end +1 + + True @@ -19,6 +76,21 @@ vertical 12 + +True +False +Warning: Plugins may not work on all platforms and may be removed in the future + + + + + +False +True +0 + + + True False @@ -79,7 +151,7 @@ False True -0 +1 @@ -129,7 +201,7 @@ True True -1 +2 @@ -139,63 +211,6 @@ 0 - - -False -end - - -gtk-ok -True -True -True -True -True -True - - -False -True -0 - - - - -gtk-cancel -True -True -True -True - - -False -True -1 - - - - -gtk-help -True -True -True -True - - -False -True -2 -True - - - - -False -True -end -1 - - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice AppArmor profiles
Hi there, I've been working on making AppArmor profiles for LibreOffice and have been wondering about the best way to integrate them upstream. Originally I was thinking about having them in AppArmor upstream but it makes more sense to be in lock step with LibreOffice versions. That way as bugs get fixed or LibreOffice is made to require less permissions it shows up at the right time. You can see the latest public version here[1*] and that thread starts here[2]. If they could be integrated somewhere with the build system it would help solve the other big issue that I've ran into, the changing pathnames from pre-built debs to different distros doing things differently. In an ideal world each different system then could just generate a libreoffice-apparmor package that would enable the profiles. If not (or if we want to decide all that later), I would just be happy knowing where in the LibreOffice code base the profiles make sense to live. Just to be clear, I don't believe you could turn these on by default right now. This just gives organizations who want LibreOffice confined that option. Kind regards, Bryan Canonical Backline Support Engineer [1] https://lists.ubuntu.com/archives/apparmor/2015-April/007713.html [2] https://lists.ubuntu.com/archives/apparmor/2015-April/007690.html * This profile found a few bugs in AppArmor. I had to do AppArmor restarts to reload the profiles. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'refs/changes/35/10735/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/22/10822/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/44/9644/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/44/9644/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/35/10735/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/79/10679/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/44/9644/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/35/10735/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/22/10822/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/44/9644/4'
___ 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/7488/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/7488/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/57/10757/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/16/10816/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/16/10816/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/37/8937/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/87/7487/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/37/8937/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/37/8937/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/80/10680/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/57/10757/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/57/10757/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/87/7487/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/7489/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/89/7489/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/7489/4'
___ 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/7489/1'
___ 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' - sd/source
sd/source/ui/remotecontrol/AvahiNetworkService.cxx | 28 +
1 file changed, 18 insertions(+), 10 deletions(-)
New commits:
commit 8de2e9b4bc53e6c097897142bad223c100d36292
Author: Bryan Quigley
Date: Mon Aug 4 12:26:00 2014 -0400
fdo#81552 Fail nicely if avahi doesn't let libreoffice publish items
Needed some minor changes for 4-2.
Reviewed-on: https://gerrit.libreoffice.org/10735
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
(cherry picked from commit 3c57701cf0a169bd8d1893d1b2271d48b8072147)
Change-Id: Ie264a032a71bda336158e18bd2b14c569f23f42d
Reviewed-on: https://gerrit.libreoffice.org/10822
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
index 04d8e57..43ee31b 100644
--- a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
+++ b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
@@ -35,7 +35,7 @@ static AvahiThreadedPoll *threaded_poll = NULL;
static AvahiEntryGroup *group = NULL;
static AvahiNetworkService *avahiService = NULL;
-static void create_services(AvahiClient *c);
+static bool create_services(AvahiClient *c);
static void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState
state, AVAHI_GCC_UNUSED void *userdata) {
assert(g == group || group == NULL);
@@ -78,16 +78,19 @@ static void entry_group_callback(AvahiEntryGroup *g,
AvahiEntryGroupState state,
}
}
-static void create_services(AvahiClient *c) {
+static bool create_services(AvahiClient *c) {
assert(c);
/* If this is the first time we're called, let's create a new
* entry group if necessary */
+if(!client)
+return false;
if (!group)
if (!(group = avahi_entry_group_new(c, entry_group_callback, NULL))) {
fprintf(stderr, "avahi_entry_group_new() failed: %s\n",
avahi_strerror(avahi_client_errno(c)));
avahiService->clear();
+return false;
}
/* If the group is empty (either because it was just created, or
@@ -113,22 +116,23 @@ static void create_services(AvahiClient *c) {
avahi_entry_group_reset(group);
-create_services(c);
-return;
+return create_services(c);
}
fprintf(stderr, "Failed to add _impressremote._tcp service: %s\n",
avahi_strerror(ret));
avahiService->clear();
+return false;
}
/* Tell the server to register the service */
if ((ret = avahi_entry_group_commit(group)) < 0) {
fprintf(stderr, "Failed to commit entry group: %s\n",
avahi_strerror(ret));
avahiService->clear();
+return false;
}
}
-return;
+return true; //Services we're already created
}
static void client_callback(AvahiClient *c, AvahiClientState state,
AVAHI_GCC_UNUSED void * userdata) {
@@ -174,7 +178,8 @@ void AvahiNetworkService::setup() {
return;
}
- create_services(client);
+ if(!create_services(client))
+return;
/* Finally, start the event loop thread */
if (avahi_threaded_poll_start(threaded_poll) < 0) {
@@ -184,8 +189,11 @@ void AvahiNetworkService::setup() {
}
void AvahiNetworkService::clear() {
- /* Call this when the app shuts down */
- avahi_threaded_poll_stop(threaded_poll);
- avahi_client_free(client);
- avahi_threaded_poll_free(threaded_poll);
+/* Call this when the app shuts down */
+if(threaded_poll)
+avahi_threaded_poll_stop(threaded_poll);
+if(client)
+avahi_client_free(client);
+if(threaded_poll)
+avahi_threaded_poll_free(threaded_poll);
}
___
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' - sd/source
sd/source/ui/remotecontrol/AvahiNetworkService.cxx | 26 +
1 file changed, 17 insertions(+), 9 deletions(-)
New commits:
commit d2eec11f0a6f27e13a4a834942f8acf20ae62cec
Author: Bryan Quigley
Date: Mon Aug 4 12:26:00 2014 -0400
fdo#81552 Fail nicely if avahi doesn't let libreoffice publish items
Change-Id: Ie264a032a71bda336158e18bd2b14c569f23f42d
Reviewed-on: https://gerrit.libreoffice.org/10735
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
(cherry picked from commit 3c57701cf0a169bd8d1893d1b2271d48b8072147)
Reviewed-on: https://gerrit.libreoffice.org/10816
diff --git a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
index d4d92cd..ad2bfef 100644
--- a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
+++ b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
@@ -35,7 +35,7 @@ static AvahiThreadedPoll *threaded_poll = NULL;
static AvahiEntryGroup *group = NULL;
static AvahiNetworkService *avahiService = NULL;
-static void create_services(AvahiClient *c);
+static bool create_services(AvahiClient *c);
static void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState
state, AVAHI_GCC_UNUSED void *userdata) {
assert(g == group || group == NULL);
@@ -78,16 +78,19 @@ static void entry_group_callback(AvahiEntryGroup *g,
AvahiEntryGroupState state,
}
}
-static void create_services(AvahiClient *c) {
+static bool create_services(AvahiClient *c) {
assert(c);
/* If this is the first time we're called, let's create a new
* entry group if necessary */
+if(!client)
+return false;
if (!group)
if (!(group = avahi_entry_group_new(c, entry_group_callback, NULL))) {
SAL_WARN("sdremote.wifi", "avahi_entry_group_new() failed: " <<
avahi_strerror(avahi_client_errno(c)));
avahiService->clear();
+return false;
}
/* If the group is empty (either because it was just created, or
@@ -113,22 +116,23 @@ static void create_services(AvahiClient *c) {
avahi_entry_group_reset(group);
-create_services(c);
-return;
+return create_services(c);
}
SAL_WARN("sdremote.wifi", "Failed to add _impressremote._tcp
service: " << avahi_strerror(ret));
avahiService->clear();
+return false;
}
/* Tell the server to register the service */
if ((ret = avahi_entry_group_commit(group)) < 0) {
SAL_WARN("sdremote.wifi", "Failed to commit entry group: " <<
avahi_strerror(ret));
avahiService->clear();
+return false;
}
}
-return;
+return true; //Services we're already created
}
static void client_callback(AvahiClient *c, AvahiClientState state,
AVAHI_GCC_UNUSED void * userdata) {
@@ -174,7 +178,8 @@ void AvahiNetworkService::setup() {
return;
}
- create_services(client);
+ if(!create_services(client))
+return;
/* Finally, start the event loop thread */
if (avahi_threaded_poll_start(threaded_poll) < 0) {
@@ -185,7 +190,10 @@ void AvahiNetworkService::setup() {
void AvahiNetworkService::clear() {
/* Call this when the app shuts down */
-avahi_threaded_poll_stop(threaded_poll);
-avahi_client_free(client);
-avahi_threaded_poll_free(threaded_poll);
+if(threaded_poll)
+avahi_threaded_poll_stop(threaded_poll);
+if(client)
+avahi_client_free(client);
+if(threaded_poll)
+avahi_threaded_poll_free(threaded_poll);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/remotecontrol/AvahiNetworkService.cxx | 26 +
1 file changed, 17 insertions(+), 9 deletions(-)
New commits:
commit 3c57701cf0a169bd8d1893d1b2271d48b8072147
Author: Bryan Quigley
Date: Mon Aug 4 12:26:00 2014 -0400
fdo#81552 Fail nicely if avahi doesn't let libreoffice publish items
Change-Id: Ie264a032a71bda336158e18bd2b14c569f23f42d
Reviewed-on: https://gerrit.libreoffice.org/10735
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
index d4d92cd..ad2bfef 100644
--- a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
+++ b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
@@ -35,7 +35,7 @@ static AvahiThreadedPoll *threaded_poll = NULL;
static AvahiEntryGroup *group = NULL;
static AvahiNetworkService *avahiService = NULL;
-static void create_services(AvahiClient *c);
+static bool create_services(AvahiClient *c);
static void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState
state, AVAHI_GCC_UNUSED void *userdata) {
assert(g == group || group == NULL);
@@ -78,16 +78,19 @@ static void entry_group_callback(AvahiEntryGroup *g,
AvahiEntryGroupState state,
}
}
-static void create_services(AvahiClient *c) {
+static bool create_services(AvahiClient *c) {
assert(c);
/* If this is the first time we're called, let's create a new
* entry group if necessary */
+if(!client)
+return false;
if (!group)
if (!(group = avahi_entry_group_new(c, entry_group_callback, NULL))) {
SAL_WARN("sdremote.wifi", "avahi_entry_group_new() failed: " <<
avahi_strerror(avahi_client_errno(c)));
avahiService->clear();
+return false;
}
/* If the group is empty (either because it was just created, or
@@ -113,22 +116,23 @@ static void create_services(AvahiClient *c) {
avahi_entry_group_reset(group);
-create_services(c);
-return;
+return create_services(c);
}
SAL_WARN("sdremote.wifi", "Failed to add _impressremote._tcp
service: " << avahi_strerror(ret));
avahiService->clear();
+return false;
}
/* Tell the server to register the service */
if ((ret = avahi_entry_group_commit(group)) < 0) {
SAL_WARN("sdremote.wifi", "Failed to commit entry group: " <<
avahi_strerror(ret));
avahiService->clear();
+return false;
}
}
-return;
+return true; //Services we're already created
}
static void client_callback(AvahiClient *c, AvahiClientState state,
AVAHI_GCC_UNUSED void * userdata) {
@@ -174,7 +178,8 @@ void AvahiNetworkService::setup() {
return;
}
- create_services(client);
+ if(!create_services(client))
+return;
/* Finally, start the event loop thread */
if (avahi_threaded_poll_start(threaded_poll) < 0) {
@@ -185,7 +190,10 @@ void AvahiNetworkService::setup() {
void AvahiNetworkService::clear() {
/* Call this when the app shuts down */
-avahi_threaded_poll_stop(threaded_poll);
-avahi_client_free(client);
-avahi_threaded_poll_free(threaded_poll);
+if(threaded_poll)
+avahi_threaded_poll_stop(threaded_poll);
+if(client)
+avahi_client_free(client);
+if(threaded_poll)
+avahi_threaded_poll_free(threaded_poll);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
re: NPAPI-based features in LO
Hi there, I pushed that gerrit request.. https://gerrit.libreoffice.org/#/c/9644/. Most things have already been mentioned, but... >regarding (2) the problem is that users could have created documents >that contain embedded plug-ins Which AFAICT is also broken, tried this on Ubuntu 14.04 and WinXP. Example file: https://issues.apache.org/ooo/attachment.cgi?id=81036 > do browsers nowadays sand-box plug-ins appropriately? can the LO plug-in > even be sand-boxed? I believe the major ones get sandboxed (or maybe just Flash) and google's move to PPAPI allows for better sandboxing. I don't believe either are relevant for LibreOffice though. As mentioned earlier, plugins in general are on the way out. I don't think it makes sense to invest in NPAPI while the browser vendors are trying to kill it themselves. Just to clarify my commit message in regards to the "needed" GUI/ActiveX changes. We still have an ActiveX browser (or more?) plugin that I also haven't been able to get to work. I was going to wait on removing the plugin hooks from the GUI until we decide if we want to drop that too. Seems consistent to remove them all at the same time... (any Win devs interested in doing that?) Thanks! Bryan P.S. At one point could you load a webpage with an embedded LibreOffice doc in it, that has an embedded Flash swf in it? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - filter/source
filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu |2 +- filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu |2 +- filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu |2 +- filter/source/config/fragments/filters/StarOffice_XML__Draw_.xcu |2 +- filter/source/config/fragments/filters/StarOffice_XML__Impress_.xcu |2 +- filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu |2 +- filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu |2 +- filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template.xcu |2 +- filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template.xcu |2 +- filter/source/config/fragments/filters/impress_StarOffice_XML_Draw.xcu |2 +- filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template.xcu |2 +- filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template.xcu |2 +- filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer.xcu |2 +- filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument.xcu |2 +- filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template.xcu |2 +- 15 files changed, 15 insertions(+), 15 deletions(-) New commits: commit 95da7399047e025327aa96bffde2faf1c2a0757c Author: Bryan Quigley Date: Sun Nov 10 16:10:26 2013 -0500 Remove OOo1.0 file formats from Save As. List discussion: http://lists.freedesktop.org/archives/libreoffice/2013-November/057337.html Reviewed-on: https://gerrit.libreoffice.org/7489 Tested-by: LibreOffice gerrit bot Reviewed-by: Kohei Yoshida (cherry picked from commit aeeaccf59abbc485d7786486f1accc1cb4d4dbf7) (cherry picked from commit c9c4148f00f60a9bb986e9431e76ab7cf8b4c547) This will be used as a "fix" for fdo#74979. Change-Id: Iea7e5d9ed8f0e48ffce4504bfaaf0d41067c7a5d Reviewed-on: https://gerrit.libreoffice.org/8937 Reviewed-by: Bryan Quigley Reviewed-by: Kohei Yoshida Tested-by: Kohei Yoshida diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu index b1f5c03..0a1fdce 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -IMPORT EXPORT OWN DEFAULT 3RDPARTYFILTER ENCRYPTION +IMPORT OWN DEFAULT 3RDPARTYFILTER ENCRYPTION diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu index ffe412a..dbc8bc3 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -IMPORT EXPORT TEMPLATE OWN ALIEN ENCRYPTION +IMPORT TEMPLATE OWN ALIEN ENCRYPTION diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu index 96a5052..f84efc0 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -IMPORT EXPORT OWN ALIEN NOTINFILEDIALOG NOTINCHOOSER ENCRYPTION +IMPORT OWN ALIEN NOTINFILEDIALOG NOTINCHOOSER ENCRYPTION com.sun.star.comp.chart2.XMLFilter XML diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Draw_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Draw_.xcu index b32c713..a4a6c37 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Draw_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Draw_.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -IMPORT EXPORT TEMPLATE OWN ALIEN PREFERRED ENCRYPTION +IMPORT TEMPLATE OWN ALIEN PREFERRED ENCRYPTION XML diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Impress_.xcu b/filter/source/co
[Libreoffice-commits] core.git: filter/source
filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu |2 +- filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu |2 +- filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu |2 +- filter/source/config/fragments/filters/StarOffice_XML__Draw_.xcu |2 +- filter/source/config/fragments/filters/StarOffice_XML__Impress_.xcu |2 +- filter/source/config/fragments/filters/StarOffice_XML__Math_.xcu |4 ++-- filter/source/config/fragments/filters/StarOffice_XML__Writer_.xcu |2 +- filter/source/config/fragments/filters/calc_StarOffice_XML_Calc_Template.xcu |2 +- filter/source/config/fragments/filters/draw_StarOffice_XML_Draw_Template.xcu |2 +- filter/source/config/fragments/filters/impress_StarOffice_XML_Draw.xcu |2 +- filter/source/config/fragments/filters/impress_StarOffice_XML_Impress_Template.xcu |2 +- filter/source/config/fragments/filters/writer_StarOffice_XML_Writer_Template.xcu |2 +- filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer.xcu |2 +- filter/source/config/fragments/filters/writer_globaldocument_StarOffice_XML_Writer_GlobalDocument.xcu |2 +- filter/source/config/fragments/filters/writer_web_StarOffice_XML_Writer_Web_Template.xcu |2 +- 15 files changed, 16 insertions(+), 16 deletions(-) New commits: commit aeeaccf59abbc485d7786486f1accc1cb4d4dbf7 Author: Bryan Quigley Date: Sun Nov 10 16:10:26 2013 -0500 Remove OOo1.0 file formats from Save As. List discussion: http://lists.freedesktop.org/archives/libreoffice/2013-November/057337.html Change-Id: Iea7e5d9ed8f0e48ffce4504bfaaf0d41067c7a5d Reviewed-on: https://gerrit.libreoffice.org/7489 Tested-by: LibreOffice gerrit bot Reviewed-by: Kohei Yoshida diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu index b1f5c03..0a1fdce 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -IMPORT EXPORT OWN DEFAULT 3RDPARTYFILTER ENCRYPTION +IMPORT OWN DEFAULT 3RDPARTYFILTER ENCRYPTION diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu index ffe412a..dbc8bc3 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Calc_.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -IMPORT EXPORT TEMPLATE OWN ALIEN ENCRYPTION +IMPORT TEMPLATE OWN ALIEN ENCRYPTION diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu index 96a5052..f84efc0 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Chart_.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -IMPORT EXPORT OWN ALIEN NOTINFILEDIALOG NOTINCHOOSER ENCRYPTION +IMPORT OWN ALIEN NOTINFILEDIALOG NOTINCHOOSER ENCRYPTION com.sun.star.comp.chart2.XMLFilter XML diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Draw_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Draw_.xcu index b32c713..a4a6c37 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Draw_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Draw_.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -IMPORT EXPORT TEMPLATE OWN ALIEN PREFERRED ENCRYPTION +IMPORT TEMPLATE OWN ALIEN PREFERRED ENCRYPTION XML diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Impress_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Impress_.xcu index 258cf49..af61108 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Impress_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Impress_.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -IMPORT EXPORT TEM
[Libreoffice-commits] core.git: filter/source
filter/source/config/fragments/filters/ODG_FlatXML.xcu |2 +- filter/source/config/fragments/filters/ODP_FlatXML.xcu |2 +- filter/source/config/fragments/filters/ODS_FlatXML.xcu |2 +- filter/source/config/fragments/filters/ODT_FlatXML.xcu |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 17f39da974adcb39a1d4e2abfd071eff66eee8b5 Author: Bryan Quigley Date: Sun Nov 10 14:29:31 2013 -0500 Make Flat XML document name consistant with ODF List discussion: http://lists.freedesktop.org/archives/libreoffice/2013-November/057337.html Change-Id: I4ddaa7adcffefbedab895f5e94eb6bd92201386e Reviewed-on: https://gerrit.libreoffice.org/7488 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/filter/source/config/fragments/filters/ODG_FlatXML.xcu b/filter/source/config/fragments/filters/ODG_FlatXML.xcu index f370f43..ff5fefc 100644 --- a/filter/source/config/fragments/filters/ODG_FlatXML.xcu +++ b/filter/source/config/fragments/filters/ODG_FlatXML.xcu @@ -24,7 +24,7 @@ com.sun.star.comp.Writer.XmlFilterAdaptor -OpenDocument Drawing (Flat XML) +Flat XML ODF Drawing IMPORT EXPORT OWN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/ODP_FlatXML.xcu b/filter/source/config/fragments/filters/ODP_FlatXML.xcu index c45962f..d568b43 100644 --- a/filter/source/config/fragments/filters/ODP_FlatXML.xcu +++ b/filter/source/config/fragments/filters/ODP_FlatXML.xcu @@ -24,7 +24,7 @@ com.sun.star.comp.Writer.XmlFilterAdaptor -OpenDocument Presentation (Flat XML) +Flat XML ODF Presentation IMPORT EXPORT OWN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/ODS_FlatXML.xcu b/filter/source/config/fragments/filters/ODS_FlatXML.xcu index 4c8b7b6..e7b1ed7 100644 --- a/filter/source/config/fragments/filters/ODS_FlatXML.xcu +++ b/filter/source/config/fragments/filters/ODS_FlatXML.xcu @@ -24,7 +24,7 @@ com.sun.star.comp.Writer.XmlFilterAdaptor -OpenDocument Spreadsheet (Flat XML) +Flat XML ODF Spreadsheet IMPORT EXPORT OWN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/ODT_FlatXML.xcu b/filter/source/config/fragments/filters/ODT_FlatXML.xcu index aa28ef5..e23b17e 100644 --- a/filter/source/config/fragments/filters/ODT_FlatXML.xcu +++ b/filter/source/config/fragments/filters/ODT_FlatXML.xcu @@ -24,7 +24,7 @@ com.sun.star.comp.Writer.XmlFilterAdaptor -OpenDocument Text (Flat XML) +Flat XML ODF Text Document IMPORT EXPORT OWN 3RDPARTYFILTER ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu |2 +- filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu |2 +- filter/source/config/fragments/filters/Text__encoded__ui.xcu |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 7a14419439103676916590b5fda110a514585b80 Author: Bryan Quigley Date: Sun Nov 10 12:51:14 2013 -0500 Make text choose encoding See thread here: http://lists.freedesktop.org/archives/libreoffice/2013-November/057337.html Change-Id: I1de7c24f8be8a7d1142275311f94b6e4e7800229 Reviewed-on: https://gerrit.libreoffice.org/7487 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu b/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu index d7e8fc0..ea8bdb7 100644 --- a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu +++ b/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu @@ -17,6 +17,6 @@ --> -Text Encoded (Master Document) +Text - Choose Encoding (Master Document) diff --git a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu b/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu index 025d63f..5d6fa4b 100644 --- a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu +++ b/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu @@ -17,6 +17,6 @@ --> -Text Encoded (Writer/Web) +Text - Choose Encoding (Writer/Web) diff --git a/filter/source/config/fragments/filters/Text__encoded__ui.xcu b/filter/source/config/fragments/filters/Text__encoded__ui.xcu index f4d8b29..81353c9 100644 --- a/filter/source/config/fragments/filters/Text__encoded__ui.xcu +++ b/filter/source/config/fragments/filters/Text__encoded__ui.xcu @@ -17,6 +17,6 @@ --> -Text Encoded +Text - Choose Encoding ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Save as formats explored
> I know people who still use StarOffice 5.2 so there are surely people out > there who still might use these formats. I am happy to look at actual use cases for these formats. Why do they still use StarOffice 5.2? (Is this more common than I think?, Are they using it on a OS platform that is still supported?) What format do you send them documents in? What's keeping them from upgrading to LibreOffice? > If you can provide some numbers that show that nobody has used this feature > in a long time I think we can agree to remove it. All the data I can really provide is from Google filetype searches: Here is ODT: https://encrypted.google.com/search?hl=en&q=filetype%3Asxw#hl=en&q=-facebook+filetype:odt Note that there don't appear to be many false positives. Here is SXW: https://encrypted.google.com/search?hl=en&q=filetype%3Asxw#hl=en&q=-facebook+filetype:sxw Note the abundance of false positives. If you switch it to past year on either, for SXW you get two pages of results (all false positives?). Like the Word 95/6.0 file formats, I would expect more people use this accidentally then still use it. And yes, the results aren't loss of data; just loss of time and possibly sending someone a document they can't open. (Remember Office 2007/2010 can open ODF now) This is the same reason I want the Flat XML versions to still sound technical, so that average users don't accidentally pick it. Users will ignore options they don't understand. When I don't see a need for saving to the format anymore and I think there is a high chance that users will accidentally pick the format that's when I propose removing it. As for removing clutter, that's also important. We don't have the 80/20 rule in effect for file formats and I'm not proposing it. I would guess we closer to a 99.999/000.001 ratio before we start removing a file format. There is a real cost in users looking at options that will never be useful to them. Thanks, Bryan *Facebook appears to be spamming Google results... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Save as formats explored
Thanks for the feedback. The patches for all three are attached. 1. I should reiterate that I'm just removing Write support ONLY for "OpenOffice 1.0" formats. You would still be able to open them and save them as newer formats. (This is very similar to what I did for Word 95/6.0 which didn't seem to cause any issues). I believe calling it OpenOffice 1.0 should have implied it's legacy. 2. I went with Flat XML ODF Text Document. 3. I went with Text - Choose Encoding. One issue that I noticed is that if you make a Master Document, it gives you the option to save as -> Text Encoded/Choose Encoding. Should this be removed from there? Thank you! Bryan Quigley Just to reiterate, because my previous copyright statement was too specific: All of my past & future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. diff --git a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu b/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu index d7e8fc0..ea8bdb7 100644 --- a/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu +++ b/filter/source/config/fragments/filters/Text__encoded___StarWriter_GlobalDocument__ui.xcu @@ -17,6 +17,6 @@ --> -Text Encoded (Master Document) +Text - Choose Encoding (Master Document) diff --git a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu b/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu index 025d63f..5d6fa4b 100644 --- a/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu +++ b/filter/source/config/fragments/filters/Text__encoded___StarWriter_Web__ui.xcu @@ -17,6 +17,6 @@ --> -Text Encoded (Writer/Web) +Text - Choose Encoding (Writer/Web) diff --git a/filter/source/config/fragments/filters/Text__encoded__ui.xcu b/filter/source/config/fragments/filters/Text__encoded__ui.xcu index f4d8b29..81353c9 100644 --- a/filter/source/config/fragments/filters/Text__encoded__ui.xcu +++ b/filter/source/config/fragments/filters/Text__encoded__ui.xcu @@ -17,6 +17,6 @@ --> -Text Encoded +Text - Choose Encoding diff --git a/filter/source/config/fragments/filters/ODG_FlatXML.xcu b/filter/source/config/fragments/filters/ODG_FlatXML.xcu index f370f43..ff5fefc 100644 --- a/filter/source/config/fragments/filters/ODG_FlatXML.xcu +++ b/filter/source/config/fragments/filters/ODG_FlatXML.xcu @@ -24,7 +24,7 @@ com.sun.star.comp.Writer.XmlFilterAdaptor -OpenDocument Drawing (Flat XML) +Flat XML ODF Drawing IMPORT EXPORT OWN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/ODP_FlatXML.xcu b/filter/source/config/fragments/filters/ODP_FlatXML.xcu index c45962f..d568b43 100644 --- a/filter/source/config/fragments/filters/ODP_FlatXML.xcu +++ b/filter/source/config/fragments/filters/ODP_FlatXML.xcu @@ -24,7 +24,7 @@ com.sun.star.comp.Writer.XmlFilterAdaptor -OpenDocument Presentation (Flat XML) +Flat XML ODF Presentation IMPORT EXPORT OWN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/ODS_FlatXML.xcu b/filter/source/config/fragments/filters/ODS_FlatXML.xcu index 4c8b7b6..e7b1ed7 100644 --- a/filter/source/config/fragments/filters/ODS_FlatXML.xcu +++ b/filter/source/config/fragments/filters/ODS_FlatXML.xcu @@ -24,7 +24,7 @@ com.sun.star.comp.Writer.XmlFilterAdaptor -OpenDocument Spreadsheet (Flat XML) +Flat XML ODF Spreadsheet IMPORT EXPORT OWN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/ODT_FlatXML.xcu b/filter/source/config/fragments/filters/ODT_FlatXML.xcu index aa28ef5..e23b17e 100644 --- a/filter/source/config/fragments/filters/ODT_FlatXML.xcu +++ b/filter/source/config/fragments/filters/ODT_FlatXML.xcu @@ -24,7 +24,7 @@ com.sun.star.comp.Writer.XmlFilterAdaptor -OpenDocument Text (Flat XML) +Flat XML ODF Text Document IMPORT EXPORT OWN 3RDPARTYFILTER diff --git a/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu b/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu index b1f5c03..0a1fdce 100644 --- a/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu +++ b/filter/source/config/fragments/filters/StarOffice_XML__Base_.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -IMPORT EXPORT OWN DEFAULT 3RDPARTYFILTER ENCRYPTION +IMPORT OWN DEFAULT 3RDPARTYFILTER ENCRYPTION diff --
Save as formats explored
Hi all, I've been looking at the Save As formats again and have another few changes I'd like to propose. Like last time, these changes would be UI only and not impact importing these file formats. 1. Remove all of the "OpenOffice.org 1.0" file formats. People may think they should use this to communicate with OpenOffice users. More importantly I don't see any use case for this file format anymore. Is anyone still exporting to it / or know anyone who is? (Google,which overestimates shows filetype:sxw, 23,300. filetype:odt, 2,610,000. ) 2. Change one of these names to be consistent: ODF Text Document (odt) OpenDocument Text (Flat XML) (fodt) Either: OpenDocument Text (odt) or Flat ODF Text Document (fodt) 3. Change "Text Encoded (.txt)" to "Text (Choose Encoding) (.txt) or "Text - Choose Encoding (.txt)" Any preferences/comments on the above? I'm happy to make patches for all once we reach consensus. Thank you! Bryan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Re: Remove save to old Microsoft office formats
Hi all, > Was discussed in ESC call, so pushed to master and 4.0 now. Thanks! > Could you update the features page with this info I updated this page http://wiki.documentfoundation.org/ReleaseNotes/4.0 with: Dropped support for legacy Word and Excel (version 6.0/95) files. These files can still be opened, but they will save in your default format (usually .odt/.ods). > Wow - that's bold :-) Glad it got approved as is. 4.0 is a good time to do things like this :) > I assume the root problem you want to fix is of users accidentally > picking the wrong format in the filter / drop-down and getting a > needlessly bad experience here ? Correct. They may have been told things like, "make sure to use the old version of .doc". It's generally easier to pick what you want on a shorter list as well. Thanks again, Bryan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Remove save to old Microsoft office formats
Hi all, This patch removes the ability to save to old office 6/95 formats. I've also opened a bug on it here: https://bugs.freedesktop.org/show_bug.cgi?id=53471 It's a very trivial patch but: This contribution to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. This patch was also written before I joined Canonical. Thanks, Bryan Quigley 0001-Removed-save-to-Office-6.0-95-formats.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] Remove old Word 6.0/95 "save as" support
Hi all, I'd like to get opinions (and preferably consensus) on removing old Microsoft formats "save as" support, specifically: Word 6.0 Word 95 Excel 5.0 Excel 95 The usability problem I've seen is that users: * want to save in MS Word format, but don't know what version to use * the pick 6.0 or 95 thinking many different things (lower number means it will work with more computers?) * since this is there only copy of the file, they lose all tables and more We currently have the same "This document may contain formatting or content that can not be saved in..." message for if you are saving to Word 97/2000/XP (very good at saving) or Word 6.0 (very bad at saving). I also do not think customizing this text to make it more specific will help. Users have become trained by the interface to ignore this message (this is a different usability issue, NOT a user issue). I believe the old binary StarOffice file "save as" support is going away soon as well. So, Does anyone still need to save in an extremely old version of Word or Excel? Or can we get rid of it? Thanks! Bryan P.S. Please copy me on any replies. P.S.S. I've previously reported this as a bug against OpenOffice (http://www.openoffice.org/issues/show_bug.cgi?id=107711). Should I report it against LibreOffice as well? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
