rpms
/
libreoffice
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

4.0.1 rc2

Browse Source
f41
David Tardon 12 years ago
parent 324ce99345
commit fbe3790b9d
10 changed files with 12 additions and 1101 deletions
Show Stats Download Patch File Download Diff File

3
.gitignore vendored
Unescape View File

@ -54,3 +54,6 @@
/libreoffice-4.0.0.3.tar.xz
/libreoffice-help-4.0.0.3.tar.xz
/libreoffice-translations-4.0.0.3.tar.xz
/libreoffice-4.0.1.2.tar.xz
/libreoffice-help-4.0.1.2.tar.xz
/libreoffice-translations-4.0.1.2.tar.xz

30
0001-Resolves-fdo-60132-Error-reading-file-after-insertin.patch
Unescape View File

@ -1,30 +0,0 @@
From 165a53f3a7f08e65055e08ecd4cfc068c5d353b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Fri, 8 Feb 2013 11:45:18 +0000
Subject: [PATCH] Resolves: fdo#60132 Error reading file after inserting
comment
Change-Id: Ib2b388c78c8f44a626267c2f8d3975b46ead3bd5
---
xmloff/source/text/txtfldi.cxx | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 4b7dc53..d97281a 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -3782,6 +3782,11 @@ void XMLAnnotationImportContext::PrepareField(
while (xFields->hasMoreElements())
{
uno::Reference<beans::XPropertySet> xCurrField(xFields->nextElement(), uno::UNO_QUERY);
+ uno::Reference<beans::XPropertySetInfo> xPropsInfo(xCurrField->getPropertySetInfo());
+
+ if (!xPropsInfo->hasPropertyByName(sPropertyName))
+ continue;
+
OUString aFieldName;
xCurrField->getPropertyValue(sPropertyName) >>= aFieldName;
if (aFieldName == aName)
--
1.8.1

66
0001-Resolves-rhbz-907933-crash-on-removing-second-last-p.patch
Unescape View File

@ -1,66 +0,0 @@
From 15d8b51bf82610c663f80fe552a1c0315e137ad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 5 Feb 2013 17:33:49 +0000
Subject: [PATCH] Resolves: rhbz#907933 crash on removing second last para in
cell...
if (basically) the last para is on next page
Change-Id: Iaff610ea94a829e73bfb8c694a27e0e9b4f6e295
Reviewed-on: https://gerrit.libreoffice.org/2012
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
---
sw/source/core/inc/tabfrm.hxx | 2 ++
sw/source/core/layout/tabfrm.cxx | 20 ++++++++++++++++++++
2 files changed, 22 insertions(+)
diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx
index 464fc9c..1041385 100644
--- a/sw/source/core/inc/tabfrm.hxx
+++ b/sw/source/core/inc/tabfrm.hxx
@@ -151,6 +151,8 @@ public:
//
sal_Bool HasFollowFlowLine() const { return bHasFollowFlowLine; }
void SetFollowFlowLine( sal_Bool bNew ) { bHasFollowFlowLine = bNew; }
+ //return the SwTabFrm (if any) that this SwTabFrm is a follow flow line for
+ SwTabFrm* GetFollowFlowLineFor();
sal_Bool IsRebuildLastLine() const { return bIsRebuildLastLine; }
void SetRebuildLastLine( sal_Bool bNew ) { bIsRebuildLastLine = bNew; }
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 27ad754..fb23128 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -132,8 +132,28 @@ extern const SwTable *pRowCacheLastTable;
extern const SwTabFrm *pRowCacheLastTabFrm;
extern const SwFrm *pRowCacheLastCellFrm;
+//return the SwTabFrm (if any) that this SwTabFrm is a follow flow line for
+SwTabFrm* SwTabFrm::GetFollowFlowLineFor()
+{
+ SwFlowFrm *pPrec = GetPrecede();
+ if (pPrec && pPrec->GetFrm()->IsTabFrm())
+ {
+ SwTabFrm *pPrevTabFrm = (SwTabFrm*)pPrec;
+ assert(this == pPrevTabFrm->GetFollow());
+ if (pPrevTabFrm->HasFollowFlowLine() && pPrevTabFrm->GetFollow() == this)
+ return pPrevTabFrm;
+ }
+ return NULL;
+}
+
SwTabFrm::~SwTabFrm()
{
+ //rhbz#907933, we are a follow flow line for something and have been
+ //deleted, remove ourself as a follow flowline
+ SwTabFrm* pFlowFrameFor = GetFollowFlowLineFor();
+ if (pFlowFrameFor)
+ pFlowFrameFor->RemoveFollowFlowLine();
+
// There is some terrible code in fetab.cxx, that
// makes use of these global pointers. Obviously
// this code did not consider that a TabFrm can be
--
1.8.1.2

69
0001-Resolves-rhbz-910176-cannot-select-directory-with-gn.patch
Unescape View File

@ -1,69 +0,0 @@
From 914de32b27c7fe164b21f9247275ee3117c0864b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Fri, 15 Feb 2013 13:41:11 +0000
Subject: [PATCH] Resolves: rhbz#910176 cannot select directory with gnome
folder picker
<< gtk documentation
gtk_file_chooser_get_current_folder_uri ()
Gets the current folder of chooser as an URI.
Note that this is the folder that the file chooser is currently displaying ...
which is not the same as the currently-selected folder if the chooser is in
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER mode ... to get the currently-selected
folder in that mode, use gtk_file_chooser_get_uri() as the usual way to get the
selection.
>>
<< offapi documentation
XFolderPicker
getDisplayDirectory:
Returns the root directory that the FolderPicker is showing.
getDirectory
Returns the selected directory
>>
so getDisplayDirectory <-> gtk_file_chooser_get_current_folder_uri
and getDirectory <-> gtk_file_chooser_get_uri
Change-Id: Iaa5ab16a250cd59fe5e8bd02149298eef6d1dec2
---
vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index 4da4b1e..6cd0531 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
@@ -96,7 +96,7 @@ rtl::OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory() throw( uno::Run
gchar* pCurrentFolder =
gtk_file_chooser_get_current_folder_uri( GTK_FILE_CHOOSER( m_pDialog ) );
- ::rtl::OUString aCurrentFolderName = uritounicode(pCurrentFolder);
+ OUString aCurrentFolderName = uritounicode(pCurrentFolder);
g_free( pCurrentFolder );
return aCurrentFolderName;
@@ -104,7 +104,16 @@ rtl::OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory() throw( uno::Run
rtl::OUString SAL_CALL SalGtkFolderPicker::getDirectory() throw( uno::RuntimeException )
{
- return getDisplayDirectory();
+ SolarMutexGuard g;
+
+ OSL_ASSERT( m_pDialog != NULL );
+
+ gchar* pSelectedFolder =
+ gtk_file_chooser_get_uri( GTK_FILE_CHOOSER( m_pDialog ) );
+ OUString aSelectedFolderName = uritounicode(pSelectedFolder);
+ g_free( pSelectedFolder );
+
+ return aSelectedFolderName;
}
void SAL_CALL SalGtkFolderPicker::setDescription( const rtl::OUString& rDescription )
--
1.8.1.2

59
0001-fdo-60491-scp2-always-package-emboleobj-library-on-n.patch
Unescape View File

@ -1,59 +0,0 @@
From 92e7811ee757db41dc0b428aa1fe1f3ba3797bac Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Sat, 9 Feb 2013 22:39:42 +0100
Subject: [PATCH] fdo#60491: scp2: always package emboleobj library on non-WNT
platforms
(regression from 09cd5c460704ddd99669a61ae335bfb2ce357140, which defined
DISABLE_ATL on all platforms in configure)
(cherry picked from commit ca8ac449e3524f895de1e94a3c5d511591031b40)
Conflicts:
postprocess/Rdb_services.mk
Change-Id: If2373386102373cb49e8cd0c6bf807da2f805dda
Reviewed-on: https://gerrit.libreoffice.org/2095
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
---
postprocess/packcomponents/makefile.mk | 4 ++--
scp2/source/ooo/file_library_ooo.scp | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index fa3231c..a37ba73 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -224,12 +224,12 @@ my_components += \
.ENDIF
-.IF "$(DISABLE_ATL)" == ""
.IF "$(OS)" == "WNT"
+.IF "$(DISABLE_ATL)" == ""
my_components += component/embeddedobj/source/msole/emboleobj.windows
+.ENDIF
.ELSE
my_components += component/embeddedobj/source/msole/emboleobj
-.ENDIF
.END
.IF "$(DISABLE_NEON)" != "TRUE"
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 642cd81..6dd5e29 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -394,7 +394,8 @@ STD_LIB_FILE(gid_File_Lib_Drawinglayer,drawinglayer)
SPECIAL_LIB_FILE(gid_File_Lib_Embobj,embobj)
-#ifndef DISABLE_ATL
+/* fdo#60491 always need emboleobj library on non-WNT platforms */
+#if !defined(WNT) || !defined(DISABLE_ATL)
SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj)
#endif
--
1.8.1.2

495
0001-fix-parser-errors-in-help-translations.patch
Unescape View File

@ -1,495 +0,0 @@
From 6ee465836d1fee4b4fbe714bde3b804cdda1b4ff Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Wed, 6 Feb 2013 11:23:17 +0100
Subject: [PATCH] fix parser errors in help translations
Change-Id: I9f5b3e637e36cadc397eacd9b60edac78e849fac
---
source/ast/helpcontent2/source/text/shared/guide.po | 2 +-
source/bg/helpcontent2/source/text/scalc/01.po | 2 +-
source/bg/helpcontent2/source/text/swriter/01.po | 2 +-
source/da/helpcontent2/source/text/scalc/00.po | 2 +-
source/da/helpcontent2/source/text/scalc/01.po | 4 ++--
source/da/helpcontent2/source/text/shared/01.po | 2 +-
source/da/helpcontent2/source/text/swriter/01.po | 2 +-
source/el/helpcontent2/source/text/sbasic/shared.po | 2 +-
source/eo/helpcontent2/source/text/simpress/guide.po | 2 +-
source/es/helpcontent2/source/text/sbasic/shared.po | 2 +-
source/es/helpcontent2/source/text/sbasic/shared/02.po | 2 +-
source/es/helpcontent2/source/text/swriter/guide.po | 2 +-
source/et/helpcontent2/source/text/sbasic/shared.po | 2 +-
source/fi/helpcontent2/source/text/scalc/01.po | 4 ++--
source/fr/helpcontent2/source/text/scalc/01.po | 2 +-
source/hu/helpcontent2/source/text/shared.po | 2 +-
source/id/helpcontent2/source/text/simpress/01.po | 2 +-
source/nl/helpcontent2/source/text/scalc/01.po | 4 ++--
source/nl/helpcontent2/source/text/shared.po | 2 +-
source/nl/helpcontent2/source/text/shared/01.po | 4 ++--
source/nl/helpcontent2/source/text/shared/guide.po | 2 +-
source/nl/helpcontent2/source/text/shared/optionen.po | 6 +++---
source/nl/helpcontent2/source/text/swriter/01.po | 2 +-
source/nn/helpcontent2/source/text/sbasic/shared/02.po | 2 +-
source/nn/helpcontent2/source/text/scalc/01.po | 2 +-
source/nn/helpcontent2/source/text/shared/optionen.po | 2 +-
source/sv/helpcontent2/source/text/sbasic/shared/02.po | 2 +-
source/sv/helpcontent2/source/text/scalc/01.po | 2 +-
source/sv/helpcontent2/source/text/shared/00.po | 2 +-
source/tr/helpcontent2/source/text/swriter/01.po | 4 ++--
30 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/translations/source/ast/helpcontent2/source/text/shared/guide.po b/translations/source/ast/helpcontent2/source/text/shared/guide.po
index 0351fc2..2b3d200 100644
--- a/translations/source/ast/helpcontent2/source/text/shared/guide.po
+++ b/translations/source/ast/helpcontent2/source/text/shared/guide.po
@@ -20810,7 +20810,7 @@ msgctxt ""
"par_id3155450\n"
"help.text"
msgid "<image id=\"img_id3152349\" src=\"cmd/sc_save.png\" width=\"0.222inch\" height=\"0.222inch\"><alt id=\"alt_id3152349\">This icon is for tips on how to use the program more effectively.</alt></image>"
-msgstr "<image id=\"img_id3152349\" src=\"cmd/sc_save.png\" width=\"0.222inch\" height=\"0.222inch\">Esti iconu amuesa conseyos sobre cómo usar el programa de forma más eficaz.</alt></image>"
+msgstr "<image id=\"img_id3152349\" src=\"cmd/sc_save.png\" width=\"0.222inch\" height=\"0.222inch\"><alt id=\"alt_id3152349\">Esti iconu amuesa conseyos sobre cómo usar el programa de forma más eficaz.</alt></image>"
#: doc_save.xhp
msgctxt ""
diff --git a/translations/source/bg/helpcontent2/source/text/scalc/01.po b/translations/source/bg/helpcontent2/source/text/scalc/01.po
index 85b78c7..33e19c3 100644
--- a/translations/source/bg/helpcontent2/source/text/scalc/01.po
+++ b/translations/source/bg/helpcontent2/source/text/scalc/01.po
@@ -241,7 +241,7 @@ msgctxt ""
"par_id9838862\n"
"help.text"
msgid "You can also press <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Up and <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Down keys to scroll through the pages."
-msgstr "За превъртане през страниците можете да използвате също клавишите <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Up и <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline>+Page Down."
+msgstr "За превъртане през страниците можете да използвате също клавишите <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Up и <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Page Down."
#: 01120000.xhp
msgctxt ""
diff --git a/translations/source/bg/helpcontent2/source/text/swriter/01.po b/translations/source/bg/helpcontent2/source/text/swriter/01.po
index 001abc2..a29c75c 100644
--- a/translations/source/bg/helpcontent2/source/text/swriter/01.po
+++ b/translations/source/bg/helpcontent2/source/text/swriter/01.po
@@ -11705,7 +11705,7 @@ msgctxt ""
"25\n"
"help.text"
msgid "<ahelp hid=\"modules/swriter/ui/linenumbering/linesspin\">Enter the number of lines to leave between the separators.</ahelp>"
-msgstr "<ahelp hid=\"modules/swriter/ui/linenumbering/linesspin\">Въведете броя редове, който да се оставят между разделителите."
+msgstr "<ahelp hid=\"modules/swriter/ui/linenumbering/linesspin\">Въведете броя редове, който да се оставят между разделителите.</ahelp>"
#: 06180000.xhp
msgctxt ""
diff --git a/translations/source/da/helpcontent2/source/text/scalc/00.po b/translations/source/da/helpcontent2/source/text/scalc/00.po
index 66d0e4b..f9c5ff1 100644
--- a/translations/source/da/helpcontent2/source/text/scalc/00.po
+++ b/translations/source/da/helpcontent2/source/text/scalc/00.po
@@ -330,7 +330,7 @@ msgctxt ""
"27\n"
"help.text"
msgid "<variable id=\"datengueltigeingabe\">Choose <emph>Data - Validity - Input Help</emph> tab</variable>"
-msgstr "<variable id=\"datengueltigeingabe\">Vælg <emph>Data - Validitet- Indtastningshjælp</emph</variable>"
+msgstr "<variable id=\"datengueltigeingabe\">Vælg <emph>Data - Validitet- Indtastningshjælp</emph></variable>"
#: 00000412.xhp
msgctxt ""
diff --git a/translations/source/da/helpcontent2/source/text/scalc/01.po b/translations/source/da/helpcontent2/source/text/scalc/01.po
index 62b0267..b8cf12b 100644
--- a/translations/source/da/helpcontent2/source/text/scalc/01.po
+++ b/translations/source/da/helpcontent2/source/text/scalc/01.po
@@ -49642,7 +49642,7 @@ msgctxt ""
"12\n"
"help.text"
msgid "Sorts the selection from the lowest value to the highest value. You can define the sort rules on Data - Sort - Options. You define the default on <switchinline select=\"sys\"><caseinline select=\"MAC\">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages."
-msgstr "Sorterer markeringen fra den laveste værdi til den højeste værdi. Du kan definere sorteringsreglerne i Data - Sorter - Indstillinger.</ahelp> Du definerer standarden i <switchinline select=\"sys\"><caseinline select=\"MAC\">%PRODUCTNAME - Indstillinger</caseinline><defaultinline>Funktioner - Indstillinger</defaultinline></switchinline> - Sprogindstillinger - Sprog."
+msgstr "Sorterer markeringen fra den laveste værdi til den højeste værdi. Du kan definere sorteringsreglerne i Data - Sorter - Indstillinger. Du definerer standarden i <switchinline select=\"sys\"><caseinline select=\"MAC\">%PRODUCTNAME - Indstillinger</caseinline><defaultinline>Funktioner - Indstillinger</defaultinline></switchinline> - Sprogindstillinger - Sprog."
#: 12030100.xhp
msgctxt ""
@@ -49660,7 +49660,7 @@ msgctxt ""
"14\n"
"help.text"
msgid "Sorts the selection from the highest value to the lowest value. You can define the sort rules on Data - Sort - Options. You define the default on <switchinline select=\"sys\"><caseinline select=\"MAC\">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages."
-msgstr "Sorterer markeringen fra den højeste værdi til den laveste værdi. Du kan definere sorteringsreglerne i Data - Sorter - Indstillinger.</ahelp> Du definerer standarden i <switchinline select=\"sys\"><caseinline select=\"MAC\">%PRODUCTNAME - Indstillinger</caseinline><defaultinline>Funktioner - Indstillinger</defaultinline></switchinline> - Sprogindstillinger - Sprog."
+msgstr "Sorterer markeringen fra den højeste værdi til den laveste værdi. Du kan definere sorteringsreglerne i Data - Sorter - Indstillinger. Du definerer standarden i <switchinline select=\"sys\"><caseinline select=\"MAC\">%PRODUCTNAME - Indstillinger</caseinline><defaultinline>Funktioner - Indstillinger</defaultinline></switchinline> - Sprogindstillinger - Sprog."
#: 12030100.xhp
msgctxt ""
diff --git a/translations/source/da/helpcontent2/source/text/shared/01.po b/translations/source/da/helpcontent2/source/text/shared/01.po
index 4de9a41..afb3685 100644
--- a/translations/source/da/helpcontent2/source/text/shared/01.po
+++ b/translations/source/da/helpcontent2/source/text/shared/01.po
@@ -19117,7 +19117,7 @@ msgctxt ""
"26\n"
"help.text"
msgid "<ahelp hid=\"filter/ui/xmlfiltersettings/save\">Displays a <emph>Save as </emph>dialog to save the selected file as an XSLT filter package (*.jar).</ahelp>"
-msgstr "<ahelp hid=\"filter/ui/xmlfiltersettings/save\"Viser en <emph>Gem som</emph>-dialog til at gemme den valgte fil som en XSLT-filterpakke (*.jar).</ahelp>"
+msgstr "<ahelp hid=\"filter/ui/xmlfiltersettings/save\">Viser en <emph>Gem som</emph>-dialog til at gemme den valgte fil som en XSLT-filterpakke (*.jar).</ahelp>"
#: 06150000.xhp
msgctxt ""
diff --git a/translations/source/da/helpcontent2/source/text/swriter/01.po b/translations/source/da/helpcontent2/source/text/swriter/01.po
index 18fda00..8dc4e8a 100644
--- a/translations/source/da/helpcontent2/source/text/swriter/01.po
+++ b/translations/source/da/helpcontent2/source/text/swriter/01.po
@@ -11767,7 +11767,7 @@ msgctxt ""
"32\n"
"help.text"
msgid "<ahelp hid=\"modules/swriter/ui/linenumbering/linesintextframes\">Adds line numbers to text in text frames. The numbering restarts in each text frame, and is excluded from the line count in the main text area of the document.</ahelp> In <link href=\"text/swriter/02/03210000.xhp\" name=\"linked frames\">linked frames</link>, the numbering is not restarted."
-msgstr "Tilføjer linjetal til tekst i tekstrammer. Nummereringen starter forfra i hver tekstramme og medregnes ikke i linjetællingen i dokumentets hovedtekst.</ahelp> I <link href=\"text/swriter/02/03210000.xhp\" name=\"linked frames\">kædede rammer</link> startes nummereringen ikke forfra."
+msgstr "<ahelp hid=\"modules/swriter/ui/linenumbering/linesintextframes\">Tilføjer linjetal til tekst i tekstrammer. Nummereringen starter forfra i hver tekstramme og medregnes ikke i linjetællingen i dokumentets hovedtekst.</ahelp> I <link href=\"text/swriter/02/03210000.xhp\" name=\"linked frames\">kædede rammer</link> startes nummereringen ikke forfra."
#: 06180000.xhp
msgctxt ""
diff --git a/translations/source/el/helpcontent2/source/text/sbasic/shared.po b/translations/source/el/helpcontent2/source/text/sbasic/shared.po
index e919e7a..8c1e164 100644
--- a/translations/source/el/helpcontent2/source/text/sbasic/shared.po
+++ b/translations/source/el/helpcontent2/source/text/sbasic/shared.po
@@ -18460,7 +18460,7 @@ msgctxt ""
"1\n"
"help.text"
msgid "<link href=\"text/sbasic/shared/main0601.xhp\" name=\"$[officename] Basic Help\">%PRODUCTNAME Basic Help</link>"
-msgstr "<link href=\"text/sbasic/shared/main0601.xhp\" name=\"Βοήθεια για το \"$[officename] Basic\">Βοήθεια για το %PRODUCTNAME Basic</link>"
+msgstr "<link href=\"text/sbasic/shared/main0601.xhp\" name=\"Βοήθεια για το $[officename] Basic\">Βοήθεια για το %PRODUCTNAME Basic</link>"
#: main0601.xhp
msgctxt ""
diff --git a/translations/source/eo/helpcontent2/source/text/simpress/guide.po b/translations/source/eo/helpcontent2/source/text/simpress/guide.po
index 23f69e8..cc0ace5 100644
--- a/translations/source/eo/helpcontent2/source/text/simpress/guide.po
+++ b/translations/source/eo/helpcontent2/source/text/simpress/guide.po
@@ -439,7 +439,7 @@ msgctxt ""
"100\n"
"help.text"
msgid "You can preview your animation by using the controls to the left of the <emph>Image Number </emph>box."
-msgstr "Vi povas antaŭvidi vian animacion uzante la regilojn maldekstre de la kadro <emph>Numero de bildo<emph>."
+msgstr "Vi povas antaŭvidi vian animacion uzante la regilojn maldekstre de la kadro <emph>Numero de bildo</emph>."
#: animated_gif_create.xhp
msgctxt ""
diff --git a/translations/source/es/helpcontent2/source/text/sbasic/shared.po b/translations/source/es/helpcontent2/source/text/sbasic/shared.po
index f967fdb..5346e78 100644
--- a/translations/source/es/helpcontent2/source/text/sbasic/shared.po
+++ b/translations/source/es/helpcontent2/source/text/sbasic/shared.po
@@ -12901,7 +12901,7 @@ msgctxt ""
"1\n"
"help.text"
msgid "<variable id=\"01050000\"><link href=\"text/sbasic/shared/01050000.xhp\" name=\"$[officename] Basic IDE\">$[officename] Basic IDE</link></variable>"
-msgstr "<link href=\"text/sbasic/shared/01050000.xhp\" name=\"$[officename] Basic IDE\">EID de $[officename] Basic</link></variable>"
+msgstr "<variable id=\"01050000\"><link href=\"text/sbasic/shared/01050000.xhp\" name=\"$[officename] Basic IDE\">EID de $[officename] Basic</link></variable>"
#: 01050000.xhp
msgctxt ""
diff --git a/translations/source/es/helpcontent2/source/text/sbasic/shared/02.po b/translations/source/es/helpcontent2/source/text/sbasic/shared/02.po
index 6d7967b..77819d9 100644
--- a/translations/source/es/helpcontent2/source/text/sbasic/shared/02.po
+++ b/translations/source/es/helpcontent2/source/text/sbasic/shared/02.po
@@ -1356,7 +1356,7 @@ msgctxt ""
"57\n"
"help.text"
msgid "<ahelp hid=\".uno:TestMode\">Starts test mode. Click the dialog closer icon to end test mode.</ahelp>"
-msgstr "<ahelp hid=\".uno:TestMode\">Inicia el modo de pruebas. Haga clic en el icono de cerrar en el diálogo para finalizar el modo de pruebas."
+msgstr "<ahelp hid=\".uno:TestMode\">Inicia el modo de pruebas. Haga clic en el icono de cerrar en el diálogo para finalizar el modo de pruebas.</ahelp>"
#: 20000000.xhp
msgctxt ""
diff --git a/translations/source/es/helpcontent2/source/text/swriter/guide.po b/translations/source/es/helpcontent2/source/text/swriter/guide.po
index c6dca65..965188c 100644
--- a/translations/source/es/helpcontent2/source/text/swriter/guide.po
+++ b/translations/source/es/helpcontent2/source/text/swriter/guide.po
@@ -18346,7 +18346,7 @@ msgctxt ""
"16\n"
"help.text"
msgid "In the <item type=\"menuitem\">Section</item> list, click the section you want to modify. You can press <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A to select all sections in the list, and you can Shift+click or <switchinline select=\"sys\"><caseinline select=\"MAC\">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+click to select some sections."
-msgstr "En la lista <item type=\"menuitem\">Sección</item>, haga clic en la sección que quiere modificar. Puede presionar <switchinline select=\"sys\"><caseinline select=\"MAC\">Comando</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A para seleccionar todas las secciones en la lista, y puede hacer clic mientras presiona Mayús o presionar <switchinline select=\"sys\"><caseinline select=\"MAC\">Comando<defaultinline>Ctrl</defaultinline></switchinline>+clic para seleccionar algunas secciones."
+msgstr "En la lista <item type=\"menuitem\">Sección</item>, haga clic en la sección que quiere modificar. Puede presionar <switchinline select=\"sys\"><caseinline select=\"MAC\">Comando</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A para seleccionar todas las secciones en la lista, y puede hacer clic mientras presiona Mayús o presionar <switchinline select=\"sys\"><caseinline select=\"MAC\">Comando</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+clic para seleccionar algunas secciones."
#: section_edit.xhp
msgctxt ""
diff --git a/translations/source/et/helpcontent2/source/text/sbasic/shared.po b/translations/source/et/helpcontent2/source/text/sbasic/shared.po
index adb546c..433d6b8 100644
--- a/translations/source/et/helpcontent2/source/text/sbasic/shared.po
+++ b/translations/source/et/helpcontent2/source/text/sbasic/shared.po
@@ -1400,7 +1400,7 @@ msgctxt ""
"par_idN10ED8\n"
"help.text"
msgid "<ahelp hid=\".\">Specifies the sequence of the selected items, where \"0\" corresponds to the first item. To select more than one item, Multiselection must be enabled.</ahelp>"
-msgstr "<ahelp hid=\".\">Määrab valitud elementide järjekorra, kusjuures esimest tähistab \"0\". Rohkem kui ühe elemendi valimiseks peab olema lubatud mitmene valik."
+msgstr "<ahelp hid=\".\">Määrab valitud elementide järjekorra, kusjuures esimest tähistab \"0\". Rohkem kui ühe elemendi valimiseks peab olema lubatud mitmene valik.</ahelp>"
#: 01170101.xhp
msgctxt ""
diff --git a/translations/source/fi/helpcontent2/source/text/scalc/01.po b/translations/source/fi/helpcontent2/source/text/scalc/01.po
index 9f9f686..e7a012b 100644
--- a/translations/source/fi/helpcontent2/source/text/scalc/01.po
+++ b/translations/source/fi/helpcontent2/source/text/scalc/01.po
@@ -49649,7 +49649,7 @@ msgctxt ""
"12\n"
"help.text"
msgid "Sorts the selection from the lowest value to the highest value. You can define the sort rules on Data - Sort - Options. You define the default on <switchinline select=\"sys\"><caseinline select=\"MAC\">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages."
-msgstr "Järjestetään valittua aluetta pienimmästä suurimpaan arvoon. Lajittelusäännöt määrätään Tiedot - Lajittele - Asetukset -välilehdellä.</ahelp> Oletukset asetetaan valinnassa: <switchinline select=\"sys\"><caseinline select=\"MAC\">%PRODUCTNAME - Asetukset</caseinline><defaultinline>Työkalut - Asetukset</defaultinline></switchinline> - Kieliasetukset - Kielet."
+msgstr "Järjestetään valittua aluetta pienimmästä suurimpaan arvoon. Lajittelusäännöt määrätään Tiedot - Lajittele - Asetukset -välilehdellä. Oletukset asetetaan valinnassa: <switchinline select=\"sys\"><caseinline select=\"MAC\">%PRODUCTNAME - Asetukset</caseinline><defaultinline>Työkalut - Asetukset</defaultinline></switchinline> - Kieliasetukset - Kielet."
#: 12030100.xhp
msgctxt ""
@@ -49667,7 +49667,7 @@ msgctxt ""
"14\n"
"help.text"
msgid "Sorts the selection from the highest value to the lowest value. You can define the sort rules on Data - Sort - Options. You define the default on <switchinline select=\"sys\"><caseinline select=\"MAC\">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages."
-msgstr "Järjestetään valittua aluetta suurimmasta pienimpään. Lajittelusäännöt määrätään Tiedot - Lajittele - Asetukset -välilehdellä.</ahelp> Oletusarvot asetetaan valinnassa: <switchinline select=\"sys\"><caseinline select=\"MAC\">%PRODUCTNAME - Asetukset</caseinline><defaultinline>Työkalut - Asetukset</defaultinline></switchinline> - Kieliasetukset - Kielet."
+msgstr "Järjestetään valittua aluetta suurimmasta pienimpään. Lajittelusäännöt määrätään Tiedot - Lajittele - Asetukset -välilehdellä. Oletusarvot asetetaan valinnassa: <switchinline select=\"sys\"><caseinline select=\"MAC\">%PRODUCTNAME - Asetukset</caseinline><defaultinline>Työkalut - Asetukset</defaultinline></switchinline> - Kieliasetukset - Kielet."
#: 12030100.xhp
msgctxt ""
diff --git a/translations/source/fr/helpcontent2/source/text/scalc/01.po b/translations/source/fr/helpcontent2/source/text/scalc/01.po
index 80fcff7..0e6b150 100644
--- a/translations/source/fr/helpcontent2/source/text/scalc/01.po
+++ b/translations/source/fr/helpcontent2/source/text/scalc/01.po
@@ -39130,7 +39130,7 @@ msgctxt ""
"bm_id3148912\n"
"help.text"
msgid "<bookmark_value>calculating;linear depreciations</bookmark_value><bookmark_value>depreciations;linear</bookmark_value><bookmark_value>linear depreciations</bookmark_value><bookmark_value>straight-line depreciations</bookmark_value><bookmark_value>SLN function</bookmark_value>"
-msgstr "<bookmark_value>Calcul;amortissements linéaires</bookmark_value><bookmark_value>Amortissements;linéaires</bookmark_value><bookmark_value>Amortissements linéaires</bookmark_value><bookmark_value>Amortissement en ligne droite</bookmark_value<bookmark_value>AMORLIN, fonction</bookmark_value>"
+msgstr "<bookmark_value>Calcul;amortissements linéaires</bookmark_value><bookmark_value>Amortissements;linéaires</bookmark_value><bookmark_value>Amortissements linéaires</bookmark_value><bookmark_value>Amortissement en ligne droite</bookmark_value><bookmark_value>AMORLIN, fonction</bookmark_value>"
#: 04060119.xhp
msgctxt ""
diff --git a/translations/source/hu/helpcontent2/source/text/shared.po b/translations/source/hu/helpcontent2/source/text/shared.po
index 435bae2..f374172 100644
--- a/translations/source/hu/helpcontent2/source/text/shared.po
+++ b/translations/source/hu/helpcontent2/source/text/shared.po
@@ -1342,7 +1342,7 @@ msgctxt ""
"par_id2783898\n"
"help.text"
msgid "<ahelp hid=\".\">Enable an Internet connection for %PRODUCTNAME. If you need a Proxy, check the %PRODUCTNAME Proxy settings in <switchinline select=\"sys\"><caseinline select=\"MAC\">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet. Then choose Check for Updates to check for the availability of a newer version of your office suite.</ahelp>"
-msgstr "<ahelp hid=\".\">Engedélyezze az internetkapcsolatot a %PRODUCTNAME-hoz. Ha proxyt használ, akkor ellenőrizze a %PRODUCTNAME proxybeállításait a <switchinline select=\"sys\"><caseinline select=\"MAC\">%PRODUCTNAME - Beállítások</caseinline><defaultinline>Eszközök - Beállítások</defaultinline></switchinline> - Internet alatt. Ezután nyomja meg az Ellenőrzés gombot az irodai programcsomag újabb verziójának kereséséhez."
+msgstr "<ahelp hid=\".\">Engedélyezze az internetkapcsolatot a %PRODUCTNAME-hoz. Ha proxyt használ, akkor ellenőrizze a %PRODUCTNAME proxybeállításait a <switchinline select=\"sys\"><caseinline select=\"MAC\">%PRODUCTNAME - Beállítások</caseinline><defaultinline>Eszközök - Beállítások</defaultinline></switchinline> - Internet alatt. Ezután nyomja meg az Ellenőrzés gombot az irodai programcsomag újabb verziójának kereséséhez.</ahelp>"
#: main0108.xhp
msgctxt ""
diff --git a/translations/source/id/helpcontent2/source/text/simpress/01.po b/translations/source/id/helpcontent2/source/text/simpress/01.po
index 87a2bf0..b53579e 100644
--- a/translations/source/id/helpcontent2/source/text/simpress/01.po
+++ b/translations/source/id/helpcontent2/source/text/simpress/01.po
@@ -6086,7 +6086,7 @@ msgctxt ""
"2\n"
"help.text"
msgid "<ahelp hid=\".uno:Break\">Breaks apart lines joined with the <emph>Connect</emph> command.</ahelp>"
-msgstr "<ahelp hid=\".uno:Break\">Penggal garis-garis yang digabung dengan perintah <emph>Sambung</emph></emph>.</ahelp>"
+msgstr "<ahelp hid=\".uno:Break\">Penggal garis-garis yang digabung dengan perintah <emph>Sambung</emph>.</ahelp>"
#: 13170000.xhp
msgctxt ""
diff --git a/translations/source/nl/helpcontent2/source/text/scalc/01.po b/translations/source/nl/helpcontent2/source/text/scalc/01.po
index 90e3022..d23282c 100644
--- a/translations/source/nl/helpcontent2/source/text/scalc/01.po
+++ b/translations/source/nl/helpcontent2/source/text/scalc/01.po
@@ -49642,7 +49642,7 @@ msgctxt ""
"12\n"
"help.text"
msgid "Sorts the selection from the lowest value to the highest value. You can define the sort rules on Data - Sort - Options. You define the default on <switchinline select=\"sys\"><caseinline select=\"MAC\">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages."
-msgstr "Sorteert de selectie van de laagste waarde naar de hoogste waarde. U kunt de sorteerregels opgeven met Gegevens - Sorteren - Opties.</ahelp> U definieert de standaardwaarde in <switchinline select=\"sys\"><caseinline select=\"MAC\">%PRODUCTNAME - Voorkeuren</caseinline><defaultinline>Extra - Opties</defaultinline></switchinline> - Taalinstellingen - Talen."
+msgstr "Sorteert de selectie van de laagste waarde naar de hoogste waarde. U kunt de sorteerregels opgeven met Gegevens - Sorteren - Opties. U definieert de standaardwaarde in <switchinline select=\"sys\"><caseinline select=\"MAC\">%PRODUCTNAME - Voorkeuren</caseinline><defaultinline>Extra - Opties</defaultinline></switchinline> - Taalinstellingen - Talen."
#: 12030100.xhp
msgctxt ""
@@ -49660,7 +49660,7 @@ msgctxt ""
"14\n"
"help.text"
msgid "Sorts the selection from the highest value to the lowest value. You can define the sort rules on Data - Sort - Options. You define the default on <switchinline select=\"sys\"><caseinline select=\"MAC\">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages."
-msgstr "Sorteert de selectie van de hoogste waarde naar de laagste waarde. U kunt de sorteerregels opgeven met Gegevens - Sorteren - Opties.</ahelp> U definieert de standaardwaarde in <switchinline select=\"sys\"><caseinline select=\"MAC\">%PRODUCTNAME - Voorkeuren</caseinline><defaultinline>Extra - Opties</defaultinline></switchinline> - Taalinstellingen - Talen."
+msgstr "Sorteert de selectie van de hoogste waarde naar de laagste waarde. U kunt de sorteerregels opgeven met Gegevens - Sorteren - Opties. U definieert de standaardwaarde in <switchinline select=\"sys\"><caseinline select=\"MAC\">%PRODUCTNAME - Voorkeuren</caseinline><defaultinline>Extra - Opties</defaultinline></switchinline> - Taalinstellingen - Talen."
#: 12030100.xhp
msgctxt ""
diff --git a/translations/source/nl/helpcontent2/source/text/shared.po b/translations/source/nl/helpcontent2/source/text/shared.po
index a632fbb..f17f789 100644
--- a/translations/source/nl/helpcontent2/source/text/shared.po
+++ b/translations/source/nl/helpcontent2/source/text/shared.po
@@ -1342,7 +1342,7 @@ msgctxt ""
"par_id2783898\n"
"help.text"
msgid "<ahelp hid=\".\">Enable an Internet connection for %PRODUCTNAME. If you need a Proxy, check the %PRODUCTNAME Proxy settings in <switchinline select=\"sys\"><caseinline select=\"MAC\">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet. Then choose Check for Updates to check for the availability of a newer version of your office suite.</ahelp>"
-msgstr "<ahelp hid=\".\">Inschakelen van een internetverbinding voor% PRODUCTNAME. Als u een Proxy-server nodig heeft, controleer dan de% PRODUCTNAME Proxy instellingen in <switchinline select=\"sys\"> <caseinline select=\"MAC\">% PRODUCTNAME - Instellingen </ caseinline> <defaultinline> Extra - Opties </ defaultinline> </ switchinline > - Internet. Kies dan Zoeken naar Updates om te controleren op de beschikbaarheid van een nieuwere versie van uw Office-pakket.</ Ahelp>"
+msgstr "<ahelp hid=\".\">Inschakelen van een internetverbinding voor% PRODUCTNAME. Als u een Proxy-server nodig heeft, controleer dan de% PRODUCTNAME Proxy instellingen in <switchinline select=\"sys\"> <caseinline select=\"MAC\">% PRODUCTNAME - Instellingen </caseinline> <defaultinline> Extra - Opties </defaultinline></switchinline> - Internet. Kies dan Zoeken naar Updates om te controleren op de beschikbaarheid van een nieuwere versie van uw Office-pakket.</ahelp>"
#: main0108.xhp
msgctxt ""
diff --git a/translations/source/nl/helpcontent2/source/text/shared/01.po b/translations/source/nl/helpcontent2/source/text/shared/01.po
index 7a4fd6d..b3dd4b4 100644
--- a/translations/source/nl/helpcontent2/source/text/shared/01.po
+++ b/translations/source/nl/helpcontent2/source/text/shared/01.po
@@ -10109,7 +10109,7 @@ msgctxt ""
"par_id3154583\n"
"help.text"
msgid "<ahelp hid=\"SVX:LISTBOX:RID_SVXPAGE_LINE:LB_EDGE_STYLE\">Select the shape to be used at the corners of the line. In case of a small angle between lines, a mitered shape is replaced with a beveled shape.</ahelp>"
-msgstr "<ahelp hid=\"SVX:LISTBOX:RID_SVXPAGE_LINE:LB_EDGE_STYLE\"> Kies de vorm die moet worden gebruikt op de hoeken van een lijn. Bij een kleine hoek tussen lijnen, wordt een verstekhoeken vervangen door een afgeschuinde vorm. </ Ahelp>"
+msgstr "<ahelp hid=\"SVX:LISTBOX:RID_SVXPAGE_LINE:LB_EDGE_STYLE\"> Kies de vorm die moet worden gebruikt op de hoeken van een lijn. Bij een kleine hoek tussen lijnen, wordt een verstekhoeken vervangen door een afgeschuinde vorm. </ahelp>"
#: 05200100.xhp
msgctxt ""
@@ -10125,7 +10125,7 @@ msgctxt ""
"par_id3154586\n"
"help.text"
msgid "<ahelp hid=\"SVX:LISTBOX:RID_SVXPAGE_LINE:LB_CAP_STYLE\">Select the style of the line end caps. The caps are added to inner dashes as well.</ahelp>"
-msgstr "<ahelp hid=\"SVX:LISTBOX:RID_SVXPAGE_LINE:LB_CAP_STYLE\">Kies de stijl van de eindkappen van een lijn . De kappen worden ook toegevoegd aan de binnenstreepjes.</ Ahelp>"
+msgstr "<ahelp hid=\"SVX:LISTBOX:RID_SVXPAGE_LINE:LB_CAP_STYLE\">Kies de stijl van de eindkappen van een lijn . De kappen worden ook toegevoegd aan de binnenstreepjes.</ahelp>"
#: 03150100.xhp
msgctxt ""
diff --git a/translations/source/nl/helpcontent2/source/text/shared/guide.po b/translations/source/nl/helpcontent2/source/text/shared/guide.po
index 97031d7..dcc483d 100644
--- a/translations/source/nl/helpcontent2/source/text/shared/guide.po
+++ b/translations/source/nl/helpcontent2/source/text/shared/guide.po
@@ -17468,7 +17468,7 @@ msgctxt ""
"par_id3153885\n"
"help.text"
msgid "Using these commands in conjunction with the <emph>Accept Change</emph> and <emph>Reject Change</emph> commands allows navigating, accepting and rejecting changes without invoking the <emph>Edit - Changes - Accept or Reject</emph> dialog."
-msgstr "Met behulp van deze opdrachten in combinatie met de <emph> Wijziging Accepteren </ emph> en <emph> Wijziging Negeren </ emph> opdrachten kunt u navigeren, accepteren en afwijzen van veranderingen zonder gebruikmaking van het dialoogvenster<emph> Bewerken - Wijzigingen - Accepteren of Annuleren</ emph >."
+msgstr "Met behulp van deze opdrachten in combinatie met de <emph> Wijziging Accepteren </emph> en <emph> Wijziging Negeren </emph> opdrachten kunt u navigeren, accepteren en afwijzen van veranderingen zonder gebruikmaking van het dialoogvenster<emph> Bewerken - Wijzigingen - Accepteren of Annuleren</emph>."
#: contextmenu.xhp
msgctxt ""
diff --git a/translations/source/nl/helpcontent2/source/text/shared/optionen.po b/translations/source/nl/helpcontent2/source/text/shared/optionen.po
index 58a504a..7829a06 100644
--- a/translations/source/nl/helpcontent2/source/text/shared/optionen.po
+++ b/translations/source/nl/helpcontent2/source/text/shared/optionen.po
@@ -5982,7 +5982,7 @@ msgctxt ""
"27\n"
"help.text"
msgid "<ahelp hid=\"SD:CHECKBOX:TP_OPTIONS_MISC:CBX_ENABLE_SDREMOTE\">Specifies that you want to enable Bluetooth remote control while Impress is running.</ahelp> Unmark<emph> Enable remote control</emph> to disable remote controlling."
-msgstr "<ahelp hid=\"SD:CHECKBOX:TP_OPTIONS_MISC:CBX_ENABLE_SDREMOTE\"> Hiermee schakelt u een Bluetooth-afstandsbediening in terwijl Impress draait. </ ahelp> Markering emph> Afstandsbediening inschakelen </ emph>uitvinken om het op afstand bedienen uit te schakelen ."
+msgstr "<ahelp hid=\"SD:CHECKBOX:TP_OPTIONS_MISC:CBX_ENABLE_SDREMOTE\"> Hiermee schakelt u een Bluetooth-afstandsbediening in terwijl Impress draait. </ahelp> Markering <emph> Afstandsbediening inschakelen </emph>uitvinken om het op afstand bedienen uit te schakelen ."
#: 01070500.xhp
msgctxt ""
@@ -9943,7 +9943,7 @@ msgctxt ""
"par_id3145121\n"
"help.text"
msgid "<ahelp hid=\".\">Specifies the date acceptance patterns for the current locale. Calc spreadsheet and Writer table cell input needs to match locale dependent date acceptance patterns before it is recognized as a valid date.</ahelp> Default locale dependent date acceptance patterns are generated build time, but it is possible to add more or modify them in this edit box."
-msgstr "<ahelp hid=\".\"> Geeft de datum aanvaardingspatronen voor de huidige taalinstellingen. Calc-werkblad en Writer-tabelcel invoer moet overeenkomen met taalafhankelijke datum aanvaardingspatronen voordat deze wordt herkend als een geldige datum. </ Ahelp> Standaard taalafhankelijke datum aanvaardingspatronen worden gegenereerd, maar het is mogelijk om er meer toe te voegen of aan te passen in dit invoervak."
+msgstr "<ahelp hid=\".\"> Geeft de datum aanvaardingspatronen voor de huidige taalinstellingen. Calc-werkblad en Writer-tabelcel invoer moet overeenkomen met taalafhankelijke datum aanvaardingspatronen voordat deze wordt herkend als een geldige datum. </ahelp> Standaard taalafhankelijke datum aanvaardingspatronen worden gegenereerd, maar het is mogelijk om er meer toe te voegen of aan te passen in dit invoervak."
#: 01140000.xhp
msgctxt ""
@@ -9959,7 +9959,7 @@ msgctxt ""
"par_id3157939\n"
"help.text"
msgid "Syntax: <emph>Y</emph> means year, <emph>M</emph> means month, and <emph>D</emph> means day, regardless of localizaton."
-msgstr "Syntaxis: <emph> Y </ emph> betekent jaar <emph> M </ emph> betekent maand en <emph> D </ emph> betekent dag, ongeacht de taalinstelling."
+msgstr "Syntaxis: <emph> Y </emph> betekent jaar <emph> M </emph> betekent maand en <emph> D </emph> betekent dag, ongeacht de taalinstelling."
#: 01140000.xhp
msgctxt ""
diff --git a/translations/source/nl/helpcontent2/source/text/swriter/01.po b/translations/source/nl/helpcontent2/source/text/swriter/01.po
index 4e4a4fe..0ee077d 100644
--- a/translations/source/nl/helpcontent2/source/text/swriter/01.po
+++ b/translations/source/nl/helpcontent2/source/text/swriter/01.po
@@ -18460,7 +18460,7 @@ msgctxt ""
"par_idN10561\n"
"help.text"
msgid "<ahelp hid=\".\">Creates mail merge documents that you can send as an e-mail message or an e-mail attachment.</ahelp>"
-msgstr "<ahelp hid=\".\"> Maakt mailmerge documenten die u kunt verzenden als een e-mailbericht of een e-mailbijlage. </ ahelp>"
+msgstr "<ahelp hid=\".\">Maakt mailmerge documenten die u kunt verzenden als een e-mailbericht of een e-mailbijlage.</ahelp>"
#: mailmerge02.xhp
msgctxt ""
diff --git a/translations/source/nn/helpcontent2/source/text/sbasic/shared/02.po b/translations/source/nn/helpcontent2/source/text/sbasic/shared/02.po
index 69837bc..243703c 100644
--- a/translations/source/nn/helpcontent2/source/text/sbasic/shared/02.po
+++ b/translations/source/nn/helpcontent2/source/text/sbasic/shared/02.po
@@ -1404,7 +1404,7 @@ msgctxt ""
"par_id9961851\n"
"help.text"
msgid "<ahelp hid=\".\">Adds a tree control that can show a hierarchical list. You can populate the list by your program, using API calls (XtreeControl).</ahelp>"
-msgstr "<ahelp hid=\".\">Legg til ein trekontroll som kan vise hierarkiske lister. Du kan fylle ut lista frå programmet ditt ved å bruke API-oppkall (XtreeControl)."
+msgstr "<ahelp hid=\".\">Legg til ein trekontroll som kan vise hierarkiske lister. Du kan fylle ut lista frå programmet ditt ved å bruke API-oppkall (XtreeControl).</ahelp>"
#: 11010000.xhp
msgctxt ""
diff --git a/translations/source/nn/helpcontent2/source/text/scalc/01.po b/translations/source/nn/helpcontent2/source/text/scalc/01.po
index b320235..5e010b8 100644
--- a/translations/source/nn/helpcontent2/source/text/scalc/01.po
+++ b/translations/source/nn/helpcontent2/source/text/scalc/01.po
@@ -11911,7 +11911,7 @@ msgctxt ""
"27\n"
"help.text"
msgid "The cells for the 1st and 2nd quarters each contain a sum formula for the three cells to their left. If you apply the <emph>AutoOutline</emph> command, the table is grouped into two quarters."
-msgstr "Kvar av cellene for 1. og 2. kvartal inneheld summen av dei tre cellene til venstre for desse. Dersom du bruker <emph>Autodisposisjon<emph> vil tabellen bli gruppert til to kvartal."
+msgstr "Kvar av cellene for 1. og 2. kvartal inneheld summen av dei tre cellene til venstre for desse. Dersom du bruker <emph>Autodisposisjon</emph> vil tabellen bli gruppert til to kvartal."
#: 12080500.xhp
msgctxt ""
diff --git a/translations/source/nn/helpcontent2/source/text/shared/optionen.po b/translations/source/nn/helpcontent2/source/text/shared/optionen.po
index 3c084eb..19a668e 100644
--- a/translations/source/nn/helpcontent2/source/text/shared/optionen.po
+++ b/translations/source/nn/helpcontent2/source/text/shared/optionen.po
@@ -13661,7 +13661,7 @@ msgctxt ""
"30\n"
"help.text"
msgid "<switchinline select=\"appl\"><caseinline select=\"IMPRESS\"><variable id=\"rastertext\">It is also possible to toggle the visibility of the grid with the <emph>Grid - Display Grid</emph> command in the context menu of the page. You can also select the <emph>Grid - Grid to Front</emph> submenu of this context menu to display the grid in front of objects.</variable></caseinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"IMPRESS\"><variable id=\"rastertext\">Det er også råd å slå visinga av rutenettet av og på ved hjelp av kommandoen <emph>Rutenett → Vis rutenett</emph> i lokalmenyen for sida. Frå den same lokalmenyen kan du også velje å leggje rutenette framføre objektet med kommandoen <emph>Rutenett → Rutenett fremst.</variable></caseinline></switchinline>"
+msgstr "<switchinline select=\"appl\"><caseinline select=\"IMPRESS\"><variable id=\"rastertext\">Det er også råd å slå visinga av rutenettet av og på ved hjelp av kommandoen <emph>Rutenett → Vis rutenett</emph> i lokalmenyen for sida. Frå den same lokalmenyen kan du også velje å leggje rutenette framføre objektet med kommandoen <emph>Rutenett → Rutenett fremst</emph>.</variable></caseinline></switchinline>"
#: 01050100.xhp
msgctxt ""
diff --git a/translations/source/sv/helpcontent2/source/text/sbasic/shared/02.po b/translations/source/sv/helpcontent2/source/text/sbasic/shared/02.po
index 47e369c..369f693 100644
--- a/translations/source/sv/helpcontent2/source/text/sbasic/shared/02.po
+++ b/translations/source/sv/helpcontent2/source/text/sbasic/shared/02.po
@@ -1473,7 +1473,7 @@ msgctxt ""
"2\n"
"help.text"
msgid "<ahelp hid=\".\">Calls an \"Open\" dialog to import a BASIC dialog file.</ahelp>"
-msgstr "<ahelp hid=\".\">Anropar en \"Öppna\"-dialog för att importera en BASIC-dialogfil."
+msgstr "<ahelp hid=\".\">Anropar en \"Öppna\"-dialog för att importera en BASIC-dialogfil.</ahelp>"
#: 11180000.xhp
msgctxt ""
diff --git a/translations/source/sv/helpcontent2/source/text/scalc/01.po b/translations/source/sv/helpcontent2/source/text/scalc/01.po
index e7d9034..80d3233 100644
--- a/translations/source/sv/helpcontent2/source/text/scalc/01.po
+++ b/translations/source/sv/helpcontent2/source/text/scalc/01.po
@@ -23991,7 +23991,7 @@ msgctxt ""
"2\n"
"help.text"
msgid "<ahelp hid=\".\">Combines the selected cells into a single cell or splits merged cells. Aligns cell content centered.</ahelp>"
-msgstr "<ahelp hid=\".\">Slår samman de markerade cellerna till en enda cell eller delar sammanfogade celler. Centrerar cellinnehållet."
+msgstr "<ahelp hid=\".\">Slår samman de markerade cellerna till en enda cell eller delar sammanfogade celler. Centrerar cellinnehållet.</ahelp>"
#: 05060000.xhp
msgctxt ""
diff --git a/translations/source/sv/helpcontent2/source/text/shared/00.po b/translations/source/sv/helpcontent2/source/text/shared/00.po
index 295e948..181d8bc 100644
--- a/translations/source/sv/helpcontent2/source/text/shared/00.po
+++ b/translations/source/sv/helpcontent2/source/text/shared/00.po
@@ -563,7 +563,7 @@ msgctxt ""
"par_id355152953\n"
"help.text"
msgid "<ahelp hid=\".\" visibility=\"hidden\">Sets the quality for the export. Choose from a low quality with minimal file size, up to a high quality and big file size</ahelp>"
-msgstr "Anger exportkvalitén. En lägre kvalité ger mindre filstorlek men sämre bildkvalité, en högre kvalité ger bättre bildkvalité men större filstorlek.</ahelp>"
+msgstr "<ahelp hid=\".\" visibility=\"hidden\">Anger exportkvalitén. En lägre kvalité ger mindre filstorlek men sämre bildkvalité, en högre kvalité ger bättre bildkvalité men större filstorlek.</ahelp>"
#: 00000200.xhp
msgctxt ""
diff --git a/translations/source/tr/helpcontent2/source/text/swriter/01.po b/translations/source/tr/helpcontent2/source/text/swriter/01.po
index 698b871..96ebdc3 100644
--- a/translations/source/tr/helpcontent2/source/text/swriter/01.po
+++ b/translations/source/tr/helpcontent2/source/text/swriter/01.po
@@ -26502,7 +26502,7 @@ msgctxt ""
"17\n"
"help.text"
msgid "<variable id=\"bearbeitenautomatisch\"><ahelp hid=\"modules/swriter/ui/insertfootnote/automatic\">Automatically assigns consecutive numbers to the footnotes or endnotes that you insert.</ahelp> To change the settings for automatic numbering, choose <link href=\"text/swriter/01/06080000.xhp\" name=\"Tools - Footnotes\"><emph>Tools - Footnotes/Endnotes</emph></link>. </variable>"
-msgstr "<variable id=\"bearbeitenautomatisch\"><ahelp hid=\"modules/swriter/ui/insertfootnote/automatic\">Eklediğiniz dipnot ve sonnotlara ardışıl numaraları otomatik olarak ekler.</ahelp> Otomatik numaralandırma için ayarı değiştirmek için, <link href=\"text/swriter/01/06080000.xhp\" name=\"Tools - Footnotes\">Araçlar - Dipnotlar/Sonnotlar</emph></link>'ı seçin.</variable>"
+msgstr "<variable id=\"bearbeitenautomatisch\"><ahelp hid=\"modules/swriter/ui/insertfootnote/automatic\">Eklediğiniz dipnot ve sonnotlara ardışıl numaraları otomatik olarak ekler.</ahelp> Otomatik numaralandırma için ayarı değiştirmek için, <link href=\"text/swriter/01/06080000.xhp\" name=\"Tools - Footnotes\"><emph>Araçlar - Dipnotlar/Sonnotlar</emph></link>'ı seçin.</variable>"
#: 04030000.xhp
msgctxt ""
@@ -27820,7 +27820,7 @@ msgctxt ""
"30\n"
"help.text"
msgid "<ahelp hid=\"SW:METRICFIELD:TP_FRM_STD:ED_AT_HORZ_POS\">Enter the amount of space to leave between the left edge of the selected object and the reference point that you select in the <emph>To</emph> box.</ahelp> This option is only available if you select \"From Left\" in the <emph>Horizontal</emph> box."
-msgstr "<ahelp hid=\"SW:METRICFIELD:TP_FRM_STD:ED_AT_HORZ_POS\">Seçili nesnenin sol kenarı ile <emph>Kime</emph> kutusundaki kaynak nokta arasındaki boşluk miktarını girin.</ahelp> Bu seçenek sadece <emph>Yatay<emph> kutudan \"Soldan\"'ı seçerseniz kullanılabilir."
+msgstr "<ahelp hid=\"SW:METRICFIELD:TP_FRM_STD:ED_AT_HORZ_POS\">Seçili nesnenin sol kenarı ile <emph>Kime</emph> kutusundaki kaynak nokta arasındaki boşluk miktarını girin.</ahelp> Bu seçenek sadece <emph>Yatay</emph> kutudan \"Soldan\"'ı seçerseniz kullanılabilir."
#: 05060100.xhp
msgctxt ""
--
1.8.1

198
0001-rhbz-760765-copy-custom-styles-on-copy-paste.patch
Unescape View File

@ -1,198 +0,0 @@
From 24578b804007d8c3201e5ed32b8485e1725c33c1 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Thu, 17 Jan 2013 15:01:32 +0100
Subject: [PATCH] rhbz#760765 copy custom styles on copy & paste
Change-Id: Icaacf3bc1a02a017692432aec36aba06d3f5dde5
---
sd/inc/stlpool.hxx | 3 +++
sd/source/core/drawdoc3.cxx | 49 ++++++++++++++++++++++++++++++++++++++++++---
sd/source/core/stlpool.cxx | 18 +++++++++++++++++
sd/source/core/stlsheet.cxx | 16 +++++++++------
4 files changed, 77 insertions(+), 9 deletions(-)
diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx
index 9e76c2a..4833dd8 100644
--- a/sd/inc/stlpool.hxx
+++ b/sd/inc/stlpool.hxx
@@ -80,6 +80,8 @@ public:
void CopyGraphicSheets(SdStyleSheetPool& rSourcePool);
void CopyCellSheets(SdStyleSheetPool& rSourcePool);
void CopyTableStyles(SdStyleSheetPool& rSourcePool);
+ void CopyGraphicSheets(SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets);
+ void CopyCellSheets(SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets);
void CreatePseudosIfNecessary();
void UpdateStdNames();
@@ -121,6 +123,7 @@ public:
virtual void SAL_CALL release (void) throw ();
protected:
void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily );
+ void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets );
virtual SfxStyleSheetBase* Create(const String& rName, SfxStyleFamily eFamily, sal_uInt16 nMask);
virtual SfxStyleSheetBase* Create(const SdStyleSheet& rStyle);
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index e7ac380..b18c254 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -357,6 +357,26 @@ sal_Bool SdDrawDocument::InsertBookmark(
return bOK;
}
+namespace
+{
+
+void
+lcl_removeUnusedStyles(SfxStyleSheetBasePool* const pStyleSheetPool, SdStyleSheetVector& rStyles)
+{
+ SdStyleSheetVector aUsedStyles;
+ aUsedStyles.reserve(rStyles.size());
+ for (SdStyleSheetVector::const_iterator aIt(rStyles.begin()), aLast(rStyles.end()); aIt != aLast; ++aIt)
+ {
+ if ((*aIt)->IsUsed())
+ aUsedStyles.push_back(*aIt);
+ else
+ pStyleSheetPool->Remove((*aIt).get());
+ }
+ rStyles = aUsedStyles;
+}
+
+}
+
sal_Bool SdDrawDocument::InsertBookmarkAsPage(
const std::vector<rtl::OUString> &rBookmarkList,
std::vector<rtl::OUString> *pExchangeList, // Liste der zu verwendenen Namen
@@ -484,8 +504,8 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
/**************************************************************************
* Die tatsaechlich benoetigten Vorlagen kopieren
**************************************************************************/
- SdStyleSheetPool* pBookmarkStyleSheetPool =
- (SdStyleSheetPool*) pBookmarkDoc->GetStyleSheetPool();
+ SdStyleSheetPool* pBookmarkStyleSheetPool = dynamic_cast<SdStyleSheetPool*>(pBookmarkDoc->GetStyleSheetPool());
+ SdStyleSheetPool* pStyleSheetPool = dynamic_cast<SdStyleSheetPool*>(GetStyleSheetPool());
// Wenn Vorlagen kopiert werden muessen, dann muessen auch die
// MasterPages kopiert werden!
@@ -498,7 +518,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
SdStyleSheetVector aCreatedStyles;
String layoutName = *pIter;
- ((SdStyleSheetPool*)GetStyleSheetPool())->CopyLayoutSheets(layoutName, *pBookmarkStyleSheetPool,aCreatedStyles);
+ pStyleSheetPool->CopyLayoutSheets(layoutName, *pBookmarkStyleSheetPool,aCreatedStyles);
if(!aCreatedStyles.empty())
{
@@ -510,6 +530,18 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
}
}
+ // Copy styles. This unconditionally copies all styles, even those
+ // that are not used in any of the inserted pages. The unused styles
+ // are then removed at the end of the function, where we also create
+ // undo records for the inserted styles.
+ SdStyleSheetVector aNewGraphicStyles;
+ pStyleSheetPool->CopyGraphicSheets(*pBookmarkStyleSheetPool, aNewGraphicStyles);
+ SdStyleSheetVector aNewCellStyles;
+ pStyleSheetPool->CopyCellSheets(*pBookmarkStyleSheetPool, aNewCellStyles);
+
+ // TODO handle undo of table styles too
+ pStyleSheetPool->CopyTableStyles(*pBookmarkStyleSheetPool);
+
/**************************************************************************
* Dokument einfuegen
**************************************************************************/
@@ -910,6 +942,17 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
// Make absolutely sure no double masterpages are there
RemoveUnnecessaryMasterPages(NULL, sal_True, sal_True);
+ // remove copied styles not used on any inserted page and create
+ // undo records
+ // WARNING: SdMoveStyleSheetsUndoAction clears the passed list of
+ // styles, so it cannot be used after this point
+ lcl_removeUnusedStyles(GetStyleSheetPool(), aNewGraphicStyles);
+ if (!aNewGraphicStyles.empty() && pUndoMgr)
+ pUndoMgr->AddUndoAction(new SdMoveStyleSheetsUndoAction(this, aNewGraphicStyles, sal_True));
+ lcl_removeUnusedStyles(GetStyleSheetPool(), aNewCellStyles);
+ if (!aNewCellStyles.empty() && pUndoMgr)
+ pUndoMgr->AddUndoAction(new SdMoveStyleSheetsUndoAction(this, aNewCellStyles, sal_True));
+
if( bUndo )
EndUndo();
pUndoMgr->LeaveListAction();
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 078a64d..cfe6c82 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -582,8 +582,24 @@ void SdStyleSheetPool::CopyTableStyles(SdStyleSheetPool& rSourcePool)
}
}
+void SdStyleSheetPool::CopyGraphicSheets(SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets)
+{
+ CopySheets( rSourcePool, SD_STYLE_FAMILY_GRAPHICS, rCreatedSheets );
+}
+
+void SdStyleSheetPool::CopyCellSheets(SdStyleSheetPool& rSourcePool, SdStyleSheetVector& rCreatedSheets)
+{
+ CopySheets( rSourcePool, SD_STYLE_FAMILY_CELL, rCreatedSheets );
+}
+
void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily )
{
+ SdStyleSheetVector aTmpSheets;
+ CopySheets(rSourcePool, eFamily, aTmpSheets);
+}
+
+void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets)
+{
String aHelpFile;
sal_uInt32 nCount = rSourcePool.aStyles.size();
@@ -610,6 +626,8 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily
xNewSheet->SetHelpId( aHelpFile, xSheet->GetHelpId( aHelpFile ) );
xNewSheet->GetItemSet().Put( xSheet->GetItemSet() );
+
+ rCreatedSheets.push_back( SdStyleSheetRef( static_cast< SdStyleSheet* >( xNewSheet.get() ) ) );
}
}
}
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index ecd84d7..f013739 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -35,6 +35,7 @@
#include <svl/smplhint.hxx>
#include <svl/itemset.hxx>
+#include <svx/sdr/properties/attributeproperties.hxx>
#include <svx/xflbmtit.hxx>
#include <svx/xflbstit.hxx>
#include <editeng/bulitem.hxx>
@@ -349,13 +350,16 @@ bool SdStyleSheet::IsUsed() const
continue;
// NULL-Pointer ist im Listener-Array erlaubt
- if (pListener && pListener->ISA(SdrAttrObj))
+ if (pListener)
{
- bResult = ((SdrAttrObj*)pListener)->IsInserted();
- }
- else if (pListener && pListener->ISA(SfxStyleSheet))
- {
- bResult = ((SfxStyleSheet*)pListener)->IsUsed();
+ if (pListener->ISA(sdr::properties::AttributeProperties))
+ {
+ bResult = true;
+ }
+ else if (pListener->ISA(SfxStyleSheet))
+ {
+ bResult = ((SfxStyleSheet*)pListener)->IsUsed();
+ }
}
if (bResult)
break;
--
1.8.0.2

164
0001-rhbz-908674-Adapt-rtl-Allocator-construct-to-C-11.patch
Unescape View File

@ -1,164 +0,0 @@
From d5e77fcf7f525e6de83495876e2a1aa1fb133d96 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 14 Feb 2013 15:21:46 +0100
Subject: [PATCH] rhbz#908674: Adapt rtl::Allocator::construct to C++11
...otherwise, at least with some --with-system-boost versions and C++11
compilers, like with Fedora's boost-1.50.0-4.fc18.x86_64 and
gcc-c++-4.7.2-8.fc18.x86_64, using this to copy-construct an instance of
boost::unordered::detail::ptr_node<std::pair<rtl::OUString,Bootstrap_Impl*>> in
the call to p_bootstrap_map->insert(...) in rtl_bootstrap_args_open
(sal/rtl/source/bootstrap.cxx) would memcopy the ptr_node and fail to call
rtl_uString_acquire, leading to memory corruption later on when
rtl_uString_release is called one time too often.
It is not entirely clear to me whether this is a shortcoming of the given Boost
version, but this patch solves the problem and brings rtl::Allocator::construct
in line with the (changed) Allocator requirements of C++11 anyway.
The problem potentially lurks with every use of rtl::Allocator, but only showed
now begining with LO 4.0 where e5111574fd904b38a3980ca4ea3d21cfcb22dea6 "Revert
'sb140: sb140: #i116981# clean up memory upon exit'" re-introduced code into
rtl_bootstrap_args_open that inserts into a boost::unordered_map that uses
rtl::Allocator.
(cherry picked from commit c91d353872b7d4e1a39192bff1444b46cab6e5eb)
Conflicts:
config_host/config_global.h.in
...solved by resorting to the old -DHAVE_CXX11_PERFECT_FORWARDING logic spread
across various solenv/.../*.mk instead.
Change-Id: I3be22f59a8eb49d31458480c27f3ce15803c7fd4
---
config_host.mk.in | 1 +
configure.ac | 26 ++++++++++++++++++++++++++
sal/inc/rtl/allocator.hxx | 8 ++++++++
solenv/gbuild/platform/com_GCC_defs.mk | 6 ++++++
solenv/gbuild/platform/com_MSC_defs.mk | 6 ++++++
solenv/inc/settings.mk | 4 ++++
6 files changed, 51 insertions(+)
diff --git a/config_host.mk.in b/config_host.mk.in
index 73aecf8..0af569c 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -217,6 +217,7 @@ export GUIBASE_FOR_BUILD=@GUIBASE_FOR_BUILD@
export GUI_FOR_BUILD=@GUI_FOR_BUILD@
export HARDLINKDELIVER=@HARDLINKDELIVER@
export HAVE_CXX0X=@HAVE_CXX0X@
+export HAVE_CXX11_PERFECT_FORWARDING=@HAVE_CXX11_PERFECT_FORWARDING@
export HAVE_GCC_AVX=@HAVE_GCC_AVX@
export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@
export HAVE_GCC_GGDB2=@HAVE_GCC_GGDB2@
diff --git a/configure.ac b/configure.ac
index ce85229..703bb13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5464,6 +5464,32 @@ AC_SUBST(HAVE_GCC_AVX)
AC_SUBST(HAVE_GCC_BUILTIN_ATOMIC)
dnl ===================================================================
+dnl Check for C++11 perfect forwarding support
+dnl ===================================================================
+HAVE_CXX11_PERFECT_FORWARDING=
+AC_MSG_CHECKING([whether $CXX supports C++11 perfect forwarding])
+save_CXXFLAGS=$CXXFLAGS
+if test "$HAVE_CXX0X" = TRUE; then
+ CXXFLAGS="$CXXFLAGS -std=gnu++0x"
+fi
+AC_LANG_PUSH([C++])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <utility>
+ template<typename T, typename... Args> T * f(Args &&... v) {
+ return new T(std::forward<Args>(v)...);
+ }
+ ]], [[
+ f<int>(0);
+ ]])], [perfect_forwarding=yes], [perfect_forwarding=no])
+AC_LANG_POP([C++])
+CXXFLAGS=$save_CXXFLAGS
+AC_MSG_RESULT([$perfect_forwarding])
+if test "$perfect_forwarding" = yes; then
+ HAVE_CXX11_PERFECT_FORWARDING=TRUE
+fi
+AC_SUBST([HAVE_CXX11_PERFECT_FORWARDING])
+
+dnl ===================================================================
dnl system stl sanity tests
dnl ===================================================================
HAVE_GCC_VISIBILITY_BROKEN=
diff --git a/sal/inc/rtl/allocator.hxx b/sal/inc/rtl/allocator.hxx
index 4900d97..979c743 100644
--- a/sal/inc/rtl/allocator.hxx
+++ b/sal/inc/rtl/allocator.hxx
@@ -125,10 +125,18 @@ public:
}
//-----------------------------------------
+#if defined HAVE_CXX11_PERFECT_FORWARDING
+ template< typename... Args >
+ void construct (pointer p, Args &&... value)
+ {
+ new ((void*)p)T(std::forward< Args >(value)...);
+ }
+#else
void construct (pointer p, const T& value)
{
new ((void*)p)T(value);
}
+#endif
//-----------------------------------------
void destroy (pointer p)
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 437cdd3..1f50a97 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -58,6 +58,12 @@ gb_COMPILERDEFS := \
-D$(COM) \
-DCPPU_ENV=$(gb_CPPU_ENV) \
+ifeq ($(HAVE_CXX11_PERFECT_FORWARDING),TRUE)
+gb_COMPILERDEFS += \
+ -DHAVE_CXX11_PERFECT_FORWARDING \
+
+endif
+
ifeq ($(HAVE_GCC_BUILTIN_ATOMIC),TRUE)
gb_COMPILERDEFS += \
-DHAVE_GCC_BUILTIN_ATOMIC \
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index a81b5df..626274b 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -60,6 +60,12 @@ gb_COMPILERDEFS := \
-DCPPU_ENV=$(gb_CPPU_ENV) \
-DM1500 \
+ifeq ($(HAVE_CXX11_PERFECT_FORWARDING),TRUE)
+gb_COMPILERDEFS += \
+ -DHAVE_CXX11_PERFECT_FORWARDING \
+
+endif
+
gb_RCDEFS := \
-DWINVER=0x0400 \
-DWIN32 \
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index dbb513d..c1b6a78 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -813,6 +813,10 @@ CDEFS+=$(CDEFS_PRESET)
CDEFS+=-DTIMELOG
.ENDIF
+.IF "$(HAVE_CXX11_PERFECT_FORWARDING)" == "TRUE"
+CDEFS += -DHAVE_CXX11_PERFECT_FORWARDING
+.ENDIF
+
CDEFSCXX=
CDEFSOBJ=
#CDEFSMT=-DMULTITHREAD
--
1.8.1.2

23
libreoffice.spec
Unescape View File

@ -1,5 +1,5 @@
# download path contains version without the last (fourth) digit
%define libo_version 4.0.0
%define libo_version 4.0.1
# Should contain .alphaX / .betaX, if this is pre-release (actually
# pre-RC) version. The pre-release string is part of tarball file names,
# so we need a way to define it easily at one place.
@ -46,8 +46,8 @@
Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.3
Release: 8%{?libo_prerelease}%{?dist}
Version: %{libo_version}.2
Release: 1%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0
Group: Applications/Productivity
URL: http://www.documentfoundation.org/develop
@ -246,20 +246,13 @@ Patch13: libreoffice-rhel6limits.patch
Patch14: libreoffice-rhel6glib.patch
%endif
Patch15: 0001-temporarily-disable-failing-test.patch
Patch16: 0001-rhbz-760765-copy-custom-styles-on-copy-paste.patch
Patch17: 0001-fix-parser-errors-in-help-translations.patch
Patch18: 0001-rhbz-908674-Adapt-rtl-Allocator-construct-to-C-11.patch
Patch19: 0001-make-evolution-3.6-work-with-address-book.patch
Patch20: 0001-Resolves-fdo-60132-Error-reading-file-after-insertin.patch
Patch21: 0001-no-g_list_free_full-in-RHEL-6-glib.patch
Patch22: 0001-Resolves-rhbz-910176-cannot-select-directory-with-gn.patch
Patch23: 0001-Work-around-problem-with-boost-shared_array-NULL-cto.patch
Patch24: 0001-fix-compile-for-change-to-boost-1.53.0-declaring-sma.patch
Patch25: 0001-fdo-60491-scp2-always-package-emboleobj-library-on-n.patch
Patch26: 0001-Resolves-rhbz-895196-sc-filter-float-a11y-parent-of-.patch
Patch27: 0001-do-not-access-vector-elements-beyond-size-rhbz-84751.patch
Patch28: 0001-rhbz-742780-Let-make-OPT_FLAGS-.-override-SDK-optimi.patch
Patch29: 0001-Resolves-rhbz-907933-crash-on-removing-second-last-p.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice
@ -998,20 +991,13 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch14 -p1 -b .rhel6glib.patch
%endif
%patch15 -p1 -b .temporarily-disable-failing-test.patch
%patch16 -p1 -b .rhbz-760765-copy-custom-styles-on-copy-paste.patch
%patch17 -p1 -b .fix-parser-errors-in-help-translations.patch
%patch18 -p1 -b .rhbz-908674-Adapt-rtl-Allocator-construct-to-C-11.patch
%patch19 -p1 -b .make-evolution-3.6-work-with-address-book.patch
%patch20 -p1 -b .fdo-60132-Error-reading-file-after-insertin.patch
%patch21 -p1 -b .no-g_list_free_full-in-RHEL-6-glib.patch
%patch22 -p1 -b .rhbz-910176-cannot-select-directory-with-gn.patch
%patch23 -p1 -b .Work-around-problem-with-boost-shared_array-NULL-cto.patch
%patch24 -p1 -b .fix-compile-for-change-to-boost-1.53.0-declaring-sma.patch
%patch25 -p1 -b .fdo-60491-scp2-always-package-emboleobj-library-on-n.patch
%patch26 -p1 -b .rhbz-895196-sc-filter-float-a11y-parent-of-.patch
%patch27 -p1 -b .do-not-access-vector-elements-beyond-size-rhbz-84751.patch
%patch28 -p1 -b .rhbz-742780-Let-make-OPT_FLAGS-.-override-SDK-optimi.patch
%patch29 -p1 -b .rhbz-907933-crash-on-removing-second-last-p.patch
# TODO: check this
# these are horribly incomplete--empty translations and copied english
@ -2079,6 +2065,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
* Thu Feb 28 2013 David Tardon <dtardon@redhat.com> - 1:4.0.1.2-1
- 4.0.1 rc2
* Tue Feb 26 2013 Eike Rathke <erack@redhat.com> - 1:4.0.0.3-8
- do not access vector elements beyond size, rhbz#847519 related
- Resolves: rhbz#742780 let make OPT_FLAGS=... override SDK flags

6
sources
Unescape View File

@ -6,6 +6,6 @@
a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
1f24ab1d39f4a51faf22244c94a6203f 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
0168229624cfac409e766913506961a8 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
a3c01489036823e9f5b5caf3a8db1f9e libreoffice-4.0.0.3.tar.xz
716f624d7a39b99da8a5d550b6a87875 libreoffice-help-4.0.0.3.tar.xz
09ec7331354c6f9a0b2f48efe344ce7d libreoffice-translations-4.0.0.3.tar.xz
52c3bacdf46b4648c5697cc55b648784 libreoffice-4.0.1.2.tar.xz
916da8f21945895e04eebb74e60f854d libreoffice-help-4.0.1.2.tar.xz
98477b5c9e8a7954d321dd143ac9336e libreoffice-translations-4.0.1.2.tar.xz

Write Preview
Loading…
Cancel
Save