[Libreoffice-commits] online.git: kit/Kit.cpp
kit/Kit.cpp | 18 ++
1 file changed, 10 insertions(+), 8 deletions(-)
New commits:
commit d718b1c0545fe77b0552269057bff707f8bee347
Author: Miklos Vajna
Date: Mon May 28 09:11:06 2018 +0200
kit: let alphaBlend() take an std::vector instead of raw pointer
So that it's more obvious that the two for loops don't read past the end
of the vector.
Change-Id: I49752c1bc316b6d73568ab334b07727ef60bdce5
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 25b03f2af..8ef9840bd 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -600,19 +600,19 @@ public:
offsetX += (tileWidth - maxX) / 2;
offsetY += (tileHeight - maxY) / 2;
-alphaBlend(pixmap->data(), _width, _height, offsetX, offsetY,
tilePixmap, tilesPixmapWidth, tilesPixmapHeight);
+alphaBlend(*pixmap, _width, _height, offsetX, offsetY, tilePixmap,
tilesPixmapWidth, tilesPixmapHeight);
}
}
private:
/// Alpha blend pixels from 'from' over the 'to'.
-void alphaBlend(const unsigned char* from, int from_width, int
from_height, int from_offset_x, int from_offset_y,
+void alphaBlend(const std::vector& from, int from_width,
int from_height, int from_offset_x, int from_offset_y,
unsigned char* to, int to_width, int to_height)
{
for (int to_y = from_offset_y, from_y = 0; (to_y < to_height) &&
(from_y < from_height) ; ++to_y, ++from_y)
for (int to_x = from_offset_x, from_x = 0; (to_x < to_width) &&
(from_x < from_width); ++to_x, ++from_x)
{
-const unsigned char* f = from + 4 * (from_y * from_width +
from_x);
+const unsigned char* f = from.data() + 4 * (from_y *
from_width + from_x);
double src_r = f[0];
double src_g = f[1];
double src_b = f[2];
@@ -657,14 +657,19 @@ private:
// are always set to 0 (black) and the alpha level is 0 everywhere
// except on the text area; the alpha level take into account of
// performing anti-aliasing over the text edges.
-unsigned char* text = _loKitDoc->renderFont(_font.c_str(),
_text.c_str(), &_width, &_height);
+unsigned char* textPixels = _loKitDoc->renderFont(_font.c_str(),
_text.c_str(), &_width, &_height);
-if (!text)
+if (!textPixels)
{
LOG_ERR("Watermark: rendering failed.");
}
const unsigned int pixel_count = width * height * 4;
+
+std::vector text(textPixels, textPixels + pixel_count);
+// No longer needed.
+std::free(textPixels);
+
_pixmap.reserve(pixel_count);
// Create the white blurred background
@@ -703,9 +708,6 @@ private:
// Now copy the (black) text over the (white) blur
alphaBlend(text, _width, _height, 0, 0, _pixmap.data(), _width,
_height);
-// No longer needed.
-std::free(text);
-
// Make the resulting pixmap semi-transparent
for (unsigned char* p = _pixmap.data(); p < _pixmap.data() +
pixel_count; p++)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: WebServer behind LOOL?
Hi, On Wed, May 23, 2018 at 09:14:58AM +, Renato Ribeiro wrote: > This is a basic question but I can't understand yet. What is the web > server running behind the LibreOffice Online? The websocket is the > protocol used to change messages, right? What's other protocols are > used in this application? Where does WOPI come in here? Poco has a built-in library to serve static files over HTTP(S), that's used in loolwsd. Websocket is used to update the JS client once the page is loaded. The JS itself is served as static content. The only non-websocket and non-static part is the convert-to functionality at the moment, I think. Regarding WOPI, see here: https://speakerdeck.com/kendy/integrating-libreoffice-online-via-wopi It's the protocol between auth/storage and the stateless Online instance. Regards, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: basic/source connectivity/source dbaccess/source desktop/source
basic/source/inc/parser.hxx|5 ++---
connectivity/source/drivers/firebird/Util.hxx |3 ---
dbaccess/source/ui/inc/commontypes.hxx |2 --
desktop/source/deployment/registry/package/dp_extbackenddb.hxx |2 --
4 files changed, 2 insertions(+), 10 deletions(-)
New commits:
commit f62243c7bb620d821ae84366235111c47a99bae0
Author: Arkadiy Illarionov
Date: Sat May 26 11:58:26 2018 +0300
tdf#96099 Remove some trivial typedef std::vector
Change-Id: I41fff78c10d46bde50063536d8cf1a3942dbf6af
Reviewed-on: https://gerrit.libreoffice.org/54834
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
diff --git a/basic/source/inc/parser.hxx b/basic/source/inc/parser.hxx
index 4ff5baf83518..bee2a188c1fc 100644
--- a/basic/source/inc/parser.hxx
+++ b/basic/source/inc/parser.hxx
@@ -26,7 +26,6 @@
#include
-typedef std::vector< OUString > StringVector;
struct SbiParseStack;
@@ -72,8 +71,8 @@ public:
short nBase;// OPTION BASE-value
bool bExplicit;// true: OPTION EXPLICIT
bool bClassModule; // true: OPTION ClassModule
-StringVector aIfaceVector; // Holds all interfaces implemented by a
class module
-StringVector aRequiredTypes; // Types used in Dim As New outside
subs
+std::vector aIfaceVector; // Holds all interfaces
implemented by a class module
+std::vector aRequiredTypes; // Types used in Dim As New
outside subs
# define N_DEF_TYPES 26
SbxDataType eDefTypes[N_DEF_TYPES];// DEFxxx data types
diff --git a/connectivity/source/drivers/firebird/Util.hxx
b/connectivity/source/drivers/firebird/Util.hxx
index 0b06e3c18fb8..dbff25356205 100644
--- a/connectivity/source/drivers/firebird/Util.hxx
+++ b/connectivity/source/drivers/firebird/Util.hxx
@@ -18,13 +18,10 @@
#include
#include
-#include
-
namespace connectivity
{
namespace firebird
{
-typedef std::vector< OString > OStringVector;
// Type Blob has 2 subtypes values
// 0 for BLOB, 1 for CLOB
// see http://www.firebirdfaq.org/faq48/
diff --git a/dbaccess/source/ui/inc/commontypes.hxx
b/dbaccess/source/ui/inc/commontypes.hxx
index 18ba066f816a..74402d59bcd7 100644
--- a/dbaccess/source/ui/inc/commontypes.hxx
+++ b/dbaccess/source/ui/inc/commontypes.hxx
@@ -23,7 +23,6 @@
#include
#include
-#include
#include
@@ -37,7 +36,6 @@ namespace dbaui
{
typedef std::set StringBag;
-typedef std::vector StringArray;
typedef ::utl::SharedUNOComponent< css::sdbc::XConnection >
SharedConnection;
diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
index 1c220ff91485..ac91a62e9252 100644
--- a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
+++ b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
@@ -55,8 +55,6 @@ public:
and the media type
*/
std::vector< std::pair< OUString, OUString> > items;
-typedef std::vector<
-std::pair< OUString, OUString> >::const_iterator ITC_ITEMS;
};
public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/IwyuFilter_chart2.yaml chart2/source
chart2/IwyuFilter_chart2.yaml | 47 -
chart2/source/model/inc/BaseCoordinateSystem.hxx |1
chart2/source/model/inc/ChartTypeManager.hxx |6 --
chart2/source/model/inc/DataSeries.hxx |5 -
chart2/source/model/inc/Diagram.hxx|8 +-
chart2/source/model/inc/XMLFilter.hxx |7 +-
chart2/source/model/main/CartesianCoordinateSystem.cxx |1
chart2/source/model/main/DataSeries.cxx|1
chart2/source/model/main/PolarCoordinateSystem.cxx |1
9 files changed, 61 insertions(+), 16 deletions(-)
New commits:
commit f50eb2d12e3b80ff75b6d1a89753efcef0cd6f27
Author: Gabor Kelemen
Date: Mon May 21 18:34:40 2018 +0200
tdf#42949 Fix IWYU warnings in chart2/source/model/inc/
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here
and a bit of fallout management.
Change-Id: I2833ac36c359df76f46e7aa973c012a4d7cedc84
Reviewed-on: https://gerrit.libreoffice.org/54872
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/chart2/IwyuFilter_chart2.yaml b/chart2/IwyuFilter_chart2.yaml
index 4951d1b1ae46..f826ca6128ac 100644
--- a/chart2/IwyuFilter_chart2.yaml
+++ b/chart2/IwyuFilter_chart2.yaml
@@ -185,4 +185,49 @@ blacklist:
- com/sun/star/beans/XPropertySet.hpp
- cppuhelper/propshlp.hxx
- com/sun/star/beans/XPropertyState.hpp
-
+chart2/source/model/inc/BaseCoordinateSystem.hxx:
+# base class has to be a complete type
+- com/sun/star/chart2/XChartTypeContainer.hpp
+- com/sun/star/chart2/XCoordinateSystem.hpp
+- com/sun/star/lang/XServiceInfo.hpp
+- com/sun/star/util/XCloneable.hpp
+- com/sun/star/util/XModifyBroadcaster.hpp
+- com/sun/star/util/XModifyListener.hpp
+chart2/source/model/inc/ChartTypeManager.hxx:
+# base class has to be a complete type
+- com/sun/star/chart2/XChartTypeManager.hpp
+- com/sun/star/lang/XMultiServiceFactory.hpp
+- com/sun/star/lang/XServiceInfo.hpp
+chart2/source/model/inc/DataSeries.hxx:
+# base class has to be a complete type
+- com/sun/star/chart2/XDataSeries.hpp
+- com/sun/star/chart2/XRegressionCurveContainer.hpp
+- com/sun/star/chart2/data/XDataSink.hpp
+- com/sun/star/chart2/data/XDataSource.hpp
+- com/sun/star/lang/XServiceInfo.hpp
+- com/sun/star/util/XCloneable.hpp
+- com/sun/star/util/XModifyBroadcaster.hpp
+- com/sun/star/util/XModifyListener.hpp
+chart2/source/model/inc/Diagram.hxx:
+# base class has to be a complete type
+- com/sun/star/chart/X3DDefaultSetter.hpp
+- com/sun/star/chart2/XCoordinateSystemContainer.hpp
+- com/sun/star/chart2/XDiagram.hpp
+- com/sun/star/chart2/XTitled.hpp
+- com/sun/star/lang/XServiceInfo.hpp
+- com/sun/star/util/XCloneable.hpp
+- com/sun/star/util/XModifyBroadcaster.hpp
+- com/sun/star/util/XModifyListener.hpp
+chart2/source/model/inc/StockBar.hxx:
+# base class has to be a complete type
+- com/sun/star/util/XCloneable.hpp
+- com/sun/star/util/XModifyBroadcaster.hpp
+- com/sun/star/util/XModifyListener.hpp
+chart2/source/model/inc/XMLFilter.hxx:
+# base class has to be a complete type
+- com/sun/star/document/XExporter.hpp
+- com/sun/star/document/XFilter.hpp
+- com/sun/star/document/XImporter.hpp
+- com/sun/star/io/XActiveDataSource.hpp
+- com/sun/star/lang/XMultiServiceFactory.hpp
+- com/sun/star/lang/XServiceInfo.hpp
diff --git a/chart2/source/model/inc/BaseCoordinateSystem.hxx
b/chart2/source/model/inc/BaseCoordinateSystem.hxx
index 76ad85aa597f..1f20e83a02dc 100644
--- a/chart2/source/model/inc/BaseCoordinateSystem.hxx
+++ b/chart2/source/model/inc/BaseCoordinateSystem.hxx
@@ -24,7 +24,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/chart2/source/model/inc/ChartTypeManager.hxx
b/chart2/source/model/inc/ChartTypeManager.hxx
index 7b09b1a16b7e..dc764ad86c53 100644
--- a/chart2/source/model/inc/ChartTypeManager.hxx
+++ b/chart2/source/model/inc/ChartTypeManager.hxx
@@ -19,15 +19,13 @@
#ifndef INCLUDED_CHART2_SOURCE_MODEL_INC_CHARTTYPEMANAGER_HXX
#define INCLUDED_CHART2_SOURCE_MODEL_INC_CHARTTYPEMANAGER_HXX
-#include
-#include
#include
-#include
#include
#include
-
#include
+namespace com { namespace sun { namespace star { namespace uno { class
XComponentContext; } } } }
+
namespace chart
{
diff --git a/chart2/source/model/inc/DataSeries.hxx
b/chart2/source/model/inc/DataSeries.hxx
index ee45f584d7b9..aefab3406606 100644
--- a/chart2/source/model/inc/DataSeries.hxx
+++ b/chart2/source/model/inc/DataSeries.hxx
@@ -27,10 +27,7 @@
#include
#include
#include
-#include
#include
-#include
-#include
// helper classes
#include
@@ -43,6 +40,8 @@
#include
#include
+namespace com { namespace sun { namespace star { namespace beans { class
XProp
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - icon-themes/karasa_jaga
dev/null |binary icon-themes/karasa_jaga/COPYING | 224 ++ icon-themes/karasa_jaga/cmd/32/addtable.png |binary icon-themes/karasa_jaga/cmd/32/dbformdelete.png |binary icon-themes/karasa_jaga/cmd/32/dbquerydelete.png |binary icon-themes/karasa_jaga/cmd/32/dbreportdelete.png |binary icon-themes/karasa_jaga/cmd/32/dbtabledelete.png |binary icon-themes/karasa_jaga/cmd/32/dbtableedit.png|binary icon-themes/karasa_jaga/cmd/32/dbtablerename.png |binary icon-themes/karasa_jaga/cmd/32/deleteannotation.png |binary icon-themes/karasa_jaga/cmd/32/deletecolumns.png |binary icon-themes/karasa_jaga/cmd/32/deletecomment.png |binary icon-themes/karasa_jaga/cmd/32/deletemasterpage.png |binary icon-themes/karasa_jaga/cmd/32/deletepage.png |binary icon-themes/karasa_jaga/cmd/32/deleterecord.png |binary icon-themes/karasa_jaga/cmd/32/deleterows.png |binary icon-themes/karasa_jaga/cmd/32/deleteslide.png|binary icon-themes/karasa_jaga/cmd/32/deletetable.png|binary icon-themes/karasa_jaga/cmd/32/exportdirecttoepub.png |binary icon-themes/karasa_jaga/cmd/32/exporttoepub.png |binary icon-themes/karasa_jaga/cmd/32/exporttopdf.png|binary icon-themes/karasa_jaga/cmd/lc_dbformdelete.png |binary icon-themes/karasa_jaga/cmd/lc_dbreportdelete.png |binary icon-themes/karasa_jaga/cmd/lc_dbtabledelete.png |binary icon-themes/karasa_jaga/cmd/lc_deleteannotation.png |binary icon-themes/karasa_jaga/cmd/lc_deletemasterpage.png |binary icon-themes/karasa_jaga/cmd/lc_deletepage.png |binary icon-themes/karasa_jaga/cmd/lc_deleteslide.png|binary icon-themes/karasa_jaga/cmd/lc_deletetable.png|binary icon-themes/karasa_jaga/cmd/lc_exportdirecttoepub.png |binary icon-themes/karasa_jaga/cmd/lc_exportdirecttopdf.png |binary icon-themes/karasa_jaga/cmd/lc_exporttoepub.png |binary icon-themes/karasa_jaga/cmd/lc_greatestwidth.png |binary icon-themes/karasa_jaga/cmd/lc_insertslide.png|binary icon-themes/karasa_jaga/cmd/sc_dbreportdelete.png |binary icon-themes/karasa_jaga/cmd/sc_deletemasterpage.png |binary icon-themes/karasa_jaga/cmd/sc_deletepage.png |binary icon-themes/karasa_jaga/cmd/sc_deleteslide.png|binary icon-themes/karasa_jaga/cmd/sc_exportdirecttoepub.png |binary icon-themes/karasa_jaga/cmd/sc_exportdirecttopdf.png |binary icon-themes/karasa_jaga/cmd/sc_exporttoepub.png |binary icon-themes/karasa_jaga/cmd/sc_greatestheight.png |binary icon-themes/karasa_jaga/cmd/sc_greatestwidth.png |binary icon-themes/karasa_jaga/dbaccess/res/all_left.png |binary icon-themes/karasa_jaga/dbaccess/res/all_right.png|binary icon-themes/karasa_jaga/dbaccess/res/form_16.png |binary icon-themes/karasa_jaga/dbaccess/res/reports_32.png |binary icon-themes/karasa_jaga/dbaccess/res/sc021.png|binary icon-themes/karasa_jaga/dbaccess/res/sc023.png|binary icon-themes/karasa_jaga/dbaccess/res/sortdown.png |binary icon-themes/karasa_jaga/dbaccess/res/sortup.png |binary icon-themes/karasa_jaga/dbaccess/res/tables_32.png|binary icon-themes/karasa_jaga/links.txt | 13 - icon-themes/karasa_jaga/res/lx03126.png |binary icon-themes/karasa_jaga/res/lx03188.png |binary icon-themes/karasa_jaga/res/sx03126.png |binary icon-themes/karasa_jaga/res/sx03127.png |binary icon-themes/karasa_jaga/res/sx03132.png |binary icon-themes/karasa_jaga/res/sx03188.png |binary icon-themes/karasa_jaga/res/tables_32.png |binary icon-themes/karasa_jaga/sfx2/res/startcenter-logo.svg | 91 --- 61 files changed, 224 insertions(+), 104 deletions(-) New commits: commit ba5b318fd04d056d5301fba43bd3953e7c8c181f Author: Rizal Muttaqin Date: Fri May 25 10:14:41 2018 +0700 tdf#117481 Karasa Jaga: Add dbaccess icons for base sidebar Change-Id: I5174261484c64a6f223c4a2e197d0e042c3581e4 Reviewed-on: https://gerrit.libreoffice.org/54787 Tested-by: Jenkins Reviewed-by: andreas_kainz (cherry picked from commit 18c85f770bca04f71b03c4ca06da1a0488842512) Reviewed-on: https://gerrit.libreoffice.org/54898 Tested-by: andreas_kainz diff --git a/icon-themes/karasa_jaga/COPYING b/icon-themes/karasa_jaga/COPYING new file mode 100644 index ..5938d6c1cd38 --- /dev/null +++ b/icon-themes/karasa_jaga/COPYING @@ -0,0 +1,224 @@ +Karasa Jaga Icon Theme for Sundara OS +Copyright (c) 2014 Rizal Muttaqin + +Karasa Jaga icon theme is derived heavily from Oxygen icon theme, used +for Sundara OS branding. LibreOffice Style Karasa Jaga is part of Karasa +Jaga icon theme. For further information see at +https://github.com/rizmut/libreoffice-style-karasa-jaga. + +The Oxy
[Libreoffice-commits] core.git: sw/source
sw/source/filter/xml/xmltbli.cxx | 128 +++
1 file changed, 64 insertions(+), 64 deletions(-)
New commits:
commit e7fe9094831036c295bf448737869a47f1873e3f
Author: Miklos Vajna
Date: Mon May 28 09:08:36 2018 +0200
sw: prefix members of SwXMLTableCellContext_Impl
Change-Id: Ifb10b563e90c79469652af95133301f3909f8393
Reviewed-on: https://gerrit.libreoffice.org/54897
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 98ddb181baf1..6f75cf0ea7d7 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -391,30 +391,30 @@ void SwXMLTableRow_Impl::Dispose()
class SwXMLTableCellContext_Impl : public SvXMLImportContext
{
-OUString aStyleName;
-OUString sFormula;
-OUString sSaveParaDefault;
+OUString m_aStyleName;
+OUString m_sFormula;
+OUString m_sSaveParaDefault;
OUString mXmlId;
OUString m_StringValue;
-SvXMLImportContextRef xMyTable;
+SvXMLImportContextRef m_xMyTable;
-double fValue;
-bool bHasValue;
+double m_fValue;
+bool m_bHasValue;
bool m_bHasStringValue;
bool m_bValueTypeIsString;
-bool bProtect;
+bool m_bProtect;
-sal_uInt32 nRowSpan;
-sal_uInt32 nColSpan;
-sal_uInt32 nColRepeat;
+sal_uInt32 m_nRowSpan;
+sal_uInt32 m_nColSpan;
+sal_uInt32 m_nColRepeat;
-boolbHasTextContent : 1;
-boolbHasTableContent : 1;
+boolm_bHasTextContent : 1;
+boolm_bHasTableContent : 1;
-SwXMLTableContext *GetTable() { return static_cast(xMyTable.get()); }
+SwXMLTableContext *GetTable() { return static_cast(m_xMyTable.get()); }
-bool HasContent() const { return bHasTextContent || bHasTableContent; }
+bool HasContent() const { return m_bHasTextContent || m_bHasTableContent; }
inline void InsertContent_();
inline void InsertContent();
inline void InsertContent( SwXMLTableContext *pTable );
@@ -439,20 +439,20 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl(
const Reference< xml::sax::XAttributeList > & xAttrList,
SwXMLTableContext *pTable ) :
SvXMLImportContext( rImport, nPrfx, rLName ),
-sFormula(),
-xMyTable( pTable ),
-fValue( 0.0 ),
-bHasValue( false ),
+m_sFormula(),
+m_xMyTable( pTable ),
+m_fValue( 0.0 ),
+m_bHasValue( false ),
m_bHasStringValue(false),
m_bValueTypeIsString(false),
-bProtect( false ),
-nRowSpan( 1 ),
-nColSpan( 1 ),
-nColRepeat( 1 ),
-bHasTextContent( false ),
-bHasTableContent( false )
-{
-sSaveParaDefault = GetImport().GetTextImport()->GetCellParaStyleDefault();
+m_bProtect( false ),
+m_nRowSpan( 1 ),
+m_nColSpan( 1 ),
+m_nColRepeat( 1 ),
+m_bHasTextContent( false ),
+m_bHasTableContent( false )
+{
+m_sSaveParaDefault =
GetImport().GetTextImport()->GetCellParaStyleDefault();
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
@@ -471,31 +471,31 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl(
mXmlId = rValue;
break;
case XML_TOK_TABLE_STYLE_NAME:
-aStyleName = rValue;
+m_aStyleName = rValue;
GetImport().GetTextImport()->SetCellParaStyleDefault(rValue);
break;
case XML_TOK_TABLE_NUM_COLS_SPANNED:
-nColSpan = static_cast(std::max(1,
rValue.toInt32()));
-if (nColSpan > 256)
+m_nColSpan = static_cast(std::max(1,
rValue.toInt32()));
+if (m_nColSpan > 256)
{
-SAL_INFO("sw.xml", "ignoring huge table:number-columns-spanned
" << nColSpan);
-nColSpan = 1;
+SAL_INFO("sw.xml", "ignoring huge table:number-columns-spanned
" << m_nColSpan);
+m_nColSpan = 1;
}
break;
case XML_TOK_TABLE_NUM_ROWS_SPANNED:
-nRowSpan = static_cast(std::max(1,
rValue.toInt32()));
-if (nRowSpan > 8192 || (nRowSpan > 256 &&
utl::ConfigManager::IsFuzzing()))
+m_nRowSpan = static_cast(std::max(1,
rValue.toInt32()));
+if (m_nRowSpan > 8192 || (m_nRowSpan > 256 &&
utl::ConfigManager::IsFuzzing()))
{
-SAL_INFO("sw.xml", "ignoring huge table:number-rows-spanned "
<< nRowSpan);
-nRowSpan = 1;
+SAL_INFO("sw.xml", "ignoring huge table:number-rows-spanned "
<< m_nRowSpan);
+m_nRowSpan = 1;
}
break;
case XML_TOK_TABLE_NUM_COLS_REPEATED:
-nColRepeat = static_cast(std::max(1,
rValue.toInt32())
Re: New Defects reported by Coverity Scan for LibreOffice
On Sun, 2018-05-27 at 22:28 +, scan-ad...@coverity.com wrote: > *** CID 1078573: Null pointer dereferences (FORWARD_NULL) > /sw/source/core/docnode/swbaslnk.cxx Since 7581730b2795a58d4fe6868e2f61572a91fde293 lcl_CallModify ends up as... bool bUpdate = false; SwGrfNode* pSwGrfNode = nullptr; if (m_pContentNode->IsGrfNode()) ... else if( m_pContentNode->IsOLENode() ) bUpdate = true; if (bUpdate) ... SetGrfFlySize(aGrfSz, pSwGrfNode, aOldSz) so on the face of it, if its an ole node and not a graphic SetGrfFlySize now derefs null pSwGrfNode. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/accmap.hxx|3 +++
sw/source/core/access/acccontext.cxx |6 +-
sw/source/core/access/accmap.cxx | 11 ---
3 files changed, 16 insertions(+), 4 deletions(-)
New commits:
commit c12bfe9296b5db66ae7326f1dd99b1aa8fb9d2bb
Author: Caolán McNamara
Date: Fri May 25 14:37:03 2018 +0100
tdf#117601 a11y crash after merging cells
this is similar to tdf#87199, in this case the accessibiles for the merged
cells are not visible so not removed when their frame is deleted, but remain
in the cache pointing to invalid frames.
Change-Id: Ibc5b9f27541683b8f3604839fa3d1431380a4039
Reviewed-on: https://gerrit.libreoffice.org/54808
Reviewed-by: Michael Stahl
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index fc7f665da383..c78bea3e0e51 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -277,6 +277,9 @@ public:
Point PixelToCore (const Point& rPoint) const;
tools::Rectangle CoreToPixel (const tools::Rectangle& rRect) const;
+// is there a known accessibility impl cached for the frame
+bool Contains(const SwFrame *pFrame) const;
+
private:
/** get mapping mode for LogicToPixel and PixelToLogic conversions
diff --git a/sw/source/core/access/acccontext.cxx
b/sw/source/core/access/acccontext.cxx
index 628ad727dc47..efb6b415d372 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -402,8 +402,12 @@ void SwAccessibleContext::DisposeChildren(const SwFrame
*pFrame,
if( pLower )
{
::rtl::Reference< SwAccessibleContext > xAccImpl;
-if( rLower.IsAccessible( GetShell()->IsPreview() ) )
+if (rLower.IsAccessible(GetShell()->IsPreview())
+ // tdf#117601 dispose the darn thing if it ever was
accessible
+|| GetMap()->Contains(pLower))
+{
xAccImpl = GetMap()->GetContextImpl( pLower, false );
+}
if( xAccImpl.is() )
xAccImpl->Dispose( bRecursive );
else
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 712b70873507..43cc0974625e 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -2158,6 +2158,11 @@ void SwAccessibleMap::RemoveContext( const SdrObject
*pObj )
}
}
+bool SwAccessibleMap::Contains(const SwFrame *pFrame) const
+{
+return (pFrame && mpFrameMap && mpFrameMap->find(pFrame) !=
mpFrameMap->end());
+}
+
void SwAccessibleMap::A11yDispose( const SwFrame *pFrame,
const SdrObject *pObj,
vcl::Window* pWindow,
@@ -2173,9 +2178,9 @@ void SwAccessibleMap::A11yDispose( const SwFrame *pFrame,
OSL_ENSURE( !aFrameOrObj.GetSwFrame() ||
aFrameOrObj.GetSwFrame()->IsAccessibleFrame(),
"non accessible frame should be disposed" );
-if (aFrameOrObj.IsAccessible( GetShell()->IsPreview() )
-// fdo#87199 dispose the darn thing if it ever was accessible
-|| (pFrame && mpFrameMap && mpFrameMap->find(pFrame) !=
mpFrameMap->end()))
+if (aFrameOrObj.IsAccessible(GetShell()->IsPreview())
+ // fdo#87199 dispose the darn thing if it ever was accessible
+|| Contains(pFrame))
{
::rtl::Reference< SwAccessibleContext > xAccImpl;
::rtl::Reference< SwAccessibleContext > xParentAccImpl;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source sw/inc
include/svx/unopage.hxx|3 ++-
svx/source/unodraw/unopage.cxx |6 +-
sw/inc/unodraw.hxx |2 +-
3 files changed, 4 insertions(+), 7 deletions(-)
New commits:
commit 26b27c23d42247695d72167be7729e36a473f644
Author: Noel Grandin
Date: Fri May 18 09:47:03 2018 +0200
loplugin:useuniqueptr in SvxDrawPage
Change-Id: Ic0ca03d419cb7124d5076130163de113b29bac9d
Reviewed-on: https://gerrit.libreoffice.org/54848
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx
index eefc11c61b2b..1ca099d797eb 100644
--- a/include/svx/unopage.hxx
+++ b/include/svx/unopage.hxx
@@ -40,6 +40,7 @@
#include
#include
+#include
class SdrPage;
class SdrModel;
@@ -70,7 +71,7 @@ class SVX_DLLPUBLIC SvxDrawPage : public
::cppu::WeakAggImplHelper6< css::drawin
SdrPage*mpPage; // should be reference
SdrModel* mpModel;// probably not needed -> use from SdrPage
-SdrView*mpView;
+std::unique_ptr mpView;
voidSelectObjectsInView( const css::uno::Reference<
css::drawing::XShapes >& aShapes, SdrPageView* pPageView ) throw ();
voidSelectObjectInView( const css::uno::Reference<
css::drawing::XShape >& xShape, SdrPageView* pPageView ) throw();
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 8f252456b107..15a3b01c5635 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -94,11 +94,7 @@ void SvxDrawPage::disposing() throw()
mpModel = nullptr;
}
-if( mpView )
-{
-delete mpView;
-mpView = nullptr;
-}
+mpView.reset();
mpPage = nullptr;
}
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index aea0b64ce67c..3612db0b7755 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -47,7 +47,7 @@ public:
const SdrMarkList& PreGroup(const css::uno::Reference<
css::drawing::XShapes >& rShapes);
voidPreUnGroup(const css::uno::Reference<
css::drawing::XShapeGroup >& rShapeGroup);
-SdrView*GetDrawView() {return mpView;}
+SdrView*GetDrawView() {return mpView.get();}
SdrPageView*GetPageView();
voidRemovePageView();
static css::uno::Reference< css::uno::XInterface > GetInterface(
SdrObject* pObj );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/cib_contract935' - vcl/source
vcl/source/fontsubset/sft.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4ea25643ffa8acfa53703394fb0376b09e225324
Author: Khaled Hosny
Date: Fri Oct 13 20:58:08 2017 +0200
tdf#107605: Fix reading version 0 OS/2 font table
The version 0 table os exactly 78 bytes since it does not have any of
the extra fields from the later versions.
Change-Id: Ie2e478bdefb201b988dc0844240d4ff193d66583
Reviewed-on: https://gerrit.libreoffice.org/43374
Tested-by: Jenkins
Reviewed-by: Khaled Hosny
(cherry picked from commit abc401787179b097dcbc1006fa454980537bfc0b)
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index d4a8b5a764a6..d1397efc4ecc 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -2532,7 +2532,7 @@ void GetTTFontMterics(const std::vector& hhea,
* FIXME: horribly outdated comment and horrible code that uses hard-coded
* offsets to read the table.
*/
-if (os2.size() > 76 + 2)
+if (os2.size() >= 76 + 2)
{
info->fsSelection = GetUInt16(os2.data(), 62);
info->typoAscender = GetInt16(os2.data(), 68);
@@ -2542,7 +2542,7 @@ void GetTTFontMterics(const std::vector& hhea,
info->winDescent= GetUInt16(os2.data(), 76);
}
-if (hhea.size() > 8 + 2) {
+if (hhea.size() >= 8 + 2) {
info->ascender = GetInt16(hhea.data(), 4);
info->descender = GetInt16(hhea.data(), 6);
info->linegap = GetInt16(hhea.data(), 8);
___
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/runtime/methods.cxx | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
New commits:
commit f122faeede515093cf9dc450c9b62fdaae603bef
Author: Takeshi Abe
Date: Mon May 7 17:31:39 2018 +0900
basic: Avoid looking up system clock twice to get current datetime
Change-Id: I3de322a420bdbbd7906160b97dca531dfe3092a4
Reviewed-on: https://gerrit.libreoffice.org/53929
Tested-by: Jenkins
Reviewed-by: Takeshi Abe
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 589105ff3935..960219ca81c0 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -2224,13 +2224,12 @@ void SbRtl_Second(StarBASIC *, SbxArray & rPar, bool)
double Now_Impl()
{
-Date aDate( Date::SYSTEM );
-tools::Time aTime( tools::Time::SYSTEM );
-double aSerial = static_cast(GetDayDiff( aDate ));
-long nSeconds = aTime.GetHour();
+DateTime aDateTime( DateTime::SYSTEM );
+double aSerial = static_cast(GetDayDiff( aDateTime ));
+long nSeconds = aDateTime.GetHour();
nSeconds *= 3600;
-nSeconds += aTime.GetMin() * 60;
-nSeconds += aTime.GetSec();
+nSeconds += aDateTime.GetMin() * 60;
+nSeconds += aDateTime.GetSec();
double nDays = static_cast(nSeconds) / (24.0*3600.0);
aSerial += nDays;
return aSerial;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
tdf97815 switching to English function names does not work with _ADD functions
Hi Eike, As I did some work in the past on this aspect, I try to fix this bug, even though I am not a big fan of the Add-In functions ;-). I came across code that I don't understand enough: 1. /scaddins/source/analysis/deffuncname.hxx contains a lot of static const char*[2], with German and English function name. Why is there a German function name, can't this be removed (this German function name must at least be related to the cause of the bug)? 2. /scaddins/source/analysis/analysishelper.cxx contains a const FuncDataBase pFuncDatas[], that uses a macro FUNCDATA, which uses "get" to fill the structure. I can't easily find this "get"; do you know where it is defined? Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-cd-3-2' - wsd/Admin.cpp
wsd/Admin.cpp |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit d5deed4a3737292a46fd8314859c9f7f76084736
Author: Michael Meeks
Date: Tue May 15 10:52:56 2018 +0100
Start the admin thread even if it is disabled.
The admin thread does memory cleanup as well which is required.
This also reduces logging churn.
Change-Id: I1c6cfaf6085b685f230dc24ae1716b0256d892f8
Reviewed-on: https://gerrit.libreoffice.org/54365
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index 7645f74cd..ba24004ec 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -614,8 +614,7 @@ void Admin::dumpState(std::ostream& os)
void Admin::start()
{
-if (LOOLWSD::AdminEnabled)
-startThread();
+startThread();
}
/* 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: sc/source
sc/source/ui/unoobj/textuno.cxx | 25 -
1 file changed, 8 insertions(+), 17 deletions(-)
New commits:
commit 06f86d544c8017c2e736bc77db27dd623853770b
Author: Noel Grandin
Date: Mon May 28 10:19:25 2018 +0200
tdf#100756 slowdown in manipulating spreadsheet via UNO
regression from
commit 5bce32904091ffe28884fd5c0f4801ee82bad101
SfxHint: convert home-grown RTTI to normal C++ RTTI
the cost does seem in this case to be mostly the dynamic_cast, but since
we don't need it anymore, just remove it
Change-Id: Icbf51b89c036b86cfb3e4c2a827228ccf25bb3a6
Reviewed-on: https://gerrit.libreoffice.org/54899
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index d868dffd3a84..49fc91b2037a 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -987,27 +987,18 @@ void ScCellTextData::UpdateData()
void ScCellTextData::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
-if ( dynamic_cast(&rHint) )
+const SfxHintId nId = rHint.GetId();
+if ( nId == SfxHintId::Dying )
{
-//const ScUpdateRefHint& rRef = (const ScUpdateRefHint&)rHint;
+pDocShell = nullptr; // invalid now
-//! Ref-Update
+DELETEZ( pForwarder );
+pEditEngine.reset(); // EditEngine uses document's pool
}
-else
+else if ( nId == SfxHintId::DataChanged )
{
-const SfxHintId nId = rHint.GetId();
-if ( nId == SfxHintId::Dying )
-{
-pDocShell = nullptr; // invalid now
-
-DELETEZ( pForwarder );
-pEditEngine.reset(); // EditEngine uses document's pool
-}
-else if ( nId == SfxHintId::DataChanged )
-{
-if (!bInUpdate) // not for own UpdateData
calls
-bDataValid = false; // text has to be read
from the cell again
-}
+if (!bInUpdate) // not for own UpdateData calls
+bDataValid = false; // text has to be read from
the cell again
}
}
___
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/inc sw/source
sw/inc/accmap.hxx|3 +++
sw/source/core/access/acccontext.cxx |6 +-
sw/source/core/access/accmap.cxx | 11 ---
3 files changed, 16 insertions(+), 4 deletions(-)
New commits:
commit 95ed8c0c76c18e773c5484b8b27c36805fcc7b9b
Author: Caolán McNamara
Date: Fri May 25 14:37:03 2018 +0100
tdf#117601 a11y crash after merging cells
this is similar to tdf#87199, in this case the accessibiles for the merged
cells are not visible so not removed when their frame is deleted, but remain
in the cache pointing to invalid frames.
Change-Id: Ibc5b9f27541683b8f3604839fa3d1431380a4039
Reviewed-on: https://gerrit.libreoffice.org/54902
Reviewed-by: Michael Stahl
Tested-by: Jenkins
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index fc7f665da383..c78bea3e0e51 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -277,6 +277,9 @@ public:
Point PixelToCore (const Point& rPoint) const;
tools::Rectangle CoreToPixel (const tools::Rectangle& rRect) const;
+// is there a known accessibility impl cached for the frame
+bool Contains(const SwFrame *pFrame) const;
+
private:
/** get mapping mode for LogicToPixel and PixelToLogic conversions
diff --git a/sw/source/core/access/acccontext.cxx
b/sw/source/core/access/acccontext.cxx
index 628ad727dc47..efb6b415d372 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -402,8 +402,12 @@ void SwAccessibleContext::DisposeChildren(const SwFrame
*pFrame,
if( pLower )
{
::rtl::Reference< SwAccessibleContext > xAccImpl;
-if( rLower.IsAccessible( GetShell()->IsPreview() ) )
+if (rLower.IsAccessible(GetShell()->IsPreview())
+ // tdf#117601 dispose the darn thing if it ever was
accessible
+|| GetMap()->Contains(pLower))
+{
xAccImpl = GetMap()->GetContextImpl( pLower, false );
+}
if( xAccImpl.is() )
xAccImpl->Dispose( bRecursive );
else
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 712b70873507..43cc0974625e 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -2158,6 +2158,11 @@ void SwAccessibleMap::RemoveContext( const SdrObject
*pObj )
}
}
+bool SwAccessibleMap::Contains(const SwFrame *pFrame) const
+{
+return (pFrame && mpFrameMap && mpFrameMap->find(pFrame) !=
mpFrameMap->end());
+}
+
void SwAccessibleMap::A11yDispose( const SwFrame *pFrame,
const SdrObject *pObj,
vcl::Window* pWindow,
@@ -2173,9 +2178,9 @@ void SwAccessibleMap::A11yDispose( const SwFrame *pFrame,
OSL_ENSURE( !aFrameOrObj.GetSwFrame() ||
aFrameOrObj.GetSwFrame()->IsAccessibleFrame(),
"non accessible frame should be disposed" );
-if (aFrameOrObj.IsAccessible( GetShell()->IsPreview() )
-// fdo#87199 dispose the darn thing if it ever was accessible
-|| (pFrame && mpFrameMap && mpFrameMap->find(pFrame) !=
mpFrameMap->end()))
+if (aFrameOrObj.IsAccessible(GetShell()->IsPreview())
+ // fdo#87199 dispose the darn thing if it ever was accessible
+|| Contains(pFrame))
{
::rtl::Reference< SwAccessibleContext > xAccImpl;
::rtl::Reference< SwAccessibleContext > xParentAccImpl;
___
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' - sw/inc sw/source
sw/inc/accmap.hxx|3 +++
sw/source/core/access/acccontext.cxx |6 +-
sw/source/core/access/accmap.cxx | 11 ---
3 files changed, 16 insertions(+), 4 deletions(-)
New commits:
commit bab7384c005921768a9499550c1525d211aeddf9
Author: Caolán McNamara
Date: Fri May 25 14:37:03 2018 +0100
tdf#117601 a11y crash after merging cells
this is similar to tdf#87199, in this case the accessibiles for the merged
cells are not visible so not removed when their frame is deleted, but remain
in the cache pointing to invalid frames.
Change-Id: Ibc5b9f27541683b8f3604839fa3d1431380a4039
Reviewed-on: https://gerrit.libreoffice.org/54903
Reviewed-by: Michael Stahl
Tested-by: Jenkins
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 2739b1a78a01..8582e2354347 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -292,6 +292,9 @@ public:
Point PixelToCore (const Point& rPoint) const;
tools::Rectangle CoreToPixel (const tools::Rectangle& rRect) const;
+// is there a known accessibility impl cached for the frame
+bool Contains(const SwFrame *pFrame) const;
+
private:
/** get mapping mode for LogicToPixel and PixelToLogic conversions
diff --git a/sw/source/core/access/acccontext.cxx
b/sw/source/core/access/acccontext.cxx
index 46e0be9ce220..176358fd4907 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -402,8 +402,12 @@ void SwAccessibleContext::DisposeChildren(const SwFrame
*pFrame,
if( pLower )
{
::rtl::Reference< SwAccessibleContext > xAccImpl;
-if( rLower.IsAccessible( GetShell()->IsPreview() ) )
+if (rLower.IsAccessible(GetShell()->IsPreview())
+ // tdf#117601 dispose the darn thing if it ever was
accessible
+|| GetMap()->Contains(pLower))
+{
xAccImpl = GetMap()->GetContextImpl( pLower, false );
+}
if( xAccImpl.is() )
xAccImpl->Dispose( bRecursive );
else
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 98a50e784b5b..7047b4ddce47 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -2162,6 +2162,11 @@ void SwAccessibleMap::RemoveContext( const SdrObject
*pObj )
}
}
+bool SwAccessibleMap::Contains(const SwFrame *pFrame) const
+{
+return (pFrame && mpFrameMap && mpFrameMap->find(pFrame) !=
mpFrameMap->end());
+}
+
void SwAccessibleMap::A11yDispose( const SwFrame *pFrame,
const SdrObject *pObj,
vcl::Window* pWindow,
@@ -2177,9 +2182,9 @@ void SwAccessibleMap::A11yDispose( const SwFrame *pFrame,
OSL_ENSURE( !aFrameOrObj.GetSwFrame() ||
aFrameOrObj.GetSwFrame()->IsAccessibleFrame(),
"non accessible frame should be disposed" );
-if (aFrameOrObj.IsAccessible( GetShell()->IsPreview() )
-// fdo#87199 dispose the darn thing if it ever was accessible
-|| (pFrame && mpFrameMap && mpFrameMap->find(pFrame) !=
mpFrameMap->end()))
+if (aFrameOrObj.IsAccessible(GetShell()->IsPreview())
+ // fdo#87199 dispose the darn thing if it ever was accessible
+|| Contains(pFrame))
{
::rtl::Reference< SwAccessibleContext > xAccImpl;
::rtl::Reference< SwAccessibleContext > xParentAccImpl;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang dbaccess/source
compilerplugins/clang/useuniqueptr.cxx |3 ++
dbaccess/source/ui/dlg/dbwiz.cxx | 34 -
dbaccess/source/ui/inc/dbwiz.hxx |2 -
3 files changed, 21 insertions(+), 18 deletions(-)
New commits:
commit f66510f1da3ab0584cd13e55f59728f7a2f2f488
Author: Noel Grandin
Date: Fri May 18 13:44:18 2018 +0200
loplugin:useuniqueptr in ODbTypeWizDialog
Change-Id: I4c364ddbad4881cc8a70a1827d7c51e7cc9313f1
Reviewed-on: https://gerrit.libreoffice.org/54850
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/compilerplugins/clang/useuniqueptr.cxx
b/compilerplugins/clang/useuniqueptr.cxx
index 4dc5b85dbf3b..2424bcca8c09 100644
--- a/compilerplugins/clang/useuniqueptr.cxx
+++ b/compilerplugins/clang/useuniqueptr.cxx
@@ -59,6 +59,9 @@ public:
// horrible horrible spawn of evil ownership and deletion here
if (fn == SRCDIR "/sfx2/source/view/ipclient.cxx")
return;
+// sometimes it owns, sometimes it doesn't
+if (fn == SRCDIR "/editeng/source/misc/svxacorr.cxx")
+return;
TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
}
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 4bbbc7c7c052..106f028f029e 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -74,7 +74,7 @@ ODbTypeWizDialog::ODbTypeWizDialog(vcl::Window* _pParent
m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxORB,this,this));
m_pImpl->setDataSourceOrName(_aDataSourceName);
Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource();
-m_pOutSet = new SfxItemSet( *_pItems->GetPool(), _pItems->GetRanges() );
+m_pOutSet.reset(new SfxItemSet( *_pItems->GetPool(), _pItems->GetRanges()
));
m_pImpl->translateProperties(xDatasource, *m_pOutSet);
m_eType =
dbaui::ODbDataSourceAdministrationHelper::getDatasourceType(*m_pOutSet);
@@ -104,7 +104,7 @@ ODbTypeWizDialog::~ODbTypeWizDialog()
void ODbTypeWizDialog::dispose()
{
-delete m_pOutSet;
+m_pOutSet.reset();
svt::OWizardMachine::dispose();
}
@@ -197,12 +197,12 @@ WizardTypes::WizardState
ODbTypeWizDialog::determineNextState( WizardState _nCur
const SfxItemSet* ODbTypeWizDialog::getOutputSet() const
{
-return m_pOutSet;
+return m_pOutSet.get();
}
SfxItemSet* ODbTypeWizDialog::getWriteOutputSet()
{
-return m_pOutSet;
+return m_pOutSet.get();
}
std::pair< Reference,bool> ODbTypeWizDialog::createConnection()
@@ -245,39 +245,39 @@ VclPtr ODbTypeWizDialog::createPage(WizardState
_nState)
}
break;
case CONNECTION_PAGE:
-pPage = OConnectionTabPage::Create(this,m_pOutSet);
+pPage = OConnectionTabPage::Create(this,m_pOutSet.get());
pStringId = STR_PAGETITLE_CONNECTION;
break;
case ADDITIONAL_PAGE_DBASE:
-pPage = ODriversSettings::CreateDbase(this,m_pOutSet);
+pPage = ODriversSettings::CreateDbase(this,m_pOutSet.get());
break;
case ADDITIONAL_PAGE_FLAT:
-pPage = ODriversSettings::CreateText(this,m_pOutSet);
+pPage = ODriversSettings::CreateText(this,m_pOutSet.get());
break;
case ADDITIONAL_PAGE_LDAP:
-pPage = ODriversSettings::CreateLDAP(this,m_pOutSet);
+pPage = ODriversSettings::CreateLDAP(this,m_pOutSet.get());
break;
case ADDITIONAL_PAGE_MYSQL_JDBC:
-pPage = ODriversSettings::CreateMySQLJDBC(this,m_pOutSet);
+pPage = ODriversSettings::CreateMySQLJDBC(this,m_pOutSet.get());
break;
case ADDITIONAL_PAGE_MYSQL_NATIVE:
-pPage = ODriversSettings::CreateMySQLNATIVE(this,m_pOutSet);
+pPage = ODriversSettings::CreateMySQLNATIVE(this,m_pOutSet.get());
break;
case ADDITIONAL_PAGE_MYSQL_ODBC:
-pPage = ODriversSettings::CreateMySQLODBC(this,m_pOutSet);
+pPage = ODriversSettings::CreateMySQLODBC(this,m_pOutSet.get());
break;
case ADDITIONAL_PAGE_ORACLE_JDBC:
-pPage = ODriversSettings::CreateOracleJDBC(this,m_pOutSet);
+pPage = ODriversSettings::CreateOracleJDBC(this,m_pOutSet.get());
break;
case ADDITIONAL_PAGE_ADO:
-pPage = ODriversSettings::CreateAdo(this,m_pOutSet);
+pPage = ODriversSettings::CreateAdo(this,m_pOutSet.get());
break;
case ADDITIONAL_PAGE_ODBC:
-pPage = ODriversSettings::CreateODBC(this,m_pOutSet);
+pPage = ODriversSettings::CreateODBC(this,m_pOutSet.get());
break;
case ADDITIONAL_USERDEFINED:
-pPage = ODriversSettings::CreateUser(this,m_pOutSet);
+pPage = ODriversSettings::CreateUser(this,m_pOutSet.get());
break;
default:
OSL_FAIL(
[Libreoffice-commits] core.git: extras/source include/svtools include/svx include/vcl sc/inc sc/qa sc/source sc/uiconfig svtools/source svx/source vcl/source vcl/unx
extras/source/glade/libreoffice-catalog.xml.in |3
include/svtools/valueset.hxx | 201 +++
include/svx/SvxColorValueSet.hxx | 13
include/vcl/customweld.hxx | 19
include/vcl/layout.hxx | 24
include/vcl/weld.hxx | 16
sc/inc/scabstdlg.hxx |8
sc/qa/unit/screenshots/screenshots.cxx |2
sc/source/ui/attrdlg/scdlgfact.cxx | 13
sc/source/ui/attrdlg/scdlgfact.hxx | 17
sc/source/ui/inc/tabbgcolordlg.hxx | 29
sc/source/ui/miscdlgs/tabbgcolordlg.cxx| 90 -
sc/source/ui/view/tabvwshf.cxx |2
sc/uiconfig/scalc/ui/tabcolordialog.ui | 53
svtools/source/control/valueacc.cxx| 983
svtools/source/control/valueimp.hxx| 198 +++
svtools/source/control/valueset.cxx| 1455 +
svx/source/tbxctrls/SvxColorValueSet.cxx | 74 +
vcl/source/app/customweld.cxx |6
vcl/source/app/salvtables.cxx | 23
vcl/unx/gtk3/gtk3gtkinst.cxx | 56
21 files changed, 3168 insertions(+), 117 deletions(-)
New commits:
commit 4883fd31141c3598b25a123033297f847cd18552
Author: Caolán McNamara
Date: Wed May 23 14:15:46 2018 +0100
weld ScTabBgColorDlg
Change-Id: I864382bc55dead850c13faae9958fb660fd4f156
Reviewed-on: https://gerrit.libreoffice.org/54809
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index 22b33767161b..04fbd09c5a22 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -338,9 +338,6 @@
-
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 000e00268874..5530adf33da8 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
#include
#include
@@ -36,6 +37,7 @@ class DataChangedEvent;
class ScrollBar;
struct ValueSetItem;
+struct SvtValueSetItem;
class ValueSetAcc;
class ValueItemAcc;
@@ -178,6 +180,7 @@ to be set (before Show) with SetStyle().
*/
typedef std::vector ValueItemList;
+typedef std::vector SvtValueItemList;
#define WB_ITEMBORDER (WinBits(0x0001))
#define WB_DOUBLEBORDER (WinBits(0x0002))
@@ -405,6 +408,204 @@ public:
void SetEdgeBlending(bool bNew);
};
+class SVT_DLLPUBLIC SvtValueSet : public weld::CustomWidgetController
+{
+private:
+
+ScopedVclPtr maVirDev;
+css::uno::Reference mxAccessible;
+SvtValueItemList mItemList;
+std::unique_ptr mpNoneItem;
+tools::Rectangle maNoneItemRect;
+tools::Rectangle maItemListRect;
+longmnItemWidth;
+longmnItemHeight;
+longmnTextOffset;
+longmnVisLines;
+longmnLines;
+longmnUserItemWidth;
+longmnUserItemHeight;
+sal_uInt16 mnSelItemId;
+sal_uInt16 mnHighItemId;
+sal_uInt16 mnCols;
+sal_uInt16 mnCurCol;
+sal_uInt16 mnUserCols;
+sal_uInt16 mnUserVisLines;
+sal_uInt16 mnFirstLine;
+sal_uInt16 mnSpacing;
+DrawFrameStyle mnFrameStyle;
+Color maColor;
+OUStringmaText;
+WinBits mnStyle;
+Link maDoubleClickHdl;
+Link maSelectHdl;
+Link maHighlightHdl;
+
+boolmbFormat : 1;
+boolmbNoSelection : 1;
+boolmbBlackSel : 1;
+boolmbDoubleSel : 1;
+boolmbScroll : 1;
+boolmbFullMode : 1;
+boolmbEdgeBlending : 1;
+boolmbHasVisibleItems : 1;
+
+friend class SvtValueSetAcc;
+friend class SvtValueItemAcc;
+
+SVT_DLLPRIVATE void ImplInitSettings( bool bFont, bool
bForeground, bool bBackground );
+
+SVT_DLLPRIVATE void ImplInitScrollBar();
+SVT_DLLPRIVATE void ImplDeleteItems();
+SVT_DLLPRIVATE void ImplFormatItem(vcl::RenderContext const &
rRenderContext, SvtValueSetItem* pItem, tools::Rectangle aRect);
+SVT_DLLPRIVATE void ImplDrawItemText(vcl::RenderContext&
rRenderContext, const OUString& rStr);
+SVT_DLLPRIVATE void ImplDrawSelect(vcl::RenderContext&
rRenderContext, sal_uInt16 nItemId, const bool bFocus, const bool bDrawSel);
+SVT_DLLPRIVATE void ImplDrawSelect(vcl::RenderContext&
rRenderContext);
+SVT_DLLPRIVATE void ImplDraw(vcl::RenderContext& rRenderContext);
+SVT_DLLPRIVATE bool ImplScroll( const Point& rPos );
+SVT_DLL
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a060c536c6afb15dbe41d2e4d3d8d3c7df2c454e Author: Christian Lohmaier Date: Mon May 28 14:04:16 2018 +0200 Updated core Project: translations b1dbd807900728ddd68a7b03ea58a5ce43717f6f add Frisian translation Change-Id: If5b9e5bf1f924e32b8fd0d6bd4c078e8fdb3f26f diff --git a/translations b/translations index adb3b92c5d9f..b1dbd8079007 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit adb3b92c5d9fff53ba638017eda2a2536ff8beb4 +Subproject commit b1dbd807900728ddd68a7b03ea58a5ce43717f6f ___ 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' - l10ntools/source scp2/source solenv/inc
l10ntools/source/ulfconv/msi-encodinglist.txt |1 + scp2/source/ooo/module_langpack.ulf |6 ++ solenv/inc/langlist.mk|1 + 3 files changed, 8 insertions(+) New commits: commit 9bf385b15439f25b89fe7c53a967a0941440226e Author: Christian Lohmaier Date: Wed May 23 11:12:23 2018 +0200 tdf#117729 add Frisian (fy) UI langauge Change-Id: I46f75e969b1252a9511507c116f44578dfbd Reviewed-on: https://gerrit.libreoffice.org/54699 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier (cherry picked from commit f8fb04d0af7b1d21b8638e92922d0965e507c5d9) diff --git a/l10ntools/source/ulfconv/msi-encodinglist.txt b/l10ntools/source/ulfconv/msi-encodinglist.txt index 9670f9ea0af6..44d7f91b2650 100644 --- a/l10ntools/source/ulfconv/msi-encodinglist.txt +++ b/l10ntools/source/ulfconv/msi-encodinglist.txt @@ -58,6 +58,7 @@ fi 0 1035 fo 0 1080 # Faroese fr 0 1036 fr-CA0 3084 +fy 0 1122 # Frisian fur 0 1585 ga 0 2108 # Irish gd 0 1084 # Gaelic (Scotland) diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf index 113f01906c5a..ca1c40b2a7db 100644 --- a/scp2/source/ooo/module_langpack.ulf +++ b/scp2/source/ooo/module_langpack.ulf @@ -40,6 +40,12 @@ en-US = "French" [STR_DESC_MODULE_LANGPACK_FR] en-US = "Installs the French user interface" +[STR_NAME_MODULE_LANGPACK_FY] +en-US = "Frisian" + +[STR_DESC_MODULE_LANGPACK_FY] +en-US = "Installs the Frisian user interface" + [STR_NAME_MODULE_LANGPACK_IT] en-US = "Italian" diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk index 41b557a420c4..d0c5cb5cba78 100644 --- a/solenv/inc/langlist.mk +++ b/solenv/inc/langlist.mk @@ -49,6 +49,7 @@ eu \ fa \ fi \ fr \ +fy \ ga \ gd \ gl \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3-3.2' - vcl/source
vcl/source/filter/ipdf/pdfread.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 4a3457907546b4cde3adaf0ba6a6d258fe1b54b7
Author: Ashod Nakashian
Date: Mon May 28 08:02:06 2018 -0400
vcl: fix pdf rendering regression
Change-Id: I6c2c48c033facb317b4ca7ed2af07348d6386b98
Reviewed-on: https://gerrit.libreoffice.org/54921
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/vcl/source/filter/ipdf/pdfread.cxx
b/vcl/source/filter/ipdf/pdfread.cxx
index f61c4062fb37..af8f3ab38c06 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -264,7 +264,9 @@ bool ImportPDF(SvStream& rStream, Graphic& rGraphic,
{
uno::Sequence aPdfData;
Bitmap aBitmap;
-bool bRet = ImportPDF(rStream, aBitmap, 0, aPdfData, fResolutionDPI);
+bool bRet = ImportPDF(rStream, aBitmap, 0, aPdfData,
+ STREAM_SEEK_TO_BEGIN,
+ STREAM_SEEK_TO_END, fResolutionDPI);
rGraphic = aBitmap;
rGraphic.setPdfData(std::make_shared>(aPdfData));
rGraphic.setPageNumber(0); // We currently import only the first page.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Changes to 'feature/latency'
New branch 'feature/latency' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/qa
vcl/qa/cppunit/complextext.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit 39eecc510667c8b1be9d3a031f7a30ae5be18040
Author: Noel Grandin
Date: Mon May 28 11:14:36 2018 +0200
disable part of VclComplexTextTest::testArabic
fails sporadically on one of the windows buildboxes, Khaled might be
able to get to it in a few weeks
Change-Id: I65ebb8ad1e2ae08308d2ac150b88a393c134f715
Reviewed-on: https://gerrit.libreoffice.org/54906
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index ad5d6ca1f48f..97d156d4f8e8 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -9,7 +9,9 @@
#include
#include
+#if !defined(_WIN32)
std::ostream& operator<<(std::ostream& rStream, const std::vector& rVec);
+#endif
#include
#include
@@ -23,6 +25,7 @@ std::ostream& operator<<(std::ostream& rStream, const
std::vector& rVec);
#include
+#if !defined(_WIN32)
std::ostream& operator<<(std::ostream& rStream, const std::vector& rVec)
{
rStream << "{ ";
@@ -32,6 +35,7 @@ std::ostream& operator<<(std::ostream& rStream, const
std::vector& rVec)
rStream << " }";
return rStream;
}
+#endif
class VclComplexTextTest : public test::BootstrapFixture
{
@@ -76,12 +80,16 @@ void VclComplexTextTest::testArabic()
pOutDev->SetFont( aFont );
// absolute character widths AKA text array.
+#if !defined(_WIN32)
std::vector aRefCharWidths {6, 9, 16, 16, 22, 22, 26, 29, 32, 32,
36, 40, 49, 53, 56, 63, 63, 66, 72, 72};
+#endif
std::vector aCharWidths(aOneTwoThree.getLength(), 0);
long nTextWidth = pOutDev->GetTextArray(aOneTwoThree, aCharWidths.data());
+#if !defined(_WIN32)
CPPUNIT_ASSERT_EQUAL(aRefCharWidths, aCharWidths);
+#endif
CPPUNIT_ASSERT_EQUAL(72L, nTextWidth);
CPPUNIT_ASSERT_EQUAL(nTextWidth, aCharWidths.back());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/access/acccontext.cxx |9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
New commits:
commit eccf771815eefb826f5bb8597277020ec297edf1
Author: Caolán McNamara
Date: Mon May 28 09:50:09 2018 +0100
directly get matching a11y if it exists
rather than check if it exists, and then get it if it exists
I wonder if the else branch from...
commit 0c2229dcab143925c6ad390e0735e2d98c3eecca
Date: Fri Mar 24 13:04:32 2017 +0100
tdf#58624 sw: fix ~SwAccessibleContext() use-after-free race
is still relevant after this
Change-Id: Idabea01f0c450b07b75214c5a83460e1d0319802
Reviewed-on: https://gerrit.libreoffice.org/54904
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/core/access/acccontext.cxx
b/sw/source/core/access/acccontext.cxx
index efb6b415d372..b1d7e2f810ad 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -401,13 +401,8 @@ void SwAccessibleContext::DisposeChildren(const SwFrame
*pFrame,
const SwFrame* pLower = rLower.GetSwFrame();
if( pLower )
{
-::rtl::Reference< SwAccessibleContext > xAccImpl;
-if (rLower.IsAccessible(GetShell()->IsPreview())
- // tdf#117601 dispose the darn thing if it ever was
accessible
-|| GetMap()->Contains(pLower))
-{
-xAccImpl = GetMap()->GetContextImpl( pLower, false );
-}
+// tdf#117601 dispose the darn thing if it ever was accessible
+::rtl::Reference xAccImpl =
GetMap()->GetContextImpl(pLower, false);
if( xAccImpl.is() )
xAccImpl->Dispose( bRecursive );
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Fred Kruse license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Best Regards Fred Kruse ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/core/graphichelper.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 796bee47e90efee7c076f6acdc2a95004ed081d0
Author: Marco Cecchetti
Date: Tue May 15 11:13:05 2018 +0200
tdf#117172 - Image context menu Save fails to do anything
Change-Id: I5c0980d85ef5ed050bfafbc368576c5ad72a80a7
Reviewed-on: https://gerrit.libreoffice.org/54359
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/svx/source/core/graphichelper.cxx
b/svx/source/core/graphichelper.cxx
index 355ba12fcec9..4c01c13191ac 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -331,6 +331,13 @@ OUString GraphicHelper::ExportGraphic(weld::Window*
pParent, const Graphic& rGra
return sPath;
}
}
+else
+{
+XOutBitmap::WriteGraphic( rGraphic, sPath, aFilter,
+XOutFlags::DontExpandFilename |
+XOutFlags::DontAddExtension |
+XOutFlags::UseNativeIfPossible );
+}
}
}
return OUString();
___
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/inc vcl/unx
vcl/inc/unx/salobj.h |1 +
vcl/unx/generic/window/salobj.cxx | 10 --
2 files changed, 5 insertions(+), 6 deletions(-)
New commits:
commit 20c6ab6b492d360faafeb857ef51bc0da5f645f6
Author: Caolán McNamara
Date: Mon May 28 10:48:32 2018 +0100
tdf#117628 crash after closing media player with X11 backend
Change-Id: I812da5ddf7343573f93ea64e592442edb31cad2d
Reviewed-on: https://gerrit.libreoffice.org/54911
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h
index 8eb91b917efe..4a0535507dc2 100644
--- a/vcl/inc/unx/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -56,6 +56,7 @@ class VCLPLUG_GEN_PUBLIC X11SalObject : public SalObject
public:
SystemEnvData maSystemChildData;
SalFrame* mpParent;
+::WindowmaParentWin;
::WindowmaPrimary;
::WindowmaSecondary;
ColormapmaColormap;
diff --git a/vcl/unx/generic/window/salobj.cxx
b/vcl/unx/generic/window/salobj.cxx
index 203c1d3bb794..76fe2311514c 100644
--- a/vcl/unx/generic/window/salobj.cxx
+++ b/vcl/unx/generic/window/salobj.cxx
@@ -63,6 +63,7 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent,
SystemWindowData* p
const SystemEnvData* pEnv = pParent->GetSystemData();
Display* pDisp = pSalDisp->GetDisplay();
::Window aObjectParent = static_cast<::Window>(pEnv->aWindow);
+pObject->maParentWin = aObjectParent;
// find out on which screen that window is
XWindowAttributes aParentAttr;
@@ -235,8 +236,7 @@ X11SalObject::~X11SalObject()
rObjects.remove( this );
GetGenericUnixSalData()->ErrorTrapPush();
-const SystemEnvData* pEnv = mpParent->GetSystemData();
-::Window aObjectParent = static_cast<::Window>(pEnv->aWindow);
+::Window aObjectParent = maParentWin;
XSetWindowBackgroundPixmap(static_cast(maSystemChildData.pDisplay),
aObjectParent, None);
if ( maSecondary )
XDestroyWindow( static_cast(maSystemChildData.pDisplay),
maSecondary );
@@ -400,12 +400,11 @@ bool X11SalObject::Dispatch( XEvent* pEvent )
)
{
SalMouseEvent aEvt;
-const SystemEnvData* pParentData =
pObject->mpParent->GetSystemData();
int dest_x, dest_y;
::Window aChild = None;
XTranslateCoordinates( pEvent->xbutton.display,
pEvent->xbutton.root,
- pParentData->aWindow,
+ pObject->maParentWin,
pEvent->xbutton.x_root,
pEvent->xbutton.y_root,
&dest_x, &dest_y,
@@ -466,9 +465,8 @@ bool X11SalObject::Dispatch( XEvent* pEvent )
void X11SalObject::SetLeaveEnterBackgrounds(const
css::uno::Sequence& rLeaveArgs, const
css::uno::Sequence& rEnterArgs)
{
SalDisplay* pSalDisp=
vcl_sal::getSalDisplay(GetGenericUnixSalData());
-const SystemEnvData* pEnv = mpParent->GetSystemData();
Display* pDisp = pSalDisp->GetDisplay();
-::Window aObjectParent = static_cast<::Window>(pEnv->aWindow);
+::Window aObjectParent = maParentWin;
bool bFreePixmap = false;
Pixmap aPixmap = None;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/unx
vcl/inc/unx/salobj.h |1 +
vcl/unx/generic/window/salobj.cxx | 10 --
2 files changed, 5 insertions(+), 6 deletions(-)
New commits:
commit 5fde838b561924208dacd4a3f4ce5df6c7ea4661
Author: Caolán McNamara
Date: Mon May 28 10:48:32 2018 +0100
tdf#117628 crash after closing media player with X11 backend
Change-Id: I812da5ddf7343573f93ea64e592442edb31cad2d
Reviewed-on: https://gerrit.libreoffice.org/54910
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h
index 8eb91b917efe..4a0535507dc2 100644
--- a/vcl/inc/unx/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -56,6 +56,7 @@ class VCLPLUG_GEN_PUBLIC X11SalObject : public SalObject
public:
SystemEnvData maSystemChildData;
SalFrame* mpParent;
+::WindowmaParentWin;
::WindowmaPrimary;
::WindowmaSecondary;
ColormapmaColormap;
diff --git a/vcl/unx/generic/window/salobj.cxx
b/vcl/unx/generic/window/salobj.cxx
index 203c1d3bb794..76fe2311514c 100644
--- a/vcl/unx/generic/window/salobj.cxx
+++ b/vcl/unx/generic/window/salobj.cxx
@@ -63,6 +63,7 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent,
SystemWindowData* p
const SystemEnvData* pEnv = pParent->GetSystemData();
Display* pDisp = pSalDisp->GetDisplay();
::Window aObjectParent = static_cast<::Window>(pEnv->aWindow);
+pObject->maParentWin = aObjectParent;
// find out on which screen that window is
XWindowAttributes aParentAttr;
@@ -235,8 +236,7 @@ X11SalObject::~X11SalObject()
rObjects.remove( this );
GetGenericUnixSalData()->ErrorTrapPush();
-const SystemEnvData* pEnv = mpParent->GetSystemData();
-::Window aObjectParent = static_cast<::Window>(pEnv->aWindow);
+::Window aObjectParent = maParentWin;
XSetWindowBackgroundPixmap(static_cast(maSystemChildData.pDisplay),
aObjectParent, None);
if ( maSecondary )
XDestroyWindow( static_cast(maSystemChildData.pDisplay),
maSecondary );
@@ -400,12 +400,11 @@ bool X11SalObject::Dispatch( XEvent* pEvent )
)
{
SalMouseEvent aEvt;
-const SystemEnvData* pParentData =
pObject->mpParent->GetSystemData();
int dest_x, dest_y;
::Window aChild = None;
XTranslateCoordinates( pEvent->xbutton.display,
pEvent->xbutton.root,
- pParentData->aWindow,
+ pObject->maParentWin,
pEvent->xbutton.x_root,
pEvent->xbutton.y_root,
&dest_x, &dest_y,
@@ -466,9 +465,8 @@ bool X11SalObject::Dispatch( XEvent* pEvent )
void X11SalObject::SetLeaveEnterBackgrounds(const
css::uno::Sequence& rLeaveArgs, const
css::uno::Sequence& rEnterArgs)
{
SalDisplay* pSalDisp=
vcl_sal::getSalDisplay(GetGenericUnixSalData());
-const SystemEnvData* pEnv = mpParent->GetSystemData();
Display* pDisp = pSalDisp->GetDisplay();
-::Window aObjectParent = static_cast<::Window>(pEnv->aWindow);
+::Window aObjectParent = maParentWin;
bool bFreePixmap = false;
Pixmap aPixmap = None;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/drawinglayer sc/inc
include/drawinglayer/processor3d/shadow3dextractor.hxx |2 +-
sc/inc/scmod.hxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6f6c61a8c0fb7fd838e0c6516276a22b7729904c
Author: Andrea Gelmini
Date: Mon May 28 11:32:40 2018 +0200
Fix typos
Change-Id: I4faf601f9b690bdf284d8ee472091f38ca96d5f1
Reviewed-on: https://gerrit.libreoffice.org/54908
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/include/drawinglayer/processor3d/shadow3dextractor.hxx
b/include/drawinglayer/processor3d/shadow3dextractor.hxx
index f3714d0fe54b..e336b487e7e4 100644
--- a/include/drawinglayer/processor3d/shadow3dextractor.hxx
+++ b/include/drawinglayer/processor3d/shadow3dextractor.hxx
@@ -39,7 +39,7 @@ namespace drawinglayer
{
/** Shadow3DExtractingProcessor class
-This processor extracts the 2D shadow geometry (projected
geometry) of all feeded primitives.
+This processor extracts the 2D shadow geometry (projected
geometry) of all fed primitives.
It is used to create the shadow of 3D objects which consists of 2D
geometry. It needs quite
some data to do so since we do not only offer flat projected 2D
shadow, but also projections
dependent on the light source
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index 1ef0eed7b936..e38c07dccca5 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -82,7 +82,7 @@ class ScModule: public SfxModule, public SfxListener, public
utl::ConfigurationL
ScDragData* m_pDragData;
ScSelectionTransferObj* m_pSelTransfer;
ScMessagePool* m_pMessagePool;
-// there is no global InputHandler anymore, each View has it's own
+// there is no global InputHandler anymore, each View has its own
ScInputHandler* m_pRefInputHandler;
ScViewCfg* m_pViewCfg;
ScDocCfg* m_pDocCfg;
___
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' - basegfx/source basic/source compilerplugins/clang cui/source dbaccess/source include/basegfx include/filter include/sfx2 include/svl include/
basegfx/source/polygon/b3dpolygon.cxx |8
basegfx/source/polygon/b3dpolypolygon.cxx |2 +-
basic/source/runtime/inputbox.cxx |2 +-
compilerplugins/clang/passstuffbyref.cxx |4
cui/source/dialogs/cuicharmap.cxx |2 +-
cui/source/inc/cuicharmap.hxx |4 ++--
cui/source/inc/postdlg.hxx |2 +-
dbaccess/source/filter/hsqldb/alterparser.hxx |6 +++---
dbaccess/source/filter/hsqldb/columndef.hxx|4 ++--
dbaccess/source/filter/hsqldb/createparser.hxx |4 ++--
include/basegfx/polygon/b3dpolygon.hxx |8
include/basegfx/polygon/b3dpolypolygon.hxx |2 +-
include/filter/msfilter/svdfppt.hxx|4 ++--
include/sfx2/charwin.hxx |4 ++--
include/sfx2/opengrf.hxx |2 +-
include/svl/aeitem.hxx |2 +-
include/svx/charmap.hxx|2 +-
include/vcl/customweld.hxx |2 +-
sc/inc/scmod.hxx |2 +-
sc/inc/userdat.hxx |4 ++--
sc/source/ui/inc/tabvwsh.hxx |2 +-
sd/source/ui/dlg/navigatr.cxx |2 +-
sd/source/ui/inc/navigatr.hxx |2 +-
sfx2/source/appl/opengrf.cxx |2 +-
sfx2/source/appl/sfxhelp.cxx |2 +-
svl/source/items/aeitem.cxx|2 +-
vcl/inc/impgraph.hxx |2 +-
27 files changed, 44 insertions(+), 40 deletions(-)
New commits:
commit 3341435d7916c209c7613d594f78059ba112495b
Author: Noel Grandin
Date: Fri May 25 14:08:33 2018 +0200
loplugin:passstuffbyref
Change-Id: I785e96599bbda029adf4698d11d7f981750dec07
Reviewed-on: https://gerrit.libreoffice.org/54802
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit ff3bdde2527123fc9e011ff0d93e958174632186)
Reviewed-on: https://gerrit.libreoffice.org/54914
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/basegfx/source/polygon/b3dpolygon.cxx
b/basegfx/source/polygon/b3dpolygon.cxx
index 1f2e6ebea67a..58be07cfe897 100644
--- a/basegfx/source/polygon/b3dpolygon.cxx
+++ b/basegfx/source/polygon/b3dpolygon.cxx
@@ -1442,7 +1442,7 @@ namespace basegfx
return mpPolygon->count();
}
-basegfx::B3DPoint B3DPolygon::getB3DPoint(sal_uInt32 nIndex) const
+basegfx::B3DPoint const & B3DPolygon::getB3DPoint(sal_uInt32 nIndex) const
{
OSL_ENSURE(nIndex < mpPolygon->count(), "B3DPolygon access outside
range (!)");
@@ -1457,7 +1457,7 @@ namespace basegfx
mpPolygon->setPoint(nIndex, rValue);
}
-BColor B3DPolygon::getBColor(sal_uInt32 nIndex) const
+BColor const & B3DPolygon::getBColor(sal_uInt32 nIndex) const
{
OSL_ENSURE(nIndex < mpPolygon->count(), "B3DPolygon access outside
range (!)");
@@ -1488,7 +1488,7 @@ namespace basegfx
return mpPolygon->getNormal();
}
-B3DVector B3DPolygon::getNormal(sal_uInt32 nIndex) const
+B3DVector const & B3DPolygon::getNormal(sal_uInt32 nIndex) const
{
OSL_ENSURE(nIndex < mpPolygon->count(), "B3DPolygon access outside
range (!)");
@@ -1520,7 +1520,7 @@ namespace basegfx
mpPolygon->clearNormals();
}
-B2DPoint B3DPolygon::getTextureCoordinate(sal_uInt32 nIndex) const
+B2DPoint const & B3DPolygon::getTextureCoordinate(sal_uInt32 nIndex) const
{
OSL_ENSURE(nIndex < mpPolygon->count(), "B3DPolygon access outside
range (!)");
diff --git a/basegfx/source/polygon/b3dpolypolygon.cxx
b/basegfx/source/polygon/b3dpolypolygon.cxx
index b7ea0b36631e..7cb977065e0f 100644
--- a/basegfx/source/polygon/b3dpolypolygon.cxx
+++ b/basegfx/source/polygon/b3dpolypolygon.cxx
@@ -229,7 +229,7 @@ namespace basegfx
return mpPolyPolygon->count();
}
-B3DPolygon B3DPolyPolygon::getB3DPolygon(sal_uInt32 nIndex) const
+B3DPolygon const & B3DPolyPolygon::getB3DPolygon(sal_uInt32 nIndex) const
{
OSL_ENSURE(nIndex < mpPolyPolygon->count(), "B3DPolyPolygon access
outside range (!)");
diff --git a/basic/source/runtime/inputbox.cxx
b/basic/source/runtime/inputbox.cxx
index ae7302f14c21..b3d495d5bead 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -42,7 +42,7 @@ class SvRTLInputBox : public weld::GenericDialogController
public:
SvRTLInputBox(weld::Window* pParent, const OUString& rPrompt, const
OUString& rTitle,
const OUString& rDefault, long nXTwips, long nYTwips );
-OUString GetText() const { return m_aText; }
+OUString const & GetText() const { return m_aText; }
};
SvRTLInputBox::SvRTLInputBox(weld::Window* pParent, const OUString& rPrompt,
diff --git a/compilerplugins/clang/passstuffbyref.cxx
b/compilerplugins/c
[Libreoffice-commits] core.git: Changes to 'refs/tags/cd-5.3-47'
Tag 'cd-5.3-47' created by Jan Holesovsky at 2018-05-28 14:41 + cd-5.3-47 Changes since cd-5.3-46-6: --- 0 files changed --- ___ 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/filter/hsqldb/rowinputbinary.cxx | 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 91e6174a088b8c722e8c6d3482c1ae9a6818a7c5
Author: Julien Nabet
Date: Mon May 21 18:56:52 2018 +0200
tdf#117732: Mig FB, fix reading of time
Change-Id: Ie67b50d899c4684f6fadd0c42337f54ef952078e
Reviewed-on: https://gerrit.libreoffice.org/54646
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/dbaccess/source/filter/hsqldb/rowinputbinary.cxx
b/dbaccess/source/filter/hsqldb/rowinputbinary.cxx
index 62c37525367d..d47901d2d7a4 100644
--- a/dbaccess/source/filter/hsqldb/rowinputbinary.cxx
+++ b/dbaccess/source/filter/hsqldb/rowinputbinary.cxx
@@ -333,7 +333,20 @@ std::vector HsqlRowInputStream::readOneRow(const
ColumnTypeVector& nColType
{
sal_Int64 value = 0;
m_pStream->ReadInt64(value);
-css::util::Time time((value % 1000) * 100, value / 1000,
0, 0, true);
+auto valueInSecs = value / 1000;
+sal_uInt16 nHours = 0;
+// in negative case value is comprised between
+// -24 * 60 * 60 and -1
+// so add 24 * 60 * 60 in order the rest of calculus is ok
+if (valueInSecs < 0)
+valueInSecs += 24 * 60 * 60;
+else
+nHours = (valueInSecs / 3600) + 1;
+
+valueInSecs = valueInSecs % 3600;
+const sal_uInt16 nMins = valueInSecs / 60;
+const sal_uInt16 nSecs = valueInSecs % 60;
+css::util::Time time((value % 1000) * 100, nSecs, nMins,
nHours, true);
aData.push_back(makeAny(time));
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: tdf97815 switching to English function names does not work with _ADD functions
Hi Winfried, Btw, the bug title is misleading, it shouldn't be only ..._ADD functions but all Add-In functions. On Monday, 2018-05-28 09:41:20 +, Winfried Donkers wrote: > As I did some work in the past on this aspect, I try to fix this bug, even > though I am not a big fan of the Add-In functions ;-). > I came across code that I don't understand enough: > 1. /scaddins/source/analysis/deffuncname.hxx contains a lot of static const > char*[2], with German and English function name. Why is there a German > function name, can't this be removed (this German function name must at least > be related to the cause of the bug)? Hairy stuff.. old Excel versions used to store localized (gasp!) Add-In function names, which these are used for, stored in FuncDataBase::pCompListID, then aCompList then obtained via FuncData::GetCompNameList() in AnalysisAddIn::getCompatibilityNames(), see also offapi/com/sun/star/sheet/XCompatibilityNames.idl > 2. /scaddins/source/analysis/analysishelper.cxx contains a const FuncDataBase > pFuncDatas[], that uses a macro FUNCDATA, which uses "get" to fill the > structure. I can't easily find this "get"; do you know where it is defined? It's not a function name to be called, but the FUNCDATA macro builds a string from "get" #FUNCNAME, for example with FUNCNAME "Workday" it gives "getWorkday". This with the namespace prefix "com.sun.star.addin.Analysis." then forms the programmatical name (e.g. here "com.sun.star.addin.Analysis.getWorkday") that was also used to store the function call in formulas prior to ODFF (i.e. Pre-ODF, PODF, ODF_11). See also sc/source/core/tool/odffmap.cxx and ScCompiler::fillFromAddInMap(). Note that the FUNCDATA macro also assigns ANALYSIS_FUNCNAME_##FUNCNAME (with the example FUNCNAME "Workday" resulting in the ANALYSIS_FUNCNAME_Workday symbol, see scaddins/inc/strings.hrc) to FuncDataBase::pUINameID which is used via FuncData::GetUINameID() to lookup the actual UI name in AnalysisAddIn::getDisplayFunctionName(), which uses AnalysisAddIn::AnalysisResId() to call Translate::get(). The underlying problem (localization not switched) seems to be somehow related to that either AnalysisAddIn::setLocale() is not called, or the there called AnalysisAddIn::InitData() does not actually result in a new Translate locale, or (most likely) the function name change is not propagated to ScCompiler's UI symbol table, i.e. that probably needs to be re-read/created with the then current Add-In names, see sc/source/core/tool/compiler.cxx ScCompiler::fillFromAddIn...() functions called from from formula::FormulaCompiler::loadSymbols() like FormulaCompiler::InitSymbolsEnglish() does, but it does that only once and probably does it when the Add-Ins' locale was still set to the current UI localization. Just guessing here. Finally, I can feel your pain ;) took me a while to dig through.. Hope that helps Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Care about Free Software, support the FSFE https://fsfe.org/support/?erack signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/dialog/charmap.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit e99cb63b7d76ce02d0d9cdf13bf5e19e936ad035 Author: Caolán McNamara Date: Mon May 28 09:10:09 2018 +0100 coverity#1435837 Uninitialized scalar field Change-Id: Ie2d78756019fe48167515c6022cd564a969cd90e Reviewed-on: https://gerrit.libreoffice.org/54901 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index fa9c3cebede3..0288524a6466 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -68,6 +68,8 @@ SvxShowCharSet::SvxShowCharSet(weld::ScrolledWindow* pScrolledWindow, const VclP : mxVirDev(rVirDev) , mxScrollArea(pScrolledWindow) , mxContext(comphelper::getProcessComponentContext()) +, nX(0) +, nY(0) , maFontSize(0, 0) , maPosition(0,0) , mbRecalculateFont(true) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3-3.2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 121ba866e0d4cc9d4e7e51546aeda561f4267cd3 Author: Jan Holesovsky Date: Mon May 28 16:36:17 2018 +0200 Bump version 5.3-47 Change-Id: I3ab41b34d09e9318cdd23e172082ca96d6ba020d diff --git a/configure.ac b/configure.ac index e02ecb99f101..d4f6888e8f72 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[5.3.10.46],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[5.3.10.47],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) ___ 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' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bc849c63875552fe419ac2d87d7d34819842619c Author: László Németh Date: Thu May 17 12:33:35 2018 +0200 Updated core Project: dictionaries 37c3e3924d33f29dbff7fb3dba40b36a694c6792 Hungarian dictionary v1.7 Extend Hungarian dictionary with boundary data for compound words and for disambiguation of digraphs to fix incomplete and bad Hungarian collate, sorting and hyphenation rules in the future. Other minor fixes (*idegenszó -> idegen szó, *periférikus etc.) (cherry-picked from commit e90e83b23b6ace35349fc2b3e65bd2d69c80ddd8) Reviewed-on: https://gerrit.libreoffice.org/54480 Reviewed-by: László Németh Tested-by: László Németh Change-Id: I3278801ac875f2d33fd5dc62efc43a9a81194734 Reviewed-on: https://gerrit.libreoffice.org/54747 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/dictionaries b/dictionaries index d689c8660c0e..37c3e3924d33 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit d689c8660c0e3335159273af25fd88fe82de4af3 +Subproject commit 37c3e3924d33f29dbff7fb3dba40b36a694c6792 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-6-0' - hu_HU/description.xml hu_HU/hu_HU.aff hu_HU/hu_HU.dic hu_HU/README_hu_HU.txt
hu_HU/README_hu_HU.txt |4 hu_HU/description.xml |2 hu_HU/hu_HU.aff| 8138 +++ hu_HU/hu_HU.dic|25929 - 4 files changed, 17103 insertions(+), 16970 deletions(-) New commits: commit 37c3e3924d33f29dbff7fb3dba40b36a694c6792 Author: László Németh Date: Thu May 17 12:33:35 2018 +0200 Hungarian dictionary v1.7 Extend Hungarian dictionary with boundary data for compound words and for disambiguation of digraphs to fix incomplete and bad Hungarian collate, sorting and hyphenation rules in the future. Other minor fixes (*idegenszó -> idegen szó, *periférikus etc.) (cherry-picked from commit e90e83b23b6ace35349fc2b3e65bd2d69c80ddd8) Reviewed-on: https://gerrit.libreoffice.org/54480 Reviewed-by: László Németh Tested-by: László Németh Change-Id: I3278801ac875f2d33fd5dc62efc43a9a81194734 Reviewed-on: https://gerrit.libreoffice.org/54747 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/hu_HU/README_hu_HU.txt b/hu_HU/README_hu_HU.txt index fdb5d86..cf08e29 100644 --- a/hu_HU/README_hu_HU.txt +++ b/hu_HU/README_hu_HU.txt @@ -1,4 +1,4 @@ -Magyar Ispell helyesírási szótár – 1.7 béta 5 szótárállományok morfológiai adatokkal +Magyar Ispell helyesírási szótár – 1.7 szótárállományok morfológiai adatokkal A szótárállományok a LibreOffice projekt részeként a következő nyílt forráskódú licencek bármelyike alapján szabadon felhasználhatóak, de mindenféle garancia nélkül: @@ -11,7 +11,7 @@ Honlap: http://magyarispell.sf.net -- -Hungarian Hunspell dictionaries version 1.7 beta 5 with morphological data +Hungarian Hunspell dictionaries version 1.7 with morphological data These files are part of the LibreOffice project. diff --git a/hu_HU/description.xml b/hu_HU/description.xml index 072e2c3..e7ff8d7 100644 --- a/hu_HU/description.xml +++ b/hu_HU/description.xml @@ -1,6 +1,6 @@ http://openoffice.org/extensions/description/2006"; xmlns:d="http://openoffice.org/extensions/description/2006"; xmlns:xlink="http://www.w3.org/1999/xlink";> - + Hungarian spelling dictionary, hyphenation rules, thesaurus, and grammar checker diff --git a/hu_HU/hu_HU.aff b/hu_HU/hu_HU.aff index f8f6411..469f338 100644 --- a/hu_HU/hu_HU.aff +++ b/hu_HU/hu_HU.aff @@ -6,7 +6,7 @@ # GPL/LGPL/MPL license as published by the FSF and Mozilla Foundation. # # -# Version: March 2018, 1.7 beta 5 +# Version: May 2018, 1.7 # # Home page: http://magyarispell.sourceforge.net # @@ -30,7 +30,7 @@ # amelyet N�meth L�szl� �s God� Ferenc k�sz�tett, �s a GPL/LGPL/MPL licenc # alatt k�zz�tett a http://magyarispell.sourceforge.net oldalon. # -# Magyar Ispell 1.7 beta 5 v�ltozat, 2018-03 +# Magyar Ispell 1.7, 2018-05 # # K�sz�net illeti a k�vetkez�ket: # @@ -52,7 +52,7 @@ NAME Magyar Ispell helyes�r�si sz�t�r LANG hu_HU HOME http://magyarispell.sourceforge.net -VERSION Magyar 1.7b4 +VERSION Magyar 1.7 SET UTF-8 KEY öüó|qwertzuiopőú|asdfghjkléáű|íyxcvbnm TRY íóútaeslzánorhgkiédmyőpvöbucfjüűxwq-.à @@ -157,7 +157,7 @@ ICONV fl fl # - multicharacter suggestions # - well-sorted suggestions -REP 153 +REP 154 REP í i REP i í REP ó o @@ -311,8 +311,9 @@ REP ue- ü # fondue-t->fondüt REP ^rám rám_ # rámváró->rám váró REP ^rád rád_ # rádváró->rád váró REP ^hű hűe # hűn->hűen, hűk->hűek +REP ^orr orv # orrvadász->orvvadász -AF 1477 +AF 1478 AF V˯j�L�n��TtYc��l # 1 AF Um��yiYc� # 2 AF �CWR̯j���y���Yc� # 3 @@ -385,7 +386,7 @@ AF W̯j AF abh) # 70 AF abh # 71 AF BV��ж) # 72 -AF !V�n�Llabh) # 73 +AF Uʮi�K�m���QYc�� # 73 AF AU���KQxc�ÿ� # 74 AF AU�m�KkQc�ÿ� # 75 AF $U��m�Ssc� # 76 @@ -653,7 +654,7 @@ AF U AF U���D # 338 AF � # 339 AF U��mD # 340 -AF �m�UAQD # 341 +AF �Uʮi�K�m��SsYc�� # 341 AF uSs��) # 342 AF UVʮ˯ij��KL��n�m���QRvckl # 343 AF � # 344 @@ -665,7 +666,7 @@ AF W AF W���jYc� # 350 AF �AUQʮi���c��w # 351 AF U�m�AQD # 352 -AF �m�UAQDF # 353 +AF V���n�LlRjTtabhz!) # 353 AF W̯j�MRc��l # 354 AF W̯j�MRTtYc�� # 355 AF Vn) # 356 @@ -694,7 +695,7 @@ AF AF Uʮi�K�m��Qc��Y # 379 AF V���yjYc� # 380 AF ���AU�QbciKk�ÿ� # 381 -AF !AU�m��KkQ) # 382 +AF Uʮi�K�m�QYc�� # 382 AF A�U�m�KkQiSsz!) # 383 AF m�KkU�QbciAҷÿ� # 384 AF V˯j�L�n��RTtvc��l # 385 @@ -702,7 +703,7 @@ AF V˯j AF qV˯j�L�n��RYc�� # 387 AF V˯j�L�n��y���RTtc� # 388 AF A���UQD # 389 -AF VN˯j�LRTtYc��l # 390 +AF �BVR˯j���y���c� # 390 AF AU��ϵ) # 391 AF m�$AU�Ssbhc # 392 AF bhc� # 393 @@ -717,8 +718,8 @@ AF &X) # 401 AF uxTt��) # 402 AF Vn���) # 403 AF W���) # 404 -AF Uʮi�K�m��yǿ�SsYc�uQ) # 405 -AF Uʮi�K�m��yǿ�SsYc�uQ # 406 +AF ��GV��LTtl # 405 +AF ��FU�m�K�Qk�y # 406 AF wX # 407 AF x # 408 AF V�n��jYc�l # 409 @@ -756,7 +757,7 @@ AF V AF V�n��jYc�˯�L���Tt�� # 441 AF Uʮi�K�m��SsYc��kADF�) # 442 AF
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - extras/source include/svtools include/svx include/vcl sc/inc sc/qa sc/source sc/uiconfig svtools/source svx/source vcl/source vcl/unx
extras/source/glade/libreoffice-catalog.xml.in |3
include/svtools/valueset.hxx | 201 +++
include/svx/SvxColorValueSet.hxx | 13
include/vcl/customweld.hxx | 19
include/vcl/layout.hxx | 24
include/vcl/weld.hxx | 16
sc/inc/scabstdlg.hxx |8
sc/qa/unit/screenshots/screenshots.cxx |2
sc/source/ui/attrdlg/scdlgfact.cxx | 13
sc/source/ui/attrdlg/scdlgfact.hxx | 17
sc/source/ui/inc/tabbgcolordlg.hxx | 29
sc/source/ui/miscdlgs/tabbgcolordlg.cxx| 90 -
sc/source/ui/view/tabvwshf.cxx |2
sc/uiconfig/scalc/ui/tabcolordialog.ui | 53
svtools/source/control/valueacc.cxx| 983
svtools/source/control/valueimp.hxx| 198 +++
svtools/source/control/valueset.cxx| 1455 +
svx/source/tbxctrls/SvxColorValueSet.cxx | 74 +
vcl/source/app/customweld.cxx |6
vcl/source/app/salvtables.cxx | 23
vcl/unx/gtk3/gtk3gtkinst.cxx | 56
21 files changed, 3168 insertions(+), 117 deletions(-)
New commits:
commit d78da37b5250cbc94c553e4ee2d542a35e3eb293
Author: Caolán McNamara
Date: Wed May 23 14:15:46 2018 +0100
weld ScTabBgColorDlg
Change-Id: I864382bc55dead850c13faae9958fb660fd4f156
Reviewed-on: https://gerrit.libreoffice.org/54920
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index 22b33767161b..04fbd09c5a22 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -338,9 +338,6 @@
-
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 000e00268874..5530adf33da8 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
#include
#include
@@ -36,6 +37,7 @@ class DataChangedEvent;
class ScrollBar;
struct ValueSetItem;
+struct SvtValueSetItem;
class ValueSetAcc;
class ValueItemAcc;
@@ -178,6 +180,7 @@ to be set (before Show) with SetStyle().
*/
typedef std::vector ValueItemList;
+typedef std::vector SvtValueItemList;
#define WB_ITEMBORDER (WinBits(0x0001))
#define WB_DOUBLEBORDER (WinBits(0x0002))
@@ -405,6 +408,204 @@ public:
void SetEdgeBlending(bool bNew);
};
+class SVT_DLLPUBLIC SvtValueSet : public weld::CustomWidgetController
+{
+private:
+
+ScopedVclPtr maVirDev;
+css::uno::Reference mxAccessible;
+SvtValueItemList mItemList;
+std::unique_ptr mpNoneItem;
+tools::Rectangle maNoneItemRect;
+tools::Rectangle maItemListRect;
+longmnItemWidth;
+longmnItemHeight;
+longmnTextOffset;
+longmnVisLines;
+longmnLines;
+longmnUserItemWidth;
+longmnUserItemHeight;
+sal_uInt16 mnSelItemId;
+sal_uInt16 mnHighItemId;
+sal_uInt16 mnCols;
+sal_uInt16 mnCurCol;
+sal_uInt16 mnUserCols;
+sal_uInt16 mnUserVisLines;
+sal_uInt16 mnFirstLine;
+sal_uInt16 mnSpacing;
+DrawFrameStyle mnFrameStyle;
+Color maColor;
+OUStringmaText;
+WinBits mnStyle;
+Link maDoubleClickHdl;
+Link maSelectHdl;
+Link maHighlightHdl;
+
+boolmbFormat : 1;
+boolmbNoSelection : 1;
+boolmbBlackSel : 1;
+boolmbDoubleSel : 1;
+boolmbScroll : 1;
+boolmbFullMode : 1;
+boolmbEdgeBlending : 1;
+boolmbHasVisibleItems : 1;
+
+friend class SvtValueSetAcc;
+friend class SvtValueItemAcc;
+
+SVT_DLLPRIVATE void ImplInitSettings( bool bFont, bool
bForeground, bool bBackground );
+
+SVT_DLLPRIVATE void ImplInitScrollBar();
+SVT_DLLPRIVATE void ImplDeleteItems();
+SVT_DLLPRIVATE void ImplFormatItem(vcl::RenderContext const &
rRenderContext, SvtValueSetItem* pItem, tools::Rectangle aRect);
+SVT_DLLPRIVATE void ImplDrawItemText(vcl::RenderContext&
rRenderContext, const OUString& rStr);
+SVT_DLLPRIVATE void ImplDrawSelect(vcl::RenderContext&
rRenderContext, sal_uInt16 nItemId, const bool bFocus, const bool bDrawSel);
+SVT_DLLPRIVATE void ImplDrawSelect(vcl::RenderContext&
rRenderContext);
+SVT_DLLPRIVATE void ImplDraw(vcl::RenderContext& rRenderContext);
+SVT_DLLPRIVATE bool ImplScroll( const Point& rPos );
+SVT_DLL
[Libreoffice-commits] core.git: sc/inc sc/qa sc/source
sc/inc/scabstdlg.hxx |3 -
sc/qa/unit/screenshots/screenshots.cxx |2
sc/source/ui/attrdlg/scdlgfact.cxx |5 +
sc/source/ui/attrdlg/scdlgfact.hxx |3 -
sc/source/ui/unoobj/filtuno.cxx|2
sc/source/ui/view/cellsh2.cxx |2
sc/source/ui/view/viewfun5.cxx | 86 -
7 files changed, 63 insertions(+), 40 deletions(-)
New commits:
commit 9233b1549bd7198a6f367b5950352d93b07b2997
Author: Marco Cecchetti
Date: Fri Apr 27 16:45:05 2018 +0200
lok: sc: tunneling the ascii import dialog on paste action
Modified CreateScImportAsciiDlg signature so that we are able to pass
a pointer to a dialog parent window to ScImportAsciiDlg.
Now the execution of the ScImportAsciiDlg dialog in
ScViewFunc::PasteDataFormat is asynchronous, both for lok and desktop
case. In order to achieve this result it has been needed to modify the
lifespan of some objects previously local to PasteDataFormat.
Since PasteDataFormat returns a boolean, I took care to check how this
return value is used. I found out 2 cases:
1) in ScViewFunc::PasteFromSystem where it is used for popping up an
error dialog box, informing the user in the case that the paste
operation is failed;
2) in ScGridWindow::ExecuteDrop where it is used for informing the
sysyem window manager of the success or fail of the drag and drop
action.
The first case is now handled by a lamba invoked on dialog execution
end. The second case is always handled as the paste operation was
successfull (hoping it doesn't do any real difference).
The asynchronous call and the behaviors described above occur only
when the paste operation involves some kind of text.
Change-Id: Id4f96180a9336f665a22a2441ea490af993431b0
Reviewed-on: https://gerrit.libreoffice.org/53576
Tested-by: Jenkins
Reviewed-by: Marco Cecchetti
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 707e2cda6569..4019eae3792b 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -396,7 +396,8 @@ class ScAbstractDialogFactory
public:
SC_DLLPUBLIC static ScAbstractDialogFactory*Create();
-virtual VclPtr CreateScImportAsciiDlg( const
OUString& aDatName,
+virtual VclPtr
CreateScImportAsciiDlg(vcl::Window* pParent,
+const
OUString& aDatName,
SvStream*
pInStream,
ScImportAsciiCall eCall) = 0;
diff --git a/sc/qa/unit/screenshots/screenshots.cxx
b/sc/qa/unit/screenshots/screenshots.cxx
index 8b16314fd87d..a758ef0369ba 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -245,7 +245,7 @@ VclPtr
ScScreenshotTest::createDialogByID(sal_uInt32 nID)
case 13: // "modules/scalc/ui/textimportcsv.ui"
{
-pReturnDialog = mpFact->CreateScImportAsciiDlg(OUString(),
mpStream.get(), SC_PASTETEXT);
+pReturnDialog = mpFact->CreateScImportAsciiDlg(nullptr,
OUString(), mpStream.get(), SC_PASTETEXT);
break;
}
case 14: // "modules/scalc/ui/formatcellsdialog.ui"
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 4134e6f2a0a4..4088b50dbe15 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -719,10 +719,11 @@ void ScAbstractTabController_Impl::SetText( const
OUString& rStr )
}
// =Factories for createdialog ===
-VclPtr
ScAbstractDialogFactory_Impl::CreateScImportAsciiDlg ( const OUString& aDatName,
+VclPtr
ScAbstractDialogFactory_Impl::CreateScImportAsciiDlg ( vcl::Window* pParent,
+const OUString& aDatName,
SvStream* pInStream,
ScImportAsciiCall eCall )
{
-VclPtr pDlg = VclPtr::Create( nullptr,
aDatName,pInStream, eCall );
+VclPtr pDlg = VclPtr::Create( pParent,
aDatName,pInStream, eCall );
return VclPtr::Create( pDlg );
}
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx
b/sc/source/ui/attrdlg/scdlgfact.hxx
index cd63bb3a7418..722684d30c95 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -539,7 +539,8 @@ class ScAbstractDialogFactory_Impl : public
ScAbstractDialogFactory
public:
virtual ~ScAbstractDialogFactory_Impl() {}
-virtual VclPtr CreateScImportAsciiDlg( const
OUString& aDatName,
+virtual VclPtr
CreateScImportAsciiDlg(vcl::Window* pParent,
+const
OUString& aDatName,
SvStream*
pInStream,
[Libreoffice-commits] website.git: Branch 'update' - check.php
check.php | 22 ++
1 file changed, 14 insertions(+), 8 deletions(-)
New commits:
commit e3384226f9f6080838eae6766018364a2c727086
Author: Christian Lohmaier
Date: Mon May 28 19:26:43 2018 +0200
enable update to 6.0.4 and 5.4.7
diff --git a/check.php b/check.php
index 1fc42ce..7258688 100644
--- a/check.php
+++ b/check.php
@@ -518,6 +518,9 @@ $build_hash_to_version = array(
# 5.4.6
'7d6c666f03cf1f0a0c2c51a17c0f67a8d5a8012b' => '5.4.6.1',
'4014ce260a04f1026ba855d3b8d91541c224eab8' => '5.4.6.2', # Final
+# 5.4.7
+'ef425abf896c652d17796228d1dbcfe9c7af' => '5.4.7.1',
+'c838ef25c16710f8838b1faec480ebba495259d0' => '5.4.7.2', # Final
##
# 6.0.0 versions
@@ -539,6 +542,9 @@ $build_hash_to_version = array(
'e2c9f5e42b90771faa7eee1c4fc77191de3067e6' => '6.0.3.1', # rc1-buildfix1
'62abb169b0efa1520d7bee1f586865354060b989' => '6.0.3.1', # rc1-buildfix1
'8f48d515416608e3a835360314dac7e47fd0b821' => '6.0.3.2', # Final
+# 6.0.4
+'a63363f6506b8bdc5222481ce79ef33b2d13c741' => '6.0.4.1',
+'9b0d9b32d5dcda91d2f1a96dc04c645c450872bf' => '6.0.4.2', # Final
);
# Descriptions of the target versions
@@ -551,17 +557,17 @@ $build_hash_to_version = array(
# where '' and '' will be substitued with the right value
# NOTE: '&' in the URL has to be escaped as &
$update_map = array(
-'stable' => array('gitid' =>
'4014ce260a04f1026ba855d3b8d91541c224eab8',
- 'id' => 'LibreOffice 5.4.6',
- 'version' => '5.4.6',
+'stable' => array('gitid' =>
'c838ef25c16710f8838b1faec480ebba495259d0',
+ 'id' => 'LibreOffice 5.4.7',
+ 'version' => '5.4.7',
'update_type' => 'text/html',
- 'update_src' =>
'https://www.libreoffice.org/download/download/?lang=&version=5.4.6',
+ 'update_src' =>
'https://www.libreoffice.org/download/download/?lang=&version=5.4.7',
'substitute' => true ),
-'latest' => array('gitid' =>
'8f48d515416608e3a835360314dac7e47fd0b821',
- 'id' => 'LibreOffice 6.0.3',
- 'version' => '6.0.3',
+'latest' => array('gitid' =>
'9b0d9b32d5dcda91d2f1a96dc04c645c450872bf',
+ 'id' => 'LibreOffice 6.0.4',
+ 'version' => '6.0.4',
'update_type' => 'text/html',
- 'update_src' =>
'https://www.libreoffice.org/download/download/?lang=&version=6.0.3',
+ 'update_src' =>
'https://www.libreoffice.org/download/download/?lang=&version=6.0.4',
'substitute' => true ),
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/osx
vcl/osx/vclnsapp.mm |3 +++
1 file changed, 3 insertions(+)
New commits:
commit aa81a086bd3dcd7d6b830951619f310bd0aff30c
Author: Tor Lillqvist
Date: Mon May 28 14:41:20 2018 +0300
tdf#117850: Just call _Exit() in our applicationWillTerminate:
Sure, it is just a workaround, but a very effective workaround.
Change-Id: Id0daff048a27dae5cf8fb5e0e949c5b21e03fc86
Reviewed-on: https://gerrit.libreoffice.org/54924
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/vcl/osx/vclnsapp.mm b/vcl/osx/vclnsapp.mm
index 882ee3fb79a7..a3e5396d902e 100644
--- a/vcl/osx/vclnsapp.mm
+++ b/vcl/osx/vclnsapp.mm
@@ -22,6 +22,8 @@
#include
+#include
+
#include
#include
#include
@@ -308,6 +310,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
{
(void)aNotification;
sal_detail_deinitialize();
+_Exit(0);
}
-(NSApplicationTerminateReply)applicationShouldTerminate: (NSApplication *) app
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - sw/inc sw/source
sw/inc/view.hxx |1 +
sw/source/uibase/app/appenv.cxx |2 +-
sw/source/uibase/uiview/view.cxx | 38 ++
3 files changed, 40 insertions(+), 1 deletion(-)
New commits:
commit db488f42a900504004d819e2795c18b056500db6
Author: Mike Kaganski
Date: Fri May 25 14:58:11 2018 +0300
tdf#35798: use separate paragraphs for Label elements
Since commit db04be037b611e296ef9f2542322c52ed82d7a2b, empty Database
fields are hidden. But since Labels wizard generates a single paragraph
with line breaks for the label's text, the hiding feature cannot be
used efficiently.
Let the individual lines be in individual paragraphs.
Change-Id: I27430d54baea88461c2ea9de38baa95d6b7e9e62
Reviewed-on: https://gerrit.libreoffice.org/54800
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit 2f11ce0670749b9da20dfb29269b176cb09fb01e)
Reviewed-on: https://gerrit.libreoffice.org/54959
Tested-by: Mike Kaganski
diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx
index 447205517e6e..b5671577c204 100644
--- a/sw/source/uibase/app/appenv.cxx
+++ b/sw/source/uibase/app/appenv.cxx
@@ -124,7 +124,7 @@ OUString InsertLabEnvText( SwWrtShell& rSh, SwFieldMgr&
rFieldMgr, const OUStrin
if ( !bField )
rSh.Insert( sTmpText );
}
-rSh.InsertLineBreak();
+rSh.SplitNode();
}
rSh.DelLeft(); // Again remove last linebreak
commit 67de15af3debfef0993f39be2bc20e865b803f35
Author: Mike Kaganski
Date: Mon May 21 09:35:01 2018 +0300
tdf#115386: Show Mail Merge toolbar for documents with MM fields
Change-Id: I357a30d72c5ac4af8c64b82b4cc61c3bd606940a
Reviewed-on: https://gerrit.libreoffice.org/54612
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
Reviewed-on: https://gerrit.libreoffice.org/54957
Tested-by: Mike Kaganski
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index 0e0f57fe10b2..9fdd4c26d95e 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -248,6 +248,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
m_bOldShellWasPagePreview : 1,
m_bIsPreviewDoubleClick : 1, // #i114045#
m_bMakeSelectionVisible : 1; // transport the bookmark
selection
+bool m_bInitOnceCompleted = false;
/// LibreOfficeKit has to force the page size for PgUp/PgDown
/// functionality based on the user's view, instead of using the
m_aVisArea.
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index b48be3a0b2a5..e6d52358aaa2 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -219,6 +219,28 @@ IMPL_LINK_NOARG(SwView, FormControlActivated,
LinkParamNone*, void)
}
}
+namespace
+{
+uno::Reference getLayoutManager(const SfxViewFrame&
rViewFrame)
+{
+uno::Reference xLayoutManager;
+uno::Reference
xPropSet(rViewFrame.GetFrame().GetFrameInterface(),
+ uno::UNO_QUERY);
+if (xPropSet.is())
+{
+try
+{
+xLayoutManager.set(xPropSet->getPropertyValue("LayoutManager"),
uno::UNO_QUERY);
+}
+catch (const Exception& e)
+{
+SAL_WARN("sw.ui", "Failure getting layout manager: " + e.Message);
+}
+}
+return xLayoutManager;
+}
+}
+
void SwView::SelectShell()
{
// Attention: Maintain the SelectShell for the WebView additionally
@@ -420,6 +442,20 @@ void SwView::SelectShell()
GetEditWin().SetInputContext( aCntxt );
}
+// Show Mail Merge toolbar initially for documents with Database fields
+if (!m_bInitOnceCompleted && GetWrtShell().IsAnyDatabaseFieldInDoc())
+{
+if (auto xLayoutManager = getLayoutManager(*GetViewFrame()))
+{
+const OUString
sResourceURL("private:resource/toolbar/mailmerge");
+if (!xLayoutManager->getElement(sResourceURL).is())
+{
+xLayoutManager->createElement(sResourceURL);
+xLayoutManager->showElement(sResourceURL);
+}
+}
+}
+
// Activate the toolbar to the new selection which also was active
last time.
// Before a flush () must be, but does not affect the UI according to
MBA and
// is not a performance problem.
@@ -444,6 +480,8 @@ void SwView::SelectShell()
m_pWrtShell->UpdateTable();
GetViewImpl()->GetUNOObject_Impl()->NotifySelChanged();
+
+m_bInitOnceCompleted = true;
}
// Interaction: AttrChangedNotify() and TimeoutHdl.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - connectivity/source vcl/osx
connectivity/source/drivers/firebird/PreparedStatement.cxx |9 +-
vcl/osx/vclnsapp.mm| 18 -
2 files changed, 8 insertions(+), 19 deletions(-)
New commits:
commit 2f7812a4fa1503bd8391cd8deb07d6606519e182
Author: Tor Lillqvist
Date: Fri May 25 14:53:16 2018 +0300
Bin ten year old temporary hack
Cmd-W works just fine without any special handling at this low level,
as far as I can see.
Change-Id: Ib00964553984b7aeec89d9fab9fc425c08de910a
Reviewed-on: https://gerrit.libreoffice.org/54917
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/vcl/osx/vclnsapp.mm b/vcl/osx/vclnsapp.mm
index edf7549a0993..882ee3fb79a7 100644
--- a/vcl/osx/vclnsapp.mm
+++ b/vcl/osx/vclnsapp.mm
@@ -104,25 +104,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
if( pKeyWin && [pKeyWin isKindOfClass: [SalFrameWindow class]] )
{
AquaSalFrame* pFrame = [static_cast(pKeyWin)
getSalFrame];
-// handle Cmd-W
-// FIXME: the correct solution would be to handle this in framework
-// in the menu code
-// however that is currently being revised, so let's use a
preliminary solution here
-// this hack is based on assumption
-// a) Cmd-W is the same in all languages in OOo's menu config
-// b) Cmd-W is the same in all languages in on MacOS
-// for now this seems to be true
unsigned int nModMask = ([pEvent modifierFlags] &
(NSShiftKeyMask|NSControlKeyMask|NSAlternateKeyMask|NSCommandKeyMask));
-if( (pFrame->mnStyleMask & NSClosableWindowMask) != 0 )
-{
-if( nModMask == NSCommandKeyMask
-&& [[pEvent charactersIgnoringModifiers] isEqualToString:
@"w"] )
-{
-[static_cast(pFrame->getNSWindow())
windowShouldClose: nil];
-return;
-}
-}
-
/*
* #i98949# - Cmd-M miniaturize window, Cmd-Option-M miniaturize
all windows
*/
commit 54ddc4ff4c2ff7e8b2c502d6b475cfdc9b8e3cec
Author: Julien Nabet
Date: Sat May 26 18:01:15 2018 +0200
tdf#117446: FB mig, (VAR)BINARY, fix memory management
By default, 8000 bytes are allocated for VARBINARY
The pb is we can need more.
See https://bugs.documentfoundation.org/show_bug.cgi?id=117446#c6
Change-Id: I0ef5811dc01a587491bd9345129d1a41a4d9f095
Reviewed-on: https://gerrit.libreoffice.org/54863
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 0a43d5c93851..fee4029088f4 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -837,12 +837,19 @@ void SAL_CALL OPreparedStatement::setBytes(sal_Int32
nParameterIndex,
setParameterNull(nParameterIndex, false);
const sal_Int32 nMaxSize = 0x;
Sequence xBytesCopy(xBytes);
-// First 2 bytes indicate string size
if (xBytesCopy.getLength() > nMaxSize)
{
xBytesCopy.realloc( nMaxSize );
}
const short nSize = xBytesCopy.getLength();
+// 8000 corresponds to value from lcl_addDefaultParameters
+// in dbaccess/source/filter/hsqldb/createparser.cxx
+if (nSize > 8000)
+{
+free(pVar->sqldata);
+pVar->sqldata = static_cast(malloc(sizeof(char) *
nSize + 2));
+}
+// First 2 bytes indicate string size
memcpy(pVar->sqldata, &nSize, 2);
// Actual data
memcpy(pVar->sqldata + 2, xBytesCopy.getConstArray(), nSize);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sw/inc sw/source
sw/inc/view.hxx |1 +
sw/source/uibase/app/applab.cxx |3 +++
sw/source/uibase/uiview/view.cxx | 24 +---
3 files changed, 17 insertions(+), 11 deletions(-)
New commits:
commit 7859f9f259846889bcdd193ddb067e8912d6a89f
Author: Mike Kaganski
Date: Fri May 25 16:05:12 2018 +0300
tdf#115386: Show Mail Merge toolbar for new labels
Change-Id: I26ec6c7fdfa5b6f6f818927fd9ede00184dc5e8c
Reviewed-on: https://gerrit.libreoffice.org/54813
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
Reviewed-on: https://gerrit.libreoffice.org/54961
Tested-by: Mike Kaganski
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index 9fdd4c26d95e..82a736801d61 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -643,6 +643,7 @@ public:
const OUString& GetRedlineAuthor();
/// See SfxViewShell::NotifyCursor().
void NotifyCursor(SfxViewShell* pViewShell) const override;
+void ShowUIElement(const OUString& sElementURL) const;
};
inline long SwView::GetXScroll() const
diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx
index 6f688a5d9903..9d72bda9b3c9 100644
--- a/sw/source/uibase/app/applab.cxx
+++ b/sw/source/uibase/app/applab.cxx
@@ -386,6 +386,9 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel)
if (pFirstFlyFormat)
pSh->GotoFly(pFirstFlyFormat->GetName(), FLYCNTTYPE_ALL, false);
+if (pSh->IsAnyDatabaseFieldInDoc())
+pSh->GetView().ShowUIElement("private:resource/toolbar/mailmerge");
+
pSh->EndAllAction();
pSh->DoUndo();
}
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index e6d52358aaa2..103713df7a07 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -241,6 +241,18 @@ uno::Reference
getLayoutManager(const SfxViewFrame& rView
}
}
+void SwView::ShowUIElement(const OUString& sElementURL) const
+{
+if (auto xLayoutManager = getLayoutManager(*GetViewFrame()))
+{
+if (!xLayoutManager->getElement(sElementURL).is())
+{
+xLayoutManager->createElement(sElementURL);
+xLayoutManager->showElement(sElementURL);
+}
+}
+}
+
void SwView::SelectShell()
{
// Attention: Maintain the SelectShell for the WebView additionally
@@ -444,17 +456,7 @@ void SwView::SelectShell()
// Show Mail Merge toolbar initially for documents with Database fields
if (!m_bInitOnceCompleted && GetWrtShell().IsAnyDatabaseFieldInDoc())
-{
-if (auto xLayoutManager = getLayoutManager(*GetViewFrame()))
-{
-const OUString
sResourceURL("private:resource/toolbar/mailmerge");
-if (!xLayoutManager->getElement(sResourceURL).is())
-{
-xLayoutManager->createElement(sResourceURL);
-xLayoutManager->showElement(sResourceURL);
-}
-}
-}
+ShowUIElement("private:resource/toolbar/mailmerge");
// Activate the toolbar to the new selection which also was active
last time.
// Before a flush () must be, but does not affect the UI according to
MBA and
___
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/runtime/methods.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 44391aec4a12c0b36208ca30cc0c66e151678c24 Author: Samuel Mehrbrodt Date: Mon May 28 14:20:55 2018 +0200 Add missing include Change-Id: I645e25d6dcff1d395760f3a9980858a4c4ac1378 Reviewed-on: https://gerrit.libreoffice.org/54923 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 960219ca81c0..9049d787d04e 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - filter/source include/unotools officecfg/registry sw/CppunitTest_sw_mailmerge.mk sw/inc sw/qa sw/source sw/uiconfig unotools/source
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 13
include/unotools/compatibility.hxx|1
officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs |6
sw/CppunitTest_sw_mailmerge.mk|4
sw/inc/IDocumentSettingAccess.hxx |1
sw/inc/doc.hxx|3
sw/inc/ndhints.hxx| 26 +
sw/inc/ndtxt.hxx | 12
sw/inc/viewsh.hxx |2
sw/qa/extras/mailmerge/data/5-with-blanks.ods |binary
sw/qa/extras/mailmerge/data/tdf35798-legacy.fodt | 37 ++
sw/qa/extras/mailmerge/data/tdf35798-legacy.odt |binary
sw/qa/extras/mailmerge/data/tdf35798-new.fodt | 38 ++
sw/qa/extras/mailmerge/data/tdf35798-new.odt |binary
sw/qa/extras/mailmerge/mailmerge.cxx | 141
++
sw/source/core/doc/DocumentSettingManager.cxx |8
sw/source/core/doc/doc.cxx| 128
+
sw/source/core/doc/doctxm.cxx |4
sw/source/core/inc/DocumentSettingManager.hxx |1
sw/source/core/text/txtfrm.cxx|9
sw/source/core/txtnode/atrfld.cxx | 26 +
sw/source/core/txtnode/ndtxt.cxx |2
sw/source/core/txtnode/thints.cxx | 65 ++--
sw/source/core/view/viewsh.cxx| 20 +
sw/source/filter/xml/xmlimp.cxx | 26 +
sw/source/ui/config/optcomp.cxx | 16 -
sw/source/uibase/app/docshini.cxx | 22 -
sw/source/uibase/uno/SwXDocumentSettings.cxx | 18 +
sw/uiconfig/swriter/ui/optcompatpage.ui |1
unotools/source/config/compatibility.cxx |4
30 files changed, 513 insertions(+), 121 deletions(-)
New commits:
commit 08071d4de2935b64a07cb4e9bdf9fa88e850c86b
Author: Mike Kaganski
Date: Fri May 18 18:48:38 2018 +0300
tdf#35798: Hide empty Database fields' paragraphs (+ compat option)
With this change, Database fields that expand to empty values behave
as if they are "Hidden Paragraph" fields.
A compatibility option to enable this behaviour is added. The option is
enabled by default, and for any non-native documents (for compatibility
with other office suites). For existing (F)ODT documents, the option is
disabled for those documents that don't have this setting set, to keep
the layout of legacy documents.
Change-Id: Ic5e8cb15a3a7d1a765a984eef4b0d97666df7dfd
Reviewed-on: https://gerrit.libreoffice.org/54552
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
Reviewed-on: https://gerrit.libreoffice.org/54929
Tested-by: Mike Kaganski
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index 892cb3989593..3cc2cdb9842d 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -87,12 +87,25 @@ bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence<
css::beans::Property
PropertyMapEntry aImportInfoMap[] =
{
{ OUString("BaseURI"), 0, ::cppu::UnoType::get(),
PropertyAttribute::MAYBEVOID, 0},
+{ OUString("DefaultDocumentSettings"), 0,
+ ::cppu::UnoType>::get(),
PropertyAttribute::MAYBEVOID, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
Reference< XPropertySet > xInfoSet(
GenericPropertySet_CreateInstance( new PropertySetInfo(
aImportInfoMap ) ) );
xInfoSet->setPropertyValue( "BaseURI", makeAny( aBaseURI ));
+
+OUString aFilterName;
+auto It = aMediaMap.find(OUString("FilterName"));
+if (It != aMediaMap.end() && (It->second >>= aFilterName)
+&& aFilterName == "OpenDocument Text Flat XML")
+{
+PropertyValue EmptyDbFieldHidesPara("EmptyDbFieldHidesPara", 0,
Any(false),
+
PropertyState::PropertyState_DIRECT_VALUE);
+Sequence aSettings{ EmptyDbFieldHidesPara };
+xInfoSet->setPropertyValue("DefaultDocumentSettings",
makeAny(aSettings));
+}
aAnys[0] <<= xInfoSet;
diff --git a/include/unotools/compatibility.hxx
b/include/unotools/compatibility.hxx
index f281f58aad1d..ac8add44e025 100644
--- a/include/unotools/compatibility.hxx
+++ b/include/unotools/compatibility.hxx
@@ -60,6 +60,7 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityE
[Libreoffice-commits] core.git: vcl/source
vcl/source/app/salvtables.cxx | 22 ++
1 file changed, 22 insertions(+)
New commits:
commit c3ea8e1d7922b93285dac930eb37f67eec19a21e
Author: Caolán McNamara
Date: Mon May 28 17:29:17 2018 +0100
toggle should trigger only through ui
Change-Id: I15619dad2189f81a074f8b9649c4e8b756120f2c
Reviewed-on: https://gerrit.libreoffice.org/54944
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 2c6fdac648ae..1579aae20222 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -991,6 +991,7 @@ class SalInstanceRadioButton : public SalInstanceButton,
public virtual weld::Ra
{
private:
VclPtr<::RadioButton> m_xRadioButton;
+bool m_bBlockNotify;
DECL_LINK(ToggleHdl, ::RadioButton&, void);
@@ -998,13 +999,16 @@ public:
SalInstanceRadioButton(::RadioButton* pButton, bool bTakeOwnership)
: SalInstanceButton(pButton, bTakeOwnership)
, m_xRadioButton(pButton)
+, m_bBlockNotify(false)
{
m_xRadioButton->SetToggleHdl(LINK(this, SalInstanceRadioButton,
ToggleHdl));
}
virtual void set_active(bool active) override
{
+m_bBlockNotify = true;
m_xRadioButton->Check(active);
+m_bBlockNotify = false;
}
virtual bool get_active() const override
@@ -1030,6 +1034,8 @@ public:
IMPL_LINK_NOARG(SalInstanceRadioButton, ToggleHdl, ::RadioButton&, void)
{
+if (m_bBlockNotify)
+return;
signal_toggled();
}
@@ -1037,6 +1043,7 @@ class SalInstanceToggleButton : public SalInstanceButton,
public virtual weld::T
{
private:
VclPtr m_xToggleButton;
+bool m_bBlockNotify;
DECL_LINK(ToggleListener, VclWindowEvent&, void);
@@ -1044,6 +1051,7 @@ public:
SalInstanceToggleButton(PushButton* pButton, bool bTakeOwnership)
: SalInstanceButton(pButton, bTakeOwnership)
, m_xToggleButton(pButton)
+, m_bBlockNotify(false)
{
}
@@ -1056,7 +1064,9 @@ public:
virtual void set_active(bool active) override
{
+m_bBlockNotify = true;
m_xToggleButton->Check(active);
+m_bBlockNotify = false;
}
virtual bool get_active() const override
@@ -1066,7 +1076,9 @@ public:
virtual void set_inconsistent(bool inconsistent) override
{
+m_bBlockNotify = false;
m_xToggleButton->SetState(inconsistent ? TRISTATE_INDET :
TRISTATE_FALSE);
+m_bBlockNotify = true;
}
virtual bool get_inconsistent() const override
@@ -1083,6 +1095,8 @@ public:
IMPL_LINK(SalInstanceToggleButton, ToggleListener, VclWindowEvent&, rEvent,
void)
{
+if (m_bBlockNotify)
+return;
if (rEvent.GetId() == VclEventId::PushbuttonToggle)
signal_toggled();
}
@@ -1091,19 +1105,23 @@ class SalInstanceCheckButton : public
SalInstanceButton, public virtual weld::Ch
{
private:
VclPtr m_xCheckButton;
+bool m_bBlockNotify;
DECL_LINK(ToggleHdl, CheckBox&, void);
public:
SalInstanceCheckButton(CheckBox* pButton, bool bTakeOwnership)
: SalInstanceButton(pButton, bTakeOwnership)
, m_xCheckButton(pButton)
+, m_bBlockNotify(false)
{
m_xCheckButton->SetToggleHdl(LINK(this, SalInstanceCheckButton,
ToggleHdl));
}
virtual void set_active(bool active) override
{
+m_bBlockNotify = true;
m_xCheckButton->Check(active);
+m_bBlockNotify = false;
}
virtual bool get_active() const override
@@ -1113,7 +1131,9 @@ public:
virtual void set_inconsistent(bool inconsistent) override
{
+m_bBlockNotify = true;
m_xCheckButton->SetState(inconsistent ? TRISTATE_INDET :
TRISTATE_FALSE);
+m_bBlockNotify = false;
}
virtual bool get_inconsistent() const override
@@ -1129,6 +1149,8 @@ public:
IMPL_LINK_NOARG(SalInstanceCheckButton, ToggleHdl, CheckBox&, void)
{
+if (m_bBlockNotify)
+return;
signal_toggled();
}
___
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/ui/unoobj/scdetect.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3dd0105d1c237fd5af619d6153802b3549678c80
Author: Julien Nabet
Date: Sun May 27 21:07:28 2018 +0200
DBase: synchronize DB types known on Calc with those known on Base
by adding 0x31, VisualFoxProAuto on array of valid marks in lcl_MayBeDBase
See
https://opengrok.libreoffice.org/xref/core/connectivity/source/inc/dbase/DTable.hxx#40
and
https://opengrok.libreoffice.org/xref/core/include/connectivity/dbtools.hxx#823
Yes, it should be great to have only 1 enum
Change-Id: Ic3fb74c838aab5e744cbe1d70ad8ca4ce2c00b8d
Reviewed-on: https://gerrit.libreoffice.org/54894
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 881c5f9834a3..251fda4e1549 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -191,7 +191,7 @@ static bool lcl_MayBeDBase( SvStream& rStream )
// Look for dbf marker, see connectivity/source/inc/dbase/DTable.hxx
// DBFType for values.
const sal_uInt8 nValidMarks[] = {
-0x03, 0x04, 0x05, 0x30, 0x43, 0xB3, 0x83, 0x8b, 0x8e, 0xf5 };
+0x03, 0x04, 0x05, 0x30, 0x31, 0x43, 0xB3, 0x83, 0x8b, 0x8e, 0xf5 };
sal_uInt8 nMark;
rStream.Seek(STREAM_SEEK_TO_BEGIN);
rStream.ReadUChar( nMark );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/uitest/calc_tests/fillRandomNumber.py | 58
1 file changed, 58 insertions(+)
New commits:
commit ee3a23978da998b4d5ebac89c422cd78f7b31c3a
Author: Zdeněk Crhonek
Date: Mon May 28 14:53:19 2018 +0200
uitest Calc Fill random number
Change-Id: I6922a537f06c7cced0f8b5390c8261c57d07b29b
Reviewed-on: https://gerrit.libreoffice.org/54928
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek
diff --git a/sc/qa/uitest/calc_tests/fillRandomNumber.py
b/sc/qa/uitest/calc_tests/fillRandomNumber.py
new file mode 100644
index ..a2c55fb353d5
--- /dev/null
+++ b/sc/qa/uitest/calc_tests/fillRandomNumber.py
@@ -0,0 +1,58 @@
+# -*- 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
+
+#randomnumbergenerator.ui
+class fillRandomNumber(UITestCase):
+def test_fill_random_number(self):
+calc_doc = self.ui_test.create_doc_in_start_center("calc")
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+document = self.ui_test.get_component()
+gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:A2"}))
+
self.ui_test.execute_modeless_dialog_through_command(".uno:RandomNumberGeneratorDialog")
+xDialog = self.xUITest.getTopFocusWindow()
+xcellrangeedit = xDialog.getChild("cell-range-edit")
+xdistributioncombo = xDialog.getChild("distribution-combo")
+xparameter1spin = xDialog.getChild("parameter1-spin")
+xparameter2spin = xDialog.getChild("parameter2-spin")
+xenableseedcheck = xDialog.getChild("enable-seed-check")
+xseedspin = xDialog.getChild("seed-spin")
+xenableroundingcheck = xDialog.getChild("enable-rounding-check")
+xdecimalplacesspin = xDialog.getChild("decimal-places-spin")
+
+xcellrangeedit.executeAction("TYPE",
mkPropertyValues({"TEXT":"$Sheet1.$A$1:$A$2"}))
+props = {"TEXT": "Uniform Integer"}
+actionProps = mkPropertyValues(props)
+xdistributioncombo.executeAction("SELECT", actionProps)
+
+xparameter1spin.executeAction("UP", tuple())
+xparameter2spin.executeAction("UP", tuple())
+xenableseedcheck.executeAction("CLICK", tuple())
+xseedspin.executeAction("UP", tuple())
+xenableroundingcheck.executeAction("CLICK", tuple())
+xdecimalplacesspin.executeAction("UP", tuple())
+
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+#Verify
+self.assertEqual(bool(get_cell_by_position(document, 0, 0,
0).getString() ), True)
+self.assertEqual(bool(get_cell_by_position(document, 0, 0,
1).getString() ), True)
+#undo
+self.xUITest.executeCommand(".uno:Undo")
+self.assertEqual(bool(get_cell_by_position(document, 0, 0,
0).getString() ), False)
+self.assertEqual(bool(get_cell_by_position(document, 0, 0,
1).getString() ), False)
+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: Branch 'libreoffice-6-1' - cui/uiconfig vcl/unx
cui/uiconfig/ui/textattrtabpage.ui |4 +---
vcl/unx/gtk3/gtk3gtkinst.cxx | 11 ---
2 files changed, 5 insertions(+), 10 deletions(-)
New commits:
commit c3a9610e66f0577cb5db3b166b11492ae5b33555
Author: Caolán McNamara
Date: Fri May 25 16:41:00 2018 +0100
fix up position of anchor widget
Change-Id: I35823a4c84f6134bf9b005fb1ab6df12d716d14e
Reviewed-on: https://gerrit.libreoffice.org/54942
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/uiconfig/ui/textattrtabpage.ui
b/cui/uiconfig/ui/textattrtabpage.ui
index 2b6b02b5a4d7..d8922c205972 100644
--- a/cui/uiconfig/ui/textattrtabpage.ui
+++ b/cui/uiconfig/ui/textattrtabpage.ui
@@ -1,5 +1,5 @@
-
+
@@ -407,8 +407,6 @@
True
True
GDK_BUTTON_PRESS_MASK
| GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK |
GDK_STRUCTURE_MASK
-start
-center
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index da393b7ced7e..9fecb7981593 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1255,14 +1255,11 @@ public:
{
GtkWidget* pParent = gtk_widget_get_parent(m_pWidget);
if (GTK_IS_VIEWPORT(pParent))
-{
pParent = gtk_widget_get_parent(pParent);
-if (GTK_IS_SCROLLED_WINDOW(pParent))
-{
-
gtk_scrolled_window_set_min_content_width(GTK_SCROLLED_WINDOW(pParent), nWidth);
-
gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(pParent),
nHeight);
-return;
-}
+if (GTK_IS_SCROLLED_WINDOW(pParent))
+{
+
gtk_scrolled_window_set_min_content_width(GTK_SCROLLED_WINDOW(pParent), nWidth);
+
gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(pParent),
nHeight);
}
gtk_widget_set_size_request(m_pWidget, nWidth, nHeight);
}
___
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' - svx/source
svx/source/dialog/charmap.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit aa9eaa396ef7bbe6955bb1053e4f76121ea38923 Author: Caolán McNamara Date: Mon May 28 09:10:09 2018 +0100 coverity#1435837 Uninitialized scalar field Change-Id: Ie2d78756019fe48167515c6022cd564a969cd90e Reviewed-on: https://gerrit.libreoffice.org/54937 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index fa9c3cebede3..0288524a6466 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -68,6 +68,8 @@ SvxShowCharSet::SvxShowCharSet(weld::ScrolledWindow* pScrolledWindow, const VclP : mxVirDev(rVirDev) , mxScrollArea(pScrolledWindow) , mxContext(comphelper::getProcessComponentContext()) +, nX(0) +, nY(0) , maFontSize(0, 0) , maPosition(0,0) , mbRecalculateFont(true) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig
cui/source/inc/transfrm.hxx | 24 +++
cui/source/tabpages/transfrm.cxx | 113 --
cui/uiconfig/ui/slantcornertabpage.ui | 68 ++--
3 files changed, 101 insertions(+), 104 deletions(-)
New commits:
commit b93348cd30df08ae60f38fce3efdd3823b674d44
Author: Caolán McNamara
Date: Fri May 25 16:19:52 2018 +0100
weld SvxSlantTabPage
Change-Id: Ib3b1bf1fa434c63b66f388a1f1815787b642fb88
Reviewed-on: https://gerrit.libreoffice.org/54817
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 94fa4836de51..654facf57c05 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -227,17 +227,6 @@ class SvxSlantTabPage : public SvxTabPage
static const sal_uInt16 pSlantRanges[];
private:
-VclPtrm_pFlRadius;
-VclPtr m_pMtrRadius;
-VclPtrm_pFlAngle;
-VclPtr m_pMtrAngle;
-
-VclPtrm_aControlGroups[2];
-VclPtrm_aControlGroupX[2];
-VclPtr m_aControlX[2];
-VclPtrm_aControlGroupY[2];
-VclPtr m_aControlY[2];
-
const SfxItemSet& rOutAttrs;
const SdrView* pView;
@@ -248,10 +237,19 @@ private:
MapUnit ePoolUnit;
FieldUnit eDlgUnit;
+std::unique_ptr m_xFlRadius;
+std::unique_ptr m_xMtrRadius;
+std::unique_ptr m_xFlAngle;
+std::unique_ptr m_xMtrAngle;
+std::unique_ptr m_aControlGroups[2];
+std::unique_ptr m_aControlGroupX[2];
+std::unique_ptr m_aControlX[2];
+std::unique_ptr m_aControlGroupY[2];
+std::unique_ptr m_aControlY[2];
+
public:
- SvxSlantTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
+SvxSlantTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~SvxSlantTabPage() override;
-virtual void dispose() override;
static VclPtr Create( TabPageParent, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pSlantRanges; }
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 570635d1737a..2095550f6f3f 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -320,13 +320,11 @@ void SvxAngleTabPage::Reset(const SfxItemSet* rAttrs)
m_pCtlAngle->SaveValue();
}
-
VclPtr SvxAngleTabPage::Create( TabPageParent pWindow, const
SfxItemSet* rSet)
{
return VclPtr::Create(pWindow.pParent, *rSet);
}
-
void SvxAngleTabPage::ActivatePage(const SfxItemSet& rSet)
{
SfxBoolItem const * bPosProtect = nullptr;
@@ -337,7 +335,6 @@ void SvxAngleTabPage::ActivatePage(const SfxItemSet& rSet)
}
}
-
DeactivateRC SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if(_pSet)
@@ -422,25 +419,23 @@ void SvxAngleTabPage::PointChanged(weld::DrawingArea*
/*pWindow*/, RectPoint /*e
|* dialog for changing slant and corner radius
|*
\/
-SvxSlantTabPage::SvxSlantTabPage(vcl::Window* pParent, const SfxItemSet&
rInAttrs)
-: SvxTabPage(
pParent,"SlantAndCornerRadius","cui/ui/slantcornertabpage.ui",
-rInAttrs)
+SvxSlantTabPage::SvxSlantTabPage(TabPageParent pParent, const SfxItemSet&
rInAttrs)
+: SvxTabPage(pParent, "cui/ui/slantcornertabpage.ui",
"SlantAndCornerRadius", rInAttrs)
, rOutAttrs(rInAttrs)
, pView(nullptr)
, eDlgUnit(FUNIT_NONE)
+, m_xFlRadius(m_xBuilder->weld_widget("FL_RADIUS"))
+, m_xMtrRadius(m_xBuilder->weld_metric_spin_button("MTR_FLD_RADIUS",
FUNIT_CM))
+, m_xFlAngle(m_xBuilder->weld_widget("FL_SLANT"))
+, m_xMtrAngle(m_xBuilder->weld_metric_spin_button("MTR_FLD_ANGLE",
FUNIT_DEGREE))
{
-get(m_pFlRadius, "FL_RADIUS");
-get(m_pMtrRadius, "MTR_FLD_RADIUS");
-get(m_pFlAngle, "FL_SLANT");
-get(m_pMtrAngle, "MTR_FLD_ANGLE");
-
for (int i = 0; i < 2; ++i)
{
-get(m_aControlGroups[i], "controlgroups" + OString::number(i+1));
-get(m_aControlGroupX[i], "controlgroupx" + OString::number(i+1));
-get(m_aControlX[i], "controlx" + OString::number(i+1));
-get(m_aControlGroupY[i], "controlgroupy" + OString::number(i+1));
-get(m_aControlY[i], "controly" + OString::number(i+1));
+m_aControlGroups[i].reset(m_xBuilder->weld_widget("controlgroups" +
OString::number(i+1)));
+m_aControlGroupX[i].reset(m_xBuilder->weld_widget("controlgroupx" +
OString::number(i+1)));
+m_aControlX[i].reset(m_xBuilder->weld_metric_spin_button("controlx" +
OString::number(i+1), FUNIT_CM));
+m_aControlGroupY[i].reset(m_xBuilder->weld_widget("controlgroupy" +
OString::number(i+1)));
+m_aControlY[i].reset(m_xBuilder->weld_metric_spin_button("controly" +
OString::number(i+1), FUNIT_CM));
}
// this page needs ExchangeSupport
@@ -448,30 +4
[Libreoffice-commits] core.git: cui/uiconfig vcl/unx
cui/uiconfig/ui/textattrtabpage.ui |4 +---
vcl/unx/gtk3/gtk3gtkinst.cxx | 11 ---
2 files changed, 5 insertions(+), 10 deletions(-)
New commits:
commit 79f796cc6f0c7b7e8dbc627467037e942d099c52
Author: Caolán McNamara
Date: Fri May 25 16:41:00 2018 +0100
fix up position of anchor widget
Change-Id: I35823a4c84f6134bf9b005fb1ab6df12d716d14e
Reviewed-on: https://gerrit.libreoffice.org/54816
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/uiconfig/ui/textattrtabpage.ui
b/cui/uiconfig/ui/textattrtabpage.ui
index 2b6b02b5a4d7..d8922c205972 100644
--- a/cui/uiconfig/ui/textattrtabpage.ui
+++ b/cui/uiconfig/ui/textattrtabpage.ui
@@ -1,5 +1,5 @@
-
+
@@ -407,8 +407,6 @@
True
True
GDK_BUTTON_PRESS_MASK
| GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK |
GDK_STRUCTURE_MASK
-start
-center
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index da393b7ced7e..9fecb7981593 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1255,14 +1255,11 @@ public:
{
GtkWidget* pParent = gtk_widget_get_parent(m_pWidget);
if (GTK_IS_VIEWPORT(pParent))
-{
pParent = gtk_widget_get_parent(pParent);
-if (GTK_IS_SCROLLED_WINDOW(pParent))
-{
-
gtk_scrolled_window_set_min_content_width(GTK_SCROLLED_WINDOW(pParent), nWidth);
-
gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(pParent),
nHeight);
-return;
-}
+if (GTK_IS_SCROLLED_WINDOW(pParent))
+{
+
gtk_scrolled_window_set_min_content_width(GTK_SCROLLED_WINDOW(pParent), nWidth);
+
gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(pParent),
nHeight);
}
gtk_widget_set_size_request(m_pWidget, nWidth, nHeight);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig include/vcl
cui/source/inc/transfrm.hxx | 70 +++---
cui/source/tabpages/transfrm.cxx | 439 --
cui/uiconfig/ui/possizetabpage.ui | 145 +++-
include/vcl/customweld.hxx|1
4 files changed, 311 insertions(+), 344 deletions(-)
New commits:
commit ebfb0d3950a8723e24baa330b80a0a560e381639
Author: Caolán McNamara
Date: Mon May 28 16:51:20 2018 +0100
weld SvxPositionSizeTabPage
Change-Id: Ic642d6ab2470a14b3a1d83284407fc690d5eba88
Reviewed-on: https://gerrit.libreoffice.org/54945
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 654facf57c05..7e7aa264f91b 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -74,32 +74,6 @@ class SvxPositionSizeTabPage : public SvxTabPage
static const sal_uInt16 pPosSizeRanges[];
private:
-// position
-VclPtrm_pFlPosition;
-VclPtr m_pMtrPosX;
-VclPtr m_pMtrPosY;
-VclPtr m_pCtlPos;
-
-// size
-VclPtrm_pFlSize;
-VclPtr m_pFtWidth;
-VclPtr m_pMtrWidth;
-VclPtr m_pFtHeight;
-VclPtr m_pMtrHeight;
-VclPtrm_pCbxScale;
-VclPtr m_pCtlSize;
-
-// protect
-VclPtrm_pFlProtect;
-VclPtr m_pTsbPosProtect;
-VclPtr m_pTsbSizeProtect;
-
-// adjust
-VclPtrm_pFlAdjust;
-VclPtr m_pTsbAutoGrowWidth;
-VclPtr m_pTsbAutoGrowHeight;
-
-private:
const SfxItemSet& mrOutAttrs;
const SdrView* mpView;
@@ -123,22 +97,48 @@ private:
double mfOldHeight;
RectPoint meRP;
+RectCtl m_aCtlPos;
+RectCtl m_aCtlSize;
-DECL_LINK( ChangePosProtectHdl, Button*, void );
-DECL_LINK( ChangeSizeProtectHdl, Button*, void );
+// position
+std::unique_ptr m_xFlPosition;
+std::unique_ptr m_xMtrPosX;
+std::unique_ptr m_xMtrPosY;
+std::unique_ptr m_xCtlPos;
+
+// size
+std::unique_ptr m_xFlSize;
+std::unique_ptr m_xFtWidth;
+std::unique_ptr m_xMtrWidth;
+std::unique_ptr m_xFtHeight;
+std::unique_ptr m_xMtrHeight;
+std::unique_ptr m_xCbxScale;
+std::unique_ptr m_xCtlSize;
+
+// protect
+std::unique_ptr m_xFlProtect;
+std::unique_ptr m_xTsbPosProtect;
+std::unique_ptr m_xTsbSizeProtect;
+
+// adjust
+std::unique_ptr m_xFlAdjust;
+std::unique_ptr m_xTsbAutoGrowWidth;
+std::unique_ptr m_xTsbAutoGrowHeight;
+
+DECL_LINK(ChangePosProtectHdl, weld::ToggleButton&, void);
+DECL_LINK(ChangeSizeProtectHdl, weld::ToggleButton&, void);
void SetMinMaxPosition();
void GetTopLeftPosition(double& rfX, double& rfY, const basegfx::B2DRange&
rRange);
-DECL_LINK( ChangeWidthHdl, Edit&, void );
-DECL_LINK( ChangeHeightHdl, Edit&, void );
-DECL_LINK( ClickSizeProtectHdl, Button*, void );
-DECL_LINK( ClickAutoHdl, Button*, void );
+DECL_LINK( ChangeWidthHdl, weld::MetricSpinButton&, void );
+DECL_LINK( ChangeHeightHdl, weld::MetricSpinButton&, void );
+DECL_LINK( ClickSizeProtectHdl, weld::ToggleButton&, void );
+DECL_LINK( ClickAutoHdl, weld::ToggleButton&, void );
public:
-SvxPositionSizeTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs
);
+SvxPositionSizeTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~SvxPositionSizeTabPage() override;
-virtual void dispose() override;
static VclPtr Create( TabPageParent, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pPosSizeRanges; }
@@ -149,8 +149,8 @@ public:
virtual void ActivatePage( const SfxItemSet& rSet ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
-virtual void PointChanged( vcl::Window* pWindow, RectPoint eRP ) override;
virtual void PointChanged( weld::DrawingArea* pWindow, RectPoint eRP )
override;
+virtual void PointChanged( vcl::Window* pWindow, RectPoint eRP ) override;
void Construct();
void SetView( const SdrView* pSdrView ) { mpView = pSdrView; }
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 2095550f6f3f..b37d366f2f0b 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -773,8 +773,8 @@ void SvxSlantTabPage::PointChanged( weld::DrawingArea*,
RectPoint )
|* Dialog for changing position and size of graphic objects
|*
\/
-SvxPositionSizeTabPage::SvxPositionSizeTabPage(vcl::Window* pParent, const
SfxItemSet& rInAttrs)
-: SvxTabPage(pParent,"PositionAndSize","cui/ui/possizetabpage.ui",
rInAttrs)
+SvxPositionSizeTabPage::SvxPositionSizeTabPage(TabPageParent pParent, const
SfxItemSet& rInAttr
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - cui/source include/svx sal/rtl sd/source svx/source vcl/inc
cui/source/tabpages/textattr.cxx |2
include/svx/dlgctrl.hxx|8 -
sal/rtl/alloc_arena.hxx|2
sd/source/ui/table/TableDesignPane.cxx |6
sd/source/ui/table/TableDesignPane.hxx |3
svx/source/dialog/dlgctrl.cxx | 227 ++---
vcl/inc/salwtype.hxx |1
7 files changed, 101 insertions(+), 148 deletions(-)
New commits:
commit d1ceb421883fd4c05d146c109f906127d2b2ee31
Author: Noel Grandin
Date: Fri May 25 16:34:11 2018 +0200
loplugin:unusedfields
Change-Id: I625b73152c0c277c6e0ce3e24e4704094fc4e8ff
Reviewed-on: https://gerrit.libreoffice.org/54822
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 96d7c67d98527b1ccc1cfba3ca817238e582d63b)
Reviewed-on: https://gerrit.libreoffice.org/54943
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 3013bd6038d7..9cb423211176 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -81,7 +81,7 @@ SvxTextAttrPage::SvxTextAttrPage(TabPageParent pPage, const
SfxItemSet& rInAttrs
, m_xCtlPosition(new weld::CustomWeld(*m_xBuilder, "CTL_POSITION",
m_aCtlPosition))
, m_xTsbFullWidth(m_xBuilder->weld_check_button("TSB_FULL_WIDTH"))
{
-m_aCtlPosition.SetControlSettings(RectPoint::MM, 240, 100);
+m_aCtlPosition.SetControlSettings(RectPoint::MM, 240);
FieldUnit eFUnit = GetModuleFieldUnit( rInAttrs );
SetFieldUnit( *m_xMtrFldLeft, eFUnit );
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index c14761bd8017..c7a1e1087765 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -100,7 +100,6 @@ protected:
BitmapEx* pBitmap;
CTL_STATE m_nState;
-bool mbCompleteDisable : 1;
bool mbUpdateForeground : 1;
bool mbUpdateBackground : 1;
@@ -143,8 +142,6 @@ public:
virtual css::uno::Reference< css::accessibility::XAccessible >
CreateAccessible() override;
RectPoint GetApproxRPFromPixPt( const css::awt::Point&
rPixelPoint ) const;
-
-bool IsCompletelyDisabled() const { return mbCompleteDisable; }
};
class SAL_WARN_UNUSED SVX_DLLPUBLIC RectCtl : public
weld::CustomWidgetController
@@ -163,7 +160,6 @@ private:
protected:
rtl::Reference pAccContext;
sal_uInt16 nBorderWidth;
-sal_uInt16 nRadius;
Point aPtLT, aPtMT, aPtRT;
Point aPtLM, aPtMM, aPtRM;
Point aPtLB, aPtMB, aPtRB;
@@ -180,8 +176,8 @@ protected:
Point GetApproxLogPtFromPixPt( const Point& rRoughPixelPoint
) const;
public:
-RectCtl(SvxTabPage* pPage, RectPoint eRpt = RectPoint::MM, sal_uInt16
nBorder = 200, sal_uInt16 nCircle = 80);
-void SetControlSettings(RectPoint eRpt, sal_uInt16 nBorder, sal_uInt16
nCircl);
+RectCtl(SvxTabPage* pPage, RectPoint eRpt = RectPoint::MM, sal_uInt16
nBorder = 200);
+void SetControlSettings(RectPoint eRpt, sal_uInt16 nBorder);
virtual ~RectCtl() override;
virtual void Paint(vcl::RenderContext& rRenderContext, const
tools::Rectangle&) override;
diff --git a/sal/rtl/alloc_arena.hxx b/sal/rtl/alloc_arena.hxx
index 120d0ec5ac45..061fc0cf044f 100644
--- a/sal/rtl/alloc_arena.hxx
+++ b/sal/rtl/alloc_arena.hxx
@@ -100,8 +100,6 @@ struct rtl_arena_st
rtl_arena_segment_type * m_hash_table_0[RTL_ARENA_HASH_SIZE];
sal_Size m_hash_size; /* m_hash_mask + 1 */
sal_Size m_hash_shift; /* log2(m_hash_size) */
-
-rtl_cache_type ** m_qcache_ptr;
};
/** gp_default_arena
diff --git a/sd/source/ui/table/TableDesignPane.cxx
b/sd/source/ui/table/TableDesignPane.cxx
index 1a61bf6f100e..23a8dd2499e4 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -86,8 +86,6 @@ static const OUStringLiteral gPropNames[CB_COUNT] =
TableDesignWidget::TableDesignWidget( VclBuilderContainer* pParent,
ViewShellBase& rBase )
: mrBase(rBase)
-, mbStyleSelected(false)
-, mbOptionsChanged(false)
{
pParent->get(m_pValueSet, "previews");
m_pValueSet->SetStyle(m_pValueSet->GetStyle() | WB_NO_DIRECTSELECT |
WB_FLATVALUESET | WB_ITEMBORDER);
@@ -146,7 +144,6 @@ static SfxDispatcher* getDispatcher( ViewShellBase const &
rBase )
IMPL_LINK_NOARG(TableDesignWidget, implValueSetHdl, ValueSet*, void)
{
-mbStyleSelected = true;
ApplyStyle();
}
@@ -202,10 +199,7 @@ void TableDesignWidget::ApplyStyle()
IMPL_LINK_NOARG(TableDesignWidget, implCheckBoxHdl, Button*, void)
{
-mbOptionsChanged = true;
-
ApplyOptions();
-
FillDesignPreviewControl();
}
diff --git a/sd/source/ui/table/TableDesignPane.hxx
b/sd/source/ui/table/TableDesignPane.hxx
index 149ce0ae..a8a641291656 100644
--- a/sd/source/ui/table/TableDesignPane.hxx
+++ b/sd/source/ui/table/TableDesignPane.hxx
@@ -98,9 +98,6
[Libreoffice-commits] core.git: svx/source
svx/source/dialog/dlgctrl.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 4899b89f7422983ae0c6f9cf8716ddfeb422de02 Author: Caolán McNamara Date: Mon May 28 09:08:26 2018 +0100 coverity#1435838 Uninitialized scalar field Change-Id: I76446f3d70f3385b78ee382b265439765176f4f5 Reviewed-on: https://gerrit.libreoffice.org/54900 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 3f72131aa1bd..eee6d668d1e0 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -626,6 +626,7 @@ BitmapEx& RectCtl::GetRectBitmap() RectCtl::RectCtl(SvxTabPage* pPage, RectPoint eRpt, sal_uInt16 nBorder) : m_pPage(pPage) , nBorderWidth(Application::GetDefaultDevice()->LogicToPixel(Size(nBorder, 0), MapMode(MapUnit::Map100thMM)).Width()) +, eRP(eRpt) , eDefRP(eRpt) , pBitmap(nullptr) , m_nState(CTL_STATE::NONE) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Weekly QA Report (W18/W19/W20-2018)
Hello, What have happened in QA in the last 21 days? * 342 bugs have been created, of which, 116 are still unconfirmed ( Total Unconfirmed bugs: 509 ) + Created bugs: http://tinyurl.com/y89co4y9 + Still unconfirmed bugs: http://tinyurl.com/y9q3pqph * 2411 comments have been written by 356 users. * 129 new users have signed up to Bugzilla. == STATUSES CHANGED == * 15 bugs have been changed to 'ASSIGNED'. + Link: http://tinyurl.com/yd9sfh3e + Done by: Thomas Lendo ( 2 ), Kevin Dubrulle ( 2 ), Xisco Faulí ( 1 ), Miklos Vajna ( 1 ), victor.mireyev ( 1 ), Heiko Tietze ( 1 ), Julien Nabet ( 1 ), Jim Raykowski ( 1 ), Patrick Jaap ( 1 ), Justin L ( 1 ), Adolfo Jayme ( 1 ), aryan10jangid ( 1 ), Katarina Behrens (CIB) ( 1 ) * 13 bugs have been changed to 'CLOSED'. + Link: http://tinyurl.com/ya7nekg9 + Done by: Eike Rathke ( 8 ), Julien Nabet ( 2 ), Alex Thurgood ( 1 ), Harald Koester ( 1 ), Timur ( 1 ) * 42 bugs have been changed to 'NEEDINFO'. + Link: http://tinyurl.com/yczstpyz + Done by: Buovjaga ( 7 ), Tor Lillqvist ( 4 ), Heiko Tietze ( 4 ), raal ( 3 ), Jean-Baptiste Faure ( 3 ), Dieter Praas ( 3 ), V Stuart Foote ( 2 ), MM ( 2 ), Alex Thurgood ( 2 ), Timur ( 2 ), Adolfo Jayme ( 2 ), Xisco Faulí ( 1 ), Regina Henschel ( 1 ), steve -_- ( 1 ), Khaled Hosny ( 1 ), eisa01 ( 1 ), Cor Nouws ( 1 ), Aron Budea ( 1 ), Armin Le Grand (CIB) ( 1 ) * 134 bugs have been changed to 'NEW'. + Link: http://tinyurl.com/y9ods9ks + Done by: Buovjaga ( 18 ), Dieter Praas ( 18 ), raal ( 17 ), Heiko Tietze ( 8 ), robert ( 7 ), V Stuart Foote ( 5 ), Telesto ( 5 ), Xisco Faulí ( 4 ), Regina Henschel ( 4 ), MM ( 4 ), Timur ( 4 ), Aron Budea ( 4 ), Mike Kaganski ( 3 ), jalojo ( 3 ), Jacques Guilleron ( 3 ), Drew Jensen ( 3 ), Adolfo Jayme ( 2 ), Xavier Van Wijmeersch ( 1 ), Andras Timar ( 1 ), Thomas Woltjer ( 1 ), Thorsten Behrens (CIB) ( 1 ), Julien Nabet ( 1 ), Samuel ( 1 ), Olivier Hallot ( 1 ), nurcantur ( 1 ), m.a.riosv ( 1 ), Michael Meeks ( 1 ), me ( 1 ), Matthias ( 1 ), Khaled Hosny ( 1 ), Ekansh Jha ( 1 ), jfpersonal2 ( 1 ), infiwerthamb1980 ( 1 ), himajin10 ( 1 ), Matthew Francis ( 1 ), Eike Rathke ( 1 ), elizabeth.cnrw ( 1 ), eisa01 ( 1 ), kompilainenn ( 1 ) * 4 bugs have been changed to 'REOPENED'. + Link: http://tinyurl.com/y8b3wdgg + Done by: Justin L ( 1 ), Ysabeau ( 1 ), nona ( 1 ), dbtale ( 1 ) * 52 bugs have been changed to 'RESOLVED DUPLICATE'. + Link: http://tinyurl.com/ycq5d7aq + Done by: Telesto ( 6 ), Buovjaga ( 5 ), Aron Budea ( 5 ), Maxim Monastirsky ( 4 ), Dieter Praas ( 4 ), V Stuart Foote ( 3 ), Mike Kaganski ( 3 ), Jean-Baptiste Faure ( 3 ), Timur ( 3 ), Heiko Tietze ( 2 ), raal ( 2 ), eisa01 ( 2 ), Xavier Van Wijmeersch ( 1 ), Xisco Faulí ( 1 ), Thomas Lendo ( 1 ), Julien Nabet ( 1 ), m.a.riosv ( 1 ), Johnny_M ( 1 ), Khaled Hosny ( 1 ), Adolfo Jayme ( 1 ), Drew Jensen ( 1 ), Dilshod ( 1 ) * 80 bugs have been changed to 'RESOLVED FIXED'. + Link: http://tinyurl.com/y7wzxefd + Done by: Miklos Vajna ( 10 ), Caolán McNamara ( 6 ), Tomaz Vajngerl ( 5 ), Adolfo Jayme ( 5 ), Armin Le Grand (CIB) ( 5 ), Mike Kaganski ( 4 ), Eike Rathke ( 4 ), Drew Jensen ( 4 ), Tor Lillqvist ( 3 ), Julien Nabet ( 3 ), Justin L ( 3 ), Vasily Melenchuk (CIB) ( 2 ), Andras Timar ( 2 ), Heiko Tietze ( 2 ), Olivier Hallot ( 2 ), andreas_k ( 2 ), Winfried Donkers ( 1 ), V Stuart Foote ( 1 ), Szymon Kłos ( 1 ), Andy ( 1 ), Serge Krot (CIB) ( 1 ), safirdepo.iletisim ( 1 ), Paul Kerry ( 1 ), Noel Grandin ( 1 ), Michael Meeks ( 1 ), Mert Tumer ( 1 ), Markus Mohrhard ( 1 ), Khaled Hosny ( 1 ), Jim Davis ( 1 ), danielfaleirosilva ( 1 ), Chris Sherlock ( 1 ), Tamas Bunth ( 1 ), Aron Budea ( 1 ), baffclan ( 1 ) * 2 bugs have been changed to 'RESOLVED INSUFFICIENTDATA'. + Link: http://tinyurl.com/yap2d2hu + Done by: Timur ( 2 ) * 10 bugs have been changed to 'RESOLVED INVALID'. + Link: http://tinyurl.com/ybulklaz + Done by: Jean-Baptiste Faure ( 3 ), Mike Kaganski ( 2 ), Pedro ( 1 ), Patrick ( 1 ), Khaled Hosny ( 1 ), Timur ( 1 ), Adolfo Jayme ( 1 ) * 2 bugs have been changed to 'RESOLVED MOVED'. + Link: http://tinyurl.com/y76k3vu2 + Done by: V Stuart Foote ( 1 ), Buovjaga ( 1 ) * 19 bugs have been changed to 'RESOLVED NOTABUG'. + Link: http://tinyurl.com/ybygkq6j + Done by: V Stuart Foote ( 2 ), Heiko Tietze ( 2 ), Mike Kaganski ( 2 ), Dieter Praas ( 2 ), Xisco Faulí ( 1 ), Buovjaga ( 1 ), tim ( 1 ), Regina Henschel ( 1 ), raal ( 1 ), m.a.riosv ( 1 ), Khaled Hosny ( 1 ), Alex Thurgood ( 1 ), Adolfo Jayme ( 1 ), Arnaud Versini ( 1 ), kompilainenn ( 1 ) * 6 bugs have been changed to 'RESOLVED NOTOURBUG'. + Link: http://tinyurl.com/y8muxqzr + Done by: Buovjaga ( 2 ), Mike Kaganski ( 2 ), Jean-Baptiste Faure ( 1 ), Timur ( 1 ) * 7 bugs have been changed to 'RESOLVED WONTFIX'. + Link: htt
[Libreoffice-commits] core.git: sc/source
sc/source/ui/app/scmod.cxx | 24 +---
1 file changed, 9 insertions(+), 15 deletions(-)
New commits:
commit 8f9f66e8d2bae94c1f469ffc51bdbffeba853a2b
Author: Henry Castro
Date: Mon May 28 10:20:53 2018 -0400
sc: simplify ScModule::GetClipDoc
Change-Id: I36a79a41b989d37efc35a9f9b4bebca9bdaf9ee9
Reviewed-on: https://gerrit.libreoffice.org/54935
Tested-by: Jenkins
Reviewed-by: Henry Castro
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index fc8145365871..26652ddf1808 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -662,28 +662,22 @@ void ScModule::SetDragJump(
ScDocument* ScModule::GetClipDoc()
{
// called from document
+SfxViewFrame* pViewFrame = nullptr;
ScTabViewShell* pViewShell = nullptr;
-const ScTransferObj* pObj = nullptr;
+css::uno::Reference xTransferable;
if ((pViewShell = dynamic_cast(SfxViewShell::Current(
-pObj = ScTransferObj::GetOwnClipboard(pViewShell->GetClipData());
+xTransferable.set(pViewShell->GetClipData());
else if ((pViewShell =
dynamic_cast(SfxViewShell::GetFirst(
-pObj = ScTransferObj::GetOwnClipboard(pViewShell->GetClipData());
-else
+xTransferable.set(pViewShell->GetClipData());
+else if ((pViewFrame = SfxViewFrame::GetFirst()))
{
-css::uno::Reference
xClipboard;
-
-if (SfxViewFrame* pViewFrame = SfxViewFrame::GetFirst())
-xClipboard = pViewFrame->GetWindow().GetClipboard();
-
-if (xClipboard.is())
-{
-css::uno::Reference
xTransferable(
-xClipboard->getContents(), css::uno::UNO_QUERY);
-pObj = ScTransferObj::GetOwnClipboard(xTransferable);
-}
+css::uno::Reference
xClipboard =
+pViewFrame->GetWindow().GetClipboard();
+xTransferable.set(xClipboard.is() ? xClipboard->getContents() :
nullptr, css::uno::UNO_QUERY);
}
+const ScTransferObj* pObj = ScTransferObj::GetOwnClipboard(xTransferable);
if (pObj)
{
ScDocument* pDoc = pObj->GetDocument();
___
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/tool/token.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 92e6be6614af2d8c1697faf5fc37e74af3700cea Author: Luboš Luňák Date: Mon May 28 16:01:49 2018 +0200 blacklist ocDBSum for calc's threading Triggers a number of asserts on hard-recalc (Shift+Ctrl+F9) with ooo#58183-1 that would require passing ScContextInterpreter* to a number of functions, so just blacklist it. Change-Id: I0c3666a3423cea7c77f530480b8b63506c4bbad2 Reviewed-on: https://gerrit.libreoffice.org/54933 Reviewed-by: Michael Meeks Tested-by: Jenkins diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index a973e06332cf..575ebd64cad4 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1319,7 +1319,8 @@ void ScTokenArray::CheckForThreading( OpCode eOp ) ocMatch, ocCell, ocInfo, -ocStyle +ocStyle, +ocDBSum }); // We only call this if it was already disabled ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/msdffimp.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 63ce2fa4835109eeab172ab167dafe4a752b6764 Author: Miklos Vajna Date: Mon May 28 17:08:34 2018 +0200 filter: fix build of embedded ole stream dumper Change-Id: I7f9f34af52057b35f3778d84cfe98afa37817b6b Reviewed-on: https://gerrit.libreoffice.org/54939 Reviewed-by: Miklos Vajna Tested-by: Jenkins diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 3e80858d9275..f37fa69dffd7 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -7064,7 +7064,7 @@ css::uno::Reference < css::embed::XEmbeddedObject > SvxMSDffManager::CheckForCo aTmpName += ".bin"; SvFileStream aTmpStream(aTmpName,StreamMode::READ|StreamMode::WRITE|StreamMode::TRUNC); xMemStream->Seek(0); -*xMemStream >> aTmpStream; +aTmpStream.WriteStream(*xMemStream); aTmpStream.Close(); #endif if ( pName || pFilter ) ___ 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' - connectivity/source
connectivity/source/drivers/firebird/PreparedStatement.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 570279baa7df076413cc6b4f9220a07248db0c1b
Author: Julien Nabet
Date: Sat May 26 18:01:15 2018 +0200
tdf#117446: FB mig, (VAR)BINARY, fix memory management
By default, 8000 bytes are allocated for VARBINARY
The pb is we can need more.
See https://bugs.documentfoundation.org/show_bug.cgi?id=117446#c6
Change-Id: I0ef5811dc01a587491bd9345129d1a41a4d9f095
Reviewed-on: https://gerrit.libreoffice.org/54863
Tested-by: Jenkins
Reviewed-by: Julien Nabet
(cherry picked from commit 54ddc4ff4c2ff7e8b2c502d6b475cfdc9b8e3cec)
Reviewed-on: https://gerrit.libreoffice.org/54963
Reviewed-by: Noel Grandin
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 0a43d5c93851..fee4029088f4 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -837,12 +837,19 @@ void SAL_CALL OPreparedStatement::setBytes(sal_Int32
nParameterIndex,
setParameterNull(nParameterIndex, false);
const sal_Int32 nMaxSize = 0x;
Sequence xBytesCopy(xBytes);
-// First 2 bytes indicate string size
if (xBytesCopy.getLength() > nMaxSize)
{
xBytesCopy.realloc( nMaxSize );
}
const short nSize = xBytesCopy.getLength();
+// 8000 corresponds to value from lcl_addDefaultParameters
+// in dbaccess/source/filter/hsqldb/createparser.cxx
+if (nSize > 8000)
+{
+free(pVar->sqldata);
+pVar->sqldata = static_cast(malloc(sizeof(char) *
nSize + 2));
+}
+// First 2 bytes indicate string size
memcpy(pVar->sqldata, &nSize, 2);
// Actual data
memcpy(pVar->sqldata + 2, xBytesCopy.getConstArray(), nSize);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |3 --- 1 file changed, 3 deletions(-) New commits: commit 255bfc283c531512c93401bb4a23cb617137b864 Author: Stephan Bergmann Date: Mon May 28 13:13:44 2018 +0200 WITH_HELPPACK_INTEGRATION isn't substituted anywhere (just used via SCPDEFS) Change-Id: I23a14b0e76399b5e6303ad11ad7d09966d951b6f Reviewed-on: https://gerrit.libreoffice.org/54915 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/configure.ac b/configure.ac index 21218f46e41c..5dd419305b66 100644 --- a/configure.ac +++ b/configure.ac @@ -11262,14 +11262,11 @@ dnl Test whether to integrate helppacks into the product's installer dnl === AC_MSG_CHECKING([for helppack integration]) if test "$with_helppack_integration" = "no"; then -WITH_HELPPACK_INTEGRATION= AC_MSG_RESULT([no integration]) else -WITH_HELPPACK_INTEGRATION=TRUE SCPDEFS="$SCPDEFS -DWITH_HELPPACK_INTEGRATION" AC_MSG_RESULT([integration]) fi -AC_SUBST(WITH_HELPPACK_INTEGRATION) ### # Extensions checking ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/app/apphdl.cxx | 70 ++--
1 file changed, 18 insertions(+), 52 deletions(-)
New commits:
commit d7c2667089535d25b8f0ad4f58810ee54552156b
Author: Mike Kaganski
Date: Sat May 26 19:55:49 2018 +0300
Only show Mail Merge toolbar after wizard finished
The toolbar is not needed while wizard works (since it's modal).
This simplifies the logic a little.
Also this allows to show the toolbar in the actual document used for
mailmerge (e.g., when a new or existing document is used, nit the
current one); previously, the toolbar appeared in the document active at
the moment of wizard launch remained in that document, and actual
document went without the toolbar.
Change-Id: I44c45c41f1a3e06cd0fb1930092727b9e08caf74
Reviewed-on: https://gerrit.libreoffice.org/54864
Reviewed-by: Mike Kaganski
Tested-by: Mike Kaganski
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 05efb9d821e4..ac5a40287a4d 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -59,9 +59,7 @@
#include
#include
#include
-#include
#include
-#include
#include
#include
#include
@@ -331,8 +329,6 @@ class SwMailMergeWizardExecutor : public
salhelper::SimpleReferenceObject
VclPtr m_pWizard; // always owner
VclPtr m_pWizardToDestroyInCallback;
-bool m_bDestroyMMToolbarOnCancel;
-
DECL_LINK( EndDialogHdl, Dialog&, void );
DECL_LINK( DestroyDialogHdl, void*, void );
DECL_LINK( DestroyWizardHdl, void*, void );
@@ -352,8 +348,7 @@ public:
SwMailMergeWizardExecutor::SwMailMergeWizardExecutor()
: m_pView( nullptr ),
m_pView2Close( nullptr ),
- m_pWizard( nullptr ),
- m_bDestroyMMToolbarOnCancel( false )
+ m_pWizard( nullptr )
{
}
@@ -418,25 +413,6 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard(
const SfxItemSet * pArgs
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
m_pWizard = pFact->CreateMailMergeWizard(*m_pView, xMMConfig);
-uno::Reference
xPropSet(m_pView->GetViewFrame()->GetFrame().GetFrameInterface(),
uno::UNO_QUERY);
-if (!xPropSet.is())
-return;
-
-uno::Reference xLayoutManager;
-uno::Any aValue = xPropSet->getPropertyValue("LayoutManager");
-aValue >>= xLayoutManager;
-if (!xLayoutManager.is())
-return;
-
-const OUString sResourceURL( "private:resource/toolbar/mailmerge" );
-uno::Reference xUIElement =
xLayoutManager->getElement(sResourceURL);
-if (!xUIElement.is())
-{
-// ensure the mail-merge toolbar is displayed and remember if it was
before
-m_bDestroyMMToolbarOnCancel = true;
-xLayoutManager->createElement(sResourceURL);
-xLayoutManager->showElement(sResourceURL);
-}
ExecuteWizard();
}
@@ -452,21 +428,24 @@ void SwMailMergeWizardExecutor::ExecutionFinished()
SwDBManager* pDbManager = pDoc->GetDBManager();
if (pDbManager)
pDbManager->CommitLastRegistrations();
-}
-// Update Mail Merge controls
-const sal_uInt16 slotIds[] = { FN_MAILMERGE_FIRST_ENTRY,
- FN_MAILMERGE_PREV_ENTRY,
- FN_MAILMERGE_NEXT_ENTRY,
- FN_MAILMERGE_LAST_ENTRY,
- FN_MAILMERGE_CURRENT_ENTRY,
- FN_MAILMERGE_EXCLUDE_ENTRY,
- FN_MAILMERGE_CREATE_DOCUMENTS,
- FN_MAILMERGE_SAVE_DOCUMENTS,
- FN_MAILMERGE_PRINT_DOCUMENTS,
- FN_MAILMERGE_EMAIL_DOCUMENTS,
- 0 };
-m_pView->GetViewFrame()->GetBindings().Invalidate(slotIds);
+// Show the toolbar
+m_pView->ShowUIElement("private:resource/toolbar/mailmerge");
+
+// Update Mail Merge controls
+const sal_uInt16 slotIds[] = { FN_MAILMERGE_FIRST_ENTRY,
+ FN_MAILMERGE_PREV_ENTRY,
+ FN_MAILMERGE_NEXT_ENTRY,
+ FN_MAILMERGE_LAST_ENTRY,
+ FN_MAILMERGE_CURRENT_ENTRY,
+ FN_MAILMERGE_EXCLUDE_ENTRY,
+ FN_MAILMERGE_CREATE_DOCUMENTS,
+ FN_MAILMERGE_SAVE_DOCUMENTS,
+ FN_MAILMERGE_PRINT_DOCUMENTS,
+ FN_MAILMERGE_EMAIL_DOCUMENTS,
+ 0 };
+m_pView->GetViewFrame()->GetBindings().Invalidate(slotIds);
+}
// release/destroy asynchronously
Application::PostUserEvent( LINK( this, SwMailMergeWizardExecutor,
DestroyDialogHdl ) );
@
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sw/source
sw/source/uibase/app/apphdl.cxx | 14 ++
1 file changed, 14 insertions(+)
New commits:
commit d64da241e8ebd0c212548982dcf61cc658939e8a
Author: Mike Kaganski
Date: Sat May 26 14:23:13 2018 +0300
tdf#117817: Update Mail Merge controls after wizard completes
Otherwise they may stay disabled until cursor position changes.
Change-Id: If734bbd4793b3b01c64601d68126d5752f5aba0c
Reviewed-on: https://gerrit.libreoffice.org/54841
Reviewed-by: Mike Kaganski
Tested-by: Mike Kaganski
(cherry picked from commit f304ae0ca4738fa3605587146224ee8972a894f3)
Reviewed-on: https://gerrit.libreoffice.org/54964
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 467112e58956..27dbf41be1ce 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -487,6 +487,20 @@ void SwMailMergeWizardExecutor::ExecutionFinished()
pDbManager->CommitLastRegistrations();
}
+// Update Mail Merge controls
+const sal_uInt16 slotIds[] = { FN_MAILMERGE_FIRST_ENTRY,
+ FN_MAILMERGE_PREV_ENTRY,
+ FN_MAILMERGE_NEXT_ENTRY,
+ FN_MAILMERGE_LAST_ENTRY,
+ FN_MAILMERGE_CURRENT_ENTRY,
+ FN_MAILMERGE_EXCLUDE_ENTRY,
+ FN_MAILMERGE_CREATE_DOCUMENTS,
+ FN_MAILMERGE_SAVE_DOCUMENTS,
+ FN_MAILMERGE_PRINT_DOCUMENTS,
+ FN_MAILMERGE_EMAIL_DOCUMENTS,
+ 0 };
+m_pView->GetViewFrame()->GetBindings().Invalidate(slotIds);
+
// release/destroy asynchronously
Application::PostUserEvent( LINK( this, SwMailMergeWizardExecutor,
DestroyDialogHdl ) );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - dbaccess/source xmloff/inc xmloff/source
dbaccess/source/ui/dlg/dlgattr.cxx|4 +--
dbaccess/source/ui/inc/dlgattr.hxx|2 -
xmloff/inc/XMLTextHeaderFooterContext.hxx |1
xmloff/inc/animationimport.hxx|1
xmloff/inc/txtfldi.hxx|1
xmloff/inc/txtvfldi.hxx |2 -
xmloff/source/draw/animationimport.cxx|6 ++---
xmloff/source/draw/animimp.cxx| 10 +++--
xmloff/source/draw/eventimp.cxx | 10 +++--
xmloff/source/draw/ximpbody.cxx | 12 +--
xmloff/source/draw/ximpbody.hxx |2 -
xmloff/source/draw/ximpnote.cxx |8 +++
xmloff/source/draw/ximpnote.hxx |3 --
xmloff/source/draw/ximpstyl.cxx | 24 ++
xmloff/source/draw/ximpstyl.hxx |6 -
xmloff/source/style/xmlexppr.cxx |2 -
xmloff/source/style/xmlnumi.cxx | 13 ---
xmloff/source/text/XMLTextFrameContext.cxx|4 ---
xmloff/source/text/XMLTextHeaderFooterContext.cxx |2 -
xmloff/source/text/XMLTextListBlockContext.cxx|1
xmloff/source/text/XMLTextListBlockContext.hxx|1
xmloff/source/text/txtfldi.cxx|3 --
xmloff/source/text/txtparai.cxx |1
xmloff/source/text/txtparai.hxx |2 -
xmloff/source/text/txtvfldi.cxx |5 +++-
25 files changed, 42 insertions(+), 84 deletions(-)
New commits:
commit 2e80fe39a438ab702ad8f3e2456159328cb16365
Author: Noel Grandin
Date: Fri May 18 13:46:59 2018 +0200
loplugin:useuniqueptr in dbaui::SbaSbAttrDlg
Change-Id: Ia24f948370b30ccc3870e36c19312e9eebb309b3
Reviewed-on: https://gerrit.libreoffice.org/54851
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx
b/dbaccess/source/ui/dlg/dlgattr.cxx
index f64c42e3e8ba..d2c3031b72ee 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -38,7 +38,7 @@ SbaSbAttrDlg::SbaSbAttrDlg(vcl::Window* pParent, const
SfxItemSet* pCellAttrs,
: SfxTabDialog(pParent, "FieldDialog", "dbaccess/ui/fielddialog.ui",
pCellAttrs)
, m_nNumberFormatId(0)
{
-pNumberInfoItem = new SvxNumberInfoItem( pFormatter, 0 );
+pNumberInfoItem.reset( new SvxNumberInfoItem( pFormatter, 0 ) );
if (bHasFormat)
m_nNumberFormatId = AddTabPage("format", RID_SVXPAGE_NUMBERFORMAT);
@@ -54,7 +54,7 @@ SbaSbAttrDlg::~SbaSbAttrDlg()
void SbaSbAttrDlg::dispose()
{
-delete pNumberInfoItem;
+pNumberInfoItem.reset();
SfxTabDialog::dispose();
}
diff --git a/dbaccess/source/ui/inc/dlgattr.hxx
b/dbaccess/source/ui/inc/dlgattr.hxx
index d5b5c20b4102..1a10d63ace86 100644
--- a/dbaccess/source/ui/inc/dlgattr.hxx
+++ b/dbaccess/source/ui/inc/dlgattr.hxx
@@ -29,7 +29,7 @@ namespace dbaui
class SbaSbAttrDlg : public SfxTabDialog
{
-SvxNumberInfoItem* pNumberInfoItem;
+std::unique_ptr pNumberInfoItem;
sal_uInt32 m_nNumberFormatId;
public:
commit 03841dc12ff3ee65ca632039418c65bbfd5ccaea
Author: Noel Grandin
Date: Fri May 25 17:00:23 2018 +0200
loplugin:unusedfields-in-constructor in xmloff
fields that are only referenced in the constructor
Change-Id: I44bddb2dce2f30c21ea0f1ada4c1615c854d3334
Reviewed-on: https://gerrit.libreoffice.org/54823
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/xmloff/inc/XMLTextHeaderFooterContext.hxx
b/xmloff/inc/XMLTextHeaderFooterContext.hxx
index 47688ba08021..385190dd5674 100644
--- a/xmloff/inc/XMLTextHeaderFooterContext.hxx
+++ b/xmloff/inc/XMLTextHeaderFooterContext.hxx
@@ -34,7 +34,6 @@ class XMLTextHeaderFooterContext: public SvXMLImportContext
const OUString sOn;
const OUString sShareContent;
-const OUString sShareContentFirst;
const OUString sText;
const OUString sTextFirst;
const OUString sTextLeft;
diff --git a/xmloff/inc/animationimport.hxx b/xmloff/inc/animationimport.hxx
index 6d59ad9a4898..b59f8cb60b30 100644
--- a/xmloff/inc/animationimport.hxx
+++ b/xmloff/inc/animationimport.hxx
@@ -34,7 +34,6 @@ class AnimationsImportHelperImpl;
class AnimationNodeContext : public SvXMLImportContext
{
std::shared_ptr mpHelper;
-bool mbRootContext;
css::uno::Reference< css::animations::XAnimationNode > mxNode;
void init_node( const css::uno::Reference< css::xml::sax::XAttributeList
>& xAttrList );
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index 350ca6d11e0e..936c7102b3fb 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -216,7 +216,6 @@ protected:
class XMLAuthorFieldImportContext : public XMLSenderFieldImportContext
{
bool bAuthorFullName;
-const OUString sServiceAuthor;
[Libreoffice-commits] core.git: 2 commits - dbaccess/source
dbaccess/source/ui/dlg/dbwizsetup.cxx | 13 ++---
dbaccess/source/ui/dlg/indexdialog.cxx |4 ++--
dbaccess/source/ui/inc/dbwizsetup.hxx |2 +-
dbaccess/source/ui/inc/indexdialog.hxx |2 +-
4 files changed, 10 insertions(+), 11 deletions(-)
New commits:
commit c9f120a424072808c0ed09fc2487541cc212c45e
Author: Noel Grandin
Date: Mon May 21 15:46:07 2018 +0200
loplugin:useuniqueptr in ODbTypeWizDialogSetup
Change-Id: I5d1e737510d423f9caa44ad5b498ef5e781c24d0
Reviewed-on: https://gerrit.libreoffice.org/54856
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx
b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 3403203c2e33..03b520739f25 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -141,7 +141,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window*
_pParent
m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxORB,this,this));
m_pImpl->setDataSourceOrName(_aDataSourceName);
Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource();
-m_pOutSet = new SfxItemSet( *_pItems->GetPool(), _pItems->GetRanges() );
+m_pOutSet.reset( new SfxItemSet( *_pItems->GetPool(), _pItems->GetRanges()
) );
m_pImpl->translateProperties(xDatasource, *m_pOutSet);
@@ -264,8 +264,7 @@ ODbTypeWizDialogSetup::~ODbTypeWizDialogSetup()
void ODbTypeWizDialogSetup::dispose()
{
-delete m_pOutSet;
-m_pOutSet = nullptr;
+m_pOutSet.reset();
m_pGeneralPage.clear();
m_pMySQLIntroPage.clear();
m_pFinalPage.clear();
@@ -388,12 +387,12 @@ void ODbTypeWizDialogSetup::resetPages(const Reference<
XPropertySet >& _rxDatas
const SfxItemSet* ODbTypeWizDialogSetup::getOutputSet() const
{
-return m_pOutSet;
+return m_pOutSet.get();
}
SfxItemSet* ODbTypeWizDialogSetup::getWriteOutputSet()
{
-return m_pOutSet;
+return m_pOutSet.get();
}
std::pair< Reference,bool>
ODbTypeWizDialogSetup::createConnection()
@@ -628,7 +627,7 @@ void ODbTypeWizDialogSetup::saveDatasource()
{
SfxTabPage* pPage =
static_cast(WizardDialog::GetPage(getCurrentState()));
if ( pPage )
-pPage->FillItemSet(m_pOutSet);
+pPage->FillItemSet(m_pOutSet.get());
}
bool ODbTypeWizDialogSetup::leaveState(WizardState _nState)
@@ -640,7 +639,7 @@ bool ODbTypeWizDialogSetup::leaveState(WizardState _nState)
resetPages(m_pImpl->getCurrentDataSource());
}
SfxTabPage* pPage =
static_cast(WizardDialog::GetPage(_nState));
-return pPage && pPage->DeactivatePage(m_pOutSet) != DeactivateRC::KeepPage;
+return pPage && pPage->DeactivatePage(m_pOutSet.get()) !=
DeactivateRC::KeepPage;
}
void ODbTypeWizDialogSetup::setTitle(const OUString& /*_sTitle*/)
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx
b/dbaccess/source/ui/inc/dbwizsetup.hxx
index 0f0588f9bf68..c84b730fab94 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -58,7 +58,7 @@ class ODbTypeWizDialogSetup final : public svt::RoadmapWizard
, public IItemSetH
{
private:
std::unique_ptr m_pImpl;
-SfxItemSet* m_pOutSet;
+std::unique_ptr m_pOutSet;
OUStringm_sURL;
OUStringm_sOldURL;
boolm_bIsConnectable : 1;
commit 1ebeb51e8bfa7b139e2661e8fe460a102dfb5659
Author: Noel Grandin
Date: Fri May 18 15:27:18 2018 +0200
loplugin:useuniqueptr in DbaIndexDialog
Change-Id: Ife795db29256a50a93b668890c85473872d350a9
Reviewed-on: https://gerrit.libreoffice.org/54853
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx
b/dbaccess/source/ui/dlg/indexdialog.cxx
index e2e7adc0986f..c12b89e5f5c1 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -215,7 +215,7 @@ namespace dbaui
setToolBox(m_pActions);
-m_pIndexes = new OIndexCollection();
+m_pIndexes.reset(new OIndexCollection());
try
{
m_pIndexes->attach(_rxIndexes);
@@ -307,7 +307,7 @@ namespace dbaui
void DbaIndexDialog::dispose()
{
setToolBox(nullptr);
-delete m_pIndexes;
+m_pIndexes.reset();
m_pActions.clear();
m_pIndexList.clear();
m_pIndexDetails.clear();
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx
b/dbaccess/source/ui/inc/indexdialog.hxx
index 766177035374..e7b458559fbb 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -89,7 +89,7 @@ namespace dbaui
VclPtr m_pFields;
VclPtr m_pClose;
-OIndexCollection* m_pIndexes;
+std::unique_ptr m_pIndexes;
SvTreeListEntry*m_pPreviousSelection;
boolm_bEditAgain;
[Libreoffice-commits] core.git: vbahelper/source
vbahelper/source/vbahelper/vbacommandbarhelper.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 535f31419ab61c33212b1dd2693e34968902d3ad Author: Samuel Mehrbrodt Date: Mon May 28 14:45:31 2018 +0200 Add missing include Change-Id: I0b3af7ac36631748c0d33afb6d06d19761af9c41 Reviewed-on: https://gerrit.libreoffice.org/54926 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx index b2d01cfa633f..5b344dc61225 100644 --- a/vbahelper/source/vbahelper/vbacommandbarhelper.cxx +++ b/vbahelper/source/vbahelper/vbacommandbarhelper.cxx @@ -18,6 +18,7 @@ */ #include "vbacommandbarhelper.hxx" #include +#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
