[openoffice] branch AOO42X updated: Maintenance cleanup
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 2e5a9e16ca Maintenance cleanup
2e5a9e16ca is described below
commit 2e5a9e16ca7183442c7784b02769c09d09776e6a
Author: mseidel
AuthorDate: Mon Aug 28 21:50:26 2023 +0200
Maintenance cleanup
(cherry picked from commit 681286523c50f34f13f05f7b87ce0c70e28295de)
---
main/sw/source/filter/rtf/swparrtf.hxx | 359 +-
main/sw/source/filter/ww8/docxexport.cxx | 868 -
main/sw/source/filter/ww8/docxexport.hxx | 209 +++---
main/sw/source/filter/ww8/docxexportfilter.cxx | 182 +++---
main/sw/source/filter/ww8/docxexportfilter.hxx | 39 +-
main/tools/source/string/debugprint.cxx| 20 +-
main/writerfilter/source/filter/RtfFilter.cxx | 108 +--
7 files changed, 893 insertions(+), 892 deletions(-)
diff --git a/main/sw/source/filter/rtf/swparrtf.hxx
b/main/sw/source/filter/rtf/swparrtf.hxx
index 6b946b6119..f70f036999 100644
--- a/main/sw/source/filter/rtf/swparrtf.hxx
+++ b/main/sw/source/filter/rtf/swparrtf.hxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* 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
@@ -7,20 +7,19 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#ifndef _SWPARRTF_HXX
#define _SWPARRTF_HXX
@@ -41,14 +40,14 @@
#include
#include
-#include // fuer den Attribut Stack
+#include // fuer den Attribut Stack
#include
#include "../inc/msfilter.hxx"
#include
extern void GetLineIndex(SvxBoxItem &rBox, short nLineThickness, short nSpace,
sal_uInt8 nCol, short nIdx,
-sal_uInt16 nOOIndex, sal_uInt16 nWWIndex, short *pSize);
+ sal_uInt16 nOOIndex, sal_uInt16 nWWIndex, short *pSize);
class Font;
class Graphic;
@@ -71,9 +70,9 @@ struct SvxRTFPictureType;
class RtfReader: public Reader
{
-virtual sal_uLong Read( SwDoc &, const String& rBaseURL, SwPaM &,const
String &);
+ virtual sal_uLong Read( SwDoc &, const String& rBaseURL, SwPaM &,const
String &);
public:
-virtual sal_uLong Read( SvStream* pStrm, SwDoc &, const String& rBaseURL,
SwPaM &);
+ virtual sal_uLong Read( SvStream* pStrm, SwDoc &, const String&
rBaseURL, SwPaM &);
};
class SwNodeIdx : public SvxNodeIdx
@@ -88,15 +87,15 @@ public:
class BookmarkPosition
{
public:
-SwNodeIndex maMkNode;
-xub_StrLen mnMkCntnt;
-BookmarkPosition(const SwPaM &rPaM);
-BookmarkPosition(const BookmarkPosition &rEntry);
+ SwNodeIndex maMkNode;
+ xub_StrLen mnMkCntnt;
+ BookmarkPosition(const SwPaM &rPaM);
+ BookmarkPosition(const BookmarkPosition &rEntry);
bool operator==(const BookmarkPosition);
private:
-//No assignment
-BookmarkPosition& operator=(const BookmarkPosition&);
+ // No assignment
+ BookmarkPosition& operator=(const BookmarkPosition&);
};
@@ -158,50 +157,50 @@ typedef std::deque< SwListEntry > SwListArr;
struct DocPageInformation
{
SvxBoxItem maBox;
-long mnPaperw;
-long mnPaperh;
-long mnMargl;
-long mnMargr;
-long mnMargt;
-long mnMargb;
-long mnGutter;
-long mnPgnStart;
-bool mbFacingp;
-bool mbLandscape;
-bool mbRTLdoc;
-DocPageInformation();
+ long mnPaperw;
+ long mnPaperh;
+ long mnMargl;
+ long mnMargr;
+ long mnMargt;
+ long mnMargb;
+ long mnGutter;
+ long mnPgnStart;
+ bool mbFacingp;
+ bool mbLandscape;
+ bool mbRTLdoc;
+ DocPageInformation();
};
struct SectPageInformation
{
-std::vector maColumns;
+ std::vector maColumns;
SvxBoxItem maBox;
-SvxNumberType maNumType;
-SwPageDesc *mpTitlePageHdFt;
-SwPageDesc *mpPageHdFt;
-long mnPgwsxn;
-long mnPghsxn;
-long mnMarglsxn;
-long mnMargrsxn;
-long mnMargtsxn;
-long mnMargb
svn commit: r1912017 - /openoffice/devtools/build-scripts/4.1.15/wntmsci/ReadMe.txt
Author: mseidel Date: Wed Aug 30 17:54:37 2023 New Revision: 1912017 URL: http://svn.apache.org/viewvc?rev=1912017&view=rev Log: Small update Modified: openoffice/devtools/build-scripts/4.1.15/wntmsci/ReadMe.txt Modified: openoffice/devtools/build-scripts/4.1.15/wntmsci/ReadMe.txt URL: http://svn.apache.org/viewvc/openoffice/devtools/build-scripts/4.1.15/wntmsci/ReadMe.txt?rev=1912017&r1=1912016&r2=1912017&view=diff == --- openoffice/devtools/build-scripts/4.1.15/wntmsci/ReadMe.txt (original) +++ openoffice/devtools/build-scripts/4.1.15/wntmsci/ReadMe.txt Wed Aug 30 17:54:37 2023 @@ -6,7 +6,7 @@ https://wiki.openoffice.org/wiki/Documen Build Environment: - Windows 10 Pro 22H2 (64-bit) - - Cygwin 3.4.7 (64-bit) + - Cygwin 3.4.8 (64-bit) - Apache Ant 1.9.16 - MozillaBuild 3.4 - MS Visual C++ Compiler 2008 Standard Edition (32-bit)
[openoffice] branch trunk updated: Updated English dictionary
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 863a930eea Updated English dictionary 863a930eea is described below commit 863a930eea0685c3d6bf329ce3f28c3a10ea53ae Author: mseidel AuthorDate: Fri Sep 1 16:19:33 2023 +0200 Updated English dictionary --- main/extensions.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/extensions.lst b/main/extensions.lst index 70218b7125..3026468b64 100644 --- a/main/extensions.lst +++ b/main/extensions.lst @@ -72,7 +72,7 @@ # English (en_AU, en_CA, en_GB, en_US, en_ZA) dictionary [ language=en.* || language=de || language=it ] - 3be983c0def12d91650c7e812de5a89f https://sourceforge.net/projects/aoo-extensions/files/17102/92/dict-en-20230801_aoo.oxt/download "dict-en.oxt" + 4b4f10baafc602cfc93d3b74d60efc4b https://sourceforge.net/projects/aoo-extensions/files/17102/93/dict-en-20230901_aoo.oxt/download "dict-en.oxt" # English (USA, en_US) dictionary [ language==nl || language==ru ]
[openoffice] branch AOO42X updated: Updated English dictionary
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new 05936d8c8d Updated English dictionary 05936d8c8d is described below commit 05936d8c8def15f5b3c05848294cfe9cdb37c7a5 Author: mseidel AuthorDate: Fri Sep 1 16:19:33 2023 +0200 Updated English dictionary (cherry picked from commit 863a930eea0685c3d6bf329ce3f28c3a10ea53ae) --- main/extensions.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/extensions.lst b/main/extensions.lst index 70218b7125..3026468b64 100644 --- a/main/extensions.lst +++ b/main/extensions.lst @@ -72,7 +72,7 @@ # English (en_AU, en_CA, en_GB, en_US, en_ZA) dictionary [ language=en.* || language=de || language=it ] - 3be983c0def12d91650c7e812de5a89f https://sourceforge.net/projects/aoo-extensions/files/17102/92/dict-en-20230801_aoo.oxt/download "dict-en.oxt" + 4b4f10baafc602cfc93d3b74d60efc4b https://sourceforge.net/projects/aoo-extensions/files/17102/93/dict-en-20230901_aoo.oxt/download "dict-en.oxt" # English (USA, en_US) dictionary [ language==nl || language==ru ]
[openoffice] branch AOO41X updated: Updated English dictionary
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new 1bf924f5a7 Updated English dictionary 1bf924f5a7 is described below commit 1bf924f5a728b7cf2c69c51a0d5892f00427c4d9 Author: mseidel AuthorDate: Fri Sep 1 16:23:44 2023 +0200 Updated English dictionary --- main/extensions.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/extensions.lst b/main/extensions.lst index 0c8de03d62..2dad96ecfa 100644 --- a/main/extensions.lst +++ b/main/extensions.lst @@ -39,7 +39,7 @@ # English dictionary [ language=en.* || language=de || language=it ] -3be983c0def12d91650c7e812de5a89f https://sourceforge.net/projects/aoo-extensions/files/17102/92/dict-en-20230801_aoo.oxt/download "dict-en.oxt" +4b4f10baafc602cfc93d3b74d60efc4b https://sourceforge.net/projects/aoo-extensions/files/17102/93/dict-en-20230901_aoo.oxt/download "dict-en.oxt" # English (USA, en_US) dictionary [ language==nl || language==ru ]
[openoffice] branch trunk updated: Simplified graphics
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new ff6a8e0727 Simplified graphics ff6a8e0727 is described below commit ff6a8e0727b879fdd30b357d072905c31f2f1ba3 Author: mseidel AuthorDate: Wed Sep 6 21:11:26 2023 +0200 Simplified graphics --- main/default_images/res/sc10223.png | Bin 173 -> 156 bytes main/default_images/res/sc10224.png | Bin 176 -> 148 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/default_images/res/sc10223.png b/main/default_images/res/sc10223.png index 3eb7177d04..58ac126c2d 100644 Binary files a/main/default_images/res/sc10223.png and b/main/default_images/res/sc10223.png differ diff --git a/main/default_images/res/sc10224.png b/main/default_images/res/sc10224.png index 21a29df5aa..340b7b91c0 100644 Binary files a/main/default_images/res/sc10224.png and b/main/default_images/res/sc10224.png differ
[openoffice] branch AOO42X updated: Simplified graphics
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new 381084fc7a Simplified graphics 381084fc7a is described below commit 381084fc7aa2a8d78bdab8622d2bf7065eb1b7bd Author: mseidel AuthorDate: Wed Sep 6 21:11:26 2023 +0200 Simplified graphics (cherry picked from commit ff6a8e0727b879fdd30b357d072905c31f2f1ba3) --- main/default_images/res/sc10223.png | Bin 173 -> 156 bytes main/default_images/res/sc10224.png | Bin 176 -> 148 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/default_images/res/sc10223.png b/main/default_images/res/sc10223.png index 3eb7177d04..58ac126c2d 100644 Binary files a/main/default_images/res/sc10223.png and b/main/default_images/res/sc10223.png differ diff --git a/main/default_images/res/sc10224.png b/main/default_images/res/sc10224.png index 21a29df5aa..340b7b91c0 100644 Binary files a/main/default_images/res/sc10224.png and b/main/default_images/res/sc10224.png differ
[openoffice] branch AOO41X updated: Simplified graphics
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new cec230555c Simplified graphics cec230555c is described below commit cec230555c34c034f9043ded390893a20ed71da9 Author: mseidel AuthorDate: Wed Sep 6 21:11:26 2023 +0200 Simplified graphics (cherry picked from commit ff6a8e0727b879fdd30b357d072905c31f2f1ba3) --- main/default_images/res/sc10223.png | Bin 173 -> 156 bytes main/default_images/res/sc10224.png | Bin 176 -> 148 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/default_images/res/sc10223.png b/main/default_images/res/sc10223.png index 3eb7177d04..58ac126c2d 100644 Binary files a/main/default_images/res/sc10223.png and b/main/default_images/res/sc10223.png differ diff --git a/main/default_images/res/sc10224.png b/main/default_images/res/sc10224.png index 21a29df5aa..340b7b91c0 100644 Binary files a/main/default_images/res/sc10224.png and b/main/default_images/res/sc10224.png differ
[openoffice] branch trunk updated: Updated Danish dictionary
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new d92367bb08 Updated Danish dictionary d92367bb08 is described below commit d92367bb0838c42b060c59140595936839f6ee2f Author: mseidel AuthorDate: Thu Sep 7 22:11:13 2023 +0200 Updated Danish dictionary --- main/extensions.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/extensions.lst b/main/extensions.lst index 3026468b64..fb25eb7e05 100644 --- a/main/extensions.lst +++ b/main/extensions.lst @@ -56,7 +56,7 @@ # Danish dictionary (incl. synonyms) [ language=da ] - 3e01a52f376b27cc01a44dad6fbe0cf7 https://sourceforge.net/projects/aoo-extensions/files/1429/11/da_dk-2.7.001.oxt/download "dict-da_dk.oxt" + c6d3168b3b8fc98c651b92f6e5bddb5e https://sourceforge.net/projects/aoo-extensions/files/1429/12/da_dk-2.8.001.oxt/download "dict-da_dk.oxt" # German dictionary [ language=de || language=de_DE || language=nl || language=ru ]
[openoffice] branch AOO42X updated: Updated Danish dictionary
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new 53dc1d7313 Updated Danish dictionary 53dc1d7313 is described below commit 53dc1d731393da607eebef41ffd6263bca34d774 Author: mseidel AuthorDate: Thu Sep 7 22:11:13 2023 +0200 Updated Danish dictionary (cherry picked from commit d92367bb0838c42b060c59140595936839f6ee2f) --- main/extensions.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/extensions.lst b/main/extensions.lst index 3026468b64..fb25eb7e05 100644 --- a/main/extensions.lst +++ b/main/extensions.lst @@ -56,7 +56,7 @@ # Danish dictionary (incl. synonyms) [ language=da ] - 3e01a52f376b27cc01a44dad6fbe0cf7 https://sourceforge.net/projects/aoo-extensions/files/1429/11/da_dk-2.7.001.oxt/download "dict-da_dk.oxt" + c6d3168b3b8fc98c651b92f6e5bddb5e https://sourceforge.net/projects/aoo-extensions/files/1429/12/da_dk-2.8.001.oxt/download "dict-da_dk.oxt" # German dictionary [ language=de || language=de_DE || language=nl || language=ru ]
[openoffice] branch AOO41X updated: Updated Danish dictionary
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new 0306a91de9 Updated Danish dictionary 0306a91de9 is described below commit 0306a91de9f9707e22afd2dfffb5904b8c9ad3bb Author: mseidel AuthorDate: Thu Sep 7 22:15:11 2023 +0200 Updated Danish dictionary --- main/extensions.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/extensions.lst b/main/extensions.lst index 2dad96ecfa..70ee0ff86d 100644 --- a/main/extensions.lst +++ b/main/extensions.lst @@ -67,7 +67,7 @@ # Danish dictionary. [ language=da ] -3e01a52f376b27cc01a44dad6fbe0cf7 https://sourceforge.net/projects/aoo-extensions/files/1429/11/da_dk-2.7.001.oxt/download "dict-da_dk.oxt" +c6d3168b3b8fc98c651b92f6e5bddb5e https://sourceforge.net/projects/aoo-extensions/files/1429/12/da_dk-2.8.001.oxt/download "dict-da_dk.oxt" # Lithuanian dictionary. [ language=lt ]
[openoffice] branch trunk updated: Removing commons-httpclient from ext_source since we bootstrap it later when needed
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 0c352e1497 Removing commons-httpclient from ext_source since we bootstrap it later when needed 0c352e1497 is described below commit 0c352e1497c7f7db4e548ddd1b896c5a24b848e6 Author: mseidel AuthorDate: Sat Sep 9 20:59:09 2023 +0200 Removing commons-httpclient from ext_source since we bootstrap it later when needed --- ...02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz | Bin 1882664 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ext_sources/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz b/ext_sources/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz deleted file mode 100644 index f52b40704b..00 Binary files a/ext_sources/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz and /dev/null differ
[openoffice] branch AOO42X updated: Removing commons-httpclient from ext_source since we bootstrap it later when needed
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new 087f8b2ba9 Removing commons-httpclient from ext_source since we bootstrap it later when needed 087f8b2ba9 is described below commit 087f8b2ba9a9bbfd2bd1620481a6c6db04e320c4 Author: mseidel AuthorDate: Sat Sep 9 20:59:09 2023 +0200 Removing commons-httpclient from ext_source since we bootstrap it later when needed (cherry picked from commit 0c352e1497c7f7db4e548ddd1b896c5a24b848e6) --- ...02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz | Bin 1882664 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ext_sources/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz b/ext_sources/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz deleted file mode 100644 index f52b40704b..00 Binary files a/ext_sources/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz and /dev/null differ
[openoffice] branch AOO41X updated: Removing commons-httpclient from ext_source since we bootstrap it later when needed
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new 2957f65b9b Removing commons-httpclient from ext_source since we bootstrap it later when needed 2957f65b9b is described below commit 2957f65b9b457eb30c4edab0ddf55a9b5636feb8 Author: mseidel AuthorDate: Sat Sep 9 20:59:09 2023 +0200 Removing commons-httpclient from ext_source since we bootstrap it later when needed (cherry picked from commit 0c352e1497c7f7db4e548ddd1b896c5a24b848e6) --- ...02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz | Bin 1882664 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ext_sources/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz b/ext_sources/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz deleted file mode 100644 index f52b40704b..00 Binary files a/ext_sources/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz and /dev/null differ
[openoffice] branch trunk updated: Removing icu4c from ext_source since we bootstrap it later
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 3ef6d585c1 Removing icu4c from ext_source since we bootstrap it later 3ef6d585c1 is described below commit 3ef6d585c1326a9c685cda800b11439a15dffce6 Author: mseidel AuthorDate: Sat Sep 9 21:43:16 2023 +0200 Removing icu4c from ext_source since we bootstrap it later --- ...ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz | Bin 12356471 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ext_sources/2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz b/ext_sources/2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz deleted file mode 100644 index c8379720df..00 Binary files a/ext_sources/2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz and /dev/null differ
[openoffice] branch AOO42X updated: Removing icu4c from ext_source since we bootstrap it later
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new cdd0ee92ad Removing icu4c from ext_source since we bootstrap it later cdd0ee92ad is described below commit cdd0ee92adf62b15d3e26d4e4923f9a1aeb70ea7 Author: mseidel AuthorDate: Sat Sep 9 21:43:16 2023 +0200 Removing icu4c from ext_source since we bootstrap it later (cherry picked from commit 3ef6d585c1326a9c685cda800b11439a15dffce6) --- ...ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz | Bin 12356471 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ext_sources/2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz b/ext_sources/2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz deleted file mode 100644 index c8379720df..00 Binary files a/ext_sources/2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz and /dev/null differ
[openoffice] branch AOO41X updated: Removing icu4c from ext_source since we bootstrap it later
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new 5d0b249b16 Removing icu4c from ext_source since we bootstrap it later 5d0b249b16 is described below commit 5d0b249b1658ad08b6f593afd65151b3417d3a06 Author: mseidel AuthorDate: Sat Sep 9 21:43:16 2023 +0200 Removing icu4c from ext_source since we bootstrap it later (cherry picked from commit 3ef6d585c1326a9c685cda800b11439a15dffce6) --- ...ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz | Bin 12356471 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ext_sources/2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz b/ext_sources/2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz deleted file mode 100644 index c8379720df..00 Binary files a/ext_sources/2f6ecca935948f7db92d925d88d0d078-icu4c-4_0_1-src.tgz and /dev/null differ
[openoffice] branch trunk updated: Removing libpng from ext_source, bootstrap it later
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 53093d1e69 Removing libpng from ext_source, bootstrap it later 53093d1e69 is described below commit 53093d1e6919ddd8041d2ad586cc2c77b5272a27 Author: mseidel AuthorDate: Sat Sep 9 22:25:18 2023 +0200 Removing libpng from ext_source, bootstrap it later --- ...98347a5541a2dad55cd6d07ee60a9-libpng-1.5.26.tar.gz | Bin 1129120 -> 0 bytes main/external_deps.lst| 6 ++ 2 files changed, 6 insertions(+) diff --git a/ext_sources/3ca98347a5541a2dad55cd6d07ee60a9-libpng-1.5.26.tar.gz b/ext_sources/3ca98347a5541a2dad55cd6d07ee60a9-libpng-1.5.26.tar.gz deleted file mode 100644 index 5a73701885..00 Binary files a/ext_sources/3ca98347a5541a2dad55cd6d07ee60a9-libpng-1.5.26.tar.gz and /dev/null differ diff --git a/main/external_deps.lst b/main/external_deps.lst index f3b069e8d2..1dc7f484b1 100644 --- a/main/external_deps.lst +++ b/main/external_deps.lst @@ -132,6 +132,12 @@ if (SOLAR_JAVA==TRUE && (ENABLE_MEDIAWIKI==YES || ENABLE_REPORTBUILDER==YES)) URL1 = https://archive.apache.org/dist/commons/logging/source/$(name) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) +if (SYSTEM_LIBPNG != YES) +MD5 = 3ca98347a5541a2dad55cd6d07ee60a9 +name = libpng-1.5.26.tar.gz +URL1 = https://sourceforge.net/projects/libpng/files/libpng15/older-releases/1.5.26/$(name) +URL2 = $(OOO_EXTRAS)$(MD5)-$(name) + if (SYSTEM_JPEG != YES) MD5 = 52654eb3b2e60c35731ea8fc87f1bd29 name = jpeg-8d.tar.gz
[openoffice] branch AOO42X updated: Removing libpng from ext_source, bootstrap it later
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new aed3baeee4 Removing libpng from ext_source, bootstrap it later aed3baeee4 is described below commit aed3baeee4425c6dc1957fcf1757556f4a6ea9b9 Author: mseidel AuthorDate: Sat Sep 9 22:25:18 2023 +0200 Removing libpng from ext_source, bootstrap it later (cherry picked from commit 53093d1e6919ddd8041d2ad586cc2c77b5272a27) --- ...98347a5541a2dad55cd6d07ee60a9-libpng-1.5.26.tar.gz | Bin 1129120 -> 0 bytes main/external_deps.lst| 6 ++ 2 files changed, 6 insertions(+) diff --git a/ext_sources/3ca98347a5541a2dad55cd6d07ee60a9-libpng-1.5.26.tar.gz b/ext_sources/3ca98347a5541a2dad55cd6d07ee60a9-libpng-1.5.26.tar.gz deleted file mode 100644 index 5a73701885..00 Binary files a/ext_sources/3ca98347a5541a2dad55cd6d07ee60a9-libpng-1.5.26.tar.gz and /dev/null differ diff --git a/main/external_deps.lst b/main/external_deps.lst index 71264e9070..617c09978a 100644 --- a/main/external_deps.lst +++ b/main/external_deps.lst @@ -138,6 +138,12 @@ if (SOLAR_JAVA==TRUE && (ENABLE_MEDIAWIKI==YES || ENABLE_REPORTBUILDER==YES)) URL1 = https://archive.apache.org/dist/commons/logging/source/$(name) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) +if (SYSTEM_LIBPNG != YES) +MD5 = 3ca98347a5541a2dad55cd6d07ee60a9 +name = libpng-1.5.26.tar.gz +URL1 = https://sourceforge.net/projects/libpng/files/libpng15/older-releases/1.5.26/$(name) +URL2 = $(OOO_EXTRAS)$(MD5)-$(name) + if (SYSTEM_JPEG != YES) MD5 = 52654eb3b2e60c35731ea8fc87f1bd29 name = jpeg-8d.tar.gz
[openoffice] branch trunk updated: Removing hsqldb from ext_source since we bootstrap it later
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new d98be9a246 Removing hsqldb from ext_source since we bootstrap it later d98be9a246 is described below commit d98be9a24613ebe504de87f0f919d2f1a41bc1d6 Author: mseidel AuthorDate: Tue Sep 12 17:21:59 2023 +0200 Removing hsqldb from ext_source since we bootstrap it later --- .../17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip | Bin 3519470 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ext_sources/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip b/ext_sources/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip deleted file mode 100644 index 8f932dcdba..00 Binary files a/ext_sources/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip and /dev/null differ
[openoffice] branch AOO42X updated: Removing hsqldb from ext_source since we bootstrap it later
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new 65413f9714 Removing hsqldb from ext_source since we bootstrap it later 65413f9714 is described below commit 65413f971454d98eb120fac8f0c653995d145586 Author: mseidel AuthorDate: Tue Sep 12 17:21:59 2023 +0200 Removing hsqldb from ext_source since we bootstrap it later (cherry picked from commit d98be9a24613ebe504de87f0f919d2f1a41bc1d6) --- .../17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip | Bin 3519470 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ext_sources/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip b/ext_sources/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip deleted file mode 100644 index 8f932dcdba..00 Binary files a/ext_sources/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip and /dev/null differ
[openoffice] branch AOO41X updated: Removing hsqldb from ext_source since we bootstrap it later
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new efedb85fa1 Removing hsqldb from ext_source since we bootstrap it later efedb85fa1 is described below commit efedb85fa165fce2f1cf1cabad4d626e2b4ab7bf Author: mseidel AuthorDate: Tue Sep 12 17:21:59 2023 +0200 Removing hsqldb from ext_source since we bootstrap it later (cherry picked from commit d98be9a24613ebe504de87f0f919d2f1a41bc1d6) --- .../17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip | Bin 3519470 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ext_sources/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip b/ext_sources/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip deleted file mode 100644 index 8f932dcdba..00 Binary files a/ext_sources/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip and /dev/null differ
[openoffice] branch trunk updated: Fixed typos, removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 0f46dff71a Fixed typos, removed whitespace
0f46dff71a is described below
commit 0f46dff71a3a0e0942a743e8b5b7c556cf7fbc70
Author: mseidel
AuthorDate: Wed Sep 13 00:22:46 2023 +0200
Fixed typos, removed whitespace
---
main/UnoControls/source/controls/framecontrol.cxx | 51 ---
1 file changed, 26 insertions(+), 25 deletions(-)
diff --git a/main/UnoControls/source/controls/framecontrol.cxx
b/main/UnoControls/source/controls/framecontrol.cxx
index 4afbfa5d06..24ecdcac9f 100644
--- a/main/UnoControls/source/controls/framecontrol.cxx
+++ b/main/UnoControls/source/controls/framecontrol.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* 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
@@ -7,21 +7,20 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
-
//__
// my own include
//__
@@ -89,13 +88,13 @@ Any SAL_CALL FrameControl::queryInterface( const Type&
rType ) throw( RuntimeExc
Reference< XInterface > xDel = BaseControl::impl_getDelegator();
if ( xDel.is() )
{
- // If an delegator exist, forward question to his
queryInterface.
+ // If a delegator exists, forward question to his
queryInterface.
// Delegator will ask his own queryAggregation!
aReturn = xDel->queryInterface( rType );
}
else
{
- // If an delegator unknown, forward question to own
queryAggregation.
+ // If a delegator unknown, forward question to own
queryAggregation.
aReturn = queryAggregation( rType );
}
@@ -149,8 +148,8 @@ Sequence< Type > SAL_CALL FrameControl::getTypes() throw(
RuntimeException )
{
// Create a static typecollection ...
static OTypeCollection aTypeCollection (
::getCppuType(( const Reference< XControlModel >*)NULL
) ,
-
::getCppuType(( const Reference<
XControlContainer >*)NULL ) ,
-
::getCppuType(( const Reference<
XConnectionPointContainer >*)NULL ) ,
+
::getCppuType(( const Reference<
XControlContainer >*)NULL ) ,
+
::getCppuType(( const Reference<
XConnectionPointContainer >*)NULL ) ,
BaseControl::getTypes()
);
// ... and set his address to static pointer!
@@ -170,8 +169,8 @@ Any SAL_CALL FrameControl::queryAggregation( const Type&
aType ) throw( RuntimeE
// Ask for my own supported interfaces ...
// Attention: XTypeProvider and XInterface are supported by
OComponentHelper!
Any aReturn ( ::cppu::queryInterface( aType
,
-
static_cast< XControlModel* > ( this )
,
-
[openoffice] branch AOO42X updated: Fixed typos, removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new a3f67fb4d2 Fixed typos, removed whitespace
a3f67fb4d2 is described below
commit a3f67fb4d220fe5bca57e7af54239899b2ff8f8b
Author: mseidel
AuthorDate: Wed Sep 13 00:22:46 2023 +0200
Fixed typos, removed whitespace
(cherry picked from commit 0f46dff71a3a0e0942a743e8b5b7c556cf7fbc70)
---
main/UnoControls/source/controls/framecontrol.cxx | 51 ---
1 file changed, 26 insertions(+), 25 deletions(-)
diff --git a/main/UnoControls/source/controls/framecontrol.cxx
b/main/UnoControls/source/controls/framecontrol.cxx
index 4afbfa5d06..24ecdcac9f 100644
--- a/main/UnoControls/source/controls/framecontrol.cxx
+++ b/main/UnoControls/source/controls/framecontrol.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* 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
@@ -7,21 +7,20 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
-
//__
// my own include
//__
@@ -89,13 +88,13 @@ Any SAL_CALL FrameControl::queryInterface( const Type&
rType ) throw( RuntimeExc
Reference< XInterface > xDel = BaseControl::impl_getDelegator();
if ( xDel.is() )
{
- // If an delegator exist, forward question to his
queryInterface.
+ // If a delegator exists, forward question to his
queryInterface.
// Delegator will ask his own queryAggregation!
aReturn = xDel->queryInterface( rType );
}
else
{
- // If an delegator unknown, forward question to own
queryAggregation.
+ // If a delegator unknown, forward question to own
queryAggregation.
aReturn = queryAggregation( rType );
}
@@ -149,8 +148,8 @@ Sequence< Type > SAL_CALL FrameControl::getTypes() throw(
RuntimeException )
{
// Create a static typecollection ...
static OTypeCollection aTypeCollection (
::getCppuType(( const Reference< XControlModel >*)NULL
) ,
-
::getCppuType(( const Reference<
XControlContainer >*)NULL ) ,
-
::getCppuType(( const Reference<
XConnectionPointContainer >*)NULL ) ,
+
::getCppuType(( const Reference<
XControlContainer >*)NULL ) ,
+
::getCppuType(( const Reference<
XConnectionPointContainer >*)NULL ) ,
BaseControl::getTypes()
);
// ... and set his address to static pointer!
@@ -170,8 +169,8 @@ Any SAL_CALL FrameControl::queryAggregation( const Type&
aType ) throw( RuntimeE
// Ask for my own supported interfaces ...
// Attention: XTypeProvider and XInterface are supported by
OComponentHelper!
Any aReturn ( ::cppu::queryInterface( aType
,
-
[openoffice] branch trunk updated: Fixed typo (possibel -> possible) and some others
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 4ff439bb68 Fixed typo (possibel -> possible) and some others
4ff439bb68 is described below
commit 4ff439bb6886f3bed33191fca8cb2e1ca650bbd9
Author: mseidel
AuthorDate: Sun Sep 17 14:37:03 2023 +0200
Fixed typo (possibel -> possible) and some others
---
main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx | 122
main/l10ntools/source/filter/utils/Cache.java | 97 +--
2 files changed, 111 insertions(+), 108 deletions(-)
diff --git a/main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
b/main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
index 8e614e1742..d7c9761411 100644
--- a/main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
+++ b/main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -40,7 +40,7 @@ namespace basegfx
class B2DPoint;
class B2DVector;
class B2DHomMatrix;
-class B2DCubicBezier;
+ class B2DCubicBezier;
} // end of namespace basegfx
//
@@ -49,12 +49,12 @@ namespace basegfx
{
class BASEGFX_DLLPUBLIC B2DPolygon
{
-public:
-typedef o3tl::cow_wrapper< ImplB2DPolygon > ImplType;
+ public:
+ typedef o3tl::cow_wrapper< ImplB2DPolygon > ImplType;
private:
// internal data.
-ImplTypempPolygon;
+ ImplType
mpPolygon;
public:
/// diverse constructors
@@ -66,8 +66,8 @@ namespace basegfx
/// assignment operator
B2DPolygon& operator=(const B2DPolygon& rPolygon);
-/// unshare this polygon with all internally shared instances
-void makeUnique();
+ /// unshare this polygon with all internally shared instances
+ void makeUnique();
/// compare operators
bool operator==(const B2DPolygon& rPolygon) const;
@@ -77,7 +77,7 @@ namespace basegfx
sal_uInt32 count() const;
/// Coordinate interface
-basegfx::B2DPoint getB2DPoint(sal_uInt32 nIndex) const;
+ basegfx::B2DPoint getB2DPoint(sal_uInt32 nIndex) const;
void setB2DPoint(sal_uInt32 nIndex, const basegfx::B2DPoint&
rValue);
/// Coordinate insert/append
@@ -108,36 +108,36 @@ namespace basegfx
bool isNextControlPointUsed(sal_uInt32 nIndex) const;
B2VectorContinuity getContinuityInPoint(sal_uInt32 nIndex)
const;
-/** check edge for being a bezier segment
-
-This test the existence of control vectors, but do not apply
-testAndSolveTrivialBezier() to the bezier segment, so it is still
useful
-to do so.
-Since it can use internal data representations, it is faster
-than using getBezierSegment() and applying isBezier() on it.
-
-@param nIndex
-Index of the addressed edge's start point
-
-@return
-true if edge exists and at least one control vector is used
-*/
-bool isBezierSegment(sal_uInt32 nIndex) const;
-
-/** bezier segment access
-
-This method also works when it is no bezier segment at all and
will fill
-the given B2DCubicBezier as needed.
-In any case, the given B2DCubicBezier will be filled, if necessary
with
-the single start point (if no valid edge exists).
-
-@param nIndex
-Index of the addressed edge's start point
-
-@param rTarget
-
[openoffice] branch AOO42X updated: Fixed typo (possibel -> possible) and some others
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new d13ddb8257 Fixed typo (possibel -> possible) and some others
d13ddb8257 is described below
commit d13ddb8257991fd8b69407e38f9fc0504fe0aa83
Author: mseidel
AuthorDate: Sun Sep 17 14:37:03 2023 +0200
Fixed typo (possibel -> possible) and some others
(cherry picked from commit 4ff439bb6886f3bed33191fca8cb2e1ca650bbd9)
---
main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx | 122
main/l10ntools/source/filter/utils/Cache.java | 97 +--
2 files changed, 111 insertions(+), 108 deletions(-)
diff --git a/main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
b/main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
index 8e614e1742..d7c9761411 100644
--- a/main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
+++ b/main/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -40,7 +40,7 @@ namespace basegfx
class B2DPoint;
class B2DVector;
class B2DHomMatrix;
-class B2DCubicBezier;
+ class B2DCubicBezier;
} // end of namespace basegfx
//
@@ -49,12 +49,12 @@ namespace basegfx
{
class BASEGFX_DLLPUBLIC B2DPolygon
{
-public:
-typedef o3tl::cow_wrapper< ImplB2DPolygon > ImplType;
+ public:
+ typedef o3tl::cow_wrapper< ImplB2DPolygon > ImplType;
private:
// internal data.
-ImplTypempPolygon;
+ ImplType
mpPolygon;
public:
/// diverse constructors
@@ -66,8 +66,8 @@ namespace basegfx
/// assignment operator
B2DPolygon& operator=(const B2DPolygon& rPolygon);
-/// unshare this polygon with all internally shared instances
-void makeUnique();
+ /// unshare this polygon with all internally shared instances
+ void makeUnique();
/// compare operators
bool operator==(const B2DPolygon& rPolygon) const;
@@ -77,7 +77,7 @@ namespace basegfx
sal_uInt32 count() const;
/// Coordinate interface
-basegfx::B2DPoint getB2DPoint(sal_uInt32 nIndex) const;
+ basegfx::B2DPoint getB2DPoint(sal_uInt32 nIndex) const;
void setB2DPoint(sal_uInt32 nIndex, const basegfx::B2DPoint&
rValue);
/// Coordinate insert/append
@@ -108,36 +108,36 @@ namespace basegfx
bool isNextControlPointUsed(sal_uInt32 nIndex) const;
B2VectorContinuity getContinuityInPoint(sal_uInt32 nIndex)
const;
-/** check edge for being a bezier segment
-
-This test the existence of control vectors, but do not apply
-testAndSolveTrivialBezier() to the bezier segment, so it is still
useful
-to do so.
-Since it can use internal data representations, it is faster
-than using getBezierSegment() and applying isBezier() on it.
-
-@param nIndex
-Index of the addressed edge's start point
-
-@return
-true if edge exists and at least one control vector is used
-*/
-bool isBezierSegment(sal_uInt32 nIndex) const;
-
-/** bezier segment access
-
-This method also works when it is no bezier segment at all and
will fill
-the given B2DCubicBezier as needed.
-In any case, the given B2DCubicBezier will be filled, if necessary
with
-the single start point (if no valid edge exists).
-
-@param nIndex
-Inde
[openoffice] branch trunk updated: Maintenance cleanup
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new ce48dd1f26 Maintenance cleanup
ce48dd1f26 is described below
commit ce48dd1f26396c7ab9fed48d2df6a6b2bfcf6e06
Author: mseidel
AuthorDate: Mon Sep 18 23:16:55 2023 +0200
Maintenance cleanup
---
main/filter/source/msfilter/svxmsbas.cxx| 579 +-
main/idlc/source/options.cxx| 582 +-
main/l10ntools/source/help/HelpCompiler.cxx | 915 ++--
main/l10ntools/source/help/HelpCompiler.hxx | 402 ++--
main/svtools/inc/svtools/svparser.hxx | 70 +--
main/svtools/source/svrtf/parrtf.cxx| 234 ---
main/sw/source/filter/ascii/parasc.cxx | 198 +++---
7 files changed, 1484 insertions(+), 1496 deletions(-)
diff --git a/main/filter/source/msfilter/svxmsbas.cxx
b/main/filter/source/msfilter/svxmsbas.cxx
index 4f7a279ae1..44d97512ec 100644
--- a/main/filter/source/msfilter/svxmsbas.cxx
+++ b/main/filter/source/msfilter/svxmsbas.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -24,7 +24,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_filter.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#include
#include
#include
@@ -59,14 +58,14 @@ using namespace com::sun::star;
using rtl::OUString;
-static ::rtl::OUString sVBAOption( RTL_CONSTASCII_USTRINGPARAM( "Option
VBASupport 1\n" ) );
+static ::rtl::OUString sVBAOption( RTL_CONSTASCII_USTRINGPARAM( "Option
VBASupport 1\n" ) );
int SvxImportMSVBasic::Import( const String& rStorageName,
-const String &rSubStorageName,
-sal_Bool bAsComment, sal_Bool bStripped )
+ const String
&rSubStorageName,
+ sal_Bool bAsComment,
sal_Bool bStripped )
{
-std::vector< String > codeNames;
-return Import( rStorageName, rSubStorageName, codeNames, bAsComment,
bStripped );
+ std::vector< String > codeNames;
+ return Import( rStorageName, rSubStorageName, codeNames, bAsComment,
bStripped );
}
int SvxImportMSVBasic::Import( const String& rStorageName,
@@ -79,8 +78,8 @@ int SvxImportMSVBasic::Import( const String& rStorageName,
bAsComment, bStripped ))
nRet |= 1;
-if (bImport)
-ImportForms_Impl(rStorageName, rSubStorageName);
+ if (bImport)
+ ImportForms_Impl(rStorageName, rSubStorageName);
if( bCopy && CopyStorage_Impl( rStorageName, rSubStorageName ))
nRet |= 2;
@@ -89,105 +88,105 @@ int SvxImportMSVBasic::Import( const String& rStorageName,
}
bool SvxImportMSVBasic::ImportForms_Impl(const String& rStorageName,
-const String& rSubStorageName)
+ const String& rSubStorageName)
{
-SvStorageRef xVBAStg(xRoot->OpenSotStorage(rStorageName,
-STREAM_READWRITE | STREAM_NOCREATE | STREAM_SHARE_DENYALL));
-if (!xVBAStg.Is() || xVBAStg->GetError())
-return false;
-
-std::vector aUserForms;
-SvStorageInfoList aContents;
-xVBAStg->FillInfoList(&aContents);
-for (sal_uInt16 nI = 0; nI < aContents.Count(); ++nI)
-{
- SvStorageInfo& rInfo = aContents.GetObject(nI);
- if (!rInfo.IsStream() && rInfo.GetName() != rSubStorageName)
- aUserForms.push_back(rInfo.GetName());
-}
-
-if (aUserForms.empty())
-return false;
-
-bool bRet = true;
-try
-{
-Reference
xSF(comphelper::getProcessServiceFactory());
-
-Reference xContext;
-Reference xProps(xSF, UNO_QUERY);
-
[openoffice] branch AOO42X updated: Maintenance cleanup
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new facfa769b2 Maintenance cleanup
facfa769b2 is described below
commit facfa769b24085cdd3483ec17d21b4f42b335e99
Author: mseidel
AuthorDate: Mon Sep 18 23:16:55 2023 +0200
Maintenance cleanup
(cherry picked from commit ce48dd1f26396c7ab9fed48d2df6a6b2bfcf6e06)
---
main/filter/source/msfilter/svxmsbas.cxx| 579 +-
main/idlc/source/options.cxx| 582 +-
main/l10ntools/source/help/HelpCompiler.cxx | 915 ++--
main/l10ntools/source/help/HelpCompiler.hxx | 402 ++--
main/svtools/inc/svtools/svparser.hxx | 70 +--
main/svtools/source/svrtf/parrtf.cxx| 234 ---
main/sw/source/filter/ascii/parasc.cxx | 198 +++---
7 files changed, 1484 insertions(+), 1496 deletions(-)
diff --git a/main/filter/source/msfilter/svxmsbas.cxx
b/main/filter/source/msfilter/svxmsbas.cxx
index 4f7a279ae1..44d97512ec 100644
--- a/main/filter/source/msfilter/svxmsbas.cxx
+++ b/main/filter/source/msfilter/svxmsbas.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -24,7 +24,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_filter.hxx"
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil -*- */
#include
#include
#include
@@ -59,14 +58,14 @@ using namespace com::sun::star;
using rtl::OUString;
-static ::rtl::OUString sVBAOption( RTL_CONSTASCII_USTRINGPARAM( "Option
VBASupport 1\n" ) );
+static ::rtl::OUString sVBAOption( RTL_CONSTASCII_USTRINGPARAM( "Option
VBASupport 1\n" ) );
int SvxImportMSVBasic::Import( const String& rStorageName,
-const String &rSubStorageName,
-sal_Bool bAsComment, sal_Bool bStripped )
+ const String
&rSubStorageName,
+ sal_Bool bAsComment,
sal_Bool bStripped )
{
-std::vector< String > codeNames;
-return Import( rStorageName, rSubStorageName, codeNames, bAsComment,
bStripped );
+ std::vector< String > codeNames;
+ return Import( rStorageName, rSubStorageName, codeNames, bAsComment,
bStripped );
}
int SvxImportMSVBasic::Import( const String& rStorageName,
@@ -79,8 +78,8 @@ int SvxImportMSVBasic::Import( const String& rStorageName,
bAsComment, bStripped ))
nRet |= 1;
-if (bImport)
-ImportForms_Impl(rStorageName, rSubStorageName);
+ if (bImport)
+ ImportForms_Impl(rStorageName, rSubStorageName);
if( bCopy && CopyStorage_Impl( rStorageName, rSubStorageName ))
nRet |= 2;
@@ -89,105 +88,105 @@ int SvxImportMSVBasic::Import( const String& rStorageName,
}
bool SvxImportMSVBasic::ImportForms_Impl(const String& rStorageName,
-const String& rSubStorageName)
+ const String& rSubStorageName)
{
-SvStorageRef xVBAStg(xRoot->OpenSotStorage(rStorageName,
-STREAM_READWRITE | STREAM_NOCREATE | STREAM_SHARE_DENYALL));
-if (!xVBAStg.Is() || xVBAStg->GetError())
-return false;
-
-std::vector aUserForms;
-SvStorageInfoList aContents;
-xVBAStg->FillInfoList(&aContents);
-for (sal_uInt16 nI = 0; nI < aContents.Count(); ++nI)
-{
- SvStorageInfo& rInfo = aContents.GetObject(nI);
- if (!rInfo.IsStream() && rInfo.GetName() != rSubStorageName)
- aUserForms.push_back(rInfo.GetName());
-}
-
-if (aUserForms.empty())
-return false;
-
-bool bRet = true;
-try
-{
-Reference
xSF(comphelper::getProcessSe
[openoffice] branch trunk updated: Fixed typos (varaible -> variable) and some other
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 3d12bb4c80 Fixed typos (varaible -> variable) and some other
3d12bb4c80 is described below
commit 3d12bb4c8063d131d21d7316ab6bf172191cc131
Author: mseidel
AuthorDate: Tue Sep 26 00:17:20 2023 +0200
Fixed typos (varaible -> variable) and some other
---
main/dbaccess/source/core/api/KeySet.cxx | 60 ++---
.../sxc/pexcel/records/formula/TokenDecoder.java | 222 -
.../sxc/pexcel/records/formula/TokenEncoder.java | 265 ++---
3 files changed, 273 insertions(+), 274 deletions(-)
diff --git a/main/dbaccess/source/core/api/KeySet.cxx
b/main/dbaccess/source/core/api/KeySet.cxx
index b8384e50a2..adfe9c39ad 100644
--- a/main/dbaccess/source/core/api/KeySet.cxx
+++ b/main/dbaccess/source/core/api/KeySet.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -294,7 +294,7 @@ void OKeySet::construct(const Reference< XResultSet>&
_xDriverSet,const ::rtl::O
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "ocke.jans...@sun.com",
"OKeySet::construct" );
OCacheSet::construct(_xDriverSet,i_sRowSetFilter);
initColumns();
-
+
Reference xKeyColumns = getKeyColumns();
Reference xMeta = m_xConnection->getMetaData();
Reference xQueryColSup(m_xComposer,UNO_QUERY);
@@ -302,7 +302,7 @@ void OKeySet::construct(const Reference< XResultSet>&
_xDriverSet,const ::rtl::O
findTableColumnsMatching_throw(makeAny(m_xTable),m_sUpdateTableName,xMeta,xQueryColumns,m_pKeyColumnNames);
// the first row is empty because it's now easier for us to distinguish
when we are beforefirst or first
- // without extra varaible to be set
+ // without extra variable to be set
m_aKeyMap.insert(OKeySetMatrix::value_type(0,OKeySetValue(NULL,::std::pair
>(0,NULL;
m_aKeyIter = m_aKeyMap.begin();
@@ -330,14 +330,14 @@ void OKeySet::construct(const Reference< XResultSet>&
_xDriverSet,const ::rtl::O
connectivity::OSQLTable
xSelColSup(xSelectTables->getByName(*pIter),uno::UNO_QUERY);
Reference xProp(xSelColSup,uno::UNO_QUERY);
::rtl::OUString sSelectTableName =
::dbtools::composeTableName( xMeta, xProp, ::dbtools::eInDataManipulation,
false, false, false );
-
-
::dbaccess::getColumnPositions(xQueryColumns,xSelColSup->getColumns()->getElementNames(),sSelectTableName,(*m_pForeignColumnNames));
-
+
+
::dbaccess::getColumnPositions(xQueryColumns,xSelColSup->getColumns()->getElementNames(),sSelectTableName,(*m_pForeignColumnNames));
+
SelectColumnsMetaData::iterator aPosEnd =
(*m_pForeignColumnNames).end();
for(SelectColumnsMetaData::iterator aPosIter =
(*m_pForeignColumnNames).begin();aPosIter != aPosEnd;++aPosIter)
{
// look for columns not in the source
columns to use them as filter as well
- // if (
!xSourceColumns->hasByName(aPosIter->first) )
+ // if (
!xSourceColumns->hasByName(aPosIter->first) )
{
if ( aFilter.getLength() )
aFilter.append(aAnd);
@@ -450,14 +450,14 @@ Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const
Sequence< Any >& rows
aSql.append(m_aComposedTableName);
aSql.append(::rtl::OUString::createFromAscii(" WHERE "));
- // list all cloumns that should be set
+
[openoffice] branch AOO42X updated: Fixed typos (varaible -> variable) and some other
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 6e505d7395 Fixed typos (varaible -> variable) and some other
6e505d7395 is described below
commit 6e505d73955a3fca78d9932026a4f8f864036403
Author: mseidel
AuthorDate: Tue Sep 26 00:17:20 2023 +0200
Fixed typos (varaible -> variable) and some other
(cherry picked from commit 3d12bb4c8063d131d21d7316ab6bf172191cc131)
---
main/dbaccess/source/core/api/KeySet.cxx | 60 ++---
.../sxc/pexcel/records/formula/TokenDecoder.java | 222 -
.../sxc/pexcel/records/formula/TokenEncoder.java | 265 ++---
3 files changed, 273 insertions(+), 274 deletions(-)
diff --git a/main/dbaccess/source/core/api/KeySet.cxx
b/main/dbaccess/source/core/api/KeySet.cxx
index b8384e50a2..adfe9c39ad 100644
--- a/main/dbaccess/source/core/api/KeySet.cxx
+++ b/main/dbaccess/source/core/api/KeySet.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -294,7 +294,7 @@ void OKeySet::construct(const Reference< XResultSet>&
_xDriverSet,const ::rtl::O
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "ocke.jans...@sun.com",
"OKeySet::construct" );
OCacheSet::construct(_xDriverSet,i_sRowSetFilter);
initColumns();
-
+
Reference xKeyColumns = getKeyColumns();
Reference xMeta = m_xConnection->getMetaData();
Reference xQueryColSup(m_xComposer,UNO_QUERY);
@@ -302,7 +302,7 @@ void OKeySet::construct(const Reference< XResultSet>&
_xDriverSet,const ::rtl::O
findTableColumnsMatching_throw(makeAny(m_xTable),m_sUpdateTableName,xMeta,xQueryColumns,m_pKeyColumnNames);
// the first row is empty because it's now easier for us to distinguish
when we are beforefirst or first
- // without extra varaible to be set
+ // without extra variable to be set
m_aKeyMap.insert(OKeySetMatrix::value_type(0,OKeySetValue(NULL,::std::pair
>(0,NULL;
m_aKeyIter = m_aKeyMap.begin();
@@ -330,14 +330,14 @@ void OKeySet::construct(const Reference< XResultSet>&
_xDriverSet,const ::rtl::O
connectivity::OSQLTable
xSelColSup(xSelectTables->getByName(*pIter),uno::UNO_QUERY);
Reference xProp(xSelColSup,uno::UNO_QUERY);
::rtl::OUString sSelectTableName =
::dbtools::composeTableName( xMeta, xProp, ::dbtools::eInDataManipulation,
false, false, false );
-
-
::dbaccess::getColumnPositions(xQueryColumns,xSelColSup->getColumns()->getElementNames(),sSelectTableName,(*m_pForeignColumnNames));
-
+
+
::dbaccess::getColumnPositions(xQueryColumns,xSelColSup->getColumns()->getElementNames(),sSelectTableName,(*m_pForeignColumnNames));
+
SelectColumnsMetaData::iterator aPosEnd =
(*m_pForeignColumnNames).end();
for(SelectColumnsMetaData::iterator aPosIter =
(*m_pForeignColumnNames).begin();aPosIter != aPosEnd;++aPosIter)
{
// look for columns not in the source
columns to use them as filter as well
- // if (
!xSourceColumns->hasByName(aPosIter->first) )
+ // if (
!xSourceColumns->hasByName(aPosIter->first) )
{
if ( aFilter.getLength() )
aFilter.append(aAnd);
@@ -450,14 +450,14 @@ Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const
Sequence< Any >& rows
aSql.append(m_aComposedTableName);
aSql.append(::rtl::OUString::createFromAscii("
[openoffice] branch AOO41X updated: Fixed typo (paramater -> parameter)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new e416a1064c Fixed typo (paramater -> parameter) e416a1064c is described below commit e416a1064c1789095d1b73d04ede8fe50c5c02ca Author: mseidel AuthorDate: Tue Sep 26 01:03:14 2023 +0200 Fixed typo (paramater -> parameter) --- main/helpcontent2/source/text/scalc/01/04060109.xhp | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/main/helpcontent2/source/text/scalc/01/04060109.xhp b/main/helpcontent2/source/text/scalc/01/04060109.xhp index e7480f62c7..53901d9b56 100644 --- a/main/helpcontent2/source/text/scalc/01/04060109.xhp +++ b/main/helpcontent2/source/text/scalc/01/04060109.xhp @@ -2,7 +2,7 @@ @@ -55,7 +55,7 @@ In INDIRECT, the parameter is appended as the second parameter. In both functions, if the argument is inserted with the value 0, then the R1C1 notation is used. If the argument is not given or has a value other than 0, then the A1 notation is used. In case of R1C1 notation, ADDRESS returns address strings using the exclamation mark '!' as the sheet name separator, and INDIRECT expects the exclamation mark as sheet name separator. Both functions still use the dot '.' sheet name separator with A1 notation. -When opening documents from ODF 1.0/1.1 format, the ADDRESS functions that show a sheet name as the fourth paramater will shift that sheet name to become the fifth parameter. A new fourth parameter with the value 1 will be inserted. +When opening documents from ODF 1.0/1.1 format, the ADDRESS functions that show a sheet name as the fourth parameter will shift that sheet name to become the fifth parameter. A new fourth parameter with the value 1 will be inserted. When storing a document in ODF 1.0/1.1 format, if ADDRESS functions have a fourth parameter, that parameter will be removed. Do not save a spreadsheet in the old ODF 1.0/1.1 format if the ADDRESS function's new fourth parameter was used with a value of 0. The INDIRECT function is saved without conversion to ODF 1.0/1.1 format. If the second parameter was present, an older version of Calc will return an error for that function. @@ -618,4 +618,4 @@ - \ No newline at end of file +
[openoffice] branch trunk updated: Fixed typo (paramter -> parameter) and some other
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 0c72d66f1a Fixed typo (paramter -> parameter) and some other 0c72d66f1a is described below commit 0c72d66f1a33589bfa5729d3fc3bdd5e807826ac Author: mseidel AuthorDate: Tue Sep 26 19:31:30 2023 +0200 Fixed typo (paramter -> parameter) and some other --- .../xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl | 12 +- main/svl/inc/svl/cntnrsrt.hxx | 15 +- main/svtools/inc/svtools/ruler.hxx | 18 +-- main/sw/source/core/layout/layact.cxx | 174 +++-- 4 files changed, 111 insertions(+), 108 deletions(-) diff --git a/main/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl b/main/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl index 087277a008..020e43c949 100644 --- a/main/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl +++ b/main/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl @@ -95,7 +95,7 @@ @@ -129,13 +129,13 @@ - - - + + + - + @@ -164,7 +164,7 @@ - + Parameter dpi: Parameter metaFileURL: Parameter stylesFileURL: diff --git a/main/svl/inc/svl/cntnrsrt.hxx b/main/svl/inc/svl/cntnrsrt.hxx index 97b039d7a5..509daa9007 100644 --- a/main/svl/inc/svl/cntnrsrt.hxx +++ b/main/svl/inc/svl/cntnrsrt.hxx @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,19 +7,20 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ + #ifndef _CNTRSRT_HXX #define _CNTRSRT_HXX @@ -34,9 +35,9 @@ * Definiert eine von Container abgeleitete Klasse "ClassName", * in der die Elemente des Typs "Type" sortiert enthalten sind. * Dazu muss einer Funktion "SortFunc" definiert sein, die als -* Paramter zwei "const Type&" erwartet und 0 zurueckgibt, wenn -* beide gleich sind, -1 wenn der erste Paramter kleiner ist als -* der zweite und +1 wenn der erste Paramter groesser ist als +* Parameter zwei "const Type&" erwartet und 0 zurueckgibt, wenn +* beide gleich sind, -1 wenn der erste Parameter kleiner ist als +* der zweite und +1 wenn der erste Parameter groesser ist als * der zweite. * * Die Zugriffs-Methoden entsprechen in etwa denen der Container- diff --git a/main/svtools/inc/svtools/ruler.hxx b/main/svtools/inc/svtools/ruler.hxx index 2ed1bcfb43..14e7468ad6 100644 --- a/main/svtools/inc/svtools/ruler.hxx +++ b/main/svtools/inc/svtools/ruler.hxx @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,16 +7,16 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ @@ -369,7 +369,7 @@ es folgende Abfrage-Methoden. Mit dieser Methode kann man einen HitTest durchfuehren, um gegebenenfalls ueber das Abfa
[openoffice] branch AOO42X updated: Fixed typo (paramter -> parameter) and some other
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new 45c064b311 Fixed typo (paramter -> parameter) and some other 45c064b311 is described below commit 45c064b311c35d8633dffe1670e9673af15dca97 Author: mseidel AuthorDate: Tue Sep 26 19:31:30 2023 +0200 Fixed typo (paramter -> parameter) and some other (cherry picked from commit 0c72d66f1a33589bfa5729d3fc3bdd5e807826ac) --- .../xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl | 12 +- main/svl/inc/svl/cntnrsrt.hxx | 15 +- main/svtools/inc/svtools/ruler.hxx | 18 +-- main/sw/source/core/layout/layact.cxx | 174 +++-- 4 files changed, 111 insertions(+), 108 deletions(-) diff --git a/main/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl b/main/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl index 087277a008..020e43c949 100644 --- a/main/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl +++ b/main/filter/source/xslt/odf2xhtml/export/xhtml/opendoc2xhtml.xsl @@ -95,7 +95,7 @@ @@ -129,13 +129,13 @@ - - - + + + - + @@ -164,7 +164,7 @@ - + Parameter dpi: Parameter metaFileURL: Parameter stylesFileURL: diff --git a/main/svl/inc/svl/cntnrsrt.hxx b/main/svl/inc/svl/cntnrsrt.hxx index 97b039d7a5..509daa9007 100644 --- a/main/svl/inc/svl/cntnrsrt.hxx +++ b/main/svl/inc/svl/cntnrsrt.hxx @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,19 +7,20 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ + #ifndef _CNTRSRT_HXX #define _CNTRSRT_HXX @@ -34,9 +35,9 @@ * Definiert eine von Container abgeleitete Klasse "ClassName", * in der die Elemente des Typs "Type" sortiert enthalten sind. * Dazu muss einer Funktion "SortFunc" definiert sein, die als -* Paramter zwei "const Type&" erwartet und 0 zurueckgibt, wenn -* beide gleich sind, -1 wenn der erste Paramter kleiner ist als -* der zweite und +1 wenn der erste Paramter groesser ist als +* Parameter zwei "const Type&" erwartet und 0 zurueckgibt, wenn +* beide gleich sind, -1 wenn der erste Parameter kleiner ist als +* der zweite und +1 wenn der erste Parameter groesser ist als * der zweite. * * Die Zugriffs-Methoden entsprechen in etwa denen der Container- diff --git a/main/svtools/inc/svtools/ruler.hxx b/main/svtools/inc/svtools/ruler.hxx index 2ed1bcfb43..14e7468ad6 100644 --- a/main/svtools/inc/svtools/ruler.hxx +++ b/main/svtools/inc/svtools/ruler.hxx @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,16 +7,16 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ @@ -369,7 +369,7 @@ es folgende Abfrage-Methoden. Mit dieser Method
[openoffice] branch trunk updated: Updated English dictionary
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 94c1ac5cfe Updated English dictionary 94c1ac5cfe is described below commit 94c1ac5cfe331b604b38f987efe21c3710820752 Author: mseidel AuthorDate: Sun Oct 1 10:42:49 2023 +0200 Updated English dictionary --- main/extensions.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/extensions.lst b/main/extensions.lst index fb25eb7e05..dc903d8ae1 100644 --- a/main/extensions.lst +++ b/main/extensions.lst @@ -72,7 +72,7 @@ # English (en_AU, en_CA, en_GB, en_US, en_ZA) dictionary [ language=en.* || language=de || language=it ] - 4b4f10baafc602cfc93d3b74d60efc4b https://sourceforge.net/projects/aoo-extensions/files/17102/93/dict-en-20230901_aoo.oxt/download "dict-en.oxt" + 3be14c66b13862d44db700aa0b0c05c9 https://sourceforge.net/projects/aoo-extensions/files/17102/95/dict-en-20231001_aoo.oxt/download "dict-en.oxt" # English (USA, en_US) dictionary [ language==nl || language==ru ]
[openoffice] branch AOO42X updated: Updated English dictionary
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new 707a8398c9 Updated English dictionary 707a8398c9 is described below commit 707a8398c94354cf022a28344132a3acde0f692a Author: mseidel AuthorDate: Sun Oct 1 10:42:49 2023 +0200 Updated English dictionary (cherry picked from commit 94c1ac5cfe331b604b38f987efe21c3710820752) --- main/extensions.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/extensions.lst b/main/extensions.lst index fb25eb7e05..dc903d8ae1 100644 --- a/main/extensions.lst +++ b/main/extensions.lst @@ -72,7 +72,7 @@ # English (en_AU, en_CA, en_GB, en_US, en_ZA) dictionary [ language=en.* || language=de || language=it ] - 4b4f10baafc602cfc93d3b74d60efc4b https://sourceforge.net/projects/aoo-extensions/files/17102/93/dict-en-20230901_aoo.oxt/download "dict-en.oxt" + 3be14c66b13862d44db700aa0b0c05c9 https://sourceforge.net/projects/aoo-extensions/files/17102/95/dict-en-20231001_aoo.oxt/download "dict-en.oxt" # English (USA, en_US) dictionary [ language==nl || language==ru ]
[openoffice] branch AOO41X updated: Updated English dictionary
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new aadf42309d Updated English dictionary aadf42309d is described below commit aadf42309d2d9411d6197c4bc952559265649e53 Author: mseidel AuthorDate: Sun Oct 1 10:49:46 2023 +0200 Updated English dictionary --- main/extensions.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/extensions.lst b/main/extensions.lst index 70ee0ff86d..a41200db05 100644 --- a/main/extensions.lst +++ b/main/extensions.lst @@ -39,7 +39,7 @@ # English dictionary [ language=en.* || language=de || language=it ] -4b4f10baafc602cfc93d3b74d60efc4b https://sourceforge.net/projects/aoo-extensions/files/17102/93/dict-en-20230901_aoo.oxt/download "dict-en.oxt" +3be14c66b13862d44db700aa0b0c05c9 https://sourceforge.net/projects/aoo-extensions/files/17102/95/dict-en-20231001_aoo.oxt/download "dict-en.oxt" # English (USA, en_US) dictionary [ language==nl || language==ru ]
[openoffice] branch AOO42X updated (707a8398c9 -> bc01e88916)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a change to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git from 707a8398c9 Updated English dictionary new 1784980f80 Fixed typos, fixed mixed indentation, removerd whitespace new bc01e88916 For gbuild, when linking a binary on Windows produces a .manifest file, embed this manifest into the binary like dmake did. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: main/automation/source/app/testbasi.cxx| 18 +- main/automation/source/app/testbasi.hxx| 12 +- main/automation/source/server/XMLParser.cxx| 371 +-- main/basic/inc/basic/mybasic.hxx | 26 +- main/filter/source/msfilter/svdfppt.cxx| 1017 .../source/win32/filepicker/asyncrequests.hxx | 292 +-- main/l10ntools/source/tagtest.cxx | 297 +-- main/solenv/gbuild/platform/windows.mk | 13 +- main/sw/source/core/text/pormulti.cxx | 1632 ++--- main/sw/source/ui/wrtsh/wrtsh1.cxx | 554 ++--- main/vcl/inc/vcl/pdfwriter.hxx | 2421 ++-- .../xmerge/converter/palm/PalmDocument.java| 31 +- 12 files changed, 3352 insertions(+), 3332 deletions(-)
[openoffice] 02/02: For gbuild, when linking a binary on Windows produces a .manifest file, embed this manifest into the binary like dmake did.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit bc01e889163b95849e5617a241242df2f94536ec
Author: Damjan Jovanovic
AuthorDate: Sun Oct 1 09:48:00 2023 +0200
For gbuild, when linking a binary on Windows produces a .manifest file,
embed this manifest into the binary like dmake did.
Unfortunately our old version of LINK.EXE doesn't have the /MANIFEST:EMBED
option, so the manifest has to be be embedded by calling MT.EXE in a
separate step.
Also, stop delivering the .manifest files to ${OUTDIR} now.
Patch by: me
Fixes: #127731 - AOO fails to open ODBC manager
(cherry picked from commit 104751b68faf29eef4f137251f7b9ecd22ed8074)
---
main/solenv/gbuild/platform/windows.mk | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/main/solenv/gbuild/platform/windows.mk
b/main/solenv/gbuild/platform/windows.mk
index d65332ea6e..7f60d6b537 100644
--- a/main/solenv/gbuild/platform/windows.mk
+++ b/main/solenv/gbuild/platform/windows.mk
@@ -32,6 +32,7 @@ gb_AS := ml
gb_CC := cl
gb_CXX := cl
gb_LINK := link
+gb_MT := mt
gb_AWK := awk
gb_CLASSPATHSEP := ;
gb_RC := rc
@@ -448,6 +449,8 @@ gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. ,
,$(SOLARINC)))
gb_LinkTarget_get_pdbfile = $(call gb_LinkTarget_get_target,)pdb/$(1).pdb
+# Runs the linker command to generate the binary.
+# If a .manifest file is generated, embeds it into the binary.
define gb_LinkTarget__command
$(call gb_Output_announce,$(2),$(true),LNK,4)
$(call gb_Helper_abbreviate_dirs_native,\
@@ -472,7 +475,14 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(patsubst %,%.lib,$(EXTERNAL_LIBS)) \
$(foreach lib,$(LINKED_STATIC_LIBS),$(call
gb_StaticLibrary_get_filename,$(lib))) \
$(LIBS) \
- $(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1));
RC=$$?; rm $${RESPONSEFILE} \
+ $(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1)); \
+ RC=$$?; \
+ if [ -f $(if $(DLLTARGET),$(DLLTARGET),$(1)).manifest ]; then \
+ $(gb_MT) \
+ -manifest $(if $(DLLTARGET),$(DLLTARGET),$(1)).manifest
\
+ -outputresource:$(if $(DLLTARGET),$(DLLTARGET),$(1)); \
+ fi; \
+ rm $${RESPONSEFILE} \
$(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false;
fi) ; exit $$RC)
endef
@@ -677,7 +687,6 @@ $(call gb_LinkTarget_set_auxtargets,$(2),\
$(call gb_Executable_get_target,$(1)) \
$(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS := $(call
gb_Executable_get_target,$(1)).manifest
-$(call gb_Deliver_add_deliverable,$(call
gb_Executable_get_target,$(1)).manifest,$(call
gb_LinkTarget_get_target,$(2)).manifest,$(1))
$(call gb_LinkTarget_get_target,$(2)) \
$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call
gb_LinkTarget_get_pdbfile,$(2))
[openoffice] branch trunk updated: Fixed typos, removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 0ac3728e1a Fixed typos, removed whitespace
0ac3728e1a is described below
commit 0ac3728e1a96e788ca8a295f83d279b6214d295f
Author: mseidel
AuthorDate: Thu Oct 5 00:05:47 2023 +0200
Fixed typos, removed whitespace
---
.../dbaccess/source/ui/relationdesign/relation.src | 65 +
main/offapi/com/sun/star/embed/EmbedStates.idl | 24 +-
.../com/sun/star/ui/XContextMenuInterceptor.idl| 15 +-
main/sc/source/ui/drawfunc/drformsh.src| 6 +-
main/svtools/source/misc/imagemgr.src | 262 +++--
5 files changed, 163 insertions(+), 209 deletions(-)
diff --git a/main/dbaccess/source/ui/relationdesign/relation.src
b/main/dbaccess/source/ui/relationdesign/relation.src
index 0f38648522..ad7bcda97a 100644
--- a/main/dbaccess/source/ui/relationdesign/relation.src
+++ b/main/dbaccess/source/ui/relationdesign/relation.src
@@ -1,5 +1,5 @@
/**
- *
+ *
* 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
@@ -7,19 +7,20 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
+
#ifndef _DBU_REL_HRC_
#include "dbu_rel.hrc"
#endif
@@ -65,62 +66,12 @@ QueryBox RELATION_DESIGN_SAVEMODIFIED
String STR_QUERY_REL_DELETE_WINDOW
{
- Text [ en-US ] = "When you delete this table all corresponding
relations will be deleted as well. Continue?";
+ Text [ en-US ] = "When you delete this table all corresponding
relations will be deleted as well. Continue?" ;
};
String STR_QUERY_REL_COULD_NOT_CREATE
{
- Text [ en-US ] = "The database could not create the relation. May be
foreign keys for this kind of table aren't supported.\nPlease check your
documentation of the database.";
+ Text [ en-US ] = "The database could not create the relation. Maybe
foreign keys for this kind of table aren't supported.\nPlease check your
documentation of the database." ;
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// ** EOF
diff --git a/main/offapi/com/sun/star/embed/EmbedStates.idl
b/main/offapi/com/sun/star/embed/EmbedStates.idl
index 9cce247ad8..8d57969270 100644
--- a/main/offapi/com/sun/star/embed/EmbedStates.idl
+++ b/main/offapi/com/sun/star/embed/EmbedStates.idl
@@ -1,5 +1,5 @@
/**
- *
+ *
* 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
@@ -7,19 +7,20 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
+
#ifndef __com_sun_star_embed_EmbedStates_idl__
#define __com_sun_star_embed_EmbedStates_idl__
@@ -38,10 +39,10 @@ published constants EmbedStates
/** "Loaded" - the persistent representation of the object is loaded in
memory.
-
- The object is created and assigned with a persistent entry,
- and a view representation ( metafile and etc. ) can be retrieved
- ( if there is any ).
+
+ The object is created and assigned with a persistent entry
[openoffice] branch AOO42X updated: Fixed typos, removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new d0db74eec9 Fixed typos, removed whitespace
d0db74eec9 is described below
commit d0db74eec9c1bc4522fc3fd441059b5db589c492
Author: mseidel
AuthorDate: Thu Oct 5 00:05:47 2023 +0200
Fixed typos, removed whitespace
(cherry picked from commit 0ac3728e1a96e788ca8a295f83d279b6214d295f)
---
.../dbaccess/source/ui/relationdesign/relation.src | 65 +
main/offapi/com/sun/star/embed/EmbedStates.idl | 24 +-
.../com/sun/star/ui/XContextMenuInterceptor.idl| 15 +-
main/sc/source/ui/drawfunc/drformsh.src| 6 +-
main/svtools/source/misc/imagemgr.src | 262 +++--
5 files changed, 163 insertions(+), 209 deletions(-)
diff --git a/main/dbaccess/source/ui/relationdesign/relation.src
b/main/dbaccess/source/ui/relationdesign/relation.src
index 0f38648522..ad7bcda97a 100644
--- a/main/dbaccess/source/ui/relationdesign/relation.src
+++ b/main/dbaccess/source/ui/relationdesign/relation.src
@@ -1,5 +1,5 @@
/**
- *
+ *
* 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
@@ -7,19 +7,20 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
+
#ifndef _DBU_REL_HRC_
#include "dbu_rel.hrc"
#endif
@@ -65,62 +66,12 @@ QueryBox RELATION_DESIGN_SAVEMODIFIED
String STR_QUERY_REL_DELETE_WINDOW
{
- Text [ en-US ] = "When you delete this table all corresponding
relations will be deleted as well. Continue?";
+ Text [ en-US ] = "When you delete this table all corresponding
relations will be deleted as well. Continue?" ;
};
String STR_QUERY_REL_COULD_NOT_CREATE
{
- Text [ en-US ] = "The database could not create the relation. May be
foreign keys for this kind of table aren't supported.\nPlease check your
documentation of the database.";
+ Text [ en-US ] = "The database could not create the relation. Maybe
foreign keys for this kind of table aren't supported.\nPlease check your
documentation of the database." ;
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// ** EOF
diff --git a/main/offapi/com/sun/star/embed/EmbedStates.idl
b/main/offapi/com/sun/star/embed/EmbedStates.idl
index 9cce247ad8..8d57969270 100644
--- a/main/offapi/com/sun/star/embed/EmbedStates.idl
+++ b/main/offapi/com/sun/star/embed/EmbedStates.idl
@@ -1,5 +1,5 @@
/**
- *
+ *
* 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
@@ -7,19 +7,20 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
+
#ifndef __com_sun_star_embed_EmbedStates_idl__
#define __com_sun_star_embed_EmbedStates_idl__
@@ -38,10 +39,10 @@ published constants EmbedStates
/** "Loaded" - the persistent representation of the object is loaded in
memory.
-
- The object is created and assigned with a persistent entry,
- and a view representation ( metafile and etc. ) can be retrieved
- ( if there is any ).
+
+ The object is c
[openoffice] branch trunk updated: Fixed typo (menues -> menus), removed whitespace
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new fcab2ba6d1 Fixed typo (menues -> menus), removed whitespace fcab2ba6d1 is described below commit fcab2ba6d17f2df720f3fcb8f956a8e234c4d5b7 Author: mseidel AuthorDate: Thu Oct 5 17:36:06 2023 +0200 Fixed typo (menues -> menus), removed whitespace --- main/dbaccess/source/ui/inc/dbu_resource.hrc | 101 main/embeddedobj/source/general/docholder.cxx | 130 +-- main/svtools/source/contnr/svimpbox.cxx | 317 +- 3 files changed, 275 insertions(+), 273 deletions(-) diff --git a/main/dbaccess/source/ui/inc/dbu_resource.hrc b/main/dbaccess/source/ui/inc/dbu_resource.hrc index 6277f10b87..ea83f23f8c 100644 --- a/main/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/main/dbaccess/source/ui/inc/dbu_resource.hrc @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,16 +7,16 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ @@ -41,7 +41,7 @@ #define RID_UNTYPED_START RID_DBACCESS_START #define RID_WARN_START RID_DBACCESS_START #define RID_CONTROL_START RID_DBACCESS_START -#define RID_MISC_START RID_DBACCESS_START +#define RID_MISC_START RID_DBACCESS_START // new defines to make the strings folder specific #define RID_STR_BRW_START RID_DBACCESS_START @@ -111,10 +111,10 @@ #define DLG_DATABASE_ADVANCED RID_DIALOG_START + 26 #define DLG_COLLECTION_VIEWRID_DIALOG_START + 27 #define DLG_DATABASE_TYPE_CHANGE RID_DIALOG_START + 28 -#define DLG_DATABASE_WIZARDRID_DIALOG_START + 29 -#define RID_EXTENSION_NOT_PRESENT_DLG RID_DIALOG_START + 30 -#define DLG_TEXT_CONNECTION_SETTINGSRID_DIALOG_START + 31 -#define DLG_TABLE_FILTERRID_DIALOG_START + 32 +#define DLG_DATABASE_WIZARDRID_DIALOG_START + 29 +#define RID_EXTENSION_NOT_PRESENT_DLG RID_DIALOG_START + 30 +#define DLG_TEXT_CONNECTION_SETTINGS RID_DIALOG_START + 31 +#define DLG_TABLE_FILTER RID_DIALOG_START + 32 // // tab pages @@ -139,35 +139,35 @@ #define PAGE_USERDRIVERRID_PAGE_START + 19 #define PAGE_MYSQL_JDBCRID_PAGE_START + 20 #define PAGE_GENERATED_VALUES RID_PAGE_START + 22 -#define PAGE_ADVANCED_SETTINGS_SPECIAL RID_PAGE_START + 23 -#define PAGE_MYSQL_NATIVE RID_PAGE_START + 24 -// FREE -// FREE +#define PAGE_ADVANCED_SETTINGS_SPECIAL RID_PAGE_START + 23 +#define PAGE_MYSQL_NATIVE RID_PAGE_START + 24 +// FREE +// FREE #define PAGE_ORACLE_JDBC RID_PAGE_START + 27 #define PAGE_TABLESUBSCRIPTION RID_PAGE_START + 28 -// FREE -// FREE -// FREE +// FREE +// FREE +// FREE #define PAGE_MOZILLA RID_PAGE_START + 32 #define PAGE_DS_ORACLE_ADVANCED_SETTINGS RID_PAGE_START + 33 -#define PAGE_DBWIZARD_INTRO RID_PAGE_START + 40 -#define PAGE_DBWIZARD_DBASERID_PAGE_START + 41 -#define PAGE_DBWIZARD_TEXT RID_PAGE_START + 42 -#define PAGE_DBWIZARD_MSACCESS RID_PAGE_START + 43 -#define PAGE_DBWIZARD_LDAP RID_PAGE_START + 44 -#define PAGE_DBWIZARD_ADABASRID_PAGE_START + 45 -#define PAGE_DBWIZARD_MYSQL_INTRO RID_PAGE_START + 46 -#define PAGE_DBWIZARD_MYSQL_ODBC RID_PAGE_START + 47 -#define PAGE_DBWIZARD_ORACLERID_PAGE_START + 48 -#define PAGE_DBWIZARD_JDBC RI
[openoffice] branch AOO42X updated: Fixed typo (menues -> menus), removed whitespace
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new 00bcbf8545 Fixed typo (menues -> menus), removed whitespace 00bcbf8545 is described below commit 00bcbf854555d5f60e005656f389575320ceed61 Author: mseidel AuthorDate: Thu Oct 5 17:36:06 2023 +0200 Fixed typo (menues -> menus), removed whitespace (cherry picked from commit fcab2ba6d17f2df720f3fcb8f956a8e234c4d5b7) --- main/dbaccess/source/ui/inc/dbu_resource.hrc | 101 main/embeddedobj/source/general/docholder.cxx | 130 +-- main/svtools/source/contnr/svimpbox.cxx | 317 +- 3 files changed, 275 insertions(+), 273 deletions(-) diff --git a/main/dbaccess/source/ui/inc/dbu_resource.hrc b/main/dbaccess/source/ui/inc/dbu_resource.hrc index 6277f10b87..ea83f23f8c 100644 --- a/main/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/main/dbaccess/source/ui/inc/dbu_resource.hrc @@ -1,5 +1,5 @@ /** - * + * * 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 @@ -7,16 +7,16 @@ * 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 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ @@ -41,7 +41,7 @@ #define RID_UNTYPED_START RID_DBACCESS_START #define RID_WARN_START RID_DBACCESS_START #define RID_CONTROL_START RID_DBACCESS_START -#define RID_MISC_START RID_DBACCESS_START +#define RID_MISC_START RID_DBACCESS_START // new defines to make the strings folder specific #define RID_STR_BRW_START RID_DBACCESS_START @@ -111,10 +111,10 @@ #define DLG_DATABASE_ADVANCED RID_DIALOG_START + 26 #define DLG_COLLECTION_VIEWRID_DIALOG_START + 27 #define DLG_DATABASE_TYPE_CHANGE RID_DIALOG_START + 28 -#define DLG_DATABASE_WIZARDRID_DIALOG_START + 29 -#define RID_EXTENSION_NOT_PRESENT_DLG RID_DIALOG_START + 30 -#define DLG_TEXT_CONNECTION_SETTINGSRID_DIALOG_START + 31 -#define DLG_TABLE_FILTERRID_DIALOG_START + 32 +#define DLG_DATABASE_WIZARDRID_DIALOG_START + 29 +#define RID_EXTENSION_NOT_PRESENT_DLG RID_DIALOG_START + 30 +#define DLG_TEXT_CONNECTION_SETTINGS RID_DIALOG_START + 31 +#define DLG_TABLE_FILTER RID_DIALOG_START + 32 // // tab pages @@ -139,35 +139,35 @@ #define PAGE_USERDRIVERRID_PAGE_START + 19 #define PAGE_MYSQL_JDBCRID_PAGE_START + 20 #define PAGE_GENERATED_VALUES RID_PAGE_START + 22 -#define PAGE_ADVANCED_SETTINGS_SPECIAL RID_PAGE_START + 23 -#define PAGE_MYSQL_NATIVE RID_PAGE_START + 24 -// FREE -// FREE +#define PAGE_ADVANCED_SETTINGS_SPECIAL RID_PAGE_START + 23 +#define PAGE_MYSQL_NATIVE RID_PAGE_START + 24 +// FREE +// FREE #define PAGE_ORACLE_JDBC RID_PAGE_START + 27 #define PAGE_TABLESUBSCRIPTION RID_PAGE_START + 28 -// FREE -// FREE -// FREE +// FREE +// FREE +// FREE #define PAGE_MOZILLA RID_PAGE_START + 32 #define PAGE_DS_ORACLE_ADVANCED_SETTINGS RID_PAGE_START + 33 -#define PAGE_DBWIZARD_INTRO RID_PAGE_START + 40 -#define PAGE_DBWIZARD_DBASERID_PAGE_START + 41 -#define PAGE_DBWIZARD_TEXT RID_PAGE_START + 42 -#define PAGE_DBWIZARD_MSACCESS RID_PAGE_START + 43 -#define PAGE_DBWIZARD_LDAP RID_PAGE_START + 44 -#define PAGE_DBWIZARD_ADABASRID_PAGE_START + 45 -#define PAGE_DBWIZARD_MYSQL_INTRO RID_PAGE_START + 46 -#define PAGE_DBWIZARD_MYSQL_ODBC RID_PAGE_START + 47 -#define PAGE_DBWIZARD_ORACLERI
[openoffice] branch trunk updated: Maintenance cleanup
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new ca41231d9e Maintenance cleanup
ca41231d9e is described below
commit ca41231d9e330adbb3cff54175670d80e843e360
Author: mseidel
AuthorDate: Sun Oct 8 15:51:35 2023 +0200
Maintenance cleanup
---
main/dbaccess/source/ui/dlg/indexdialog.cxx| 52 +-
.../uielement/langselectionmenucontroller.cxx | 257 +
main/sfx2/source/appl/newhelp.src | 138 ++---
main/sfx2/source/bastyp/progress.cxx | 265 -
main/store/source/storlckb.hxx | 23 +-
main/svx/source/mnuctrls/SmartTagCtl.cxx | 174 +++---
main/sw/source/core/view/vprint.cxx| 625 +++--
main/tools/source/generic/poly2.cxx| 20 +-
main/vcl/inc/vcl/pdfextoutdevdata.hxx | 70 +--
main/vcl/inc/vcl/pdfwriter.hxx | 6 +-
main/writerfilter/inc/resourcemodel/TableData.hxx | 28 +-
.../inc/resourcemodel/TableManager.hxx | 4 +-
12 files changed, 832 insertions(+), 830 deletions(-)
diff --git a/main/dbaccess/source/ui/dlg/indexdialog.cxx
b/main/dbaccess/source/ui/dlg/indexdialog.cxx
index 3d4c4e774c..db31250768 100644
--- a/main/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/main/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -42,7 +42,7 @@
#ifndef _DBAUI_INDEXCOLLECTION_HXX_
#include "indexcollection.hxx"
#endif
-#ifndef _SV_MSGBOX_HXX
+#ifndef _SV_MSGBOX_HXX
#include
#endif
#ifndef _COM_SUN_STAR_SDB_SQLCONTEXT_HPP_
@@ -95,7 +95,7 @@ namespace dbaui
return sal_False;
ConstIndexFieldsIterator aLeft = _rLHS.begin();
-ConstIndexFieldsIterator aLeftEnd = _rLHS.end();
+ ConstIndexFieldsIterator aLeftEnd = _rLHS.end();
ConstIndexFieldsIterator aRight = _rRHS.begin();
for (; aLeft != aLeftEnd; ++aLeft, ++aRight)
{
@@ -135,9 +135,9 @@ namespace dbaui
::rtl::OUString sNewName(_rNewText);
::rtl::OUString sAlias =
::dbtools::convertName2SQLName(sNewName,xMeta->getExtraNameCharacters());
if ( (
xMeta->supportsMixedCaseQuotedIdentifiers() )
- ?
- sAlias != sNewName
- :
+ ?
+ sAlias != sNewName
+ :
!sNewName.equalsIgnoreAsciiCase(sAlias))
return sal_False;
}
@@ -199,8 +199,8 @@ namespace dbaui
//==
DBG_NAME(DbaIndexDialog)
//--
- DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence<
::rtl::OUString >& _rFieldNames,
- const
Reference< XNameAccess >& _rxIndexes,
+ DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence<
::rtl::OUString >& _rFieldNames,
+ const
Reference< XNameAccess >& _rxIndexes,
const
Reference< XConnection >& _rxConnection,
const
Reference< XMultiServiceFactory >& _rxORB,sal_Int32 _nMaxColumnsInIndex)
:ModalDialog( _pParent, ModuleRes(DLG_IN
[openoffice] branch AOO42X updated: Maintenance cleanup
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new aac4b21256 Maintenance cleanup
aac4b21256 is described below
commit aac4b21256092bee1fbb18ba37bb60949ac19bb7
Author: mseidel
AuthorDate: Sun Oct 8 15:51:35 2023 +0200
Maintenance cleanup
(cherry picked from commit ca41231d9e330adbb3cff54175670d80e843e360)
---
main/dbaccess/source/ui/dlg/indexdialog.cxx| 52 +-
.../uielement/langselectionmenucontroller.cxx | 257 +
main/sfx2/source/appl/newhelp.src | 138 ++---
main/sfx2/source/bastyp/progress.cxx | 265 -
main/store/source/storlckb.hxx | 23 +-
main/svx/source/mnuctrls/SmartTagCtl.cxx | 174 +++---
main/sw/source/core/view/vprint.cxx| 625 +++--
main/tools/source/generic/poly2.cxx| 20 +-
main/vcl/inc/vcl/pdfextoutdevdata.hxx | 70 +--
main/vcl/inc/vcl/pdfwriter.hxx | 6 +-
main/writerfilter/inc/resourcemodel/TableData.hxx | 28 +-
.../inc/resourcemodel/TableManager.hxx | 4 +-
12 files changed, 832 insertions(+), 830 deletions(-)
diff --git a/main/dbaccess/source/ui/dlg/indexdialog.cxx
b/main/dbaccess/source/ui/dlg/indexdialog.cxx
index 3d4c4e774c..db31250768 100644
--- a/main/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/main/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -42,7 +42,7 @@
#ifndef _DBAUI_INDEXCOLLECTION_HXX_
#include "indexcollection.hxx"
#endif
-#ifndef _SV_MSGBOX_HXX
+#ifndef _SV_MSGBOX_HXX
#include
#endif
#ifndef _COM_SUN_STAR_SDB_SQLCONTEXT_HPP_
@@ -95,7 +95,7 @@ namespace dbaui
return sal_False;
ConstIndexFieldsIterator aLeft = _rLHS.begin();
-ConstIndexFieldsIterator aLeftEnd = _rLHS.end();
+ ConstIndexFieldsIterator aLeftEnd = _rLHS.end();
ConstIndexFieldsIterator aRight = _rRHS.begin();
for (; aLeft != aLeftEnd; ++aLeft, ++aRight)
{
@@ -135,9 +135,9 @@ namespace dbaui
::rtl::OUString sNewName(_rNewText);
::rtl::OUString sAlias =
::dbtools::convertName2SQLName(sNewName,xMeta->getExtraNameCharacters());
if ( (
xMeta->supportsMixedCaseQuotedIdentifiers() )
- ?
- sAlias != sNewName
- :
+ ?
+ sAlias != sNewName
+ :
!sNewName.equalsIgnoreAsciiCase(sAlias))
return sal_False;
}
@@ -199,8 +199,8 @@ namespace dbaui
//==
DBG_NAME(DbaIndexDialog)
//--
- DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence<
::rtl::OUString >& _rFieldNames,
- const
Reference< XNameAccess >& _rxIndexes,
+ DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence<
::rtl::OUString >& _rFieldNames,
+ const
Reference< XNameAccess >& _rxIndexes,
const
Reference< XConnection >& _rxConnection,
const
Reference< XMultiServiceFactory >& _rxORB,sal_Int32 _n
[openoffice] branch AOO41X updated: #i126557# Patch by: hanya
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new a4efec7a41 #i126557# Patch by: hanya a4efec7a41 is described below commit a4efec7a4175e59f03afbc4556dff4528dd5100f Author: Kay Schenk AuthorDate: Tue Sep 29 01:23:47 2015 + #i126557# Patch by: hanya git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1705793 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit fe883e55b650d5c98f286102ad843b7b9903b065) --- main/formula/source/ui/dlg/funcpage.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/main/formula/source/ui/dlg/funcpage.cxx b/main/formula/source/ui/dlg/funcpage.cxx index 06e5650395..a50c7832a4 100644 --- a/main/formula/source/ui/dlg/funcpage.cxx +++ b/main/formula/source/ui/dlg/funcpage.cxx @@ -110,6 +110,7 @@ FuncPage::FuncPage(Window* pParent,const IFunctionManager* _pFunctionManager): aLbCategory.SetEntryData(aLbCategory.InsertEntry(pCategory->getName()),(void*)pCategory); } +aLbCategory.SetDropDownLineCount( aLbCategory.GetEntryCount() ); aLbCategory.SelectEntryPos(1); UpdateFunctionList(); aLbCategory.SetSelectHdl( LINK( this, FuncPage, SelHdl ) );
[openoffice] branch AOO41X updated: #i126476# Patch by: Mark Hung
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO41X by this push:
new 376de1e92b #i126476# Patch by: Mark Hung
376de1e92b is described below
commit 376de1e92b9cf8f9af0f1e4b64def448bc422b96
Author: Kay Schenk
AuthorDate: Mon Aug 24 21:04:11 2015 +
#i126476# Patch by: Mark Hung
git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1697501
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 290927565caaa0b0949305f1ad0dcb1cc863aa3e)
---
main/sw/source/core/text/itrcrsr.cxx | 4
1 file changed, 4 insertions(+)
diff --git a/main/sw/source/core/text/itrcrsr.cxx
b/main/sw/source/core/text/itrcrsr.cxx
index b5ef649715..b00b5ca2e9 100644
--- a/main/sw/source/core/text/itrcrsr.cxx
+++ b/main/sw/source/core/text/itrcrsr.cxx
@@ -56,6 +56,7 @@
// --> OD 2010-05-05 #i111284#
#include
// <--
+#include
// Nicht reentrant !!!
// wird in GetCharRect gesetzt und im UnitUp/Down ausgewertet.
@@ -267,6 +268,9 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm,
SwTxtSizeInfo *pNewInf )
rSpace.IsAutoFirst() )
{
nFirstLineOfs = GetFnt()->GetSize(
GetFnt()->GetActual() ).Height();
+LanguageType aLang = pNode->GetLang( 0, 1,
i18n::ScriptType::ASIAN);
+if (aLang != LANGUAGE_KOREAN && aLang !=
LANGUAGE_JAPANESE)
+nFirstLineOfs<<=1;
const SvxLineSpacingItem *pSpace =
aLineInf.GetLineSpacing();
if( pSpace )
{
[openoffice] branch AOO41X updated: Corrected string in German SDF
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new 55256c85a4 Corrected string in German SDF 55256c85a4 is described below commit 55256c85a4a2779d9498e72a92c79842ef95efd8 Author: mseidel AuthorDate: Sun Oct 8 19:23:18 2023 +0200 Corrected string in German SDF --- extras/l10n/source/de/localize.sdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras/l10n/source/de/localize.sdf b/extras/l10n/source/de/localize.sdf index f2f94bbc72..bec03bc813 100644 --- a/extras/l10n/source/de/localize.sdf +++ b/extras/l10n/source/de/localize.sdf @@ -3606,7 +3606,7 @@ officecfg registry\data\org\openoffice\Office\UI\MathCommands.xcu 0 value ..Math officecfg registry\data\org\openoffice\Office\UI\MathCommands.xcu 0 value ..MathCommands.UserInterface.Commands..uno:Draw Label 0 de ~Aktualisieren 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\MathCommands.xcu 0 value ..MathCommands.UserInterface.Commands..uno:FitInWindow Label 0 de An Fenster anpassen 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\MathCommands.xcu 0 value ..MathCommands.UserInterface.Commands..uno:FormelCursor Label 0 de Formel Cursor 20130618 17:22:18 -officecfg registry\data\org\openoffice\Office\UI\MathCommands.xcu 0 value ..MathCommands.UserInterface.Commands..uno:ImportFormulaLabel 0 de Formular ~importieren... 20130618 17:22:18 +officecfg registry\data\org\openoffice\Office\UI\MathCommands.xcu 0 value ..MathCommands.UserInterface.Commands..uno:ImportFormulaLabel 0 de Formel ~importieren... 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\MathCommands.xcu 0 value ..MathCommands.UserInterface.Commands..uno:InsertCommandLabel 0 de Befehl einfügen 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\MathCommands.xcu 0 value ..MathCommands.UserInterface.Commands..uno:InsertConfigName Label 0 de Text einfügen 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\MathCommands.xcu 0 value ..MathCommands.UserInterface.Commands..uno:ModifyStatus Label 0 de Geändert-Status 20130618 17:22:18
[openoffice] branch AOO41X updated: #i126366 Do not remove outer braces Patch by: Ivan Timofeev resolves error {a+b}over{c+d} --> a+b}over{c+d
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO41X by this push:
new 4d0df6500a #i126366 Do not remove outer braces Patch by: Ivan Timofeev
resolves error {a+b}over{c+d} --> a+b}over{c+d
4d0df6500a is described below
commit 4d0df6500a3d04241e018b4c2297a6b4ff86cb1a
Author: Regina Henschel
AuthorDate: Sat Jun 20 12:17:27 2015 +
#i126366 Do not remove outer braces
Patch by: Ivan Timofeev
resolves error {a+b}over{c+d} --> a+b}over{c+d
git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1686597
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 36769aa60b3f033a576a4b625c34b8da35153b85)
---
main/starmath/source/mathmlimport.cxx | 6 --
1 file changed, 6 deletions(-)
diff --git a/main/starmath/source/mathmlimport.cxx
b/main/starmath/source/mathmlimport.cxx
index d0e98782ad..594f8279f8 100644
--- a/main/starmath/source/mathmlimport.cxx
+++ b/main/starmath/source/mathmlimport.cxx
@@ -581,12 +581,6 @@ void SmXMLImport::endDocument(void)
aText = pDocShell->GetText();
pTree->CreateTextFromNode(aText);
aText.EraseTrailingChars();
-if ((aText.GetChar(0) == '{') &&
-(aText.GetChar(aText.Len()-1) == '}'))
-{
-aText.Erase(0,1);
-aText.Erase(aText.Len()-1,1);
-}
}
pDocShell->SetText( String() );
[openoffice] branch AOO41X updated: #i126367 existing command text is repeated when insert formula Patch by: Marcos Paulo de Souza
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO41X by this push:
new 79ee02b8ac #i126367 existing command text is repeated when insert
formula Patch by: Marcos Paulo de Souza
79ee02b8ac is described below
commit 79ee02b8ac7b9f9ab497a2e00c303f9dec353eb2
Author: Regina Henschel
AuthorDate: Mon Jun 15 20:35:27 2015 +
#i126367 existing command text is repeated when insert formula
Patch by: Marcos Paulo de Souza
git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1685665
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 7db8e6903f1f33a109e86c2c0669c4a39fef0c71)
---
main/starmath/source/mathmlimport.cxx | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/main/starmath/source/mathmlimport.cxx
b/main/starmath/source/mathmlimport.cxx
index 594f8279f8..c50d544104 100644
--- a/main/starmath/source/mathmlimport.cxx
+++ b/main/starmath/source/mathmlimport.cxx
@@ -577,12 +577,10 @@ void SmXMLImport::endDocument(void)
pDocShell->SetFormulaTree(pTree);
if (0 == aText.Len()) //If we picked up no annotation text
{
-//Make up some editable text
-aText = pDocShell->GetText();
+// Get text from imported formula
pTree->CreateTextFromNode(aText);
aText.EraseTrailingChars();
}
-pDocShell->SetText( String() );
// Convert symbol names
SmParser &rParser = pDocShell->GetParser();
[openoffice] branch AOO41X updated: Use correct icon in Help.
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new bdaa6f794b Use correct icon in Help. bdaa6f794b is described below commit bdaa6f794be1cb167167181ef360d766671c35b2 Author: mseidel AuthorDate: Fri May 14 01:11:25 2021 +0200 Use correct icon in Help. This fixes issue https://bz.apache.org/ooo/show_bug.cgi?id=128313 (cherry picked from commit 98df2d037e8c632079b3b07c9657ee7f14315976) --- .../source/text/sbasic/shared/02/2000.xhp | 7 ++- main/helpcontent2/source/text/shared/02/0117.xhp | 15 +++ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/main/helpcontent2/source/text/sbasic/shared/02/2000.xhp b/main/helpcontent2/source/text/sbasic/shared/02/2000.xhp index 39be697dd8..7048c9d9a8 100644 --- a/main/helpcontent2/source/text/sbasic/shared/02/2000.xhp +++ b/main/helpcontent2/source/text/sbasic/shared/02/2000.xhp @@ -1,7 +1,5 @@ - - - - + Form Controls @@ -444,7 +443,7 @@ -Icon +Icon
svn commit: r64433 - in /dev/openoffice/4.1.15: ./ binaries/ binaries/SDK/ binaries/ast/ binaries/bg/ binaries/ca-XR/ binaries/ca-XV/ binaries/ca/ binaries/cs/ binaries/da/ binaries/de/ binaries/el/ b
Author: mseidel Date: Mon Oct 9 19:56:54 2023 New Revision: 64433 Log: Created directory structure for AOO4115 Added: dev/openoffice/4.1.15/ dev/openoffice/4.1.15/binaries/ dev/openoffice/4.1.15/binaries/SDK/ dev/openoffice/4.1.15/binaries/ast/ dev/openoffice/4.1.15/binaries/bg/ dev/openoffice/4.1.15/binaries/ca/ dev/openoffice/4.1.15/binaries/ca-XR/ dev/openoffice/4.1.15/binaries/ca-XV/ dev/openoffice/4.1.15/binaries/cs/ dev/openoffice/4.1.15/binaries/da/ dev/openoffice/4.1.15/binaries/de/ dev/openoffice/4.1.15/binaries/el/ dev/openoffice/4.1.15/binaries/en-GB/ dev/openoffice/4.1.15/binaries/en-US/ dev/openoffice/4.1.15/binaries/es/ dev/openoffice/4.1.15/binaries/eu/ dev/openoffice/4.1.15/binaries/fi/ dev/openoffice/4.1.15/binaries/fr/ dev/openoffice/4.1.15/binaries/gd/ dev/openoffice/4.1.15/binaries/gl/ dev/openoffice/4.1.15/binaries/he/ dev/openoffice/4.1.15/binaries/hi/ dev/openoffice/4.1.15/binaries/hu/ dev/openoffice/4.1.15/binaries/it/ dev/openoffice/4.1.15/binaries/ja/ dev/openoffice/4.1.15/binaries/km/ dev/openoffice/4.1.15/binaries/ko/ dev/openoffice/4.1.15/binaries/lt/ dev/openoffice/4.1.15/binaries/nb/ dev/openoffice/4.1.15/binaries/nl/ dev/openoffice/4.1.15/binaries/pl/ dev/openoffice/4.1.15/binaries/pt/ dev/openoffice/4.1.15/binaries/pt-BR/ dev/openoffice/4.1.15/binaries/ru/ dev/openoffice/4.1.15/binaries/sk/ dev/openoffice/4.1.15/binaries/sl/ dev/openoffice/4.1.15/binaries/sr/ dev/openoffice/4.1.15/binaries/sv/ dev/openoffice/4.1.15/binaries/ta/ dev/openoffice/4.1.15/binaries/th/ dev/openoffice/4.1.15/binaries/tr/ dev/openoffice/4.1.15/binaries/vi/ dev/openoffice/4.1.15/binaries/zh-CN/ dev/openoffice/4.1.15/binaries/zh-TW/ dev/openoffice/4.1.15/source/
[openoffice] branch AOO41X updated: Corrected icons in German SDF
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new 87b458b0bb Corrected icons in German SDF 87b458b0bb is described below commit 87b458b0bb2cec9209903c1877181123802863ea Author: mseidel AuthorDate: Mon Oct 9 22:30:30 2023 +0200 Corrected icons in German SDF --- extras/l10n/source/de/localize.sdf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extras/l10n/source/de/localize.sdf b/extras/l10n/source/de/localize.sdf index bec03bc813..ee22cb2aca 100644 --- a/extras/l10n/source/de/localize.sdf +++ b/extras/l10n/source/de/localize.sdf @@ -33842,7 +33842,7 @@ helpcontent2 source\text\sbasic\shared\02\2000.xhp 0 helppar_id3153824 0 helpcontent2 source\text\sbasic\shared\02\2000.xhp 0 help par_id3147530 8 0 de \Fügt eine Befehlsschaltfläche ein.\ Mit einer Befehlsschaltfläche können Sie beim Eintritt eines bestimmten Ereignisses (wie z. B. bei einem Mausklick) einen Befehl ausführen. 20130618 17:22:18 helpcontent2 source\text\sbasic\shared\02\2000.xhp 0 help par_id3154923 9 0 de Falls gewünscht können Sie die Schaltfläche mit Text oder einer Grafik versehen. 20130618 17:22:18 helpcontent2 source\text\sbasic\shared\02\2000.xhp 0 help hd_id314855010 0 de Grafisches Kontrollfeld 20130618 17:22:18 -helpcontent2 source\text\sbasic\shared\02\2000.xhp 0 help par_id3154138 0 de \\Symbol\\ 20130618 17:22:18 +helpcontent2 source\text\sbasic\shared\02\2000.xhp 0 help par_id3154138 0 de \\Symbol\\ 20130618 17:22:18 helpcontent2 source\text\sbasic\shared\02\2000.xhp 0 help par_id3151042 11 0 de \Fügt ein Kontrollfeld ein, das eine Grafik anzeigt.\ 20130618 17:22:18 helpcontent2 source\text\sbasic\shared\02\2000.xhp 0 help hd_id315044712 0 de Markierfeld 20130618 17:22:18 helpcontent2 source\text\sbasic\shared\02\2000.xhp 0 help par_id3155131 0 de \\Symbol\\ 20130618 17:22:18 @@ -56393,7 +56393,7 @@ helpcontent2source\text\shared\02\0117.xhp 0 helphd_id315331622 0 de Gr helpcontent2 source\text\shared\02\0117.xhp 0 help par_id3159622 0 de \\Symbol\\ 20130618 17:22:18 helpcontent2 source\text\shared\02\0117.xhp 0 help par_id3148601 23 0 de \Erzeugt eine grafische Schaltfläche.\ Abgesehen von der grafischen Darstellung hat eine grafische Schaltfläche dieselben Eigenschaften wie eine "normale" Schaltfläche. 20130618 17:22:18 helpcontent2 source\text\shared\02\0117.xhp 0 help hd_id315917149 0 de Grafisches Kontrollfeld 20130618 17:22:18 -helpcontent2 source\text\shared\02\0117.xhp 0 help par_id3155869 0 de \\Symbol\\ 20130618 17:22:18 +helpcontent2 source\text\shared\02\0117.xhp 0 help par_id3155869 0 de \\Symbol\\ 20130618 17:22:18 helpcontent2 source\text\shared\02\0117.xhp 0 help par_id3149596 50 0 de \Erstellt ein grafisches Kontrollfeld. Es dient ausschließlich dazu, Bilder einer Datenbank aufzunehmen.\ Wenn Sie in der Formularansicht doppelt auf solch ein Feld klicken, öffnet sich der Dialog \Grafik einfügen\ zum Einfügen des Bildes. Es existiert zusätzlich ein Kontextmenü (nicht im Entwurfsmodus) mit Befehlen zum Einfügen und Löschen der Grafik. [...] helpcontent2 source\text\shared\02\0117.xhp 0 help par_id3150318 70 0 de Sie können Grafiken aus einer Datenbank im Formular anzeigen und, sofern das grafische Kontrollfeld nicht schreibgeschützt ist, neue Grafiken einfügen. Das Kontrollfeld muss dabei auf ein Datenbankfeld vom Typ Bild verweisen. Geben Sie das Datenfeld im Register \Daten\ des Eigenschaftenfe
svn commit: r1912856 [1/2] - in /openoffice/devtools/SVG: Galaxy/ Galaxy/AOO41X/ High Contrast/ Industrial/ Industrial/AOO41X/
Author: mseidel Date: Tue Oct 10 09:48:37 2023 New Revision: 1912856 URL: http://svn.apache.org/viewvc?rev=1912856&view=rev Log: Re-worked graphics Modified: openoffice/devtools/SVG/Galaxy/AOO41X/cropmarkers2.svg openoffice/devtools/SVG/Galaxy/AOO41X/markers2.svg openoffice/devtools/SVG/Galaxy/cropmarkers.svg openoffice/devtools/SVG/Galaxy/markers.svg openoffice/devtools/SVG/High Contrast/cropmarkersACC.svg openoffice/devtools/SVG/High Contrast/markersACC.svg openoffice/devtools/SVG/Industrial/AOO41X/cropmarkers2.svg openoffice/devtools/SVG/Industrial/AOO41X/markers2.svg openoffice/devtools/SVG/Industrial/cropmarkers.svg openoffice/devtools/SVG/Industrial/markers.svg Modified: openoffice/devtools/SVG/Galaxy/AOO41X/cropmarkers2.svg URL: http://svn.apache.org/viewvc/openoffice/devtools/SVG/Galaxy/AOO41X/cropmarkers2.svg?rev=1912856&r1=1912855&r2=1912856&view=diff == --- openoffice/devtools/SVG/Galaxy/AOO41X/cropmarkers2.svg (original) +++ openoffice/devtools/SVG/Galaxy/AOO41X/cropmarkers2.svg Tue Oct 10 09:48:37 2023 @@ -1,23 +1,23 @@ http://purl.org/dc/elements/1.1/"; - xmlns:cc="http://creativecommons.org/ns#"; - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - xmlns:svg="http://www.w3.org/2000/svg"; - xmlns="http://www.w3.org/2000/svg"; - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; width="153" height="63" viewBox="0 -63 43.180001 17.78" version="1.1" style="fill:none;stroke-linecap:round;stroke-linejoin:round" id="svg2" - inkscape:version="0.91 r13725" - sodipodi:docname="cropmarkers2.svg" - inkscape:export-filename="/home/seidel/Schreibtisch/cropmarkers2.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" + sodipodi:docname="cropmarkers.svg" + inkscape:export-filename="../../../../Schreibtisch/cropmarkers.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; + xmlns="http://www.w3.org/2000/svg"; + xmlns:svg="http://www.w3.org/2000/svg"; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + xmlns:cc="http://creativecommons.org/ns#"; + xmlns:dc="http://purl.org/dc/elements/1.1/";> @@ -26,7 +26,6 @@ image/svg+xml http://purl.org/dc/dcmitype/StillImage"; /> - Matthias Seidel @@ -46,19 +45,21 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1366" - inkscape:window-height="744" + inkscape:window-width="1920" + inkscape:window-height="1056" id="namedview678" showgrid="false" inkscape:showpageshadow="false" - inkscape:zoom="7.8431371" - inkscape:cx="76.51" - inkscape:cy="31.5" + inkscape:zoom="11.542484" + inkscape:cx="76.586634" + inkscape:cy="31.492355" inkscape:window-x="0" inkscape:window-y="24" inkscape:window-maximized="1" inkscape:current-layer="svg2" - units="px" /> + units="px" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" /> http://svn.apache.org/viewvc/openoffice/devtools/SVG/Galaxy/AOO41X/markers2.svg?rev=1912856&r1=1912855&r2=1912856&view=diff == --- openoffice/devtools/SVG/Galaxy/AOO41X/markers2.svg (original) +++ openoffice/devtools/SVG/Galaxy/AOO41X/markers2.svg Tue Oct 10 09:48:37 2023 @@ -1,20 +1,20 @@ http://purl.org/dc/elements/1.1/"; - xmlns:cc="http://creativecommons.org/ns#"; - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - xmlns:svg="http://www.w3.org/2000/svg"; - xmlns="http://www.w3.org/2000/svg"; - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; viewBox="0 0 117 92" id="svg2" version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="markers2.svg&quo
svn commit: r1912856 [2/2] - in /openoffice/devtools/SVG: Galaxy/ Galaxy/AOO41X/ High Contrast/ Industrial/ Industrial/AOO41X/
Modified: openoffice/devtools/SVG/Industrial/AOO41X/markers2.svg URL: http://svn.apache.org/viewvc/openoffice/devtools/SVG/Industrial/AOO41X/markers2.svg?rev=1912856&r1=1912855&r2=1912856&view=diff == --- openoffice/devtools/SVG/Industrial/AOO41X/markers2.svg (original) +++ openoffice/devtools/SVG/Industrial/AOO41X/markers2.svg Tue Oct 10 09:48:37 2023 @@ -1,20 +1,20 @@ http://purl.org/dc/elements/1.1/"; - xmlns:cc="http://creativecommons.org/ns#"; - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - xmlns:svg="http://www.w3.org/2000/svg"; - xmlns="http://www.w3.org/2000/svg"; - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; viewBox="0 0 117 92" id="svg2" version="1.1" - inkscape:version="0.91 r13725" - sodipodi:docname="markers2.svg" - inkscape:export-filename="/home/seidel/Schreibtisch/markers2.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" + sodipodi:docname="markers.svg" + inkscape:export-filename="../../../../Schreibtisch/markers.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; + xmlns="http://www.w3.org/2000/svg"; + xmlns:svg="http://www.w3.org/2000/svg"; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + xmlns:cc="http://creativecommons.org/ns#"; + xmlns:dc="http://purl.org/dc/elements/1.1/";> @@ -23,7 +23,6 @@ image/svg+xml http://purl.org/dc/dcmitype/StillImage"; /> - Matthias Seidel @@ -45,12 +44,12 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1366" - inkscape:window-height="744" + inkscape:window-width="1920" + inkscape:window-height="1056" id="namedview432" showgrid="false" - inkscape:zoom="6.7934782" - inkscape:cx="58.5" + inkscape:zoom="9.576087" + inkscape:cx="58.479001" inkscape:cy="46" inkscape:window-x="0" inkscape:window-y="24" @@ -58,7 +57,9 @@ inkscape:current-layer="svg2" inkscape:showpageshadow="false" showguides="true" - inkscape:guide-bbox="true" /> + inkscape:guide-bbox="true" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" /> - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + Modified: openoffice/devtools/SVG/Industrial/cropmarkers.svg URL: http://svn.apache.org/viewvc/openoffice/devtools/SVG/Industrial/cropmarkers.svg?rev=1912856&r1=1912855&r2=1912856&view=diff == --- openoffice/devtools/SVG/Industrial/cropmarkers.svg (original) +++ openoffice/devtools/SVG/Industrial/cropmarkers.svg Tue Oct 10 09:48:37 2023 @@ -1,23 +1,23 @@ http://purl.org/dc/elements/1.1/"; - xmlns:cc="http://creativecommons.org/ns#"; - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - xmlns:svg="http://www.w3.org/2000/svg"; - xmlns="http://www.w3.org/2000/svg"; - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; width="153" height="63" viewBox="0 -63 43.180001 17.78" version="1.1" style="fill:none;stroke-linecap:round;stroke-linejoin:round" id="svg2" - inkscape:version="0.91 r13725" + inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" sodipodi:docname="cropmarkers.svg" - inkscape:export-filename="/home/seidel/Schreibtisch/cropmarkers.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + inkscape:export-filename="../../../../Schreibtisch/cropmarkers.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; + xmlns="http://www.w3.org/2000/svg"; + xmlns:svg="http://www.w3.org/2000/svg"; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + xmlns:cc="http://creativecommons.org/ns#"; + xmlns:dc="http://purl.org/dc/elements/1.1/";> @@ -26,7 +26,6 @@ image/svg+xml http://purl.org/dc/dcmitype/StillImage"; /> - Matthias Seidel @@ -46,19 +45,21 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1366" - inkscape:window-height="744" + inkscape:window-width="1920" + inkscape:window-height="1056" id="namedview678" showgrid
svn commit: r1912857 - in /openoffice/devtools/SVG: Galaxy/AOO41X/cropmarkers2.svg Galaxy/AOO41X/markers2.svg Industrial/AOO41X/cropmarkers2.svg Industrial/AOO41X/markers2.svg
Author: mseidel Date: Tue Oct 10 09:55:02 2023 New Revision: 1912857 URL: http://svn.apache.org/viewvc?rev=1912857&view=rev Log: Small fix in export path Modified: openoffice/devtools/SVG/Galaxy/AOO41X/cropmarkers2.svg openoffice/devtools/SVG/Galaxy/AOO41X/markers2.svg openoffice/devtools/SVG/Industrial/AOO41X/cropmarkers2.svg openoffice/devtools/SVG/Industrial/AOO41X/markers2.svg Modified: openoffice/devtools/SVG/Galaxy/AOO41X/cropmarkers2.svg URL: http://svn.apache.org/viewvc/openoffice/devtools/SVG/Galaxy/AOO41X/cropmarkers2.svg?rev=1912857&r1=1912856&r2=1912857&view=diff == --- openoffice/devtools/SVG/Galaxy/AOO41X/cropmarkers2.svg (original) +++ openoffice/devtools/SVG/Galaxy/AOO41X/cropmarkers2.svg Tue Oct 10 09:55:02 2023 @@ -8,7 +8,7 @@ id="svg2" inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" sodipodi:docname="cropmarkers.svg" - inkscape:export-filename="../../../../Schreibtisch/cropmarkers.png" + inkscape:export-filename="../../../../Schreibtisch/cropmarkers2.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; Modified: openoffice/devtools/SVG/Galaxy/AOO41X/markers2.svg URL: http://svn.apache.org/viewvc/openoffice/devtools/SVG/Galaxy/AOO41X/markers2.svg?rev=1912857&r1=1912856&r2=1912857&view=diff == --- openoffice/devtools/SVG/Galaxy/AOO41X/markers2.svg (original) +++ openoffice/devtools/SVG/Galaxy/AOO41X/markers2.svg Tue Oct 10 09:55:02 2023 @@ -5,7 +5,7 @@ version="1.1" inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" sodipodi:docname="markers.svg" - inkscape:export-filename="../../../../Schreibtisch/markers.png" + inkscape:export-filename="../../../../Schreibtisch/markers2.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; Modified: openoffice/devtools/SVG/Industrial/AOO41X/cropmarkers2.svg URL: http://svn.apache.org/viewvc/openoffice/devtools/SVG/Industrial/AOO41X/cropmarkers2.svg?rev=1912857&r1=1912856&r2=1912857&view=diff == --- openoffice/devtools/SVG/Industrial/AOO41X/cropmarkers2.svg (original) +++ openoffice/devtools/SVG/Industrial/AOO41X/cropmarkers2.svg Tue Oct 10 09:55:02 2023 @@ -8,7 +8,7 @@ id="svg2" inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" sodipodi:docname="cropmarkers.svg" - inkscape:export-filename="../../../../Schreibtisch/cropmarkers.png" + inkscape:export-filename="../../../../Schreibtisch/cropmarkers2.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; Modified: openoffice/devtools/SVG/Industrial/AOO41X/markers2.svg URL: http://svn.apache.org/viewvc/openoffice/devtools/SVG/Industrial/AOO41X/markers2.svg?rev=1912857&r1=1912856&r2=1912857&view=diff == --- openoffice/devtools/SVG/Industrial/AOO41X/markers2.svg (original) +++ openoffice/devtools/SVG/Industrial/AOO41X/markers2.svg Tue Oct 10 09:55:02 2023 @@ -5,7 +5,7 @@ version="1.1" inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" sodipodi:docname="markers.svg" - inkscape:export-filename="../../../../Schreibtisch/markers.png" + inkscape:export-filename="../../../../Schreibtisch/markers2.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
[openoffice] branch trunk updated: Updated graphics based on re-worked templates
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 3e31c30448 Updated graphics based on re-worked templates 3e31c30448 is described below commit 3e31c304482d03d32a0703ceb63b5fb98e0dec33 Author: mseidel AuthorDate: Tue Oct 10 11:52:16 2023 +0200 Updated graphics based on re-worked templates --- main/default_images/svx/res/cropmarkers.png | Bin 612 -> 604 bytes main/default_images/svx/res/cropmarkersACC.png | Bin 616 -> 601 bytes main/default_images/svx/res/markers.png | Bin 8549 -> 8472 bytes main/default_images/svx/res/markersACC.png | Bin 9859 -> 9862 bytes .../industrial/svx/res/cropmarkers.png | Bin 2805 -> 2825 bytes .../industrial/svx/res/markers.png | Bin 11288 -> 11221 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/default_images/svx/res/cropmarkers.png b/main/default_images/svx/res/cropmarkers.png index 13175d6bc5..fefc394cc6 100644 Binary files a/main/default_images/svx/res/cropmarkers.png and b/main/default_images/svx/res/cropmarkers.png differ diff --git a/main/default_images/svx/res/cropmarkersACC.png b/main/default_images/svx/res/cropmarkersACC.png index 50f30f0fe8..f4eb36287a 100644 Binary files a/main/default_images/svx/res/cropmarkersACC.png and b/main/default_images/svx/res/cropmarkersACC.png differ diff --git a/main/default_images/svx/res/markers.png b/main/default_images/svx/res/markers.png index 10294bb941..02e009fb44 100644 Binary files a/main/default_images/svx/res/markers.png and b/main/default_images/svx/res/markers.png differ diff --git a/main/default_images/svx/res/markersACC.png b/main/default_images/svx/res/markersACC.png index d7756201be..ea01d9e768 100644 Binary files a/main/default_images/svx/res/markersACC.png and b/main/default_images/svx/res/markersACC.png differ diff --git a/main/ooo_custom_images/industrial/svx/res/cropmarkers.png b/main/ooo_custom_images/industrial/svx/res/cropmarkers.png index d83fb50731..defd175d58 100644 Binary files a/main/ooo_custom_images/industrial/svx/res/cropmarkers.png and b/main/ooo_custom_images/industrial/svx/res/cropmarkers.png differ diff --git a/main/ooo_custom_images/industrial/svx/res/markers.png b/main/ooo_custom_images/industrial/svx/res/markers.png index ebad7c1e9a..20447a7dd0 100644 Binary files a/main/ooo_custom_images/industrial/svx/res/markers.png and b/main/ooo_custom_images/industrial/svx/res/markers.png differ
[openoffice] branch AOO42X updated: Updated graphics based on re-worked templates
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new 19876b8c4a Updated graphics based on re-worked templates 19876b8c4a is described below commit 19876b8c4a9b396673cd9747fd7702904d545bf0 Author: mseidel AuthorDate: Tue Oct 10 11:52:16 2023 +0200 Updated graphics based on re-worked templates (cherry picked from commit 3e31c304482d03d32a0703ceb63b5fb98e0dec33) --- main/default_images/svx/res/cropmarkers.png | Bin 612 -> 604 bytes main/default_images/svx/res/cropmarkersACC.png | Bin 616 -> 601 bytes main/default_images/svx/res/markers.png | Bin 8549 -> 8472 bytes main/default_images/svx/res/markersACC.png | Bin 9859 -> 9862 bytes .../industrial/svx/res/cropmarkers.png | Bin 2805 -> 2825 bytes .../industrial/svx/res/markers.png | Bin 11288 -> 11221 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/default_images/svx/res/cropmarkers.png b/main/default_images/svx/res/cropmarkers.png index 13175d6bc5..fefc394cc6 100644 Binary files a/main/default_images/svx/res/cropmarkers.png and b/main/default_images/svx/res/cropmarkers.png differ diff --git a/main/default_images/svx/res/cropmarkersACC.png b/main/default_images/svx/res/cropmarkersACC.png index 50f30f0fe8..f4eb36287a 100644 Binary files a/main/default_images/svx/res/cropmarkersACC.png and b/main/default_images/svx/res/cropmarkersACC.png differ diff --git a/main/default_images/svx/res/markers.png b/main/default_images/svx/res/markers.png index 10294bb941..02e009fb44 100644 Binary files a/main/default_images/svx/res/markers.png and b/main/default_images/svx/res/markers.png differ diff --git a/main/default_images/svx/res/markersACC.png b/main/default_images/svx/res/markersACC.png index d7756201be..ea01d9e768 100644 Binary files a/main/default_images/svx/res/markersACC.png and b/main/default_images/svx/res/markersACC.png differ diff --git a/main/ooo_custom_images/industrial/svx/res/cropmarkers.png b/main/ooo_custom_images/industrial/svx/res/cropmarkers.png index d83fb50731..defd175d58 100644 Binary files a/main/ooo_custom_images/industrial/svx/res/cropmarkers.png and b/main/ooo_custom_images/industrial/svx/res/cropmarkers.png differ diff --git a/main/ooo_custom_images/industrial/svx/res/markers.png b/main/ooo_custom_images/industrial/svx/res/markers.png index ebad7c1e9a..20447a7dd0 100644 Binary files a/main/ooo_custom_images/industrial/svx/res/markers.png and b/main/ooo_custom_images/industrial/svx/res/markers.png differ
svn commit: r1912858 - in /openoffice/devtools/SVG: Galaxy/AOO41X/cropmarkers2.svg Galaxy/AOO41X/markers2.svg Industrial/AOO41X/cropmarkers2.svg Industrial/AOO41X/markers2.svg
Author: mseidel Date: Tue Oct 10 10:09:00 2023 New Revision: 1912858 URL: http://svn.apache.org/viewvc?rev=1912858&view=rev Log: Another small fix in export path Modified: openoffice/devtools/SVG/Galaxy/AOO41X/cropmarkers2.svg openoffice/devtools/SVG/Galaxy/AOO41X/markers2.svg openoffice/devtools/SVG/Industrial/AOO41X/cropmarkers2.svg openoffice/devtools/SVG/Industrial/AOO41X/markers2.svg Modified: openoffice/devtools/SVG/Galaxy/AOO41X/cropmarkers2.svg URL: http://svn.apache.org/viewvc/openoffice/devtools/SVG/Galaxy/AOO41X/cropmarkers2.svg?rev=1912858&r1=1912857&r2=1912858&view=diff == --- openoffice/devtools/SVG/Galaxy/AOO41X/cropmarkers2.svg (original) +++ openoffice/devtools/SVG/Galaxy/AOO41X/cropmarkers2.svg Tue Oct 10 10:09:00 2023 @@ -7,8 +7,8 @@ style="fill:none;stroke-linecap:round;stroke-linejoin:round" id="svg2" inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" - sodipodi:docname="cropmarkers.svg" - inkscape:export-filename="../../../../Schreibtisch/cropmarkers2.png" + sodipodi:docname="cropmarkers2.svg" + inkscape:export-filename="../../../../../Schreibtisch/cropmarkers2.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; Modified: openoffice/devtools/SVG/Galaxy/AOO41X/markers2.svg URL: http://svn.apache.org/viewvc/openoffice/devtools/SVG/Galaxy/AOO41X/markers2.svg?rev=1912858&r1=1912857&r2=1912858&view=diff == --- openoffice/devtools/SVG/Galaxy/AOO41X/markers2.svg (original) +++ openoffice/devtools/SVG/Galaxy/AOO41X/markers2.svg Tue Oct 10 10:09:00 2023 @@ -4,8 +4,8 @@ id="svg2" version="1.1" inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" - sodipodi:docname="markers.svg" - inkscape:export-filename="../../../../Schreibtisch/markers2.png" + sodipodi:docname="markers2.svg" + inkscape:export-filename="../../../../../Schreibtisch/markers2.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; Modified: openoffice/devtools/SVG/Industrial/AOO41X/cropmarkers2.svg URL: http://svn.apache.org/viewvc/openoffice/devtools/SVG/Industrial/AOO41X/cropmarkers2.svg?rev=1912858&r1=1912857&r2=1912858&view=diff == --- openoffice/devtools/SVG/Industrial/AOO41X/cropmarkers2.svg (original) +++ openoffice/devtools/SVG/Industrial/AOO41X/cropmarkers2.svg Tue Oct 10 10:09:00 2023 @@ -8,7 +8,7 @@ id="svg2" inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" sodipodi:docname="cropmarkers.svg" - inkscape:export-filename="../../../../Schreibtisch/cropmarkers2.png" + inkscape:export-filename="../../../../../Schreibtisch/cropmarkers2.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; Modified: openoffice/devtools/SVG/Industrial/AOO41X/markers2.svg URL: http://svn.apache.org/viewvc/openoffice/devtools/SVG/Industrial/AOO41X/markers2.svg?rev=1912858&r1=1912857&r2=1912858&view=diff == --- openoffice/devtools/SVG/Industrial/AOO41X/markers2.svg (original) +++ openoffice/devtools/SVG/Industrial/AOO41X/markers2.svg Tue Oct 10 10:09:00 2023 @@ -5,7 +5,7 @@ version="1.1" inkscape:version="1.3 (0e150ed6c4, 2023-07-21)" sodipodi:docname="markers.svg" - inkscape:export-filename="../../../../Schreibtisch/markers2.png" + inkscape:export-filename="../../../../../Schreibtisch/markers2.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
[openoffice] branch AOO41X updated: Updated graphics based on re-worked templates
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new 7c3291100d Updated graphics based on re-worked templates 7c3291100d is described below commit 7c3291100d8954dfe899ff6106dbb8df8c40d828 Author: mseidel AuthorDate: Tue Oct 10 12:11:28 2023 +0200 Updated graphics based on re-worked templates --- main/default_images/svx/res/cropmarkers2.png| Bin 612 -> 604 bytes main/default_images/svx/res/cropmarkersACC.png | Bin 616 -> 601 bytes main/default_images/svx/res/markers2.png| Bin 8549 -> 8472 bytes main/default_images/svx/res/markersACC.png | Bin 9859 -> 9862 bytes .../industrial/svx/res/cropmarkers2.png | Bin 2805 -> 2825 bytes .../industrial/svx/res/markers2.png | Bin 11288 -> 11221 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/main/default_images/svx/res/cropmarkers2.png b/main/default_images/svx/res/cropmarkers2.png index 13175d6bc5..fefc394cc6 100644 Binary files a/main/default_images/svx/res/cropmarkers2.png and b/main/default_images/svx/res/cropmarkers2.png differ diff --git a/main/default_images/svx/res/cropmarkersACC.png b/main/default_images/svx/res/cropmarkersACC.png index 50f30f0fe8..f4eb36287a 100644 Binary files a/main/default_images/svx/res/cropmarkersACC.png and b/main/default_images/svx/res/cropmarkersACC.png differ diff --git a/main/default_images/svx/res/markers2.png b/main/default_images/svx/res/markers2.png index 10294bb941..02e009fb44 100644 Binary files a/main/default_images/svx/res/markers2.png and b/main/default_images/svx/res/markers2.png differ diff --git a/main/default_images/svx/res/markersACC.png b/main/default_images/svx/res/markersACC.png index d7756201be..ea01d9e768 100644 Binary files a/main/default_images/svx/res/markersACC.png and b/main/default_images/svx/res/markersACC.png differ diff --git a/main/ooo_custom_images/industrial/svx/res/cropmarkers2.png b/main/ooo_custom_images/industrial/svx/res/cropmarkers2.png index d83fb50731..defd175d58 100644 Binary files a/main/ooo_custom_images/industrial/svx/res/cropmarkers2.png and b/main/ooo_custom_images/industrial/svx/res/cropmarkers2.png differ diff --git a/main/ooo_custom_images/industrial/svx/res/markers2.png b/main/ooo_custom_images/industrial/svx/res/markers2.png index ebad7c1e9a..20447a7dd0 100644 Binary files a/main/ooo_custom_images/industrial/svx/res/markers2.png and b/main/ooo_custom_images/industrial/svx/res/markers2.png differ
[openoffice] branch AOO41X updated: Corrected icons in en-GB and pl SDF
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new 8343de8640 Corrected icons in en-GB and pl SDF 8343de8640 is described below commit 8343de86403da787f107a920085d75c92318c85f Author: mseidel AuthorDate: Tue Oct 10 12:17:19 2023 +0200 Corrected icons in en-GB and pl SDF --- extras/l10n/source/en-GB/localize.sdf | 4 ++-- extras/l10n/source/pl/localize.sdf| 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extras/l10n/source/en-GB/localize.sdf b/extras/l10n/source/en-GB/localize.sdf index 765e5b4939..64388a05d7 100644 --- a/extras/l10n/source/en-GB/localize.sdf +++ b/extras/l10n/source/en-GB/localize.sdf @@ -33842,7 +33842,7 @@ helpcontent2 source\text\sbasic\shared\02\2000.xhp 0 helppar_id3153824 0 helpcontent2 source\text\sbasic\shared\02\2000.xhp 0 help par_id3147530 8 0 en-GB \Adds a command button.\ You can use a command button to execute a command for a defined event, such as a mouse click. 20130618 17:22:18 helpcontent2 source\text\sbasic\shared\02\2000.xhp 0 help par_id3154923 9 0 en-GB If you want, you can add text or a graphic to the button. 20130618 17:22:18 helpcontent2 source\text\sbasic\shared\02\2000.xhp 0 help hd_id314855010 0 en-GB Image Control 20130618 17:22:18 -helpcontent2 source\text\sbasic\shared\02\2000.xhp 0 help par_id3154138 0 en-GB \\Icon\\ 20130618 17:22:18 +helpcontent2 source\text\sbasic\shared\02\2000.xhp 0 help par_id3154138 0 en-GB \\Icon\\ 20130618 17:22:18 helpcontent2 source\text\sbasic\shared\02\2000.xhp 0 help par_id3151042 11 0 en-GB \Adds a control that displays a graphic.\ 20130618 17:22:18 helpcontent2 source\text\sbasic\shared\02\2000.xhp 0 help hd_id315044712 0 en-GB Check Box 20130618 17:22:18 helpcontent2 source\text\sbasic\shared\02\2000.xhp 0 help par_id3155131 0 en-GB \\Icon\\ 20130618 17:22:18 @@ -56395,7 +56395,7 @@ helpcontent2source\text\shared\02\0117.xhp 0 helphd_id315331622 0 en-GB helpcontent2 source\text\shared\02\0117.xhp 0 help par_id3159622 0 en-GB \\Icon\\ 20130618 17:22:18 helpcontent2 source\text\shared\02\0117.xhp 0 help par_id3148601 23 0 en-GB \Creates a button displayed as an image.\ Aside from the graphic representation, an image button has the same properties as a "normal" button.20130618 17:22:18 helpcontent2 source\text\shared\02\0117.xhp 0 help hd_id315917149 0 en-GB Image Control 20130618 17:22:18 -helpcontent2 source\text\shared\02\0117.xhp 0 help par_id3155869 0 en-GB \\Icon\\ 20130618 17:22:18 +helpcontent2 source\text\shared\02\0117.xhp 0 help par_id3155869 0 en-GB \\Icon\\ 20130618 17:22:18 helpcontent2 source\text\shared\02\0117.xhp 0 help par_id3149596 50 0 en-GB \Creates an image control. It can only be used to add images from a database.\ In the form document, double-click one of these controls to open the \Insert Graphic\ dialogue box to insert the image. There is also a context menu (not in design mode) with commands for inserting and deleting the image. 20130618 17:22:18 helpcontent2 source\text\shared\02\0117.xhp 0 help par_id3150318 70 0 en-GB Images from a database can be displayed in a form, and new images can be inserted in the database as long as the image control is not write-protected. The control must refer to a database field of the image type. Therefore, enter the data field into the properties window on the \Data\ tab page. 20130618 17:22:18 helpcontent2 source\text\shared\02\0117.xhp 0
[openoffice] branch AOO42X updated: Fixed small glitch
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new 035cb4ae57 Fixed small glitch 035cb4ae57 is described below commit 035cb4ae578f13c0a4fdafc1011190b54d475742 Author: mseidel AuthorDate: Tue Oct 10 20:02:52 2023 +0200 Fixed small glitch (cherry picked from commit 3c29434da21164ac1fdb5dea455a60d7fc64ae6a) --- main/default_images/svx/res/markers.png | Bin 8472 -> 8405 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/main/default_images/svx/res/markers.png b/main/default_images/svx/res/markers.png index 02e009fb44..f0d6f4a4cc 100644 Binary files a/main/default_images/svx/res/markers.png and b/main/default_images/svx/res/markers.png differ
[openoffice] branch trunk updated: Fixed small glitch
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 3c29434da2 Fixed small glitch 3c29434da2 is described below commit 3c29434da21164ac1fdb5dea455a60d7fc64ae6a Author: mseidel AuthorDate: Tue Oct 10 20:02:52 2023 +0200 Fixed small glitch --- main/default_images/svx/res/markers.png | Bin 8472 -> 8405 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/main/default_images/svx/res/markers.png b/main/default_images/svx/res/markers.png index 02e009fb44..f0d6f4a4cc 100644 Binary files a/main/default_images/svx/res/markers.png and b/main/default_images/svx/res/markers.png differ
svn commit: r1912871 - in /openoffice/devtools/SVG/Galaxy: AOO41X/markers2.svg markers.svg
Author: mseidel Date: Tue Oct 10 18:03:40 2023 New Revision: 1912871 URL: http://svn.apache.org/viewvc?rev=1912871&view=rev Log: Fixed small glitch Modified: openoffice/devtools/SVG/Galaxy/AOO41X/markers2.svg openoffice/devtools/SVG/Galaxy/markers.svg Modified: openoffice/devtools/SVG/Galaxy/AOO41X/markers2.svg URL: http://svn.apache.org/viewvc/openoffice/devtools/SVG/Galaxy/AOO41X/markers2.svg?rev=1912871&r1=1912870&r2=1912871&view=diff == --- openoffice/devtools/SVG/Galaxy/AOO41X/markers2.svg (original) +++ openoffice/devtools/SVG/Galaxy/AOO41X/markers2.svg Tue Oct 10 18:03:40 2023 @@ -1426,10 +1426,10 @@ inkscape:export-ydpi="90" /> + style="opacity:0.9;fill:#00;stroke-width:0.599987" + d="M 74.5,44 C 72.007002,44 70,45.561002 70,47.5 70,49.438998 72.007002,51 74.5,51 76.992998,51 79,49.438998 79,47.5 79,45.561002 76.992998,44 74.5,44 Z m 0,1 C 76.432994,45 78,46.119289 78,47.5 78,48.88071 76.432994,50 74.5,50 72.567006,50 71,48.88071 71,47.5 71,46.119289 72.567006,45 74.5,45 Z" /> http://svn.apache.org/viewvc/openoffice/devtools/SVG/Galaxy/markers.svg?rev=1912871&r1=1912870&r2=1912871&view=diff == --- openoffice/devtools/SVG/Galaxy/markers.svg (original) +++ openoffice/devtools/SVG/Galaxy/markers.svg Tue Oct 10 18:03:40 2023 @@ -1426,10 +1426,10 @@ inkscape:export-ydpi="90" /> + style="opacity:0.9;fill:#00;stroke-width:0.599987" + d="M 74.5,44 C 72.007002,44 70,45.561002 70,47.5 70,49.438998 72.007002,51 74.5,51 76.992998,51 79,49.438998 79,47.5 79,45.561002 76.992998,44 74.5,44 Z m 0,1 C 76.432994,45 78,46.119289 78,47.5 78,48.88071 76.432994,50 74.5,50 72.567006,50 71,48.88071 71,47.5 71,46.119289 72.567006,45 74.5,45 Z" />
[openoffice] branch AOO41X updated: Fixed small glitch
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new ac8bb0a266 Fixed small glitch ac8bb0a266 is described below commit ac8bb0a266c58b612813d2cd5e4f11cf66b5e92e Author: mseidel AuthorDate: Tue Oct 10 20:06:33 2023 +0200 Fixed small glitch --- main/default_images/svx/res/markers2.png | Bin 8472 -> 8405 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/main/default_images/svx/res/markers2.png b/main/default_images/svx/res/markers2.png index 02e009fb44..f0d6f4a4cc 100644 Binary files a/main/default_images/svx/res/markers2.png and b/main/default_images/svx/res/markers2.png differ
svn commit: r64477 - in /dev/openoffice: 4.1.15-RC1/ 4.1.15/
Author: mseidel Date: Wed Oct 11 14:28:43 2023 New Revision: 64477 Log: Added RC1 Added: dev/openoffice/4.1.15-RC1/ - copied from r64476, dev/openoffice/4.1.15/ Removed: dev/openoffice/4.1.15/
[openoffice] branch AOO41X updated: #i96720# FilePicker: setDefaultName, setDefaultDirectory "broken"
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO41X by this push:
new de4f303f92 #i96720# FilePicker: setDefaultName, setDefaultDirectory
"broken"
de4f303f92 is described below
commit de4f303f92c636ab115e46e3d5e1477fba3d4960
Author: Damjan Jovanovic
AuthorDate: Wed Nov 25 18:49:36 2015 +
#i96720# FilePicker: setDefaultName, setDefaultDirectory "broken"
Display the proposed filename even when the URL
specified for the file picker directory is invalid.
As the Win32 file picker sadly allows both paths and URLs
for directories, users try paths on other more
restrictive platforms, and since the file picker there
shows neither the directory nor the file, they wrongly
conclude both are broken.
Patch by: me
git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1716508
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 1aa1f6e56713546a63af3b26af83aa1655ce348c)
---
main/fpicker/source/office/OfficeFilePicker.cxx | 16 +---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/main/fpicker/source/office/OfficeFilePicker.cxx
b/main/fpicker/source/office/OfficeFilePicker.cxx
index 8aefcb7e24..d04bc08526 100644
--- a/main/fpicker/source/office/OfficeFilePicker.cxx
+++ b/main/fpicker/source/office/OfficeFilePicker.cxx
@@ -171,19 +171,29 @@ void SvtFilePicker::prepareExecute()
// --**-- doesn't match the spec yet
if ( m_aDisplayDirectory.getLength() > 0 || m_aDefaultName.getLength()
> 0 )
{
+ sal_Bool isFileSet = sal_False;
if ( m_aDisplayDirectory.getLength() > 0 )
{
- INetURLObject aPath( m_aDisplayDirectory );
+ INetURLObject aPath;
+ INetURLObject givenPath( m_aDisplayDirectory );
+ if (!givenPath.HasError())
+ aPath = givenPath;
+ else
+ {
+ INetURLObject aStdDirObj(
SvtPathOptions().GetWorkPath() );
+ aPath = aStdDirObj;
+ }
if ( m_aDefaultName.getLength() > 0 )
{
aPath.insertName( m_aDefaultName );
getDialog()->SetHasFilename( true );
}
String sPath = aPath.GetMainURL(
INetURLObject::NO_DECODE );
- getDialog()->SetPath( aPath.GetMainURL(
INetURLObject::NO_DECODE ) );
+ getDialog()->SetPath( sPath );
+ isFileSet = sal_True;
}
- else if ( m_aDefaultName.getLength() > 0 )
+ if ( !isFileSet && m_aDefaultName.getLength() > 0 )
{
getDialog()->SetPath( m_aDefaultName );
getDialog()->SetHasFilename( true );
[openoffice-org] branch main updated: Initial Ukrainian translation
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new 9418497ce7 Initial Ukrainian translation 9418497ce7 is described below commit 9418497ce715a05d0acbeaf74a15a0008acb6cff Author: mseidel AuthorDate: Tue Oct 17 15:30:18 2023 +0200 Initial Ukrainian translation --- content/uk/brand.md | 8 content/uk/index.html | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/content/uk/brand.md b/content/uk/brand.md index a2059f2a25..1c7b1aae95 100644 --- a/content/uk/brand.md +++ b/content/uk/brand.md @@ -2,13 +2,13 @@ type=brand home=home search=search selectedlang=en -language=Language +language=Українська name=Apache OpenOffice -tagline=The Free and Open Productivity Suite -logo=AOO_logos/AOO4_website_logo.png +tagline=Вільний і відкритий пакет продуктивності +logo=AOO_logos/100MillAOO100px.png domain=https://www.openoffice.org divid=bannera announce=Released: Apache OpenOffice -announceurl=https://blogs.apache.org/OOo/entry/announcing-apache-openoffice-4-19 +announceurl=https://blogs.apache.org/OOo/entry/announcing-apache-openoffice-4-110 announcetip=Released: Apache OpenOffice ~~ diff --git a/content/uk/index.html b/content/uk/index.html index ffe0e04b42..9095072719 100644 --- a/content/uk/index.html +++ b/content/uk/index.html @@ -4,7 +4,7 @@ -Apache OpenOffice - The Free and Open Productivity Suite +Apache OpenOffice - Безкоштовний і відкритий пакет продуктивності
[openoffice-org] branch main updated: More Ukrainian translation
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new 9a06f06036 More Ukrainian translation 9a06f06036 is described below commit 9a06f060367b44432883fe4cc4556506508930ca Author: mseidel AuthorDate: Tue Oct 17 16:23:27 2023 +0200 More Ukrainian translation --- assets/uk/msg_prop_l10n_uk.js | 2 +- content/uk/index.html | 29 ++--- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/assets/uk/msg_prop_l10n_uk.js b/assets/uk/msg_prop_l10n_uk.js index 73ad58fa83..2e4221e53e 100644 --- a/assets/uk/msg_prop_l10n_uk.js +++ b/assets/uk/msg_prop_l10n_uk.js @@ -20,4 +20,4 @@ l10n.index_alert_box_href = "https://openoffice.apache.org/translate.html";; / // Maximum 49 characters. l10n.index_alert_box_headline_text = "We need your help to complete translation into Ukrainian!"; // Maximum 630 characters. -l10n.index_alert_box_text_text = "This note is in English because we need your help to translate Apache OpenOffice into your language. The links on this page will help you download and install Apache OpenOffice in all currently available languages. If you are interested in helping translate, please click this text to review the information. You can send a note to our mailing list \"l...@openoffice.apache.org\" if you want to volunteer or if you have questions."; +l10n.index_alert_box_text_text = "This note is in English because we need your help to translate Apache OpenOffice and this website into your language. The links on this page will help you download and install Apache OpenOffice in all currently available languages. If you are interested in helping translate, please click this text to review the information. You can send a note to our mailing list \"l...@openoffice.apache.org\" if you want to volunteer or if you have questions."; diff --git a/content/uk/index.html b/content/uk/index.html index 9095072719..12b83c8976 100644 --- a/content/uk/index.html +++ b/content/uk/index.html @@ -1,10 +1,10 @@ http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> http://www.w3.org/1999/xhtml"; xml:lang="uk" lang="uk"> - + -Apache OpenOffice - Безкоштовний і відкритий пакет продуктивності +Apache OpenOffice - Офіційна сторінка - Безкоштовний і відкритий пакет продуктивності
[openoffice-org] branch main updated: More Ukrainian translation
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new 71ccdf123a More Ukrainian translation 71ccdf123a is described below commit 71ccdf123acc82234f2eb9851db5c1bd7862b572 Author: mseidel AuthorDate: Tue Oct 17 16:44:59 2023 +0200 More Ukrainian translation --- content/uk/index.html | 12 ++-- content/uk/topnav.md | 22 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/content/uk/index.html b/content/uk/index.html index 12b83c8976..1450b36179 100644 --- a/content/uk/index.html +++ b/content/uk/index.html @@ -192,16 +192,16 @@ screen reader. +title="Follow our official Blog"> Офіційний блог +title="Підпішіться на нас у Facebook"> Facebook +title="Підпішіться на нас у Twitter"> Twitter +title="Підпішіться на наш канал у YouTube"> YouTube @@ -216,9 +216,9 @@ screen reader. https://validator.w3.org/check?uri=referer"; -title="W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) of Web documents"> +title="Служба перевірки розмітки W3C - Перевірте розмітку (HTML, XHTML, ...) Web сторінки"> https://www.w3.org/Icons/valid-xhtml10-blue.png"; -alt="W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) of Web documents"/> +alt="Служба перевірки розмітки W3C - Перевірте розмітку (HTML, XHTML, ...) Web сторінки"/> diff --git a/content/uk/topnav.md b/content/uk/topnav.md index 18dc58725f..9413ac4622 100644 --- a/content/uk/topnav.md +++ b/content/uk/topnav.md @@ -1,9 +1,9 @@ type=navigator divid=topnava ~~ -- [Product][m0] -- [Download][m1] -- [Support][m2] +- [Продукт][m0] +- [Завантаження][m1] +- [Підтримка][m2] - [Blog][m3] - [Extend][m4] - [Develop][m5] @@ -11,11 +11,11 @@ divid=topnava - [Native Language][m7] -[m0]:/product/index.html "Apache OpenOffice product description" -[m1]:/uk/download/index.html "Download OpenOffice" -[m2]:/support/index.html "Find Support for OpenOffice" -[m3]:https://blogs.apache.org/OOo/ "Apache OpenOffice Blog" -[m4]:/extensions/index.html "Extensions and Templates for OpenOffice" -[m5]:https://openoffice.apache.org/get-involved.html "Get involved in Apache OpenOffice" -[m6]:/projects/accepted.html "Apache OpenOffice development focus areas" -[m7]:/projects/native-lang.html"Apache OpenOffice in your Native Language" +[m0]: /product/index.html "Опис програмного продукту Apache OpenOffice" +[m1]: /uk/download/index.html "Завантаження Apache OpenOffice" +[m2]: /support/index.html "Знайти підтримку стосовно OpenOffice" +[m3]: https://blogs.apache.org/OOo/ "Apache OpenOffice Blog" +[m4]: /extensions/index.html "Extensions and Templates for OpenOffice" +[m5]: https://openoffice.apache.org/get-involved.html "Get involved in Apache OpenOffice" +[m6]: /projects/accepted.html "Apache OpenOffice development focus areas" +[m7]: /projects/native-lang.html "Apache OpenOffice in your Native Language"
[openoffice-org] branch main updated: Ukrainian translation
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new 13d8d2107f Ukrainian translation 13d8d2107f is described below commit 13d8d2107f5fab1f2a54aa59e9637d39f5a9961f Author: mseidel AuthorDate: Tue Oct 17 17:47:50 2023 +0200 Ukrainian translation --- assets/uk/msg_prop_l10n_uk.js | 10 +- content/uk/index.html | 2 +- content/uk/topnav.md | 10 +- templates/ssi_paths.gsp | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/assets/uk/msg_prop_l10n_uk.js b/assets/uk/msg_prop_l10n_uk.js index 2e4221e53e..165ed0190b 100644 --- a/assets/uk/msg_prop_l10n_uk.js +++ b/assets/uk/msg_prop_l10n_uk.js @@ -14,10 +14,10 @@ var l10n = new Object(); // The following variables are used in the "index.html" file: -l10n.index_alert_box_show = true; -l10n.index_alert_box_background_color = "#F5A9A9";// More see "http://html-color-codes.info/"; -l10n.index_alert_box_href = "https://openoffice.apache.org/translate.html";; // Make the whole alert box clickable with a link. - // Maximum 49 characters. +l10n.index_alert_box_show = true; +l10n.index_alert_box_background_color = "#F5A9A9"; // More see "http://html-color-codes.info/"; +l10n.index_alert_box_href = "https://openoffice.apache.org/translate.html";; // Make the whole alert box clickable with a link. + // Maximum 49 characters. l10n.index_alert_box_headline_text = "We need your help to complete translation into Ukrainian!"; - // Maximum 630 characters. + // Maximum 630 characters. l10n.index_alert_box_text_text = "This note is in English because we need your help to translate Apache OpenOffice and this website into your language. The links on this page will help you download and install Apache OpenOffice in all currently available languages. If you are interested in helping translate, please click this text to review the information. You can send a note to our mailing list \"l...@openoffice.apache.org\" if you want to volunteer or if you have questions."; diff --git a/content/uk/index.html b/content/uk/index.html index 1450b36179..764eedafdc 100644 --- a/content/uk/index.html +++ b/content/uk/index.html @@ -119,7 +119,7 @@ screen reader. + "" + "" + "" - + "I want to download Apache OpenOffice" + + "Я хочу завантажити Apache OpenOffice" + "(Most recent release: " + DL.VERSION + ")" + "Download Apache OpenOffice for free (really!) | " + "https://blogs.apache.org/OOo/ "Apache OpenOffice Blog" +[m3]: https://blogs.apache.org/OOo/ "Блог Apache OpenOffice" [m4]: /extensions/index.html "Extensions and Templates for OpenOffice" [m5]: https://openoffice.apache.org/get-involved.html "Get involved in Apache OpenOffice" [m6]: /projects/accepted.html "Apache OpenOffice development focus areas" diff --git a/templates/ssi_paths.gsp b/templates/ssi_paths.gsp index 3d40b3201a..0b77475325 100644 --- a/templates/ssi_paths.gsp +++ b/templates/ssi_paths.gsp @@ -149,7 +149,7 @@ // topnav["/th/"] = "/th/topnav.html" topnav["/th/"] = "/topnav.html" topnav["/tr/"] = "/tr/topnav.html" -// topnav["/uk/"] = "/uk/topnav.html" + topnav["/uk/"] = "/uk/topnav.html" topnav["/uk/"] = "/topnav.html" topnav["/vi/"] = "/vi/topnav.html" topnav["/xx/"] = "/xx/topnav.html" @@ -211,4 +211,4 @@ if ( leftnav[key] ) content.leftnav = leftnav[key]; if ( rightnav[key] ) content.rightnav = rightnav[key]; } -%> \ No newline at end of file +%>
[openoffice-org] branch main updated: Activated localized Ukrainian brand and topnav
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new efd55c870c Activated localized Ukrainian brand and topnav efd55c870c is described below commit efd55c870c35d1dbae5e3bcb02c7e046005cbdae Author: mseidel AuthorDate: Tue Oct 17 18:20:10 2023 +0200 Activated localized Ukrainian brand and topnav --- templates/ssi_paths.gsp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/templates/ssi_paths.gsp b/templates/ssi_paths.gsp index 0b77475325..299f3486e9 100644 --- a/templates/ssi_paths.gsp +++ b/templates/ssi_paths.gsp @@ -72,7 +72,7 @@ // brand["/th/"] = "/th/brand.html" brand["/th/"] = "/brand.html" brand["/tr/"] = "/tr/brand.html" -// brand["/uk/"] = "/uk/brand.html" + brand["/uk/"] = "/uk/brand.html" brand["/uk/"] = "/brand.html" // brand["/vi/"] = "/vi/brand.html" brand["/vi/"] = "/brand.html" @@ -82,7 +82,7 @@ brand["/zh/"] = "/zh/brand.html" // As long as we have no translation for a specific language, we will use the general English text to keep the website updates as low as possible for new releases. -// Therefore some of the following languages are commented out and in the next line the general "brand.html" will be used. +// Therefore some of the following languages are commented out and in the next line the general "topnav.html" will be used. def topnav = [:] topnav["/"] = "/topnav.html" @@ -150,7 +150,6 @@ topnav["/th/"] = "/topnav.html" topnav["/tr/"] = "/tr/topnav.html" topnav["/uk/"] = "/uk/topnav.html" - topnav["/uk/"] = "/topnav.html" topnav["/vi/"] = "/vi/topnav.html" topnav["/xx/"] = "/xx/topnav.html" topnav["/zh-cn/"] = "/zh-cn/topnav.html"
[openoffice-org] branch main updated: Activated localized Ukrainian brand.html
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new 5988c59c28 Activated localized Ukrainian brand.html 5988c59c28 is described below commit 5988c59c284872d79895a0c2fd068cc4905244b3 Author: mseidel AuthorDate: Tue Oct 17 18:42:17 2023 +0200 Activated localized Ukrainian brand.html --- templates/ssi_paths.gsp | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/ssi_paths.gsp b/templates/ssi_paths.gsp index 299f3486e9..0c191a7df9 100644 --- a/templates/ssi_paths.gsp +++ b/templates/ssi_paths.gsp @@ -73,7 +73,6 @@ brand["/th/"] = "/brand.html" brand["/tr/"] = "/tr/brand.html" brand["/uk/"] = "/uk/brand.html" - brand["/uk/"] = "/brand.html" // brand["/vi/"] = "/vi/brand.html" brand["/vi/"] = "/brand.html" brand["/xx/"] = "/xx/brand.html"
[openoffice-org] branch main updated: Update topnav.md in ukrainian (#68)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new f413a10e82 Update topnav.md in ukrainian (#68) f413a10e82 is described below commit f413a10e821b49d7a3f81f23bd29f25ace9f3b7b Author: Олексій AuthorDate: Tue Oct 17 20:17:26 2023 +0300 Update topnav.md in ukrainian (#68) Complete translate to ukrainian --- content/uk/topnav.md | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/content/uk/topnav.md b/content/uk/topnav.md index cf73b725ee..2625be703a 100644 --- a/content/uk/topnav.md +++ b/content/uk/topnav.md @@ -5,17 +5,17 @@ divid=topnava - [Завантаження][m1] - [Підтримка][m2] - [Блог][m3] -- [Extensions & Templates][m4] -- [Get Involved][m5] -- [Focus Areas][m6] -- [Native Languages][m7] +- [Розширення і шаблони][m4] +- [Взяти участь][m5] +- [Зони розробки][m6] +- [Рідні мови][m7] [m0]: /product/index.html "Опис програмного продукту Apache OpenOffice" [m1]: /uk/download/index.html "Завантаження Apache OpenOffice" [m2]: /support/index.html "Знайти підтримку стосовно OpenOffice" [m3]: https://blogs.apache.org/OOo/ "Блог Apache OpenOffice" -[m4]: /extensions/index.html "Extensions and Templates for OpenOffice" -[m5]: https://openoffice.apache.org/get-involved.html "Get involved in Apache OpenOffice" -[m6]: /projects/accepted.html "Apache OpenOffice development focus areas" -[m7]: /projects/native-lang.html "Apache OpenOffice in your Native Language" +[m4]: /extensions/index.html "Розширення і шаблони для OpenOffice" +[m5]: https://openoffice.apache.org/get-involved.html "Приєднуйтесь до Apache OpenOffice" +[m6]: /projects/accepted.html "Зони розробки Apache OpenOffice" +[m7]: /projects/native-lang.html "Apache OpenOffice вашою рідною мовою"
[openoffice-org] branch main updated: Re-added jpg
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new 7e50b8c5e9 Re-added jpg 7e50b8c5e9 is described below commit 7e50b8c5e9e415985d1ba7d3cf7c3c512d940082 Author: mseidel AuthorDate: Tue Oct 17 23:03:26 2023 +0200 Re-added jpg --- assets/images/AOO_logos/orb.jpg | Bin 0 -> 6120 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/images/AOO_logos/orb.jpg b/assets/images/AOO_logos/orb.jpg new file mode 100644 index 00..303635e76e Binary files /dev/null and b/assets/images/AOO_logos/orb.jpg differ
[openoffice-org] branch main updated: Re-added original jpg
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new a40a29eb6a Re-added original jpg a40a29eb6a is described below commit a40a29eb6a9f9ca4495e11b585056d572562f980 Author: mseidel AuthorDate: Tue Oct 17 23:38:21 2023 +0200 Re-added original jpg --- assets/images/AOO_logos/orb.jpg | Bin 6120 -> 8572 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/images/AOO_logos/orb.jpg b/assets/images/AOO_logos/orb.jpg index 303635e76e..cdb2dde760 100644 Binary files a/assets/images/AOO_logos/orb.jpg and b/assets/images/AOO_logos/orb.jpg differ
[openoffice-org] branch main updated: Fixed indentation
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new dd72e4e4af Fixed indentation dd72e4e4af is described below commit dd72e4e4afc9c28f0793ca4551b1e295225b0262 Author: mseidel AuthorDate: Wed Oct 18 00:06:24 2023 +0200 Fixed indentation --- assets/uk/download/msg_prop_l10n_uk.js | 251 + 1 file changed, 126 insertions(+), 125 deletions(-) diff --git a/assets/uk/download/msg_prop_l10n_uk.js b/assets/uk/download/msg_prop_l10n_uk.js index 2edf2b8663..261159bb7f 100644 --- a/assets/uk/download/msg_prop_l10n_uk.js +++ b/assets/uk/download/msg_prop_l10n_uk.js @@ -3,8 +3,8 @@ * * Instead of hard coded text in the green box please use these variables and translate it to your favorite language. * - * Wrong: "Download Apache OpenOffice" - * Correct: l10n.dl_green_box_headline_text + * Wrong: "Download Apache OpenOffice" + * Correct:l10n.dl_green_box_headline_text */ @@ -16,18 +16,18 @@ // Set a specific language ISO code to force to assemble a download link with a certain language. // Change xx to a valid ISO lang code. -DL.NL_LANG = "en-US"; +DL.NL_LANG = "en-US"; // General: -l10n.dl_headline_text = "Apache OpenOffice Download"; +l10n.dl_headline_text = "Apache OpenOffice Download"; // Download: Strings in the green box (used in "index.html"). -l10n.dl_green_box_headline_text= "Download Apache OpenOffice"; -l10n.dl_green_box_headline_title = "Download Apache OpenOffice for your favorite operating system, language and version"; -l10n.dl_green_box_subtext1_text= "Hosted by Sourceforge.net - A trusted website"; -l10n.dl_green_box_subtext1_title = "Apache OpenOffice binary files are hosted by Sourceforge.net - A trusted website"; -l10n.dl_green_box_subtext2_text= "Select your favorite operating system, language and version"; -l10n.dl_green_box_subtext2_title = "Select your favorite operating system, language and version"; +l10n.dl_green_box_headline_text= "Download Apache OpenOffice"; +l10n.dl_green_box_headline_title = "Download Apache OpenOffice for your favorite operating system, language and version"; +l10n.dl_green_box_subtext1_text= "Hosted by Sourceforge.net - A trusted website"; +l10n.dl_green_box_subtext1_title = "Apache OpenOffice binary files are hosted by Sourceforge.net - A trusted website"; +l10n.dl_green_box_subtext2_text= "Select your favorite operating system, language and version"; +l10n.dl_green_box_subtext2_title = "Select your favorite operating system, language and version"; l10n.dl_green_box_selectbox_os_title = "Select your favorite operating system"; l10n.dl_green_box_selectbox_lang_title = "Select your favorite language"; l10n.dl_green_box_selectbox_ver_title = "Select your favorite release version"; @@ -40,60 +40,60 @@ l10n.dl_green_box_selectbox_ver_title = "Select your favorite release version"; // l10n.dl_green_box_select_box_os_values = [ "" ]; l10n.dl_green_box_select_box_os_values = [ "Windows (EXE)", - "Linux 64-bit (x86-64) (DEB)", - "Linux 64-bit (x86-64) (RPM)", - "Linux 32-bit (x86) (DEB)", - "Linux 32-bit (x86) (RPM)", - "OS X (version >= 10.7) (DMG)", - "OS X (version <= 10.6) (DMG)", - "More platforms / operating systems" ]; + "Linux 64-bit (x86-64) (DEB)", + "Linux 64-bit (x86-64) (RPM)", + "Linux 32-bit (x86) (DEB)", +
[openoffice-org] branch main updated: Update brand.md with some little changes in Ukrainian (#71)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new def02cb9a6 Update brand.md with some little changes in Ukrainian (#71) def02cb9a6 is described below commit def02cb9a6807f6ed1dd286dd2879f97c24b32de Author: Олексій AuthorDate: Wed Oct 18 21:25:10 2023 +0300 Update brand.md with some little changes in Ukrainian (#71) Update brand.md with some little changes in Ukrainian --- content/uk/brand.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/uk/brand.md b/content/uk/brand.md index 1c7b1aae95..1b380b16e6 100644 --- a/content/uk/brand.md +++ b/content/uk/brand.md @@ -4,11 +4,11 @@ search=search selectedlang=en language=Українська name=Apache OpenOffice -tagline=Вільний і відкритий пакет продуктивності +tagline=Вільний і відкритий офісний пакет logo=AOO_logos/100MillAOO100px.png domain=https://www.openoffice.org divid=bannera -announce=Released: Apache OpenOffice +announce=Випущено: Apache OpenOffice announceurl=https://blogs.apache.org/OOo/entry/announcing-apache-openoffice-4-110 -announcetip=Released: Apache OpenOffice +announcetip=Випущено: Apache OpenOffice ~~
[openoffice] branch trunk updated: Update README.md
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 169c5e89af Update README.md 169c5e89af is described below commit 169c5e89afbfabc2f91196959c9305b12d96b429 Author: Matthias Seidel AuthorDate: Sat Oct 21 01:31:31 2023 +0200 Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 898491cf1a..af881fdf7b 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Currently supported platforms include: - FreeBSD - OS/2 -OpenOffice is used by millions of users worldwide and with more than 350 million downloads it is one of the most successful open source projects. +OpenOffice is used by millions of users worldwide and with more than 360 million downloads it is one of the most successful open source projects. # Getting the latest sources via Git
[openoffice] branch trunk updated: Update download numbers
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 7e4d1fd9c1 Update download numbers 7e4d1fd9c1 is described below commit 7e4d1fd9c11c21dc1349834b16148eb4096a31e3 Author: mseidel AuthorDate: Sat Oct 21 01:37:03 2023 +0200 Update download numbers --- main/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/README b/main/README index 6d1e2e65cb..bdf86766c4 100644 --- a/main/README +++ b/main/README @@ -19,7 +19,7 @@ Apache OpenOffice (AOO) FreeBSD OS/2 -OpenOffice is used by millions of users worldwide and with more than 350 million +OpenOffice is used by millions of users worldwide and with more than 360 million downloads it is one of the most successful open source projects. Getting the latest sources via Git
[openoffice] branch AOO42X updated: Update download numbers
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new a7004e2dd8 Update download numbers a7004e2dd8 is described below commit a7004e2dd8f0c9d8bccaa6f0fd59483fb5f6e9ca Author: mseidel AuthorDate: Sat Oct 21 01:37:03 2023 +0200 Update download numbers (cherry picked from commit 7e4d1fd9c11c21dc1349834b16148eb4096a31e3) --- main/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/README b/main/README index 6d1e2e65cb..bdf86766c4 100644 --- a/main/README +++ b/main/README @@ -19,7 +19,7 @@ Apache OpenOffice (AOO) FreeBSD OS/2 -OpenOffice is used by millions of users worldwide and with more than 350 million +OpenOffice is used by millions of users worldwide and with more than 360 million downloads it is one of the most successful open source projects. Getting the latest sources via Git
[openoffice] branch AOO41X updated: Update download numbers
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO41X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO41X by this push: new 0a12a2c199 Update download numbers 0a12a2c199 is described below commit 0a12a2c1993909e4b3326dd08430c07a29ca3109 Author: mseidel AuthorDate: Sat Oct 21 01:37:03 2023 +0200 Update download numbers (cherry picked from commit 7e4d1fd9c11c21dc1349834b16148eb4096a31e3) --- main/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/README b/main/README index 6091ed005a..0e8e29b86b 100644 --- a/main/README +++ b/main/README @@ -18,7 +18,7 @@ Apache OpenOffice (AOO) FreeBSD OS/2 -OpenOffice is used by millions of users worldwide and with more than 350 million +OpenOffice is used by millions of users worldwide and with more than 360 million downloads it is one of the most successful open source projects. Getting the latest sources via Git
[openoffice-org] branch main updated: Celebrating 360 Million downloads
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new d1bc8871ef Celebrating 360 Million downloads d1bc8871ef is described below commit d1bc8871ef5da0ed236278858a8c1bc0c1319dba Author: mseidel AuthorDate: Sat Oct 21 02:19:30 2023 +0200 Celebrating 360 Million downloads --- assets/images/AOO_logos/100MillAOO100px.png | Bin 31759 -> 32074 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/images/AOO_logos/100MillAOO100px.png b/assets/images/AOO_logos/100MillAOO100px.png index 21398c1565..9799c472eb 100644 Binary files a/assets/images/AOO_logos/100MillAOO100px.png and b/assets/images/AOO_logos/100MillAOO100px.png differ
[openoffice-org] branch main updated: Updated download numbers for social media links
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git
The following commit(s) were added to refs/heads/main by this push:
new a25dc0a516 Updated download numbers for social media links
a25dc0a516 is described below
commit a25dc0a516ef77dae5c0b63f084cd01aa02a68e4
Author: mseidel
AuthorDate: Sun Oct 22 12:50:14 2023 +0200
Updated download numbers for social media links
---
content/af/download/index.html | 8
content/am/download/index.html | 8
content/ar/download/index.html | 8
content/ast/download/index.html | 8
content/bg/download/index.html | 8
content/ca/download/index.html | 8
content/cs/download/index.html | 8
content/da/download/index.html | 8
content/de/download/index.html | 8
content/download/index.html | 8
content/el/download/index.html | 8
content/eo/download/index.html | 8
content/es/descargar/index.html | 8
content/et/download/index.html | 8
content/eu/download/index.html | 8
content/fi/download/index.html | 8
content/fr/download/index.html | 8
content/gd/download/index.html | 8
content/gl/download/index.html | 8
content/hi/download/index.html | 8
content/hu/download/index.html | 8
content/hy/download/index.html | 8
content/is/download/index.html | 8
content/it-new/download/index.html | 8
content/ja/download/index.html | 8
content/kab/download/index.html | 8
content/km/download/index.html | 8
content/ko/download/index.html | 8
content/lt/download/index.html | 8
content/nl/download/index.html | 8
content/no/download/index.html | 8
content/om/download/index.html | 8
content/pl/download/index.html | 8
content/pt-br/download/index.html | 8
content/pt/download/index.html | 10 +-
content/ro/download/index.html | 8
content/ru/download/index.html | 8
content/sk/download/index.html | 8
content/sl/download/index.html | 8
content/sr-cyrl/download/index.html | 8
content/sr/download/index.html | 8
content/sv/download/index.html | 8
content/ta/download/index.html | 8
content/th/download/index.html | 8
content/tr/download/index.html | 8
content/vi/download/index.html | 8
content/xx/download/index.html | 8
content/zh-tw/download/index.html | 10 +-
48 files changed, 194 insertions(+), 194 deletions(-)
diff --git a/content/af/download/index.html b/content/af/download/index.html
index 88007c579a..7cdc63c982 100644
--- a/content/af/download/index.html
+++ b/content/af/download/index.html
@@ -3,12 +3,12 @@
http://schema.org/Article";>
-
+
https://www.openoffice.org/images/AOO_logos/AOO-Logo-Download.png"; />
-
+
https://www.openoffice.org/images/AOO_logos/AOO-Logo-Download.png"; />
-
+
Apache OpenOffice Downloads - Official Site
@@ -37,7 +37,7 @@
} else if ( platform == 'facebook' ) {
window.open(
'https://www.facebook.com/sharer/sharer.php?u=https%3A%2F%2Fwww.openoffice.org%2Fdownload%2F',
'_blank', 'toolbar=0, status=0, width=580, height=325' );
} else if ( platform == 'twitter' ) {
-window.open(
'https://twitter.com/intent/tweet?url=https%3A%2F%2Fwww.openoffice.org%2Fdownload%2F&text=Join+the+OpenOffice+revolution%2C+the+free+office+productivity+suite+with+over+350+million+trusted+downloads.',
'_blank', 'toolbar=0, status=0, width=580, height=325' );
+window.open(
'https://twitter.com/intent/tweet?url=https%3A%2F%2Fwww.openoffice.org%2Fdownload%2F&text=Join+the+OpenOffice+revolution%2C+the+free+office+productivity+suite+with+over+360+million+trusted+downloads.',
'_blank', 'toolbar=0, status=0, width=580, height=325' );
}
}
diff --git a/content/am/download/index.html b/content/am/download/index.html
index f48d024259..d8ed38c29b 100644
--- a/content/am/download/index.html
+++ b/content/am/download/index.html
@@ -3,12 +3,12 @@
http://schema.org/Article";>
-
+
https://www.openoffice.org/images/AOO_logos/AOO-Logo-Download.png"; />
-
+
https://www.openoffice.org/images/AOO_logos/AOO-Logo-Download.png"; />
-
+
Apache OpenOffice Downloads -
[openoffice-org] branch main updated: Add Ukrainian to language menu, activate soft redirect
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new 9f466156ec Add Ukrainian to language menu, activate soft redirect 9f466156ec is described below commit 9f466156ecf9e29515bdd9f05e24828e7dd3fd83 Author: mseidel AuthorDate: Sun Oct 22 13:37:07 2023 +0200 Add Ukrainian to language menu, activate soft redirect --- assets/download/globalvars.js | 129 +- assets/download/languages.js | 2 +- assets/msg_prop_l10n.js | 43 +++--- 3 files changed, 88 insertions(+), 86 deletions(-) diff --git a/assets/download/globalvars.js b/assets/download/globalvars.js index cbd2af4950..320d418fc9 100644 --- a/assets/download/globalvars.js +++ b/assets/download/globalvars.js @@ -40,73 +40,74 @@ DL.SEL_OS = [ "win32","Windows 32-bit (x86) (EXE)", ".exe", "other","More platforms / operating systems", "" ]; // Data for the element "lang". -// Value Visible text Tool tip -DL.SEL_LANG= [ "hy", "Armenian", "Հայերեն", - "ast", "Asturian", "Asturianu", - "eu", "Basque", "Euskara", - "bg", "Bulgarian", "български език", - "ca", "Catalan", "Català", - "ca-XV","Catalan [Valencia AVL]", "València (AVL)", - "ca-XR","Catalan [Valencia RACV]", "València (RACV)", - "zh-CN","Chinese [simplified]", "简体中文", - "zh-TW","Chinese [traditional]", "正體中文", - "cs", "Czech", "Čeština", - "da", "Danish", "Dansk", - "nl", "Dutch", "Nederlands", - "en-GB","English [British]", "English [British]", - "en-US","English [US]", "English [US]", - "eo", "Esperanto", "Esperanto", - "et", "Estonian", "Eesti keeles", - "fi", "Finnish", "Suomi", - "fr", "French", "Français", - "gl", "Galician", "Galego", - "de", "German", "Deutsch", - "el", "Greek", "ελληνικά", - "he", "Hebrew", "עברית", - "hi", "Hindi", "हिन्दी", - "hu", "Hungarian", "Magyar", - "it", "Italian", "Italiano", - "ja", "Japanese", "日本語", - "km", "Khmer", "ភាសាខ្មែរ", - "ko", "Korean",
[openoffice-org] branch main updated: Fixed error
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new 78e15cb70c Fixed error 78e15cb70c is described below commit 78e15cb70c9262d7978b25bb33ee6dc37d72d505 Author: mseidel AuthorDate: Sun Oct 22 14:10:30 2023 +0200 Fixed error --- assets/download/globalvars.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/download/globalvars.js b/assets/download/globalvars.js index 320d418fc9..a449121238 100644 --- a/assets/download/globalvars.js +++ b/assets/download/globalvars.js @@ -84,8 +84,8 @@ DL.SEL_LANG = [ "hy", "Armenian", "Հայերեն", "sv", "Swedish", "Svenska", "ta", "Tamil", "தமிழ்", "th", "Thai", "ภาษาไทย", - "uk", "Ukrainian", "Yкраї́нська", "tr", "Turkish", "Türkçe", + "uk", "Ukrainian", "Yкраї́нська", "vi", "Vietnamese", "Tiếng Việt" ]; // Data for the element "ver".
[openoffice-org] branch main updated: Update msg_prop_l10n_uk.js to Ukrainian (#69)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new 03ffec56ac Update msg_prop_l10n_uk.js to Ukrainian (#69) 03ffec56ac is described below commit 03ffec56ac840035c0c20b30d2446c739a004120 Author: Олексій AuthorDate: Sun Oct 22 15:40:28 2023 +0300 Update msg_prop_l10n_uk.js to Ukrainian (#69) * Update msg_prop_l10n_uk.js to Ukrainian Full translation msg_prop_l10n_uk.js to Ukrainian * Update msg_prop_l10n_uk.js Updated some older parts * Update msg_prop_l10n_uk.js - added English comments and some Ukrainian translation Update msg_prop_l10n_uk.js - added English comments and some Ukrainian translation - Co-authored-by: Matthias Seidel --- assets/uk/download/msg_prop_l10n_uk.js | 507 ++--- 1 file changed, 274 insertions(+), 233 deletions(-) diff --git a/assets/uk/download/msg_prop_l10n_uk.js b/assets/uk/download/msg_prop_l10n_uk.js index 261159bb7f..4dae4a042a 100644 --- a/assets/uk/download/msg_prop_l10n_uk.js +++ b/assets/uk/download/msg_prop_l10n_uk.js @@ -7,37 +7,48 @@ * Correct:l10n.dl_green_box_headline_text */ +/* Цей файл призначений для збереження текстової інформації, яку можна використовувати на веб-сторінці завантаження за допомогою JavaScript +* включаючи цей файл. +* +* Замість жорстко закодованого тексту в зеленому полі, будь ласка, використовуйте ці змінні та перекладіть його на вашу улюблену мову. +* +* Неправильно: "Завантажити Apache OpenOffice" +* Правильно: l10n.dl_green_box_headline_text +*/ // Object that contains all following variables. +// Об'єкт, що містить всі наступні змінні. //var l10n = new Object(); // The following variables are used in the "index.html" file: +// Наступні змінні використовуються у файлі "index.html": // Set a specific language ISO code to force to assemble a download link with a certain language. -// Change xx to a valid ISO lang code. +// Установіть ISO-код певної мови, щоб примусово компонувати посилання для завантаження певною мовою. DL.NL_LANG = "en-US"; // General: -l10n.dl_headline_text = "Apache OpenOffice Download"; +// Загальне: +l10n.dl_headline_text = "Завантаження Apache OpenOffice"; // Download: Strings in the green box (used in "index.html"). -l10n.dl_green_box_headline_text= "Download Apache OpenOffice"; -l10n.dl_green_box_headline_title = "Download Apache OpenOffice for your favorite operating system, language and version"; -l10n.dl_green_box_subtext1_text= "Hosted by Sourceforge.net - A trusted website"; -l10n.dl_green_box_subtext1_title = "Apache OpenOffice binary files are hosted by Sourceforge.net - A trusted website"; -l10n.dl_green_box_subtext2_text= "Select your favorite operating system, language and version"; -l10n.dl_green_box_subtext2_title = "Select your favorite operating system, language and version"; -l10n.dl_green_box_selectbox_os_title = "Select your favorite operating system"; -l10n.dl_green_box_selectbox_lang_title = "Select your favorite language"; -l10n.dl_green_box_selectbox_ver_title = "Select your favorite release version"; +// Завантаження: рядки в зеленому полі (викоритовується у "index.html"). +l10n.dl_green_box_headline_text= "Завантаження Apache OpenOffice"; +l10n.dl_green_box_headline_title = "Завантаження Apache OpenOffice для певних операційної системи, мови і версії"; +l10n.dl_green_box_subtext1_text= "Розміщено на Sourceforge.net - надійному веб-сайті"; +l10n.dl_green_box_subtext1_title = "Двійкові файли Apache OpenOffice розміщено на SourceForge.net - надійному веб сайті"; +l10n.dl_green_box_subtext2_text= "Виберіть бажані операційну систему, мову і версію"; +l10n.dl_green_box_subtext2_title = "Виберіть бажані операційну систему, мову і версію"; +l10n.dl_green_box_selectbox_os_title = "Виберіть бажану операційну систему"; +l10n.dl_green_box_selectbox_lang_title = "Виберіть бажану мову"; +l10n.dl_green_box_selectbox_ver_title = "Виберіть бажану версію"; // The strings that will be shown in the OS, language and version drop-down select boxes. -// You must leave at least one single empty string (see the comment lines above the 3 following variables)! -//
[openoffice-org] branch main updated: Small corrections
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git
The following commit(s) were added to refs/heads/main by this push:
new a537970de2 Small corrections
a537970de2 is described below
commit a537970de2652db0bc61bd73f7122c69c831d504
Author: mseidel
AuthorDate: Sun Oct 22 15:17:47 2023 +0200
Small corrections
---
assets/download/globalvars.js | 2 +-
assets/download/languages.js| 5 ++---
assets/download/msg_prop_l10n_en.js | 1 +
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/assets/download/globalvars.js b/assets/download/globalvars.js
index a449121238..8b57336719 100644
--- a/assets/download/globalvars.js
+++ b/assets/download/globalvars.js
@@ -85,7 +85,7 @@ DL.SEL_LANG = [ "hy",
"Armenian", "Հայերեն",
"ta", "Tamil",
"தமிழ்",
"th", "Thai",
"ภาษาไทย",
"tr", "Turkish",
"Türkçe",
- "uk", "Ukrainian",
"Yкраї́нська",
+ "uk", "Ukrainian",
"Yкраїнська",
"vi", "Vietnamese",
"Tiếng Việt" ];
// Data for the element "ver".
diff --git a/assets/download/languages.js b/assets/download/languages.js
index 5de3664041..a0d149fe19 100644
--- a/assets/download/languages.js
+++ b/assets/download/languages.js
@@ -12,7 +12,7 @@ a b 01 2
*/
DL.language_matrix = {
-// All listed languages below *are* supported and *are* available as full
installation and language pack.
+// All listed languages below *are* supported and *are* available as full
installation and language pack. (Some languages are not released but already
added for AOO 4.2.0)
"ast": { "-" : [ 'ast', 'Asturian', 'Asturianu' ] },
"bg": { "-" : [ 'bg','Bulgarian', 'български език' ] },
@@ -59,7 +59,7 @@ DL.language_matrix = {
"ta": { "-" : [ 'ta','Tamil', 'தமிழ்' ] },
"th": { "-" : [ 'th','Thai', 'ภาษาไทย' ] },
"tr": { "-" : [ 'tr','Turkish', 'Türkçe' ]
},
-"uk": { "-" : [ 'uk','Ukrainian', 'Yкраї́нська' ] },
+"uk": { "-" : [ 'uk','Ukrainian', 'Yкраїнська' ] },
"vi": { "-" : [ 'vi','Vietnamese','Tiếng Việt' ]
},
"zh": { "-" : [ 'zh','Chinese', 'Chinese' ],
"cn": [ 'zh-CN', 'Chinese (simplified)', '简体中文' ],
@@ -104,4 +104,3 @@ DL.language_matrix = {
"uz": { "-" : [ 'uz','Uzbek', 'Ўзбек' ] },
"cy": { "-" : [ 'cy','Welsh', 'Cymraeg' ] }
};
-
diff --git a/assets/download/msg_prop_l10n_en.js
b/assets/download/msg_prop_l10n_en.js
index c51adf9e2c..6fb7794866 100644
--- a/assets/download/msg_prop_l10n_en.js
+++ b/assets/download/msg_prop_l10n_en.js
@@ -81,6 +81,7 @@ l10n.dl_green_box_select_box_lang_values_custom = [ "ast",
"Asturian", "Astur
"ta", "Tamil",
"தமிழ்",
"th", "Thai",
"ภาษาไทย",
"tr", "Turkish",
"Türkçe",
+ "uk", "Ukrainian",
"Yкраїнська",
"vi", "Vietnamese",
"Tiếng Việt" ];
l10n.dl_green_box_select_box_version_values= [ "" ];
[openoffice-org] branch main updated: Add platform hints for Ukrainian
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new d6d47ea0b7 Add platform hints for Ukrainian d6d47ea0b7 is described below commit d6d47ea0b7d74747df51c6a0aeaa35ea2a123508 Author: mseidel AuthorDate: Sun Oct 22 15:28:26 2023 +0200 Add platform hints for Ukrainian --- content/uk/download/platform_hints.html | 41 + 1 file changed, 41 insertions(+) diff --git a/content/uk/download/platform_hints.html b/content/uk/download/platform_hints.html new file mode 100644 index 00..ef713a6840 --- /dev/null +++ b/content/uk/download/platform_hints.html @@ -0,0 +1,41 @@ +http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> +http://www.w3.org/1999/xhtml"; /> + + + Apache OpenOffice - Important hints for the chosen platform + + + + + /* <![CDATA[ */ + /* Exceptions on standard css ---*/ + @import "/css/styles.css"; + @import "/css/exceptions.css"; + /* ]]> */ + + + + + + Apache OpenOffice + Apache OpenOffice + + + +<!-- +document.write( "<h3>" + l10n.dl_platform_info_headline + "</h3>" ); + +document.write( "<h4><b>" + l10n.dl_platform_info_win_headline + "</b></h4>" ); +document.write( l10n.dl_platform_info_win_text ); + +document.write( "<h4><b>" + l10n.dl_platform_info_mac_headline + "</b></h4>" ); +document.write( l10n.dl_platform_info_mac_text ); + +document.write( "<h4><b>" + l10n.dl_platform_info_linux_headline + "</b></h4>" ); +document.write( l10n.dl_platform_info_linux_text ); +//--> + + + +
[openoffice-org] branch main updated: Small corrections
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new 222d64791f Small corrections 222d64791f is described below commit 222d64791f3ac295f0492196379d3a43f04222bb Author: mseidel AuthorDate: Sun Oct 22 15:59:01 2023 +0200 Small corrections --- assets/download/msg_prop_l10n_en.js | 1 - content/uk/download/platform_hints.html | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/assets/download/msg_prop_l10n_en.js b/assets/download/msg_prop_l10n_en.js index 6fb7794866..c51adf9e2c 100644 --- a/assets/download/msg_prop_l10n_en.js +++ b/assets/download/msg_prop_l10n_en.js @@ -81,7 +81,6 @@ l10n.dl_green_box_select_box_lang_values_custom = [ "ast", "Asturian", "Astur "ta", "Tamil", "தமிழ்", "th", "Thai", "ภาษาไทย", "tr", "Turkish", "Türkçe", - "uk", "Ukrainian", "Yкраїнська", "vi", "Vietnamese", "Tiếng Việt" ]; l10n.dl_green_box_select_box_version_values= [ "" ]; diff --git a/content/uk/download/platform_hints.html b/content/uk/download/platform_hints.html index ef713a6840..f7d5b111e9 100644 --- a/content/uk/download/platform_hints.html +++ b/content/uk/download/platform_hints.html @@ -5,7 +5,7 @@ Apache OpenOffice - Important hints for the chosen platform - +
[openoffice-org] branch main updated: Update msg_prop_l10n.js - translated Ukrainian row (#74)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new c86052a25b Update msg_prop_l10n.js - translated Ukrainian row (#74) c86052a25b is described below commit c86052a25b660470cb84db5cb492c3103325047a Author: Олексій AuthorDate: Sun Oct 22 17:12:10 2023 +0300 Update msg_prop_l10n.js - translated Ukrainian row (#74) Update msg_prop_l10n.js - translated Ukrainian row --- assets/msg_prop_l10n.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/msg_prop_l10n.js b/assets/msg_prop_l10n.js index 091b253b17..d8034ca633 100644 --- a/assets/msg_prop_l10n.js +++ b/assets/msg_prop_l10n.js @@ -98,6 +98,6 @@ l10n.index_redirect_text = [ /* hy */ "soft", "Այս կայքը հասանե /* ta */"none", "This site is also available in தமிழ் (ta). Just click this text to get redirected.", /* th */"none", "This site is also available in ภาษาไทย (th). Just click this text to get redirected.", /* tr */"soft", "Bu site ayrıca Türkçe (tr) olarak mevcuttur. Yeniden yönlendirilmek için sadece bu metine tıklayın.", - /* uk */"soft", "This site is also available in Ukrainian (uk). Just click this text to get redirected.", + /* uk */"soft", "Сайт також доступний Українською (uk). Натисніть, щоб перейти.", /* vi */"none", "This site is also available in Tiếng Việt (vi). Just click this text to get redirected." ];
[openoffice-org] branch main updated: Update index.html to Ukrainian (#73)
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new a6d67d0971 Update index.html to Ukrainian (#73) a6d67d0971 is described below commit a6d67d09715bbf76120fbe7dd6cb7e294e1d9825 Author: Олексій AuthorDate: Sun Oct 22 18:09:51 2023 +0300 Update index.html to Ukrainian (#73) * Update index.html to Ukrainian Complete update index.html to Ukrainian * Update index.html Updated download number * Update index.html added English comments Update index.html added English comments - Co-authored-by: Matthias Seidel --- content/uk/download/index.html | 53 +- 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/content/uk/download/index.html b/content/uk/download/index.html index dcba25b8c2..43f9483f88 100644 --- a/content/uk/download/index.html +++ b/content/uk/download/index.html @@ -2,14 +2,14 @@ http://www.w3.org/1999/xhtml"; xml:lang="uk" lang="uk"> http://schema.org/Article";> - - + + https://www.openoffice.org/images/AOO_logos/AOO-Logo-Download.png"; /> - - + + https://www.openoffice.org/images/AOO_logos/AOO-Logo-Download.png"; /> - - Apache OpenOffice Downloads - Official Site + + Завантаження Apache OpenOffice - Офіційна сторінка @@ -20,6 +20,7 @@
[openoffice-org] branch main updated: Updated native language status
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new 086951c0fc Updated native language status 086951c0fc is described below commit 086951c0fc45a469ddb2a47564417a3fefd586b4 Author: mseidel AuthorDate: Sun Oct 22 17:44:15 2023 +0200 Updated native language status --- assets/uk/msg_prop_l10n_uk.js | 6 +++--- content/projects/native-lang.md | 16 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/assets/uk/msg_prop_l10n_uk.js b/assets/uk/msg_prop_l10n_uk.js index 165ed0190b..7966c2a137 100644 --- a/assets/uk/msg_prop_l10n_uk.js +++ b/assets/uk/msg_prop_l10n_uk.js @@ -3,8 +3,8 @@ * * Instead of hard coded text in the green box please use these variables and translate it to your favorite language. * - * Wrong: "Download Apache OpenOffice" - * Correct: l10n.index_redirect_text + * Wrong: "Download Apache OpenOffice" + * Correct:l10n.index_redirect_text */ @@ -20,4 +20,4 @@ l10n.index_alert_box_href = "https://openoffice.apache.org/translate.html";; / // Maximum 49 characters. l10n.index_alert_box_headline_text = "We need your help to complete translation into Ukrainian!"; // Maximum 630 characters. -l10n.index_alert_box_text_text = "This note is in English because we need your help to translate Apache OpenOffice and this website into your language. The links on this page will help you download and install Apache OpenOffice in all currently available languages. If you are interested in helping translate, please click this text to review the information. You can send a note to our mailing list \"l...@openoffice.apache.org\" if you want to volunteer or if you have questions."; +l10n.index_alert_box_text_text = "This note is in English because we need your help to translate Apache OpenOffice into your language. The links on this page will help you download and install Apache OpenOffice in all currently available languages. If you are interested in helping translate, please click this text to review the information. You can send a note to our mailing list \"l...@openoffice.apache.org\" if you want to volunteer or if you have questions."; diff --git a/content/projects/native-lang.md b/content/projects/native-lang.md index 1ae90e168d..5c445254b4 100644 --- a/content/projects/native-lang.md +++ b/content/projects/native-lang.md @@ -28,18 +28,18 @@ Language | Website | OpenOffice availability [Afrikaans (af)](/af/) | help wanted | outdated [Amharic (am)](/am/) | help wanted | outdated [Arabic (ar)](/ar/)| help wanted | outdated -[Armenian (hy)](/hy/) | maintained| outdated +[Armenian (hy)](/hy/) | maintained| planned for 4.2.x [Asturian (ast)](/ast/)| help wanted | current 4.1.x [Basque (eu)](/eu/)| help wanted | current 4.1.x [Bulgarian (bg)](/bg/) | help wanted | current 4.1.x [Catalan (ca)](/ca/) | help wanted | current 4.1.x -[正體中文 Chinese trad. (tw)](/zh-tw/) | maintained| current 4.1.x -[简体中文 Chinese sim. (cn)](/zh-cn/) | maintained| current 4.1.x +[Chinese traditional (zh-tw)](/zh-tw/) | maintained| current 4.1.x +[Chinese simplified (zh-cn)](/zh-cn/) | maintained| current 4.1.x [Czech (cs)](/cs/) | maintained | current 4.1.x [Danish (da)](/da/)| maintained | current 4.1.x [Dutch (nl)](/nl/) | maintained | current 4.1.x [Esperanto (eo)](/eo/) | help wanted | outdated -[Estonian (et)](/et/) | help wanted | outdated +[Estonian (et)](/et/) | help wanted | planned for 4.2.x [Finnish (fi)](/fi/) | maintained| current 4.1.x [French (fr)](/fr/)| maintained | current 4.1.x [Galician (gl)](/gl/) | help wanted | current 4.1.x @@ -53,19 +53,19 @@ Language
[openoffice-org] branch main updated: Removed Ukrainian from download menu
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new 7e6ed5727c Removed Ukrainian from download menu 7e6ed5727c is described below commit 7e6ed5727c7929cdae1a29975c6eac6268fe63b4 Author: mseidel AuthorDate: Sun Oct 22 18:46:27 2023 +0200 Removed Ukrainian from download menu --- assets/uk/download/msg_prop_l10n_uk.js | 199 - 1 file changed, 99 insertions(+), 100 deletions(-) diff --git a/assets/uk/download/msg_prop_l10n_uk.js b/assets/uk/download/msg_prop_l10n_uk.js index 4dae4a042a..498668d9cf 100644 --- a/assets/uk/download/msg_prop_l10n_uk.js +++ b/assets/uk/download/msg_prop_l10n_uk.js @@ -40,9 +40,9 @@ l10n.dl_green_box_subtext1_text = "Розміщено на Sourceforge.net - l10n.dl_green_box_subtext1_title = "Двійкові файли Apache OpenOffice розміщено на SourceForge.net - надійному веб сайті"; l10n.dl_green_box_subtext2_text= "Виберіть бажані операційну систему, мову і версію"; l10n.dl_green_box_subtext2_title = "Виберіть бажані операційну систему, мову і версію"; -l10n.dl_green_box_selectbox_os_title = "Виберіть бажану операційну систему"; -l10n.dl_green_box_selectbox_lang_title = "Виберіть бажану мову"; -l10n.dl_green_box_selectbox_ver_title = "Виберіть бажану версію"; +l10n.dl_green_box_selectbox_os_title = "Виберіть бажану операційну систему"; +l10n.dl_green_box_selectbox_lang_title = "Виберіть бажану мову"; +l10n.dl_green_box_selectbox_ver_title = "Виберіть бажану версію"; // The strings that will be shown in the OS, language and version drop-down select boxes. // You must leave at least one single empty string (see the comment lines below the 3 following variables)! @@ -63,50 +63,49 @@ l10n.dl_green_box_select_box_os_values = [ "Windows (EXE)", l10n.dl_green_box_select_box_language_values = [ "" ]; // l10n.dl_green_box_select_box_lang_values_custom = [ "" ]; -// Value Visible text Tool tip -// ЗначенняТекст відображення Спливна підказка -l10n.dl_green_box_select_box_lang_values_custom= [ "ast", "Asturian", "Asturianu", - "eu", "Basque", "Euskara", - "bg", "Bulgarian", "български език", - "ca", "Catalan", "Català", - "ca-XV","Catalan [Valencia AVL]", "València (AVL)", - "ca-XR","Catalan [Valencia RACV]", "València (RACV)", - "zh-CN","Chinese [simplified]", "简体中文", - "zh-TW","Chinese [traditional]", "正體中文", - "cs", "Czech", "Čeština", - "da", "Danish", "Dansk", - "nl", "Dutch", "Nederlands", -
[openoffice-org] branch main updated: Add Ukrainian product pages
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new 5760622c65 Add Ukrainian product pages 5760622c65 is described below commit 5760622c65e169bd51eb9507dac47206c7dfa8e1 Author: mseidel AuthorDate: Sun Oct 22 19:57:52 2023 +0200 Add Ukrainian product pages --- content/uk/product/base.md| 42 + content/uk/product/calc.md| 57 + content/uk/product/draw.md| 42 + content/uk/product/impress.md | 43 + content/uk/product/index.md | 73 +++ content/uk/product/leftnav.md | 16 ++ content/uk/product/math.md| 24 ++ content/uk/product/suite.md | 42 + content/uk/product/writer.md | 62 content/uk/topnav.md | 2 +- 10 files changed, 402 insertions(+), 1 deletion(-) diff --git a/content/uk/product/base.md b/content/uk/product/base.md new file mode 100644 index 00..7d5322672f --- /dev/null +++ b/content/uk/product/base.md @@ -0,0 +1,42 @@ +type=page +image_css=rfloatimg +title=Apache OpenOffice Base +notice=https://www.apache.org/licenses/LICENSE-2.0 +~~ +[](/product/pix/base-big.png "Click for bigger version") + +**Base** is a fully featured desktop database management system, designed to +meet the needs of a broad array of users, from tracking a personal CD collections, +to producing a corporate monthly departmental sales reports. + +Base offers wizards to help users new to database design (or Base) +to create Tables, Queries, Forms and Reports, along with a set of +predefined table definitions for tracking Assets, Customers, Sales Orders, +Invoices and much more. + +When a personal use database is all you need, Base offers the full HSQL +relational database engine, configured for single user, with the data stored +right in the Base file, as well as native support for dBase flat files. + +For power users in the enterprise, Base delivers native support drivers for +a variety of multi-user database engines: MySQL, Adabas D, MS Access and +PostgreSQL. In addition, support for JDBC and ODBC standard drivers allows you +to connect to virtually any database. + +Base integrates seamlessly into the rest of the Apache OpenOffice suite +applications, for example: + + - Supplying address book data for mail merge in Writer using the industry +standard LDAP protocol, or common address book formats such as Microsoft +Outlook, Microsoft Windows and Mozilla; + - Creating linked data ranges in Calc files for data pilot analysis or as the +basis for charts. + +For more information on working with Base, please see the +[Apache OpenOffice Wiki Database][1] pages. + +For technical information, or to help make Base even better, stop by the +[Base project page][2]. + +[1]: https://wiki.openoffice.org/wiki/database +[2]: https://dba.openoffice.org/ diff --git a/content/uk/product/calc.md b/content/uk/product/calc.md new file mode 100644 index 00..8451d5b510 --- /dev/null +++ b/content/uk/product/calc.md @@ -0,0 +1,57 @@ +type=page +image_css=rfloatimg +title=Apache OpenOffice Calc +notice=https://www.apache.org/licenses/LICENSE-2.0 +~~ +[](/product/pix/calc-big.png "Click for bigger version") + +*The solution to storing all your numbers and lists!* + +**Calc** is the spreadsheet application you've always wanted. Newcomers find it +intuitive and easy to learn; professional data miners and number crunchers will +appreciate the comprehensive range of advanced functions. + +*DataPilot* is an advanced technology that makes it easy to pull in raw data from corporate +databases; cross-tabulate, summarize, and convert it into meaningful information. + +*Natural language formulas* let you create formulas using words (e.g. "sales - +costs"). + +*Intelligent Sum Button* inserts a sum function or a subtotal automatically, +depending on context. + +*Wizards* guides you through choosing and using a comprehensive range of +advanced spreadsheet functions, or [download templates][1] from our Templates +repository for ready-made spreadsheet solutions. + +*Styles and Formatting* makes it easy to apply flexible cell formatting options, +including freely rotating contents, templates, backgrounds, borders, and many +more. You can be your own spreadsheet expert thanks to *templates* with built-in +functions, allowing you to concentrate on your real work. + +*Scenario Manager* allows "what if ..." analysis at the touch of a button - e.g. +compare profitability for high / me
[openoffice-org] branch main updated: Add left navigator for Ukrainian product page
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git
The following commit(s) were added to refs/heads/main by this push:
new 33bb3fc1e0 Add left navigator for Ukrainian product page
33bb3fc1e0 is described below
commit 33bb3fc1e08444836a220f710b6876812ebe7c7a
Author: mseidel
AuthorDate: Sun Oct 22 21:07:06 2023 +0200
Add left navigator for Ukrainian product page
---
templates/brand.gsp | 3 ++-
templates/ssi_paths.gsp | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/templates/brand.gsp b/templates/brand.gsp
index 07b875d3cf..89000330a9 100644
--- a/templates/brand.gsp
+++ b/templates/brand.gsp
@@ -29,6 +29,7 @@
Slovenščina (sl)
Suomi (fi)
Svenska (sv)
+ Yкраїнська (uk)
Tiếng Việt (vi)
Türkçe (tr)
Հայերեն (hy)
@@ -79,4 +80,4 @@
-https://blogs.apache.org/OOo/entry/announcing-apache-openoffice-4-110";
title="${content.announcetip} 4.1.14">${content.announce} 4.1.14
\ No newline at end of file
+https://blogs.apache.org/OOo/entry/announcing-apache-openoffice-4-110";
title="${content.announcetip} 4.1.14">${content.announce} 4.1.14
diff --git a/templates/ssi_paths.gsp b/templates/ssi_paths.gsp
index 0c191a7df9..2273faf7d2 100644
--- a/templates/ssi_paths.gsp
+++ b/templates/ssi_paths.gsp
@@ -194,6 +194,7 @@
leftnav["/sv/product/"] = "/sv/product/leftnav.html"
leftnav["/tr/product/"] = "/tr/product/leftnav.html"
leftnav["/tr/why/"] = "/tr/why/leftnav.html"
+ leftnav["/uk/product/"] = "/uk/product/leftnav.html"
leftnav["/why/"] = "/why/leftnav.html"
leftnav["/xx/product/"] = "/xx/product/leftnav.html"
leftnav["/xx/why/"] = "/xx/why/leftnav.html"
[openoffice-org] branch main updated: Corrected link
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new 33c765f9e6 Corrected link 33c765f9e6 is described below commit 33c765f9e675de90973fc3557ae77c0a6d83ef0e Author: mseidel AuthorDate: Sun Oct 22 22:18:40 2023 +0200 Corrected link --- content/uk/product/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/uk/product/index.md b/content/uk/product/index.md index e88737e393..d18744f301 100644 --- a/content/uk/product/index.md +++ b/content/uk/product/index.md @@ -66,7 +66,7 @@ Apache OpenOffice is **standards compliant**: [1]: /uk/download "Download Apache OpenOffice" [2]: /about_us/milestones.html -[3]: /reviews.html +[3]: /product/reviews.html [4]: /projects/native-lang.html [6]: https://www.oasis-open.org/ [7]: https://www.oasis-open.org/committees/tc_home.php?wg_abbrev=office
[openoffice-org] branch main updated: Small tweaks
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new 5d004f5163 Small tweaks 5d004f5163 is described below commit 5d004f516329940794b7f828363c6c2734b7a959 Author: mseidel AuthorDate: Sun Oct 22 22:57:15 2023 +0200 Small tweaks --- assets/sr-latn/download/msg_prop_l10n_sh.js | 43 + content/projects/native-lang.md | 4 +-- 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/assets/sr-latn/download/msg_prop_l10n_sh.js b/assets/sr-latn/download/msg_prop_l10n_sh.js index 8735d137e8..601cf4797e 100644 --- a/assets/sr-latn/download/msg_prop_l10n_sh.js +++ b/assets/sr-latn/download/msg_prop_l10n_sh.js @@ -3,8 +3,8 @@ * * Instead of hard coded text in the green box please use these variables and translate it to your favorite language. * - * Wrong: "Download Apache OpenOffice" - * Correct: l10n.dl_green_box_headline_text + * Wrong: "Download Apache OpenOffice" + * Correct:l10n.dl_green_box_headline_text */ @@ -15,10 +15,10 @@ var l10n = new Object(); // The following variables are used in the "index.html" file: // Set a specific language ISO code to force to assemble a download link with a certain language. -DL.NL_LANG = "sr"; +DL.NL_LANG = "en"; // General: -l10n.dl_headline_text = "Preuzmite Apache OpenOffice"; +l10n.dl_headline_text = "Preuzmite Apache OpenOffice"; // Download: Strings in the green box (used in "index.html"). l10n.dl_green_box_headline_text= "Preuzmite Apache OpenOffice"; @@ -27,9 +27,9 @@ l10n.dl_green_box_subtext1_text = "Hostovano od strane Sourceforge.net - web l l10n.dl_green_box_subtext1_title = "Binarne datoteke Apache OpenOffice-a su hostovane od strane Sourceforge.net - web lokacija od poverenja"; l10n.dl_green_box_subtext2_text= "Izaberite željeni operativni sistem, jezik i verziju"; l10n.dl_green_box_subtext2_title = "Izaberite željeni operativni sistem, jezik i verziju"; -l10n.dl_green_box_selectbox_os_title = "Izaberite željeni operativni sistem"; -l10n.dl_green_box_selectbox_lang_title = "Izaberite željeni jezik"; -l10n.dl_green_box_selectbox_ver_title = "Izaberite željenu verziju izdanja"; +l10n.dl_green_box_selectbox_os_title = "Izaberite željeni operativni sistem"; +l10n.dl_green_box_selectbox_lang_title = "Izaberite željeni jezik"; +l10n.dl_green_box_selectbox_ver_title = "Izaberite željenu verziju izdanja"; // The strings that will be shown in the OS, language and version drop-down select boxes. // You must leave at least one single empty string (see the comment lines below the 3 following variables)! @@ -90,15 +90,25 @@ l10n.dl_green_box_select_box_language_values= [ "Asturian (Asturianu)", l10n.dl_green_box_select_box_lang_values_custom= [ "" ]; /* l10n.dl_green_box_select_box_version_values = [ "" ]; */ -l10n.dl_green_box_select_box_version_values= [ "4.1.4", - "4.1.3", - "4.1.2", - "4.1.1", - "4.1.0", - "4.0.1", - "4.0.0", - "3.4.1", - "Starija izdanja" ]; +l10n.dl_green_box_select_box_version_values= [ "4.1.14", + "4.1.13", + "4.1.12" + "4.1.11", + "4.1.10", + "4.1.9", + "4.1.8", +
[openoffice-org] branch main updated: Fixed eror
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new dda9bdd39e Fixed eror dda9bdd39e is described below commit dda9bdd39e46f21e493f9654e3a9f661314373b2 Author: mseidel AuthorDate: Sun Oct 22 23:18:54 2023 +0200 Fixed eror --- assets/sr-latn/download/msg_prop_l10n_sh.js | 96 ++--- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/assets/sr-latn/download/msg_prop_l10n_sh.js b/assets/sr-latn/download/msg_prop_l10n_sh.js index 601cf4797e..fc3f84b553 100644 --- a/assets/sr-latn/download/msg_prop_l10n_sh.js +++ b/assets/sr-latn/download/msg_prop_l10n_sh.js @@ -92,7 +92,7 @@ l10n.dl_green_box_select_box_lang_values_custom = [ "" ]; /* l10n.dl_green_box_select_box_version_values = [ "" ]; */ l10n.dl_green_box_select_box_version_values= [ "4.1.14", "4.1.13", - "4.1.12" + "4.1.12", "4.1.11", "4.1.10", "4.1.9", @@ -126,15 +126,15 @@ l10n.dl_share_light_blue_box_text_text= "Recite vašim prijateljima za Apache l10n.dl_share_light_blue_box_text_title= "Pomozite širenju priče i recite vašim prijateljima za Apache OpenOffice"; l10n.dl_share_light_blue_box_blog_text = "Zvanični blog"; l10n.dl_share_light_blue_box_blog_title= "OpenOffice-ov dnevnik na Webu."; -l10n.dl_share_light_blue_box_blog_src = "http://www.openoffice.org/images/logo-rss-32.png";; +l10n.dl_share_light_blue_box_blog_src = "https://www.openoffice.org/images/logo-rss-32.png";; l10n.dl_share_light_blue_box_blog_alt = "OpenOffice-ov dnevnik na Webu"; l10n.dl_share_light_blue_box_facebook_text = "Facebook"; l10n.dl_share_light_blue_box_facebook_title= "Recite vašim prijateljima za Apache OpenOffice preko Facebook-a"; -l10n.dl_share_light_blue_box_facebook_src = "http://www.openoffice.org/images/logo-facebook-32.png";; +l10n.dl_share_light_blue_box_facebook_src = "https://www.openoffice.org/images/logo-facebook-32.png";; l10n.dl_share_light_blue_box_facebook_alt = "Delite preko Facebook-a"; l10n.dl_share_light_blue_box_twitter_text = "Twitter"; l10n.dl_share_light_blue_box_twitter_title = "Recite vašim prijateljima za Apache OpenOffice preko Twitter-a"; -l10n.dl_share_light_blue_box_twitter_src = "http://www.openoffice.org/images/logo-twitter-32.png";; +l10n.dl_share_light_blue_box_twitter_src = "https://www.openoffice.org/images/logo-twitter-32.png";; l10n.dl_share_light_blue_box_twitter_alt = "Delite preko Twitter-a"; // Extensions: Strings in the blue box (top) (used in "index.html"). @@ -142,98 +142,98 @@ l10n.dl_ext_blue_box_headline_text= "Nabavite proširenja i rečnike za Apache l10n.dl_ext_blue_box_headline_title= "Izaberite iz širokog spektra dodatnih i individualnih funkcionalnosti"; l10n.dl_ext_blue_box_text_text = "Proširite funkcionalnost Apache OpenOffice-a sa velikom i rastućom bibliotekom proširenja i rečnicima od drugih korisnika."; l10n.dl_ext_blue_box_text_title= "Izaberite iz širokog spektra dodatnih i individualnih funkcionalnosti"; -l10n.dl_ext_blue_box_text_href = "http://extensions.openoffice.org/";; +l10n.dl_ext_blue_box_text_href = "https://extensions.openoffice.org/";; // Templates: Strings in the blue box (bottom) (used in "index.html"). l10n.dl_tlp_blue_box_headline_text = "Nabavite šablone za Apache OpenOffice"; l10n.dl_tlp_blue_box_headline_title= "Izaberite iz širokog spektra dodatnih i individualnih dokumenata"; l10n.dl_tlp_blue_box_text_text = "Proširite kreativnost Apache OpenOffice-a sa velikom i rastućom bibliotekom šablona od drugih korisnika."; l10n.dl_tlp_blue_box_text_title= "Izaberite iz širokog spek
[openoffice-org] branch main updated: Renew outdated sr-Latn file
This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openoffice-org.git The following commit(s) were added to refs/heads/main by this push: new 6205bee176 Renew outdated sr-Latn file 6205bee176 is described below commit 6205bee176fb212b0b9865bab54ef54fb0392831 Author: mseidel AuthorDate: Mon Oct 23 10:00:42 2023 +0200 Renew outdated sr-Latn file --- assets/sr-latn/download/msg_prop_l10n_sh.js| 756 +++-- ...msg_prop_l10n_sh.js => msg_prop_l10n_sh.js.bak} | 0 2 files changed, 385 insertions(+), 371 deletions(-) diff --git a/assets/sr-latn/download/msg_prop_l10n_sh.js b/assets/sr-latn/download/msg_prop_l10n_sh.js index fc3f84b553..cbff508be3 100644 --- a/assets/sr-latn/download/msg_prop_l10n_sh.js +++ b/assets/sr-latn/download/msg_prop_l10n_sh.js @@ -1,371 +1,385 @@ -/* This file is to maintain text information that can be used on the download webpage via JavaScript when - * including this file. - * - * Instead of hard coded text in the green box please use these variables and translate it to your favorite language. - * - * Wrong: "Download Apache OpenOffice" - * Correct:l10n.dl_green_box_headline_text - */ - - - -// Object that contains all following variables. -var l10n = new Object(); - -// The following variables are used in the "index.html" file: - -// Set a specific language ISO code to force to assemble a download link with a certain language. -DL.NL_LANG = "en"; - -// General: -l10n.dl_headline_text = "Preuzmite Apache OpenOffice"; - -// Download: Strings in the green box (used in "index.html"). -l10n.dl_green_box_headline_text= "Preuzmite Apache OpenOffice"; -l10n.dl_green_box_headline_title = "Preuzmite Apache OpenOffice prema vašem operativnom sistemu, jeziku i verziji"; -l10n.dl_green_box_subtext1_text= "Hostovano od strane Sourceforge.net - web lokacija od poverenja"; -l10n.dl_green_box_subtext1_title = "Binarne datoteke Apache OpenOffice-a su hostovane od strane Sourceforge.net - web lokacija od poverenja"; -l10n.dl_green_box_subtext2_text= "Izaberite željeni operativni sistem, jezik i verziju"; -l10n.dl_green_box_subtext2_title = "Izaberite željeni operativni sistem, jezik i verziju"; -l10n.dl_green_box_selectbox_os_title = "Izaberite željeni operativni sistem"; -l10n.dl_green_box_selectbox_lang_title = "Izaberite željeni jezik"; -l10n.dl_green_box_selectbox_ver_title = "Izaberite željenu verziju izdanja"; - -// The strings that will be shown in the OS, language and version drop-down select boxes. -// You must leave at least one single empty string (see the comment lines below the 3 following variables)! -/* l10n.dl_green_box_select_box_os_values = [ "" ]; */ -l10n.dl_green_box_select_box_os_values = [ "Windows (EXE)", - "Linux 64-bit (x86-64) (DEB)", - "Linux 64-bit (x86-64) (RPM)", - "Linux 32-bit (x86) (DEB)", - "Linux 32-bit (x86) (RPM)", - "OS X 64-bit (x86-64) (DMG)", - "OS X 32-bit (x86) (DMG)", - "Još platformi / operativni sistemi" ]; - -/* l10n.dl_green_box_select_box_language_values= [ "" ]; */ -l10n.dl_green_box_select_box_language_values = [ "Asturian (Asturianu)", - "Basque (Euskara)", - "Bulgarian (български език)", -"Catalan (Català)", -"Catalan Valencia AVL (Català Valencià AVL)", -"Catalan Valencia RACV (Català Valencià RACV)", - "Chinese [simplified] (简体中文)", - "Chinese [traditional] (正體中文)", - "Czech (Čeština)", - "Danish (Dansk)", - "Dutch (Nederlands)", - "English [Britis
[openoffice-org] branch main updated: Renew outdated sr-Latn file
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git
The following commit(s) were added to refs/heads/main by this push:
new 0995722c4e Renew outdated sr-Latn file
0995722c4e is described below
commit 0995722c4eb4b8582b38e9af0fbf6cc4f83c240b
Author: mseidel
AuthorDate: Mon Oct 23 10:27:02 2023 +0200
Renew outdated sr-Latn file
---
content/sr-latn/download/index.html| 231 +++--
.../download/{index.html => index.html.bak}| 0
content/sr-latn/download/platform_hints.html | 41
3 files changed, 157 insertions(+), 115 deletions(-)
diff --git a/content/sr-latn/download/index.html
b/content/sr-latn/download/index.html
index 7ac0a573c6..d0de6892b7 100644
--- a/content/sr-latn/download/index.html
+++ b/content/sr-latn/download/index.html
@@ -1,14 +1,14 @@
http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
http://www.w3.org/1999/xhtml"; />
http://schema.org/Article";>
-
+
-
- http://www.openoffice.org/images/aoo-logo-100x100.png"; />
+
+ https://www.openoffice.org/images/AOO_logos/AOO-Logo-Download.png"; />
-
- http://www.openoffice.org/images/aoo-logo-100x100.png"; />
-
+
+ https://www.openoffice.org/images/AOO_logos/AOO-Logo-Download.png"; />
+
Apache OpenOffice Downloads - Official Site
@@ -25,18 +25,18 @@
if ( window.document.referrer.indexOf( "shell.windows.com" ) != -1 ) {
- location.href = "<a rel="nofollow" href="http://www.openoffice.org/why/why_odf.html"">http://www.openoffice.org/why/why_odf.html"</a>;;
+ location.href = "/why/why_odf.html";
}
function share( platform ) {
// _gaq.push( ['_trackEvent', 'social', 'shareDownload', platform] );
if ( platform == 'apacheblog' ) {
-window.open( '<a rel="nofollow" href="http://blogs.apache.org/OOo/">http://blogs.apache.org/OOo/</a>', '_blank' );
+window.open( '<a rel="nofollow" href="https://blogs.apache.org/OOo/">https://blogs.apache.org/OOo/</a>', '_blank' );
} else if ( platform == 'facebook' ) {
-window.open(
'<a rel="nofollow" href="http://www.facebook.com/sharer/sharer.php?u=http%3A%2F%2Fwww.openoffice.org%2Fdownload%2F">http://www.facebook.com/sharer/sharer.php?u=http%3A%2F%2Fwww.openoffice.org%2Fdownload%2F</a>',
'_blank', 'toolbar=0, status=0, width=580, height=325' );
+window.open(
'<a rel="nofollow" href="https://www.facebook.com/sharer/sharer.php?u=https%3A%2F%2Fwww.openoffice.org%2Fdownload%2F">https://www.facebook.com/sharer/sharer.php?u=https%3A%2F%2Fwww.openoffice.org%2Fdownload%2F</a>',
'_blank', 'toolbar=0, status=0, width=580, height=325' );
} else if ( platform == 'twitter' ) {
-window.open(
'<a rel="nofollow" href="http://twitter.com/intent/tweet?url=http%3A%2F%2Fwww.openoffice.org%2Fdownload%2F&text=Join+the+OpenOffice+revolution%2C+the+free+office+productivity+suite+with+over+250+million+trusted+downloads">http://twitter.com/intent/tweet?url=http%3A%2F%2Fwww.openoffice.org%2Fdownload%2F&text=Join+the+OpenOffice+revolution%2C+the+free+office+productivity+suite+with+over+250+million+trusted+downloads</a>.',
'_blank', 'toolbar=0, status=0, width=580, height=325' );
+window.open(
'<a rel="nofollow" href="https://twitter.com/intent/tweet?url=https%3A%2F%2Fwww.openoffice.org%2Fxx%2Fdownload%2F&text=Join+the+OpenOffice+revolution%2C+the+free+office+productivity+suite+with+over+360+million+trusted+downloads">https://twitter.com/intent/tweet?url=https%3A%2F%2Fwww.openoffice.org%2Fxx%2Fdownload%2F&text=Join+the+OpenOffice+revolution%2C+the+free+office+productivity+suite+with+over+360+million+trusted+downloads</a>.',
'_blank', 'toolbar=0, status=0, width=580, height=325' );
}
}
@@ -44,111 +44,112 @@
-
-
-
-
-
-
-<!--
-// The text in the H1 tag is intentionally shown as "display: none" (do
not display).
-// This is to please accessibility tools like a screen reader.
-document.write( "<h1 style='display: none;'>" + l10n.dl_headline_text +
"</h1>" );
-//-->
-
-
-
-
-
-<!--
-
-// Set a specific language ISO code to force to assemble a certain
localized build as download link.
-// Changed: The variable ca
