[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/mork/MQueryHelper.cxx |4 ++--
connectivity/source/drivers/mork/mork_helper.cxx |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 1108f9c9045d603cfabaf28f7ad17c3b0433cc3b
Author: Muhammet Kara
AuthorDate: Thu Jul 26 20:32:19 2018 +0300
Commit: Noel Grandin
CommitDate: Fri Jul 27 08:36:10 2018 +0200
Remove unused iterators from MQueryHelper.cxx and mork_helper.cxx
Leftover from 8d3d04ef588b5
Change-Id: I4ab7c7eccc8165bdfadba792f2ef8ccf1e52c1c3
Reviewed-on: https://gerrit.libreoffice.org/58138
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
Reviewed-by: Noel Grandin
diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx
b/connectivity/source/drivers/mork/MQueryHelper.cxx
index 9d855b675f60..00cdf3df93c0 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.cxx
@@ -193,12 +193,12 @@ sal_Int32 MQueryHelper::executeQuery(OConnection*
xConnection, MQueryExpression
std::string listTable = oStringTable.getStr();
pMork->getRecordKeysForListTable(listTable, listRecords);
}
-MorkTableMap::Map::iterator tableIter;
+
MorkTableMap *Tables = pMork->getTables( 0x80 );
if (!Tables)
return -1;
+
MorkRowMap *Rows = nullptr;
-MorkRowMap::Map::const_iterator rowIter;
// Iterate all tables
for (auto & table : Tables->map)
diff --git a/connectivity/source/drivers/mork/mork_helper.cxx
b/connectivity/source/drivers/mork/mork_helper.cxx
index 1a8668bc049e..07c70a1aa2d6 100644
--- a/connectivity/source/drivers/mork/mork_helper.cxx
+++ b/connectivity/source/drivers/mork/mork_helper.cxx
@@ -12,8 +12,8 @@ bool openAddressBook(const std::string& path)
{
return false;
}
+
const int defaultScope = 0x80;
-MorkTableMap::Map::const_iterator tableIter;
MorkTableMap *Tables = mork.getTables( defaultScope );
if ( Tables )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/dialogs/tp_ChartType.cxx |3 ---
1 file changed, 3 deletions(-)
New commits:
commit d751ee0d080a3585c5f98c27c3afe4a9a1c98a03
Author: Muhammet Kara
AuthorDate: Thu Jul 26 20:05:40 2018 +0300
Commit: Noel Grandin
CommitDate: Fri Jul 27 08:35:46 2018 +0200
Remove unused local variable aOpts
and the corresponding include for SvtMiscOptions
Introduced in 20bb2e7074811
Leftover from 026e2623f7f498432e6dc970fb06145dfc77dc45
Change-Id: Ibe232045be2396f4a9761d5537b4cc3c9b7af6e1
Reviewed-on: https://gerrit.libreoffice.org/58137
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
Reviewed-by: Noel Grandin
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx
b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 13e81edf86ed..269753642511 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -27,7 +27,6 @@
#include
#include
-#include
#include
#include
@@ -683,8 +682,6 @@ ChartTypeTabPage::ChartTypeTabPage(vcl::Window* pParent
}
m_aChartTypeDialogControllerList.emplace_back(new
CombiColumnLineChartDialogController() );
-SvtMiscOptions aOpts;
-
for (auto const& elem : m_aChartTypeDialogControllerList)
{
m_pMainTypeList->InsertEntry( elem->getName(), elem->getImage() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source include/editeng include/svx svx/source sw/inc sw/source
editeng/source/items/justifyitem.cxx |6
editeng/source/items/writingmodeitem.cxx |6
include/editeng/autokernitem.hxx |6
include/editeng/blinkitem.hxx|5 ---
include/editeng/charhiddenitem.hxx |5 ---
include/editeng/charreliefitem.hxx |6
include/editeng/charrotateitem.hxx | 13 --
include/editeng/charscaleitem.hxx|7 -
include/editeng/charsetcoloritem.hxx |7 -
include/editeng/cmapitem.hxx |6
include/editeng/emphasismarkitem.hxx |6
include/editeng/escapementitem.hxx |7 -
include/editeng/forbiddenruleitem.hxx|7 -
include/editeng/hngpnctitem.hxx |7 -
include/editeng/hyphenzoneitem.hxx | 10 ---
include/editeng/justifyitem.hxx |2 -
include/editeng/kernitem.hxx |5 ---
include/editeng/nhypitem.hxx |6
include/editeng/optitems.hxx |7 -
include/editeng/orphitem.hxx |6
include/editeng/paravertalignitem.hxx|6
include/editeng/pbinitem.hxx |8 --
include/editeng/prntitem.hxx |8 --
include/editeng/scriptspaceitem.hxx |7 -
include/editeng/spltitem.hxx | 13 +++---
include/editeng/twolinesitem.hxx | 13 +++---
include/editeng/widwitem.hxx |6
include/editeng/writingmodeitem.hxx |5 +++
include/editeng/wrlmitem.hxx |6
include/svx/grfcrop.hxx | 12 +++--
include/svx/postattr.hxx | 24 ---
svx/source/inc/fmitems.hxx | 10 ---
sw/inc/fmtfordr.hxx |7 -
sw/inc/fmtfsize.hxx |1
sw/inc/fmtsrnd.hxx | 10 ---
sw/inc/fmtwrapinfluenceonobjpos.hxx |6 +++-
sw/inc/grfatr.hxx| 13 --
sw/inc/paratr.hxx| 18 --
sw/inc/tgrditem.hxx |7 +++--
sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx |7 -
sw/source/core/layout/atrfrm.cxx | 29 ---
41 files changed, 28 insertions(+), 318 deletions(-)
New commits:
commit 727878a7d8ae25342db75173cc314fa330ccc077
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 16:42:16 2018 +0200
Commit: Stephan Bergmann
CommitDate: Fri Jul 27 08:29:44 2018 +0200
Remove unused copy assignment ops of SfxPoolItem-derived classes
SfxPoolItem has the curious design of non-deleted copy ctor and deleted copy
assignment op. Many derived classes then provide a non-deleted assignment
op,
apparently more or less on an as-needed basis. But some of those
user-provided
assignment ops are actually unused (and their presence causes
-Werror=deprecated-copy with GCC trunk towards GCC 9 when the---implicitly-
defined---copy ctor of the derived class is used), so remove them. In some
cases that would still cause -Werror=deprected-copy because of a
user-declared
dtor, so in those cases explicitly default all the copy/move functions
(some of
which will then be implicitly defined as deleted).
Change-Id: If0d9f1a9f3954263a39ffd27ba895d6202afa307
Reviewed-on: https://gerrit.libreoffice.org/58133
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/editeng/source/items/justifyitem.cxx
b/editeng/source/items/justifyitem.cxx
index f940950bede4..c22b989bfc0e 100644
--- a/editeng/source/items/justifyitem.cxx
+++ b/editeng/source/items/justifyitem.cxx
@@ -393,10 +393,4 @@ sal_uInt16 SvxJustifyMethodItem::GetValueCount() const
return static_cast(SvxCellJustifyMethod::Distribute) + 1; //
Last Enum value + 1
}
-SvxJustifyMethodItem& SvxJustifyMethodItem::operator=(const
SvxJustifyMethodItem& r)
-{
-SetValue( r.GetValue() );
-return *this;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/items/writingmodeitem.cxx
b/editeng/source/items/writingmodeitem.cxx
index d4cd8a385d3b..25e6bfb1cb22 100644
--- a/editeng/source/items/writingmodeitem.cxx
+++ b/editeng/source/items/writingmodeitem.cxx
@@ -105,10 +105,4 @@ bool SvxWritingModeItem::QueryValue( css::uno::Any& rVal,
return true;
}
-SvxWritingModeItem& SvxWritingModeItem::operator=( const SvxWritingModeItem&
rItem )
-{
-SetValue( static_cast(rItem.GetValue()) );
-return *this;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editen
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/ColorSets.hxx|1 -
include/svx/IAccessibleViewForwarder.hxx |6 ++
include/svx/XPropertyEntry.hxx |7 ++-
include/svx/sdasitm.hxx |5 +
include/svx/sdr/contact/displayinfo.hxx |3 ---
include/svx/sdtaiitm.hxx | 10 ++
include/svx/svdoattr.hxx |4
include/svx/svdoedge.hxx |1 -
include/svx/sxcecitm.hxx | 10 ++
include/svx/sxcllitm.hxx | 10 ++
include/svx/sxmbritm.hxx |5 +
include/svx/sxmtfitm.hxx | 15 +++
include/svx/sxmtritm.hxx | 10 ++
include/svx/xtable.hxx |1 -
svx/source/sdr/contact/displayinfo.cxx |4
svx/source/styles/ColorSets.cxx |3 ---
svx/source/svdraw/svdoedge.cxx |5 -
svx/source/xoutdev/XPropertyEntry.cxx|6 --
svx/source/xoutdev/xtable.cxx|6 --
19 files changed, 81 insertions(+), 31 deletions(-)
New commits:
commit 13502c0f201f37960ec06bf1e7e2e8b4d838090a
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 16:21:18 2018 +0200
Commit: Stephan Bergmann
CommitDate: Fri Jul 27 08:29:15 2018 +0200
svx: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by explicitly defaulting the copy/move functions (and, where needed in
turn,
also a default ctor) for classes that have a user-declared dtor that does
nothing other than an implicitly-defined one would do, but needs to be user-
declared because it is virtual and potentially serves as a key function to
emit the vtable, or is non-public, etc.; and by removing explicitly user-
provided functions that do the same as their implicitly-defined
counterparts,
but may prevent implicitly declared copy functions from being defined as
non-
deleted in the future. (Even if such a user-provided function was declared
non-inline in an include file, the apparently-used implicitly-defined copy
functions are already include, so why bother with non-inline functions.)
Change-Id: I1c470ef87e95b22e406099a4e6816693edab2e03
Reviewed-on: https://gerrit.libreoffice.org/58131
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/svx/ColorSets.hxx b/include/svx/ColorSets.hxx
index 586a180342c9..9ac53100b874 100644
--- a/include/svx/ColorSets.hxx
+++ b/include/svx/ColorSets.hxx
@@ -27,7 +27,6 @@ class SVX_DLLPUBLIC ColorSet
std::vector maColors;
public:
ColorSet(OUString const & aName);
-~ColorSet();
void add(sal_uInt32 nIndex, sal_uInt32 aColorData)
{
diff --git a/include/svx/IAccessibleViewForwarder.hxx
b/include/svx/IAccessibleViewForwarder.hxx
index eb89854fe1fe..1b228669b7da 100644
--- a/include/svx/IAccessibleViewForwarder.hxx
+++ b/include/svx/IAccessibleViewForwarder.hxx
@@ -51,6 +51,12 @@ namespace accessibility {
class IAccessibleViewForwarder
{
public:
+IAccessibleViewForwarder() = default;
+IAccessibleViewForwarder(IAccessibleViewForwarder const &) = default;
+IAccessibleViewForwarder(IAccessibleViewForwarder &&) = default;
+IAccessibleViewForwarder & operator =(IAccessibleViewForwarder const &) =
default;
+IAccessibleViewForwarder & operator =(IAccessibleViewForwarder &&) =
default;
+
virtual ~IAccessibleViewForwarder(){};
/** Returns the area of the underlying document that is visible in the
diff --git a/include/svx/XPropertyEntry.hxx b/include/svx/XPropertyEntry.hxx
index 4a180c33ea6b..98f482f9c7b4 100644
--- a/include/svx/XPropertyEntry.hxx
+++ b/include/svx/XPropertyEntry.hxx
@@ -34,11 +34,16 @@ private:
protected:
XPropertyEntry(const OUString& rPropEntryName);
-XPropertyEntry(const XPropertyEntry& rOther);
+
+XPropertyEntry(XPropertyEntry const &) = default;
+XPropertyEntry(XPropertyEntry &&) = default;
public:
virtual ~XPropertyEntry();
+XPropertyEntry & operator =(XPropertyEntry const &) = default;
+XPropertyEntry & operator =(XPropertyEntry &&) = default;
+
void SetName(const OUString& rPropEntryName) { maPropEntryName =
rPropEntryName; }
const OUString& GetName() const { return maPropEntryName; }
void SetUiBitmap(const BitmapEx& rUiBitmap) { maUiBitmap = rUiBitmap; }
diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx
index 254aba0a7c4d..c0c02897da5c 100644
--- a/include/svx/sdasitm.hxx
+++ b/include/svx/sdasitm.hxx
@@ -54,6 +54,11 @@ private:
SdrCustomShapeGeometryItem( const css::uno::Sequence<
css::beans::PropertyValue >& );
virtual ~SdrCustomShapeGeometryItem() override;
+SdrCustomShapeGeometryItem(SdrCustomShapeGeometryItem const &) =
default;
+SdrCustomShapeGeometryItem(SdrCustomShapeGeometryItem &&) =
default;
+SdrCustomShapeGeometryItem & operator =(SdrCustomShap
[Libreoffice-commits] core.git: cppcanvas/source
cppcanvas/source/wrapper/implbitmapcanvas.hxx | 10 +- cppcanvas/source/wrapper/implcanvas.hxx | 10 +- 2 files changed, 10 insertions(+), 10 deletions(-) New commits: commit 6844ef8a7ed9b253b6cca4c8d8aec54ef05d013e Author: Stephan Bergmann AuthorDate: Thu Jul 26 15:17:19 2018 +0200 Commit: Stephan Bergmann CommitDate: Fri Jul 27 08:28:46 2018 +0200 cppcanvas: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9) ...by explicitly defaulting the copy/move functions (and, where needed in turn, also a default ctor) for classes that have a user-declared dtor that does nothing other than an implicitly-defined one would do, but needs to be user- declared because it is virtual and potentially serves as a key function to emit the vtable, or is non-public, etc. There appears to be no good reason for these classes to have a deleted copy assignment op, so just change that to implicitly-defined, too. Change-Id: I65fb6ea78a13b7b3d237529613c0489c8cf50614 Reviewed-on: https://gerrit.libreoffice.org/58119 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.hxx b/cppcanvas/source/wrapper/implbitmapcanvas.hxx index 6f09794caf99..f2ccaf42153d 100644 --- a/cppcanvas/source/wrapper/implbitmapcanvas.hxx +++ b/cppcanvas/source/wrapper/implbitmapcanvas.hxx @@ -39,16 +39,16 @@ namespace cppcanvas explicit ImplBitmapCanvas( const css::uno::Reference< css::rendering::XBitmapCanvas >& rCanvas ); virtual ~ImplBitmapCanvas() override; +ImplBitmapCanvas(ImplBitmapCanvas const &) = default; +ImplBitmapCanvas(ImplBitmapCanvas &&) = default; +ImplBitmapCanvas & operator =(ImplBitmapCanvas const &) = default; +ImplBitmapCanvas & operator =(ImplBitmapCanvas &&) = default; + virtual ::basegfx::B2ISize getSize() const override; virtual CanvasSharedPtr clone() const override; -// take compiler-provided default copy constructor -//ImplBitmapCanvas(const ImplBitmapCanvas&); - private: -ImplBitmapCanvas& operator=( const ImplBitmapCanvas& ) = delete; - const css::uno::Reference< css::rendering::XBitmapCanvas > mxBitmapCanvas; const css::uno::Reference< css::rendering::XBitmap > mxBitmap; }; diff --git a/cppcanvas/source/wrapper/implcanvas.hxx b/cppcanvas/source/wrapper/implcanvas.hxx index b71f2311f67b..b6f8d02da87c 100644 --- a/cppcanvas/source/wrapper/implcanvas.hxx +++ b/cppcanvas/source/wrapper/implcanvas.hxx @@ -53,6 +53,11 @@ namespace cppcanvas explicit ImplCanvas( const css::uno::Reference< css::rendering::XCanvas >& rCanvas ); virtual ~ImplCanvas() override; +ImplCanvas(ImplCanvas const &) = default; +ImplCanvas(ImplCanvas &&) = default; +ImplCanvas & operator =(ImplCanvas const &) = default; +ImplCanvas & operator =(ImplCanvas &&) = default; + virtual void setTransformation( const ::basegfx::B2DHomMatrix& rMatrix ) override; virtual ::basegfx::B2DHomMatrix getTransformation() const override; @@ -69,12 +74,7 @@ namespace cppcanvas virtual css::rendering::ViewStategetViewState() const override; -// take compiler-provided default copy constructor -//ImplCanvas(const ImplCanvas&); - private: -ImplCanvas& operator=( const ImplCanvas& ) = delete; - mutable css::rendering::ViewStatemaViewState; boost::optional maClipPolyPolygon; const css::uno::Reference< css::rendering::XCanvas > mxCanvas; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcompiler/inc helpcompiler/source
helpcompiler/inc/HelpCompiler.hxx|2 +-
helpcompiler/source/HelpCompiler.cxx |3 +--
helpcompiler/source/HelpIndexer.cxx |2 +-
helpcompiler/source/HelpLinker.cxx | 14 +-
4 files changed, 4 insertions(+), 17 deletions(-)
New commits:
commit e6d79e896c540c3e758ebc4b730ca71987c2cee6
Author: Noel Grandin
AuthorDate: Thu Jul 26 12:20:59 2018 +0200
Commit: Noel Grandin
CommitDate: Fri Jul 27 08:28:27 2018 +0200
loplugin:returnconstant in helpcompiler
and fix scanForFiles to return false on error
Change-Id: I246e906de9985947be421d361340874c94a2102d
Reviewed-on: https://gerrit.libreoffice.org/58085
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/helpcompiler/inc/HelpCompiler.hxx
b/helpcompiler/inc/HelpCompiler.hxx
index dbc76764e35b..31ef2c0c2076 100644
--- a/helpcompiler/inc/HelpCompiler.hxx
+++ b/helpcompiler/inc/HelpCompiler.hxx
@@ -218,7 +218,7 @@ public:
bool in_bExtensionMode);
/// @throws HelpProcessingException
/// @throws BasicCodeTagger::TaggerException
-bool compile();
+void compile();
private:
xmlDocPtr getSourceDocument(const fs::path &filePath);
static void tagBasicCodeExamples(xmlDocPtr doc);
diff --git a/helpcompiler/source/HelpCompiler.cxx
b/helpcompiler/source/HelpCompiler.cxx
index 8cfdcecfa539..5abbdc648f41 100644
--- a/helpcompiler/source/HelpCompiler.cxx
+++ b/helpcompiler/source/HelpCompiler.cxx
@@ -439,7 +439,7 @@ void myparser::traverse( xmlNodePtr parentNode )
}
}
-bool HelpCompiler::compile()
+void HelpCompiler::compile()
{
// we now have the jaroutputstream, which will contain the document.
// now determine the document as a dom tree in variable docResolved
@@ -503,7 +503,6 @@ bool HelpCompiler::compile()
}
streamTable.document_module = actMod;
xmlFreeDoc(docResolvedOrg);
-return true;
}
namespace fs
diff --git a/helpcompiler/source/HelpIndexer.cxx
b/helpcompiler/source/HelpIndexer.cxx
index 870db09e0faa..d2380c53d3d1 100644
--- a/helpcompiler/source/HelpIndexer.cxx
+++ b/helpcompiler/source/HelpIndexer.cxx
@@ -96,7 +96,7 @@ bool HelpIndexer::scanForFiles(OUString const & path) {
osl::Directory dir(path);
if (osl::FileBase::E_None != dir.open()) {
d_error = "Error reading directory " + path;
-return true;
+return false;
}
osl::DirectoryItem item;
diff --git a/helpcompiler/source/HelpLinker.cxx
b/helpcompiler/source/HelpLinker.cxx
index c8801b14a947..da6365fe4b7c 100644
--- a/helpcompiler/source/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -347,21 +347,9 @@ void HelpLinker::link()
compactStylesheet, embeddStylesheet, module, lang,
bExtensionMode );
HCDBG(std::cerr << "before compile of " << xhpFileName <<
std::endl);
-bool success = hc.compile();
+hc.compile();
HCDBG(std::cerr << "after compile of " << xhpFileName <<
std::endl);
-if (!success && !bExtensionMode)
-{
-std::stringstream aStrStream;
-aStrStream <<
-"\nERROR: compiling help particle '"
-<< xhpFileName
-<< "' for language '"
-<< lang
-<< "' failed!";
-throw HelpProcessingException(
HelpProcessingErrorClass::General, aStrStream.str() );
-}
-
if (!m_bCreateIndex)
continue;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source i18npool/source
connectivity/source/drivers/file/FStringFunctions.cxx |6 +-
connectivity/source/drivers/postgresql/pq_tools.cxx |6 +-
i18npool/source/characterclassification/cclass_unicode_parser.cxx | 22
+-
3 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit ea7e6dd4afd7154f51c5344eb6ab1825fc92a293
Author: Noel Grandin
AuthorDate: Wed Jul 25 19:25:17 2018 +0200
Commit: Noel Grandin
CommitDate: Fri Jul 27 08:27:36 2018 +0200
use OUStringBuffer in some loops
Change-Id: Ib32fb5ddc04df1c090f9d7b319e4ff9be0c285f9
Reviewed-on: https://gerrit.libreoffice.org/58007
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/connectivity/source/drivers/file/FStringFunctions.cxx
b/connectivity/source/drivers/file/FStringFunctions.cxx
index 596196151327..95119f650ebe 100644
--- a/connectivity/source/drivers/file/FStringFunctions.cxx
+++ b/connectivity/source/drivers/file/FStringFunctions.cxx
@@ -62,7 +62,7 @@ ORowSetValue OOp_Char::operate(const
std::vector& lhs) const
if ( lhs.empty() )
return ORowSetValue();
-OUString sRet;
+OUStringBuffer sRet;
std::vector::const_reverse_iterator aIter = lhs.rbegin();
std::vector::const_reverse_iterator aEnd = lhs.rend();
for (; aIter != aEnd; ++aIter)
@@ -71,11 +71,11 @@ ORowSetValue OOp_Char::operate(const
std::vector& lhs) const
{
sal_Char c = static_cast(static_cast(*aIter));
-sRet += OUString(&c,1,RTL_TEXTENCODING_ASCII_US);
+sRet.appendAscii(&c, 1);
}
}
-return sRet;
+return sRet.makeStringAndClear();
}
ORowSetValue OOp_Concat::operate(const std::vector& lhs) const
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx
b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 06735b570338..a3730f7ed462 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -858,7 +858,7 @@ css::uno::Sequence< sal_Int32 > string2intarray( const
OUString & str )
std::vector< sal_Int32 > vec;
do
{
-OUString digits;
+OUStringBuffer digits;
do
{
if(!iswspace(c))
@@ -873,10 +873,10 @@ css::uno::Sequence< sal_Int32 > string2intarray( const
OUString & str )
break;
if ( start == strlen)
return ret;
-digits += OUString(&c, 1);
+digits.append(OUString(&c, 1));
c = str.iterateCodePoints(&start);
} while ( c );
-vec.push_back( digits.toInt32() );
+vec.push_back( digits.makeStringAndClear().toInt32() );
do
{
if(!iswspace(c))
diff --git a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
index a5cb1b680984..cdf9821776c2 100644
--- a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
@@ -691,7 +691,7 @@ void cclass_Unicode::parseText( ParseResult& r, const
OUString& rText, sal_Int32
eState = ssGetChar;
//! All the variables below (plus ParseResult) have to be resetted on
ssRewindFromValue!
-OUString aSymbol;
+OUStringBuffer aSymbol;
bool isFirst(true);
sal_Int32 index(nPos); // index of next code point after current
sal_Int32 postSymbolIndex(index); // index of code point following last
quote
@@ -880,13 +880,13 @@ void cclass_Unicode::parseText( ParseResult& r, const
OUString& rText, sal_Int32
{
if ( cLast == '\\' )
{ // escaped
-aSymbol += rText.copy(postSymbolIndex,
nextCharIndex - postSymbolIndex - 2);
-aSymbol += OUString(¤t, 1);
+aSymbol.append(rText.getStr() + postSymbolIndex,
nextCharIndex - postSymbolIndex - 2);
+aSymbol.append(OUString(¤t, 1));
}
else
{
eState = ssStop;
-aSymbol += rText.copy(postSymbolIndex,
nextCharIndex - postSymbolIndex - 1);
+aSymbol.append(rText.getStr() + postSymbolIndex,
nextCharIndex - postSymbolIndex - 1);
}
postSymbolIndex = nextCharIndex;
}
@@ -905,13 +905,13 @@ void cclass_Unicode::parseText( ParseResult& r, const
OUString& rText, sal_Int32
{
if ( cLast == '\\' )
{ // escaped
-aSymbol += rText.copy(postSymbolIndex, nextCharIndex -
postSymbolIndex - 2);
-aSymbol += OUString(¤t,
[Libreoffice-commits] core.git: codemaker/source
codemaker/source/cppumaker/cpputype.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 1a400fc39023bcf471a6d4448acbf1a2afcb274c
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 15:00:49 2018 +0200
Commit: Stephan Bergmann
CommitDate: Fri Jul 27 08:28:02 2018 +0200
codemaker: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by explicitly defaulting the copy/move functions (and, where needed in
turn,
also a default ctor) for classes that have a user-declared dtor that does
nothing other than an implicitly-defined one would do, but needs to be user-
declared because it is virtual and potentially serves as a key function to
emit the vtable, or is non-public, etc. (For LIBO_INTERNAL_ONLY, in
cppumaker-
genered code.)
Change-Id: Ia13d945c10600f5793a3247f85a464170ede483d
Reviewed-on: https://gerrit.libreoffice.org/58116
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/codemaker/source/cppumaker/cpputype.cxx
b/codemaker/source/cppumaker/cpputype.cxx
index 6252a0ec603b..dd6476ff9f89 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -1162,6 +1162,12 @@ void InterfaceType::dumpDeclaration(FileStream & out)
}
out << "\n{\npublic:\n";
inc();
+out << "#if defined LIBO_INTERNAL_ONLY\n"
+<< indent() << id_ << "() = default;\n"
+<< indent() << id_ << "(" << id_ << " const &) = default;\n"
+<< indent() << id_ << "(" << id_ << " &&) = default;\n"
+<< indent() << id_ << " & operator =(" << id_ << " const &) =
default;\n"
+<< indent() << id_ << " & operator =(" << id_ << " &&) =
default;\n#endif\n\n";
dumpAttributes(out);
dumpMethods(out);
out << "\n" << indent()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/cppuhelper
include/cppuhelper/typeprovider.hxx |3 ---
1 file changed, 3 deletions(-)
New commits:
commit a8ed578f92cdfbd6236c74bc118beeebf806a84b
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 14:04:24 2018 +0200
Commit: Stephan Bergmann
CommitDate: Fri Jul 27 08:27:14 2018 +0200
cppuhelper: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by removing explicitly user-provided functions that do the same as their
implicitly-defined counterparts, but may prevent implicitly declared copy
functions from being defined as non-deleted in the future
Change-Id: I2b7b6b8baa872addfb2adb0d551d78de1e31c896
Reviewed-on: https://gerrit.libreoffice.org/58106
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/cppuhelper/typeprovider.hxx
b/include/cppuhelper/typeprovider.hxx
index fec7ea2efc84..eed17d4925d1 100644
--- a/include/cppuhelper/typeprovider.hxx
+++ b/include/cppuhelper/typeprovider.hxx
@@ -51,9 +51,6 @@ public:
{}
/// @endcond
-OTypeCollection( const OTypeCollection & rCollection )
-: _aTypes( rCollection._aTypes )
-{}
OTypeCollection(
const css::uno::Type & rType1,
const css::uno::Sequence< css::uno::Type > & rAddTypes =
css::uno::Sequence< css::uno::Type >() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source
include/vcl/IconThemeScanner.hxx|2
include/vcl/customweld.hxx |5
include/vcl/event.hxx |2
include/vcl/keycod.hxx |9 -
include/vcl/metaact.hxx | 204
include/vcl/print.hxx |3
include/vcl/salnativewidgets.hxx| 44 +++
include/vcl/settings.hxx|7 -
include/vcl/vclptr.hxx |4
vcl/inc/fontattributes.hxx |1
vcl/source/app/IconThemeScanner.cxx |3
vcl/source/app/settings.cxx | 25
vcl/source/font/fontattributes.cxx | 14 --
vcl/source/gdi/print.cxx|8 -
vcl/source/window/keyevent.cxx |6 -
15 files changed, 257 insertions(+), 80 deletions(-)
New commits:
commit d2a28ebd5878305b29d8dbfc3b537ddfaabd3625
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 14:02:37 2018 +0200
Commit: Stephan Bergmann
CommitDate: Fri Jul 27 08:26:45 2018 +0200
vcl: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by explicitly defaulting the copy/move functions (and, where needed in
turn,
also a default ctor) for classes that have a user-declared dtor that does
nothing other than an implicitly-defined one would do, but needs to be user-
declared because it is virtual and potentially serves as a key function to
emit the vtable, or is non-public, etc.; and by removing explicitly user-
provided functions that do the same as their implicitly-defined
counterparts,
but may prevent implicitly declared copy functions from being defined as
non-
deleted in the future. (Even if such a user-provided function was declared
non-inline in an include file, the apparently-used implicitly-defined copy
functions are already include, so why bother with non-inline functions.)
Change-Id: Ife5d8eb699b8b6c84b9229ae275dc386fa189bce
Reviewed-on: https://gerrit.libreoffice.org/58105
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/vcl/IconThemeScanner.hxx b/include/vcl/IconThemeScanner.hxx
index 247b52d37711..03f472bd5928 100644
--- a/include/vcl/IconThemeScanner.hxx
+++ b/include/vcl/IconThemeScanner.hxx
@@ -34,8 +34,6 @@ namespace vcl {
class VCL_DLLPUBLIC IconThemeScanner
{
public:
-~IconThemeScanner();
-
/** Factory method to create the object.
* Provide a path to search for IconThemes.
*/
diff --git a/include/vcl/customweld.hxx b/include/vcl/customweld.hxx
index c191b91ebf2b..f6770c8fe4a4 100644
--- a/include/vcl/customweld.hxx
+++ b/include/vcl/customweld.hxx
@@ -73,6 +73,11 @@ public:
{
}
virtual ~CustomWidgetController();
+
+CustomWidgetController(CustomWidgetController const&) = default;
+CustomWidgetController(CustomWidgetController&&) = default;
+CustomWidgetController& operator=(CustomWidgetController const&) = default;
+CustomWidgetController& operator=(CustomWidgetController&&) = default;
};
class VCL_DLLPUBLIC CustomWeld
diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx
index 050e7199cc45..22486490977a 100644
--- a/include/vcl/event.hxx
+++ b/include/vcl/event.hxx
@@ -62,8 +62,6 @@ public:
sal_uInt16 GetRepeat() const { return mnRepeat; }
KeyEventLogicalTextDirectionality (TextDirectionality eMode) const;
-KeyEvent (const KeyEvent& rKeyEvent);
-
};
inline KeyEvent::KeyEvent()
diff --git a/include/vcl/keycod.hxx b/include/vcl/keycod.hxx
index 405fbd5cd936..63bbf372f382 100644
--- a/include/vcl/keycod.hxx
+++ b/include/vcl/keycod.hxx
@@ -73,7 +73,6 @@ public:
KeyFuncType GetFunction() const;
-KeyCode&operator = ( const KeyCode& rKeyCode );
booloperator ==( const KeyCode& rKeyCode ) const;
booloperator !=( const KeyCode& rKeyCode ) const;
};
@@ -116,14 +115,6 @@ inline bool vcl::KeyCode::operator !=( const vcl::KeyCode&
rKeyCode ) const
return (GetFunction() != rKeyCode.GetFunction());
}
-inline vcl::KeyCode& vcl::KeyCode::operator = ( const vcl::KeyCode& rKeyCode )
-{
-nKeyCodeAndModifiers = rKeyCode.nKeyCodeAndModifiers;
-eFunc = rKeyCode.eFunc;
-
-return *this;
-}
-
#endif // INCLUDED_VCL_KEYCOD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx
index 2578cfd26c3e..ef582b1f97dd 100644
--- a/include/vcl/metaact.hxx
+++ b/include/vcl/metaact.hxx
@@ -101,6 +101,10 @@ private:
public:
MetaPixelAction();
+MetaPixelAction(MetaPixelAction const &) = default;
+MetaPixelAction(MetaPixelAction &&) = default;
+MetaPixelAction & operator =(MetaPixelAction const &) = default;
+MetaPixelAction & operator =(MetaPixelAction &&) = default;
protected:
virtual ~MetaPixelAction() override;
public:
@@ -125,6 +129,10 @@ private:
public:
MetaPointActi
[Libreoffice-commits] core.git: include/osl
include/osl/pipe.hxx|5 -
include/osl/pipe_decl.hxx |5 -
include/osl/socket.hxx |5 -
include/osl/socket_decl.hxx |2 --
4 files changed, 17 deletions(-)
New commits:
commit 739f746254853dbf6552b0fac9192bfd5ddd0118
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 14:00:34 2018 +0200
Commit: Stephan Bergmann
CommitDate: Fri Jul 27 08:26:07 2018 +0200
sal: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by removing explicitly user-provided functions that do the same as their
implicitly-defined counterparts, but may prevent implicitly declared copy
functions from being defined as non-deleted in the future
Change-Id: I4da623b67ef1792f9dd04382dcb0e772d66bdb40
Reviewed-on: https://gerrit.libreoffice.org/58104
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/osl/pipe.hxx b/include/osl/pipe.hxx
index 40362de287a7..e9cfe2e6c3f0 100644
--- a/include/osl/pipe.hxx
+++ b/include/osl/pipe.hxx
@@ -186,11 +186,6 @@ namespace osl
: Pipe( strName, Options )
{}
-
-inline StreamPipe::StreamPipe(const StreamPipe& aPipe)
-: Pipe( aPipe )
-{}
-
inline StreamPipe::StreamPipe( oslPipe pipe, __sal_NoAcquire noacquire )
: Pipe( pipe , noacquire )
{}
diff --git a/include/osl/pipe_decl.hxx b/include/osl/pipe_decl.hxx
index 81bc4fd81183..146b77a5624e 100644
--- a/include/osl/pipe_decl.hxx
+++ b/include/osl/pipe_decl.hxx
@@ -160,11 +160,6 @@ public:
*/
inline StreamPipe(oslPipe Pipe);
-/** Copy constructor.
-@param Pipe
-*/
-inline StreamPipe(const StreamPipe& Pipe);
-
/** Creates a pipe.
@param[in] strName Pipe name
diff --git a/include/osl/socket.hxx b/include/osl/socket.hxx
index 78bb4b1c3768..0227095df089 100644
--- a/include/osl/socket.hxx
+++ b/include/osl/socket.hxx
@@ -433,11 +433,6 @@ namespace osl
{}
-inline StreamSocket::StreamSocket( const StreamSocket & socket )
-: Socket( socket )
-{}
-
-
inline sal_Int32 StreamSocket::read(void* pBuffer, sal_uInt32 n)
{
return osl_readSocket( m_handle, pBuffer, n );
diff --git a/include/osl/socket_decl.hxx b/include/osl/socket_decl.hxx
index ebf831dfb0e4..3d2a05634348 100644
--- a/include/osl/socket_decl.hxx
+++ b/include/osl/socket_decl.hxx
@@ -538,8 +538,6 @@ namespace osl
oslProtocol Protocol = osl_Socket_ProtocolIp,
oslSocketType Type = osl_Socket_TypeStream);
-inline StreamSocket( const StreamSocket & );
-
inline StreamSocket( oslSocket Socket , __sal_NoAcquire noacquire );
inline StreamSocket( oslSocket Socket );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - vcl/source
vcl/source/control/ctrl.cxx | 22 ++
1 file changed, 18 insertions(+), 4 deletions(-)
New commits:
commit 5906980ed16d99a2872a7b90c9a55dc339430f63
Author: Armin Le Grand
AuthorDate: Thu Jul 12 10:22:33 2018 +0200
Commit: Thorsten Behrens
CommitDate: Fri Jul 27 08:25:57 2018 +0200
tdf#118377 Do not use disposed OutputDevice
Change-Id: I7e085f69ce18e8e3c47fde690a939948454d4d15
Reviewed-on: https://gerrit.libreoffice.org/57319
Tested-by: Jenkins
Reviewed-by: Armin Le Grand
(cherry picked from commit 3debc8c6eded517f7401c2e7ad45f73854c32e57)
Reviewed-on: https://gerrit.libreoffice.org/57581
Reviewed-by: Michael Meeks
Reviewed-by: Xisco Faulí
Tested-by: Xisco Faulí
Reviewed-by: Thorsten Behrens
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 8febfb02975d..775e6aa1c51c 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -385,6 +385,20 @@ void Control::SetReferenceDevice( OutputDevice*
_referenceDevice )
OutputDevice* Control::GetReferenceDevice() const
{
+// tdf#118377 It can happen that mpReferenceDevice is already disposed and
+// stays disposed (see task, even when Dialog is closed). I have no idea if
+// this may be very bad - someone who knows more about lifetime of
OutputDevice's
+// will have to decide.
+// To secure this, I changed all accesses to
mpControlData->mpReferenceDevice to
+// use Control::GetReferenceDevice() - only use
mpControlData->mpReferenceDevice
+// inside Control::SetReferenceDevice and Control::GetReferenceDevice().
+// Control::GetReferenceDevice() will now reset mpReferenceDevice if it is
already
+// disposed. This way all usages will do a kind of 'test-and-get' call.
+if(nullptr != mpControlData->mpReferenceDevice &&
mpControlData->mpReferenceDevice->isDisposed())
+{
+const_cast(this)->SetReferenceDevice(nullptr);
+}
+
return mpControlData->mpReferenceDevice;
}
@@ -428,14 +442,14 @@ tools::Rectangle Control::DrawControlText( OutputDevice&
_rTargetDevice, const t
nPStyle &= ~DrawTextFlags::HideMnemonic;
}
-if ( !mpControlData->mpReferenceDevice || (
mpControlData->mpReferenceDevice == &_rTargetDevice ) )
+if( !GetReferenceDevice() || ( GetReferenceDevice() == &_rTargetDevice ) )
{
const tools::Rectangle aRet = _rTargetDevice.GetTextRect(rRect, rPStr,
nPStyle);
_rTargetDevice.DrawText(aRet, rPStr, nPStyle, _pVector, _pDisplayText);
return aRet;
}
-ControlTextRenderer aRenderer( *this, _rTargetDevice,
*mpControlData->mpReferenceDevice );
+ControlTextRenderer aRenderer( *this, _rTargetDevice,
*GetReferenceDevice() );
return aRenderer.DrawText(rRect, rPStr, nPStyle, _pVector, _pDisplayText,
i_pDeviceSize);
}
@@ -454,7 +468,7 @@ tools::Rectangle Control::GetControlTextRect( OutputDevice&
_rTargetDevice, cons
nPStyle &= ~DrawTextFlags::HideMnemonic;
}
-if ( !mpControlData->mpReferenceDevice || (
mpControlData->mpReferenceDevice == &_rTargetDevice ) )
+if ( !GetReferenceDevice() || ( GetReferenceDevice() == &_rTargetDevice ) )
{
tools::Rectangle aRet = _rTargetDevice.GetTextRect( rRect, rPStr,
nPStyle );
if (o_pDeviceSize)
@@ -464,7 +478,7 @@ tools::Rectangle Control::GetControlTextRect( OutputDevice&
_rTargetDevice, cons
return aRet;
}
-ControlTextRenderer aRenderer( *this, _rTargetDevice,
*mpControlData->mpReferenceDevice );
+ControlTextRenderer aRenderer( *this, _rTargetDevice,
*GetReferenceDevice() );
return aRenderer.GetTextRect(rRect, rPStr, nPStyle, o_pDeviceSize);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svl
include/svl/globalnameitem.hxx |5 +
include/svl/grabbagitem.hxx|5 +
include/svl/hint.hxx |6 ++
include/svl/ilstitem.hxx |5 +
include/svl/int64item.hxx |5 +
include/svl/lckbitem.hxx |5 +
include/svl/poolitem.hxx |5 +
include/svl/slstitm.hxx|5 +
8 files changed, 41 insertions(+)
New commits:
commit 08ec78be6fcc4465db0ed463bc68f841c4d43c97
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 13:54:51 2018 +0200
Commit: Stephan Bergmann
CommitDate: Fri Jul 27 08:24:56 2018 +0200
svl: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by explicitly defaulting the copy/move functions (and, where needed in
turn,
also a default ctor) for classes that have a user-declared dtor that does
nothing other than an implicitly-defined one would do, but needs to be user-
declared because it is virtual and potentially serves as a key function to
emit the vtable, or is non-public, etc.
Change-Id: I8c900426c49701afc94094115ec0c2d5b1af90d9
Reviewed-on: https://gerrit.libreoffice.org/58102
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/svl/globalnameitem.hxx b/include/svl/globalnameitem.hxx
index 7c12cc3a6bf1..3ce25307ecb4 100644
--- a/include/svl/globalnameitem.hxx
+++ b/include/svl/globalnameitem.hxx
@@ -34,6 +34,11 @@ public:
SfxGlobalNameItem( sal_uInt16 nWhich, const
SvGlobalName& );
virtual ~SfxGlobalNameItem() override;
+SfxGlobalNameItem(SfxGlobalNameItem const &) = default;
+SfxGlobalNameItem(SfxGlobalNameItem &&) = default;
+SfxGlobalNameItem & operator =(SfxGlobalNameItem const &) = default;
+SfxGlobalNameItem & operator =(SfxGlobalNameItem &&) = default;
+
virtual booloperator==( const SfxPoolItem& ) const override;
virtual SfxPoolItem*Clone( SfxItemPool *pPool = nullptr ) const
override;
const SvGlobalName& GetValue() const { return m_aName; }
diff --git a/include/svl/grabbagitem.hxx b/include/svl/grabbagitem.hxx
index 9608a08579d5..d938d526f710 100644
--- a/include/svl/grabbagitem.hxx
+++ b/include/svl/grabbagitem.hxx
@@ -27,6 +27,11 @@ public:
SfxGrabBagItem(sal_uInt16 nWhich);
~SfxGrabBagItem() override;
+SfxGrabBagItem(SfxGrabBagItem const &) = default;
+SfxGrabBagItem(SfxGrabBagItem &&) = default;
+SfxGrabBagItem & operator =(SfxGrabBagItem const &) = default;
+SfxGrabBagItem & operator =(SfxGrabBagItem &&) = default;
+
const std::map& GetGrabBag() const
{
return m_aMap;
diff --git a/include/svl/hint.hxx b/include/svl/hint.hxx
index b229d7f9b7cf..cda13c11e313 100644
--- a/include/svl/hint.hxx
+++ b/include/svl/hint.hxx
@@ -206,6 +206,12 @@ public:
SfxHint() : mnId(SfxHintId::NONE) {}
explicit SfxHint( SfxHintId nId ) : mnId(nId) {}
virtual ~SfxHint() COVERITY_NOEXCEPT_FALSE;
+
+SfxHint(SfxHint const &) = default;
+SfxHint(SfxHint &&) = default;
+SfxHint & operator =(SfxHint const &) = default;
+SfxHint & operator =(SfxHint &&) = default;
+
SfxHintId GetId() const { return mnId; }
};
diff --git a/include/svl/ilstitem.hxx b/include/svl/ilstitem.hxx
index a5916eadf1f1..198af2747fd0 100644
--- a/include/svl/ilstitem.hxx
+++ b/include/svl/ilstitem.hxx
@@ -36,6 +36,11 @@ public:
SfxIntegerListItem( sal_uInt16 nWhich, const css::uno::Sequence <
sal_Int32 >& rList );
virtual ~SfxIntegerListItem() override;
+SfxIntegerListItem(SfxIntegerListItem const &) = default;
+SfxIntegerListItem(SfxIntegerListItem &&) = default;
+SfxIntegerListItem & operator =(SfxIntegerListItem const &) = default;
+SfxIntegerListItem & operator =(SfxIntegerListItem &&) = default;
+
const std::vector< sal_Int32 >& GetList() const { return m_aList; }
virtual booloperator==( const SfxPoolItem& ) const override;
diff --git a/include/svl/int64item.hxx b/include/svl/int64item.hxx
index 9a4defcd0e8b..583f435dde94 100644
--- a/include/svl/int64item.hxx
+++ b/include/svl/int64item.hxx
@@ -23,6 +23,11 @@ public:
virtual ~SfxInt64Item() override;
+SfxInt64Item(SfxInt64Item const &) = default;
+SfxInt64Item(SfxInt64Item &&) = default;
+SfxInt64Item & operator =(SfxInt64Item const &) = default;
+SfxInt64Item & operator =(SfxInt64Item &&) = default;
+
virtual bool operator== ( const SfxPoolItem& rItem ) const override;
virtual bool GetPresentation(
diff --git a/include/svl/lckbitem.hxx b/include/svl/lckbitem.hxx
index ca5402cf2933..54b52a42aff6 100644
--- a/include/svl/lckbitem.hxx
+++ b/include/svl/lckbitem.hxx
@@ -33,6 +33,11 @@ public:
SfxLockBytesItem( sal_uInt16 nWhich, SvStream & );
virtual ~SfxLockBytesItem() override;
+SfxLockBytesItem(SfxLockBytesItem const &) = default;
+SfxLockBytesItem(SfxLoc
[Libreoffice-commits] core.git: include/salhelper
include/salhelper/timer.hxx |6 --
1 file changed, 6 deletions(-)
New commits:
commit ba263144035ddc27ab05b4f2d78d116acc24f92e
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 13:59:25 2018 +0200
Commit: Stephan Bergmann
CommitDate: Fri Jul 27 08:25:28 2018 +0200
salhelper: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by removing explicitly user-provided functions that do the same as their
implicitly-defined counterparts, but may prevent implicitly declared copy
functions from being defined as non-deleted in the future
Change-Id: I58b1b41823fa9eb5f37187272e38a2df80c48afb
Reviewed-on: https://gerrit.libreoffice.org/58103
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/salhelper/timer.hxx b/include/salhelper/timer.hxx
index ed20aadcaed1..674c95552ffe 100644
--- a/include/salhelper/timer.hxx
+++ b/include/salhelper/timer.hxx
@@ -56,12 +56,6 @@ struct SAL_WARN_UNUSED TTimeValue : public TimeValue
normalize();
}
-TTimeValue( const TTimeValue& rTimeValue ):
-TimeValue(rTimeValue)
-{
-normalize();
-}
-
TTimeValue( const TimeValue& rTimeValue )
{
Seconds = rTimeValue.Seconds;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1-0' - sw/source
sw/source/uibase/uiview/viewstat.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit e01c0d3d64331cfc91e3d7c2cff69e44bade4e32
Author: Katarina Behrens
AuthorDate: Tue Jul 24 19:03:23 2018 +0200
Commit: Thorsten Behrens
CommitDate: Fri Jul 27 08:23:28 2018 +0200
tdf#118777: Disable signature line slot if non-text object
in 6.1 only in sw, the functionality ain't there yet in sc
Change-Id: I54f7ec336026013d09ac6262779e7fcbd17c2084
Reviewed-on: https://gerrit.libreoffice.org/57949
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
Reviewed-on: https://gerrit.libreoffice.org/57990
Reviewed-by: Michael Stahl
(cherry picked from commit 545ddabc6614e751c807e9d1e1cbf7c617fc4141)
Reviewed-on: https://gerrit.libreoffice.org/58049
Reviewed-by: Eike Rathke
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/sw/source/uibase/uiview/viewstat.cxx
b/sw/source/uibase/uiview/viewstat.cxx
index 73661dca0b1b..04e344d0b10e 100644
--- a/sw/source/uibase/uiview/viewstat.cxx
+++ b/sw/source/uibase/uiview/viewstat.cxx
@@ -97,12 +97,18 @@ void SwView::GetState(SfxItemSet &rSet)
break;
case SID_INSERT_GRAPHIC:
-case SID_INSERT_SIGNATURELINE:
if( m_pWrtShell->CursorInsideInputField() )
{
rSet.DisableItem(nWhich);
}
break;
+case SID_INSERT_SIGNATURELINE:
+if( !( m_nSelectionType & SelectionType::Text ||
+m_nSelectionType & SelectionType::NumberList ) )
+{
+rSet.DisableItem(nWhich);
+}
+break;
case SID_EDIT_SIGNATURELINE:
case SID_SIGN_SIGNATURELINE:
if (!isSignatureLineSelected())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1-0' - cui/source
cui/source/dialogs/SignatureLineDialog.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 63543c44f2ce1af3b8a1cb350f9d03bc75a54f7d Author: Michael Stahl AuthorDate: Wed Jul 25 13:14:30 2018 +0200 Commit: Thorsten Behrens CommitDate: Fri Jul 27 08:22:51 2018 +0200 tdf#118777 cui: use right XText in SignatureLineDialog Writer has multiple nested XText and we have to call insertTextContent on the one that corresponds to the xCursor, so use the convenient getText() instead of hard-coding the body text. Change-Id: I86bce48e97730917aa8c4b093bb74c03e3f0dd36 Reviewed-on: https://gerrit.libreoffice.org/57969 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 7213a583f5c1d42c05dc4f19b4d4d2f9dded7733) Reviewed-on: https://gerrit.libreoffice.org/57978 Reviewed-by: Katarina Behrens (cherry picked from commit 8a4f07b367284e898898b1840fc22f357099aba9) Reviewed-on: https://gerrit.libreoffice.org/58050 Reviewed-by: Eike Rathke Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/cui/source/dialogs/SignatureLineDialog.cxx b/cui/source/dialogs/SignatureLineDialog.cxx index f2a5ec06d26e..60e8491cbff0 100644 --- a/cui/source/dialogs/SignatureLineDialog.cxx +++ b/cui/source/dialogs/SignatureLineDialog.cxx @@ -165,11 +165,13 @@ void SignatureLineDialog::Apply() // Insert into document const Reference xTextDocument(m_xModel, UNO_QUERY); -Reference xText = xTextDocument->getText(); Reference xTextContent(xShape, UNO_QUERY_THROW); Reference xViewCursorSupplier(m_xModel->getCurrentController(), UNO_QUERY_THROW); Reference xCursor = xViewCursorSupplier->getViewCursor(); +// use cursor's XText - it might be in table cell, frame, ... +Reference const xText(xCursor->getText()); +assert(xText.is()); xText->insertTextContent(xCursor, xTextContent, true); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svtools
include/svtools/imapobj.hxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 10eb292bcae870b022ae8995ecc724fe2d3bfb7c
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 13:53:39 2018 +0200
Commit: Stephan Bergmann
CommitDate: Fri Jul 27 08:22:42 2018 +0200
svtools: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by explicitly defaulting the copy/move functions (and, where needed in
turn,
also a default ctor) for classes that have a user-declared dtor that does
nothing other than an implicitly-defined one would do, but needs to be user-
declared because it is virtual and potentially serves as a key function to
emit the vtable, or is non-public, etc.
Change-Id: I206a63f4ed3468bb60505b630a42418ee14d8a0c
Reviewed-on: https://gerrit.libreoffice.org/58101
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/svtools/imapobj.hxx b/include/svtools/imapobj.hxx
index 9e396842ccf8..be3261abe5e0 100644
--- a/include/svtools/imapobj.hxx
+++ b/include/svtools/imapobj.hxx
@@ -86,6 +86,11 @@ public:
bool bActive );
virtual ~IMapObject() {};
+IMapObject(IMapObject const &) = default;
+IMapObject(IMapObject &&) = default;
+IMapObject & operator =(IMapObject const &) = default;
+IMapObject & operator =(IMapObject &&) = default;
+
virtual sal_uInt16 GetType() const = 0;
virtual boolIsHit( const Point& rPoint ) const = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/tools
include/tools/svborder.hxx |8
1 file changed, 8 deletions(-)
New commits:
commit 1163e60f779d1cc3ccb1e30dbcc19d01b03ffc04
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 13:52:09 2018 +0200
Commit: Stephan Bergmann
CommitDate: Fri Jul 27 08:22:07 2018 +0200
tools: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by removing explicitly user-provided functions that do the same as their
implicitly-defined counterparts, but may prevent implicitly declared copy
functions from being defined as non-deleted in the future
Change-Id: I59a845b97071d5de5e0e830304948ce39942e732
Reviewed-on: https://gerrit.libreoffice.org/58100
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/tools/svborder.hxx b/include/tools/svborder.hxx
index 9eef88819847..856efecfdbe7 100644
--- a/include/tools/svborder.hxx
+++ b/include/tools/svborder.hxx
@@ -46,14 +46,6 @@ public:
}
booloperator != ( const SvBorder & rObj ) const
{ return !(*this == rObj); }
-SvBorder & operator = ( const SvBorder & rBorder )
-{
-Left() = rBorder.Left();
-Top()= rBorder.Top();
-Right() = rBorder.Right();
-Bottom() = rBorder.Bottom();
-return *this;
-}
SvBorder & operator += ( const SvBorder & rBorder )
{
Left() += rBorder.Left();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lotuswordpro/inc lotuswordpro/source
lotuswordpro/inc/lwpatomholder.hxx |1 -
lotuswordpro/inc/xfilter/ixfstyle.hxx|6 ++
lotuswordpro/inc/xfilter/xfliststyle.hxx |5 +
lotuswordpro/inc/xfilter/xfstyle.hxx |5 +
lotuswordpro/inc/xfilter/xftextstyle.hxx |5 +
lotuswordpro/source/filter/lwpatomholder.cxx |2 --
lotuswordpro/source/filter/lwpnumericfmt.cxx |3 ---
lotuswordpro/source/filter/lwpnumericfmt.hxx |1 -
8 files changed, 21 insertions(+), 7 deletions(-)
New commits:
commit aa84f1458f422c1acf38b53a3e3138cd0e84e313
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 13:49:35 2018 +0200
Commit: Stephan Bergmann
CommitDate: Fri Jul 27 08:20:53 2018 +0200
lotuswordpro: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by explicitly defaulting the copy/move functions (and, where needed in
turn,
also a default ctor) for classes that have a user-declared dtor that does
nothing other than an implicitly-defined one would do, but needs to be user-
declared because it is virtual and potentially serves as a key function to
emit the vtable, or is non-public, etc.; and by removing explicitly user-
provided functions that do the same as their implicitly-defined
counterparts,
but may prevent implicitly declared copy functions from being defined as
non-
deleted in the future. (Even if such a user-provided function was declared
non-inline in an include file, the apparently-used implicitly-defined copy
functions are already include, so why bother with non-inline functions.)
Change-Id: I725d60235b72e4eec59809e2d09bfab9a2f7c416
Reviewed-on: https://gerrit.libreoffice.org/58097
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/lotuswordpro/inc/lwpatomholder.hxx
b/lotuswordpro/inc/lwpatomholder.hxx
index 3e373f7265b9..b038289a2d6b 100644
--- a/lotuswordpro/inc/lwpatomholder.hxx
+++ b/lotuswordpro/inc/lwpatomholder.hxx
@@ -66,7 +66,6 @@ class LwpAtomHolder
{
public:
LwpAtomHolder();
-~LwpAtomHolder();
private:
sal_Int32 m_nAtom;
sal_Int32 m_nAssocAtom;
diff --git a/lotuswordpro/inc/xfilter/ixfstyle.hxx
b/lotuswordpro/inc/xfilter/ixfstyle.hxx
index defbc45471eb..2f5fabaf4cb4 100644
--- a/lotuswordpro/inc/xfilter/ixfstyle.hxx
+++ b/lotuswordpro/inc/xfilter/ixfstyle.hxx
@@ -68,6 +68,12 @@
class IXFStyle
{
public:
+IXFStyle() = default;
+IXFStyle(IXFStyle const &) = default;
+IXFStyle(IXFStyle &&) = default;
+IXFStyle & operator =(IXFStyle const &) = default;
+IXFStyle & operator =(IXFStyle &&) = default;
+
virtual ~IXFStyle(){}
/**
* @descr: return the style name.
diff --git a/lotuswordpro/inc/xfilter/xfliststyle.hxx
b/lotuswordpro/inc/xfilter/xfliststyle.hxx
index 24838063ae38..f4abb93a5b10 100644
--- a/lotuswordpro/inc/xfilter/xfliststyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfliststyle.hxx
@@ -88,6 +88,11 @@ public:
virtual ~XFListLevel(){}
+XFListLevel(XFListLevel const &) = default;
+XFListLevel(XFListLevel &&) = default;
+XFListLevel & operator =(XFListLevel const &) = default;
+XFListLevel & operator =(XFListLevel &&) = default;
+
voidSetListlevelType(enumXFListLevel type);
voidSetLevel(sal_Int16 level);
diff --git a/lotuswordpro/inc/xfilter/xfstyle.hxx
b/lotuswordpro/inc/xfilter/xfstyle.hxx
index 1e82c92e9642..493f000c60a7 100644
--- a/lotuswordpro/inc/xfilter/xfstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfstyle.hxx
@@ -73,6 +73,11 @@ public:
virtual ~XFStyle() override;
+XFStyle(XFStyle const &) = default;
+XFStyle(XFStyle &&) = default;
+XFStyle & operator =(XFStyle const &) = default;
+XFStyle & operator =(XFStyle &&) = default;
+
public:
/**
* @descr get style name.
diff --git a/lotuswordpro/inc/xfilter/xftextstyle.hxx
b/lotuswordpro/inc/xfilter/xftextstyle.hxx
index 24653ebbcf94..6b7711e5066e 100644
--- a/lotuswordpro/inc/xfilter/xftextstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xftextstyle.hxx
@@ -78,6 +78,11 @@ public:
virtual ~XFTextStyle() override;
+XFTextStyle(XFTextStyle const &) = default;
+XFTextStyle(XFTextStyle &&) = default;
+XFTextStyle & operator =(XFTextStyle const &) = default;
+XFTextStyle & operator =(XFTextStyle &&) = default;
+
public:
/**
* @descr: set the font for the text span.
diff --git a/lotuswordpro/source/filter/lwpatomholder.cxx
b/lotuswordpro/source/filter/lwpatomholder.cxx
index a9a25173460c..582d8fee2780 100644
--- a/lotuswordpro/source/filter/lwpatomholder.cxx
+++ b/lotuswordpro/source/filter/lwpatomholder.cxx
@@ -62,8 +62,6 @@ LwpAtomHolder::LwpAtomHolder()
: m_nAtom(0), m_nAssocAtom(0)
{}
-LwpAtomHolder::~LwpAtomHolder()
-{}
/**
* @descr read atomholder from object stream
* the default encoding used in Word Pro is 1252
diff --git a/lotuswordpro/source/filter/lwpnumericfmt.cxx
b/lotuswordpro/source/filter/lwpnumericfmt.c
[Libreoffice-commits] core.git: include/tools
include/tools/b3dtrans.hxx | 15 +++ 1 file changed, 15 insertions(+) New commits: commit 31dac8fc291d220af240833d0aec8638da0c0c5a Author: Stephan Bergmann AuthorDate: Thu Jul 26 13:51:15 2018 +0200 Commit: Stephan Bergmann CommitDate: Fri Jul 27 08:21:23 2018 +0200 tools: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9) ...by explicitly defaulting the copy/move functions (and, where needed in turn, also a default ctor) for classes that have a user-declared dtor that does nothing other than an implicitly-defined one would do, but needs to be user- declared because it is virtual and potentially serves as a key function to emit the vtable, or is non-public, etc. Change-Id: I17480375f747915f95efdd65ac223077e6451782 Reviewed-on: https://gerrit.libreoffice.org/58099 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/include/tools/b3dtrans.hxx b/include/tools/b3dtrans.hxx index 964c9fb1abbc..cf35192e757b 100644 --- a/include/tools/b3dtrans.hxx +++ b/include/tools/b3dtrans.hxx @@ -84,6 +84,11 @@ public: B3dTransformationSet(); virtual ~B3dTransformationSet(); +B3dTransformationSet(B3dTransformationSet const &) = default; +B3dTransformationSet(B3dTransformationSet &&) = default; +B3dTransformationSet & operator =(B3dTransformationSet const &) = default; +B3dTransformationSet & operator =(B3dTransformationSet &&) = default; + void Reset(); /** Set the orientation @@ -163,6 +168,11 @@ public: B3dViewport(); virtual ~B3dViewport() override; +B3dViewport(B3dViewport const &) = default; +B3dViewport(B3dViewport &&) = default; +B3dViewport & operator =(B3dViewport const &) = default; +B3dViewport & operator =(B3dViewport &&) = default; + void SetVUV(const basegfx::B3DVector& rNewVUV); void SetViewportValues( const basegfx::B3DPoint& rNewVRP, @@ -188,6 +198,11 @@ public: double fFocLen = 35.0, double fBnkAng = 0.0); virtual ~B3dCamera() override; +B3dCamera(B3dCamera const &) = default; +B3dCamera(B3dCamera &&) = default; +B3dCamera & operator =(B3dCamera const &) = default; +B3dCamera & operator =(B3dCamera &&) = default; + private: void CalcNewViewportValues(); void CalcFocalLength(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/attrib.hxx | 15 +++
sc/inc/celltextattr.hxx|1 -
sc/inc/datamapper.hxx |2 --
sc/inc/defaultsoptions.hxx |5 +
sc/inc/docoptio.hxx|5 +
sc/inc/dpdimsave.hxx |3 ---
sc/inc/dpnumgroupinfo.hxx |1 -
sc/inc/formulaopt.hxx |5 +
sc/inc/postit.hxx |1 -
sc/inc/printopt.hxx|6 +-
sc/inc/queryparam.hxx |5 +
sc/inc/refhint.hxx | 15 +++
sc/inc/refupdatecontext.hxx|1 -
sc/inc/textuno.hxx | 15 +++
sc/inc/token.hxx | 15 +++
sc/inc/userdat.hxx |5 +
sc/inc/viewopti.hxx|6 +-
sc/source/core/data/celltextattr.cxx |4
sc/source/core/data/column.cxx |6 ++
sc/source/core/data/dpdimsave.cxx | 12
sc/source/core/data/dpnumgroupinfo.cxx |9 -
sc/source/core/data/postit.cxx |4
sc/source/core/data/refupdatecontext.cxx |4
sc/source/core/tool/printopt.cxx |4
sc/source/core/tool/viewopti.cxx | 16
sc/source/filter/inc/fapihelper.hxx|5 +
sc/source/filter/inc/formulabase.hxx | 10 ++
sc/source/filter/inc/workbookhelper.hxx|5 +
sc/source/filter/inc/xechart.hxx |5 +
sc/source/filter/inc/xerecord.hxx | 11 +++
sc/source/filter/inc/xichart.hxx | 17 +
sc/source/filter/inc/xlpivot.hxx |5 +
sc/source/filter/inc/xlstyle.hxx |5 +
sc/source/filter/xml/XMLExportIterator.cxx |4
sc/source/filter/xml/XMLExportIterator.hxx | 12 +++-
sc/source/ui/dataprovider/dataprovider.cxx |4
sc/source/ui/dbgui/asciiopt.cxx|4
sc/source/ui/inc/asciiopt.hxx |1 -
sc/source/ui/inc/condformatdlgitem.hxx |5 +
sc/source/ui/inc/viewdata.hxx |3 ---
sc/source/ui/view/viewdata.cxx |4
41 files changed, 180 insertions(+), 85 deletions(-)
New commits:
commit f1a10d4f14e86a2a2a632ff4a091690c2f31f255
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 13:47:59 2018 +0200
Commit: Stephan Bergmann
CommitDate: Fri Jul 27 08:20:20 2018 +0200
sc: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by explicitly defaulting the copy/move functions (and, where needed in
turn,
also a default ctor) for classes that have a user-declared dtor that does
nothing other than an implicitly-defined one would do, but needs to be user-
declared because it is virtual and potentially serves as a key function to
emit the vtable, or is non-public, etc.; and by removing explicitly user-
provided functions that do the same as their implicitly-defined
counterparts,
but may prevent implicitly declared copy functions from being defined as
non-
deleted in the future. (Even if such a user-provided function was declared
non-inline in an include file, the apparently-used implicitly-defined copy
functions are already include, so why bother with non-inline functions.)
Change-Id: I4efe3eb088e5f9096be87dd8240504768755112b
Reviewed-on: https://gerrit.libreoffice.org/58096
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index fadbad0639ac..b881a54a96d5 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -87,6 +87,11 @@ public:
ScMergeFlagAttr(ScMF nFlags);
virtual ~ScMergeFlagAttr() override;
+ScMergeFlagAttr(ScMergeFlagAttr const &) = default;
+ScMergeFlagAttr(ScMergeFlagAttr &&) = default;
+ScMergeFlagAttr & operator =(ScMergeFlagAttr const &) = default;
+ScMergeFlagAttr & operator =(ScMergeFlagAttr &&) = default;
+
SfxPoolItem * Clone(SfxItemPool * pPool = nullptr) const override;
ScMFGetValue() const { return
static_cast(SfxInt16Item::GetValue()); }
@@ -194,6 +199,11 @@ public:
ScViewObjectModeItem( sal_uInt16 nWhich, ScVObjMode eMode );
virtual ~ScViewObjectModeItem() override;
+ScViewObjectModeItem(ScViewObjectModeItem const &) = default;
+ScViewObjectModeItem(ScViewObjectModeItem &&) = default;
+ScViewObjectModeItem & operator =(ScViewObjectModeItem const &) = default;
+ScViewObjectModeItem & operator =(ScViewObjectModeItem &&) = default;
+
virtual sal_uInt16 GetValueCount() const override;
virtual SfxPoolItem*Clone( SfxItemPool *pPool = nullptr ) const
override;
virtual sal_uInt16
[Libreoffice-commits] core.git: include/unotools unotools/source
include/unotools/collatorwrapper.hxx |2 --
include/unotools/compatibility.hxx |1 -
include/unotools/configitem.hxx |5 +
include/unotools/confignode.hxx |4
unotools/source/config/compatibility.cxx |4
unotools/source/i18n/collatorwrapper.cxx |4
6 files changed, 5 insertions(+), 15 deletions(-)
New commits:
commit 7f0bdd5e88ed49eebe3c0c8edabecffdddeaff4f
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 13:46:27 2018 +0200
Commit: Stephan Bergmann
CommitDate: Fri Jul 27 08:19:50 2018 +0200
unotools: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by explicitly defaulting the copy/move functions (and, where needed in
turn,
also a default ctor) for classes that have a user-declared dtor that does
nothing other than an implicitly-defined one would do, but needs to be user-
declared because it is virtual and potentially serves as a key function to
emit the vtable, or is non-public, etc.; and by removing explicitly user-
provided functions that do the same as their implicitly-defined
counterparts,
but may prevent implicitly declared copy functions from being defined as
non-
deleted in the future. (Even if such a user-provided function was declared
non-inline in an include file, the apparently-used implicitly-defined copy
functions are already include, so why bother with non-inline functions.)
Change-Id: Iaa08ef916a2d266e011a2cb66592b377cb1eb23c
Reviewed-on: https://gerrit.libreoffice.org/58095
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/unotools/collatorwrapper.hxx
b/include/unotools/collatorwrapper.hxx
index 823ba03aada0..77a22d63682a 100644
--- a/include/unotools/collatorwrapper.hxx
+++ b/include/unotools/collatorwrapper.hxx
@@ -37,8 +37,6 @@ class UNOTOOLS_DLLPUBLIC CollatorWrapper
CollatorWrapper (
const css::uno::Reference< css::uno::XComponentContext >
&rxContext);
-~CollatorWrapper();
-
sal_Int32
compareString (
const OUString& s1, const OUString& s2) const;
diff --git a/include/unotools/compatibility.hxx
b/include/unotools/compatibility.hxx
index b48d453fb3fc..cc79b28da922 100644
--- a/include/unotools/compatibility.hxx
+++ b/include/unotools/compatibility.hxx
@@ -67,7 +67,6 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityEntry
};
SvtCompatibilityEntry();
-~SvtCompatibilityEntry();
static OUString getName( const Index rIdx );
diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx
index 5a842a1193be..302fa0bdde5b 100644
--- a/include/unotools/configitem.hxx
+++ b/include/unotools/configitem.hxx
@@ -165,6 +165,11 @@ namespace utl
public:
virtual ~ConfigItem() override;
+ConfigItem(ConfigItem const &) = default;
+ConfigItem(ConfigItem &&) = default;
+ConfigItem & operator =(ConfigItem const &) = default;
+ConfigItem & operator =(ConfigItem &&) = default;
+
/** is called from the ConfigManager before application ends of
from the
PropertyChangeListener if the sub tree broadcasts changes. */
virtual voidNotify( const
css::uno::Sequence& aPropertyNames)=0;
diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx
index 09c9bb266308..5bf4a1473da3 100644
--- a/include/unotools/confignode.hxx
+++ b/include/unotools/confignode.hxx
@@ -221,10 +221,6 @@ namespace utl
const bool i_bUpdatable
);
-/// copy ctor
-OConfigurationTreeRoot(const OConfigurationTreeRoot& _rSource)
-:OConfigurationNode(_rSource), m_xCommitter(_rSource.m_xCommitter)
{ }
-
/** open a new top-level configuration node
opens a new node which is the root if an own configuration sub
tree. This is what "top level" means: The
diff --git a/unotools/source/config/compatibility.cxx
b/unotools/source/config/compatibility.cxx
index de876fd30fec..b552dc7de5bd 100644
--- a/unotools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.cxx
@@ -67,10 +67,6 @@ SvtCompatibilityEntry::SvtCompatibilityEntry()
setDefaultEntry( false );
}
-SvtCompatibilityEntry::~SvtCompatibilityEntry()
-{
-}
-
OUString SvtCompatibilityEntry::getName( const Index rIdx )
{
static const char* sPropertyName[] =
diff --git a/unotools/source/i18n/collatorwrapper.cxx
b/unotools/source/i18n/collatorwrapper.cxx
index 0b962264370c..4da1398e0636 100644
--- a/unotools/source/i18n/collatorwrapper.cxx
+++ b/unotools/source/i18n/collatorwrapper.cxx
@@ -30,10 +30,6 @@ CollatorWrapper::CollatorWrapper ( const uno::Reference<
uno::XComponentContext
mxInternationalCollator = i18n::Collator::create( rxContext );
}
-CollatorWrapper::~CollatorWrapper()
-{
-}
-
sal_Int32
CollatorWrapper::compareString (c
[Libreoffice-commits] core.git: helpcompiler/inc
helpcompiler/inc/HelpCompiler.hxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 4084f9332956b93f009bb1ab50e1708ce90312ff
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 11:28:22 2018 +0200
Commit: Stephan Bergmann
CommitDate: Fri Jul 27 08:19:01 2018 +0200
helpcompiler: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by removing explicitly user-provided functions that do the same as their
implicitly-defined counterparts, but may prevent implicitly declared copy
functions from being defined as non-deleted in the future
Change-Id: I61182be57a0ed9071e3559a6445aee98ec5c19bf
Reviewed-on: https://gerrit.libreoffice.org/58057
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/helpcompiler/inc/HelpCompiler.hxx
b/helpcompiler/inc/HelpCompiler.hxx
index 518830ad62b3..dbc76764e35b 100644
--- a/helpcompiler/inc/HelpCompiler.hxx
+++ b/helpcompiler/inc/HelpCompiler.hxx
@@ -65,7 +65,6 @@ namespace fs
OUString data;
public:
path() {}
-path(const path &rOther) : data(rOther.data) {}
path(const std::string &in, convert)
{
OUString sWorkingDir;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source include/connectivity
connectivity/source/commontools/dbcharset.cxx | 13 -
connectivity/source/commontools/dbexception.cxx |8
connectivity/source/parse/sqlnode.cxx |5 -
include/connectivity/dbcharset.hxx |3 ---
include/connectivity/dbexception.hxx|2 --
include/connectivity/sqlnode.hxx|1 -
6 files changed, 32 deletions(-)
New commits:
commit 322acaa9ad58f4dc9a7025eacedd748dd2c1a1a1
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 12:05:45 2018 +0200
Commit: Stephan Bergmann
CommitDate: Fri Jul 27 08:19:22 2018 +0200
connectivity: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by removing explicitly user-provided functions that do the same as their
implicitly-defined counterparts, but may prevent implicitly declared copy
functions from being defined as non-deleted in the future. (Even if such a
user-provided function was declared non-inline in an include file, the
apparently-used implicitly-defined copy functions are already inline, so why
bother with non-inline functions.)
Change-Id: Idb59d19dcf5e0873780959797daeb438cbb38ae7
Reviewed-on: https://gerrit.libreoffice.org/58072
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/connectivity/source/commontools/dbcharset.cxx
b/connectivity/source/commontools/dbcharset.cxx
index 9fc7923dbc70..ebe45c028207 100644
--- a/connectivity/source/commontools/dbcharset.cxx
+++ b/connectivity/source/commontools/dbcharset.cxx
@@ -142,19 +142,6 @@ namespace dbtools
OSL_ENSURE( m_pContainer,
"OCharsetMap::CharsetIterator::CharsetIterator : invalid container!" );
}
-
-OCharsetMap::CharsetIterator::CharsetIterator(const CharsetIterator&
_rSource)
-:m_pContainer( _rSource.m_pContainer )
-,m_aPos( _rSource.m_aPos )
-{
-}
-
-
-OCharsetMap::CharsetIterator::~CharsetIterator()
-{
-}
-
-
CharsetIteratorDerefHelper OCharsetMap::CharsetIterator::operator*() const
{
OSL_ENSURE( m_aPos != m_pContainer->m_aEncodings.end(),
"OCharsetMap::CharsetIterator::operator*: invalid position!");
diff --git a/connectivity/source/commontools/dbexception.cxx
b/connectivity/source/commontools/dbexception.cxx
index 961720f4bc59..718bbdf4d674 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -72,14 +72,6 @@ SQLExceptionInfo::SQLExceptionInfo( const OUString&
_rSimpleErrorMessage )
implDetermineType();
}
-
-SQLExceptionInfo::SQLExceptionInfo(const SQLExceptionInfo& _rCopySource)
-:m_aContent(_rCopySource.m_aContent)
-,m_eType(_rCopySource.m_eType)
-{
-}
-
-
SQLExceptionInfo& SQLExceptionInfo::operator=(const css::sdbc::SQLException&
_rError)
{
m_aContent <<= _rError;
diff --git a/connectivity/source/parse/sqlnode.cxx
b/connectivity/source/parse/sqlnode.cxx
index 5b0007f24011..ada5d32d4275 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -209,11 +209,6 @@ SQLParseNodeParameter::SQLParseNodeParameter( const
Reference< XConnection >& _r
{
}
-
-SQLParseNodeParameter::~SQLParseNodeParameter()
-{
-}
-
OUString OSQLParseNode::convertDateString(const SQLParseNodeParameter& rParam,
const OUString& rString)
{
Date aDate = DBTypeConversion::toDate(rString);
diff --git a/include/connectivity/dbcharset.hxx
b/include/connectivity/dbcharset.hxx
index 0830c1d00862..a4a4abe43a33 100644
--- a/include/connectivity/dbcharset.hxx
+++ b/include/connectivity/dbcharset.hxx
@@ -127,9 +127,6 @@ namespace dbtools
OCharsetMap::TextEncBag::const_iterator m_aPos;
public:
-CharsetIterator(const CharsetIterator& _rSource);
-~CharsetIterator();
-
CharsetIteratorDerefHelper operator*() const;
// no -> operator
// this would require us to a) store CharsetIteratorDerefHelper
instances ourself so that we
diff --git a/include/connectivity/dbexception.hxx
b/include/connectivity/dbexception.hxx
index e273cf8cb14c..e016e7f7e1b5 100644
--- a/include/connectivity/dbexception.hxx
+++ b/include/connectivity/dbexception.hxx
@@ -82,8 +82,6 @@ public:
*/
SQLExceptionInfo( const OUString& _rSimpleErrorMessage );
-SQLExceptionInfo(const SQLExceptionInfo& _rCopySource);
-
// use for events got via XSQLErrorListener::errorOccured
SQLExceptionInfo(const css::uno::Any& _rError);
// use with the Reason member of an SQLErrorEvent or with
NextElement of an SQLException
diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx
index e2198499baed..1b5ef59392c3 100644
--- a/include/connectivity/sqlnode.hxx
+++ b/include/connectivity/sqlnode.hxx
@@ -103,7 +103,6 @@ namespace connectivity
bool _bPredicate,
bool _bParseToSDBC
);
-~SQLParseNodeParameter();
};
//= OSQLParseNode
_
[Libreoffice-commits] core.git: stoc/source
stoc/source/security/permissions.h |3 ---
1 file changed, 3 deletions(-)
New commits:
commit db481dff62bd8f744083c91b12289ff92a166ff1
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 11:25:36 2018 +0200
Commit: Stephan Bergmann
CommitDate: Fri Jul 27 08:15:28 2018 +0200
stoc: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by removing explicitly user-provided functions that do the same as their
implicitly-defined counterparts, but may prevent implicitly declared copy
functions from being defined as non-deleted in the future
Change-Id: Iacfdd89ca6ca3af19a56cd26721e1ce2d47c49fa
Reviewed-on: https://gerrit.libreoffice.org/58055
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/stoc/source/security/permissions.h
b/stoc/source/security/permissions.h
index 6e9fe7937932..7e25d440b696 100644
--- a/stoc/source/security/permissions.h
+++ b/stoc/source/security/permissions.h
@@ -67,9 +67,6 @@ class PermissionCollection
public:
PermissionCollection()
{}
-PermissionCollection( PermissionCollection const & collection )
-: m_head( collection.m_head )
-{}
explicit PermissionCollection( ::rtl::Reference< Permission > const &
single )
: m_head( single )
{}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source
basic/source/basmgr/basmgr.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9ea6c0e6777c5b367ec507f10858c9c4be5960ed
Author: Markus Mohrhard
AuthorDate: Thu Jul 26 00:19:06 2018 +0200
Commit: Markus Mohrhard
CommitDate: Fri Jul 27 08:01:27 2018 +0200
tdf#109132, load VBA library by default during ODF import
Without loading the VBA library any of the functions inside of the
library will not be available for spreadsheet functions.
Change-Id: I7d0b931ef4817e5870635f43f4b4ae4399780bc4
Reviewed-on: https://gerrit.libreoffice.org/58149
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 77b2b5fe2235..1a4948ab9081 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -561,7 +561,7 @@ void BasicManager::SetLibraryContainerInfo( const
LibraryContainerInfo& rInfo )
{
uno::Any aLibAny = xScriptCont->getByName( *pScriptLibName );
-if ( *pScriptLibName == "Standard" )
+if ( *pScriptLibName == "Standard" || *pScriptLibName ==
"VBAProject")
xScriptCont->loadLibrary( *pScriptLibName );
BasMgrContainerListenerImpl::insertLibraryImpl
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/basic sc/source
include/basic/sbstar.hxx |3 ++-
sc/source/core/tool/interpr4.cxx |5 +
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 76bf3939b0583212a56c317c85aea110f8ac6fee
Author: Markus Mohrhard
AuthorDate: Thu Jul 26 00:17:41 2018 +0200
Commit: Markus Mohrhard
CommitDate: Fri Jul 27 08:01:03 2018 +0200
related tdf#109132, ugly hack to ensure the VBA mode is setup during import
Change-Id: Ia48e4b19eb690ba7ab24a37538f6de11a74ad4d3
Reviewed-on: https://gerrit.libreoffice.org/58148
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx
index 86b0d8e7a0c6..884974597388 100644
--- a/include/basic/sbstar.hxx
+++ b/include/basic/sbstar.hxx
@@ -62,7 +62,6 @@ class BASIC_DLLPUBLIC StarBASIC : public SbxObject
boolbQuit;
SbxObjectRef pVBAGlobals;
-BASIC_DLLPRIVATE SbxObject* getVBAGlobals( );
BASIC_DLLPRIVATE void implClearDependingVarsOnDelete( StarBASIC*
pDeletedBasic );
@@ -155,6 +154,8 @@ public:
void QuitAndExitApplication();
bool IsQuitApplication() { return bQuit; };
+SbxObject* getVBAGlobals( );
+
static css::uno::Reference< css::frame::XModel >
GetModelFromBasic( SbxObject* pBasic );
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 4d836828eeba..fe02c2fe765d 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -3215,6 +3215,11 @@ void ScInterpreter::ScMacro()
OSL_ENSURE(dynamic_cast(pObject) != nullptr, "No Basic
found!");
OUString aMacroStr = pObject->GetName() + "." + pModule->GetName() + "." +
pMethod->GetName();
OUString aBasicStr;
+if (pRoot && bUseVBAObjects)
+{
+// just here to make sure the VBA objects when we run the macro during
ODF import
+pRoot->getVBAGlobals();
+}
if (pObject->GetParent())
{
aBasicStr = pObject->GetParent()->GetName();// document BASIC
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - RepositoryFixes.mk solenv/bin solenv/gbuild
RepositoryFixes.mk |1 +
solenv/bin/macosx-create-bundle |2 +-
solenv/gbuild/platform/macosx.mk |9 +
3 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit ade5a721b1be8c114670b08b261deca37ea27e6a
Author: Jim Jagielski
AuthorDate: Thu Jul 26 23:26:13 2018 +
Commit: Jim Jagielski
CommitDate: Thu Jul 26 23:26:13 2018 +
Let's re-arrange the logic... when we create the shared lib, create
as before, w/o knowledge of UDK, but take care of UDK versioning
following that.
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index dd85ed5334df..dcdb0538313e 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -73,6 +73,7 @@ gb_Library_FILENAMES := $(patsubst
salhelper:libsalhelper%,salhelper:libuno_salh
gb_Library_FILENAMES := $(patsubst
spell:spell.uno%,spell:libspell.uno%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
store:libuno_store%,store:libstore%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
sunjavaplugin:libsunjavaplugin%,sunjavaplugin:sunjavaplugin%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst
jurt:libjpipe.dylib%,jurt:libjpipe.jnilib%,$(gb_Library_FILENAMES))
ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.4) # default to use libc++
gb_Library_FILENAMES := $(patsubst
stl:%,stl:libc++.dylib,$(gb_Library_FILENAMES))
diff --git a/solenv/bin/macosx-create-bundle b/solenv/bin/macosx-create-bundle
index 7800e03be696..bc61bdb69dfa 100755
--- a/solenv/bin/macosx-create-bundle
+++ b/solenv/bin/macosx-create-bundle
@@ -88,7 +88,7 @@ while [ $# != 0 ]; do
rm -Rf "$outputdir/$inputjnilibname"
fi
# Link jnilib
- ln -sf "$inputfilename" "$outputdir/$inputjnilibname"
+ ln -shf "$inputfilename" "$outputdir/$inputjnilibname"
#printf "macosx-create-bundle:
$outputdir/$inputjnilibname successfully created\n"
fi
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index ef93f28b..de50050fce45 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -294,19 +294,20 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
$(foreach lib,$(LINKED_STATIC_LIBS),$(call
gb_StaticLibrary_get_target,$(lib))) \
$(LIBS) \
- -o $(if $(call
gb_Library_is_udk_versioned,$(1)),$(1).$(gb_UDK_MAJOR),$(1)) \
+ -o $(1) \
`cat $${DYLIB_FILE}` && \
$(if $(filter Library,$(TARGETTYPE)),\
$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library
$(LAYER) $(1) && \
- ln -shf $(if $(call
gb_Library_is_udk_versioned,$(1)),$(1).$(gb_UDK_MAJOR),$(1)) \
- $(patsubst %.dylib,%.jnilib,$(1)) &&) \
+ ln -f $(1) $(patsubst %.dylib,%.jnilib,$(1)) &&) \
rm -f $${DYLIB_FILE})
endef
define gb_LinkTarget__command_symlink_udk_versioned_library
$(if $(call gb_Library_is_udk_versioned,$(1)),
$(call gb_Helper_abbreviate_dirs,\
- rm -f $(1) && ln -s $(notdir $(1)).$(gb_UDK_MAJOR)
$(1)))
+ rm -f $(1).$(gb_UDK_MAJOR) && \
+ mv $(1) $(1).$(gb_UDK_MAJOR) && \
+ ln -shf $(1).$(gb_UDK_MAJOR) $(1)))
endef
# parameters: 1-linktarget 2-cobjects 3-cxxobjects
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5a7d18e432571fb1e9b2cd54d6168353d25c6f19 Author: Olivier Hallot AuthorDate: Thu Jul 26 17:14:17 2018 -0300 Commit: Gerrit Code Review CommitDate: Thu Jul 26 22:18:14 2018 +0200 Update git submodules * Update helpcontent2 from branch 'master' - tdf#115254 Some branch bookmarks are'nt working 11 module sw m- n- Change-Id: I556041e33ce908d02e510676039370cdf79bc096 Reviewed-on: https://gerrit.libreoffice.org/58147 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 8426408b9647..5b63a42edbba 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 8426408b9647babdcc53ca4eef9762e50b3cd407 +Subproject commit 5b63a42edbba2999ccb50f5f58268050e25e22a9 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/optionen/mailmerge.xhp|3 ++- source/text/swriter/01/0115.xhp |1 + source/text/swriter/01/0211.xhp |3 ++- source/text/swriter/01/04120100.xhp |1 + source/text/swriter/01/05030800.xhp |1 + source/text/swriter/01/0520.xhp |3 ++- source/text/swriter/01/0606.xhp |1 + source/text/swriter/01/mailmerge01.xhp |3 ++- source/text/swriter/01/mailmerge02.xhp |1 + source/text/swriter/01/mailmerge03.xhp |3 ++- source/text/swriter/01/mailmerge04.xhp |3 ++- source/text/swriter/01/mailmerge05.xhp |3 ++- source/text/swriter/01/mm_emabod.xhp |3 ++- source/text/swriter/01/mm_emailmergeddoc.xhp |1 + source/text/swriter/01/mm_printmergeddoc.xhp |1 + source/text/swriter/01/mm_savemergeddoc.xhp |1 + 16 files changed, 24 insertions(+), 8 deletions(-) New commits: commit 5b63a42edbba2999ccb50f5f58268050e25e22a9 Author: Olivier Hallot AuthorDate: Thu Jul 26 17:14:17 2018 -0300 Commit: Olivier Hallot CommitDate: Thu Jul 26 22:18:14 2018 +0200 tdf#115254 Some branch bookmarks are'nt working 11 module sw m- n- Change-Id: I556041e33ce908d02e510676039370cdf79bc096 Reviewed-on: https://gerrit.libreoffice.org/58147 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/optionen/mailmerge.xhp b/source/text/shared/optionen/mailmerge.xhp index 5999a6bf4..e51a1e278 100644 --- a/source/text/shared/optionen/mailmerge.xhp +++ b/source/text/shared/optionen/mailmerge.xhp @@ -18,7 +18,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + @@ -32,6 +32,7 @@ + Mail Merge E-mail Specifies the user information and server settings for when you send form letters as e-mail messages. diff --git a/source/text/swriter/01/0115.xhp b/source/text/swriter/01/0115.xhp index a2d3c2384..f6cab9edd 100644 --- a/source/text/swriter/01/0115.xhp +++ b/source/text/swriter/01/0115.xhp @@ -30,6 +30,7 @@ + Mail Merge The Mail Merge dialog helps you in printing and saving form letters. diff --git a/source/text/swriter/01/0211.xhp b/source/text/swriter/01/0211.xhp index f0856ffc6..3369099f1 100644 --- a/source/text/swriter/01/0211.xhp +++ b/source/text/swriter/01/0211.xhp @@ -31,6 +31,7 @@ + Navigator Shows or hides the Navigator window, where you can quickly jump to different parts of your document. Navigator is also available as a deck of the Sidebar. You can also use the Navigator to insert elements from the current document or other open documents, and to organize master documents. To edit an item in the Navigator, right-click the item, and then choose a command from the context menu. If you want, you can dock the Navigator at the edge of your workspace. @@ -113,7 +114,7 @@ Page number Type the number of the page number that you want to jump to, and then press Enter. -To quickly move the cursor to another page while you are in a document, press Shift+Command +To quickly move the cursor to another page while you are in a document, press Shift+Command Ctrl+F5, type the number of the page that you want to jump to, and then wait a few moments. diff --git a/source/text/swriter/01/04120100.xhp b/source/text/swriter/01/04120100.xhp index a5e6f4b76..64a97a249 100644 --- a/source/text/swriter/01/04120100.xhp +++ b/source/text/swriter/01/04120100.xhp @@ -32,6 +32,7 @@ + Insert Index Entry Marks the selected text as index or table of contents entry. diff --git a/source/text/swriter/01/05030800.xhp b/source/text/swriter/01/05030800.xhp index a05b8005e..187244253 100644 --- a/source/text/swriter/01/05030800.xhp +++ b/source/text/swriter/01/05030800.xhp @@ -29,6 +29,7 @@ + Outline & Numbering Adds or removes outline level, numbering, or bullets from the paragraph. You can also select the style of numbering to use, and reset the numbering in a numbered list. diff --git a/source/text/swriter/01/0520.xhp b/source/text/swriter/01/0520.xhp index 94c11c825..e3e449044 100644 --- a/source/text/swriter/01/0520.xhp +++ b/source/text/swriter/01/0520.xhp @@ -18,7 +18,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + @@ -36,6 +36,7 @@ + Merge Table Combines two consecutive tables into a single table. The tables must be directly next to each other and not separated by an empty paragraph. diff --git a/source/text/swriter/01/0606.xhp b/source/text/swriter/01/0606.xhp index 015015f38..1871f47e9 100644 --- a/source/text/swriter/01/0606.xhp +++ b/source/text/swriter/01/0606.xhp @@ -29,6 +29,7 @@ + Chapter Numbe
[Libreoffice-commits] core.git: cppu/source pyuno/source vcl/unx
cppu/source/typelib/typelib.cxx |7 +++
pyuno/source/module/pyuno_dlopenwrapper.c |1 +
vcl/unx/generic/plugadapt/salplug.cxx |3 ++-
3 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 1d457f960b3bb8efe8132b87babba7db4b58813e
Author: Caolán McNamara
AuthorDate: Thu Jul 26 11:23:13 2018 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 26 22:04:32 2018 +0200
Related: rhbz#1602589 silence coverity leaked_storage
Change-Id: Iae694be40b32cc3821d326bb362e6091dba19a35
Reviewed-on: https://gerrit.libreoffice.org/58079
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index c586ae2220ea..46238d5481b0 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -555,6 +555,7 @@ extern "C" void typelib_typedescription_newEmpty(
osl_atomic_increment( &Init::get().nIndirectTypeDescriptionCount );
#endif
pTmp->pType = nullptr;
+// coverity[leaked_storage] - this is on purpose
}
break;
@@ -572,6 +573,7 @@ extern "C" void typelib_typedescription_newEmpty(
pTmp->aBase.ppTypeRefs = nullptr;
pTmp->aBase.ppMemberNames = nullptr;
pTmp->pParameterizedTypes = nullptr;
+// coverity[leaked_storage] - this is on purpose
}
break;
@@ -588,6 +590,7 @@ extern "C" void typelib_typedescription_newEmpty(
pTmp->pMemberOffsets = nullptr;
pTmp->ppTypeRefs = nullptr;
pTmp->ppMemberNames = nullptr;
+// coverity[leaked_storage] - this is on purpose
}
break;
@@ -602,6 +605,7 @@ extern "C" void typelib_typedescription_newEmpty(
pTmp->nEnumValues = 0;
pTmp->ppEnumNames = nullptr;
pTmp->pEnumValues = nullptr;
+// coverity[leaked_storage] - this is on purpose
}
break;
@@ -623,6 +627,7 @@ extern "C" void typelib_typedescription_newEmpty(
pTmp->pMapMemberIndexToFunctionIndex= nullptr;
pTmp->nBaseTypes = 0;
pTmp->ppBaseTypes = nullptr;
+// coverity[leaked_storage] - this is on purpose
}
break;
@@ -643,6 +648,7 @@ extern "C" void typelib_typedescription_newEmpty(
pTmp->pInterface = nullptr;
pTmp->pBaseRef = nullptr;
pTmp->nIndex = 0;
+// coverity[leaked_storage] - this is on purpose
}
break;
@@ -663,6 +669,7 @@ extern "C" void typelib_typedescription_newEmpty(
pTmp->ppGetExceptions = nullptr;
pTmp->nSetExceptions = 0;
pTmp->ppSetExceptions = nullptr;
+// coverity[leaked_storage] - this is on purpose
}
break;
diff --git a/pyuno/source/module/pyuno_dlopenwrapper.c
b/pyuno/source/module/pyuno_dlopenwrapper.c
index 5654cb0f8f0a..44e711653e35 100644
--- a/pyuno/source/module/pyuno_dlopenwrapper.c
+++ b/pyuno/source/module/pyuno_dlopenwrapper.c
@@ -72,6 +72,7 @@ static void * load(void const * address, char const * symbol)
{
dlclose(h);
abort();
}
+// coverity[leaked_storage] - this is on purpose
return func;
}
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx
b/vcl/unx/generic/plugadapt/salplug.cxx
index 41039c0584f8..d3939b986b41 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -123,6 +123,7 @@ static SalInstance* tryInstance( const OUString&
rModuleBase, bool bForce = fals
SAL_INFO("vcl.plugadapt", "could not load shared object " << aModule);
}
+// coverity[leaked_storage] - this is on purpose
return pInst;
}
@@ -317,4 +318,4 @@ SalData::~SalData() COVERITY_NOEXCEPT_FALSE
psp::PrinterInfoManager::release();
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: registry/source
registry/source/regimpl.cxx | 110 +++-
1 file changed, 39 insertions(+), 71 deletions(-)
New commits:
commit 1d023f5bba0bd29a94bb252009e5e217849239f8
Author: Caolán McNamara
AuthorDate: Thu Jul 26 11:45:02 2018 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 26 22:04:03 2018 +0200
Related: rhbz#1602589 double_free, convert to std::vector
Change-Id: I5fa19422d7ee61e7aad74eae86d843072e94016c
Reviewed-on: https://gerrit.libreoffice.org/58087
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index 0bb4b2126ffa..79279b1f3f90 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -21,6 +21,7 @@
#include "regimpl.hxx"
#include
+#include
#include
#include
@@ -903,7 +904,6 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey,
bool bReport)
{
OStoreStreamrValue;
-sal_uInt8* pBuffer;
RegValueTypevalueType;
sal_uInt32 valueSize;
sal_uInt32 nSize;
@@ -937,37 +937,32 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey,
return RegError::VALUE_NOT_EXISTS;
}
-pBuffer = static_cast(rtl_allocateMemory(VALUE_HEADERSIZE));
+std::vector aBuffer(VALUE_HEADERSIZE);
sal_uInt32 rwBytes;
-if (rValue.readAt(0, pBuffer, VALUE_HEADERSIZE, rwBytes))
+if (rValue.readAt(0, aBuffer.data(), VALUE_HEADERSIZE, rwBytes))
{
-rtl_freeMemory(pBuffer);
return RegError::INVALID_VALUE;
}
if (rwBytes != VALUE_HEADERSIZE)
{
-rtl_freeMemory(pBuffer);
return RegError::INVALID_VALUE;
}
RegError _ret = RegError::NO_ERROR;
-sal_uInt8 type = *pBuffer;
+sal_uInt8 type = aBuffer[0];
valueType = static_cast(type);
-readUINT32(pBuffer+VALUE_TYPEOFFSET, valueSize);
-rtl_freeMemory(pBuffer);
+readUINT32(aBuffer.data() + VALUE_TYPEOFFSET, valueSize);
nSize = VALUE_HEADERSIZE + valueSize;
-pBuffer = static_cast(rtl_allocateMemory(nSize));
+aBuffer.resize(nSize);
-if (rValue.readAt(0, pBuffer, nSize, rwBytes))
+if (rValue.readAt(0, aBuffer.data(), nSize, rwBytes))
{
-rtl_freeMemory(pBuffer);
return RegError::INVALID_VALUE;
}
if (rwBytes != nSize)
{
-rtl_freeMemory(pBuffer);
return RegError::INVALID_VALUE;
}
@@ -978,19 +973,17 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey,
if (valueType == RegValueType::BINARY)
{
_ret = checkBlop(
-rValue, sTargetPath, valueSize, pBuffer+VALUE_HEADEROFFSET,
+rValue, sTargetPath, valueSize, aBuffer.data() +
VALUE_HEADEROFFSET,
bReport);
if (_ret != RegError::NO_ERROR)
{
if (_ret == RegError::MERGE_ERROR ||
(_ret == RegError::MERGE_CONFLICT && bWarnings))
{
-rtl_freeMemory(pBuffer);
return _ret;
}
} else
{
-rtl_freeMemory(pBuffer);
return _ret;
}
}
@@ -998,23 +991,19 @@ RegError ORegistry::loadAndSaveValue(ORegKey* pTargetKey,
if (rValue.create(rTargetFile, sTargetPath, valueName,
storeAccessMode::Create))
{
-rtl_freeMemory(pBuffer);
return RegError::INVALID_VALUE;
}
-if (rValue.writeAt(0, pBuffer, nSize, rwBytes))
+if (rValue.writeAt(0, aBuffer.data(), nSize, rwBytes))
{
-rtl_freeMemory(pBuffer);
return RegError::INVALID_VALUE;
}
if (rwBytes != nSize)
{
-rtl_freeMemory(pBuffer);
return RegError::INVALID_VALUE;
}
pTargetKey->setModified();
-rtl_freeMemory(pBuffer);
return _ret;
}
@@ -1031,33 +1020,30 @@ RegError ORegistry::checkBlop(OStoreStream& rValue,
return RegError::INVALID_VALUE;
}
-sal_uInt8* pBuffer =
static_cast(rtl_allocateMemory(VALUE_HEADERSIZE));
+std::vector aBuffer(VALUE_HEADERSIZE);
RegValueTypevalueType;
sal_uInt32 valueSize;
sal_uInt32 rwBytes;
OString targetPath(OUStringToOString(sTargetPath,
RTL_TEXTENCODING_UTF8));
-if (!rValue.readAt(0, pBuffer, VALUE_HEADERSIZE, rwBytes) &&
+if (!rValue.readAt(0, aBuffer.data(), VALUE_HEADERSIZE, rwBytes) &&
(rwBytes == VALUE_HEADERSIZE))
{
-sal_uInt8 type = *pBuffer;
+sal_uInt8 type = aBuffer[0];
valueType = static_cast(type);
-readUINT32(pBuffer+VALUE_TYPEOFFSET, valueSize);
-rtl_freeMemory(pBuffer);
+readUINT32(aBuffer.data() + VALUE_TYPEOFFSET, valueSize);
if (valueType == RegValueType::BINARY)
{
-pBuffer = static_cast(rtl_allocateMemory(va
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/chgtrack.cxx | 20 +++-
1 file changed, 15 insertions(+), 5 deletions(-)
New commits:
commit 81411dc7c6481db6a90f3841df15c977f8c21205
Author: Caolán McNamara
AuthorDate: Thu Jul 26 11:58:36 2018 +0100
Commit: Caolán McNamara
CommitDate: Thu Jul 26 22:03:44 2018 +0200
Related: rhbz#1602589 silence coverity use_after_free
Change-Id: If5345b6515c45bee2742d1293cd181ab46e8e61b
Reviewed-on: https://gerrit.libreoffice.org/58088
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 35c1d72dbe64..8b73880e718e 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -341,8 +341,11 @@ bool ScChangeAction::IsDeletedIn( const ScChangeAction* p
) const
void ScChangeAction::RemoveAllDeletedIn()
{
//TODO: Not from TopContent, but really this one
-while ( pLinkDeletedIn )
-delete pLinkDeletedIn; // Moves up by itself
+while (pLinkDeletedIn)
+{
+// coverity[use_after_free] - Moves up by itself
+delete pLinkDeletedIn;
+}
}
bool ScChangeAction::IsDeletedInDelType( ScChangeActionType eDelType ) const
@@ -401,8 +404,11 @@ void ScChangeAction::SetDeletedIn( ScChangeAction* p )
void ScChangeAction::RemoveAllDependent()
{
-while ( pLinkDependent )
-delete pLinkDependent; // Moves up by itself
+while (pLinkDependent)
+{
+// coverity[use_after_free] - Moves up by itself
+delete pLinkDependent;
+}
}
DateTime ScChangeAction::GetDateTime() const
@@ -830,8 +836,11 @@ ScChangeActionDel::ScChangeActionDel(
ScChangeActionDel::~ScChangeActionDel()
{
DeleteCellEntries();
-while ( pLinkMove )
+while (pLinkMove)
+{
+// coverity[use_after_free] - Moves up by itself
delete pLinkMove;
+}
}
void ScChangeActionDel::AddContent( ScChangeActionContent* pContent )
@@ -1056,6 +1065,7 @@ void ScChangeActionDel::UndoCutOffMoves()
{ // Restore cut off Moves; delete Entries/Links
while ( pLinkMove )
{
+// coverity[deref_arg] - the call on delete pLinkMove at the block end
Moves a new entry into pLinkMode by itself
ScChangeActionMove* pMove = pLinkMove->GetMove();
short nFrom = pLinkMove->GetCutOffFrom();
short nTo = pLinkMove->GetCutOffTo();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/inc framework/source
framework/inc/uielement/uielement.hxx|1 -
framework/source/layoutmanager/uielement.cxx | 22 --
framework/source/services/pathsettings.cxx |5 -
3 files changed, 28 deletions(-)
New commits:
commit 1d42b3da3a0649c45ec030242668e1bc159cb37c
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 12:24:10 2018 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 26 21:42:55 2018 +0200
framework: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by removing explicitly user-provided functions that do the same as their
implicitly-defined counterparts, but may prevent implicitly declared copy
functions from being defined as non-deleted in the future. (Even if such a
user-provided function was declared non-inline in an include file, the
apparently-used implicitly-defined copy functions are already inline, so why
bother with non-inline functions.)
Change-Id: Ia4c3442642a2db3ca365a35e56a203a955a415c4
Reviewed-on: https://gerrit.libreoffice.org/58080
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/framework/inc/uielement/uielement.hxx
b/framework/inc/uielement/uielement.hxx
index 777485ce1bc5..9e63b1c0f68f 100644
--- a/framework/inc/uielement/uielement.hxx
+++ b/framework/inc/uielement/uielement.hxx
@@ -82,7 +82,6 @@ struct UIElement
m_nStyle( ButtonType::SYMBOLONLY ) {}
bool operator< ( const UIElement& aUIElement ) const;
-UIElement& operator=( const UIElement& rUIElement );
OUString m_aType;
OUString m_aName;
diff --git a/framework/source/layoutmanager/uielement.cxx
b/framework/source/layoutmanager/uielement.cxx
index 097911b16441..58218751528d 100644
--- a/framework/source/layoutmanager/uielement.cxx
+++ b/framework/source/layoutmanager/uielement.cxx
@@ -94,28 +94,6 @@ namespace framework
}
}
-UIElement& UIElement::operator= ( const UIElement& rUIElement )
-{
-if (&rUIElement != this)
-{
-m_aType = rUIElement.m_aType;
-m_aName = rUIElement.m_aName;
-m_aUIName = rUIElement.m_aUIName;
-m_xUIElement= rUIElement.m_xUIElement;
-m_bFloating = rUIElement.m_bFloating;
-m_bVisible = rUIElement.m_bVisible;
-m_bUserActive = rUIElement.m_bUserActive;
-m_bMasterHide = rUIElement.m_bMasterHide;
-m_bContextSensitive = rUIElement.m_bContextSensitive;
-m_bNoClose = rUIElement.m_bNoClose;
-m_bStateRead= rUIElement.m_bStateRead;
-m_nStyle= rUIElement.m_nStyle;
-m_aDockedData = rUIElement.m_aDockedData;
-m_aFloatingData = rUIElement.m_aFloatingData;
-}
-return *this;
-}
-
} // namespace framework
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/services/pathsettings.cxx
b/framework/source/services/pathsettings.cxx
index e047ee53057e..e3466af842ba 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -102,11 +102,6 @@ class PathSettings : private cppu::BaseMutex
, bIsReadonly (false)
{}
-PathInfo(const PathInfo& rCopy)
-{
-takeOver(rCopy);
-}
-
void takeOver(const PathInfo& rCopy)
{
sPathName = rCopy.sPathName;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d4adfdf019afd2db5c281edf438066240c3a4d61 Author: Olivier Hallot AuthorDate: Thu Jul 26 16:19:21 2018 -0300 Commit: Gerrit Code Review CommitDate: Thu Jul 26 21:28:45 2018 +0200 Update git submodules * Update helpcontent2 from branch 'master' - tdf#115254 Some branch bookmarks are'nt working 10 module sw, o- Change-Id: I301f34529ee6c62018d8301d1d16a2cab908e829 Reviewed-on: https://gerrit.libreoffice.org/58143 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index e055db0a26c7..8426408b9647 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e055db0a26c7fab3d624fef7e726e61cb1e8f032 +Subproject commit 8426408b9647babdcc53ca4eef9762e50b3cd407 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/06050600.xhp |1 source/text/shared/optionen/01040300.xhp |3 +- source/text/shared/optionen/01040500.xhp |1 source/text/shared/optionen/01040600.xhp |7 +++-- source/text/shared/optionen/01040700.xhp |7 +++-- source/text/shared/optionen/01040900.xhp |3 +- source/text/shared/optionen/01041000.xhp |1 source/text/shared/optionen/01041100.xhp | 37 +++ source/text/swriter/01/0606.xhp |1 source/text/swriter/01/06060100.xhp |3 +- 10 files changed, 37 insertions(+), 27 deletions(-) New commits: commit 8426408b9647babdcc53ca4eef9762e50b3cd407 Author: Olivier Hallot AuthorDate: Thu Jul 26 16:19:21 2018 -0300 Commit: Olivier Hallot CommitDate: Thu Jul 26 21:28:45 2018 +0200 tdf#115254 Some branch bookmarks are'nt working 10 module sw, o- Change-Id: I301f34529ee6c62018d8301d1d16a2cab908e829 Reviewed-on: https://gerrit.libreoffice.org/58143 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/06050600.xhp b/source/text/shared/01/06050600.xhp index 005f7711d..f8df9c5e9 100644 --- a/source/text/shared/01/06050600.xhp +++ b/source/text/shared/01/06050600.xhp @@ -28,6 +28,7 @@ + Position diff --git a/source/text/shared/optionen/01040300.xhp b/source/text/shared/optionen/01040300.xhp index 99034ab5c..090ac769f 100644 --- a/source/text/shared/optionen/01040300.xhp +++ b/source/text/shared/optionen/01040300.xhp @@ -18,7 +18,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + @@ -40,6 +40,7 @@ paragraph styles;modifying basic fonts + Basic Fonts Specifies the settings for the basic fonts in your documents. diff --git a/source/text/shared/optionen/01040500.xhp b/source/text/shared/optionen/01040500.xhp index bd2eec335..e39049b33 100644 --- a/source/text/shared/optionen/01040500.xhp +++ b/source/text/shared/optionen/01040500.xhp @@ -37,6 +37,7 @@ number formats; recognition in text tables + Table Defines the attributes of tables in text documents. diff --git a/source/text/shared/optionen/01040600.xhp b/source/text/shared/optionen/01040600.xhp index f67e0b41b..47533f756 100644 --- a/source/text/shared/optionen/01040600.xhp +++ b/source/text/shared/optionen/01040600.xhp @@ -18,7 +18,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + @@ -53,6 +53,7 @@ cursor; allowing in protected areas (Writer) + Formatting Aids In $[officename] text and HTML documents, defines the display for certain characters and for the direct cursor. @@ -66,14 +67,14 @@ Specifies whether paragraph delimiters are displayed. The paragraph delimiters also contain paragraph format information. Soft hyphens -Specifies whether soft hyphens (called also as optional or discretionary hyphens) are displayed. These are hidden user-defined delimiters that you enter within a word by pressing Command+Hyphen(-) +Specifies whether soft hyphens (called also as optional or discretionary hyphens) are displayed. These are hidden user-defined delimiters that you enter within a word by pressing Command+Hyphen(-) Ctrl+Hyphen(-). Words with soft hyphens are only separated at the end of a line at the point where a soft hyphen has been inserted, irrespective of whether the automatic hyphenation is activated or deactivated. Spaces Specifies whether to represent every space in the text with a dot. Non-breaking spaces -Specifies that non-breaking spaces are shown as gray boxes. Non-breaking spaces are not broken at the end of a line and are entered with the Command+Shift+Spacebar +Specifies that non-breaking spaces are shown as gray boxes. Non-breaking spaces are not broken at the end of a line and are entered with the Command+Shift+Spacebar Ctrl+Shift+Spacebar shortcut keys. Tabs diff --git a/source/text/shared/optionen/01040700.xhp b/source/text/shared/optionen/01040700.xhp index 99f5e5971..f0d4defea 100644 --- a/source/text/shared/optionen/01040700.xhp +++ b/source/text/shared/optionen/01040700.xhp @@ -1,6 +1,6 @@ - + - - + + Changes @@ -29,6 +29,7 @@ + Changes Defines the appearance of changes in the document. diff --git a/source/text/shared/optionen/01040900.xhp b/source/text/shared/optionen/01040900.xhp index 658d3c3e6..f313abbf2 100644 --- a/source/text/shared/optionen/01040900.xhp +++ b/source/text/shared/optionen/01040900.xhp @@ -46,6 +46,7 @@ + General Specifies general settings for text documents. @@ -189,4 +190,4 @@ Specifies the characters that are considered as word separators when counting words, in addition to spaces, tabs and line and paragraph breaks. - \ No newline at end o
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/notebookbar/SfxNotebookBar.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit f85181c817e7c8371b2d18cee0055b3f8c8958d4 Author: Julien Nabet AuthorDate: Thu Jul 26 12:23:49 2018 +0200 Commit: Julien Nabet CommitDate: Thu Jul 26 21:26:39 2018 +0200 Avoid com.sun.star.container.NoSuchElementException "Active" (3) Launch Math and notice this kind of logs: warn:unotools:4125:4125:unotools/source/config/confignode.cxx:444: DBG_UNHANDLED_EXCEPTION in com::sun::star::uno::Any utl::OConfigurationNode::getNodeValue(const rtl::OUString&) const type: com.sun.star.container.NoSuchElementException message: Active context: configmgr::RootAccess Change-Id: I4bb1af5caaf53086c243cc8e3a2746ff61cbb869 Reviewed-on: https://gerrit.libreoffice.org/58081 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx b/sfx2/source/notebookbar/SfxNotebookBar.cxx index 23c2280add7d..9d5a541c9240 100644 --- a/sfx2/source/notebookbar/SfxNotebookBar.cxx +++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx @@ -72,6 +72,9 @@ static OUString lcl_getAppName( vcl::EnumContext::Application eApp ) case vcl::EnumContext::Application::Draw: return OUString( "Draw" ); break; +case vcl::EnumContext::Application::Formula: +return OUString( "Formula" ); +break; default: return OUString(); break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0-6' - sfx2/source
sfx2/source/doc/objxtor.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f30122f0ecde6cd1551dfea962327bd3454a239d Author: Markus Mohrhard AuthorDate: Sat Jul 21 01:57:27 2018 +0200 Commit: Christian Lohmaier CommitDate: Thu Jul 26 21:23:51 2018 +0200 fix shutdown crash when SfxApplication has already been destroyed See e.g. http://crashreport.libreoffice.org/stats/crash_details/dc1ae6ff-923e-44f6-99a9-84893039efd7 Change-Id: I3b5a24bfb62977ca922bf3bececb6676691bf6ea Reviewed-on: https://gerrit.libreoffice.org/57789 Tested-by: Jenkins Reviewed-by: Markus Mohrhard (cherry picked from commit 715fcaff01ed048c52c69264a7a0fb773dd57b32) Reviewed-on: https://gerrit.libreoffice.org/57809 Reviewed-by: Michael Meeks (cherry picked from commit d4052d2ca523cc000132620aaecb59c14c17e20d) Reviewed-on: https://gerrit.libreoffice.org/57988 Reviewed-by: Eike Rathke Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 959666dfcc74..e1a130c7fc79 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -314,13 +314,13 @@ SfxObjectShell::~SfxObjectShell() DELETEX(AutoReloadTimer_Impl, pImpl->pReloadTimer ); SfxApplication *pSfxApp = SfxGetpApp(); -if ( USHRT_MAX != pImpl->nVisualDocumentNumber ) +if ( USHRT_MAX != pImpl->nVisualDocumentNumber && pSfxApp ) pSfxApp->ReleaseIndex(pImpl->nVisualDocumentNumber); // Destroy Basic-Manager pImpl->aBasicManager.reset( nullptr ); -if ( pSfxApp->GetDdeService() ) +if ( pSfxApp && pSfxApp->GetDdeService() ) pSfxApp->RemoveDdeTopic( this ); pImpl->pBaseModel.set( nullptr ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0-6' - sw/source
sw/source/filter/html/swhtml.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit b419713f879f72dbb947ee2251a9cf586d46c3b3
Author: Caolán McNamara
AuthorDate: Wed Jul 18 16:13:19 2018 +0100
Commit: Christian Lohmaier
CommitDate: Thu Jul 26 21:21:57 2018 +0200
tdf#118579 ignore body in body instead of flagging as an error
Change-Id: Ie6626a320a5264aea004f7c57244643798703de8
Reviewed-on: https://gerrit.libreoffice.org/57968
Reviewed-by: Eike Rathke
Reviewed-by: Michael Stahl
Reviewed-by: Christian Lohmaier
Tested-by: Christian Lohmaier
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 01f15c570a30..07ea0ca88639 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -1248,9 +1248,7 @@ void SwHTMLParser::NextToken( HtmlTokenId nToken )
switch( nToken )
{
case HtmlTokenId::BODY_ON:
-if (m_bBodySeen)
-eState = SvParserState::Error;
-else
+if (!m_bBodySeen)
{
m_bBodySeen = true;
if( !m_aStyleSource.isEmpty() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0-6' - solenv/flatpak-manifest.in
solenv/flatpak-manifest.in |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 8a77dadb63e02c06413f319c37242d27d7180d5b
Author: Stephan Bergmann
AuthorDate: Wed Jul 25 12:52:38 2018 +0200
Commit: Christian Lohmaier
CommitDate: Thu Jul 26 21:21:11 2018 +0200
Adapt solenv/flatpak-manifest.in to recent download.lst changes
(cherry picked from commit 5c016d6ae4e59629cfd0b80c631f67cf46e42d3e)
Conflicts:
solenv/flatpak-manifest.in
Change-Id: I7799abe1a6fc9cf79a751d76360ea7ad2face133
Reviewed-on: https://gerrit.libreoffice.org/58036
Reviewed-by: Michael Stahl
Reviewed-by: Christian Lohmaier
Tested-by: Christian Lohmaier
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 7adaa1bbd83a..369bef4c1233 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -405,10 +405,10 @@
"dest-filename": "external/tarballs/liborcus-0.13.3.tar.gz"
},
{
-"url":
"https://dev-www.libreoffice.org/src/poppler-0.59.0.tar.xz";,
-"sha256":
"a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641",
+"url":
"https://dev-www.libreoffice.org/src/poppler-0.66.0.tar.xz";,
+"sha256":
"2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3f7235cc9eae7",
"type": "file",
-"dest-filename": "external/tarballs/poppler-0.59.0.tar.xz"
+"dest-filename": "external/tarballs/poppler-0.66.0.tar.xz"
},
{
"url":
"https://dev-www.libreoffice.org/src/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2";,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/print_revamp' - vcl/inc vcl/source
vcl/inc/print.hrc| 47 ---
vcl/source/gdi/print.cxx | 20
2 files changed, 56 insertions(+), 11 deletions(-)
New commits:
commit 86f20ef976a50ca81ec4d7b1345f65388f1735e5
Author: Daniel Silva
AuthorDate: Mon Jul 16 17:42:11 2018 -0300
Commit: Katarina Behrens
CommitDate: Thu Jul 26 21:20:16 2018 +0200
Syncs paper names in vcl with i18nutil/*/paper.hxx
Change-Id: Ie6137f6f5f180282df0329ee807b071c09e0c331
Reviewed-on: https://gerrit.libreoffice.org/57532
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
diff --git a/vcl/inc/print.hrc b/vcl/inc/print.hrc
index db8cbdf4bdcf..754a8027c320 100644
--- a/vcl/inc/print.hrc
+++ b/vcl/inc/print.hrc
@@ -31,7 +31,6 @@ const char* RID_STR_PAPERNAMES[] =
NC_("RID_STR_PAPERNAMES", "A3"),
NC_("RID_STR_PAPERNAMES", "A4"),
NC_("RID_STR_PAPERNAMES", "A5"),
-NC_("RID_STR_PAPERNAMES", "A6"),
NC_("RID_STR_PAPERNAMES", "B4 (ISO)"),
NC_("RID_STR_PAPERNAMES", "B5 (ISO)"),
NC_("RID_STR_PAPERNAMES", "Letter"),
@@ -45,11 +44,12 @@ const char* RID_STR_PAPERNAMES[] =
NC_("RID_STR_PAPERNAMES", "C6/5 Envelope"),
NC_("RID_STR_PAPERNAMES", "DL Envelope"),
NC_("RID_STR_PAPERNAMES", "Dia Slide"),
+NC_("RID_STR_PAPERNAMES", "Screen 4:3"),
NC_("RID_STR_PAPERNAMES", "C"),
NC_("RID_STR_PAPERNAMES", "D"),
NC_("RID_STR_PAPERNAMES", "E"),
NC_("RID_STR_PAPERNAMES", "Executive"),
-NC_("RID_STR_PAPERNAMES", "Long Bond"),
+NC_("RID_STR_PAPERNAMES", "German Legal Fanfold"),
NC_("RID_STR_PAPERNAMES", "#8 (Monarch) Envelope"),
NC_("RID_STR_PAPERNAMES", "#6 3/4 (Personal) Envelope"),
NC_("RID_STR_PAPERNAMES", "#9 Envelope"),
@@ -62,9 +62,50 @@ const char* RID_STR_PAPERNAMES[] =
NC_("RID_STR_PAPERNAMES", "B4 (JIS)"),
NC_("RID_STR_PAPERNAMES", "B5 (JIS)"),
NC_("RID_STR_PAPERNAMES", "B6 (JIS)"),
+NC_("RID_STR_PAPERNAMES", "Ledger"),
+NC_("RID_STR_PAPERNAMES", "Statement"),
+NC_("RID_STR_PAPERNAMES", "Quarto"),
+NC_("RID_STR_PAPERNAMES", "10x14"),
+NC_("RID_STR_PAPERNAMES", "#14 Envelope"),
+NC_("RID_STR_PAPERNAMES", "C3 Envelope"),
+NC_("RID_STR_PAPERNAMES", "Italian Envelope"),
+NC_("RID_STR_PAPERNAMES", "U.S. Standard Fanfold"),
+NC_("RID_STR_PAPERNAMES", "German Standard Fanfold"),
NC_("RID_STR_PAPERNAMES", "Japanese Postcard"),
+NC_("RID_STR_PAPERNAMES", "9x11"),
+NC_("RID_STR_PAPERNAMES", "10x11"),
+NC_("RID_STR_PAPERNAMES", "15x11"),
+NC_("RID_STR_PAPERNAMES", "Invitation Envelope"),
+NC_("RID_STR_PAPERNAMES", "SuperA"),
+NC_("RID_STR_PAPERNAMES", "SuperB"),
+NC_("RID_STR_PAPERNAMES", "Letter Plus"),
+NC_("RID_STR_PAPERNAMES", "A4 Plus"),
+NC_("RID_STR_PAPERNAMES", "Double Postcard"),
+NC_("RID_STR_PAPERNAMES", "A6"),
+NC_("RID_STR_PAPERNAMES", "12x11"),
+NC_("RID_STR_PAPERNAMES", "A7"),
+NC_("RID_STR_PAPERNAMES", "A8"),
+NC_("RID_STR_PAPERNAMES", "A9"),
+NC_("RID_STR_PAPERNAMES", "A10"),
+NC_("RID_STR_PAPERNAMES", "B0 (ISO)"),
+NC_("RID_STR_PAPERNAMES", "B1 (ISO)"),
+NC_("RID_STR_PAPERNAMES", "B2 (ISO)"),
+NC_("RID_STR_PAPERNAMES", "B3 (ISO)"),
+NC_("RID_STR_PAPERNAMES", "B7 (ISO)"),
+NC_("RID_STR_PAPERNAMES", "B8 (ISO)"),
+NC_("RID_STR_PAPERNAMES", "B9 (ISO)"),
+NC_("RID_STR_PAPERNAMES", "B10 (ISO)"),
+NC_("RID_STR_PAPERNAMES", "C2 Envelope"),
+NC_("RID_STR_PAPERNAMES", "C7 Envelope"),
+NC_("RID_STR_PAPERNAMES", "C8 Envelope"),
+NC_("RID_STR_PAPERNAMES", "Arch A"),
+NC_("RID_STR_PAPERNAMES", "Arch B"),
+NC_("RID_STR_PAPERNAMES", "Arch C"),
+NC_("RID_STR_PAPERNAMES", "Arch D"),
+NC_("RID_STR_PAPERNAMES", "Arch E"),
+NC_("RID_STR_PAPERNAMES", "Screen 16:9"),
// To translators: This is the last entry of the sequence of paper size
names
-NC_("RID_STR_PAPERNAMES", "Double Postcard")
+NC_("RID_STR_PAPERNAMES", "Screen 16:10"),
};
#endif // INCLUDED_VCL_INC_PRINT_HRC
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 1abec5c36def..bc7716496e13 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -1471,14 +1471,18 @@ OUString Printer::GetPaperName( Paper ePaper )
pSVData->mpPaperNames = new std::unordered_map< int, OUString >;
static const int PaperIndex[] =
{
-PAPER_A0, PAPER_A1, PAPER_A2, PAPER_A3, PAPER_A4, PAPER_A5,
PAPER_A6,
-PAPER_B4_ISO, PAPER_B5_ISO, PAPER_LETTER, PAPER_LEGAL,
PAPER_TABLOID,
-PAPER_USER, PAPER_B6_ISO, PAPER_ENV_C4, PAPER_ENV_C5,
PAPER_ENV_C6, PAPER_ENV_C65,
-PAPER_ENV_DL, PAPER_SLIDE_DIA, PAPER_C, PAPER_D, PAPER_E,
-PAPER_EXECUTIVE, PAPER_FANFOLD_LEGAL_DE, PAPER_ENV_MONARCH,
PAPER_ENV_PERSONAL,
-PAPER_ENV_9, PAPER_ENV_10, PAPER_ENV_11, PAPER_ENV_12, PAPER_KAI16,
-PAPER_KAI32, PAPER_KAI32BIG, PAPER_B4_JIS, PAPER_B5_JIS,
PAPER_B6_
[Libreoffice-commits] core.git: Branch 'feature/print_revamp' - i18nutil/source include/vcl vcl/inc vcl/source
i18nutil/source/utility/paper.cxx |5 +-
include/vcl/print.hxx |1
vcl/inc/print.hrc |4 +
vcl/inc/printdlg.hxx |4 +
vcl/source/gdi/print.cxx | 10 +++-
vcl/source/window/printdlg.cxx| 90 --
6 files changed, 106 insertions(+), 8 deletions(-)
New commits:
commit 4acb86cea21de5e1d8907535e1c7ee2f94086ec1
Author: Daniel Silva
AuthorDate: Fri Jun 29 11:36:03 2018 -0300
Commit: Katarina Behrens
CommitDate: Thu Jul 26 21:16:28 2018 +0200
Sets paper sizes listbox in print dialog
Change-Id: Iaeb50f6e854b90c1062d2ed6e3e053a6c26ea520
Reviewed-on: https://gerrit.libreoffice.org/56711
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
diff --git a/i18nutil/source/utility/paper.cxx
b/i18nutil/source/utility/paper.cxx
index c2728f697183..473b8e1d977f 100644
--- a/i18nutil/source/utility/paper.cxx
+++ b/i18nutil/source/utility/paper.cxx
@@ -168,8 +168,11 @@ void PaperInfo::doSloppyFit()
long lDiffW = labs(aDinTab[i].m_nWidth - m_nPaperWidth);
long lDiffH = labs(aDinTab[i].m_nHeight - m_nPaperHeight);
+long lFlipDiffW = labs(aDinTab[i].m_nHeight - m_nPaperWidth);
+long lFlipDiffH = labs(aDinTab[i].m_nWidth - m_nPaperHeight);
-if ( lDiffW < MAXSLOPPY && lDiffH < MAXSLOPPY )
+if ( (lDiffW < MAXSLOPPY && lDiffH < MAXSLOPPY) ||
+(lFlipDiffW < MAXSLOPPY && lFlipDiffH < MAXSLOPPY) )
{
m_nPaperWidth = aDinTab[i].m_nWidth;
m_nPaperHeight = aDinTab[i].m_nHeight;
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index c80b514b05df..f219087c2f2b 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -334,6 +334,7 @@ public:
const Size& GetPaperSizePixel() const { return
maPaperSize; }
SizeGetPaperSize() const { return PixelToLogic(
maPaperSize ); }
+SizeGetPaperSize( int nPaper );
const Point&GetPageOffsetPixel() const { return
maPageOffset; }
Point GetPageOffset() const { return PixelToLogic(
maPageOffset ); }
diff --git a/vcl/inc/print.hrc b/vcl/inc/print.hrc
index b1b3d47c7be3..db8cbdf4bdcf 100644
--- a/vcl/inc/print.hrc
+++ b/vcl/inc/print.hrc
@@ -31,6 +31,7 @@ const char* RID_STR_PAPERNAMES[] =
NC_("RID_STR_PAPERNAMES", "A3"),
NC_("RID_STR_PAPERNAMES", "A4"),
NC_("RID_STR_PAPERNAMES", "A5"),
+NC_("RID_STR_PAPERNAMES", "A6"),
NC_("RID_STR_PAPERNAMES", "B4 (ISO)"),
NC_("RID_STR_PAPERNAMES", "B5 (ISO)"),
NC_("RID_STR_PAPERNAMES", "Letter"),
@@ -61,8 +62,9 @@ const char* RID_STR_PAPERNAMES[] =
NC_("RID_STR_PAPERNAMES", "B4 (JIS)"),
NC_("RID_STR_PAPERNAMES", "B5 (JIS)"),
NC_("RID_STR_PAPERNAMES", "B6 (JIS)"),
+NC_("RID_STR_PAPERNAMES", "Japanese Postcard"),
// To translators: This is the last entry of the sequence of paper size
names
-NC_("RID_STR_PAPERNAMES", "Japanese Postcard")
+NC_("RID_STR_PAPERNAMES", "Double Postcard")
};
#endif // INCLUDED_VCL_INC_PRINT_HRC
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 0be16fcd8413..659e28c275fe 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -119,6 +119,7 @@ namespace vcl
bool isSingleJobs() const { return mbSingleJobs; };
bool hasPreview();
+void setPaperSizes();
void previewForward();
void previewBackward();
@@ -183,6 +184,7 @@ namespace vcl
VclPtr mpSheetMarginTxt1;
VclPtr mpSheetMarginEdt;
VclPtr mpSheetMarginTxt2;
+VclPtr mpPaperSizeBox;
VclPtr mpNupOrientationBox;
// page order ("left to right, then down")
@@ -208,6 +210,8 @@ namespace vcl
boolmbShowLayoutFrame;
boolmbSingleJobs;
+Paper mePaper;
+
DECL_LINK( ClickHdl, Button*, void );
DECL_LINK( SelectHdl, ListBox&, void );
DECL_LINK( ModifyHdl, Edit&, void );
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index a5fe96a76db0..1abec5c36def 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -1471,14 +1471,14 @@ OUString Printer::GetPaperName( Paper ePaper )
pSVData->mpPaperNames = new std::unordered_map< int, OUString >;
static const int PaperIndex[] =
{
-PAPER_A0, PAPER_A1, PAPER_A2, PAPER_A3, PAPER_A4, PAPER_A5,
+PAPER_A0, PAPER_A1, PAPER_A2, PAPER_A3, PAPER_A4, PAPER_A5,
PAPER_A6,
PAPER_B4_ISO, PAPER_B5_ISO, PAPER_LETTER, PAPER_LEGAL,
PAPER_TABLOID,
PAPER_USER, PAPER_B6_ISO, PAPER_ENV_C4, PAPER_ENV_C5,
PAPER_ENV_C6, PAPER_ENV_C65,
PAPE
[Libreoffice-commits] core.git: Branch 'feature/print_revamp' - vcl/inc vcl/source vcl/uiconfig vcl/UIConfig_vcl.mk
vcl/UIConfig_vcl.mk |1
vcl/inc/printdlg.hxx | 23 +
vcl/source/gdi/print3.cxx| 11 +---
vcl/source/window/printdlg.cxx | 53 -
vcl/uiconfig/ui/moreoptionsdialog.ui | 88 +++
vcl/uiconfig/ui/printdialog.ui |2
6 files changed, 170 insertions(+), 8 deletions(-)
New commits:
commit 4bfb749c06884c5506c48668a46e95c7bb18006c
Author: Daniel Silva
AuthorDate: Thu Jun 21 10:20:54 2018 -0300
Commit: Katarina Behrens
CommitDate: Thu Jul 26 21:07:58 2018 +0200
Adds More options dialog with single jobs checkbox in print dialog
Change-Id: I5f88e48edb5dfd966bcafca7866ee2a982a7f020
Reviewed-on: https://gerrit.libreoffice.org/56236
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
diff --git a/vcl/UIConfig_vcl.mk b/vcl/UIConfig_vcl.mk
index 8238c717a279..8a385de8 100644
--- a/vcl/UIConfig_vcl.mk
+++ b/vcl/UIConfig_vcl.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_uifiles,vcl,\
vcl/uiconfig/ui/editmenu \
vcl/uiconfig/ui/errornocontentdialog \
vcl/uiconfig/ui/errornoprinterdialog \
+ vcl/uiconfig/ui/moreoptionsdialog \
vcl/uiconfig/ui/printdialog \
vcl/uiconfig/ui/printerdevicepage \
vcl/uiconfig/ui/printerpaperpage \
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 5264fa506034..0be16fcd8413 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -35,9 +35,27 @@
namespace vcl
{
+class MoreOptionsDialog : public ModalDialog
+{
+VclPtr mpParent;
+VclPtrmpOKButton;
+VclPtrmpCancelButton;
+VclPtrmpSingleJobsBox;
+
+DECL_LINK( ClickHdl, Button*, void );
+
+public:
+
+MoreOptionsDialog( VclPtr i_pParent );
+virtual ~MoreOptionsDialog() override;
+virtual void dispose() override;
+};
+
class PrintDialog : public ModalDialog
{
+friend class MoreOptionsDialog;
public:
+
class PrintPreviewWindow : public vcl::Window
{
GDIMetaFile maMtf;
@@ -98,6 +116,7 @@ namespace vcl
bool isPrintToFile();
bool isCollate();
+bool isSingleJobs() const { return mbSingleJobs; };
bool hasPreview();
void previewForward();
@@ -109,6 +128,8 @@ namespace vcl
std::shared_ptr maPController;
+VclPtr< MoreOptionsDialog > mpMoreOptionsDlg;
+
VclPtr mpTabCtrl;
VclPtrmpPageLayoutFrame;
VclPtr mpPrinters;
@@ -126,6 +147,7 @@ namespace vcl
VclPtrmpOKButton;
VclPtrmpCancelButton;
VclPtr mpHelpButton;
+VclPtr mpMoreOptionsBtn;
VclPtr mpBackwardBtn;
VclPtr mpForwardBtn;
@@ -184,6 +206,7 @@ namespace vcl
SizemaFirstPageSize;
boolmbShowLayoutFrame;
+boolmbSingleJobs;
DECL_LINK( ClickHdl, Button*, void );
DECL_LINK( SelectHdl, ListBox&, void );
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 599965f479f5..69dc05d9a949 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -491,12 +491,11 @@ bool
Printer::PreparePrintJob(std::shared_ptr xController,
xController->setValue( "LocalFileName",
css::uno::makeAny( aFile ) );
}
-// FIXME: single jobs is not implemented yet.
-// else if( aDlg->isSingleJobs() )
-// {
-// xController->setValue( "PrintCollateAsSingleJobs",
-//css::uno::makeAny( true ) );
-// }
+else if( aDlg->isSingleJobs() )
+{
+xController->setValue( "PrintCollateAsSingleJobs",
+css::uno::makeAny( true ) );
+}
}
catch (const std::bad_alloc&)
{
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 97c3bca84689..c10dd7bed22f 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -77,6 +77,48 @@ namespace {
}
}
+MoreOptionsDialog::MoreOptionsDialog( VclPtr i_pParent )
+: ModalDialog(i_pParent, "MoreOptionsDialog",
"vcl/ui/moreoptionsdialog.ui")
+, mpParent( i_pParent )
+{
+get(mpOKButton, "ok");
+get(mpCancelButton, "cancel");
+get(mpSingleJobsBox, "singlejobs");
+
+mpSingleJobsBox->Check( mpParent->isSingleJobs() );
+
+mpOKButton->SetClickHdl( LINK(
[Libreoffice-commits] core.git: sc/qa
sc/qa/uitest/calc_tests/data/tdf81696.ods |binary
sc/qa/uitest/conditional_format/tdf81696.py | 51
2 files changed, 51 insertions(+)
New commits:
commit 6b728b6eb89a848a7c7aaadf246311f7fcebed03
Author: Zdeněk Crhonek
AuthorDate: Thu Jul 26 08:03:23 2018 +0200
Commit: Zdenek Crhonek
CommitDate: Thu Jul 26 20:55:16 2018 +0200
uitest for bug tdf#81696
Change-Id: I1fba51bc60912d4c0c107a88c34c2df91cd8913d
Reviewed-on: https://gerrit.libreoffice.org/58033
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek
diff --git a/sc/qa/uitest/calc_tests/data/tdf81696.ods
b/sc/qa/uitest/calc_tests/data/tdf81696.ods
new file mode 100644
index ..593c8072c884
Binary files /dev/null and b/sc/qa/uitest/calc_tests/data/tdf81696.ods differ
diff --git a/sc/qa/uitest/conditional_format/tdf81696.py
b/sc/qa/uitest/conditional_format/tdf81696.py
new file mode 100644
index ..9036e637609e
--- /dev/null
+++ b/sc/qa/uitest/conditional_format/tdf81696.py
@@ -0,0 +1,51 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from uitest.uihelper.common import select_pos
+from uitest.uihelper.calc import enter_text_to_cell
+from libreoffice.calc.document import get_sheet_from_doc
+from libreoffice.calc.conditional_format import
get_conditional_format_from_sheet
+from uitest.debug import sleep
+from libreoffice.calc.document import get_cell_by_position
+from libreoffice.uno.propertyvalue import mkPropertyValues
+#Bug 81696 - CRASH while sorting cells with conditional formatting
+
+import org.libreoffice.unotest
+import pathlib
+
+def get_url_for_data_file(file_name):
+return
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+
+class tdf81696(UITestCase):
+
+def test_tdf81696_sort_cell_conditional_formatting(self):
+calc_doc =
self.ui_test.load_file(get_url_for_data_file("tdf81696.ods"))
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+document = self.ui_test.get_component()
+
+gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:B3"}))
+#Open sort dialog by DATA - SORT,Just sort it by Column A, ascending.
(it's default)
+self.ui_test.execute_dialog_through_command(".uno:DataSort")
+xDialog = self.xUITest.getTopFocusWindow()
+xTabs = xDialog.getChild("tabcontrol")
+xleftright = xDialog.getChild("leftright")
+select_pos(xTabs, "0")
+
+xOK = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOK)
+#verify
+self.assertEqual(get_cell_by_position(document, 0, 0, 0).getString(),
"A")
+self.assertEqual(get_cell_by_position(document, 0, 1, 0).getString(),
"B")
+self.assertEqual(get_cell_by_position(document, 0, 0, 1).getValue(), 1)
+self.assertEqual(get_cell_by_position(document, 0, 1, 1).getValue(), 2)
+self.assertEqual(get_cell_by_position(document, 0, 0, 2).getValue(), 2)
+self.assertEqual(get_cell_by_position(document, 0, 1, 2).getValue(), 1)
+
+self.ui_test.close_doc()
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/oox oox/inc oox/source
include/oox/core/contexthandler2.hxx |5
include/oox/core/fragmenthandler.hxx |5
include/oox/core/fragmenthandler2.hxx|5
include/oox/dump/dumperbase.hxx | 24 ++-
oox/inc/drawingml/chart/converterbase.hxx|5
oox/inc/drawingml/table/tableproperties.hxx |1
oox/inc/drawingml/table/tablestylepart.hxx |1
oox/inc/drawingml/textparagraphproperties.hxx|1
oox/source/drawingml/table/tableproperties.cxx |3 --
oox/source/drawingml/table/tablestylepart.cxx|4 ---
oox/source/drawingml/textparagraphproperties.cxx |4 ---
oox/source/dump/dumperbase.cxx |6 -
12 files changed, 43 insertions(+), 21 deletions(-)
New commits:
commit 916e1e61a1b2d7f1b822b4b90d63f4e34719a090
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 12:28:19 2018 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 26 20:45:22 2018 +0200
oox: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by explicitly defaulting the copy/move functions (and, where needed in
turn,
also a default ctor) for classes that have a user-declared dtor that does
nothing other than an implicitly-defined one would do, but needs to be user-
declared because it is virtual and potentially serves as a key function to
emit the vtable, or is non-public, etc.; and by removing explicitly user-
provided functions that do the same as their implicitly-defined
counterparts,
but may prevent implicitly declared copy functions from being defined as
non-
deleted in the future. (Even if such a user-provided function was declared
non-inline in an include file, the apparently-used implicitly-defined copy
functions are already include, so why bother with non-inline functions.)
Change-Id: Id05e85ac8ac4155e6345b6f96ddf9449f640dc98
Reviewed-on: https://gerrit.libreoffice.org/58083
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/oox/core/contexthandler2.hxx
b/include/oox/core/contexthandler2.hxx
index c14ddcd62ada..5df9a6b3bd05 100644
--- a/include/oox/core/contexthandler2.hxx
+++ b/include/oox/core/contexthandler2.hxx
@@ -229,6 +229,11 @@ public:
explicitContextHandler2( ContextHandler2Helper const & rParent
);
virtual ~ContextHandler2() override;
+ContextHandler2(ContextHandler2 const &) = default;
+ContextHandler2(ContextHandler2 &&) = default;
+ContextHandler2 & operator =(ContextHandler2 const &) = default;
+ContextHandler2 & operator =(ContextHandler2 &&) = default;
+
// resolve ambiguity from base classes
virtual void SAL_CALL acquire() throw() override {
ContextHandler::acquire(); }
virtual void SAL_CALL release() throw() override {
ContextHandler::release(); }
diff --git a/include/oox/core/fragmenthandler.hxx
b/include/oox/core/fragmenthandler.hxx
index 93666aa344e8..c92cb411a6f9 100644
--- a/include/oox/core/fragmenthandler.hxx
+++ b/include/oox/core/fragmenthandler.hxx
@@ -93,6 +93,11 @@ public:
explicitFragmentHandler( XmlFilterBase& rFilter, const
OUString& rFragmentPath );
virtual ~FragmentHandler() override;
+FragmentHandler(FragmentHandler const &) = default;
+FragmentHandler(FragmentHandler &&) = default;
+FragmentHandler & operator =(FragmentHandler const &) = default;
+FragmentHandler & operator =(FragmentHandler &&) = default;
+
/** Returns the com.sun.star.xml.sax.XFastContextHandler interface of this
context. */
css::uno::Reference< css::xml::sax::XFastContextHandler >
getFastContextHandler() { return static_cast<
ContextHandler* >( this ); }
diff --git a/include/oox/core/fragmenthandler2.hxx
b/include/oox/core/fragmenthandler2.hxx
index f32ee1064ab5..2a262c470646 100644
--- a/include/oox/core/fragmenthandler2.hxx
+++ b/include/oox/core/fragmenthandler2.hxx
@@ -69,6 +69,11 @@ public:
bool bEnableTrimSpace = true );
virtual ~FragmentHandler2() override;
+FragmentHandler2(FragmentHandler2 const &) = default;
+FragmentHandler2(FragmentHandler2 &&) = default;
+FragmentHandler2 & operator =(FragmentHandler2 const &) = default;
+FragmentHandler2 & operator =(FragmentHandler2 &&) = default;
+
// resolve ambiguity from base classes
virtual void SAL_CALL acquire() throw() override {
FragmentHandler::acquire(); }
virtual void SAL_CALL release() throw() override {
FragmentHandler::release(); }
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index 9a1f3586b3e9..03369e2d8d03 100644
--- a/include/oox/dump/dumperbase.hxx
+++ b/include/oox/dump/dumperbase.hxx
@@ -443,6 +443,11 @@ class Base
public:
virtual ~Base();
+Base(Base const &) = default;
+Base(Base &&) = default;
+Base & operat
[Libreoffice-commits] core.git: include/o3tl
include/o3tl/array_view.hxx |7 ---
1 file changed, 7 deletions(-)
New commits:
commit de573ba8e67f165693e58e05d80756e5b55852e7
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 12:26:24 2018 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 26 20:44:51 2018 +0200
o3tl: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by removing explicitly user-provided functions that do the same as their
implicitly-defined counterparts, but may prevent implicitly declared copy
functions from being defined as non-deleted in the future
Change-Id: If3430e23fff7bb0da12ae20579696869bdf9b3d8
Reviewed-on: https://gerrit.libreoffice.org/58082
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/o3tl/array_view.hxx b/include/o3tl/array_view.hxx
index 3630955a927b..563821a46f6d 100644
--- a/include/o3tl/array_view.hxx
+++ b/include/o3tl/array_view.hxx
@@ -86,13 +86,6 @@ public:
return *this;
}
-array_view& operator=(array_view const & other)
-{
-data_ = other.data_;
-size_ = other.size_;
-return *this;
-}
-
constexpr bool empty() const noexcept { return size_ == 0; }
constexpr iterator begin() const noexcept { return data_; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/inc/optsitem.hxx |5 + 1 file changed, 5 insertions(+) New commits: commit fc053e04278aa4b466a1dec8b01c2e692a548a7a Author: Stephan Bergmann AuthorDate: Thu Jul 26 12:22:16 2018 +0200 Commit: Stephan Bergmann CommitDate: Thu Jul 26 20:44:22 2018 +0200 sd: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9) ...by explicitly defaulting the copy/move functions (and, where needed in turn, also a default ctor) for classes that have a user-declared dtor that does nothing other than an implicitly-defined one would do, but needs to be user- declared because it is virtual and potentially serves as a key function to emit the vtable, or is non-public, etc. Change-Id: Ib791cc511acfce457f7ffb2cd2c1a834e4e28734 Reviewed-on: https://gerrit.libreoffice.org/58078 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index 8d925a316bf5..18e836a71e16 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -51,6 +51,11 @@ public: SdOptionsItem( const SdOptionsGeneric& rParent, const OUString& rSubTree ); virtual ~SdOptionsItem() override; +SdOptionsItem(SdOptionsItem const &) = default; +SdOptionsItem(SdOptionsItem &&) = default; +SdOptionsItem & operator =(SdOptionsItem const &) = default; +SdOptionsItem & operator =(SdOptionsItem &&) = default; + virtual voidNotify( const css::uno::Sequence& aPropertyNames) override; css::uno::Sequence< css::uno::Any > GetProperties( const css::uno::Sequence< OUString >& rNames ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/inc writerfilter/source
writerfilter/inc/dmapper/resourcemodel.hxx |6 +++
writerfilter/source/dmapper/PropertyMap.hxx|5 ++
writerfilter/source/ooxml/OOXMLPropertySet.hxx | 45 +
writerfilter/source/rtftok/rtfsprm.cxx |6 ---
writerfilter/source/rtftok/rtfsprm.hxx |7 +++
5 files changed, 62 insertions(+), 7 deletions(-)
New commits:
commit 2fb6ac75eb63368b1a0b52d82ae9adab9e012ab3
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 12:20:50 2018 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 26 20:43:47 2018 +0200
writerfilter: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by explicitly defaulting the copy/move functions (and, where needed in
turn,
also a default ctor) for classes that have a user-declared dtor that does
nothing other than an implicitly-defined one would do, but needs to be user-
declared because it is virtual and potentially serves as a key function to
emit the vtable, or is non-public, etc.; and by removing explicitly user-
provided functions that do the same as their implicitly-defined
counterparts,
but may prevent implicitly declared copy functions from being defined as
non-
deleted in the future. (Even if such a user-provided function was declared
non-inline in an include file, the apparently-used implicitly-defined copy
functions are already include, so why bother with non-inline functions.)
Change-Id: I08632dcf7ccac1ab7efa0d5e8f4985d74cd31eac
Reviewed-on: https://gerrit.libreoffice.org/58077
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/writerfilter/inc/dmapper/resourcemodel.hxx
b/writerfilter/inc/dmapper/resourcemodel.hxx
index b2caa3ad97fa..8e2ffc546682 100644
--- a/writerfilter/inc/dmapper/resourcemodel.hxx
+++ b/writerfilter/inc/dmapper/resourcemodel.hxx
@@ -99,6 +99,12 @@ public:
*/
virtual void resolve(T & rHandler) = 0;
+Reference() = default;
+Reference(Reference const &) = default;
+Reference(Reference &&) = default;
+Reference & operator =(Reference const &) = default;
+Reference & operator =(Reference &&) = default;
+
protected:
~Reference() override {}
};
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx
b/writerfilter/source/dmapper/PropertyMap.hxx
index 91e182d3997f..f43bb38cad77 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -409,6 +409,11 @@ private:
public:
ParagraphProperties();
+ParagraphProperties(ParagraphProperties const &) = default;
+ParagraphProperties(ParagraphProperties &&) = default;
+ParagraphProperties & operator =(ParagraphProperties const &) = default;
+ParagraphProperties & operator =(ParagraphProperties &&) = default;
+
// Does not compare the starting/ending range, m_sParaStyleName and
m_nDropCapLength
bool operator==( const ParagraphProperties& );
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.hxx
b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
index 2950d250b398..5d744015eb3f 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.hxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySet.hxx
@@ -35,6 +35,11 @@ public:
OOXMLValue();
virtual ~OOXMLValue() override;
+OOXMLValue(OOXMLValue const &) = default;
+OOXMLValue(OOXMLValue &&) = default;
+OOXMLValue & operator =(OOXMLValue const &) = default;
+OOXMLValue & operator =(OOXMLValue &&) = default;
+
virtual int getInt() const override;
;
virtual OUString getString() const override;
@@ -96,6 +101,11 @@ public:
virtual ~OOXMLBooleanValue() override;
+OOXMLBooleanValue(OOXMLBooleanValue const &) = default;
+OOXMLBooleanValue(OOXMLBooleanValue &&) = default;
+OOXMLBooleanValue & operator =(OOXMLBooleanValue const &) = default;
+OOXMLBooleanValue & operator =(OOXMLBooleanValue &&) = default;
+
virtual int getInt() const override;
virtual css::uno::Any getAny() const override;
#ifdef DEBUG_WRITERFILTER
@@ -111,6 +121,11 @@ public:
explicit OOXMLStringValue(const OUString & rStr);
virtual ~OOXMLStringValue() override;
+OOXMLStringValue(OOXMLStringValue const &) = default;
+OOXMLStringValue(OOXMLStringValue &&) = default;
+OOXMLStringValue & operator =(OOXMLStringValue const &) = default;
+OOXMLStringValue & operator =(OOXMLStringValue &&) = default;
+
virtual css::uno::Any getAny() const override;
virtual OUString getString() const override;
#ifdef DEBUG_WRITERFILTER
@@ -146,6 +161,11 @@ public:
OOXMLPropertySet();
virtual ~OOXMLPropertySet() override;
+OOXMLPropertySet(OOXMLPropertySet const &) = default;
+OOXMLPropertySet(OOXMLPropertySet &&) = default;
+OOXMLPropertySet & operator =(OOXMLPropertySet const &) = default;
+OOXMLPropertySet & operator =(OOXMLPropertySet &&) = default;
+
void resolve(Properties & rHandler) override;
void add(
[Libreoffice-commits] core.git: filter/source include/filter
filter/source/graphicfilter/icgm/bundles.cxx |8
filter/source/graphicfilter/icgm/bundles.hxx |6 +-
filter/source/msfilter/svdfppt.cxx | 19 ---
filter/source/msfilter/util.cxx |7 ---
filter/source/svg/svgexport.cxx |5 +
include/filter/msfilter/mstoolbar.hxx| 11 +++
include/filter/msfilter/svdfppt.hxx |4
include/filter/msfilter/util.hxx |1 -
8 files changed, 21 insertions(+), 40 deletions(-)
New commits:
commit ec32cb36e63fe3dd1599b2984ade83b811700939
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 12:17:51 2018 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 26 20:43:19 2018 +0200
filter: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by explicitly defaulting the copy/move functions (and, where needed in
turn,
also a default ctor) for classes that have a user-declared dtor that does
nothing other than an implicitly-defined one would do, but needs to be user-
declared because it is virtual and potentially serves as a key function to
emit the vtable, or is non-public, etc.; and by removing explicitly user-
provided functions that do the same as their implicitly-defined
counterparts,
but may prevent implicitly declared copy functions from being defined as
non-
deleted in the future. (Even if such a user-provided function was declared
non-inline in an include file, the apparently-used implicitly-defined copy
functions are already include, so why bother with non-inline functions.)
Change-Id: I20a2c713f0fea62659d44298c1d98dc9b7f2d5aa
Reviewed-on: https://gerrit.libreoffice.org/58076
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/filter/source/graphicfilter/icgm/bundles.cxx
b/filter/source/graphicfilter/icgm/bundles.cxx
index e3ced2b7153d..c083229216fa 100644
--- a/filter/source/graphicfilter/icgm/bundles.cxx
+++ b/filter/source/graphicfilter/icgm/bundles.cxx
@@ -23,14 +23,6 @@
#include
#include
-Bundle& Bundle::operator=( const Bundle& rSource )
-{
-mnColor = rSource.mnColor;
-mnBundleIndex = rSource.mnBundleIndex;
-return *this;
-};
-
-
void Bundle::SetColor( sal_uInt32 nColor )
{
mnColor = nColor;
diff --git a/filter/source/graphicfilter/icgm/bundles.hxx
b/filter/source/graphicfilter/icgm/bundles.hxx
index 40178e373f71..ba0740afdb45 100644
--- a/filter/source/graphicfilter/icgm/bundles.hxx
+++ b/filter/source/graphicfilter/icgm/bundles.hxx
@@ -45,9 +45,13 @@ public:
{};
virtual Bundle* Clone() { return new Bundle( *this ); };
-Bundle& operator=(const Bundle& rBundle );
virtual~Bundle() {} ;
+
+Bundle(Bundle const &) = default;
+Bundle(Bundle &&) = default;
+Bundle & operator =(Bundle const &) = default;
+Bundle & operator =(Bundle &&) = default;
};
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 02201e843ece..d31da869b523 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -3108,11 +3108,6 @@ HeaderFooterEntry::HeaderFooterEntry( const
PptSlidePersistEntry* pMPE ) :
}
}
-HeaderFooterEntry::~HeaderFooterEntry()
-{
-}
-
-
sal_uInt32 HeaderFooterEntry::IsToDisplay( sal_uInt32 nInstance )
{
sal_uInt32 nMask = 0;
@@ -3834,11 +3829,6 @@ PPTCharSheet::PPTCharSheet( TSS_Type nInstance )
}
}
-PPTCharSheet::PPTCharSheet( const PPTCharSheet& rAttr )
-{
-*this = rAttr;
-}
-
void PPTCharSheet::Read( SvStream& rIn, sal_uInt32 nLevel)
{
// character attributes
@@ -3931,11 +3921,6 @@ PPTParaSheet::PPTParaSheet( TSS_Type nInstance )
}
}
-PPTParaSheet::PPTParaSheet( const PPTParaSheet& rSheet )
-{
-*this = rSheet;
-}
-
void PPTParaSheet::Read( SdrPowerPointImport const &
#ifdef DBG_UTIL
rManager
@@ -4760,10 +4745,6 @@ PPTTextSpecInfo::PPTTextSpecInfo( sal_uInt32 _nCharIdx )
:
nLanguage[ 2 ] = LANGUAGE_SYSTEM;
}
-PPTTextSpecInfo::~PPTTextSpecInfo()
-{
-}
-
PPTTextSpecInfoAtomInterpreter::PPTTextSpecInfoAtomInterpreter() :
bValid ( false )
{
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index fec841f2d34f..9335cc4d2b00 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -310,13 +310,6 @@ WW8ReadFieldParams::WW8ReadFieldParams( const OUString&
_rData )
nSavPtr = nNext;
}
-
-WW8ReadFieldParams::~WW8ReadFieldParams()
-{
-
-}
-
-
OUString WW8ReadFieldParams::GetResult() const
{
if (nFnd<0 && nSavPtr>nFnd)
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 91a1d35c3bb4..f959563de94d 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -100,6 +100,11 @@ class TextField
protected:
SVGFilter::ObjectSet mMasterPageSet;
public:
+TextField() = defa
Re: How to insert extra and hidden information for each element of document via LibreOffice API?
When I think of UML, I think of a graphical representation. Your description leads me to believe that you will have a "text" representation. My first thought was user defined attributes https://api.libreoffice.org/docs/idl/ref/servicecom_1_1sun_1_1star_1_1xml_1_1UserDefinedAttributesSupplier.html OK, so what supports that? I did not look into it, but, some possibilities might include (assuming that my guesses from the link above are accurate), 1. A text section. I was hoping that a paragraph and it seems that it does NOT. You could create a new text section for each bit, since it looks like text section would contain this (but I did not verify). 2. Paragraph Style. The bad thing is that it looks like it would be on a style, so, you would need to create a new style for each item of interest. I have two comments on this. First, you could embed an XML UserDefinedAttributes for each paragraph style that you create. Second, you could embed simple information (maybe) into the style name. 3. You could place the UML into a text table with a "cell" for each identifiable part and place an attribute into each cell properties object. I have a simple example of this for a a Calc cell in OOME4, but I have not test run it against a text table cell. Is the user expected to edit this data in any way? If not, then you could embed the entire original UML as a user defined attribute as a single user defined attribute attached to some element (such as a style that is not otherwise used). Your comments lead me to believe that you are not able to choose some formatted text method to embed the data of interest that might be bale to parse from regular text. No idea if this is of any use, but maybe. I have not tried any of these suggestions to make sure that they work. HTH. On 2018-07-24 7:20, MUNOZ JULHO Yupanqui wrote: > Hi everyone, > > I am working with the Eclipse Papyrus team on a UML to odt generator. Besides one way generating, it should be able to handle bidirectional synchronization between these two "worlds". > For reaching this goal, I need to map each model element with its respective doc element. For example, a package name will be transformed to a section in a document or a comment in a paragraph. I am looking for a way to reference the UML element from the odt document, for example adding the ID of the UML element to an odt "paragraph". > > In the users mailing list, Regina Henschel, suggested me to use bookmarks. It is a good idea, but, if is possible, I want to hide this information. > > Does anyone have another suggestion? > > Best regards, > > Yupanqui > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice [1] Links: -- [1] https://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/dlg/dbfindex.hxx |1 -
dbaccess/source/ui/inc/charsets.hxx |2 --
dbaccess/source/ui/misc/charsets.cxx |6 --
3 files changed, 9 deletions(-)
New commits:
commit 0c457a20b1a7caa9e8631dfdaa4a41a5ee149e8d
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 12:10:13 2018 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 26 20:42:40 2018 +0200
dbaccess: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by removing explicitly user-provided functions that do the same as their
implicitly-defined counterparts, but may prevent implicitly declared copy
functions from being defined as non-deleted in the future. (Even if such a
user-provided function was declared non-inline in an include file, the
apparently-used implicitly-defined copy functions are already inline, so why
bother with non-inline functions.)
Change-Id: Ie8dfa12a144b0d21c99803bf6810cc573b4880ac
Reviewed-on: https://gerrit.libreoffice.org/58075
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx
b/dbaccess/source/ui/dlg/dbfindex.hxx
index 7905cda08167..dbfabbf5594a 100644
--- a/dbaccess/source/ui/dlg/dbfindex.hxx
+++ b/dbaccess/source/ui/dlg/dbfindex.hxx
@@ -40,7 +40,6 @@ private:
public:
OTableIndex() { }
-OTableIndex( const OTableIndex& _rSource) :
aIndexFileName(_rSource.aIndexFileName) { }
explicit OTableIndex( const OUString& rFileName ) : aIndexFileName(
rFileName ) { }
const OUString& GetIndexFileName() const { return aIndexFileName; }
diff --git a/dbaccess/source/ui/inc/charsets.hxx
b/dbaccess/source/ui/inc/charsets.hxx
index 490dcb8162c1..0556dfdfab20 100644
--- a/dbaccess/source/ui/inc/charsets.hxx
+++ b/dbaccess/source/ui/inc/charsets.hxx
@@ -93,8 +93,6 @@ namespace dbaui
base_iterator m_aPosition;
public:
-ExtendedCharsetIterator(const ExtendedCharsetIterator& _rSource);
-
CharsetDisplayDerefHelper operator*() const;
/// prefix increment
diff --git a/dbaccess/source/ui/misc/charsets.cxx
b/dbaccess/source/ui/misc/charsets.cxx
index 3fe9316042ab..e068c18f98ef 100644
--- a/dbaccess/source/ui/misc/charsets.cxx
+++ b/dbaccess/source/ui/misc/charsets.cxx
@@ -101,12 +101,6 @@ namespace dbaui
OSL_ENSURE(m_pContainer,
"OCharsetDisplay::ExtendedCharsetIterator::ExtendedCharsetIterator : invalid
container!");
}
-OCharsetDisplay::ExtendedCharsetIterator::ExtendedCharsetIterator(const
ExtendedCharsetIterator& _rSource)
-:m_pContainer( _rSource.m_pContainer )
-,m_aPosition( _rSource.m_aPosition )
-{
-}
-
CharsetDisplayDerefHelper
OCharsetDisplay::ExtendedCharsetIterator::operator*() const
{
OSL_ENSURE( m_aPosition != m_pContainer->OCharsetDisplay_Base::end(),
"OCharsetDisplay::ExtendedCharsetIterator::operator* : invalid position!");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/inc/composertools.hxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 490838e438b5f6a049e6ff2ed2a89de9639585a4
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 12:09:14 2018 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 26 20:42:07 2018 +0200
dbaccess: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by explicitly defaulting the copy/move functions (and, where needed in
turn,
also a default ctor) for classes that have a user-declared dtor that does
nothing other than an implicitly-defined one would do, but needs to be user-
declared because it is virtual and potentially serves as a key function to
emit the vtable, or is non-public, etc.
Change-Id: Ic07bf2a39ee18368d2d56b5bc6e666758367b7d7
Reviewed-on: https://gerrit.libreoffice.org/58074
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/dbaccess/source/core/inc/composertools.hxx
b/dbaccess/source/core/inc/composertools.hxx
index 91f790495948..d0bfdc3ff7d6 100644
--- a/dbaccess/source/core/inc/composertools.hxx
+++ b/dbaccess/source/core/inc/composertools.hxx
@@ -66,6 +66,11 @@ namespace dbaccess
{
}
+TokenComposer(TokenComposer const &) = default;
+TokenComposer(TokenComposer &&) = default;
+TokenComposer & operator =(TokenComposer const &) = default;
+TokenComposer & operator =(TokenComposer &&) = default;
+
void operator() (const OUString& lhs)
{
append(lhs);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/cppcanvas
include/cppcanvas/canvas.hxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 5065bcf513147c1b92edc9d393768b01bc693c3a
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 12:07:48 2018 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 26 20:41:38 2018 +0200
cppcanvas: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by explicitly defaulting the copy/move functions (and, where needed in
turn,
also a default ctor) for classes that have a user-declared dtor that does
nothing other than an implicitly-defined one would do, but needs to be user-
declared because it is virtual and potentially serves as a key function to
emit the vtable, or is non-public, etc.
Change-Id: Ifa6e6f71f73b9d0a577de1a90cbf3a8c969ac062
Reviewed-on: https://gerrit.libreoffice.org/58073
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/cppcanvas/canvas.hxx b/include/cppcanvas/canvas.hxx
index 425d38e44213..532da2f0b342 100644
--- a/include/cppcanvas/canvas.hxx
+++ b/include/cppcanvas/canvas.hxx
@@ -69,6 +69,12 @@ namespace cppcanvas
ANTIALIASING_EXTRA_SIZE=2
};
+Canvas() = default;
+Canvas(Canvas const &) = default;
+Canvas(Canvas &&) = default;
+Canvas & operator =(Canvas const &) = default;
+Canvas & operator =(Canvas &&) = default;
+
virtual ~Canvas() {}
virtual void setTransformation( const
::basegfx::B2DHomMatrix& rMatrix ) = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/charttypes/CategoryPositionHelper.hxx |5 + 1 file changed, 5 insertions(+) New commits: commit 58f23b8f1fb0e696e40a6ecb356012dc59198abb Author: Stephan Bergmann AuthorDate: Thu Jul 26 12:03:41 2018 +0200 Commit: Stephan Bergmann CommitDate: Thu Jul 26 20:40:40 2018 +0200 chart2: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9) ...by explicitly defaulting the copy/move functions (and, where needed in turn, also a default ctor) for classes that have a user-declared dtor that does nothing other than an implicitly-defined one would do, but needs to be user- declared because it is virtual and potentially serves as a key function to emit the vtable, or is non-public, etc. Change-Id: Idecc69d147607824b95cd6fc715feb88c3fa1591 Reviewed-on: https://gerrit.libreoffice.org/58071 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/chart2/source/view/charttypes/CategoryPositionHelper.hxx b/chart2/source/view/charttypes/CategoryPositionHelper.hxx index 6b7491b47285..2fd0d3d0 100644 --- a/chart2/source/view/charttypes/CategoryPositionHelper.hxx +++ b/chart2/source/view/charttypes/CategoryPositionHelper.hxx @@ -29,6 +29,11 @@ public: CategoryPositionHelper( double fSeriesCount, double CategoryWidth = 1.0); virtual ~CategoryPositionHelper(); +CategoryPositionHelper(CategoryPositionHelper const &) = default; +CategoryPositionHelper(CategoryPositionHelper &&) = default; +CategoryPositionHelper & operator =(CategoryPositionHelper const &) = default; +CategoryPositionHelper & operator =(CategoryPositionHelper &&) = default; + double getScaledSlotWidth() const; virtual double getScaledSlotPos( double fCategoryX, double fSeriesNumber ) const; void setCategoryWidth( double fCategoryWidth ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: comphelper/source include/comphelper
comphelper/source/misc/logging.cxx |6 --
include/comphelper/logging.hxx |2 --
2 files changed, 8 deletions(-)
New commits:
commit 74da5c2914876cb2b1d4cc0e898d6bab0c99fb98
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 11:47:03 2018 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 26 20:40:03 2018 +0200
comphelper: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by removing explicitly user-provided functions that do the same as their
implicitly-defined counterparts, but may prevent implicitly declared copy
functions from being defined as non-deleted in the future. (Even if a dtor
was
declared non-inline in an include file, the apparently-used
implicitly-defined
copy functions are already inline, so why bother with a non-inline dtor.)
Change-Id: Id5494686dd169b17de7830588e603d1fd5f6b768
Reviewed-on: https://gerrit.libreoffice.org/58061
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/comphelper/source/misc/logging.cxx
b/comphelper/source/misc/logging.cxx
index c6863539a116..5b6c6bc6fda2 100644
--- a/comphelper/source/misc/logging.cxx
+++ b/comphelper/source/misc/logging.cxx
@@ -72,12 +72,6 @@ namespace comphelper
{
}
-
-EventLogger::~EventLogger()
-{
-}
-
-
bool EventLogger::isLoggable( const sal_Int32 _nLogLevel ) const
{
if ( !m_pImpl->isValid() )
diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx
index 69d6c9a354ec..fd04e83f732d 100644
--- a/include/comphelper/logging.hxx
+++ b/include/comphelper/logging.hxx
@@ -108,8 +108,6 @@ namespace comphelper
const sal_Char* _pAsciiLoggerName
);
-~EventLogger();
-
public:
/// determines whether an event with the given level would be logged
boolisLoggable( const sal_Int32 _nLogLevel ) const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/gpgmepp
external/gpgmepp/UnpackedTarball_gpgmepp.mk |1 + external/gpgmepp/gcc9.patch | 10 ++ 2 files changed, 11 insertions(+) New commits: commit 6a5a69bd59b96b83468079ed3c08f0c6d92608a6 Author: Stephan Bergmann AuthorDate: Thu Jul 26 10:27:18 2018 +0200 Commit: Stephan Bergmann CommitDate: Thu Jul 26 20:38:42 2018 +0200 external/gpgmepp: silence -Werror=deprecated-copy (GCC trunk towards GCC 9) Change-Id: Ib516eb3c9905577f083b99dd972443dcb3e86a42 Reviewed-on: https://gerrit.libreoffice.org/58043 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/external/gpgmepp/UnpackedTarball_gpgmepp.mk b/external/gpgmepp/UnpackedTarball_gpgmepp.mk index 1f7496b9b043..e5cce6a0aac4 100644 --- a/external/gpgmepp/UnpackedTarball_gpgmepp.mk +++ b/external/gpgmepp/UnpackedTarball_gpgmepp.mk @@ -25,5 +25,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,gpgmepp, \ external/gpgmepp/w32-build-fixes-2.patch \ $(if $(filter LINUX,$(OS)),external/gpgmepp/asan.patch) \ $(if $(filter LINUX,$(OS)),external/gpgmepp/rpath.patch) \ +external/gpgmepp/gcc9.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/gpgmepp/gcc9.patch b/external/gpgmepp/gcc9.patch new file mode 100644 index ..c2a9fd444df7 --- /dev/null +++ b/external/gpgmepp/gcc9.patch @@ -0,0 +1,10 @@ +--- lang/cpp/src/key.h lang/cpp/src/key.h +@@ -62,6 +62,7 @@ + /* implicit */ Key(const Null &); + Key(const shared_gpgme_key_t &key); + Key(gpgme_key_t key, bool acquireRef); ++Key(Key const &) = default; + + static const Null null; + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc
sw/inc/calbck.hxx |2 +-
sw/inc/node.hxx |5 +
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 847848d1401f23d51501e4b3396967a4bc193913
Author: Bjoern Michaelsen
AuthorDate: Wed Jul 25 23:19:35 2018 +0200
Commit: Björn Michaelsen
CommitDate: Thu Jul 26 20:35:55 2018 +0200
make SwContentNode handle legacy ModifyNotification() again (tdf#117749)
Change-Id: If5fe61b6bfd4012be63c27d531100018fb31dd21
Reviewed-on: https://gerrit.libreoffice.org/58024
Tested-by: Jenkins
Tested-by: Xisco Faulí
Reviewed-by: Björn Michaelsen
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index 7b3ff97fc442..8b029c75fe71 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -150,7 +150,7 @@ public:
// controlled access to Modify method
// mba: this is still considered a hack and it should be fixed; the name
makes grep-ing easier
-void ModifyNotification( const SfxPoolItem *pOldValue, const SfxPoolItem
*pNewValue ) { Modify ( pOldValue, pNewValue ); }
+virtual void ModifyNotification( const SfxPoolItem *pOldValue, const
SfxPoolItem *pNewValue ) { Modify ( pOldValue, pNewValue ); }
void SwClientNotifyCall( const SwModify& rModify, const SfxHint& rHint ) {
SwClientNotify( rModify, rHint ); }
const SwModify* GetRegisteredIn() const { return m_pRegisteredIn; }
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 3e50db779aaa..50086d45b045 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -482,6 +482,11 @@ public:
// Access to DrawingLayer FillAttributes in a preprocessed form for
primitive usage
virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr
getSdrAllFillAttributesHelper() const;
+virtual void ModifyNotification(const SfxPoolItem* pOld, const
SfxPoolItem* pNew) override
+{
+SwClientNotify(*this, sw::LegacyModifyHint(pOld, pNew));
+}
+
private:
SwContentNode( const SwContentNode & rNode ) = delete;
SwContentNode & operator= ( const SwContentNode & rNode ) = delete;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/01010303.xhp |1 + source/text/shared/optionen/01040400.xhp |1 + source/text/swriter/01/02120100.xhp |1 + source/text/swriter/01/04090006.xhp |7 --- source/text/swriter/01/05060300.xhp |1 + source/text/swriter/01/05110100.xhp |3 ++- source/text/swriter/01/05150300.xhp |7 --- source/text/swriter/02/1007.xhp |1 + 8 files changed, 15 insertions(+), 7 deletions(-) New commits: commit e055db0a26c7fab3d624fef7e726e61cb1e8f032 Author: Olivier Hallot AuthorDate: Thu Jul 26 15:20:06 2018 -0300 Commit: Olivier Hallot CommitDate: Thu Jul 26 20:27:13 2018 +0200 tdf#115254 Some branch bookmarks are not working 9 module sw, p- to r- Change-Id: I7772ab8ac360f00df6e914ea509118eacca7270d Reviewed-on: https://gerrit.libreoffice.org/58139 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/01010303.xhp b/source/text/shared/01/01010303.xhp index ee7d5c562..7d15d2c24 100644 --- a/source/text/shared/01/01010303.xhp +++ b/source/text/shared/01/01010303.xhp @@ -30,6 +30,7 @@ + Private Contains personal contact information for business cards. Business card layouts are selected on the Business Cards tab.removed switched note about autotext not supplied with OOo diff --git a/source/text/shared/optionen/01040400.xhp b/source/text/shared/optionen/01040400.xhp index 0dae62dbf..5eff473ac 100644 --- a/source/text/shared/optionen/01040400.xhp +++ b/source/text/shared/optionen/01040400.xhp @@ -47,6 +47,7 @@ printing; creating individual jobs faxes;selecting a fax machine mw made "fax machine selection" a two level entry + Print Specifies print settings within a text or HTML document. diff --git a/source/text/swriter/01/02120100.xhp b/source/text/swriter/01/02120100.xhp index 2cd55141f..26ffb84cf 100644 --- a/source/text/swriter/01/02120100.xhp +++ b/source/text/swriter/01/02120100.xhp @@ -31,6 +31,7 @@ + Rename AutoText Allows you to change the name of an AutoText entry. diff --git a/source/text/swriter/01/04090006.xhp b/source/text/swriter/01/04090006.xhp index 06629ea98..47a29f5e8 100644 --- a/source/text/swriter/01/04090006.xhp +++ b/source/text/swriter/01/04090006.xhp @@ -1,6 +1,6 @@ - + - - + + Database @@ -28,6 +28,7 @@ + Database You can insert fields from any database, for example, address fields, into your document. diff --git a/source/text/swriter/01/05060300.xhp b/source/text/swriter/01/05060300.xhp index 42c1d81d3..43e20edee 100644 --- a/source/text/swriter/01/05060300.xhp +++ b/source/text/swriter/01/05060300.xhp @@ -31,6 +31,7 @@ + Image Specify the flip and the link options for the selected image. diff --git a/source/text/swriter/01/05110100.xhp b/source/text/swriter/01/05110100.xhp index c2922d9b0..95e181034 100644 --- a/source/text/swriter/01/05110100.xhp +++ b/source/text/swriter/01/05110100.xhp @@ -18,7 +18,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + @@ -31,6 +31,7 @@ + Row Height Changes the height of the selected row(s). diff --git a/source/text/swriter/01/05150300.xhp b/source/text/swriter/01/05150300.xhp index de07faa57..e637f85a5 100644 --- a/source/text/swriter/01/05150300.xhp +++ b/source/text/swriter/01/05150300.xhp @@ -1,6 +1,6 @@ - + - - + + Apply and Edit Changes @@ -27,6 +27,7 @@ + diff --git a/source/text/swriter/02/1007.xhp b/source/text/swriter/02/1007.xhp index 7f46ef716..c11eecc8b 100644 --- a/source/text/swriter/02/1007.xhp +++ b/source/text/swriter/02/1007.xhp @@ -31,6 +31,7 @@ + Defines the number of pages displayed on screen. Click the arrow next to the icon to open a grid to select the number of pages to be displayed as rows and columns in the preview. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ff99456ba7cdcc1f78ac0450ca4bbe46f09aa051 Author: Olivier Hallot AuthorDate: Thu Jul 26 15:20:06 2018 -0300 Commit: Gerrit Code Review CommitDate: Thu Jul 26 20:27:13 2018 +0200 Update git submodules * Update helpcontent2 from branch 'master' - tdf#115254 Some branch bookmarks are not working 9 module sw, p- to r- Change-Id: I7772ab8ac360f00df6e914ea509118eacca7270d Reviewed-on: https://gerrit.libreoffice.org/58139 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 96108c111230..e055db0a26c7 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 96108c1112300ab09d5e0632fe66cdf996d4443f +Subproject commit e055db0a26c7fab3d624fef7e726e61cb1e8f032 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
OpenDocument spec tables row height [was: Writer - row-height, min-row-height and use-optimal-row-height]
Anybody? On Sun, Jun 17, 2018 at 11:48:49AM +0200, Lionel Elie Mamane wrote: > Hi, > > The Base report builder produces Writer (odt) documents directly (it > spits out XML, not using Writer to produce it), and then opens them in > Writer. It uses tables heavily. > > In the context of > https://bugs.documentfoundation.org/show_bug.cgi?id=45789 > https://gerrit.libreoffice.org/53977 > Ilhan prepared a patch to make Report Builder mark some rows of some > tables as "fit to size" in row height. By reading the OpenDocument > specification, I thought this would happen by setting the > style:use-optimal-row-height attribute on the row. However, it turns > out that Ilhan had to change some sw code for that to work, and that > made me suspicious whether that was the right thing to do. > > I looked into the XML generated by Writer with "Fit to Size" enabled > and disabled, and apparently that checkbox in writer replaces > "style:row-height" by "style:min-row-height, and > style:use-optimal-row-height is nowhere to be seen. > > Could a Writer expert please look at the sw changes in > https://gerrit.libreoffice.org/53977 > and let us know whether these changes are right or wrong with respect > to OpenDocument? Is style:use-optimal-row-height supposed to override > style:row-height or vice-versa? > > Thanks in advance, > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Calc cell type
Hi Vikas,
On Wednesday, 2018-07-25 10:15:26 +0530, Vikas Mahato wrote:
> I am trying to write some datatransformations related to date-time for calc.
>
> Is there any way to determine whether a column stores date or time value? I
> was only able to find CELLTYPE_STRING, CELLTYPE_NONE, CELLTYPE_VALUE etc in
> global.hxx but none related to date or time.
As Mike already mentioned, there are none because date|datetime is just
a serial date number value, days (and time as fraction) since a given
(and configurable) null date and just the display format makes it an
actual date.
To check if a cell of CELLTYPE_VALUE or CELLTYPE_FORMULA is formatted as
date|time|datetime use
sal_uInt32 nFormat = rDoc.GetNumberFormat( rDoc.GetNonThreadedContext(),
aAdr);
SvNumFormatType eType = rDoc.GetFormatTable()->GetType( nFormat);
bool bIsDateOrTimeOrBoth = (eType == SvNumFormatType::DATE) ||
(eType == SvNumFormatType::TIME) ||
(eType == SvNumFormatType::DATETIME);
If you're interested in only date or only time formatted values adapt.
If the type is of type date|datetime then obtain the double value from
the cell and add it to the nulldate:
double fValue = ...;// time in days as stored at the cell
DateTime aDateTime( rDoc.GetFormatTable()->GetNullDate());
aDateTime.AddTime( fValue);
Note that a DATE formatted value may still have a fraction denoting time
in its double value, you'd need to truncate the value to calculate with
full days. Same is true for a TIME formatted value that may be >= 1.0
for a duration of more than 24 hours or in fact display only the time
portion of an actual datetime value. Hard to decide in that case.
({As an aside, the number formatter when editing such a value uses
a purely arbitrary rule to decide whether to offer a time input line
(for up to 32k hours or 3.7 years) or datetime input line (starting at
1903-09-26 for a 1899-12-30 nulldate):
if (fabs( fValue) * 24 < 0x7fff)
time...
else
datetime...
})
If you need data pilot / pivot table specific handling then take a look
at sc/source/core/data/dp*.cxx especially sc/source/core/data/dputil.cxx
Eike
--
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A
signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/dbase/dindexnode.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 6bc58f562c366b1323925478a38bb409cc8588fe Author: Muhammet Kara AuthorDate: Wed Jul 25 16:12:23 2018 +0300 Commit: Muhammet Kara CommitDate: Thu Jul 26 18:48:16 2018 +0200 Remove unused local variable 'aResultNode' Change-Id: I8a240176fb3a446a8f17efd258ef5136cc44c139 Reviewed-on: https://gerrit.libreoffice.org/57980 Tested-by: Jenkins Reviewed-by: Muhammet Kara diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx index 2c5f561173c9..3a19f34f6316 100644 --- a/connectivity/source/drivers/dbase/dindexnode.cxx +++ b/connectivity/source/drivers/dbase/dindexnode.cxx @@ -481,7 +481,6 @@ void ONDXPage::Merge(sal_uInt16 nParentNodePos, const ONDXPagePtr& xPage) DBG_ASSERT(nParentNodePos != NODE_NOTFOUND, "Wrong index setup"); /* Merge 2 pages */ -ONDXNode aResultNode; sal_uInt16 nMaxNodes = rIndex.GetMaxNodes(), nMaxNodes_2 = nMaxNodes / 2; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/gbuild
solenv/gbuild/platform/macosx.mk |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8ced7bb207219980fdc4f05cadb3dd4acdb13f24
Author: Jim Jagielski
AuthorDate: Thu Jul 26 14:43:11 2018 +
Commit: Jim Jagielski
CommitDate: Thu Jul 26 14:43:11 2018 +
force symlink
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 103b09f53aa4..ef93f28b 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -298,7 +298,7 @@ $(call gb_Helper_abbreviate_dirs,\
`cat $${DYLIB_FILE}` && \
$(if $(filter Library,$(TARGETTYPE)),\
$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library
$(LAYER) $(1) && \
- ln -f $(if $(call
gb_Library_is_udk_versioned,$(1)),$(1).$(gb_UDK_MAJOR),$(1)) \
+ ln -shf $(if $(call
gb_Library_is_udk_versioned,$(1)),$(1).$(gb_UDK_MAJOR),$(1)) \
$(patsubst %.dylib,%.jnilib,$(1)) &&) \
rm -f $${DYLIB_FILE})
endef
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Compiler baselines
devtoolset-7 for i386 is over here: https://copr-be.cloud.fedoraproject.org/results/mlampe/devtoolset-7/epel-6-i386/00756569-devtoolset-7/ Is that what you're looking for? -- Sent from: http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/CppunitTest_sc_importdescriptorbaseobj.mk
sc/CppunitTest_sc_importdescriptorbaseobj.mk | 31 --- 1 file changed, 1 insertion(+), 30 deletions(-) New commits: commit e8949c8fef77c54c7b1ae9f420530d16cb6b5030 Author: Jens Carl AuthorDate: Thu Jul 26 03:07:47 2018 + Commit: Jens Carl CommitDate: Thu Jul 26 18:03:46 2018 +0200 Remove obsolete (cargo-cult copied) dependencies Change-Id: I3166be8669d5bb46ac31ecdd10327572c678ef47 Reviewed-on: https://gerrit.libreoffice.org/58032 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/sc/CppunitTest_sc_importdescriptorbaseobj.mk b/sc/CppunitTest_sc_importdescriptorbaseobj.mk index ca20aca5a878..1bf988e22bb0 100644 --- a/sc/CppunitTest_sc_importdescriptorbaseobj.mk +++ b/sc/CppunitTest_sc_importdescriptorbaseobj.mk @@ -18,43 +18,14 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_importdescriptorbaseobj, \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_importdescriptorbaseobj, \ - basegfx \ - comphelper \ cppu \ - cppuhelper \ - drawinglayer \ - editeng \ - for \ - forui \ - i18nlangtag \ - msfilter \ - oox \ sal \ - salhelper \ - sax \ - sb \ - sc \ - sfx \ - sot \ subsequenttest \ - svl \ - svt \ - svx \ - svxcore \ test \ - tk \ - tl \ - ucbhelper \ unotest \ - utl \ - vbahelper \ - vcl \ - xo \ )) $(eval $(call gb_CppunitTest_set_include,sc_importdescriptorbaseobj,\ - -I$(SRCDIR)/sc/source/ui/inc \ - -I$(SRCDIR)/sc/inc \ $$(INCLUDE) \ )) @@ -64,7 +35,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_importdescriptorbaseobj)) $(eval $(call gb_CppunitTest_use_vcl,sc_importdescriptorbaseobj)) $(eval $(call gb_CppunitTest_use_components,sc_importdescriptorbaseobj,\ -$(sc_unoapi_common_components) \ + $(sc_unoapi_common_components) \ )) $(eval $(call gb_CppunitTest_use_configuration,sc_importdescriptorbaseobj)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/impedit2.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 65eaebd2879c18926d4672c9276ef7f73f87af99
Author: Paul Trojahn
AuthorDate: Mon Jul 9 20:36:09 2018 +0200
Commit: Caolán McNamara
CommitDate: Thu Jul 26 17:57:02 2018 +0200
tdf#115438 Fix freeze when pasting unformatted text
ImpConnectParagraphs calls TextModified, which calculates the selection
rectangles of
the paragraph for accessibility services by calling DrawSelectionXOR. When
calling ImpConnectParagraphs from ImpDeleteSelection, the selection isn't
valid, because UpdateSelection wasn't called yet. DrawSelectionXOR ends up
freezing the application, because pEndNode isn't valid.
This can be fixed by calling EnterBlockNotifications, to deliver the
notification
sent by TextModified when the insertion is done.
Change-Id: Ia3a0e5b59a28f3503cbc54da682fcdaa5af277be
Reviewed-on: https://gerrit.libreoffice.org/57286
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index f3c9930ed9e8..bd641ce70b7b 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -624,7 +624,9 @@ bool ImpEditEngine::MouseMove( const MouseEvent& rMEvt,
EditView* pView )
EditPaM ImpEditEngine::InsertText(const EditSelection& aSel, const OUString&
rStr)
{
+EnterBlockNotifications();
EditPaM aPaM = ImpInsertText( aSel, rStr );
+LeaveBlockNotifications();
return aPaM;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/docsh.hxx | 12
sw/source/core/doc/DocumentStatisticsManager.cxx | 31 ---
sw/source/uibase/app/docsh.cxx | 28
3 files changed, 41 insertions(+), 30 deletions(-)
New commits:
commit e2a5932da7a3df9f6440f8326520061caa2342c1
Author: Mike Kaganski
AuthorDate: Thu Jul 26 16:14:46 2018 +1000
Commit: Caolán McNamara
CommitDate: Thu Jul 26 17:42:09 2018 +0200
tdf#41063: don't jump to cursor when saving
Reuse the fix from commits e12184393f0591b5c5d9218062cc0a4bced6d4e6
and 36c84fa3fbd03e5f651ba9d81e321566c8fcdbd0.
Change-Id: I5b7cdc321c6e30e994732d2c0295e494a172a2e2
Reviewed-on: https://gerrit.libreoffice.org/58034
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 9a88de3abeb6..f2c17c1747c1 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -51,6 +51,7 @@ class IDocumentDeviceAccess;
class IDocumentChartDataProviderAccess;
class SwDocShell;
class SwDrawModel;
+class SwViewShell;
namespace svt
{
class EmbeddedObjectRef;
@@ -318,6 +319,17 @@ public:
void RegisterAutomationDocumentEventsCaller(css::uno::Reference<
ooo::vba::XSinkCaller > const& xCaller);
void CallAutomationDocumentEventSinks(const OUString& Method,
css::uno::Sequence< css::uno::Any >& Arguments);
void RegisterAutomationDocumentObject(css::uno::Reference<
ooo::vba::word::XDocument > const& xDocument);
+
+class LockAllViewsGuard
+{
+std::vector m_aViewWasUnLocked;
+
+public:
+explicit LockAllViewsGuard(SwViewShell* pViewShell);
+~LockAllViewsGuard();
+};
+// Lock all unlocked views, and returns a guard object which unlocks those
views when destructed
+std::unique_ptr LockAllViews();
};
/** Find the right DocShell and create a new one:
diff --git a/sw/source/core/doc/DocumentStatisticsManager.cxx
b/sw/source/core/doc/DocumentStatisticsManager.cxx
index 0b8003283fb0..394aee67856a 100644
--- a/sw/source/core/doc/DocumentStatisticsManager.cxx
+++ b/sw/source/core/doc/DocumentStatisticsManager.cxx
@@ -39,35 +39,6 @@
using namespace ::com::sun::star;
-namespace
-{
-class LockAllViews
-{
-std::vector m_aViewWasUnLocked;
-SwViewShell* m_pViewShell;
-public:
-explicit LockAllViews(SwViewShell *pViewShell)
-: m_pViewShell(pViewShell)
-{
-if (!m_pViewShell)
-return;
-for (SwViewShell& rShell : m_pViewShell->GetRingContainer())
-{
-if (!rShell.IsViewLocked())
-{
-m_aViewWasUnLocked.push_back(&rShell);
-rShell.LockView(true);
-}
-}
-}
-~LockAllViews()
-{
-for(SwViewShell* pShell : m_aViewWasUnLocked)
-pShell->LockView(false);
-}
-};
-}
-
namespace sw
{
@@ -218,7 +189,7 @@ bool
DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF
const ModifyBlocker_Impl b(pObjShell);
// rhbz#1081176: don't jump to cursor pos because of (temporary)
// activation of modified flag triggering move to input position
-LockAllViews aViewGuard(pObjShell->GetEditShell());
+auto aViewGuard(pObjShell->LockAllViews());
xDocProps->setDocumentStatistics(aStat);
if (!bDocWasModified)
{
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 2a40bc1d12da..ee1fa8228b4d 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -130,6 +130,7 @@
#include
#include
+#include
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -382,10 +383,37 @@ bool SwDocShell::Save()
return !nErr.IsError();
}
+SwDocShell::LockAllViewsGuard::LockAllViewsGuard(SwViewShell* pViewShell)
+{
+if (!pViewShell)
+return;
+for (SwViewShell& rShell : pViewShell->GetRingContainer())
+{
+if (!rShell.IsViewLocked())
+{
+m_aViewWasUnLocked.push_back(&rShell);
+rShell.LockView(true);
+}
+}
+}
+
+SwDocShell::LockAllViewsGuard::~LockAllViewsGuard()
+{
+for (SwViewShell* pShell : m_aViewWasUnLocked)
+pShell->LockView(false);
+}
+
+std::unique_ptr SwDocShell::LockAllViews()
+{
+return o3tl::make_unique(GetEditShell());
+}
+
// Save using the Defaultformat
bool SwDocShell::SaveAs( SfxMedium& rMedium )
{
SwWait aWait( *this, true );
+// tdf#41063: prevent jumping to cursor at any temporary modification
+auto aViewGuard(LockAllViews());
//#i3370# remove quick help to prevent saving of autocorrection suggestions
if (m_pView)
m_pView->GetEditWin().StopQuickHelp();
___
Libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/inc/ObjectIdentifier.hxx |1 -
chart2/source/tools/ObjectIdentifier.cxx |6 --
2 files changed, 7 deletions(-)
New commits:
commit 4c702afe205a778b73b50cd95bc4f28b98baca44
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 12:02:33 2018 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 26 17:32:53 2018 +0200
chart2: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by removing explicitly user-provided functions that do the same as their
implicitly-defined counterparts, but may prevent implicitly declared copy
functions from being defined as non-deleted in the future. (Even if such a
user-provided function was declared non-inline in an include file, the
apparently-used implicitly-defined copy functions are already inline, so why
bother with non-inline functions.)
Change-Id: If96d3b6ca79416127933e7f22e3628361604efe1
Reviewed-on: https://gerrit.libreoffice.org/58069
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/chart2/source/inc/ObjectIdentifier.hxx
b/chart2/source/inc/ObjectIdentifier.hxx
index e2b81c617a15..8cb3c3c4ad37 100644
--- a/chart2/source/inc/ObjectIdentifier.hxx
+++ b/chart2/source/inc/ObjectIdentifier.hxx
@@ -92,7 +92,6 @@ public:
ObjectIdentifier( const css::uno::Reference< css::drawing::XShape >&
rxShape );
ObjectIdentifier( const css::uno::Any& rAny );
-ObjectIdentifier( const ObjectIdentifier& rOID );
bool operator==( const ObjectIdentifier& rOID ) const;
bool operator!=( const ObjectIdentifier& rOID ) const;
bool operator<( const ObjectIdentifier& rOID ) const;
diff --git a/chart2/source/tools/ObjectIdentifier.cxx
b/chart2/source/tools/ObjectIdentifier.cxx
index fbfcb6954462..b4c9840f5848 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -271,12 +271,6 @@ ObjectIdentifier::ObjectIdentifier( const Any& rAny )
}
}
-ObjectIdentifier::ObjectIdentifier( const ObjectIdentifier& rOID )
-:m_aObjectCID( rOID.m_aObjectCID )
-,m_xAdditionalShape( rOID.m_xAdditionalShape )
-{
-}
-
bool ObjectIdentifier::operator==( const ObjectIdentifier& rOID ) const
{
return areIdenticalObjects( m_aObjectCID, rOID.m_aObjectCID ) &&
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/basegfx
include/basegfx/point/b3dpoint.hxx |9 -
include/basegfx/vector/b3dvector.hxx |9 -
2 files changed, 18 deletions(-)
New commits:
commit 9ba1acca680e80a81d67b9429284840b7121
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 11:58:33 2018 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 26 17:04:32 2018 +0200
basegfx: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by removing explicitly user-provided functions that do the same as their
implicitly-defined counterparts, but may prevent implicitly declared copy
functions from being defined as non-deleted in the future
Change-Id: I88d3024ddfa51fc32de71af50cdfadb16ff93ffd
Reviewed-on: https://gerrit.libreoffice.org/58066
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/basegfx/point/b3dpoint.hxx
b/include/basegfx/point/b3dpoint.hxx
index c2711202d3de..c044e6bb6ec7 100644
--- a/include/basegfx/point/b3dpoint.hxx
+++ b/include/basegfx/point/b3dpoint.hxx
@@ -64,15 +64,6 @@ namespace basegfx
: B3DTuple(fX, fY, fZ)
{}
-/** Create a copy of a 3D Point
-
-@param rVec
-The 3D Point which will be copied.
-*/
-B3DPoint(const B3DPoint& rVec)
-: B3DTuple(rVec)
-{}
-
/** constructor with tuple to allow copy-constructing
from B3DTuple-based classes
*/
diff --git a/include/basegfx/vector/b3dvector.hxx
b/include/basegfx/vector/b3dvector.hxx
index efb37aa3f15d..e368f8849091 100644
--- a/include/basegfx/vector/b3dvector.hxx
+++ b/include/basegfx/vector/b3dvector.hxx
@@ -64,15 +64,6 @@ namespace basegfx
: B3DTuple(fX, fY, fZ)
{}
-/** Create a copy of a 3D Vector
-
-@param rVec
-The 3D Vector which will be copied.
-*/
-B3DVector(const B3DVector& rVec)
-: B3DTuple(rVec)
-{}
-
/** constructor with tuple to allow copy-constructing
from B3DTuple-based classes
*/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lingucomponent/source
lingucomponent/source/languageguessing/guess.cxx |4
lingucomponent/source/languageguessing/guess.hxx |2 --
2 files changed, 6 deletions(-)
New commits:
commit d6ecc3562b0628b1c3e0cac3b4e7a39f4038e2e8
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 11:45:43 2018 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 26 16:49:36 2018 +0200
lingucomponent: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by removing explicitly user-provided functions that do the same as their
implicitly-defined counterparts, but may prevent implicitly declared copy
functions from being defined as non-deleted in the future. (Even if a dtor
was
declared non-inline in an include file, the apparently-used
implicitly-defined
copy functions are already inline, so why bother with a non-inline dtor.)
Change-Id: Ib8eea8d4d2088c8a32c5938985ad14e4609a4237
Reviewed-on: https://gerrit.libreoffice.org/58060
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/lingucomponent/source/languageguessing/guess.cxx
b/lingucomponent/source/languageguessing/guess.cxx
index 7c578672d19e..e802c0ed95e1 100644
--- a/lingucomponent/source/languageguessing/guess.cxx
+++ b/lingucomponent/source/languageguessing/guess.cxx
@@ -104,8 +104,4 @@ Guess::Guess(const char * guess_str)
}
}
-Guess::~Guess()
-{
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lingucomponent/source/languageguessing/guess.hxx
b/lingucomponent/source/languageguessing/guess.hxx
index 9277f94c559d..d85db86900f8 100644
--- a/lingucomponent/source/languageguessing/guess.hxx
+++ b/lingucomponent/source/languageguessing/guess.hxx
@@ -43,8 +43,6 @@ class Guess final {
*/
Guess(const char * guess_str);
-~Guess();
-
const string& GetLanguage() { return language_str;}
const string& GetCountry() { return country_str;}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/qa
0 files changed New commits: commit 601c7bd8eaf2582443c6ccaa58391e52e3ea3bb7 Author: Andrea Gelmini AuthorDate: Wed Jul 25 18:19:49 2018 +0200 Commit: Julien Nabet CommitDate: Thu Jul 26 16:39:34 2018 +0200 Removed execution flag on pptx file Change-Id: Ia73b1d9cf740e8fc086885951d48cd2d4bf2d786 Reviewed-on: https://gerrit.libreoffice.org/57994 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/sd/qa/unit/data/pptx/tdf50499.pptx b/sd/qa/unit/data/pptx/tdf50499.pptx old mode 100755 new mode 100644 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/source
basctl/source/inc/bastype2.hxx |5 +
basctl/source/inc/dlgedobj.hxx |5 +
2 files changed, 10 insertions(+)
New commits:
commit d4d7b64cf02439b08eadf33ef7d5074c40d0de8d
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 11:55:25 2018 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 26 16:28:01 2018 +0200
basctl: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by explicitly defaulting the copy/move functions (and, where needed in
turn,
also a default ctor) for classes that have a user-declared dtor that does
nothing other than an implicitly-defined one would do, but needs to be user-
declared because it is virtual and potentially serves as a key function to
emit the vtable, or is non-public, etc.
Change-Id: Ib343070f809c364290d1747372508437692df5cd
Reviewed-on: https://gerrit.libreoffice.org/58064
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/basctl/source/inc/bastype2.hxx b/basctl/source/inc/bastype2.hxx
index 0cdd6826cb5a..e4f82a9d06a5 100644
--- a/basctl/source/inc/bastype2.hxx
+++ b/basctl/source/inc/bastype2.hxx
@@ -77,6 +77,11 @@ public:
virtual ~Entry();
+Entry(Entry const &) = default;
+Entry(Entry &&) = default;
+Entry & operator =(Entry const &) = default;
+Entry & operator =(Entry &&) = default;
+
EntryType GetType () const { return m_eType; }
};
diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx
index 0e6898636806..e845ba288ac2 100644
--- a/basctl/source/inc/dlgedobj.hxx
+++ b/basctl/source/inc/dlgedobj.hxx
@@ -90,6 +90,11 @@ protected:
sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32&
nHeightOut );
public:
+DlgEdObj(DlgEdObj const &) = default;
+DlgEdObj(DlgEdObj &&) = default;
+DlgEdObj & operator =(DlgEdObj const &) = default;
+DlgEdObj & operator =(DlgEdObj &&) = default;
+
void SetDlgEdForm( DlgEdForm* pForm ) { pDlgEdForm = pForm; }
DlgEdForm* GetDlgEdForm() const { return pDlgEdForm; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source
basic/source/comp/scanner.cxx |3 ---
basic/source/comp/token.cxx |5 -
basic/source/inc/scanner.hxx |1 -
basic/source/inc/token.hxx|1 -
4 files changed, 10 deletions(-)
New commits:
commit e6ab9174b02aa6240ed9c4392a0e1b0c261d3481
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 11:56:40 2018 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 26 16:27:20 2018 +0200
basic: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by removing explicitly user-provided functions that do the same as their
implicitly-defined counterparts, but may prevent implicitly declared copy
functions from being defined as non-deleted in the future. (Even if a dtor
was
declared non-inline in an include file, the apparently-used
implicitly-defined
copy functions are already inline, so why bother with a non-inline dtor.)
Change-Id: I8a31ab0c806cb0f3c226d217f152a205aff6c07f
Reviewed-on: https://gerrit.libreoffice.org/58065
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index fe6263a39f90..821f231aea20 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -53,9 +53,6 @@ SbiScanner::SbiScanner( const OUString& rBuf, StarBASIC* p )
: aBuf( rBuf )
nSaveLineIdx = -1;
}
-SbiScanner::~SbiScanner()
-{}
-
void SbiScanner::LockColumn()
{
if( !nColLock++ )
diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx
index 4cb564d0b62e..3b6d81416fc0 100644
--- a/basic/source/comp/token.cxx
+++ b/basic/source/comp/token.cxx
@@ -217,11 +217,6 @@ SbiTokenizer::SbiTokenizer( const OUString& rSrc,
StarBASIC* pb )
{
}
-SbiTokenizer::~SbiTokenizer()
-{
-}
-
-
void SbiTokenizer::Push( SbiToken t )
{
if( ePush != NIL )
diff --git a/basic/source/inc/scanner.hxx b/basic/source/inc/scanner.hxx
index b0b0b00590f7..5b5b03653b3b 100644
--- a/basic/source/inc/scanner.hxx
+++ b/basic/source/inc/scanner.hxx
@@ -67,7 +67,6 @@ protected:
void GenError( ErrCode );
public:
SbiScanner( const OUString&, StarBASIC* = nullptr );
- ~SbiScanner();
void EnableErrors(){ bError = false; }
bool IsHash() { return bHash; }
diff --git a/basic/source/inc/token.hxx b/basic/source/inc/token.hxx
index 598d20c15e42..fd991ba1bb6e 100644
--- a/basic/source/inc/token.hxx
+++ b/basic/source/inc/token.hxx
@@ -111,7 +111,6 @@ protected:
bool bErrorIsSymbol;// Handle Error token as Symbol, not
keyword
public:
SbiTokenizer( const OUString&, StarBASIC* = nullptr );
- ~SbiTokenizer();
bool IsEof() { return bEof; }
bool IsEos() { return bEos; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: registry/source
registry/source/reflwrit.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit d9f81ecb1f8a6142379d85a7c6b1fdb54c57ad22
Author: Caolán McNamara
AuthorDate: Thu Jul 26 10:48:53 2018 +0100
Commit: Stephan Bergmann
CommitDate: Thu Jul 26 16:26:18 2018 +0200
Related: rhbz#1602589 silence error[memleak]: Memory leak: newValue
Change-Id: I2d04c75aa9b5e1d91e06992fdb99899657ecf96d
Reviewed-on: https://gerrit.libreoffice.org/58062
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index 53b6d9d0e175..dc3e2a15b603 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -377,11 +377,11 @@ void FieldEntry::setData(const OString&name,
RTValueTypeconstValueType,
RTConstValueUnion constValue)
{
-sal_Unicode * newValue = nullptr;
+std::unique_ptr newValue;
if (constValueType == RT_TYPE_STRING && constValue.aString != nullptr) {
sal_Int32 n = rtl_ustr_getLength(constValue.aString) + 1;
-newValue = new sal_Unicode[n];
-memcpy(newValue, constValue.aString, n * sizeof (sal_Unicode));
+newValue.reset(new sal_Unicode[n]);
+memcpy(newValue.get(), constValue.aString, n * sizeof (sal_Unicode));
}
m_name = name;
@@ -407,7 +407,7 @@ void FieldEntry::setData(const OString&name,
m_constValue.aString = NULL_WSTRING;
else
{
-m_constValue.aString = newValue;
+m_constValue.aString = newValue.release();
}
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0-6' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 336d361f4dde4f0d3fb853283cbf1fda25de39c1 Author: Christian Lohmaier AuthorDate: Thu Jul 26 15:15:19 2018 +0200 Commit: Gerrit Code Review CommitDate: Thu Jul 26 16:10:10 2018 +0200 Update git submodules * Update translations from branch 'libreoffice-6-0-6' - update translations for 6.0.6 rc2 Change-Id: I9eacfe05198dd4b0dbf603364e39485d31a124ce (cherry picked from commit bf8c15850b7d8d10ad5337ccd110e6f20b95ca4b) - Version 6.0.6.1, tag libreoffice-6.0.6.1 Change-Id: I15ad764665dc90d8c892ebf23da4b466765c4050 diff --git a/translations b/translations index 2d3d0e7a1328..f469110c4411 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 2d3d0e7a1328293745c974e6cfb95eb455287f4c +Subproject commit f469110c44112963f188984e67366996c457ba7c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-6-0-6' - 2 commits - source/ab source/am source/bg source/da source/de source/es source/et source/ne source/nl source/pl source/pt source/tr
source/ab/cui/messages.po | 14 - source/ab/dbaccess/messages.po | 10 - source/ab/extensions/messages.po |8 source/ab/librelogo/source/pythonpath.po |6 source/ab/officecfg/registry/data/org/openoffice/Office/UI.po | 58 ++ source/ab/sc/messages.po | 34 ++-- source/ab/svx/messages.po | 16 - source/ab/sw/messages.po |8 source/am/officecfg/registry/data/org/openoffice/Office/UI.po |6 source/bg/helpcontent2/source/text/scalc/01.po |6 source/bg/helpcontent2/source/text/scalc/guide.po |8 source/bg/helpcontent2/source/text/shared/00.po|8 source/bg/helpcontent2/source/text/shared/01.po|8 source/bg/helpcontent2/source/text/shared/02.po| 32 +-- source/bg/helpcontent2/source/text/shared/04.po| 12 - source/bg/helpcontent2/source/text/simpress.po |8 source/bg/helpcontent2/source/text/smath/01.po |6 source/bg/svx/messages.po |6 source/da/instsetoo_native/inc_openoffice/windows/msi_languages.po |6 source/da/scp2/source/draw.po |6 source/de/extensions/messages.po |8 source/de/helpcontent2/source/text/scalc/01.po |6 source/de/helpcontent2/source/text/shared/01.po| 16 - source/de/helpcontent2/source/text/shared/02.po| 12 - source/de/helpcontent2/source/text/shared/05.po|6 source/de/helpcontent2/source/text/shared/explorer/database.po |6 source/de/helpcontent2/source/text/shared/guide.po | 10 - source/de/helpcontent2/source/text/simpress/guide.po |6 source/de/helpcontent2/source/text/smath/00.po |6 source/de/helpcontent2/source/text/smath/01.po | 12 - source/de/officecfg/registry/data/org/openoffice/Office/UI.po | 10 - source/de/sc/messages.po |8 source/de/sfx2/messages.po |8 source/es/cui/messages.po |6 source/es/dbaccess/messages.po |6 source/es/helpcontent2/source/text/sbasic/guide.po |6 source/es/helpcontent2/source/text/sbasic/shared.po| 14 - source/es/helpcontent2/source/text/scalc/01.po |6 source/es/helpcontent2/source/text/shared/05.po| 12 - source/es/helpcontent2/source/text/shared/guide.po | 10 - source/es/helpcontent2/source/text/shared/optionen.po |6 source/es/helpcontent2/source/text/smath/00.po |6 source/es/helpcontent2/source/text/smath/01.po | 10 - source/es/officecfg/registry/data/org/openoffice/Office/UI.po | 12 - source/es/sc/messages.po | 10 - source/es/sd/messages.po | 13 - source/es/sw/messages.po | 35 ++-- source/et/cui/messages.po |8 source/et/readlicense_oo/docs.po |8 source/et/scp2/source/ooo.po | 10 - source/et/sfx2/messages.po | 15 + source/ne/chart2/messages.po | 12 - source/ne/helpcontent2/source/auxiliary.po | 18 +- source/ne/helpcontent2/source/text/sbasic/guide.po |6 source/nl/cui/messages.po |8 source/nl/officecfg/registry/data/org/openoffice/Office/UI.po |8 source/pl/dictionaries/gd_GB.po| 11 - source/pl/dictionaries/gug.po | 11 - source/pl/extras/source/autocorr/emoji.po |8 source/pl/formula/messages.po |5 source/pl/helpcontent2/source/text/scalc/guide.po | 10 - source/pl/helpcontent2/source/text/simpress/00.po | 10 - source/pl/helpcontent2/source/text/simpress/01.po | 12 - source/pl/helpcontent2/source/text/swriter/01.po |6 source/pl/helpcontent2/source/text/swriter/guide.po| 10 - source/pl/off
[Libreoffice-commits] translations.git: Branch 'libreoffice-6-0' - source/ab source/am source/bg source/da source/de source/es source/et source/ne source/nl source/pl source/pt source/tr source/zh-CN
source/ab/cui/messages.po | 14 - source/ab/dbaccess/messages.po | 10 - source/ab/extensions/messages.po |8 source/ab/librelogo/source/pythonpath.po |6 source/ab/officecfg/registry/data/org/openoffice/Office/UI.po | 58 ++ source/ab/sc/messages.po | 34 ++-- source/ab/svx/messages.po | 16 - source/ab/sw/messages.po |8 source/am/officecfg/registry/data/org/openoffice/Office/UI.po |6 source/bg/helpcontent2/source/text/scalc/01.po |6 source/bg/helpcontent2/source/text/scalc/guide.po |8 source/bg/helpcontent2/source/text/shared/00.po|8 source/bg/helpcontent2/source/text/shared/01.po|8 source/bg/helpcontent2/source/text/shared/02.po| 32 +-- source/bg/helpcontent2/source/text/shared/04.po| 12 - source/bg/helpcontent2/source/text/simpress.po |8 source/bg/helpcontent2/source/text/smath/01.po |6 source/bg/svx/messages.po |6 source/da/instsetoo_native/inc_openoffice/windows/msi_languages.po |6 source/da/scp2/source/draw.po |6 source/de/extensions/messages.po |8 source/de/helpcontent2/source/text/scalc/01.po |6 source/de/helpcontent2/source/text/shared/01.po| 16 - source/de/helpcontent2/source/text/shared/02.po| 12 - source/de/helpcontent2/source/text/shared/05.po|6 source/de/helpcontent2/source/text/shared/explorer/database.po |6 source/de/helpcontent2/source/text/shared/guide.po | 10 - source/de/helpcontent2/source/text/simpress/guide.po |6 source/de/helpcontent2/source/text/smath/00.po |6 source/de/helpcontent2/source/text/smath/01.po | 12 - source/de/officecfg/registry/data/org/openoffice/Office/UI.po | 10 - source/de/sc/messages.po |8 source/de/sfx2/messages.po |8 source/es/cui/messages.po |6 source/es/dbaccess/messages.po |6 source/es/helpcontent2/source/text/sbasic/guide.po |6 source/es/helpcontent2/source/text/sbasic/shared.po| 14 - source/es/helpcontent2/source/text/scalc/01.po |6 source/es/helpcontent2/source/text/shared/05.po| 12 - source/es/helpcontent2/source/text/shared/guide.po | 10 - source/es/helpcontent2/source/text/shared/optionen.po |6 source/es/helpcontent2/source/text/smath/00.po |6 source/es/helpcontent2/source/text/smath/01.po | 10 - source/es/officecfg/registry/data/org/openoffice/Office/UI.po | 12 - source/es/sc/messages.po | 10 - source/es/sd/messages.po | 13 - source/es/sw/messages.po | 35 ++-- source/et/cui/messages.po |8 source/et/readlicense_oo/docs.po |8 source/et/scp2/source/ooo.po | 10 - source/et/sfx2/messages.po | 15 + source/ne/chart2/messages.po | 12 - source/ne/helpcontent2/source/auxiliary.po | 18 +- source/ne/helpcontent2/source/text/sbasic/guide.po |6 source/nl/cui/messages.po |8 source/nl/officecfg/registry/data/org/openoffice/Office/UI.po |8 source/pl/dictionaries/gd_GB.po| 11 - source/pl/dictionaries/gug.po | 11 - source/pl/extras/source/autocorr/emoji.po |8 source/pl/formula/messages.po |5 source/pl/helpcontent2/source/text/scalc/guide.po | 10 - source/pl/helpcontent2/source/text/simpress/00.po | 10 - source/pl/helpcontent2/source/text/simpress/01.po | 12 - source/pl/helpcontent2/source/text/swriter/01.po |6 source/pl/helpcontent2/source/text/swriter/guide.po| 10 - source/pl/off
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit da12ffb0eca94c1a1af7f4545d0521dd47146f09 Author: Christian Lohmaier AuthorDate: Thu Jul 26 15:15:19 2018 +0200 Commit: Gerrit Code Review CommitDate: Thu Jul 26 16:08:08 2018 +0200 Update git submodules * Update translations from branch 'libreoffice-6-0' - update translations for 6.0.6 rc2 Change-Id: I9eacfe05198dd4b0dbf603364e39485d31a124ce diff --git a/translations b/translations index 3072ac1240b2..bf8c15850b7d 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 3072ac1240b255ae78a2eed2936430307e39e5ce +Subproject commit bf8c15850b7d8d10ad5337ccd110e6f20b95ca4b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ucb/source
ucb/source/ucp/webdav-neon/NeonUri.cxx |4
ucb/source/ucp/webdav-neon/NeonUri.hxx |1 -
ucb/source/ucp/webdav-neon/PropfindCache.cxx | 11 ---
ucb/source/ucp/webdav-neon/PropfindCache.hxx |2 --
4 files changed, 18 deletions(-)
New commits:
commit a42a7a5d782baf7c8082f064b11cb2192dba07c5
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 11:48:29 2018 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 26 16:00:14 2018 +0200
ucb: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by removing explicitly user-provided functions that do the same as their
implicitly-defined counterparts, but may prevent implicitly declared copy
functions from being defined as non-deleted in the future. (Even if such a
user-provided function was declared non-inline in an include file, the
apparently-used implicitly-defined copy functions are already inline, so why
bother with non-inline functions.)
Change-Id: I6cd0ac297240ce868442ab7f8b4f1ba46c68d409
Reviewed-on: https://gerrit.libreoffice.org/58063
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/ucb/source/ucp/webdav-neon/NeonUri.cxx
b/ucb/source/ucp/webdav-neon/NeonUri.cxx
index b6ecafc96892..6a825682a6dc 100644
--- a/ucb/source/ucp/webdav-neon/NeonUri.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonUri.cxx
@@ -147,10 +147,6 @@ void NeonUri::init( const OString & rUri, const ne_uri *
pUri )
}
}
-NeonUri::~NeonUri( )
-{
-}
-
void NeonUri::calculateURI ()
{
OUStringBuffer aBuf( mScheme );
diff --git a/ucb/source/ucp/webdav-neon/NeonUri.hxx
b/ucb/source/ucp/webdav-neon/NeonUri.hxx
index fdd5b4a4afcd..fae505e501f5 100644
--- a/ucb/source/ucp/webdav-neon/NeonUri.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonUri.hxx
@@ -59,7 +59,6 @@ class NeonUri
explicit NeonUri( const OUString & inUri );
/// @throws DAVException
explicit NeonUri( const ne_uri * inUri );
-~NeonUri( );
bool operator== ( const NeonUri & rOther ) const;
bool operator!= ( const NeonUri & rOther ) const
diff --git a/ucb/source/ucp/webdav-neon/PropfindCache.cxx
b/ucb/source/ucp/webdav-neon/PropfindCache.cxx
index b854e6fda323..546c6c8545f7 100644
--- a/ucb/source/ucp/webdav-neon/PropfindCache.cxx
+++ b/ucb/source/ucp/webdav-neon/PropfindCache.cxx
@@ -29,17 +29,6 @@ namespace webdav_ucp
{
}
-PropertyNames::PropertyNames( const PropertyNames& theOther ) :
-m_nStaleTime( theOther.m_nStaleTime ),
-m_sURL( theOther.m_sURL ),
-m_aPropertiesNames( theOther.m_aPropertiesNames )
-{
-}
-
-PropertyNames::~PropertyNames()
-{
-}
-
//PropertyNamesCache implementation
PropertyNamesCache::PropertyNamesCache()
diff --git a/ucb/source/ucp/webdav-neon/PropfindCache.hxx
b/ucb/source/ucp/webdav-neon/PropfindCache.hxx
index 76a951afbdcd..d6cb13df6935 100644
--- a/ucb/source/ucp/webdav-neon/PropfindCache.hxx
+++ b/ucb/source/ucp/webdav-neon/PropfindCache.hxx
@@ -42,8 +42,6 @@ namespace webdav_ucp
public:
PropertyNames();
explicit PropertyNames( const OUString& rURL );
-PropertyNames( const PropertyNames& theOther );
-~PropertyNames();
sal_uInt32 getStaleTime() const { return m_nStaleTime; };
void setStaleTime( const sal_uInt32 nStaleTime ) { m_nStaleTime =
nStaleTime; };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/conditionalentry.ui |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit f5b7eb35bfbb80690d6d8191336e14859b9e4d60 Author: heiko tietze AuthorDate: Thu Jul 26 11:02:30 2018 +0200 Commit: Heiko Tietze CommitDate: Thu Jul 26 15:33:14 2018 +0200 tdf#117647 - Conditional formatting of "Top 10..." misleading "Top 10..." misses the option to enter different values; changed top "Top N..." Change-Id: I919fe48cce08ddd52a5f7246b77853c1b8c14253 Reviewed-on: https://gerrit.libreoffice.org/58052 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sc/uiconfig/scalc/ui/conditionalentry.ui b/sc/uiconfig/scalc/ui/conditionalentry.ui index fd713b4882ea..46509e5d6274 100644 --- a/sc/uiconfig/scalc/ui/conditionalentry.ui +++ b/sc/uiconfig/scalc/ui/conditionalentry.ui @@ -258,10 +258,10 @@ not between duplicate not duplicate - top 10 elements - bottom 10 elements - top 10 percent - bottom 10 percent + top N elements + bottom N elements + top N percent + bottom N percent above average below average above or equal average ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/toolbar/standardbar.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 350dd849194fe793e07c7080a95abf6cb97cf859 Author: heiko tietze AuthorDate: Thu Jul 26 10:28:58 2018 +0200 Commit: Heiko Tietze CommitDate: Thu Jul 26 15:32:55 2018 +0200 tdf#118539 - Recent Characters Toolbar Dropdown Control on toolbar Change-Id: I2d1ec76b11c44f258b2bfbbb7d3f00259bfb4f1f Reviewed-on: https://gerrit.libreoffice.org/58045 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml b/sw/uiconfig/swriter/toolbar/standardbar.xml index 5b97d40f10b7..e3acc2ecd1d3 100644 --- a/sw/uiconfig/swriter/toolbar/standardbar.xml +++ b/sw/uiconfig/swriter/toolbar/standardbar.xml @@ -61,8 +61,8 @@ - - + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18nlangtag/source include/i18nlangtag
i18nlangtag/source/languagetag/languagetag.cxx |6 --
include/i18nlangtag/languagetag.hxx|2 --
2 files changed, 8 deletions(-)
New commits:
commit e9cca2f5e66604ec9bf38fccc6949c7d68a6010c
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 11:34:38 2018 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 26 15:25:56 2018 +0200
i18nlangtag: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by removing explicitly user-provided functions that do the same as their
implicitly-defined counterparts, but may prevent implicitly declared copy
functions from being defined as non-deleted in the future. (Even if a dtor
was
declared non-inline in an include file, the apparently-used
implicitly-defined
copy functions are already inline, so why bother with a non-inline dtor.)
Change-Id: I6de6b84ebd177f494864d7de91e538fa5a64985c
Reviewed-on: https://gerrit.libreoffice.org/58058
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx
b/i18nlangtag/source/languagetag/languagetag.cxx
index d46ff8bba324..fd3f1156c744 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -559,12 +559,6 @@ LanguageTag::LanguageTag( const rtl_Locale & rLocale )
convertFromRtlLocale();
}
-
-LanguageTag::~LanguageTag()
-{
-}
-
-
LanguageTag::ImplPtr LanguageTagImpl::registerOnTheFly( LanguageType
nRegisterID )
{
LanguageTag::ImplPtr pImpl;
diff --git a/include/i18nlangtag/languagetag.hxx
b/include/i18nlangtag/languagetag.hxx
index 1bab1806e959..9f3dc877d9de 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -107,8 +107,6 @@ public:
*/
explicit LanguageTag( const rtl_Locale & rLocale );
-~LanguageTag();
-
/** Obtain BCP 47 language tag.
@param bResolveSystem
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: jvmfwk/inc jvmfwk/source
jvmfwk/inc/elements.hxx|1 -
jvmfwk/source/elements.cxx |4
2 files changed, 5 deletions(-)
New commits:
commit 2b4b94e8f0b7a8484ce70c701580b5a20fd0d14d
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 11:38:32 2018 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 26 15:26:15 2018 +0200
jvmfwk: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by removing explicitly user-provided functions that do the same as their
implicitly-defined counterparts, but may prevent implicitly declared copy
functions from being defined as non-deleted in the future. (Even if a dtor
was
declared non-inline in an include file, the apparently-used
implicitly-defined
copy functions are already inline, so why bother with a non-inline dtor.)
Change-Id: I1330a9fd4fc7f8fe8525b3ea02f9edb9e88e6638
Reviewed-on: https://gerrit.libreoffice.org/58059
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/jvmfwk/inc/elements.hxx b/jvmfwk/inc/elements.hxx
index eb174a4be3e9..5b540c567717 100644
--- a/jvmfwk/inc/elements.hxx
+++ b/jvmfwk/inc/elements.hxx
@@ -58,7 +58,6 @@ class CNodeJavaInfo
{
public:
CNodeJavaInfo();
-~CNodeJavaInfo();
/** if true, then javaInfo is empty. When writeToNode is called
then all child elements are deleted.
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index ff083373f553..24c60e8379c8 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -694,10 +694,6 @@ CNodeJavaInfo::CNodeJavaInfo() :
{
}
-CNodeJavaInfo::~CNodeJavaInfo()
-{
-}
-
void CNodeJavaInfo::loadFromNode(xmlDoc * pDoc, xmlNode * pJavaInfo)
{
OString sExcMsg("[Java framework] Error in function
NodeJavaInfo::loadFromNode "
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: idl/inc
idl/inc/database.hxx |7 ---
1 file changed, 7 deletions(-)
New commits:
commit f7f7eb79bf62318188f77558c5c9cfbaeab9ccd3
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 11:27:05 2018 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 26 14:44:29 2018 +0200
idl: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by removing explicitly user-provided functions that do the same as their
implicitly-defined counterparts, but may prevent implicitly declared copy
functions from being defined as non-deleted in the future
Change-Id: I75e356ee9e12bb2d88ed9db6c60c49b3f4ac5d58
Reviewed-on: https://gerrit.libreoffice.org/58056
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 86e45c0dc844..4d554ee964e1 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -44,13 +44,6 @@ public:
const OString& GetText() const { return aText; }
voidSetText( const OString& rT ) { aText = rT; }
boolIsError() const { return nLine != 0; }
-SvIdlError &operator = ( const SvIdlError & rRef )
-{
-aText = rRef.aText;
-nLine = rRef.nLine;
-nColumn = rRef.nColumn;
-return *this;
-}
};
class SvParseException : public std::exception
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/icu
external/icu/UnpackedTarball_icu.mk |3 +++ external/icu/gcc9.patch | 27 +++ 2 files changed, 30 insertions(+) New commits: commit cec34c9862ebcc2cb60951b690bbdd09d0c6989d Author: Stephan Bergmann AuthorDate: Thu Jul 26 10:29:18 2018 +0200 Commit: Stephan Bergmann CommitDate: Thu Jul 26 14:43:49 2018 +0200 external/icu: silence -Werror=deprecated-copy (GCC trunk towards GCC 9) Change-Id: I43ecb3c0daac421e48433af04b1109bac02cc9aa Reviewed-on: https://gerrit.libreoffice.org/58044 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk index 0abba05b5bbe..83a2968eb3fd 100644 --- a/external/icu/UnpackedTarball_icu.mk +++ b/external/icu/UnpackedTarball_icu.mk @@ -19,6 +19,8 @@ $(eval $(call gb_UnpackedTarball_set_pre_action,icu,\ unzip -q -d source -o $(gb_UnpackedTarget_TARFILE_LOCATION)/$(ICU_DATA_TARBALL) data/misc/icudata.rc \ )) +$(eval $(call gb_UnpackedTarball_set_patchlevel,icu,0)) + $(eval $(call gb_UnpackedTarball_add_patches,icu,\ external/icu/icu4c-build.patch.1 \ external/icu/icu4c-aix.patch.1 \ @@ -34,6 +36,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\ $(if $(filter-out ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \ external/icu/icu4c-khmerbreakengine.patch.1 \ external/icu/icu4c-61-werror-shadow.patch.1 \ + external/icu/gcc9.patch \ )) $(eval $(call gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict)) diff --git a/external/icu/gcc9.patch b/external/icu/gcc9.patch new file mode 100644 index ..5bacd203586f --- /dev/null +++ b/external/icu/gcc9.patch @@ -0,0 +1,27 @@ +--- source/i18n/unicode/format.h source/i18n/unicode/format.h +@@ -22,6 +22,13 @@ + + #ifndef FORMAT_H + #define FORMAT_H ++ ++#ifdef __GNUC__ ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wpragmas" // for old GCC ++#pragma GCC diagnostic ignored "-Wunknown-warning-option" // for Clang ++#pragma GCC diagnostic ignored "-Wdeprecated-copy" ++#endif + + + #include "unicode/utypes.h" +@@ -302,6 +309,10 @@ + U_NAMESPACE_END + + #endif /* #if !UCONFIG_NO_FORMATTING */ ++ ++#ifdef __GNUC__ ++#pragma GCC diagnostic pop ++#endif + + #endif // _FORMAT + //eof ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/xmloff xmloff/source
include/xmloff/maptype.hxx |2 --
xmloff/source/core/attrlist.cxx |5 -
2 files changed, 7 deletions(-)
New commits:
commit e0e1a2d756498d8e00a94bf7535d964f8df3e6ec
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 11:13:10 2018 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 26 14:43:03 2018 +0200
xmloff: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by removing explicitly user-provided functions that do the same as their
implicitly-defined counterparts, but may prevent implicitly declared copy
functions from being defined as non-deleted in the future
Change-Id: Idd25cd86db429b0f3391e359bb2617863b29eb67
Reviewed-on: https://gerrit.libreoffice.org/58053
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/xmloff/maptype.hxx b/include/xmloff/maptype.hxx
index 8a292008183e..0e944656f716 100644
--- a/include/xmloff/maptype.hxx
+++ b/include/xmloff/maptype.hxx
@@ -110,8 +110,6 @@ struct XMLPropertyState
: mnIndex( nIndex ) {}
XMLPropertyState( sal_Int32 nIndex, const css::uno::Any& rValue )
: mnIndex( nIndex ), maValue( rValue ) {}
-XMLPropertyState( const XMLPropertyState& rPropState )
-: mnIndex( rPropState.mnIndex ), maValue( rPropState.maValue ) {}
};
#endif // INCLUDED_XMLOFF_MAPTYPE_HXX
diff --git a/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx
index 5985ef2159be..5673d66f9d93 100644
--- a/xmloff/source/core/attrlist.cxx
+++ b/xmloff/source/core/attrlist.cxx
@@ -58,11 +58,6 @@ struct SvXMLAttributeList_Impl
vecAttribute.reserve(20);
}
-SvXMLAttributeList_Impl( const SvXMLAttributeList_Impl& r ) :
-vecAttribute( r.vecAttribute )
-{
-}
-
::std::vector vecAttribute;
typedef ::std::vector::size_type size_type;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c8da7130a1ccfe5115d5cd4d734536a2e73942a2 Author: Olivier Hallot AuthorDate: Wed Jul 25 19:04:26 2018 -0300 Commit: Gerrit Code Review CommitDate: Thu Jul 26 14:41:13 2018 +0200 Update git submodules * Update helpcontent2 from branch 'master' - tdf#115254 Some branch bookmarks are not working 8 module sw s- Change-Id: I8a8c40c6506f57caeb6de2d55181b4af91a28fce Reviewed-on: https://gerrit.libreoffice.org/58027 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 3fb1fda6051f..96108c111230 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 3fb1fda6051fafe343fde842a344192dbc5abe99 +Subproject commit 96108c1112300ab09d5e0632fe66cdf996d4443f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/01010202.xhp |2 ++ source/text/shared/01/01100400.xhp |2 ++ source/text/shared/01/06040500.xhp |8 +--- source/text/swriter/01/0216.xhp |2 ++ source/text/swriter/01/04020100.xhp |2 ++ source/text/swriter/01/05150101.xhp |1 + source/text/swriter/01/0519.xhp |3 ++- source/text/swriter/01/0610.xhp |1 + source/text/swriter/01/mm_seladdblo.xhp |3 ++- source/text/swriter/01/mm_seladdlis.xhp |3 ++- source/text/swriter/01/mm_seltab.xhp|1 + 11 files changed, 22 insertions(+), 6 deletions(-) New commits: commit 96108c1112300ab09d5e0632fe66cdf996d4443f Author: Olivier Hallot AuthorDate: Wed Jul 25 19:04:26 2018 -0300 Commit: Olivier Hallot CommitDate: Thu Jul 26 14:41:13 2018 +0200 tdf#115254 Some branch bookmarks are not working 8 module sw s- Change-Id: I8a8c40c6506f57caeb6de2d55181b4af91a28fce Reviewed-on: https://gerrit.libreoffice.org/58027 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/01010202.xhp b/source/text/shared/01/01010202.xhp index 01fa2d48d..7212b53c4 100644 --- a/source/text/shared/01/01010202.xhp +++ b/source/text/shared/01/01010202.xhp @@ -30,6 +30,7 @@ + Format Set paper formatting options. @@ -63,6 +64,7 @@ Save Saves the current label or business card format. + Save Label Format diff --git a/source/text/shared/01/01100400.xhp b/source/text/shared/01/01100400.xhp index 6f6da836e..798a03509 100644 --- a/source/text/shared/01/01100400.xhp +++ b/source/text/shared/01/01100400.xhp @@ -38,7 +38,9 @@ OLE objects;number of + + Statistics Displays statistics for the current file. diff --git a/source/text/shared/01/06040500.xhp b/source/text/shared/01/06040500.xhp index 2fe9431ea..f3f628b43 100644 --- a/source/text/shared/01/06040500.xhp +++ b/source/text/shared/01/06040500.xhp @@ -1,6 +1,6 @@ - + - - + + AutoCorrect context menu @@ -35,8 +35,10 @@Click the word to replace the highlighted word. Use the AutoCorrect submenu for permanent replacement.UFI: see i60431 + + Spellcheck Opens the Spellcheck dialog. diff --git a/source/text/swriter/01/0216.xhp b/source/text/swriter/01/0216.xhp index 9aa7c396b..dc7ce767c 100644 --- a/source/text/swriter/01/0216.xhp +++ b/source/text/swriter/01/0216.xhp @@ -28,8 +28,10 @@ + + Edit Index Entry Edits the selected index entry. Click in front of or in the index entry, and then choose this command. diff --git a/source/text/swriter/01/04020100.xhp b/source/text/swriter/01/04020100.xhp index ca36186ad..824be672f 100644 --- a/source/text/swriter/01/04020100.xhp +++ b/source/text/swriter/01/04020100.xhp @@ -34,8 +34,10 @@ sections;inserting sections by DDE DDE; command for inserting sections + + Section Sets the properties of the section. diff --git a/source/text/swriter/01/05150101.xhp b/source/text/swriter/01/05150101.xhp index d48308e79..742cafecb 100644 --- a/source/text/swriter/01/05150101.xhp +++ b/source/text/swriter/01/05150101.xhp @@ -28,6 +28,7 @@ + tables;AutoFormat function styles;table styles diff --git a/source/text/swriter/01/0519.xhp b/source/text/swriter/01/0519.xhp index 653690139..e784db86f 100644 --- a/source/text/swriter/01/0519.xhp +++ b/source/text/swriter/01/0519.xhp @@ -18,7 +18,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + @@ -36,6 +36,7 @@ dividing tables + Split Table Splits the current table into two separate tables at the cursor position. You can also access this command by right-clicking in a table cell. diff --git a/source/text/swriter/01/0610.xhp b/source/text/swriter/01/0610.xhp index abfeb31c7..48f41ab73 100644 --- a/source/text/swriter/01/0610.xhp +++ b/source/text/swriter/01/0610.xhp @@ -37,6 +37,7 @@ + Sort Sorts the selected paragraphs or table rows alphabetically or numerically. You can define up to three sort keys as well as combine alphanumeric and numeric sort keys. diff --git a/source/text/swriter/01/mm_seladdblo.xhp b/source/text/swriter/01/mm_seladdblo.xhp index e99f771d7..919594e4b 100644 --- a/source/text/swriter/01/mm_seladdblo.xhp +++ b/source/text/swriter/01/mm_seladdblo.xhp @@ -18,7 +18,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + @@ -30,6 +30,7 @@ + Select Address Block Select, edit, or delete an address block layout for mail merge. diff --git a/source/text/swriter/01/mm_seladdlis.xhp b/source/text/swriter/01/mm_seladdlis.xhp index a2fb36781..73a05ae81 100644 --- a/source/text/swriter/01/mm_seladdlis.xhp +++ b/source/text/swriter/0
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e41e43804153a43aa766e656658771937058ae8b Author: Olivier Hallot AuthorDate: Wed Jul 25 18:41:20 2018 -0300 Commit: Gerrit Code Review CommitDate: Thu Jul 26 14:40:03 2018 +0200 Update git submodules * Update helpcontent2 from branch 'master' - tdf#115254 Some branch bookmarks are not working 7 Module sw , t- to w- Change-Id: Ic307998cd8f2080c3c0a98a114308e30394362d9 Reviewed-on: https://gerrit.libreoffice.org/58026 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 264f91670f53..3fb1fda6051f 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 264f91670f5392abdf3c325bb28da64f33733ea9 +Subproject commit 3fb1fda6051fafe343fde842a344192dbc5abe99 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/optionen/01040200.xhp|1 + source/text/shared/optionen/testaccount.xhp |3 ++- source/text/swriter/01/04120201.xhp |3 ++- source/text/swriter/01/04120211.xhp |3 ++- source/text/swriter/01/04120220.xhp |8 +--- source/text/swriter/01/05040800.xhp |1 + source/text/swriter/01/05060200.xhp |2 ++ source/text/swriter/01/05090200.xhp |3 ++- source/text/swriter/01/05090300.xhp |3 ++- source/text/swriter/01/0604.xhp |1 + source/text/swriter/01/title_page.xhp |1 + source/text/swriter/01/watermark.xhp|1 + source/text/swriter/guide/indices_toc.xhp |3 ++- 13 files changed, 24 insertions(+), 9 deletions(-) New commits: commit 3fb1fda6051fafe343fde842a344192dbc5abe99 Author: Olivier Hallot AuthorDate: Wed Jul 25 18:41:20 2018 -0300 Commit: Olivier Hallot CommitDate: Thu Jul 26 14:40:03 2018 +0200 tdf#115254 Some branch bookmarks are not working 7 Module sw , t- to w- Change-Id: Ic307998cd8f2080c3c0a98a114308e30394362d9 Reviewed-on: https://gerrit.libreoffice.org/58026 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/optionen/01040200.xhp b/source/text/shared/optionen/01040200.xhp index 74bd8141b..813f29d20 100644 --- a/source/text/shared/optionen/01040200.xhp +++ b/source/text/shared/optionen/01040200.xhp @@ -50,6 +50,7 @@ displaying; comments in text documents + View Defines the default settings for displaying objects in your text documents and also the default settings for the window elements. diff --git a/source/text/shared/optionen/testaccount.xhp b/source/text/shared/optionen/testaccount.xhp index 3001bfb00..9ff89f58e 100644 --- a/source/text/shared/optionen/testaccount.xhp +++ b/source/text/shared/optionen/testaccount.xhp @@ -18,7 +18,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + @@ -27,6 +27,7 @@ + Test Account Settings When you enter settings on the %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Mail Merge E-mail tab page, you can click the Test Settings button to test your settings. diff --git a/source/text/swriter/01/04120201.xhp b/source/text/swriter/01/04120201.xhp index 65fa08619..1d234a3c9 100644 --- a/source/text/swriter/01/04120201.xhp +++ b/source/text/swriter/01/04120201.xhp @@ -18,7 +18,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + @@ -31,6 +31,7 @@ + Styles You can assign different paragraph styles to change the formatting of index titles, separators and index entries. You can also modify paragraph styles in this dialog. diff --git a/source/text/swriter/01/04120211.xhp b/source/text/swriter/01/04120211.xhp index 0b5ac572f..09db02277 100644 --- a/source/text/swriter/01/04120211.xhp +++ b/source/text/swriter/01/04120211.xhp @@ -27,9 +27,10 @@ + Index - The following options are available when you select Table of Contents as the index type. + The following options are available when you select Table of Contents as the index type. diff --git a/source/text/swriter/01/04120220.xhp b/source/text/swriter/01/04120220.xhp index 21a6e3a89..97425e882 100644 --- a/source/text/swriter/01/04120220.xhp +++ b/source/text/swriter/01/04120220.xhp @@ -30,10 +30,12 @@ - - + + - Entries (indexes/tables) + + + Entries (indexes/tables) Specify the format of the index or table entries. The appearance of this tab changes to reflect the type of index that you selected on the Type tab. diff --git a/source/text/swriter/01/05040800.xhp b/source/text/swriter/01/05040800.xhp index 067754e76..91786af12 100644 --- a/source/text/swriter/01/05040800.xhp +++ b/source/text/swriter/01/05040800.xhp @@ -28,6 +28,7 @@ + text grid for Asian layout diff --git a/source/text/swriter/01/05060200.xhp b/source/text/swriter/01/05060200.xhp index ea0860746..936a4a93c 100644 --- a/source/text/swriter/01/05060200.xhp +++ b/source/text/swriter/01/05060200.xhp @@ -28,6 +28,8 @@ + + diff --git a/source/text/swriter/01/05090200.xhp b/source/text/swriter/01/05090200.xhp index bbee06516..d34adea03 100644 --- a/source/text/swriter/01/05090200.xhp +++ b/source/text/swriter/01/05090200.xhp @@ -18,7 +18,7 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + @@ -31,6 +31,7 @@ + Columns Specify the column width properties. diff --git a/source/text/swriter/01/05090300.xhp b/source/text/swriter/01/05090300.xhp index c961def5e..9d4879274 100644 --- a/source/text/swriter/01/05090300.xhp +++ b/so
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/pngread.cxx |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 62955bb8145c95991f7771eb7efb0dc46f744ef5 Author: Caolán McNamara AuthorDate: Thu Jul 26 09:58:47 2018 +0100 Commit: Caolán McNamara CommitDate: Thu Jul 26 14:05:50 2018 +0200 skip checking png block crcs when fuzzing Change-Id: If4671f7db2afb46dc68aa7a8a92c509e1735ab9f Reviewed-on: https://gerrit.libreoffice.org/58051 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx index f00a096f5573..f4195fd5c352 100644 --- a/vcl/source/gdi/pngread.cxx +++ b/vcl/source/gdi/pngread.cxx @@ -21,6 +21,7 @@ #include #include +#include #include #include @@ -134,6 +135,7 @@ private: boolmbIDATComplete : 1; // true if finished with enough IDAT chunks boolmbpHYs : 1; // true if physical size of pixel available boolmbIgnoreGammaChunk : 1; +boolmbIgnoreCRC : 1; // skip checking CRCs while fuzzing #if OSL_DEBUG_LEVEL > 0 // do some checks in debug mode @@ -214,6 +216,7 @@ PNGReaderImpl::PNGReaderImpl( SvStream& rPNGStream ) mbIDATComplete( false ), mbpHYs ( false ), mbIgnoreGammaChunk ( false ), +mbIgnoreCRC( utl::ConfigManager::IsFuzzing() ), #if OSL_DEBUG_LEVEL > 0 mnAllocSizeScanline(0), mnAllocSizeScanlineAlpha(0), @@ -306,7 +309,7 @@ bool PNGReaderImpl::ReadNextChunk() } sal_uInt32 nCheck(0); mrPNGStream.ReadUInt32( nCheck ); -if( nCRC32 != nCheck ) +if (!mbIgnoreCRC && nCRC32 != nCheck) return false; } else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf63561_clearTabs2.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx |8 +++-
sw/source/filter/ww8/docxattributeoutput.cxx |6 +-
writerfilter/source/dmapper/DomainMapper.cxx |2 +-
4 files changed, 13 insertions(+), 3 deletions(-)
New commits:
commit 971a82bab0cd1381fc5623c2ead3e72580c5006f
Author: Justin Luth
AuthorDate: Wed Jul 11 17:21:51 2018 +0300
Commit: Miklos Vajna
CommitDate: Thu Jul 26 13:42:54 2018 +0200
related tdf#63561 docx: styles inherit tabstops too
Add import and export support for style-parent
tabstop inheritance.
This patch is dependent on GetPropertyFromStyleSheet
commit 39171b82b245a7589b9258337a18d6dd281f8ed2
Change-Id: I0245d0e08f140b6cb473c96cffa6f5a4ceff8944
Reviewed-on: https://gerrit.libreoffice.org/57278
Tested-by: Jenkins
Reviewed-by: Justin Luth
Reviewed-on: https://gerrit.libreoffice.org/57759
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/data/tdf63561_clearTabs2.docx
b/sw/qa/extras/ooxmlexport/data/tdf63561_clearTabs2.docx
new file mode 100644
index ..cf674f3c460f
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf63561_clearTabs2.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 6249547816df..a34efcdd9e2f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -58,7 +58,13 @@ DECLARE_OOXMLEXPORT_TEST(testTdf46938_clearTabStop,
"tdf46938_clearTabStop.docx"
DECLARE_OOXMLEXPORT_TEST(testTdf63561_clearTabs, "tdf63561_clearTabs.docx")
{
-// MSO2013 gives 5,7, and 4 respectively
+CPPUNIT_ASSERT_EQUAL(sal_Int32(5), getProperty<
uno::Sequence >(getParagraph(1), "ParaTabStops").getLength());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(7), getProperty<
uno::Sequence >(getParagraph(3), "ParaTabStops").getLength());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4), getProperty<
uno::Sequence >(getParagraph(4), "ParaTabStops").getLength());
+}
+
+DECLARE_OOXMLEXPORT_TEST(testTdf63561_clearTabs2, "tdf63561_clearTabs2.docx")
+{
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getProperty<
uno::Sequence >(getParagraph(1), "ParaTabStops").getLength());
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), getProperty<
uno::Sequence >(getParagraph(3), "ParaTabStops").getLength());
CPPUNIT_ASSERT_EQUAL(sal_Int32(4), getProperty<
uno::Sequence >(getParagraph(4), "ParaTabStops").getLength());
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 95de428c320c..c22ff5cdec4c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -7711,7 +7711,11 @@ static void impl_WriteTabElement( FSHelperPtr const &
pSerializer,
void DocxAttributeOutput::ParaTabStop( const SvxTabStopItem& rTabStop )
{
-const SvxTabStopItem* pInheritedTabs = GetExport().m_pStyAttr ?
GetExport().m_pStyAttr->GetItem(RES_PARATR_TABSTOP) : nullptr;
+const SvxTabStopItem* pInheritedTabs = nullptr;
+if ( GetExport().m_pStyAttr )
+pInheritedTabs =
GetExport().m_pStyAttr->GetItem(RES_PARATR_TABSTOP);
+else if ( GetExport().m_pCurrentStyle &&
GetExport().m_pCurrentStyle->DerivedFrom() )
+pInheritedTabs =
GetExport().m_pCurrentStyle->DerivedFrom()->GetAttrSet().GetItem(RES_PARATR_TABSTOP);
const sal_uInt16 nInheritedTabCount = pInheritedTabs ?
pInheritedTabs->Count() : 0;
const sal_uInt16 nCount = rTabStop.Count();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 9eab98638e99..07400a945856 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1849,7 +1849,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const
PropertyMapPtr& rContext )
// fdo#81033: for RTF, a tab stop is inherited from the style if it
// is also applied to the paragraph directly, and cleared if it is
// not applied to the paragraph directly => don't InitTabStopFromStyle
-if (!IsStyleSheetImport() && !IsRTFImport())
+if ( !IsRTFImport() )
{
uno::Any aValue =
m_pImpl->GetPropertyFromStyleSheet(PROP_PARA_TAB_STOPS);
uno::Sequence< style::TabStop > aStyleTabStops;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit aa415ee2d6b8816c9a280321660e20c41c59e896 Author: Stephan Bergmann AuthorDate: Thu Jul 26 10:01:32 2018 +0200 Commit: Stephan Bergmann CommitDate: Thu Jul 26 13:37:02 2018 +0200 OOXMLFastContextHandler has a deleted copy assignment op ...for whatever reason, ever since the file's introduction with 359fd901c7c8a1c37e1d2ccee2b5a2cf6c3c93d1 "INTEGRATION: CWS xmlfilter02". Make the copy ctor expliticly defaulted to avoid -Werror=deprecated-copy with GCC trunk towards GCC 9. Change-Id: I7785dfb073767ba963ceec682cfbdfe192eed69b Reviewed-on: https://gerrit.libreoffice.org/58040 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx index cd6768e4fbb0..0bf03601e5b5 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx @@ -46,6 +46,8 @@ public: explicit OOXMLFastContextHandler(OOXMLFastContextHandler * pContext); +OOXMLFastContextHandler(OOXMLFastContextHandler const &) = default; + virtual ~OOXMLFastContextHandler() override; // css::xml::sax::XFastContextHandler: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/mdds
external/mdds/UnpackedTarball_mdds.mk |1
external/mdds/gcc9.patch | 42 ++
2 files changed, 43 insertions(+)
New commits:
commit daa2fd4a81efaea35f18b53b65407464ba57eeaa
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 10:39:30 2018 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 26 13:34:20 2018 +0200
external/mdds: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)
...by removing explicitly user-provided functions that do the same as their
implicitly-defined counterparts, but whose presence may prevent implicitly
declared copy functions from being defined as non-deleted in the future
Change-Id: Ie9b943af57bd8081c06a531fb3c634e52f0a99b6
Reviewed-on: https://gerrit.libreoffice.org/58048
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/external/mdds/UnpackedTarball_mdds.mk
b/external/mdds/UnpackedTarball_mdds.mk
index 4f6db6b24e7b..9480bb8273af 100644
--- a/external/mdds/UnpackedTarball_mdds.mk
+++ b/external/mdds/UnpackedTarball_mdds.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,0))
# unnecessary uses of obsolete std::unary_function":
$(eval $(call gb_UnpackedTarball_add_patches,mdds,\
external/mdds/c++17.patch \
+external/mdds/gcc9.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/mdds/gcc9.patch b/external/mdds/gcc9.patch
new file mode 100644
index ..c7d19e99437d
--- /dev/null
+++ b/external/mdds/gcc9.patch
@@ -0,0 +1,42 @@
+--- include/mdds/multi_type_vector_itr.hpp
include/mdds/multi_type_vector_itr.hpp
+@@ -54,9 +54,6 @@
+ iterator_value_node(size_type start_pos, size_type block_index) :
+ type(mdds::mtv::element_type_empty), position(start_pos), size(0),
data(nullptr), __private_data(block_index) {}
+
+-iterator_value_node(const iterator_value_node& other) :
+-type(other.type), position(other.position), size(other.size),
data(other.data), __private_data(other.__private_data) {}
+-
+ void swap(iterator_value_node& other)
+ {
+ std::swap(type, other.type);
+@@ -272,9 +269,6 @@
+ size_type start_pos, size_type block_index) :
+ common_base(pos, end, start_pos, block_index) {}
+
+-iterator_base(const iterator_base& other) :
+-common_base(other) {}
+-
+ value_type& operator*()
+ {
+ return m_cur_node;
+@@ -345,9 +339,6 @@
+ size_type start_pos, size_type block_index) :
+ common_base(pos, end, start_pos, block_index) {}
+
+-const_iterator_base(const const_iterator_base& other) :
+-common_base(other) {}
+-
+ /**
+ * Take the non-const iterator counterpart to create a const iterator.
+ */
+--- include/mdds/multi_type_vector_types.hpp
include/mdds/multi_type_vector_types.hpp
+@@ -90,7 +90,6 @@
+ protected:
+ element_t type;
+ base_element_block(element_t _t) : type(_t) {}
+-~base_element_block() {}
+ };
+
+ template
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/cl-test.ods |binary 1 file changed New commits: commit 5706225cea4a2c1c92f2346471d6bff36b55ac6e Author: Luboš Luňák AuthorDate: Thu Jul 26 11:57:46 2018 +0200 Commit: Michael Meeks CommitDate: Thu Jul 26 13:25:11 2018 +0200 add simple add/sub to the opencl test document See gerrit#57911. Change-Id: I122cf6069cdac05ef6781bfb0a4840614514d435 Reviewed-on: https://gerrit.libreoffice.org/58067 Reviewed-by: Michael Meeks Tested-by: Michael Meeks diff --git a/sc/source/core/opencl/cl-test.ods b/sc/source/core/opencl/cl-test.ods index 8380e0b93a83..fa8166bac128 100644 Binary files a/sc/source/core/opencl/cl-test.ods and b/sc/source/core/opencl/cl-test.ods differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/liborcus
external/liborcus/UnpackedTarball_liborcus.mk |1 external/liborcus/gcc9.patch.0| 27 ++ 2 files changed, 28 insertions(+) New commits: commit dcd77e78d5c3b3c855c0588f165bcd4af695101f Author: Stephan Bergmann AuthorDate: Thu Jul 26 10:34:56 2018 +0200 Commit: Stephan Bergmann CommitDate: Thu Jul 26 13:05:27 2018 +0200 external/liborcus: silence -Werror=deprecated-copy (GCC trunk towards GCC 9) Change-Id: I520b19e2486bf1622206c74649f7105148b7bd87 Reviewed-on: https://gerrit.libreoffice.org/58047 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index 3ab387e734be..215bd4b8cc15 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus)) $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \ external/liborcus/rpath.patch.0 \ + external/liborcus/gcc9.patch.0 \ )) ifeq ($(OS),WNT) diff --git a/external/liborcus/gcc9.patch.0 b/external/liborcus/gcc9.patch.0 new file mode 100644 index ..afb9b81c4ea0 --- /dev/null +++ b/external/liborcus/gcc9.patch.0 @@ -0,0 +1,27 @@ +--- include/orcus/types.hpp include/orcus/types.hpp +@@ -7,6 +7,13 @@ + + #ifndef INCLUDED_ORCUS_TYPES_HPP + #define INCLUDED_ORCUS_TYPES_HPP ++ ++#ifdef __GNUC__ ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wpragmas" // for old GCC ++#pragma GCC diagnostic ignored "-Wunknown-warning-option" // for Clang ++#pragma GCC diagnostic ignored "-Wdeprecated-copy" ++#endif + + #include + #include +@@ -145,6 +152,10 @@ + typedef ::std::vector xml_attrs_t; + + } ++ ++#ifdef __GNUC__ ++#pragma GCC diagnostic pop ++#endif + + #endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libexttextcat
external/libexttextcat/ExternalProject_libexttextcat.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 6b128853443f203d47c4a2bc20cbaddb0cd57d1a Author: Stephan Bergmann AuthorDate: Thu Jul 26 10:31:39 2018 +0200 Commit: Stephan Bergmann CommitDate: Thu Jul 26 12:57:33 2018 +0200 Pass $(verbose) into ExternalProject_libexttextcat Change-Id: I87f89818c321fadb28faa600377b9e8bc3ad3085 Reviewed-on: https://gerrit.libreoffice.org/58046 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/external/libexttextcat/ExternalProject_libexttextcat.mk b/external/libexttextcat/ExternalProject_libexttextcat.mk index 34fbc8405cc5..1dd6272d3981 100644 --- a/external/libexttextcat/ExternalProject_libexttextcat.mk +++ b/external/libexttextcat/ExternalProject_libexttextcat.mk @@ -16,6 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,libexttextcat,\ $(call gb_ExternalProject_get_state_target,libexttextcat,build): $(call gb_ExternalProject_run,build,\ ./configure --disable-shared --with-pic \ + $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \ $(if $(COM_IS_CLANG),-Qunused-arguments) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/gen-boost-headers external/boost
bin/gen-boost-headers |1 + external/boost/UnpackedTarball_boost.mk|2 ++ external/boost/gcc9.patch.0| 10 ++ external/boost/include/boost/algorithm/string.hpp |1 + external/boost/include/boost/algorithm/string/case_conv.hpp|1 + external/boost/include/boost/algorithm/string/classification.hpp |1 + external/boost/include/boost/algorithm/string/predicate.hpp|1 + external/boost/include/boost/algorithm/string/split.hpp|1 + external/boost/include/boost/any.hpp |1 + external/boost/include/boost/archive/iterators/base64_from_binary.hpp |1 + external/boost/include/boost/archive/iterators/binary_from_base64.hpp |1 + external/boost/include/boost/archive/iterators/remove_whitespace.hpp |1 + external/boost/include/boost/archive/iterators/transform_width.hpp |1 + external/boost/include/boost/asio.hpp |1 + external/boost/include/boost/assign.hpp|1 + external/boost/include/boost/bimap/bimap.hpp |1 + external/boost/include/boost/bimap/unordered_set_of.hpp|1 + external/boost/include/boost/bind.hpp |1 + external/boost/include/boost/cast.hpp |1 + external/boost/include/boost/circular_buffer.hpp |1 + external/boost/include/boost/config.hpp|1 + external/boost/include/boost/container/deque.hpp |1 + external/boost/include/boost/cstdint.hpp |1 + external/boost/include/boost/current_function.hpp |1 + external/boost/include/boost/date_time.hpp |1 + external/boost/include/boost/date_time/posix_time/posix_time.hpp |1 + external/boost/include/boost/enable_shared_from_this.hpp |1 + external/boost/include/boost/exception/diagnostic_information.hpp |1 + external/boost/include/boost/filesystem.hpp|1 + external/boost/include/boost/filesystem/path.hpp |1 + external/boost/include/boost/foreach.hpp |1 + external/boost/include/boost/format.hpp|1 + external/boost/include/boost/function.hpp |1 + external/boost/include/boost/functional/hash.hpp |1 + external/boost/include/boost/fusion/adapted/std_pair.hpp |1 + external/boost/include/boost/fusion/include/adapt_struct.hpp |1 + external/boost/include/boost/intrusive/circular_list_algorithms.hpp|1 + external/boost/include/boost/intrusive_ptr.hpp |1 + external/boost/include/boost/io/ios_state.hpp |1 + external/boost/include/boost/iostreams/device/file_descriptor.hpp |1 + external/boost/include/boost/iostreams/filter/gzip.hpp |1 + external/boost/include/boost/iostreams/filtering_stream.hpp|1 + external/boost/include/boost/iterator/iterator_facade.hpp |1 + external/boost/include/boost/lexical_cast.hpp |1 + external/boost/include/boost/locale.hpp|1 + external/boost/include/boost/locale/gnu_gettext.hpp|1 + external/boost/include/boost/logic/tribool.hpp |1 + external/boost/include/boost/make_shared.hpp |1 + external/boost/include/boost/math/common_factor_rt.hpp |1 + external/boost/include/boost/math/constants/constants.hpp |1 + external/boost/include/boost/math/special_functions/expm1.hpp |1 + external/boost/include/boost/math/special_functions/log1p.hpp |1 + external/boost/include/boost/math/special_functions/sinc.hpp |1 + external/boost/include/boost/multi_array.hpp |1 + external/boost/include/boost/multi_index/composite_key.hpp |1 + external/boost/include/boost/multi_index/identity.hpp |1 + external/boost/include/boost/multi_index/mem_fun.hpp |1 + external/boost/include/boost/multi_index/ordered_index.hpp |1 + external/boost/include/boost/multi_index/random_access_index.hpp |1 + external/boost/include/boost/multi_index_container.hpp |1 + external/boost/include/boost/noncopyable.hpp |1 + external/boost/include/boost/none.hpp
[Libreoffice-commits] core.git: external/cppunit
external/cppunit/UnpackedTarball_cppunit.mk |1 + external/cppunit/gcc9.patch.0 | 11 +++ 2 files changed, 12 insertions(+) New commits: commit 46c9312c54c7292fb9d83388936e28f31f0c72c6 Author: Stephan Bergmann AuthorDate: Thu Jul 26 10:10:59 2018 +0200 Commit: Stephan Bergmann CommitDate: Thu Jul 26 12:31:44 2018 +0200 external/cppunit: silence -Werror=deprecated-copy (GCC trunk towards GCC 9) Change-Id: I2daec11938361a6988741bd29e713a36a4c77414 Reviewed-on: https://gerrit.libreoffice.org/58042 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/external/cppunit/UnpackedTarball_cppunit.mk b/external/cppunit/UnpackedTarball_cppunit.mk index 28b251e4bf5b..3b945f29ab0f 100644 --- a/external/cppunit/UnpackedTarball_cppunit.mk +++ b/external/cppunit/UnpackedTarball_cppunit.mk @@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\ external/cppunit/CPPUNIT_PLUGIN_EXPORT.patch.0 \ external/cppunit/enable-win32-debug.patch \ external/cppunit/rtti.patch.0 \ + external/cppunit/gcc9.patch.0 \ )) ifeq ($(DISABLE_DYNLOADING),TRUE) $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\ diff --git a/external/cppunit/gcc9.patch.0 b/external/cppunit/gcc9.patch.0 new file mode 100644 index ..b05725ac09f2 --- /dev/null +++ b/external/cppunit/gcc9.patch.0 @@ -0,0 +1,11 @@ +--- include/cppunit/extensions/TestSuiteBuilderContext.h include/cppunit/extensions/TestSuiteBuilderContext.h +@@ -37,6 +37,8 @@ + TestSuiteBuilderContextBase( TestSuite &suite, +const TestNamer &namer, +TestFixtureFactory &factory ); ++ ++ TestSuiteBuilderContextBase(TestSuiteBuilderContextBase const &) = default; + + virtual ~TestSuiteBuilderContextBase(); + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/comphelper
include/comphelper/stl_types.hxx | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
New commits:
commit bd8cb3ff962417e3f79ae19e7d802e433ea174ac
Author: Stephan Bergmann
AuthorDate: Thu Jul 26 09:55:57 2018 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jul 26 12:30:20 2018 +0200
Iterators must be CopyAssignable
...so make sure the (implicitly defined) copy assignment op is not deleted
and
has sane semantics
Change-Id: If34cb5bd1ef250505a4c876ab78aba2a3d5dfc21
Reviewed-on: https://gerrit.libreoffice.org/58039
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index c3539bbe21a0..bf8cc2b70494 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -143,21 +143,17 @@ public:
typedef size_t difference_type;
OUStringBufferAppender(OUStringBuffer & i_rBuffer)
-: m_rBuffer(i_rBuffer) { }
-Self & operator=(Self const &)
-{ // MSVC 2013 with non-debug runtime requires this in xutility.hpp:289
-return *this;
-}
+: m_rBuffer(&i_rBuffer) { }
Self & operator=(OUString const & i_rStr)
{
-m_rBuffer.append( i_rStr );
+m_rBuffer->append( i_rStr );
return *this;
}
Self & operator*() { return *this; } // so operator= works
Self & operator++() { return *this; }
private:
-OUStringBuffer & m_rBuffer;
+OUStringBuffer * m_rBuffer;
};
/** algorithm similar to std::copy, but inserts a separator between elements.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
