pyuno/source/module/pyuno_impl.hxx | 2 +- pyuno/source/module/pyuno_type.cxx | 2 +- pyuno/source/module/pyuno_util.cxx | 2 +- sw/source/uibase/uno/unotxdoc.cxx | 5 ++--- 4 files changed, 5 insertions(+), 6 deletions(-)
New commits: commit 8d0949a0dd7fcd72a29a455598815ed2daa0724a Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> AuthorDate: Wed May 22 15:42:51 2019 +0200 Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> CommitDate: Thu May 23 10:39:07 2019 +0200 Revert "tdf#121962 Update fields after layout has been calculated" This reverts commit a66e11492b847a53c84211d78da2c946adaaaf4e. diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 6095b8801cbe..3a8a7ada5119 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -2594,6 +2594,8 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( bStateChanged = true; } + // #122919# Force field update before PDF export + pViewShell->SwViewShell::UpdateFields(true); if( bStateChanged ) pRenderDocShell->EnableSetModified(); @@ -2603,9 +2605,6 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( pViewShell->CalcLayout(); pViewShell->CalcPagesForPrint( pViewShell->GetPageCount() ); - // #122919# Force field update before PDF export, but after layout init (tdf#121962) - pViewShell->SwViewShell::UpdateFields(true); - pViewShell->SetPDFExportOption( false ); // enable view again commit ec89f8316fc142421dd752695a6ba83d3987f656 Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Tue Jul 3 08:33:34 2018 +0200 Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> CommitDate: Thu May 23 10:38:18 2019 +0200 const fixes for python3-devel-3.7.0-1.fc29.x86_64 Change-Id: Ia16a8b828e11ce36e9bb77ecf9e8a1179bd9b90c Reviewed-on: https://gerrit.libreoffice.org/56841 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> (cherry picked from commit 76a29148be63cb006a7e25e312dc93acc93e071f) diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx index 0452da7cef6f..4a12ad3136d2 100644 --- a/pyuno/source/module/pyuno_impl.hxx +++ b/pyuno/source/module/pyuno_impl.hxx @@ -80,7 +80,7 @@ inline PyObject* PyStr_FromString(const char *string) return PyUnicode_FromString(string); } -inline char * PyStr_AsString(PyObject *object) +inline char const * PyStr_AsString(PyObject *object) { return PyUnicode_AsUTF8(object); } diff --git a/pyuno/source/module/pyuno_type.cxx b/pyuno/source/module/pyuno_type.cxx index c2472e478029..f35ddf4ace6d 100644 --- a/pyuno/source/module/pyuno_type.cxx +++ b/pyuno/source/module/pyuno_type.cxx @@ -155,7 +155,7 @@ Any PyEnum2Enum( PyObject *obj ) throw ( RuntimeException ) } OUString strTypeName( OUString::createFromAscii( PyStr_AsString( typeName.get() ) ) ); - char *stringValue = PyStr_AsString( value.get() ); + char const *stringValue = PyStr_AsString( value.get() ); TypeDescription desc( strTypeName ); if( desc.is() ) diff --git a/pyuno/source/module/pyuno_util.cxx b/pyuno/source/module/pyuno_util.cxx index ede4cd6f01c0..8e3d74287421 100644 --- a/pyuno/source/module/pyuno_util.cxx +++ b/pyuno/source/module/pyuno_util.cxx @@ -64,7 +64,7 @@ OUString pyString2ustring( PyObject *pystr ) #else #if PY_MAJOR_VERSION >= 3 Py_ssize_t size(0); - char *pUtf8(PyUnicode_AsUTF8AndSize(pystr, &size)); + char const *pUtf8(PyUnicode_AsUTF8AndSize(pystr, &size)); ret = OUString(pUtf8, size, RTL_TEXTENCODING_UTF8); #else PyObject* pUtf8 = PyUnicode_AsUTF8String(pystr); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits