[Libreoffice-commits] core.git: Branch 'feature/cib_contract3756' - officecfg/registry vcl/inc vcl/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs |8 +
vcl/inc/graphic/Manager.hxx|1
vcl/source/graphic/Manager.cxx | 20 +
3 files changed, 23 insertions(+), 6 deletions(-)
New commits:
commit 4a5dc88ad3a8111f802d35f907d7352e53097fab
Author: Samuel Mehrbrodt
AuthorDate: Mon Oct 14 15:05:19 2019 +0200
Commit: Samuel Mehrbrodt
CommitDate: Tue Oct 15 08:57:26 2019 +0200
Add option to prevent graphic swap out
Change-Id: Icbfc21b219cd4ba582e798e5deda6ef7c81a2009
Reviewed-on: https://gerrit.libreoffice.org/80773
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit f0443fa4438aa98bce48bfd53dc6a687737687b6)
Reviewed-on: https://gerrit.libreoffice.org/80806
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 543fd8c564a0..6162d467953f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1524,6 +1524,14 @@
600
+
+
+Whether graphics will be swapped to disk when
`GraphicMemoryLimit`
+is reached. Disable at your own risk.
+Graphic Swapping Enabled
+
+ true
+
Specifies the allowed cumulated memory that the
diff --git a/vcl/inc/graphic/Manager.hxx b/vcl/inc/graphic/Manager.hxx
index a756450caf28..f1413877bb08 100644
--- a/vcl/inc/graphic/Manager.hxx
+++ b/vcl/inc/graphic/Manager.hxx
@@ -35,6 +35,7 @@ private:
std::recursive_mutex maMutex; // instead of SolarMutex because graphics
can live past vcl main
std::unordered_set m_pImpGraphicList;
std::chrono::seconds mnAllowedIdleTime;
+bool mbSwapEnabled;
sal_Int64 mnMemoryLimit;
sal_Int64 mnUsedSize;
Timer maSwapOutTimer;
diff --git a/vcl/source/graphic/Manager.cxx b/vcl/source/graphic/Manager.cxx
index ec2bdca9be0b..5942b5cb8784 100644
--- a/vcl/source/graphic/Manager.cxx
+++ b/vcl/source/graphic/Manager.cxx
@@ -33,7 +33,7 @@ namespace graphic
namespace
{
void setupConfigurationValuesIfPossible(sal_Int64& rMemoryLimit,
-std::chrono::seconds& rAllowedIdleTime)
+std::chrono::seconds&
rAllowedIdleTime, bool& bSwapEnabled)
{
if (utl::ConfigManager::IsFuzzing())
return;
@@ -45,6 +45,7 @@ void setupConfigurationValuesIfPossible(sal_Int64&
rMemoryLimit,
rMemoryLimit = Cache::GraphicManager::GraphicMemoryLimit::get();
rAllowedIdleTime
=
std::chrono::seconds(Cache::GraphicManager::GraphicAllowedIdleTime::get());
+bSwapEnabled = Cache::GraphicManager::GraphicSwappingEnabled::get();
}
catch (...)
{
@@ -60,20 +61,27 @@ Manager& Manager::get()
Manager::Manager()
: mnAllowedIdleTime(10)
+, mbSwapEnabled(true)
, mnMemoryLimit(3)
, mnUsedSize(0)
, maSwapOutTimer("graphic::Manager maSwapOutTimer")
{
-setupConfigurationValuesIfPossible(mnMemoryLimit, mnAllowedIdleTime);
+setupConfigurationValuesIfPossible(mnMemoryLimit, mnAllowedIdleTime,
mbSwapEnabled);
-maSwapOutTimer.SetInvokeHandler(LINK(this, Manager, SwapOutTimerHandler));
-maSwapOutTimer.SetTimeout(1);
-maSwapOutTimer.SetDebugName("graphic::Manager maSwapOutTimer");
-maSwapOutTimer.Start();
+if (mbSwapEnabled)
+{
+maSwapOutTimer.SetInvokeHandler(LINK(this, Manager,
SwapOutTimerHandler));
+maSwapOutTimer.SetTimeout(1);
+maSwapOutTimer.SetDebugName("graphic::Manager maSwapOutTimer");
+maSwapOutTimer.Start();
+}
}
void Manager::reduceGraphicMemory()
{
+if (!mbSwapEnabled)
+return;
+
std::scoped_lock aGuard(maMutex);
for (ImpGraphic* pEachImpGraphic : m_pImpGraphicList)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
How to write to metadata of Libre Calc Sheet
Hi Team, I am trying to implement extension for Libre Office Calc where i try to get the database values and write to the sheet. I want to save this data base connection information to the sheet when saved on disk so that i can read back and use it when reopened. (I call this metadata) Can you please guide me on how to write this information to the sheet without displaying it to the user. -- Best Regards, Harish Kumar.B ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: accessibility/source chart2/source config_host/config_feature_desktop.h.in config_host/config_feature_opencl.h.in config_host/config_features.h.in configure.ac cui/sour
accessibility/source/helper/acc_factory.cxx |2 - chart2/source/view/main/ChartView.cxx |2 - config_host/config_feature_desktop.h.in | 28 config_host/config_feature_opencl.h.in | 13 + config_host/config_features.h.in| 27 --- configure.ac|2 + cui/source/dialogs/about.cxx|2 - cui/source/options/treeopt.cxx |2 + desktop/source/app/app.cxx |2 + desktop/source/app/officeipcthread.cxx |1 desktop/source/app/opencl.cxx |2 - desktop/source/deployment/registry/help/dp_help.cxx |2 - framework/source/layoutmanager/layoutmanager.cxx|2 - sc/inc/formulagroup.hxx |2 - sc/source/core/data/formulacell.cxx |2 - sc/source/core/tool/formulagroup.cxx|2 - sc/source/ui/docshell/docsh.cxx |1 sc/source/ui/unoobj/docuno.cxx |2 - sc/source/ui/view/viewfun4.cxx |2 + sfx2/source/appl/app.cxx|2 - sfx2/source/appl/workwin.cxx|2 - sfx2/source/control/dispatch.cxx|2 - sfx2/source/view/viewfrm.cxx|2 - svx/source/sdr/contact/objectcontactofpageview.cxx |2 - svx/source/tbxctrls/tbunosearchcontrollers.cxx |2 - svx/source/unodraw/unopage.cxx |1 sw/inc/viewopt.hxx |2 - sw/inc/viscrs.hxx |2 - sw/qa/extras/odfimport/odfimport.cxx|2 + sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |2 + sw/qa/extras/rtfimport/rtfimport.cxx|2 + toolkit/source/helper/accessibilityclient.cxx |2 - vcl/source/app/svmain.cxx |1 vcl/source/helper/svtaccessiblefactory.cxx |2 - vcl/source/window/builder.cxx |2 - vcl/source/window/dialog.cxx|2 - vcl/source/window/mouse.cxx |1 37 files changed, 82 insertions(+), 49 deletions(-) New commits: commit 4704acf63f4fed3a99fc95ff63c82eb5a9ae3908 Author: Luboš Luňák AuthorDate: Mon Oct 14 15:43:34 2019 +0200 Commit: Tor Lillqvist CommitDate: Tue Oct 15 08:26:59 2019 +0200 move HAVE_FEATURE_DESKTOP/OPENCL to their dedicated headers HAVE_FEATURE_OPENCL is included by a common Calc header and HAVE_FEATURE_DESKTOP is included by a common Writer header, causing pretty much their full rebuilds if any feature changes. Change-Id: If29bf78bd4fd70b37981e0826a57fd255c89 Reviewed-on: https://gerrit.libreoffice.org/80776 Tested-by: Jenkins Reviewed-by: Tor Lillqvist diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index 48458e8b62d3..076b865c5ff5 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include +#include #include #include diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 6824c4f516c9..8601e82e4803 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include +#include #include #include diff --git a/config_host/config_feature_desktop.h.in b/config_host/config_feature_desktop.h.in new file mode 100644 index ..489f684afead --- /dev/null +++ b/config_host/config_feature_desktop.h.in @@ -0,0 +1,28 @@ +/* A feature split out from config_features.h because it affects many files. + */ + +#ifndef CONFIG_FEATURE_DESKTOP_H +#define CONFIG_FEATURE_DESKTOP_H + +/* DESKTOP - Whether we have a "normal" desktop UI or not. + * + * Non-DESKTOP in practice means touch-based mobile devices, Android + * or iOS for now. Support for those is work in progress. + * + * Non-DESKTOP implies that the OS makes sure that only one instance + * of each LibreOffice-based "app" at a time can be running, and thus + * the LibreOffice code does not need to handle such things itself. + * + * Non-DESKTOP implies no traditional inter-app drag and drop concept. + * + * Non-DESKTOP implies no traditional help mechanism, and to some + * extent (as noticed, and as possible without making the code too + * ugly) the related code is ifdeffed out. + * + * Non-DESKTOP implies no traditional desktop-style GUI elements like + * toolbars and scrollbars presented by the LO code. + */ + +#define HAVE_FEATURE_DESKTOP 0 + +#endif diff --git
[Libreoffice-commits] core.git: include/oox oox/source sd/qa
include/oox/drawingml/shape.hxx |5 +
oox/source/drawingml/shape.cxx |6 +-
oox/source/ppt/pptshapegroupcontext.cxx |4 +++-
sd/qa/unit/data/pptx/tdf127964.pptx |binary
sd/qa/unit/import-tests.cxx | 23 +++
5 files changed, 36 insertions(+), 2 deletions(-)
New commits:
commit 46d630f98f1c07ec2048da35d1a4804181148ac5
Author: Miklos Vajna
AuthorDate: Mon Oct 14 21:49:32 2019 +0200
Commit: Miklos Vajna
CommitDate: Tue Oct 15 08:22:55 2019 +0200
tdf#127964 PPTX import: fix shape fill handling: style vs slide background
Regression from commit 943a534ac7cb3df513583e226c986dafd8ba246b
(tdf#123684 PPTX import: fix wrong background color for , 2019-04-23), the problem was that we didn't handle the
case when a shape had an XML fragment like this:
i.e. the shape both wants to use background fill and it has a style
declaring how to fill it as well. We gave the style a priority, while
PowerPoint gives the background fill a priority.
Fix the problem by not setting the fill from the style in case the
background fill is already set.
Change-Id: Ie1b56e5615219138a5b7ddd7a2b25295b991bc05
Reviewed-on: https://gerrit.libreoffice.org/80804
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 19b619251339..1895c2f2aad6 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -232,6 +232,8 @@ public:
void setVerticalShapesCount(sal_Int32 nVerticalShapesCount) {
mnVerticalShapesCount = nVerticalShapesCount; }
sal_Int32 getVerticalShapesCount() const { return mnVerticalShapesCount; }
+void setUseBgFill(bool bUseBgFill) { mbUseBgFill = bUseBgFill; }
+
/// Changes reference semantics to value semantics for fill properties.
void cloneFillProperties();
@@ -372,6 +374,9 @@ private:
/// Number of child shapes to be layouted vertically inside org chart
in-diagram shape.
sal_Int32 mnVerticalShapesCount = 0;
+
+/// The shape fill should be set to that of the slide background surface.
+bool mbUseBgFill = false;
};
} }
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index be8153ef155a..25d94efee180 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -189,6 +189,7 @@ Shape::Shape( const ShapePtr& pSourceShape )
, mnZOrderOff(pSourceShape->mnZOrderOff)
, mnDataNodeType(pSourceShape->mnDataNodeType)
, mfAspectRatio(pSourceShape->mfAspectRatio)
+, mbUseBgFill(pSourceShape->mbUseBgFill)
{}
Shape::~Shape()
@@ -983,7 +984,10 @@ Reference< XShape > const & Shape::createAndInsert(
}
if( const ShapeStyleRef* pFillRef = getShapeStyleRef( XML_fillRef
) )
{
-nFillPhClr = pFillRef->maPhClr.getColor( rGraphicHelper );
+if (!mbUseBgFill)
+{
+nFillPhClr = pFillRef->maPhClr.getColor(rGraphicHelper);
+}
OUString sColorScheme = pFillRef->maPhClr.getSchemeName();
if( !sColorScheme.isEmpty() )
diff --git a/oox/source/ppt/pptshapegroupcontext.cxx
b/oox/source/ppt/pptshapegroupcontext.cxx
index 6535e12d3f81..745a9b8e847e 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -101,7 +101,9 @@ ContextHandlerRef PPTShapeGroupContext::onCreateContext(
sal_Int32 aElementToken
case PPT_TOKEN( sp ): // Shape
{
std::shared_ptr pShape( new PPTShape( meShapeLocation,
"com.sun.star.drawing.CustomShape" ) );
-if( rAttribs.getBool( XML_useBgFill, false ) )
+bool bUseBgFill = rAttribs.getBool(XML_useBgFill, false);
+pShape->setUseBgFill(bUseBgFill);
+if (bUseBgFill)
{
oox::drawingml::FillPropertiesPtr pBackgroundPropertiesPtr =
mpSlidePersistPtr->getBackgroundProperties();
if (!pBackgroundPropertiesPtr)
diff --git a/sd/qa/unit/data/pptx/tdf127964.pptx
b/sd/qa/unit/data/pptx/tdf127964.pptx
new file mode 100644
index ..89482a4ce99c
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf127964.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index f46da0b2aa89..298fc53c14a1 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -208,6 +208,7 @@ public:
void testTdf122899();
void testOOXTheme();
void testCropToShape();
+void testTdf127964();
CPPUNIT_TEST_SUITE(SdImportTest);
@@ -304,6 +305,7 @@ public:
CPPUNIT_TEST(testTdf122899);
CPPUNIT_TEST(testOOXTheme);
CPPUNIT_TEST(testCropToShape);
+CPPUNIT_TEST(testTdf127964);
CPPUNIT_TEST_SUITE_END();
}
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx |2 +-
connectivity/source/drivers/postgresql/pq_statement.cxx|2 +-
connectivity/source/drivers/postgresql/pq_tools.cxx|2 +-
connectivity/source/drivers/postgresql/pq_tools.hxx|2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 1ec93ef100bb5f6ccef91f12e28ed09feb3eb38b
Author: Julien Nabet
AuthorDate: Mon Oct 14 18:55:37 2019 +0200
Commit: Julien Nabet
CommitDate: Tue Oct 15 07:24:26 2019 +0200
Replace getDefaultValue by getColExprForDefaultSettingVal (postgresql)
Change-Id: I8e0eea84a711ce45d991c07d7811094e33bcce38
Reviewed-on: https://gerrit.libreoffice.org/80787
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index bedd686b0082..99d2f22b86b3 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1514,7 +1514,7 @@ css::uno::Reference< XResultSet >
DatabaseMetaData::getColumns(
//allow NULL values. An empty string means
//nobody knows.
// => pg_attribute.attnotnull
-OUString strDefaultValue = getDefaultValue(m_pSettings);
+OUString strDefaultValue = getColExprForDefaultSettingVal(m_pSettings);
Reference< XPreparedStatement > statement = m_origin->prepareStatement(
"SELECT pg_namespace.nspname, " // 1
"pg_class.relname, " // 2
diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx
b/connectivity/source/drivers/postgresql/pq_statement.cxx
index fd822034c480..b8303c1a5ad0 100644
--- a/connectivity/source/drivers/postgresql/pq_statement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -632,7 +632,7 @@ static void getAutoValues(
const OUString & tableName,
ConnectionSettings *pConnectionSettings )
{
-OUString strDefaultValue = getDefaultValue(pConnectionSettings);
+OUString strDefaultValue =
getColExprForDefaultSettingVal(pConnectionSettings);
Reference< XPreparedStatement > stmt = connection->prepareStatement(
"SELECT pg_attribute.attname, " + strDefaultValue +
"FROM pg_class, pg_namespace, pg_attribute "
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx
b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 537d915a7781..63ed515e2659 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -836,7 +836,7 @@ OString extractSingleTableFromSelect( const std::vector<
OString > &vec )
}
-OUString getDefaultValue(ConnectionSettings const *settings)
+OUString getColExprForDefaultSettingVal(ConnectionSettings const *settings)
{
return (PQserverVersion( settings->pConnection ) < 8)?
OUString("pg_attrdef.adsrc"):
diff --git a/connectivity/source/drivers/postgresql/pq_tools.hxx
b/connectivity/source/drivers/postgresql/pq_tools.hxx
index 99bdbeb14873..af751f8e633b 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.hxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.hxx
@@ -100,7 +100,7 @@ void disposeObject( const css::uno::Reference<
css::uno::XInterface > & r );
OUString extractTableFromInsert( const OUString & sql );
OString extractSingleTableFromSelect( const std::vector< OString > &vec );
-OUString getDefaultValue(ConnectionSettings const *settings);
+OUString getColExprForDefaultSettingVal(ConnectionSettings const *settings);
void tokenizeSQL( const OString & sql, std::vector< OString > &vec );
void splitSQL( const OString & sql, std::vector< OString > &vec );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Testing use of krb5 and gssapi in PostgreSQL?
On Mon, Oct 14, 2019 at 11:05:32AM +0200, Stephan Bergmann wrote: > The only use of WITH_KRB5 and WITH_GSSAPI in LO appears to be the PostgreSQL > support (see connectivity/Library_postgresql-sdbc-impl.mk and > external/postgresql/ExternalProject_postgresql.mk). Is there some > documentation how to test whether the use of krb5 and gssapi in the > PostgreSQL support actually works? Try to connect to a PostgreSQL support with GSSAPI and Kerberos? From quick skim of the documentation: https://www.postgresql.org/docs/10/auth-methods.html#GSSAPI-AUTH Put something like this in ph_hba.conf: host dbnameusername@realm 0.0.0.0 0.0.0.0 gss (or just username and map it in pg_ident.conf) and connect as to postgres/hostname@realm -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Custom Java Sidebar for Libre Office
Hi, > I am developing an extension for LibreOffice where in i need to load > HTML content. I use JFrame for this. > I want to make my java dialog to act as a sidebar for LibreOffice. > Or is there a way i can make my Java dialog as a child of Libre Office. can you be more explicit what you mean by "make my Java dialog as a child of LibreOffice"? Maybe looking at how the existing "WollMux" Java extension handles this may help: https://github.com/WollMux/WollMux For WollMux 18.0, almost all dialogs are implemented as Java dialogs, while 18.1 uses the LibreOffice sidebar for most things. I don't have deeper knowledge of how the sidebar can be used from extensions, but I'd guess that embedding a JFrame into it is not easily possible. (Doing it in own Java dialogs should work, however.) Best regards, Michael ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: officecfg/registry vcl/inc vcl/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs |8 +
vcl/inc/graphic/Manager.hxx|1
vcl/source/graphic/Manager.cxx | 20 +
3 files changed, 23 insertions(+), 6 deletions(-)
New commits:
commit f0443fa4438aa98bce48bfd53dc6a687737687b6
Author: Samuel Mehrbrodt
AuthorDate: Mon Oct 14 15:05:19 2019 +0200
Commit: Thorsten Behrens
CommitDate: Tue Oct 15 00:52:28 2019 +0200
Add option to prevent graphic swap out
Change-Id: Icbfc21b219cd4ba582e798e5deda6ef7c81a2009
Reviewed-on: https://gerrit.libreoffice.org/80773
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 0fd0786a77a9..0c6b90fea58d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1524,6 +1524,14 @@
600
+
+
+Whether graphics will be swapped to disk when
`GraphicMemoryLimit`
+is reached. Disable at your own risk.
+Graphic Swapping Enabled
+
+ true
+
Specifies the allowed cumulated memory that the
diff --git a/vcl/inc/graphic/Manager.hxx b/vcl/inc/graphic/Manager.hxx
index a756450caf28..f1413877bb08 100644
--- a/vcl/inc/graphic/Manager.hxx
+++ b/vcl/inc/graphic/Manager.hxx
@@ -35,6 +35,7 @@ private:
std::recursive_mutex maMutex; // instead of SolarMutex because graphics
can live past vcl main
std::unordered_set m_pImpGraphicList;
std::chrono::seconds mnAllowedIdleTime;
+bool mbSwapEnabled;
sal_Int64 mnMemoryLimit;
sal_Int64 mnUsedSize;
Timer maSwapOutTimer;
diff --git a/vcl/source/graphic/Manager.cxx b/vcl/source/graphic/Manager.cxx
index ec2bdca9be0b..5942b5cb8784 100644
--- a/vcl/source/graphic/Manager.cxx
+++ b/vcl/source/graphic/Manager.cxx
@@ -33,7 +33,7 @@ namespace graphic
namespace
{
void setupConfigurationValuesIfPossible(sal_Int64& rMemoryLimit,
-std::chrono::seconds& rAllowedIdleTime)
+std::chrono::seconds&
rAllowedIdleTime, bool& bSwapEnabled)
{
if (utl::ConfigManager::IsFuzzing())
return;
@@ -45,6 +45,7 @@ void setupConfigurationValuesIfPossible(sal_Int64&
rMemoryLimit,
rMemoryLimit = Cache::GraphicManager::GraphicMemoryLimit::get();
rAllowedIdleTime
=
std::chrono::seconds(Cache::GraphicManager::GraphicAllowedIdleTime::get());
+bSwapEnabled = Cache::GraphicManager::GraphicSwappingEnabled::get();
}
catch (...)
{
@@ -60,20 +61,27 @@ Manager& Manager::get()
Manager::Manager()
: mnAllowedIdleTime(10)
+, mbSwapEnabled(true)
, mnMemoryLimit(3)
, mnUsedSize(0)
, maSwapOutTimer("graphic::Manager maSwapOutTimer")
{
-setupConfigurationValuesIfPossible(mnMemoryLimit, mnAllowedIdleTime);
+setupConfigurationValuesIfPossible(mnMemoryLimit, mnAllowedIdleTime,
mbSwapEnabled);
-maSwapOutTimer.SetInvokeHandler(LINK(this, Manager, SwapOutTimerHandler));
-maSwapOutTimer.SetTimeout(1);
-maSwapOutTimer.SetDebugName("graphic::Manager maSwapOutTimer");
-maSwapOutTimer.Start();
+if (mbSwapEnabled)
+{
+maSwapOutTimer.SetInvokeHandler(LINK(this, Manager,
SwapOutTimerHandler));
+maSwapOutTimer.SetTimeout(1);
+maSwapOutTimer.SetDebugName("graphic::Manager maSwapOutTimer");
+maSwapOutTimer.Start();
+}
}
void Manager::reduceGraphicMemory()
{
+if (!mbSwapEnabled)
+return;
+
std::scoped_lock aGuard(maMutex);
for (ImpGraphic* pEachImpGraphic : m_pImpGraphicList)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/source
sw/source/core/crsr/findattr.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 46eedca34f6f421c2f2f8181b72a6073ad16efef
Author: Michael Stahl
AuthorDate: Mon Oct 14 14:56:48 2019 +0200
Commit: Thorsten Behrens
CommitDate: Tue Oct 15 00:50:04 2019 +0200
tdf#128138 sw_redlinehide: fix infinite loop in FindAttrsImpl()
The code looked wrong previously, always assigning the end of the text
node regardless of direction, but it turns out the improvement caused an
infinite loop... let's just swap things after the loop, seems simpler
than adding another if at the assignments.
(regression from 4caef398af256be5f0c2a159129b528ee3702e5c)
Change-Id: I098f5265fa86d6a2511a80a02230899a7a303a88
Reviewed-on: https://gerrit.libreoffice.org/80774
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 4e0241697371c40f4348bdfb6585a872d4cbcbf6)
Reviewed-on: https://gerrit.libreoffice.org/80785
Reviewed-by: Thorsten Behrens
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index c77dc2065979..47c1f676ecb5 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -1198,9 +1198,12 @@ static bool FindAttrsImpl(SwPaM & rSearchPam,
}
}
-// if backward search, switch point and mark
-if( bFound && !bSrchForward )
-rSearchPam.Exchange();
+// in search direction, mark precedes point, because the next iteration
+// starts at point
+if (bFound)
+{
+rSearchPam.Normalize(!bSrchForward);
+}
return bFound;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/quartz
vcl/quartz/salgdi.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f1020c61e950b0ccca06d56df676a366907c0db2 Author: Julien Nabet AuthorDate: Mon Oct 14 21:39:19 2019 +0200 Commit: Julien Nabet CommitDate: Mon Oct 14 23:27:49 2019 +0200 Fix method name origin in SAL_WARN_IF(vcl/quartz/salgdi) Change-Id: I7fff6af5e521318324df63b32d4be7b0e0f12771 Reviewed-on: https://gerrit.libreoffice.org/80803 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index 0d5ecab6a419..8884d0bd9f3b 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -735,7 +735,7 @@ bool AquaSalGraphics::GetRawFontData( const PhysicalFontFace* pFontData, nOfs += nPrepSize; } -SAL_WARN_IF( (nOfs!=nTotalSize), "vcl", "AquaSalGraphics::CreateFontSubset (nOfs!=nTotalSize)"); +SAL_WARN_IF( (nOfs!=nTotalSize), "vcl", "AquaSalGraphics::GetRawFontData (nOfs!=nTotalSize)"); return true; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: common/Util.hpp kit/Kit.cpp
common/Util.hpp | 19 +++
kit/Kit.cpp | 12
2 files changed, 27 insertions(+), 4 deletions(-)
New commits:
commit 77e7cae6899728f8a291998eedde7d68bd450504
Author: Ashod Nakashian
AuthorDate: Mon May 27 22:57:53 2019 -0400
Commit: Michael Meeks
CommitDate: Mon Oct 14 21:35:27 2019 +0100
wsd: fix password-protect file loading from multiple views
With password-protected files, the first loading attempt
always fails due to missing password. At that point the
client is notified of the missing password and the user
is prompted. The second attempt includes a (hopefully)
correct password and the document loading commences.
Due to the fact that an exception is raised when
the loading fails, this left the loading latch
triggered, which blocked subsequent attempts.
Change-Id: I7cc257a36eb1cc080f460aac8cdb7030783a5914
diff --git a/common/Util.hpp b/common/Util.hpp
index b8b350b2c..d345950ba 100644
--- a/common/Util.hpp
+++ b/common/Util.hpp
@@ -938,6 +938,25 @@ int main(int argc, char**argv)
Convert time from ISO8061 fraction format
std::chrono::system_clock::time_point iso8601ToTimestamp(const
std::string& iso8601Time, const std::string& logName);
+/// Automatically execute code at end of current scope.
+/// Used for exception-safe code.
+class ScopeGuard
+{
+public:
+template
+explicit ScopeGuard(T const &func) : m_func(func) {}
+
+~ScopeGuard()
+{
+if (m_func)
+m_func();
+}
+private:
+ScopeGuard(const ScopeGuard &) = delete;
+ScopeGuard &operator=(const ScopeGuard &) = delete;
+
+std::function m_func;
+};
} // end namespace Util
#endif
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index b40577878..60fe9ed81 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -1488,6 +1488,13 @@ private:
// Flag and release lock.
++_isLoading;
+
+Util::ScopeGuard g([this]() {
+// Not loading.
+--_isLoading;
+_cvLoading.notify_one();
+});
+
lock.unlock();
try
@@ -1495,16 +1502,13 @@ private:
if (!load(session, renderOpts, docTemplate))
return false;
}
-catch (const std::exception& exc)
+catch (const std::exception &exc)
{
LOG_ERR("Exception while loading url [" << uriAnonym <<
"] for session [" << sessionId << "]: " << exc.what());
return false;
}
---_isLoading;
-_cvLoading.notify_one();
-
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/core/TransitionPreset.cxx | 137
1 file changed, 137 insertions(+)
New commits:
commit 363e7caa66ba67b0b731d8d642e5e32d52fa7568
Author: Marco Cecchetti
AuthorDate: Mon May 27 12:53:30 2019 +0200
Commit: Michael Meeks
CommitDate: Mon Oct 14 22:35:06 2019 +0200
lok: impress: show only supported transitions in the side pane
Change-Id: I631ee8b101bacc4dec075100aa25158b71fbae40
Reviewed-on: https://gerrit.libreoffice.org/80681
Tested-by: Jenkins
Reviewed-by: Michael Meeks
diff --git a/sd/source/core/TransitionPreset.cxx
b/sd/source/core/TransitionPreset.cxx
index c290822a79bf..951959cdb69a 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -17,12 +17,16 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include
+
#include
#include
#include
#include
#include
#include
+#include
+#include
#include
#include
#include
@@ -87,6 +91,128 @@ bool TransitionPreset::importTransitionsFile(
TransitionPresetList& rList,
// import transition presets
Reference< XAnimationNode > xAnimationNode;
+const std::set LOKSupportedTransitionTypes = {
+TransitionType::BARWIPE,
+TransitionType::BOXWIPE,
+TransitionType::FOURBOXWIPE,
+TransitionType::ELLIPSEWIPE,
+TransitionType::CLOCKWIPE,
+TransitionType::PINWHEELWIPE,
+TransitionType::PUSHWIPE,
+TransitionType::SLIDEWIPE,
+TransitionType::FADE,
+TransitionType::RANDOMBARWIPE,
+TransitionType::CHECKERBOARDWIPE,
+TransitionType::DISSOLVE,
+TransitionType::SNAKEWIPE,
+TransitionType::PARALLELSNAKESWIPE,
+TransitionType::IRISWIPE,
+TransitionType::BARNDOORWIPE,
+TransitionType::VEEWIPE,
+TransitionType::ZIGZAGWIPE,
+TransitionType::BARNZIGZAGWIPE,
+TransitionType::FANWIPE,
+TransitionType::SINGLESWEEPWIPE,
+TransitionType::WATERFALLWIPE,
+TransitionType::SPIRALWIPE,
+TransitionType::MISCDIAGONALWIPE,
+TransitionType::BOXSNAKESWIPE
+};
+
+const std::set LOKSupportedTransitionSubTypes = {
+TransitionSubType::DEFAULT,
+TransitionSubType::LEFTTORIGHT,
+TransitionSubType::TOPTOBOTTOM,
+TransitionSubType::CORNERSIN,
+TransitionSubType::CORNERSOUT,
+TransitionSubType::VERTICAL,
+TransitionSubType::HORIZONTAL,
+TransitionSubType::DOWN,
+TransitionSubType::CIRCLE,
+TransitionSubType::CLOCKWISETWELVE,
+TransitionSubType::CLOCKWISETHREE,
+TransitionSubType::CLOCKWISESIX,
+TransitionSubType::CLOCKWISENINE,
+TransitionSubType::TWOBLADEVERTICAL,
+TransitionSubType::TWOBLADEHORIZONTAL,
+TransitionSubType::FOURBLADE,
+TransitionSubType::FROMLEFT,
+TransitionSubType::FROMTOP,
+TransitionSubType::FROMRIGHT,
+TransitionSubType::FROMBOTTOM,
+TransitionSubType::CROSSFADE,
+TransitionSubType::FADETOCOLOR,
+TransitionSubType::FADEFROMCOLOR,
+TransitionSubType::FADEOVERCOLOR,
+TransitionSubType::THREEBLADE,
+TransitionSubType::EIGHTBLADE,
+TransitionSubType::ONEBLADE,
+TransitionSubType::ACROSS,
+TransitionSubType::TOPLEFTVERTICAL,
+TransitionSubType::TOPLEFTHORIZONTAL,
+TransitionSubType::TOPLEFTDIAGONAL,
+TransitionSubType::TOPRIGHTDIAGONAL,
+TransitionSubType::BOTTOMRIGHTDIAGONAL,
+TransitionSubType::BOTTOMLEFTDIAGONAL,
+TransitionSubType::RECTANGLE,
+TransitionSubType::DIAMOND,
+TransitionSubType::TOPLEFT,
+TransitionSubType::TOPRIGHT,
+TransitionSubType::BOTTOMRIGHT,
+TransitionSubType::BOTTOMLEFT,
+TransitionSubType::TOPCENTER,
+TransitionSubType::RIGHTCENTER,
+TransitionSubType::BOTTOMCENTER,
+TransitionSubType::LEFTCENTER,
+TransitionSubType::LEFT,
+TransitionSubType::UP,
+TransitionSubType::RIGHT,
+TransitionSubType::DIAGONALBOTTOMLEFT,
+TransitionSubType::DIAGONALTOPLEFT,
+TransitionSubType::CENTERTOP,
+TransitionSubType::CENTERRIGHT,
+TransitionSubType::TOP,
+TransitionSubType::BOTTOM,
+TransitionSubType::CLOCKWISETOP,
+TransitionSubType::CLOCKWISERIGHT,
+TransitionSubType::CLOCKWISEBOTTOM,
+TransitionSubType::CLOCKWISELEFT,
+TransitionSubType::CLOCKWISETOPLEFT,
+TransitionSubType::COUNTERCLOCKWISEBOTTOMLEFT,
+
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sw/source
sw/source/uibase/docvw/edtwin.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e2824abd73d97b3f043ef84f06244740762da753
Author: Mike Kaganski
AuthorDate: Mon Oct 14 17:42:27 2019 +0200
Commit: Mike Kaganski
CommitDate: Mon Oct 14 22:32:01 2019 +0200
tdf#128139: add missing nullptr check
Regression after ef2ec07b4113fdadf863352c832af657b5ae205c
Change-Id: I5eed95e8136a812813145283e6b533a808324380
Reviewed-on: https://gerrit.libreoffice.org/80782
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit 8a69d0212fa7e3f7f8f2ccf29f9393b9414282a2)
Reviewed-on: https://gerrit.libreoffice.org/80796
Tested-by: Jenkins CollaboraOffice
diff --git a/sw/source/uibase/docvw/edtwin.cxx
b/sw/source/uibase/docvw/edtwin.cxx
index 9af4c7a15541..de6743698049 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -2697,7 +2697,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
if (bNormalChar)
{
const bool bAutoTextShown
-= pACfg->IsAutoTextTip() &&
ShowAutoText(rSh.GetChunkForAutoText());
+= pACfg && pACfg->IsAutoTextTip() &&
ShowAutoText(rSh.GetChunkForAutoText());
if (!bAutoTextShown && pACorr &&
pACorr->GetSwFlags().bAutoCompleteWords)
ShowAutoCorrectQuickHelp(rSh.GetPrevAutoCorrWord(*pACorr),
*pACorr);
}
___
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.2' - sw/source
sw/source/uibase/docvw/edtwin.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0836ea3ea6d56cf91e4da8d65b2bf6fd4466febd
Author: Mike Kaganski
AuthorDate: Mon Oct 14 17:42:27 2019 +0200
Commit: Mike Kaganski
CommitDate: Mon Oct 14 22:32:08 2019 +0200
tdf#128139: add missing nullptr check
Regression after ef2ec07b4113fdadf863352c832af657b5ae205c
Change-Id: I5eed95e8136a812813145283e6b533a808324380
Reviewed-on: https://gerrit.libreoffice.org/80782
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit 8a69d0212fa7e3f7f8f2ccf29f9393b9414282a2)
Reviewed-on: https://gerrit.libreoffice.org/80795
Tested-by: Jenkins CollaboraOffice
diff --git a/sw/source/uibase/docvw/edtwin.cxx
b/sw/source/uibase/docvw/edtwin.cxx
index ddf7c6a4902d..d48a5a4199c0 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -2660,7 +2660,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
if (bNormalChar)
{
const bool bAutoTextShown
-= pACfg->IsAutoTextTip() &&
ShowAutoText(rSh.GetChunkForAutoText());
+= pACfg && pACfg->IsAutoTextTip() &&
ShowAutoText(rSh.GetChunkForAutoText());
if (!bAutoTextShown && pACorr &&
pACorr->GetSwFlags().bAutoCompleteWords)
ShowAutoCorrectQuickHelp(rSh.GetPrevAutoCorrWord(*pACorr),
*pACorr);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/Library_jdbc.mk extensions/Library_pcr.mk filter/Library_gie.mk i18npool/Library_localedata_euro.mk i18npool/Library_localedata_others.mk solenv/gbuild tes
connectivity/Library_jdbc.mk |2 ++ extensions/Library_pcr.mk|2 ++ filter/Library_gie.mk|2 ++ i18npool/Library_localedata_euro.mk |2 ++ i18npool/Library_localedata_others.mk|2 ++ solenv/gbuild/PrecompiledHeaders.mk |6 ++ test/Library_subsequenttest.mk |2 ++ vcl/Library_vclplug_gen.mk |2 ++ vcl/Library_vclplug_win.mk |2 ++ winaccessibility/Library_winaccessibility.mk |2 ++ writerperfect/Library_wpftdraw.mk|2 ++ writerperfect/Library_wpftwriter.mk |2 ++ 12 files changed, 28 insertions(+) New commits: commit f221eea9edc0e954ea6b05e26408c83c7f91013b Author: Luboš Luňák AuthorDate: Mon Oct 14 18:33:20 2019 +0200 Commit: Luboš Luňák CommitDate: Mon Oct 14 22:27:00 2019 +0200 use common PCH for more libraries Change-Id: I53164be413426691025a63cfba731cf5f9d1b7f8 Reviewed-on: https://gerrit.libreoffice.org/80790 Tested-by: Jenkins Reviewed-by: Luboš Luňák diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk index 2fb57a29cca9..fea943cd77c3 100644 --- a/connectivity/Library_jdbc.mk +++ b/connectivity/Library_jdbc.mk @@ -23,6 +23,8 @@ $(eval $(call gb_Library_set_include,jdbc,\ -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ )) +$(eval $(call gb_Library_use_common_precompiled_header,jdbc)) + $(eval $(call gb_Library_use_libraries,jdbc,\ cppu \ cppuhelper \ diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk index 58d9319c18e7..dfb6b1b38e02 100644 --- a/extensions/Library_pcr.mk +++ b/extensions/Library_pcr.mk @@ -20,6 +20,8 @@ $(eval $(call gb_Library_set_include,pcr,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_common_precompiled_header,pcr)) + $(eval $(call gb_Library_use_external,pcr,boost_headers)) $(eval $(call gb_Library_use_libraries,pcr,\ diff --git a/filter/Library_gie.mk b/filter/Library_gie.mk index 679114e67f68..2dcab32717b6 100644 --- a/filter/Library_gie.mk +++ b/filter/Library_gie.mk @@ -32,6 +32,8 @@ $(eval $(call gb_Library_use_custom_headers,gie,\ officecfg/registry \ )) +$(eval $(call gb_Library_use_common_precompiled_header,gie)) + $(eval $(call gb_Library_use_libraries,gie,\ basegfx \ comphelper \ diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk index ad4991920a88..9fff80622074 100644 --- a/i18npool/Library_localedata_euro.mk +++ b/i18npool/Library_localedata_euro.mk @@ -13,6 +13,8 @@ $(eval $(call gb_Library_use_libraries,localedata_euro,\ localedata_en \ )) +$(eval $(call gb_Library_use_common_precompiled_header,localedata_euro)) + $(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\ CustomTarget/i18npool/localedata/localedata_an_ES \ CustomTarget/i18npool/localedata/localedata_ast_ES \ diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk index 6b395b231a5f..ef546297653f 100644 --- a/i18npool/Library_localedata_others.mk +++ b/i18npool/Library_localedata_others.mk @@ -13,6 +13,8 @@ $(eval $(call gb_Library_use_libraries,localedata_others,\ localedata_en \ )) +$(eval $(call gb_Library_use_common_precompiled_header,localedata_others)) + $(eval $(call gb_Library_add_generated_exception_objects,localedata_others,\ CustomTarget/i18npool/localedata/localedata_af_NA \ CustomTarget/i18npool/localedata/localedata_af_ZA \ diff --git a/solenv/gbuild/PrecompiledHeaders.mk b/solenv/gbuild/PrecompiledHeaders.mk index 0da579ef95e5..1da101b31a4b 100644 --- a/solenv/gbuild/PrecompiledHeaders.mk +++ b/solenv/gbuild/PrecompiledHeaders.mk @@ -129,11 +129,17 @@ gb_PrecompiledHeader_ignore_flags_system := \ -DFASTSAX_DLLIMPLEMENTATION \ -DSAX_DLLIMPLEMENTATION \ -DSCQAHELPER_DLLIMPLEMENTATION \ +-DVCLPLUG_WIN_IMPLEMENTATION \ +-DVCLPLUG_GEN_IMPLEMENTATION \ -DSYSTEM_EXPAT \ -DSYSTEM_LIBXML \ -DSYSTEM_ZLIB \ +-DHAVE_VALGRIND_HEADERS \ +-DUSE_RANDR \ +-DUSE_XINERAMA_XORG \ -DDISABLE_CVE_TESTS \ -DCPPUNIT_PLUGIN_EXPORT='extern "C" SAL_DLLPUBLIC_EXPORT' \ +-DOOO_DLLIMPLEMENTATION_TEST \ -include $(SRCDIR)/pch/inc/clangfix.hxx \ # Probably also update pch/inc/clangfix.hxx if you extend the list. diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk index aaa357ef63b8..0715cc47af63 100644 --- a/test/Library_subsequenttest.mk +++ b/test/Library_subsequenttest.mk @@ -17,6 +17,8 @@ $(eval $(call gb_Library_add_defs,subsequenttest,\ -DOOO_DLLIMPLEMENTATION_TEST \ )) +$(eval $(call gb_Library_use_common_precompiled_header,subsequenttest)) + $(eval $(call gb_Library_use_sdk_api,subsequenttest)) $(eval $(call gb_Library_use_libraries,subsequenttest,\ diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 01189a158d34..e19323a20388 100644 --- a/vc
[Libreoffice-commits] core.git: 2 commits - solenv/gbuild sw/CppunitTest_sw_rtfexport2.mk sw/CppunitTest_sw_rtfexport3.mk sw/CppunitTest_sw_rtfexport4.mk sw/CppunitTest_sw_rtfexport5.mk sw/CppunitTest
solenv/gbuild/LinkTarget.mk |4 ++-- sw/CppunitTest_sw_rtfexport.mk |6 -- sw/CppunitTest_sw_rtfexport2.mk |6 -- sw/CppunitTest_sw_rtfexport3.mk |6 -- sw/CppunitTest_sw_rtfexport4.mk |6 -- sw/CppunitTest_sw_rtfexport5.mk |6 -- sw/CppunitTest_sw_rtfimport.mk |6 -- 7 files changed, 2 insertions(+), 38 deletions(-) New commits: commit c2e0cbee47e807cab77e8011af9800b67cfc0379 Author: Luboš Luňák AuthorDate: Mon Oct 14 18:56:28 2019 +0200 Commit: Luboš Luňák CommitDate: Mon Oct 14 22:26:49 2019 +0200 fix incorrect gb_DISABLE_PCH_REUSE test Change-Id: Ife41ea7ad19c03b8dca6afe8b15d0f3b752b533b Reviewed-on: https://gerrit.libreoffice.org/80789 Tested-by: Jenkins Reviewed-by: Luboš Luňák diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index e7bf4c5b05cb..695becffd076 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -1598,7 +1598,7 @@ endef # call gb_LinkTarget_reuse_precompiled_header,linktarget,pchcxxfile,,linktargetmakefilename define gb_LinkTarget_reuse_precompiled_header ifneq ($(gb_ENABLE_PCH),) -ifneq ($(gb_DISABLE_PCH_REUSE),) +ifeq ($(gb_DISABLE_PCH_REUSE),$(false)) $(call gb_LinkTarget__reuse_precompiled_header_impl,$(1),$(2),$(notdir $(2)),$(4)) $(call gb_LinkTarget__reuse_precompiled_header_workarounds,$(1),$(2),$(notdir $(2)),$(4)) endif @@ -1606,7 +1606,7 @@ endif endef -# call gb_LinkTarget_use_common_precompiled_header,linktarget,,, +# call gb_LinkTarget_use_common_precompiled_header,linktarget,,,linktargetmakefilename define gb_LinkTarget_use_common_precompiled_header ifneq ($(gb_ENABLE_PCH),) $(call gb_LinkTarget_reuse_precompiled_header,$(1),pch/inc/pch/precompiled_system,,$(4)) commit 7788e87ce25183c1d6f92a3b972b8dd8c88e58e3 Author: Luboš Luňák AuthorDate: Mon Oct 14 20:46:22 2019 +0200 Commit: Luboš Luňák CommitDate: Mon Oct 14 22:26:37 2019 +0200 remove -bigobj usage from sw rtf unittests They all have been split since the time the flag was added, and they seem to be small enough again. And this prevents a PCH CXXFLAGS mismatch when using the common PCH. Change-Id: If51d3969e11bb3d49fe877671c1313721588 Reviewed-on: https://gerrit.libreoffice.org/80793 Tested-by: Jenkins Reviewed-by: Luboš Luňák diff --git a/sw/CppunitTest_sw_rtfexport.mk b/sw/CppunitTest_sw_rtfexport.mk index 1f60aff43dda..bef73f544f54 100644 --- a/sw/CppunitTest_sw_rtfexport.mk +++ b/sw/CppunitTest_sw_rtfexport.mk @@ -42,12 +42,6 @@ $(eval $(call gb_CppunitTest_set_include,sw_rtfexport,\ $$(INCLUDE) \ )) -ifeq ($(OS),WNT) -$(eval $(call gb_CppunitTest_add_cxxflags,sw_rtfexport,\ - -bigobj \ -)) -endif - $(eval $(call gb_CppunitTest_use_api,sw_rtfexport,\ udkapi \ offapi \ diff --git a/sw/CppunitTest_sw_rtfexport2.mk b/sw/CppunitTest_sw_rtfexport2.mk index a751e90005e1..dae927ea4cbe 100644 --- a/sw/CppunitTest_sw_rtfexport2.mk +++ b/sw/CppunitTest_sw_rtfexport2.mk @@ -44,12 +44,6 @@ $(eval $(call gb_CppunitTest_set_include,sw_rtfexport2,\ $$(INCLUDE) \ )) -ifeq ($(OS),WNT) -$(eval $(call gb_CppunitTest_add_cxxflags,sw_rtfexport2,\ --bigobj \ -)) -endif - $(eval $(call gb_CppunitTest_use_api,sw_rtfexport2,\ udkapi \ offapi \ diff --git a/sw/CppunitTest_sw_rtfexport3.mk b/sw/CppunitTest_sw_rtfexport3.mk index da31b2fc4ae8..1ecef65c0290 100644 --- a/sw/CppunitTest_sw_rtfexport3.mk +++ b/sw/CppunitTest_sw_rtfexport3.mk @@ -42,12 +42,6 @@ $(eval $(call gb_CppunitTest_set_include,sw_rtfexport3,\ $$(INCLUDE) \ )) -ifeq ($(OS),WNT) -$(eval $(call gb_CppunitTest_add_cxxflags,sw_rtfexport3,\ --bigobj \ -)) -endif - $(eval $(call gb_CppunitTest_use_api,sw_rtfexport3,\ udkapi \ offapi \ diff --git a/sw/CppunitTest_sw_rtfexport4.mk b/sw/CppunitTest_sw_rtfexport4.mk index dcef59633a93..64be61d2ca2f 100644 --- a/sw/CppunitTest_sw_rtfexport4.mk +++ b/sw/CppunitTest_sw_rtfexport4.mk @@ -42,12 +42,6 @@ $(eval $(call gb_CppunitTest_set_include,sw_rtfexport4,\ $$(INCLUDE) \ )) -ifeq ($(OS),WNT) -$(eval $(call gb_CppunitTest_add_cxxflags,sw_rtfexport4,\ - -bigobj \ -)) -endif - $(eval $(call gb_CppunitTest_use_api,sw_rtfexport4,\ udkapi \ offapi \ diff --git a/sw/CppunitTest_sw_rtfexport5.mk b/sw/CppunitTest_sw_rtfexport5.mk index 36d8537f06b9..82fecf0918f8 100644 --- a/sw/CppunitTest_sw_rtfexport5.mk +++ b/sw/CppunitTest_sw_rtfexport5.mk @@ -44,12 +44,6 @@ $(eval $(call gb_CppunitTest_set_include,sw_rtfexport5,\ $$(INCLUDE) \ )) -ifeq ($(OS),WNT) -$(eval $(call gb_CppunitTest_add_cxxflags,sw_rtfexport5,\ --bigobj \ -)) -endif - $(eval $(call gb_CppunitTest_use_api,sw_rtfexport5,\ udkapi \ offapi \ diff --git a/sw/CppunitTest_sw_rtfimport.mk b/sw/CppunitTest_sw_rtfimport.mk index f17103604d27..50c748ca59e0 100644 --- a/sw/CppunitTest_sw_rtfimport.mk +++ b/sw/CppunitTest_sw_
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/platform/com_MSC_defs.mk |1
solenv/gbuild/platform/filter-sourceName.awk | 32 +++
2 files changed, 33 insertions(+)
New commits:
commit e4af0d08dbb05cb51c3df198b1768adbb0c31deb
Author: Luboš Luňák
AuthorDate: Sun Oct 13 12:39:44 2019 +0200
Commit: Luboš Luňák
CommitDate: Mon Oct 14 21:34:24 2019 +0200
filter out cl.exe printing source file name also when not using deps
This is what filter-showIncludes.awk does as a side-effect, so
this is for the --disable-dependency-tracking case.
Change-Id: I0fd58ff4e343c6322e9cba641acd5fa2bf3816f4
Reviewed-on: https://gerrit.libreoffice.org/80731
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk
b/solenv/gbuild/platform/com_MSC_defs.mk
index b604d10d3760..9c0425c7efec 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -275,6 +275,7 @@ endef
else
gb_COMPILERDEPFLAGS :=
define gb_create_deps
+| LC_ALL=C $(GBUILDDIR)/platform/filter-sourceName.awk; exit $${PIPESTATUS[0]}
endef
endif
diff --git a/solenv/gbuild/platform/filter-sourceName.awk
b/solenv/gbuild/platform/filter-sourceName.awk
new file mode 100755
index ..d55e2707d51b
--- /dev/null
+++ b/solenv/gbuild/platform/filter-sourceName.awk
@@ -0,0 +1,32 @@
+#!/usr/bin/gawk -f
+# -*- tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# 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/.
+#
+
+# Filter out the "sourcefile.cxx" message printed by cl.exe,
+# as there is no way to disable it. This file is used
+# in place of filter-showIncludes.awk (which does the same)
+# when --disable-dependency-tracking is used.
+
+BEGIN {
+firstline = 1
+}
+
+{
+if (firstline) {
+# ignore
+} else {
+# because MSVC stupidly prints errors on stdout, it's
+# necessary to forward everything that isn't matched by the pattern
+# so users get to see them.
+print $0 > "/dev/stderr"
+}
+firstline = 0
+}
+
+# vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: CustomTarget_html.mk help3xsl/default.css help3xsl/help.js help3xsl/xap_templ_query.xsl
CustomTarget_html.mk |2
help3xsl/default.css |3
help3xsl/help.js |6 +
help3xsl/xap_templ_query.xsl | 138 ---
4 files changed, 138 insertions(+), 11 deletions(-)
New commits:
commit 242a6bbefc4c8561fb4355329a0a043803e515d9
Author: Olivier Hallot
AuthorDate: Mon Oct 14 09:43:27 2019 -0300
Commit: Olivier Hallot
CommitDate: Mon Oct 14 21:13:15 2019 +0200
More work on Xapian result page
Added module dropdown fix
TODO: Language
Change-Id: I47012d6280694d87fb5d19e25c6052b8a7ed89c7
Reviewed-on: https://gerrit.libreoffice.org/80771
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/CustomTarget_html.mk b/CustomTarget_html.mk
index e43c17a48..67ee6db88 100644
--- a/CustomTarget_html.mk
+++ b/CustomTarget_html.mk
@@ -65,6 +65,8 @@ $(call
gb_CustomTarget_get_workdir,helpcontent2/help3xsl)/%/xap_tpl : \
$(call gb_Helper_abbreviate_dirs,\
$(call gb_ExternalExecutable_get_command,xsltproc) \
--stringparam lang $* \
+ --stringparam productname "$(PRODUCTNAME)" \
+ --stringparam productversion "$(PRODUCTVERSION)" \
-o $@ \
$(SRCDIR)/helpcontent2/help3xsl/xap_templ_query.xsl \
$(SRCDIR)/helpcontent2/source/text/shared/help/browserhelp.xhp \
diff --git a/help3xsl/default.css b/help3xsl/default.css
index 1710f1e52..33888ccd2 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -347,7 +347,7 @@ h6 {
grid-area: header;
position: sticky;
top: 0px;
-z-index: 1000;
+z-index: 100;
}
header {
color: #fff;
@@ -621,6 +621,7 @@ li.disabled a {
.modules {
border-bottom: 2px solid #f3f3f3;
background-color: #26;
+z-index: 100;
}
#modules:after, #langs:after {
font-size: 30px;
diff --git a/help3xsl/help.js b/help3xsl/help.js
index 1e92f6ef9..75541e674 100644
--- a/help3xsl/help.js
+++ b/help3xsl/help.js
@@ -17,7 +17,11 @@ var currentModule = null;
if(url.indexOf('explorer/database/') !== -1) {
currentModule = 'BASE';
} else {
-currentModule = regexArray[1].toUpperCase().substring(1);
+if (null === regexArray){// comes from search or elsewhere, no defined
module in URL
+currentModule = 'HARED'
+}else{
+currentModule = regexArray[1].toUpperCase().substring(1);
+}
}
var results = null;
var fullLinkified = '';
diff --git a/help3xsl/xap_templ_query.xsl b/help3xsl/xap_templ_query.xsl
index aa15b3f3b..d0eba866a 100644
--- a/help3xsl/xap_templ_query.xsl
+++ b/help3xsl/xap_templ_query.xsl
@@ -15,9 +15,30 @@ xsltproc xap_template_query.xsl
-->
http://www.w3.org/1999/XSL/Transform";>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+$log{query.log}
+
+]]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e2e80480c8c1f5712e89d1b369393f9126af0367 Author: Olivier Hallot AuthorDate: Mon Oct 14 09:43:27 2019 -0300 Commit: Gerrit Code Review CommitDate: Mon Oct 14 21:13:15 2019 +0200 Update git submodules * Update helpcontent2 from branch 'master' - More work on Xapian result page Added module dropdown fix TODO: Language Change-Id: I47012d6280694d87fb5d19e25c6052b8a7ed89c7 Reviewed-on: https://gerrit.libreoffice.org/80771 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 404ff19a22ea..242a6bbefc4c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 404ff19a22ea45cc7b84e5a6874beca8949ca165 +Subproject commit 242a6bbefc4c8561fb4355329a0a043803e515d9 ___ 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/docvw/edtwin.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8a69d0212fa7e3f7f8f2ccf29f9393b9414282a2
Author: Mike Kaganski
AuthorDate: Mon Oct 14 17:42:27 2019 +0200
Commit: Mike Kaganski
CommitDate: Mon Oct 14 20:52:14 2019 +0200
tdf#128139: add missing nullptr check
Regression after ef2ec07b4113fdadf863352c832af657b5ae205c
Change-Id: I5eed95e8136a812813145283e6b533a808324380
Reviewed-on: https://gerrit.libreoffice.org/80782
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sw/source/uibase/docvw/edtwin.cxx
b/sw/source/uibase/docvw/edtwin.cxx
index 3d2c12c0a0e1..fa1e8681fe10 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -2668,7 +2668,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
if (bNormalChar)
{
const bool bAutoTextShown
-= pACfg->IsAutoTextTip() &&
ShowAutoText(rSh.GetChunkForAutoText());
+= pACfg && pACfg->IsAutoTextTip() &&
ShowAutoText(rSh.GetChunkForAutoText());
if (!bAutoTextShown && pACorr &&
pACorr->GetSwFlags().bAutoCompleteWords)
ShowAutoCorrectQuickHelp(rSh.GetPrevAutoCorrWord(*pACorr),
*pACorr);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source include/vcl
chart2/source/controller/dialogs/dlg_CreationWizard.cxx | 10 ++
include/vcl/wizardmachine.hxx |4 ++--
2 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 5c921a617da29dc6f78dd34263963efeeac0
Author: Caolán McNamara
AuthorDate: Mon Oct 14 14:59:06 2019 +0100
Commit: Caolán McNamara
CommitDate: Mon Oct 14 20:30:00 2019 +0200
Resolves: tdf#128134 page creation order affecting travel
the page is created before the page is moved to, so CanTravel gets
locked. Only lock when the page is the current page
Change-Id: Ic21fe3077a750e1279db8be0dd5c7f9112c999b1
Reviewed-on: https://gerrit.libreoffice.org/80779
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index ef67bf7fe568..89f60fa929d2 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -156,14 +156,16 @@ void CreationWizard::enterState(WizardState nState)
vcl::RoadmapWizardMachine::enterState(nState);
}
-void CreationWizard::setInvalidPage( BuilderPage * /* pTabPage */ )
+void CreationWizard::setInvalidPage(BuilderPage* pTabPage)
{
-m_bCanTravel = false;
+if (pTabPage == m_pCurTabPage)
+m_bCanTravel = false;
}
-void CreationWizard::setValidPage( BuilderPage * /* pTabPage */ )
+void CreationWizard::setValidPage(BuilderPage* pTabPage)
{
-m_bCanTravel = true;
+if (pTabPage == m_pCurTabPage)
+m_bCanTravel = true;
}
OUString CreationWizard::getStateDisplayName( WizardState nState ) const
diff --git a/include/vcl/wizardmachine.hxx b/include/vcl/wizardmachine.hxx
index cbe4b40b4202..365f875f8783 100644
--- a/include/vcl/wizardmachine.hxx
+++ b/include/vcl/wizardmachine.hxx
@@ -119,9 +119,9 @@ namespace vcl
*/
class VCL_DLLPUBLIC WizardMachine : public weld::AssistantController
{
-private:
+protected:
BuilderPage* m_pCurTabPage;
-
+private:
WizardTypes::WizardState m_nCurState;
WizPageData* m_pFirstPage;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/html loleaflet/src
loleaflet/html/loleaflet.html.m4 |2 +-
loleaflet/src/control/Control.Menubar.js |2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit a4fb071ecfc687c639ef5ef3cc61ab549ba42ac6
Author: Tamás Zolnai
AuthorDate: Mon Oct 14 15:35:34 2019 +0200
Commit: Tamás Zolnai
CommitDate: Mon Oct 14 20:22:25 2019 +0200
menu-to-mobile-wizard: Show a blue overlay on "active" main menu button
Change-Id: Ief09e5352a404ad8da486198c3f03b4e4cfce92f
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 7cab6343a..ed0efcc85 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -143,7 +143,7 @@ ifelse(MOBILEAPP,[true],
-
+
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index fd4199e2a..bdb66f948 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -654,6 +654,7 @@ L.Control.Menubar = L.Control.extend({
window.mobileMenuWizard
= true;
var menuData =
self._map.menubar.generateFullMenuStructure();
self._map.fire('mobilewizard', menuData);
+
$('#main-menu-btn-icon').css('filter', 'drop-shadow(0px 0px 4px #0b87e7)')
}
} else if (!L.Browser.mobile) {
$menu.show().slideUp(250,
function() { $menu.css('display', ''); });
@@ -661,6 +662,7 @@ L.Control.Menubar = L.Control.extend({
} else {
window.mobileMenuWizard = false;
self._map.fire('closemobilewizard');
+
$('#main-menu-btn-icon').css('filter', '')
}
});
// hide mobile menu beforeunload
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: bundled/include kit/ChildSession.cpp kit/ChildSession.hpp loleaflet/src wsd/ClientSession.cpp
bundled/include/LibreOfficeKit/LibreOfficeKit.h |5
bundled/include/LibreOfficeKit/LibreOfficeKit.hxx | 11 +
kit/ChildSession.cpp | 25 +-
kit/ChildSession.hpp |1
loleaflet/src/control/Control.JSDialogBuilder.js |4 ++-
loleaflet/src/control/Control.LokDialog.js|2 +
wsd/ClientSession.cpp |7 +-
7 files changed, 52 insertions(+), 3 deletions(-)
New commits:
commit 80ecaa60f62aa41584ef1ab8b040806f8d92a0a7
Author: Szymon Kłos
AuthorDate: Mon Oct 14 18:02:28 2019 +0200
Commit: Szymon Kłos
CommitDate: Mon Oct 14 19:18:07 2019 +0200
jsdialogs: send events to the core
Change-Id: I23a5a14b93bda205c9c276a697e58d1dc4147f0c
diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.h
b/bundled/include/LibreOfficeKit/LibreOfficeKit.h
index 6060b015b..2e846c7fa 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.h
@@ -199,6 +199,11 @@ struct _LibreOfficeKitDocumentClass
int nButtons,
int nModifier);
+/// @see lok::Document::sendDialogEvent
+void (*sendDialogEvent) (LibreOfficeKitDocument* pThis,
+unsigned nLOKWindowId,
+const char* pArguments);
+
/// @see lok::Document::postUnoCommand
void (*postUnoCommand) (LibreOfficeKitDocument* pThis,
const char* pCommand,
diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
index a695c4113..26093f387 100644
--- a/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -303,6 +303,17 @@ public:
}
/**
+ * Posts a dialog event for the window with given id
+ *
+ * @param nWindowId id of the window to notify
+ * @param pArguments arguments of the event.
+ */
+void sendDialogEvent(unsigned nWindowId, const char* pArguments = NULL)
+{
+mpDoc->pClass->sendDialogEvent(mpDoc, nWindowId, pArguments);
+}
+
+/**
* Posts an UNO command to the document.
*
* Example argument string:
diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index cd38ec7a7..05c9ba772 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -42,6 +42,7 @@
#include
#include
#include
+#include
using Poco::JSON::Object;
using Poco::JSON::Parser;
@@ -295,7 +296,8 @@ bool ChildSession::_handleInput(const char *buffer, int
length)
tokens[0] == "uploadsigneddocument" ||
tokens[0] == "exportsignanduploaddocument" ||
tokens[0] == "rendershapeselection" ||
- tokens[0] == "removetextcontext");
+ tokens[0] == "removetextcontext" ||
+ tokens[0] == "dialogevent");
if (tokens[0] == "clientzoom")
{
@@ -419,6 +421,10 @@ bool ChildSession::_handleInput(const char *buffer, int
length)
{
return removeTextContext(buffer, length, tokens);
}
+else if (tokens[0] == "dialogevent")
+{
+return dialogEvent(buffer, length, tokens);
+}
else
{
assert(false && "Unknown command token.");
@@ -1375,6 +1381,23 @@ bool ChildSession::mouseEvent(const char* /*buffer*/,
int /*length*/,
return true;
}
+bool ChildSession::dialogEvent(const char* /*buffer*/, int /*length*/, const
std::vector& tokens)
+{
+if (tokens.size() <= 2)
+{
+sendTextFrame("error: cmd=dialogevent kind=syntax");
+return false;
+}
+
+getLOKitDocument()->setView(_viewId);
+
+unsigned nLOKWindowId = std::stoi(tokens[1].c_str());
+getLOKitDocument()->sendDialogEvent(nLOKWindowId,
+Poco::cat(std::string(" "), tokens.begin() + 2, tokens.end()).c_str());
+
+return true;
+}
+
bool ChildSession::unoCommand(const char* /*buffer*/, int /*length*/, const
std::vector& tokens)
{
if (tokens.size() <= 1)
diff --git a/kit/ChildSession.hpp b/kit/ChildSession.hpp
index 88166a0c4..971b4158b 100644
--- a/kit/ChildSession.hpp
+++ b/kit/ChildSession.hpp
@@ -259,6 +259,7 @@ private:
bool dialogKeyEvent(const char* buffer, int length, const
std::vector& tokens);
bool mouseEvent(const char* buffer, int length, const
std::vector& tokens, const LokEventTargetEnum target);
bool gestureEvent(const char* buffer, int length, const
std::vector& tokens);
+bool dialogEvent(const char* buffer, int length, const
std::vector& tokens);
bool unoCommand(const char* buffer, int length, const
std::vector& tokens);
bool selectText(const char* buffer, int length, const
std::vector& tokens);
bool selectGraphic(const char* buffer, int length, const
std::vector& tokens);
diff --git a/loleaflet/src/control/Con
Re: a developer's goodbye
Hello Winfried, it was a pleasure working with you and you will always be part of the Calc team. It is sad that we never managed to meet in person (I think we missed each other by a few minutes at one FOSDEM) so I could not tell your in person how much I have appreciated your dedication to your work on Calc's formula engine. I wish you all the best. Cheers, Markus On Fri, Oct 11, 2019 at 9:02 PM Winfried Donkers < winfried.libreoff...@gmail.com> wrote: > Hi all, > > The past 8 years I have had the honour and pleasure to contribute as > developer to LibreOffice (mainly Calc). > > Alas, because of health reasons I must end my contributions. > > It was great to be part of a large community focussed on making a great > open source project a success. > > Thank you all! > > > Winfried > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/crsr/findattr.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 4e0241697371c40f4348bdfb6585a872d4cbcbf6
Author: Michael Stahl
AuthorDate: Mon Oct 14 14:56:48 2019 +0200
Commit: Michael Stahl
CommitDate: Mon Oct 14 18:38:41 2019 +0200
tdf#128138 sw_redlinehide: fix infinite loop in FindAttrsImpl()
The code looked wrong previously, always assigning the end of the text
node regardless of direction, but it turns out the improvement caused an
infinite loop... let's just swap things after the loop, seems simpler
than adding another if at the assignments.
(regression from 4caef398af256be5f0c2a159129b528ee3702e5c)
Change-Id: I098f5265fa86d6a2511a80a02230899a7a303a88
Reviewed-on: https://gerrit.libreoffice.org/80774
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index 08d5b6d51e8d..7f35f3c37351 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -1190,9 +1190,12 @@ static bool FindAttrsImpl(SwPaM & rSearchPam,
}
}
-// if backward search, switch point and mark
-if( bFound && !bSrchForward )
-rSearchPam.Exchange();
+// in search direction, mark precedes point, because the next iteration
+// starts at point
+if (bFound)
+{
+rSearchPam.Normalize(!bSrchForward);
+}
return bFound;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 08cfb36321f6f090e6f0c29dd7c91005eb651c91 Author: Christian Lohmaier AuthorDate: Mon Oct 14 18:05:04 2019 +0200 Commit: Gerrit Code Review CommitDate: Mon Oct 14 18:31:10 2019 +0200 Update git submodules * Update translations from branch 'master' - update translations for master and force-fix errors using pocheck Change-Id: I69677c891cfbd2e5d91880a7020dbe4165cb8ac4 diff --git a/translations b/translations index bb2591d62928..708eb82135fc 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit bb2591d62928e3f47fe12a81883311f1e5caa39d +Subproject commit 708eb82135fceb43509b37a4276ab2c029005906 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/field.hxx|4 ++
vcl/source/control/field.cxx | 85 +++
2 files changed, 89 insertions(+)
New commits:
commit 5b08e2023db64741dbe54e36b0fed16395adf98e
Author: Szymon Kłos
AuthorDate: Fri Oct 11 21:54:39 2019 +0200
Commit: Szymon Kłos
CommitDate: Mon Oct 14 18:11:24 2019 +0200
jsdialogs: send units for numeric fields
Change-Id: I63b984856926a613e38319d6d769cab64601c504
Reviewed-on: https://gerrit.libreoffice.org/80692
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index 75f8240520bc..a0d6b4e5833c 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -453,6 +453,8 @@ public:
virtual voidLast() override;
virtual boolset_property(const OString &rKey, const OUString
&rValue) override;
virtual voiddispose() override;
+
+virtual boost::property_tree::ptree DumpAsPropertyTree() override;
};
@@ -514,6 +516,8 @@ public:
virtual boolset_property(const OString &rKey, const OUString
&rValue) override;
virtual voiddispose() override;
+
+virtual boost::property_tree::ptree DumpAsPropertyTree() override;
};
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index ffc6956d4cf2..83644c5e5657 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -46,6 +46,74 @@ using namespace ::comphelper;
namespace
{
+std::string FieldUnitToString(FieldUnit unit)
+{
+switch(unit)
+{
+case FieldUnit::NONE:
+return "";
+
+case FieldUnit::MM:
+return "mm";
+
+case FieldUnit::CM:
+return "cm";
+
+case FieldUnit::M:
+return "m";
+
+case FieldUnit::KM:
+return "km";
+
+case FieldUnit::TWIP:
+return "twip";
+
+case FieldUnit::POINT:
+return "point";
+
+case FieldUnit::PICA:
+return "pica";
+
+case FieldUnit::INCH:
+return "inch";
+
+case FieldUnit::FOOT:
+return "foot";
+
+case FieldUnit::MILE:
+return "mile";
+
+case FieldUnit::CHAR:
+return "char";
+
+case FieldUnit::LINE:
+return "line";
+
+case FieldUnit::CUSTOM:
+return "custom";
+
+case FieldUnit::PERCENT:
+return "percent";
+
+case FieldUnit::MM_100TH:
+return "mm100th";
+
+case FieldUnit::PIXEL:
+return "pixel";
+
+case FieldUnit::DEGREE:
+return "degree";
+
+case FieldUnit::SECOND:
+return "second";
+
+case FieldUnit::MILLISECOND:
+return "millisecond";
+}
+
+return "";
+}
+
sal_Int64 ImplPower10( sal_uInt16 n )
{
sal_uInt16 i;
@@ -807,6 +875,14 @@ void NumericField::Last()
SpinField::Last();
}
+boost::property_tree::ptree NumericField::DumpAsPropertyTree()
+{
+boost::property_tree::ptree aTree(SpinField::DumpAsPropertyTree());
+aTree.put("min", GetMin());
+aTree.put("max", GetMax());
+return aTree;
+}
+
namespace
{
Size calcMinimumSize(const Edit &rSpinField, const NumericFormatter
&rFormatter)
@@ -1665,6 +1741,15 @@ void MetricField::CustomConvert()
maCustomConvertLink.Call( *this );
}
+boost::property_tree::ptree MetricField::DumpAsPropertyTree()
+{
+boost::property_tree::ptree aTree(SpinField::DumpAsPropertyTree());
+aTree.put("min", GetMin());
+aTree.put("max", GetMax());
+aTree.put("unit", FieldUnitToString(GetUnit()));
+return aTree;
+}
+
MetricBox::MetricBox(vcl::Window* pParent, WinBits nWinStyle)
: ComboBox(pParent, nWinStyle)
, MetricFormatter(this)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/rtl opencl/source sal/qa
include/rtl/stringconcat.hxx| 55
opencl/source/openclwrapper.cxx |2 -
sal/qa/rtl/strings/test_ostring_concat.cxx |3 +
sal/qa/rtl/strings/test_oustring_concat.cxx |3 +
4 files changed, 62 insertions(+), 1 deletion(-)
New commits:
commit 35e6ada72631379053fbf620e79ddaeafc9659e9
Author: Stephan Bergmann
AuthorDate: Mon Oct 14 15:54:03 2019 +0200
Commit: Stephan Bergmann
CommitDate: Mon Oct 14 17:27:32 2019 +0200
Fix misuse of OStringLiteral
...(which got introduced with 9b5dad13b56bdde7c40970351af3da3a2c3c9350
"loplugin:stringadd look for unnecessary temporaries", and had reportedly
broken CppunitTest_sc_ucalc on tml's Windows build by hitting the
"strlen( str ) == N - 1" assert at include/rtl/string.hxx:1867), by
introducing
rtl::OStringView (and rtl::OUStringView, for consistency).
Change-Id: I766b600274302ded66a6bffc91be189b20ed1ac3
Reviewed-on: https://gerrit.libreoffice.org/80778
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/rtl/stringconcat.hxx b/include/rtl/stringconcat.hxx
index 3fd8b6720851..c075a29d9c80 100644
--- a/include/rtl/stringconcat.hxx
+++ b/include/rtl/stringconcat.hxx
@@ -480,6 +480,61 @@ struct ToStringHelper< OUStringNumber< T > >
static const bool allowOUStringConcat = true;
};
+// Abstractions over null-terminated char and sal_Unicode strings that
sometimes are needed in
+// concatenations of multiple such raw strings, as in
+//
+// char const * s1, s2;
+// OString s = OStringView(s1) + s2;
+//
+// (Providing specializations of ToStringHelper and
+// ToStringHelper would look dubious, as it would give
meaning to expressions
+// like
+//
+// std::string_view(s1) + s2
+//
+// that do not involve any user-defined types.)
+
+class OStringView {
+public:
+explicit OStringView(char const * s): view_(s) {}
+
+std::size_t length() const { return view_.length(); }
+
+char const * data() const { return view_.data(); }
+
+private:
+std::string_view view_;
+};
+
+template<>
+struct ToStringHelper< OStringView >
+{
+static std::size_t length( const OStringView& v ) { return v.length(); }
+static char* addData( char* buffer, const OStringView& v )
SAL_RETURNS_NONNULL { return addDataHelper( buffer, v.data(), v.length() ); }
+static const bool allowOStringConcat = true;
+static const bool allowOUStringConcat = false;
+};
+
+class OUStringView {
+public:
+explicit OUStringView(sal_Unicode const * s): view_(s) {}
+
+std::size_t length() const { return view_.length(); }
+
+sal_Unicode const * data() const { return view_.data(); }
+
+private:
+std::u16string_view view_;
+};
+
+template<>
+struct ToStringHelper< OUStringView >
+{
+static std::size_t length( const OUStringView& v ) { return v.length(); }
+static sal_Unicode* addData( sal_Unicode* buffer, const OUStringView& v )
SAL_RETURNS_NONNULL { return addDataHelper( buffer, v.data(), v.length() ); }
+static const bool allowOStringConcat = false;
+static const bool allowOUStringConcat = true;
+};
} // namespace
diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx
index e1645ebe85ff..a1aa5e90950c 100644
--- a/opencl/source/openclwrapper.cxx
+++ b/opencl/source/openclwrapper.cxx
@@ -185,7 +185,7 @@ OString createFileName(cl_device_id deviceId, const char*
clFileName)
platformVersion, nullptr);
// create hash for deviceName + driver version + platform version
-OString aString = OStringLiteral(deviceName) + driverVersion +
platformVersion;
+OString aString = rtl::OStringView(deviceName) + driverVersion +
platformVersion;
OString aHash = generateMD5(aString.getStr(), aString.getLength());
return getCacheFolder() + fileName + "-" + aHash + ".bin";
diff --git a/sal/qa/rtl/strings/test_ostring_concat.cxx
b/sal/qa/rtl/strings/test_ostring_concat.cxx
index e676aab2d27e..fc310dbb58bd 100644
--- a/sal/qa/rtl/strings/test_ostring_concat.cxx
+++ b/sal/qa/rtl/strings/test_ostring_concat.cxx
@@ -83,6 +83,8 @@ void test::ostring::StringConcat::checkConcat()
CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, char* > )), typeid(
OString( "foo" ) + d4 ));
CPPUNIT_ASSERT_EQUAL( OString( "fooabc" ), OString( OString( "foo" ) + d4
));
CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, char* > )), typeid(
OString( "foo" ) + d4 ));
+CPPUNIT_ASSERT_EQUAL( OString( "fooabc" ), OString( rtl::OStringView(
"foo" ) + d4 ));
+CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< rtl::OStringView, char* >
)), typeid( rtl::OStringView( "foo" ) + d4 ));
CPPUNIT_ASSERT_EQUAL( OString( "num10" ), OString( OString( "num" ) +
OString::number( 10 )));
CPPUNIT_ASSERT_EQUAL(( typeid( OStringConcat< OString, OStringNumber< int
> > )), typeid( OString( "num" ) + OString::number( 10 )));
@@ -157,6 +159,7 @@ void test:
[Libreoffice-commits] core.git: cui/source include/svx solenv/bin svx/source
cui/source/dialogs/SpellDialog.cxx |1
cui/source/options/treeopt.cxx |1
include/svx/langbox.hxx| 29 --
solenv/bin/native-code.py |1
svx/source/dialog/langbox.cxx | 160 -
svx/source/dialog/txencbox.cxx |1
6 files changed, 3 insertions(+), 190 deletions(-)
New commits:
commit 6a9e20e16701014e432aeec7a4a6705a2d6013b9
Author: Caolán McNamara
AuthorDate: Mon Oct 14 11:17:10 2019 +0100
Commit: Caolán McNamara
CommitDate: Mon Oct 14 15:53:55 2019 +0200
SvxLanguageComboBox is unused
Change-Id: I8f5fc0a80e84dc4aa79f7488591fb4904e5f5338
Reviewed-on: https://gerrit.libreoffice.org/80763
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index 2574dd84a25e..366c2662b865 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -40,6 +40,7 @@
#include
#include
#include
+#include
#include
#include
#include
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index b9d79d0d579a..b923e4b0bc2a 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -95,6 +95,7 @@
#include
#include
#include
+#include
#include
#include
#include
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index 9d20e2912a5d..9f93df3ea341 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -25,7 +25,6 @@
#include
#include
#include
-#include
#include
#include
@@ -175,34 +174,6 @@ public:
weld::ComboBox* get_widget() { return m_xControl.get(); }
};
-class SVX_DLLPUBLIC SvxLanguageComboBox : public ComboBox, public
SvxLanguageBoxBase
-{
-public:
-SvxLanguageComboBox( vcl::Window* pParent, WinBits nBits );
-
-enum class EditedAndValid
-{
-No,
-Valid,
-Invalid
-};
-
-private:
-EditedAndValid meEditedAndValid;
-
-SVX_DLLPRIVATE virtual sal_Int32ImplInsertImgEntry( const OUString&
rEntry, sal_Int32 nPos, bool bChecked ) override;
-
-SVX_DLLPRIVATE virtual void ImplClear() override;
-SVX_DLLPRIVATE virtual sal_Int32ImplInsertEntry( const OUString&
rEntry, sal_Int32 nPos ) override;
-SVX_DLLPRIVATE virtual void ImplSetEntryData( sal_Int32 nPos,
void* pData ) override;
-SVX_DLLPRIVATE virtual sal_Int32ImplGetSelectedEntryPos() const
override;
-SVX_DLLPRIVATE virtual void*ImplGetEntryData( sal_Int32 nPos )
const override;
-SVX_DLLPRIVATE virtual void ImplSelectEntryPos( sal_Int32 nPos,
bool bSelect ) override;
-SVX_DLLPRIVATE virtual sal_Int32ImplGetEntryPos( const void* pData )
const override;
-
-DECL_LINK( EditModifyHdl, Edit&, void );
-};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index e854f84fdf74..ab2f87894b80 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -506,7 +506,6 @@ custom_widgets = [
'SvxFillAttrBox',
'SvxFillTypeBox',
'SvxLanguageBox',
-'SvxLanguageComboBox',
'SvxLightCtl3D',
'SvxRelativeField',
'SvxTextEncodingBox',
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index b30d234aed4a..eb099005d2e6 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -40,9 +40,6 @@ using namespace ::com::sun::star::util;
using namespace ::com::sun::star::linguistic2;
using namespace ::com::sun::star::uno;
-
-static_assert((LISTBOX_APPEND == COMBOBOX_APPEND) && (LISTBOX_ENTRY_NOTFOUND
== COMBOBOX_ENTRY_NOTFOUND), "If these ever dispersed we'd need a solution");
-
OUString GetDicInfoStr( const OUString& rName, const LanguageType nLang, bool
bNeg )
{
INetURLObject aURLObj;
@@ -108,21 +105,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void
makeSvxLanguageBox(VclPtr & rR
rRet = pLanguageBox;
}
-extern "C" SAL_DLLPUBLIC_EXPORT void
makeSvxLanguageComboBox(VclPtr & rRet, const VclPtr &
pParent, VclBuilder::stringmap & rMap)
-{
-
static_assert(std::is_same_v,
- decltype(makeSvxLanguageComboBox)>);
-WinBits nBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP;
-bool bDropdown = BuilderUtils::extractDropdown(rMap);
-if (bDropdown)
-nBits |= WB_DROPDOWN;
-else
-nBits |= WB_BORDER;
-VclPtrInstance pLanguageBox(pParent, nBits);
-pLanguageBox->EnableAutoSize(true);
-rRet = pLanguageBox;
-}
-
SvxLanguageBoxBase::SvxLanguageBoxBase()
: m_bWithCheckmark(false)
{
@@ -734,188 +716,46 @@ SvxLanguageBox::SvxLanguageBox( vcl::Window* pParent,
WinBits nBits )
ImplLanguageBoxBaseInit();
}
-SvxLanguageComboBox::SvxLanguageComboBox( vcl::Window* pParent, WinBits nBits )
-: ComboBox( pParent, nBits )
-, SvxLanguageBoxBase()
-, m
[Libreoffice-commits] core.git: compilerplugins/clang desktop/source include/oox include/rtl lingucomponent/source oox/source pyuno/source sal/osl solenv/CompilerTest_compilerplugins_clang.mk vcl/sour
compilerplugins/clang/check.cxx | 16 +
compilerplugins/clang/check.hxx | 10 -
compilerplugins/clang/compat.hxx | 13 +
compilerplugins/clang/getstr.cxx | 172 ++
compilerplugins/clang/test/getstr.cxx | 41
desktop/source/app/crashreport.cxx|4
include/oox/helper/helper.hxx |4
include/rtl/ustring.hxx |2
lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx |2
oox/source/ppt/commonbehaviorcontext.cxx |2
pyuno/source/module/pyuno_module.cxx |2
sal/osl/unx/uunxapi.cxx |8
solenv/CompilerTest_compilerplugins_clang.mk |1
vcl/source/gdi/pdfwriter_impl.cxx |4
14 files changed, 264 insertions(+), 17 deletions(-)
New commits:
commit 77d083f2cbe496274cdab38a3a34497d1b742d86
Author: Stephan Bergmann
AuthorDate: Mon Oct 14 11:42:20 2019 +0200
Commit: Stephan Bergmann
CommitDate: Mon Oct 14 15:48:38 2019 +0200
New loplugin:getstr
...to find matches of
... << s.getStr()
(for the rtl string classes) that can be written as just
... << s
Some notes:
* The OUStringToOString(..., RTL_TEXTENCODING_UTF8) is left explicit in
desktop/source/app/crashreport.cxx (even though that would also be done
internally by the "<< OUString" operator) to clarify that these values are
written out as UTF-8 (and not as what that operator << happens to use,
which
just also happens to be UTF-8).
* OUSTRING_TO_CSTR (include/oox/helper/helper.hxx) is no longer used now.
* Just don't bother to use osl_getThreadTextEncoding() in the SAL_WARN in
lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx.
* The toUtf8() in the SAL_DEBUG in pyuno/source/module/pyuno_module.cxx can
just
go, too.
Change-Id: I4602f0379ef816bff310f1e51b57c56b7e3f0136
Reviewed-on: https://gerrit.libreoffice.org/80762
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/compilerplugins/clang/check.cxx b/compilerplugins/clang/check.cxx
index d53bfabbe9cf..be1b1f764eb1 100644
--- a/compilerplugins/clang/check.cxx
+++ b/compilerplugins/clang/check.cxx
@@ -10,6 +10,7 @@
#include
#include
+#include
#include "check.hxx"
@@ -131,6 +132,21 @@ TypeCheck TypeCheck::Typedef() const {
return TypeCheck();
}
+DeclCheck TypeCheck::TemplateSpecializationClass() const {
+if (!type_.isNull()) {
+if (auto const t = type_->getAs()) {
+if (!t->isTypeAlias()) {
+if (auto const d =
llvm::dyn_cast_or_null(
+t->getTemplateName().getAsTemplateDecl()))
+{
+return DeclCheck(d->getTemplatedDecl());
+}
+}
+}
+}
+return DeclCheck();
+}
+
TypeCheck TypeCheck::NotSubstTemplateTypeParmType() const {
return
(!type_.isNull()
diff --git a/compilerplugins/clang/check.hxx b/compilerplugins/clang/check.hxx
index 7aa56cb8523d..8e835b8b6a96 100644
--- a/compilerplugins/clang/check.hxx
+++ b/compilerplugins/clang/check.hxx
@@ -29,6 +29,8 @@ inline ContextCheck checkRecordDecl(
}
+class DeclCheck;
+
class TypeCheck {
public:
explicit TypeCheck(clang::QualType type): type_(type) {}
@@ -71,6 +73,8 @@ public:
inline ContextCheck Typedef(llvm::StringRef id) const;
+DeclCheck TemplateSpecializationClass() const;
+
TypeCheck NotSubstTemplateTypeParmType() const;
private:
@@ -80,6 +84,8 @@ private:
};
class DeclCheck {
+friend TypeCheck;
+
public:
explicit DeclCheck(clang::Decl const * decl): decl_(decl) {}
@@ -102,7 +108,9 @@ public:
ContextCheck MemberFunction() const;
private:
-clang::Decl const * const decl_;
+DeclCheck() = default;
+
+clang::Decl const * const decl_ = nullptr;
};
class ContextCheck {
diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index cb13f44cfa66..c091c51601f7 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -240,6 +240,19 @@ inline const clang::Expr *getSubExprAsWritten(const
clang::CastExpr *This) {
return getSubExprAsWritten(const_cast(This));
}
+inline clang::QualType getObjectType(clang::CXXMemberCallExpr const * expr) {
+#if CLANG_VERSION >= 10
+return expr->getObjectType();
+#else
+//
+// "[OpenCL] Improve destructor support in C++ for OpenCL":
+clang::QualType Ty = expr->getImplicitObjectArgument()->getType();
+if (Ty->isPointerType())
+Ty = Ty->getPointeeType();
+return Ty;
+#endif
+}
+
inline bool isExplicitSpecified(clang::CXXConstructorD
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtkinst.cxx | 28
1 file changed, 20 insertions(+), 8 deletions(-)
New commits:
commit de2cb96d5f9bb3c831fd136062582b4c11a003d1
Author: Caolán McNamara
AuthorDate: Mon Oct 14 13:03:15 2019 +0100
Commit: Caolán McNamara
CommitDate: Mon Oct 14 15:22:03 2019 +0200
assert fires after help hides find & replace dialog
Change-Id: I72db53711322de9420fdb097ac60dda35f1ec5d8
Reviewed-on: https://gerrit.libreoffice.org/80769
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index b1d3eed73097..b8ceadda4e0c 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -4023,7 +4023,7 @@ public:
virtual bool runAsync(std::shared_ptr
rDialogController, const std::function& func) override
{
-assert(!m_nResponseSignalId && !m_nCancelSignalId);
+assert(!m_nResponseSignalId && !m_nCancelSignalId &&
!m_nSignalDeleteId);
m_xDialogController = rDialogController;
m_aFunc = func;
@@ -4042,7 +4042,7 @@ public:
virtual bool runAsync(std::shared_ptr const & rxSelf, const
std::function& func) override
{
assert( rxSelf.get() == this );
-assert(!m_nResponseSignalId && !m_nCancelSignalId);
+assert(!m_nResponseSignalId && !m_nCancelSignalId &&
!m_nSignalDeleteId);
// In order to store a shared_ptr to ourself, we have to have been
constructed by make_shared,
// which is that rxSelf enforces.
@@ -4223,12 +4223,7 @@ public:
if (m_nCloseSignalId)
g_signal_handler_disconnect(m_pDialog, m_nCloseSignalId);
-if (m_nResponseSignalId)
-g_signal_handler_disconnect(m_pDialog, m_nResponseSignalId);
-if (m_nCancelSignalId)
-g_signal_handler_disconnect(m_pDialog, m_nCancelSignalId);
-if (m_nSignalDeleteId)
-g_signal_handler_disconnect(m_pDialog, m_nSignalDeleteId);
+assert(!m_nResponseSignalId && !m_nCancelSignalId &&
!m_nSignalDeleteId);
}
};
@@ -5954,6 +5949,23 @@ void GtkInstanceDialog::asyncresponse(gint ret)
m_aDialogRun.dec_modal_count();
hide();
m_aFunc(GtkToVcl(ret));
+
+if (m_nResponseSignalId)
+{
+g_signal_handler_disconnect(m_pDialog, m_nResponseSignalId);
+m_nResponseSignalId = 0;
+}
+if (m_nCancelSignalId)
+{
+g_signal_handler_disconnect(m_pDialog, m_nCancelSignalId);
+m_nCancelSignalId = 0;
+}
+if (m_nSignalDeleteId)
+{
+g_signal_handler_disconnect(m_pDialog, m_nSignalDeleteId);
+m_nSignalDeleteId = 0;
+}
+
m_aFunc = nullptr;
// move the self pointer, otherwise it might be de-allocated by time we
try to reset it
std::shared_ptr me = std::move(m_xRunAsyncSelf);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 2 commits - loleaflet/src
loleaflet/src/control/Control.MobileWizard.js | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 2d3cfba22fe6a95c8ce7bc8a6e28b43b3cf0d536
Author: Tamás Zolnai
AuthorDate: Mon Oct 14 15:15:36 2019 +0200
Commit: Tamás Zolnai
CommitDate: Mon Oct 14 15:15:42 2019 +0200
menu-to-mobile-wizard: Fix menu panel height
Change-Id: If3a453ebaa75717cc2fb9f195b56c0bf5c6ade17
diff --git a/loleaflet/src/control/Control.MobileWizard.js
b/loleaflet/src/control/Control.MobileWizard.js
index 3b652aa6f..ac27f778a 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -155,8 +155,11 @@ L.Control.MobileWizard = L.Control.extend({
this._setTitle(this._mainTitle);
if (data.id === 'menubar') {
- var newHeight = $(window).height() -
$('#toolbar-wrapper').height() - 2;
- $('#mobile-wizard').height(newHeight);
+ $('#mobile-wizard').height('100%');
+ if (this.map .getDocType() === 'spreadsheet')
+ $('#mobile-wizard').css('top',
$('#spreadsheet-row-column-frame').css('top'));
+ else
+ $('#mobile-wizard').css('top',
$('#document-container').css('top'));
} else {
$('#mobile-wizard').height('45%');
}
commit 9810a905a2e9f39c235997cafadde7af64ac8d03
Author: Tamás Zolnai
AuthorDate: Mon Oct 14 14:59:57 2019 +0200
Commit: Tamás Zolnai
CommitDate: Mon Oct 14 15:15:42 2019 +0200
Fix title for mobile wizard
Change-Id: I0c22b4a550d8cabdc72a8b7f843bb4b14caefc2b
diff --git a/loleaflet/src/control/Control.MobileWizard.js
b/loleaflet/src/control/Control.MobileWizard.js
index 828dbafeb..3b652aa6f 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -151,10 +151,8 @@ L.Control.MobileWizard = L.Control.extend({
L.control.jsDialogBuilder({mobileWizard: this, map:
this.map}).build(this.content.get(0), [data]);
- if (data.id === 'insert') {
- this._mainTitle = data.text ? data.text : '';
- this._setTitle(this._mainTitle);
- }
+ this._mainTitle = data.text ? data.text : '';
+ this._setTitle(this._mainTitle);
if (data.id === 'menubar') {
var newHeight = $(window).height() -
$('#toolbar-wrapper').height() - 2;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source
extensions/source/scanner/scanwin.cxx |7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 3f1b8f02cac96f92108ad98a2f6b7d34dc4794c6
Author: Mike Kaganski
AuthorDate: Mon Oct 14 10:22:14 2019 +0200
Commit: Mike Kaganski
CommitDate: Mon Oct 14 14:42:18 2019 +0200
Use default initialization instead of memset here
Change-Id: I6f4164e9c7a28e1f9d18fd6fc69dad8c48b53d9a
Reviewed-on: https://gerrit.libreoffice.org/80754
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/extensions/source/scanner/scanwin.cxx
b/extensions/source/scanner/scanwin.cxx
index 48b2c78bd90e..c8a66b73ade8 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -19,8 +19,6 @@
#include
-#include
-
#include
#include
#include
@@ -265,9 +263,8 @@ void Twain::ShimListenerThread::execute()
// We need a WinAPI HANDLE of the process to be able to wait on it
and detect the process
// termination; so use WinAPI to start the process, not
osl_executeProcess.
-STARTUPINFOW si;
-std::memset(&si, 0, sizeof si);
-si.cb = sizeof(STARTUPINFOW);
+STARTUPINFOW si{};
+si.cb = sizeof(si);
PROCESS_INFORMATION pi;
if (!CreateProcessW(nullptr,
const_cast(o3tl::toW(sCmdLine.getStr())), nullptr,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/unx
vcl/unx/gtk3/gtk3gtkinst.cxx |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit bfba5d9e98a4160e53eb07e806c19e30cc8e6947 Author: Caolán McNamara AuthorDate: Sun Oct 13 20:48:14 2019 +0100 Commit: Caolán McNamara CommitDate: Mon Oct 14 14:40:15 2019 +0200 Related: tdf#124729 check error status before continuing Change-Id: Ic39e569121b2646995b8dec50c3941db65fdd500 Reviewed-on: https://gerrit.libreoffice.org/80745 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit fb098c51e731ab92198db9822d4de757469ee804) Reviewed-on: https://gerrit.libreoffice.org/80753 Reviewed-by: Michael Stahl diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 7c423fb4a272..5161c4dd9b89 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -1070,7 +1070,12 @@ private: GdkWindow *pWindow = gtk_widget_get_window(pParent); m_pContext = gdk_window_create_gl_context(pWindow, nullptr); -gdk_gl_context_realize(m_pContext, nullptr); +if (!m_pContext) +return false; + +if (!gdk_gl_context_realize(m_pContext, nullptr)) +return false; + gdk_gl_context_make_current(m_pContext); glGenFramebuffersEXT(1, &m_nFrameBuffer); glGenRenderbuffersEXT(1, &m_nRenderBuffer); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/skia' - vcl/skia
vcl/skia/gdiimpl.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit f307e9cf24489de160b3e599365aff6dd1bab217
Author: Tomaž Vajngerl
AuthorDate: Mon Oct 14 14:26:49 2019 +0200
Commit: Tomaž Vajngerl
CommitDate: Mon Oct 14 14:26:49 2019 +0200
fix warning
Change-Id: I6f0f278bae75bb5e0cd49523b4ce6c4918092412
warning: declaration of ‘graphics’ shadows a member of ‘SkiaFlushIdle’
[-Wshadow]
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index c9936d675d66..246826b5f124 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -35,12 +35,12 @@
// Class that triggers flushing the backing buffer when idle.
class SkiaFlushIdle : public Idle
{
-SkiaSalGraphicsImpl* graphics;
+SkiaSalGraphicsImpl* mpGraphics;
public:
-explicit SkiaFlushIdle(SkiaSalGraphicsImpl* graphics)
+explicit SkiaFlushIdle(SkiaSalGraphicsImpl* pGraphics)
: Idle("skia idle swap")
-, graphics(graphics)
+, mpGraphics(pGraphics)
{
// We don't want to be swapping before we've painted.
SetPriority(TaskPriority::POST_PAINT);
@@ -48,7 +48,7 @@ public:
virtual void Invoke() override
{
-graphics->performFlush();
+mpGraphics->performFlush();
Stop();
SetPriority(TaskPriority::HIGHEST);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: a developer's goodbye
Hi Winfried, It was a pleasure having you here, and thank you a lot for all of your contributions! I hope you get well soon. All the best, Muhammet On 10/11/19 4:02 PM, Winfried Donkers wrote: Hi all, The past 8 years I have had the honour and pleasure to contribute as developer to LibreOffice (mainly Calc). Alas, because of health reasons I must end my contributions. It was great to be part of a large community focussed on making a great open source project a success. Thank you all! Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Configure options for faster Jenkins builds
On Monday 14 of October 2019, Stephan Bergmann wrote: > On 13/10/2019 21:15, Luboš Luňák wrote: > > And --disable-symbols is basically like adding -g0 to CXXFLAGS. Most > > setups build with --enable-dbgutils to build with full debug builds, but > > in fact generating debug symbols mostly seems like a waste for Jenkins > > builds. Is that actually used for something? I know unittests on Linux > > print backtraces on crashes/aborts, but I've just tried adding abort() in > > a random unittest and the backtrace is not very useful, because it > > doesn't use debug symbols anyway. And with just 'make starmath.build' > > adding 'ENABLE_SYMBOLS_FOR=' saves again about 10% of build time here. > > Was the backtrace printed by gdb inspecting the core file, or was it > printed from within the implementation of abort(2) in glibc? It was backtrace(). > For the tests to print gdb-generated backtraces on Linux, core files > must be enabled (`ulimit -c unlimited`) and be stored as files named > core* in cwd (see /proc/sys/kernel/core_pattern). When those conditions > are not met anyway for the relevant Gerrit/Jenkins builds, > --enable-symbols likely doesn't give any benefit. I see. Both Linux Jenkins builds use that and print the backtrace using gdb. Windows and Mac on the other hand do not print any backtrace at all, so those either should get fix if possible and wanted, or there the build could be sped up this way (and they are usually the bottlenecks, right?). -- Luboš Luňák l.lu...@collabora.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/skia' - vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk vcl/Library_vclplug_win.mk vcl/skia vcl/unx vcl/win
vcl/Library_vcl.mk |7 ---
vcl/Library_vclplug_gen.mk | 17 +
vcl/Library_vclplug_win.mk |5 +++--
vcl/skia/SkiaHelper.cxx|9 +
vcl/unx/generic/gdi/salbmp.cxx | 11 +--
vcl/unx/generic/gdi/salgdi.cxx | 13 ++---
vcl/unx/generic/gdi/salvd.cxx | 11 +--
vcl/win/app/salinst.cxx| 13 ++---
vcl/win/gdi/salgdi.cxx | 11 +--
vcl/win/gdi/salgdi2.cxx|8
10 files changed, 80 insertions(+), 25 deletions(-)
New commits:
commit ee5dac3fa00c48eed481ceb701e3d6728bc1a5fa
Author: Luboš Luňák
AuthorDate: Mon Oct 14 12:54:13 2019 +0200
Commit: Luboš Luňák
CommitDate: Mon Oct 14 13:54:31 2019 +0200
build properly with or without Skia enabled
Change-Id: I5106f13682963b81753f79c3203d4ef7387664fe
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index a5486cd56c83..c33c4e90db43 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -106,7 +106,7 @@ $(eval $(call gb_Library_use_externals,vcl,\
icuuc \
lcms2 \
mdds_headers \
-skia \
+$(if $(filter SKIA,$(BUILD_TYPE)),skia) \
))
ifeq ($(DISABLE_GUI),)
@@ -577,8 +577,9 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/opengl/OpenGLContext \
vcl/source/opengl/OpenGLHelper \
vcl/skia/SkiaHelper \
-vcl/skia/salbmp \
-vcl/skia/gdiimpl \
+$(if $(filter SKIA,$(BUILD_TYPE)), \
+vcl/skia/salbmp \
+vcl/skia/gdiimpl) \
))
# runtime dependency
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 0b941bf326ef..9088d3a01a6a 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -58,7 +58,7 @@ $(eval $(call gb_Library_use_externals,vclplug_gen,\
icuuc \
valgrind \
Xrender \
- skia \
+ $(if $(filter SKIA,$(BUILD_TYPE)),skia) \
))
$(eval $(call gb_Library_add_libs,vclplug_gen,\
@@ -92,7 +92,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
vcl/unx/generic/dtrans/X11_transferable \
vcl/unx/generic/gdi/cairo_xlib_cairo \
vcl/unx/generic/gdi/x11cairotextrender \
- vcl/unx/generic/gdi/gdiimpl \
+vcl/unx/generic/gdi/gdiimpl \
vcl/unx/generic/gdi/salbmp \
vcl/unx/generic/gdi/salgdi2 \
vcl/unx/generic/gdi/font \
@@ -103,12 +103,13 @@ $(eval $(call
gb_Library_add_exception_objects,vclplug_gen,\
vcl/unx/generic/window/salobj \
vcl/unx/x11/x11sys \
vcl/unx/x11/xlimits \
- vcl/opengl/x11/cairotextrender \
- vcl/opengl/x11/gdiimpl \
- vcl/opengl/x11/salvd \
- vcl/skia/x11/cairotextrender \
- vcl/skia/x11/gdiimpl \
- vcl/skia/x11/salvd \
+vcl/opengl/x11/cairotextrender \
+vcl/opengl/x11/gdiimpl \
+vcl/opengl/x11/salvd \
+$(if $(filter SKIA,$(BUILD_TYPE)), \
+vcl/skia/x11/cairotextrender \
+vcl/skia/x11/gdiimpl \
+vcl/skia/x11/salvd) \
))
# ultimately we want to split the x11 dependencies out
diff --git a/vcl/Library_vclplug_win.mk b/vcl/Library_vclplug_win.mk
index a2979674d00a..19b7a2d6f87f 100644
--- a/vcl/Library_vclplug_win.mk
+++ b/vcl/Library_vclplug_win.mk
@@ -55,12 +55,11 @@ $(eval $(call gb_Library_use_externals,vclplug_win,\
epoxy \
glm_headers \
harfbuzz \
-skia \
+$(if $(filter SKIA,$(BUILD_TYPE)),skia) \
))
$(eval $(call gb_Library_add_exception_objects,vclplug_win,\
vcl/opengl/win/gdiimpl \
-vcl/skia/win/gdiimpl \
vcl/win/app/saldata \
vcl/win/app/salinfo \
vcl/win/app/salinst \
@@ -81,6 +80,8 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_win,\
vcl/win/window/keynames \
vcl/win/window/salmenu \
vcl/win/window/salobj \
+$(if $(filter SKIA,$(BUILD_TYPE)), \
+vcl/skia/win/gdiimpl) \
))
$(eval $(call gb_Library_use_system_win32_libs,vclplug_win,\
diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx
index 37a34522295e..84291a3d1899 100644
--- a/vcl/skia/SkiaHelper.cxx
+++ b/vcl/skia/SkiaHelper.cxx
@@ -11,6 +11,13 @@
#include
+#include
+
+#if !HAVE_FEATURE_SKIA
+bool SkiaHelper::isVCLSkiaEnabled() { return false; }
+
+#else
+
bool SkiaHelper::isVCLSkiaEnabled()
{
/**
@@ -70,4 +77,6 @@ bool SkiaHelper::isVCLSkiaEnabled()
return bRet;
}
+#endif // HAVE_FEATURE_SKIA
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index 9891447935e7..b34b1a80e0e0 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -42,8 +42,12 @@
#include
#include
#include
-#include
+
+#include
+#if HAVE_FEATURE_SKIA
#include
+#include
+#endif
#if defined HAVE_VALGRIND_HEADERS
#include
@@ -54,9 +58,12 @@
std::shared_ptr X11SalInstance::CreateSalBitmap()
{
+#if HAVE_FEATURE_SKIA
if (SkiaHelper::isVCLSkiaEnabled())
return std::make_shared();
-else if (OpenGL
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.JSDialogBuilder.js | 20 +---
1 file changed, 17 insertions(+), 3 deletions(-)
New commits:
commit 1037b8adb854f0fa7807e610ff2efd7c9f4f851d
Author: Szymon Kłos
AuthorDate: Mon Oct 14 13:27:48 2019 +0200
Commit: Szymon Kłos
CommitDate: Mon Oct 14 13:29:22 2019 +0200
jsdialogs: add unit translations
Change-Id: I260cca656e2a08395549012f83d8607a14b0c612
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 24d3fbeac..aee7a23f5 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -104,6 +104,13 @@ L.Control.JSDialogBuilder = L.Control.extend({
return text.replace('~', '');
},
+ _cleanValueFromUnits: function(text) {
+ if (!text)
+ return '';
+ return text.replace('″', '')
+ .replace('%', '');
+ },
+
_containerHandler: function(parentContainer, data) {
if (data.enabled == 'false')
return false;
@@ -367,12 +374,19 @@ L.Control.JSDialogBuilder = L.Control.extend({
var minus = L.DomUtil.create('div', 'minus', controlsContainer);
minus.innerHTML = '-';
+ if (data.min)
+ $(spinfield).attr('min', data.min);
+
+ if (data.max)
+ $(spinfield).attr('max', data.max);
+
if (data.enabled == 'false')
$(spinfield).attr('disabled', 'disabled');
- if (data.children && data.children.length) {
- $(spinfield).attr('value',
data.children[0].text.replace('%', ''));
- }
+ if (data.text)
+ $(spinfield).attr('value',
builder._cleanValueFromUnits(data.text));
+ else if (data.children && data.children.length)
+ $(spinfield).attr('value',
builder._cleanValueFromUnits(data.children[0].text));
spinfield.addEventListener('change', function() {
builder.callback('spinfield', 'change', spinfield,
this.value, builder);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - oox/source
oox/source/ppt/pptimport.cxx | 28
1 file changed, 20 insertions(+), 8 deletions(-)
New commits:
commit 5dfaf7a608a1827d1b56ac7a7d4651f26e4754d1
Author: Mike Kaganski
AuthorDate: Mon Oct 14 00:12:23 2019 +0300
Commit: Michael Stahl
CommitDate: Mon Oct 14 13:10:23 2019 +0200
tdf#127164: Disable Undo during pptx save
Change-Id: I07fe6895cc2ba43dfa1716e67bdbb4e697e3420c
Reviewed-on: https://gerrit.libreoffice.org/80727
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
(cherry picked from commit 03ec3b7dd11656c8b64a94efb172e17d97ea662e)
Reviewed-on: https://gerrit.libreoffice.org/80756
Tested-by: Xisco Faulí
Reviewed-by: Michael Stahl
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index d65e408d3c13..9476eca2d825 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -232,17 +233,28 @@ sal_Bool SAL_CALL PowerPointImport::filter( const
Sequence< PropertyValue >& rDe
Reference
aFactory(getComponentContext()->getServiceManager(), UNO_QUERY_THROW);
Reference< XExporter >
xExporter(aFactory->createInstanceWithArguments("com.sun.star.comp.Impress.oox.PowerPointExport",
aArguments), UNO_QUERY);
-if (xExporter.is())
+if (Reference xFilter{ xExporter, UNO_QUERY })
{
-Reference< XComponent > xDocument( getModel(), UNO_QUERY );
-Reference< XFilter > xFilter( xExporter, UNO_QUERY );
-
-if (xFilter.is())
+Reference xUndoManager;
+bool bWasUnLocked = true;
+if (Reference xUMS{ getModel(),
UNO_QUERY })
{
-xExporter->setSourceDocument( xDocument );
-if( xFilter->filter( rDescriptor ) )
-return true;
+xUndoManager = xUMS->getUndoManager();
+if (xUndoManager.is())
+{
+bWasUnLocked = !xUndoManager->isLocked();
+xUndoManager->lock();
+}
}
+comphelper::ScopeGuard aGuard([xUndoManager, bWasUnLocked] {
+if (xUndoManager && bWasUnLocked)
+xUndoManager->unlock();
+});
+
+Reference< XComponent > xDocument(getModel(), UNO_QUERY);
+xExporter->setSourceDocument(xDocument);
+if (xFilter->filter(rDescriptor))
+return true;
}
}
___
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/graphicfilter/ieps/ieps.cxx | 26 ++
1 file changed, 18 insertions(+), 8 deletions(-)
New commits:
commit 1c85b047b6cfdbae010f0967e9c9f99f7a101d32
Author: Mike Kaganski
AuthorDate: Mon Oct 14 07:47:17 2019 +0300
Commit: Mike Kaganski
CommitDate: Mon Oct 14 13:06:21 2019 +0200
tdf#94117: try gswin64c if gswin32c failed
Change-Id: I3c29ef72525aa25ee8606122f01b7b611ecb2091
Reviewed-on: https://gerrit.libreoffice.org/80748
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx
b/filter/source/graphicfilter/ieps/ieps.cxx
index 2ce4fd01b022..39c2d1fe784d 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -296,15 +296,21 @@ static void WriteFileInThread(void *wData)
}
static bool RenderAsBMPThroughHelper(const sal_uInt8* pBuf, sal_uInt32
nBytesRead,
-Graphic &rGraphic, const OUString &rProgName, rtl_uString *pArgs[], size_t
nArgs)
+ Graphic& rGraphic,
+ std::initializer_list
aProgNames,
+ rtl_uString* pArgs[], size_t nArgs)
{
-oslProcess aProcess;
+oslProcess aProcess = nullptr;
oslFileHandle pIn = nullptr;
oslFileHandle pOut = nullptr;
oslFileHandle pErr = nullptr;
-oslProcessError eErr = runProcessWithPathSearch(rProgName,
-pArgs, nArgs,
-&aProcess, &pIn, &pOut, &pErr);
+oslProcessError eErr = osl_Process_E_Unknown;
+for (const auto& rProgName : aProgNames)
+{
+eErr = runProcessWithPathSearch(rProgName, pArgs, nArgs, &aProcess,
&pIn, &pOut, &pErr);
+if (eErr == osl_Process_E_None)
+break;
+}
if (eErr!=osl_Process_E_None)
return false;
@@ -362,7 +368,7 @@ static bool RenderAsBMPThroughConvert(const sal_uInt8*
pBuf, sal_uInt32 nBytesRe
arg1.pData, arg2.pData, arg3.pData, arg4.pData
};
return RenderAsBMPThroughHelper(pBuf, nBytesRead, rGraphic,
-("convert" EXESUFFIX),
+{ "convert" EXESUFFIX },
args,
SAL_N_ELEMENTS(args));
}
@@ -389,9 +395,13 @@ static bool RenderAsBMPThroughGS(const sal_uInt8* pBuf,
sal_uInt32 nBytesRead,
};
return RenderAsBMPThroughHelper(pBuf, nBytesRead, rGraphic,
#ifdef _WIN32
-"gswin32c" EXESUFFIX,
+// Try both 32-bit and 64-bit ghostscript executable name
+{
+"gswin32c" EXESUFFIX,
+"gswin64c" EXESUFFIX,
+},
#else
-"gs" EXESUFFIX,
+{ "gs" EXESUFFIX },
#endif
args,
SAL_N_ELEMENTS(args));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/options/treeopt.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 42294bdf528934095d5314fe334324e708e9543c
Author: Caolán McNamara
AuthorDate: Mon Oct 14 10:46:48 2019 +0100
Commit: Caolán McNamara
CommitDate: Mon Oct 14 12:50:47 2019 +0200
Resolves: tdf#128132 language page not opened
Change-Id: I1936840b89963ddc74fa8d7509855fb566e62404
Reviewed-on: https://gerrit.libreoffice.org/80761
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 845e7651ad68..b9d79d0d579a 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -795,7 +795,7 @@ void OfaTreeOptionsDialog::ActivateLastSelection()
std::unique_ptr xTemp = xTreeLB->make_iterator();
bool bTemp = xTreeLB->get_iter_first(*xTemp);
-while (!bTemp)
+while (bTemp)
{
// restore only selection of a leaf
if (xTreeLB->get_iter_depth(*xTemp) &&
xTreeLB->get_id(*xTemp).toInt64())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/cib_contract138c'
New branch 'feature/cib_contract138c' available with the following commits: commit df6f3ef167a7ad6f222ebf846a4428e47222192f Author: Samuel Mehrbrodt Date: Mon Oct 14 12:47:32 2019 +0200 Release 6.2.9.0 Change-Id: I872b041eb951624fb6c5bb12f76d4e0105f2fc82 commit 94f9079e1e01d9c851df2d21a51327a54d9767e8 Author: Samuel Mehrbrodt Date: Mon Oct 14 12:48:00 2019 +0200 .gitreview: Update default branch Change-Id: Ie828eba0e2b6dd4e730fbd74c8cd71abf3e1cb80 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: slideshow/source
slideshow/source/engine/opengl/TransitionerImpl.cxx | 22
1 file changed, 14 insertions(+), 8 deletions(-)
New commits:
commit 8715a067a3547cf91a3ed73fd893a621d5ee1a1c
Author: Caolán McNamara
AuthorDate: Mon Oct 14 10:12:38 2019 +0100
Commit: Caolán McNamara
CommitDate: Mon Oct 14 12:39:42 2019 +0200
Related: tdf#124729 check for GL_EXT_texture_filter_anisotropic support
Change-Id: I7cc7225c02e1c6688df22b237af59425fb64b79c
Reviewed-on: https://gerrit.libreoffice.org/80760
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/slideshow/source/engine/opengl/TransitionerImpl.cxx
b/slideshow/source/engine/opengl/TransitionerImpl.cxx
index 2bec0badb196..3219e32f9abf 100644
--- a/slideshow/source/engine/opengl/TransitionerImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionerImpl.cxx
@@ -836,10 +836,13 @@ void OGLTransitionerImpl::impl_createTexture(
GL_UNSIGNED_BYTE,
&tempBytes[0]);
-//anistropic filtering (to make texturing not suck when looking at
polygons from oblique angles)
-GLfloat largest_supported_anisotropy;
-glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT,
&largest_supported_anisotropy);
-glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT,
largest_supported_anisotropy);
+if (epoxy_has_gl_extension("GL_EXT_texture_filter_anisotropic"))
+{
+//anistropic filtering (to make texturing not suck when looking at
polygons from oblique angles)
+GLfloat largest_supported_anisotropy;
+glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT,
&largest_supported_anisotropy);
+glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT,
largest_supported_anisotropy);
+}
} else {
if( mpTransition && !mbBrokenTexturesATI && !useMipmap) {
glTexImage2D( GL_TEXTURE_2D, 0, pFormat->nInternalFormat,
maSlideSize.Width, maSlideSize.Height, 0, pFormat->eFormat, pFormat->eType,
&data[0] );
@@ -848,10 +851,13 @@ void OGLTransitionerImpl::impl_createTexture(
} else {
buildMipmaps( pFormat->nInternalFormat, maSlideSize.Width,
maSlideSize.Height, pFormat->eFormat, pFormat->eType, &data[0] );
-//anistropic filtering (to make texturing not suck when looking at
polygons from oblique angles)
-GLfloat largest_supported_anisotropy;
-glGetFloatv( GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT,
&largest_supported_anisotropy );
-glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT,
largest_supported_anisotropy );
+if (epoxy_has_gl_extension("GL_EXT_texture_filter_anisotropic"))
+{
+//anistropic filtering (to make texturing not suck when
looking at polygons from oblique angles)
+GLfloat largest_supported_anisotropy;
+glGetFloatv( GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT,
&largest_supported_anisotropy );
+glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT,
largest_supported_anisotropy );
+}
}
}
CHECK_GL_ERROR();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/a11y/gtk3atkcomponent.cxx |4
vcl/unx/gtk3/a11y/gtk3atkimage.cxx |5 ++---
vcl/unx/gtk3/a11y/gtk3atktext.cxx |3 ++-
3 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 86d08e23f1b20b6582dd944b952b47cc737a7c52
Author: Samuel Thibault
AuthorDate: Sun Oct 13 17:45:02 2019 +0200
Commit: Michael Stahl
CommitDate: Mon Oct 14 12:31:35 2019 +0200
gtk3atk: Make sure returned values are initialized
This is the same as 8a086a97299c ("atk: Make sure returned values are
initialized"), but for gtk3atk.
-1 is the now-document value to be used in this case, see
https://gitlab.gnome.org/GNOME/atk/merge_requests/22
Change-Id: I3cf5f78cc1db603445edfeec1bebcb2e1e48e9ed
Reviewed-on: https://gerrit.libreoffice.org/80737
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/vcl/unx/gtk3/a11y/gtk3atkcomponent.cxx
b/vcl/unx/gtk3/a11y/gtk3atkcomponent.cxx
index e904b12ac610..da5a48eca1f2 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkcomponent.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkcomponent.cxx
@@ -170,6 +170,8 @@ component_wrapper_get_position (AtkComponent *component,
return;
}
+*x = *y = -1;
+
try
{
css::uno::Reference
pComponent
@@ -208,6 +210,8 @@ component_wrapper_get_size (AtkComponent *component,
return;
}
+*width = *height = -1;
+
try
{
css::uno::Reference
pComponent
diff --git a/vcl/unx/gtk3/a11y/gtk3atkimage.cxx
b/vcl/unx/gtk3/a11y/gtk3atkimage.cxx
index 8d9cc20ebbc0..acd43f467690 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkimage.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkimage.cxx
@@ -77,7 +77,7 @@ image_get_image_position( AtkImage *image,
gint *y,
AtkCoordType coord_type )
{
-*x = *y = 0;
+*x = *y = -1;
if( ATK_IS_COMPONENT( image ) )
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
@@ -93,8 +93,7 @@ image_get_image_size( AtkImage *image,
gint *width,
gint *height )
{
-*width = 0;
-*height = 0;
+*width = *height = -1;
try {
css::uno::Reference pImage
= getImage( image );
diff --git a/vcl/unx/gtk3/a11y/gtk3atktext.cxx
b/vcl/unx/gtk3/a11y/gtk3atktext.cxx
index 532b55013ddd..1406ceea5544 100644
--- a/vcl/unx/gtk3/a11y/gtk3atktext.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atktext.cxx
@@ -621,12 +621,13 @@ text_wrapper_get_character_extents( AtkText
*text,
gint *height,
AtkCoordType coords )
{
+*x = *y = *width = *height = -1;
+
try {
css::uno::Reference pText
= getText( text );
if( pText.is() )
{
-*x = *y = *width = *height = 0;
awt::Rectangle aRect = pText->getCharacterBounds( offset );
gint origin_x = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sd/qa tools/source
sd/qa/unit/data/ppt/pass/ofz14989-1.ppt |binary
tools/source/zcodec/zcodec.cxx |2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f77820ba5eab155b630b93a587de39c6d35e0052
Author: Caolán McNamara
AuthorDate: Fri Oct 11 11:10:18 2019 +0100
Commit: Michael Stahl
CommitDate: Mon Oct 14 12:22:46 2019 +0200
ofz#14989 Z_NEED_DICT related infinite loop
Change-Id: I31c0d004d717564063c36862f9eef661d18768a9
Reviewed-on: https://gerrit.libreoffice.org/80648
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
Reviewed-on: https://gerrit.libreoffice.org/80715
Reviewed-by: Michael Stahl
diff --git a/sd/qa/unit/data/ppt/pass/ofz14989-1.ppt
b/sd/qa/unit/data/ppt/pass/ofz14989-1.ppt
new file mode 100644
index ..b470ebecdb49
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/ofz14989-1.ppt differ
diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx
index ae1bc812c626..c03345b6934a 100644
--- a/tools/source/zcodec/zcodec.cxx
+++ b/tools/source/zcodec/zcodec.cxx
@@ -159,7 +159,7 @@ long ZCodec::Decompress( SvStream& rIStm, SvStream& rOStm )
}
err = mbStatus ? inflate(PZSTREAM, Z_NO_FLUSH) : Z_ERRNO;
-if ( err < 0 )
+if (err < 0 || err == Z_NEED_DICT)
{
mbStatus = false;
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlimport/data/tdf128076.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 16
sw/source/core/unocore/unofield.cxx |6 +++---
3 files changed, 19 insertions(+), 3 deletions(-)
New commits:
commit 802d034c55876c9a933206176a7882ac1ae7566e
Author: Xisco Fauli
AuthorDate: Fri Oct 11 19:00:05 2019 +0200
Commit: Michael Stahl
CommitDate: Mon Oct 14 12:13:03 2019 +0200
tdf#128076: throw exception only if it's not alive and it's not a
description
According to a comment from https://gerrit.libreoffice.org/#/c/74533/
okay... then i guess there are different kinds of callers:
those who actually want to check if its a descriptor,
and those who want to check that it isn't "live"
so check if it's a description even if it's not alive
Change-Id: I1526fdbcb006506cc67d29cbe3f65138f90843dc
Reviewed-on: https://gerrit.libreoffice.org/80677
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/sw/qa/extras/ooxmlimport/data/tdf128076.docx
b/sw/qa/extras/ooxmlimport/data/tdf128076.docx
new file mode 100644
index ..69490a14554b
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf128076.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index f5c85890e3b2..1f151b363002 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -209,6 +209,22 @@ xray
ThisComponent.DrawPage(1).getByIndex(0).Anchor.PageStyleName
CPPUNIT_ASSERT_EQUAL(OUString("First Page"),
getProperty(xTextContent->getAnchor(), "PageStyleName"));
}
+DECLARE_OOXMLIMPORT_TEST(testTdf128076, "tdf128076.docx")
+{
+uno::Reference xTextFieldsSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xFieldsAccess(xTextFieldsSupplier->getTextFields());
+uno::Reference
xFields(xFieldsAccess->createEnumeration());
+
+if( !xFields->hasMoreElements() ) {
+CPPUNIT_ASSERT(false);
+return;
+}
+
+uno::Reference
xEnumerationAccess(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("User Field adres = Test"),
xEnumerationAccess->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("Test"),
xEnumerationAccess->getPresentation(false).trim());
+}
+
DECLARE_OOXMLIMPORT_TEST(testfdo90720, "testfdo90720.docx")
{
uno::Reference xTextFramesSupplier(mxComponent,
uno::UNO_QUERY);
diff --git a/sw/source/core/unocore/unofield.cxx
b/sw/source/core/unocore/unofield.cxx
index cbf34d1ffb5d..51ea73498e46 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -1182,11 +1182,11 @@ public:
SwFieldType* GetFieldType() const
{
-if(!m_pDoc)
+if(!m_pDoc && !IsDescriptor())
throw uno::RuntimeException();
-
-if (IsDescriptor())
+else if (IsDescriptor())
return m_pFieldType;
+
return m_pFormatField->GetField()->GetTyp();
}
void SetFieldType(SwFieldType& rType)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/fontsubset/sft.cxx | 16
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit b4be66f14abce2e817fd636f53433a8dc6c031fd
Author: Caolán McNamara
AuthorDate: Mon Oct 14 09:24:56 2019 +0100
Commit: Caolán McNamara
CommitDate: Mon Oct 14 12:11:14 2019 +0200
fix names of enums
as per...
https://docs.microsoft.com/en-us/typography/opentype/spec/cmap
encoding id 3 is PRC and 4 is Big5. We are already using
RTL_TEXTENCODING_GB_2312 for 3 and RTL_TEXTENCODING_BIG5 for 4
so this just changes the names of the enum but no logic change
Change-Id: Ie375cdc9c704641af21a3313128f4e97a5166ca5
Reviewed-on: https://gerrit.libreoffice.org/80755
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 2f29ca97cbd3..fd6e6f96df10 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1018,8 +1018,8 @@ enum cmapType {
CMAP_MS_Symbol= 10,
CMAP_MS_Unicode = 11,
CMAP_MS_ShiftJIS = 12,
-CMAP_MS_Big5 = 13,
-CMAP_MS_PRC = 14,
+CMAP_MS_PRC = 13,
+CMAP_MS_Big5 = 14,
CMAP_MS_Wansung = 15,
CMAP_MS_Johab = 16
};
@@ -1219,8 +1219,8 @@ static void FindCmap(TrueTypeFont *ttf)
sal_uInt32 ThreeZero = 0; /* MS Symbol*/
sal_uInt32 ThreeOne = 0; /* MS UCS-2 */
sal_uInt32 ThreeTwo = 0; /* MS ShiftJIS */
-sal_uInt32 ThreeThree = 0; /* MS Big5 */
-sal_uInt32 ThreeFour = 0; /* MS PRC */
+sal_uInt32 ThreeThree = 0; /* MS PRC */
+sal_uInt32 ThreeFour = 0; /* MS Big5 */
sal_uInt32 ThreeFive = 0; /* MS Wansung */
sal_uInt32 ThreeSix = 0; /* MS Johab */
@@ -1284,10 +1284,10 @@ static void FindCmap(TrueTypeFont *ttf)
ttf->cmapType = CMAP_MS_ShiftJIS;
ttf->cmap = table + ThreeTwo;
} else if (ThreeThree) {
-ttf->cmapType = CMAP_MS_Big5;
+ttf->cmapType = CMAP_MS_PRC;
ttf->cmap = table + ThreeThree;
} else if (ThreeFour) {
-ttf->cmapType = CMAP_MS_PRC;
+ttf->cmapType = CMAP_MS_Big5;
ttf->cmap = table + ThreeFour;
} else if (ThreeFive) {
ttf->cmapType = CMAP_MS_Wansung;
@@ -2263,8 +2263,8 @@ sal_uInt16 MapChar(TrueTypeFont const *ttf, sal_uInt16 ch)
case CMAP_MS_Unicode: break;
case CMAP_MS_ShiftJIS: ch = TranslateChar12(ch); break;
-case CMAP_MS_Big5: ch = TranslateChar13(ch); break;
-case CMAP_MS_PRC: ch = TranslateChar14(ch); break;
+case CMAP_MS_PRC: ch = TranslateChar13(ch); break;
+case CMAP_MS_Big5: ch = TranslateChar14(ch); break;
case CMAP_MS_Wansung: ch = TranslateChar15(ch); break;
case CMAP_MS_Johab: ch = TranslateChar16(ch); break;
default:return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.JSDialogBuilder.js | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
New commits:
commit a5d7e2e349cb56826f2c394def5c661161d8617f
Author: Szymon Kłos
AuthorDate: Mon Oct 14 12:06:35 2019 +0200
Commit: Szymon Kłos
CommitDate: Mon Oct 14 12:06:44 2019 +0200
jsdialogs: add possibility to change unit presentation
Change-Id: I6f3afdbd6c7a4708f3a1e17239811fd213f0ac9b
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 032c031a3..24d3fbeac 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -4,7 +4,7 @@
* from the JSON description provided by the server.
*/
-/* global $ w2ui */
+/* global $ w2ui _ */
L.Control.JSDialogBuilder = L.Control.extend({
/* Handler is a function which takes three parameters:
@@ -338,6 +338,14 @@ L.Control.JSDialogBuilder = L.Control.extend({
return false;
},
+ _unitToVisibleString: function(unit) {
+ if (unit == 'inch') {
+ return _('\"');
+ }
+
+ return unit;
+ },
+
_spinfieldControl: function(parentContainer, data, builder) {
var div = L.DomUtil.create('div', 'spinfieldcontainer',
parentContainer);
@@ -350,7 +358,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
if (data.unit) {
var unit = L.DomUtil.create('span', 'spinfieldunit',
div);
- unit.innerHTML = data.unit;
+ unit.innerHTML =
builder._unitToVisibleString(data.unit);
}
var controlsContainer = L.DomUtil.create('div',
'sinfieldcontrols', div);
@@ -363,7 +371,6 @@ L.Control.JSDialogBuilder = L.Control.extend({
$(spinfield).attr('disabled', 'disabled');
if (data.children && data.children.length) {
- // TODO: units
$(spinfield).attr('value',
data.children[0].text.replace('%', ''));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/stringadd.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 621fe7497a4f9e919e19e28c5682cfe77da1ed04
Author: Tor Lillqvist
AuthorDate: Mon Oct 14 12:53:53 2019 +0300
Commit: Tor Lillqvist
CommitDate: Mon Oct 14 12:55:09 2019 +0300
Comment out a lambda capture that isn't used, to avoid compiler warning
(The use of it is also commented out.)
Change-Id: Ie015a8cbd0f7a982721a389487c2134a1aba8ed1
diff --git a/compilerplugins/clang/stringadd.cxx
b/compilerplugins/clang/stringadd.cxx
index a3435bab7cb5..69251411ae70 100644
--- a/compilerplugins/clang/stringadd.cxx
+++ b/compilerplugins/clang/stringadd.cxx
@@ -193,7 +193,7 @@ bool
StringAdd::VisitCXXOperatorCallExpr(CXXOperatorCallExpr const* operatorCall
&& !tc.Class("OString").Namespace("rtl").GlobalNamespace())
return true;
-auto check = [operatorCall, this, &tc](const MaterializeTemporaryExpr*
matTempExpr) {
+auto check = [/* operatorCall, */ this, &tc](const
MaterializeTemporaryExpr* matTempExpr) {
auto tc3 = loplugin::TypeCheck(matTempExpr->getType());
if (!tc3.Class("OUString").Namespace("rtl").GlobalNamespace()
&& !tc3.Class("OString").Namespace("rtl").GlobalNamespace())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/cib_contract3756' - 2 commits - .gitreview include/sfx2 include/unotools offapi/com sc/source sd/source sfx2/source sw/qa sw/source unotools/source
.gitreview |3 +-- include/sfx2/sfxsids.hrc |1 + include/sfx2/viewsh.hxx |1 + include/unotools/mediadescriptor.hxx |1 + offapi/com/sun/star/document/MediaDescriptor.idl |8 offapi/com/sun/star/frame/XModel2.idl|1 + sc/source/ui/drawfunc/drawsh2.cxx|6 ++ sc/source/ui/drawfunc/drtxtob.cxx|6 ++ sc/source/ui/view/cellsh.cxx |3 +++ sc/source/ui/view/editsh.cxx |8 sd/source/ui/view/drviews7.cxx |2 +- sd/source/ui/view/drviewsj.cxx |5 + sd/source/ui/view/outlnvsh.cxx |3 ++- sfx2/source/appl/appuno.cxx | 14 ++ sfx2/source/doc/sfxbasemodel.cxx |9 - sfx2/source/view/viewsh.cxx | 12 sw/qa/python/check_xmodel.py |4 +++- sw/source/uibase/dochdl/swdtflvr.cxx |3 +++ sw/source/uibase/docvw/edtdd.cxx |3 +++ sw/source/uibase/shells/annotsh.cxx |6 +++--- sw/source/uibase/shells/basesh.cxx |2 +- sw/source/uibase/shells/drwtxtex.cxx |2 +- sw/source/uibase/shells/textsh1.cxx |7 +++ unotools/source/misc/mediadescriptor.cxx |6 ++ 24 files changed, 105 insertions(+), 11 deletions(-) New commits: commit 1e54d00a5a0fc6f7835a9044c38e8e5974887288 Author: Samuel Mehrbrodt AuthorDate: Mon Oct 14 10:37:45 2019 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon Oct 14 11:48:48 2019 +0200 .gitreview: Update default branch Change-Id: Ie7acdd15ee51f4d1e8d7a5b13ca107d64a360b61 Reviewed-on: https://gerrit.libreoffice.org/80758 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/.gitreview b/.gitreview index 199752b8b09e..0193cec971ff 100644 --- a/.gitreview +++ b/.gitreview @@ -3,5 +3,4 @@ host=gerrit.libreoffice.org port=29418 project=core defaultremote=logerrit -defaultbranch=master - +defaultbranch=feature/cib_contract3756 commit 56ed88f865388c44f8fbbbc419b70772b59a924f Author: Samuel Mehrbrodt AuthorDate: Thu Oct 10 08:13:51 2019 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon Oct 14 11:48:35 2019 +0200 Add document-level option to lock down content extraction Setting this option will prevent copying/dragging any content from LO to another program or even another LO window. Change-Id: Ifbc032a4fa69ac1a17d4b500f5a30f5399d84ed7 Reviewed-on: https://gerrit.libreoffice.org/80586 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt (cherry picked from commit 075f20a4b696f9e85d11dc977806e41a49e6de61) Reviewed-on: https://gerrit.libreoffice.org/80757 Tested-by: Samuel Mehrbrodt diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index b535f26e7489..0a4c167a0a80 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -257,6 +257,7 @@ class SvxSearchItem; #define SID_TOOLBAR_MODE(SID_SFX_START + 1728) #define SID_NO_FILE_SYNC(SID_SFX_START + 1729) #define SID_NO_THUMBNAIL(SID_SFX_START + 1730) +#define SID_LOCK_CONTENT_EXTRACTION (SID_SFX_START + 1731) // Used to export a temporary file for preview in Mail Merge Wizard, where saving the data source is // not required for preview, but interferes with not-yet-saved embedded data source for main document. #define SID_NO_EMBEDDED_DS TypedWhichId(SID_SFX_START + 1731) diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index cc76aefd6a5c..46ca74824571 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -286,6 +286,7 @@ public: voidAddRemoveClipboardListener( const css::uno::Reference < css::datatransfer::clipboard::XClipboardListener>&, bool ); css::uno::Reference< css::datatransfer::clipboard::XClipboardNotifier > GetClipboardNotifier(); +bool isContentExtractionLocked(); SAL_DLLPRIVATE SfxInPlaceClient* GetUIActiveIPClient_Impl() const; SAL_DLLPRIVATE void AddContextMenuInterceptor_Impl( const css::uno::Reference < css::ui::XContextMenuInterceptor >& xInterceptor ); diff --git a/include/unotools/mediadescriptor.hxx b/include/unotools/mediadescriptor.hxx index 6a826ce309ac..b2260b5652ff 100644 --- a/include/unotools/mediadescriptor.hxx +++ b/include/unotools/mediadescriptor.hxx @@ -100,6 +100,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap static const OUString& PROP_VIEWONLY(); static const OUString& PROP_DOCUMENTBASEURL(); static const OUString& PROP_SUGGESTEDSAVEASNAME(); +static const OUString& PROP_LOCKCONTENTEXTRACTION();
[Libreoffice-commits] online.git: test/run_unit.sh.in
test/run_unit.sh.in |3 +++
1 file changed, 3 insertions(+)
New commits:
commit bba5b1e7e453c8f0e735dc322626d60ba9f33f90
Author: Miklos Vajna
AuthorDate: Mon Oct 14 09:48:21 2019 +0200
Commit: Miklos Vajna
CommitDate: Mon Oct 14 10:04:36 2019 +0200
test: don't validate ssl certificates while running unit tests
Which was the case before commit
5d57f5aef38d08196952bf22cd310001cbedea1e (storage.ssl.enable should be
in sync with ssl.enable by default, 2019-10-11), otherwise we fail to
connect to the test wsd, since its certificate is typically not trusted.
With this
make check CPPUNIT_TEST_NAME="unit-copy-paste"
passes again.
Change-Id: If3a8a293831313e74eacc1cbc092922d2c72f08c
diff --git a/test/run_unit.sh.in b/test/run_unit.sh.in
index 582dbf27e..d05e2f48f 100755
--- a/test/run_unit.sh.in
+++ b/test/run_unit.sh.in
@@ -96,6 +96,7 @@ if test "z$tst" == "z"; then
--o:ssl.cert_file_path="${abs_top_builddir}/etc/cert.pem" \
--o:ssl.ca_file_path="${abs_top_builddir}/etc/ca-chain.cert.pem" \
--o:admin_console.username=admin
--o:admin_console.password=admin \
+ --o:storage.ssl.enable=false \
> "$tst_log" 2>&1 &
if test "z${SLEEPFORDEBUGGER}${SLEEPKITFORDEBUGGER}" != "z"; then
echo "sleeping for debugger"
@@ -134,6 +135,7 @@ else # newer unit tests.
--o:ssl.cert_file_path="${abs_top_builddir}/etc/cert.pem" \
--o:ssl.ca_file_path="${abs_top_builddir}/etc/ca-chain.cert.pem" \
--o:admin_console.username=admin
--o:admin_console.password=admin \
+ --o:storage.ssl.enable=false \
--unitlib="${abs_top_builddir}/test/.libs/$tst.so" 2> "$tst_log"; then
echo "Test $tst passed."
echo ":test-result: PASS $tst" >> $test_output
@@ -144,6 +146,7 @@ else # newer unit tests.
echo " $ gdb --args ${abs_top_builddir}/loolwsd
--o:sys_template_path=\"$systemplate_path\" \\"
echo " --o:child_root_path=\"$jails_path\" \\"
echo " --o:storage.filesystem[@allow]=true \\"
+echo " --o:storage.ssl.enable=false \\"
echo " --o:logging.level=trace \\"
echo "
--o:ssl.key_file_path=\"${abs_top_builddir}/etc/key.pem\" \\"
echo "
--o:ssl.cert_file_path=\"${abs_top_builddir}/etc/cert.pem\" \\"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - 4 commits - common/Session.cpp common/Session.hpp kit/ChildSession.hpp kit/Kit.cpp kit/Watermark.hpp loleaflet/src test
common/Session.cpp| 16 ++
common/Session.hpp| 11 +
kit/ChildSession.hpp |2
kit/Kit.cpp | 204 --
kit/Watermark.hpp | 180 ++
loleaflet/src/control/Parts.js|2
loleaflet/src/core/Socket.js |3
loleaflet/src/layer/tile/GridLayer.js |2
loleaflet/src/layer/tile/TileLayer.js |2
test/TileCacheTests.cpp | 85 +++---
test/TileQueueTests.cpp | 58 -
test/WhiteBoxTests.cpp| 21 +--
test/httpwstest.cpp |6 -
wsd/ClientSession.cpp | 12 +-
wsd/DocumentBroker.cpp| 13 +-
wsd/DocumentBroker.hpp|2
wsd/TileCache.cpp | 25 ++--
wsd/TileCache.hpp |8 -
wsd/TileDesc.hpp | 41 +-
19 files changed, 398 insertions(+), 295 deletions(-)
New commits:
commit eb6064816b2f31e1bbc83f47162ae7ff632e53ca
Author: Mert Tumer
AuthorDate: Mon Oct 14 00:45:59 2019 +0300
Commit: Mert Tumer
CommitDate: Mon Oct 14 12:12:56 2019 +0300
Include nviewid to tests with tile messages
Change-Id: I8af803bd57cc0e3d0af510dcf6013c1658658678
diff --git a/test/TileCacheTests.cpp b/test/TileCacheTests.cpp
index b4ec0fa8d..7e2e6c9dd 100644
--- a/test/TileCacheTests.cpp
+++ b/test/TileCacheTests.cpp
@@ -185,6 +185,7 @@ void TileCacheTests::testSimple()
// now, so it discards the cached data.
TileCache tc("doc.ods", Poco::Timestamp());
+int nviewid=0;
int part = 0;
int width = 256;
int height = 256;
@@ -192,7 +193,7 @@ void TileCacheTests::testSimple()
int tilePosY = 0;
int tileWidth = 3840;
int tileHeight = 3840;
-TileDesc tile(part, width, height, tilePosX, tilePosY, tileWidth,
tileHeight, -1, 0, -1, false);
+TileDesc tile(nviewid, part, width, height, tilePosX, tilePosY, tileWidth,
tileHeight, -1, 0, -1, false);
// No Cache
TileCache::Tile tileData = tc.lookupTile(tile);
@@ -209,7 +210,7 @@ void TileCacheTests::testSimple()
CPPUNIT_ASSERT_MESSAGE("cached tile corrupted", data == *tileData);
// Invalidate Tiles
-tc.invalidateTiles("invalidatetiles: EMPTY");
+tc.invalidateTiles("invalidatetiles: EMPTY", nviewid);
// No Cache
tileData = tc.lookupTile(tile);
@@ -225,13 +226,13 @@ void TileCacheTests::testSimpleCombine()
// First.
std::shared_ptr socket1 = loadDocAndGetSocket(_uri,
documentURL, "simpleCombine-1 ");
-sendTextFrame(socket1, "tilecombine part=0 width=256 height=256
tileposx=0,3840 tileposy=0,0 tilewidth=3840 tileheight=3840");
+sendTextFrame(socket1, "tilecombine nviewid=0 part=0 width=256 height=256
tileposx=0,3840 tileposy=0,0 tilewidth=3840 tileheight=3840");
std::vector tile1a = getResponseMessage(socket1, "tile:", testname);
CPPUNIT_ASSERT_MESSAGE("did not receive a tile: message as expected",
!tile1a.empty());
std::vector tile1b = getResponseMessage(socket1, "tile:", testname);
CPPUNIT_ASSERT_MESSAGE("did not receive a tile: message as expected",
!tile1b.empty());
-sendTextFrame(socket1, "tilecombine part=0 width=256 height=256
tileposx=0,3840 tileposy=0,0 tilewidth=3840 tileheight=3840");
+sendTextFrame(socket1, "tilecombine nviewid=0 part=0 width=256 height=256
tileposx=0,3840 tileposy=0,0 tilewidth=3840 tileheight=3840");
tile1a = getResponseMessage(socket1, "tile:", testname);
CPPUNIT_ASSERT_MESSAGE("did not receive a tile: message as expected",
!tile1a.empty());
@@ -242,7 +243,7 @@ void TileCacheTests::testSimpleCombine()
std::cerr << "Connecting second client." << std::endl;
std::shared_ptr socket2 = loadDocAndGetSocket(_uri,
documentURL, "simpleCombine-2 ", true);
-sendTextFrame(socket2, "tilecombine part=0 width=256 height=256
tileposx=0,3840 tileposy=0,0 tilewidth=3840 tileheight=3840");
+sendTextFrame(socket2, "tilecombine nviewid=0 part=0 width=256 height=256
tileposx=0,3840 tileposy=0,0 tilewidth=3840 tileheight=3840");
std::vector tile2a = getResponseMessage(socket2, "tile:", testname);
CPPUNIT_ASSERT_MESSAGE("did not receive a tile: message as expected",
!tile2a.empty());
@@ -267,7 +268,7 @@ void TileCacheTests::testCancelTiles()
std::shared_ptr socket =
loadDocAndGetSocket("setclientpart.ods", _uri, testName);
// Request a huge tile, and cancel immediately.
-sendTextFrame(socket, "tilecombine part=0 width=2560 height=2560
tileposx=0 tileposy=0 tilewidth=38400 tileheight=38400");
+sendTextFrame(socket, "tilecombine nviewid=0 part=0 width=2560
height=2560 tileposx=0 tileposy=0 tilewidth=38400 tileheight=38400");
sendTextFrame(socket, "canceltiles");
const auto res = getResponseString(socket, "tile:", testName, 1000);
@@
[Libreoffice-commits] core.git: bin/update_pch bin/update_pch.sh external/clucene external/liborcus external/libstaroffice external/libwpd external/libwps
bin/update_pch| 10 + bin/update_pch.sh |2 external/clucene/Library_clucene.mk |2 external/clucene/inc/pch/precompiled_clucene.cxx | 12 + external/clucene/inc/pch/precompiled_clucene.hxx | 108 ++ external/liborcus/Library_orcus-parser.mk |2 external/liborcus/Library_orcus.mk|2 external/liborcus/UnpackedTarball_liborcus.mk |1 external/liborcus/fix-pch.patch.0 | 11 + external/liborcus/inc/pch/precompiled_orcus-parser.cxx| 12 + external/liborcus/inc/pch/precompiled_orcus-parser.hxx| 88 +++ external/liborcus/inc/pch/precompiled_orcus.cxx | 12 + external/liborcus/inc/pch/precompiled_orcus.hxx | 108 ++ external/libstaroffice/Library_staroffice.mk |2 external/libstaroffice/inc/pch/precompiled_staroffice.cxx | 12 + external/libstaroffice/inc/pch/precompiled_staroffice.hxx | 59 +++ external/libwpd/Library_wpd.mk|3 external/libwpd/inc/pch/precompiled_wpd.cxx | 12 + external/libwpd/inc/pch/precompiled_wpd.hxx | 52 ++ external/libwps/Library_wps.mk|3 external/libwps/inc/pch/precompiled_wps.cxx | 12 + external/libwps/inc/pch/precompiled_wps.hxx | 64 22 files changed, 588 insertions(+), 1 deletion(-) New commits: commit f5fa61e7f00733df3a064c297b4a31b182be05b6 Author: Luboš Luňák AuthorDate: Sun Oct 13 10:55:02 2019 +0200 Commit: Luboš Luňák CommitDate: Mon Oct 14 11:07:30 2019 +0200 add PCHs for more external libs I think this is all external libs where it makes sense for them to have their own PCH and be worth it. Maybe some smaller externals can also use the common system PCH, but unfortunately many externals use all kinds of defines that affect system headers, which is a problem for the common system PCH. Change-Id: I2c589ac55d93728daf3b158df110722e5f055d45 Reviewed-on: https://gerrit.libreoffice.org/80728 Tested-by: Jenkins Reviewed-by: Luboš Luňák diff --git a/bin/update_pch b/bin/update_pch index 0fd06b5bdbd5..62ed9e773779 100755 --- a/bin/update_pch +++ b/bin/update_pch @@ -426,6 +426,16 @@ def filter_ignore(line, module): ignore_list += [ 'third_party/freetype/include/pstables.h', ] +if module == 'external/clucene': +ignore_list += [ +'_bufferedstream.h', +'_condition.h', +'_gunichartables.h', +'_threads.h', +'error.h', +'CLucene/LuceneThreads.h', +'CLucene/config/_threads.h' +] for i in ignore_list: if line.startswith(i): diff --git a/bin/update_pch.sh b/bin/update_pch.sh index bc7742ea952e..5299242b9d7c 100755 --- a/bin/update_pch.sh +++ b/bin/update_pch.sh @@ -42,7 +42,7 @@ for x in $headers; do fi else header=$x -local update_msg=`echo $header | sed -e s%$root/%%` +update_msg=`echo $header | sed -e s%$root/%%` module=`readlink -f $header | sed -e s%$root/%% -e s%/.*%%` if [ "$module" = "pch" ]; then continue # PCH's in pch/inc/pch/ are handled manually diff --git a/external/clucene/Library_clucene.mk b/external/clucene/Library_clucene.mk index a6dc8576f0b1..6f585f6f2bfa 100644 --- a/external/clucene/Library_clucene.mk +++ b/external/clucene/Library_clucene.mk @@ -23,6 +23,8 @@ $(eval $(call gb_Library_set_include,clucene,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_set_precompiled_header,clucene,external/clucene/inc/pch/precompiled_clucene)) + $(eval $(call gb_Library_add_defs,clucene,\ -Dclucene_shared_EXPORTS \ -Dclucene_core_EXPORTS \ diff --git a/external/clucene/inc/pch/precompiled_clucene.cxx b/external/clucene/inc/pch/precompiled_clucene.cxx new file mode 100644 index ..98e81ca8ed41 --- /dev/null +++ b/external/clucene/inc/pch/precompiled_clucene.cxx @@ -0,0 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * 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/. + */ + +#include "precompiled_clucene.hxx" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/external/clucene/inc/pch/precompiled_clucene.hxx b/external/clucene/inc/pch/precompiled_clucene.hxx new file mode 100644 index ..f68f71e8754f --- /dev/null +++ b/external/clucene/inc/pch/precompiled_clucene.hxx @@ -0,0 +1,108 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-m
Testing use of krb5 and gssapi in PostgreSQL?
The only use of WITH_KRB5 and WITH_GSSAPI in LO appears to be the PostgreSQL support (see connectivity/Library_postgresql-sdbc-impl.mk and external/postgresql/ExternalProject_postgresql.mk). Is there some documentation how to test whether the use of krb5 and gssapi in the PostgreSQL support actually works? (Asking because the latest Flatpak runtime org.freedesktop.Sdk//19.08 dropped krb5, and I wonder whether I should bundle it in the LO Flatpak---but without even knowing how to test that it will actually works as intended, or just configure the Flatpak build --without-krb5 --without-gssapi.) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/docbm.cxx |9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit a77321a07695c067662885eea5369e3c821dccb0
Author: Michael Stahl
AuthorDate: Fri Oct 11 14:42:12 2019 +0200
Commit: Michael Stahl
CommitDate: Mon Oct 14 10:57:01 2019 +0200
sw: deleteFieldmarkAt() should just call getFieldmarkAt()
dynamic_cast isn't a performance problem here.
Change-Id: I7d90025051a428588479bb1431dd8bac292f5c49
Reviewed-on: https://gerrit.libreoffice.org/80672
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 1d61f2ac65e7..880943fd6560 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -1284,14 +1284,11 @@ namespace sw { namespace mark
void MarkManager::deleteFieldmarkAt(const SwPosition& rPos)
{
-auto const pFieldmark = find_if(
-m_vFieldmarks.begin(),
-m_vFieldmarks.end(),
-[&rPos] (const ::sw::mark::IMark* pMark) { return
pMark->IsCoveringPosition(rPos); } );
-if(pFieldmark == m_vFieldmarks.end())
+auto const pFieldmark = dynamic_cast(getFieldmarkAt(rPos));
+if (!pFieldmark)
return;
-deleteMark(lcl_FindMark(m_vAllMarks, *pFieldmark));
+deleteMark(lcl_FindMark(m_vAllMarks, pFieldmark));
}
::sw::mark::IFieldmark*
MarkManager::changeFormFieldmarkType(::sw::mark::IFieldmark* pFieldmark, const
OUString& rNewType)
___
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 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 307b39ac9ced9a31157f9ec7ec1b125fe3f34779 Author: Michael Stahl AuthorDate: Fri Oct 11 13:47:59 2019 +0200 Commit: Michael Stahl CommitDate: Mon Oct 14 10:55:38 2019 +0200 configure: remove sanitizer flags from default COMPILER_PLUGINS_CXX When COMPILER_PLUGINS_CXX is default initialised from $CXX, filter out sanitizer flags, because: a) linking fails with unresolved symbols currently b) typically the slowdown is unhelpful in a build c) if anybody wants a sanitized plugin they can set COMPILER_PLUGINS_CXX manually (init from CXX was added in ad5cbcf6ba0afdc1d8d7405c2641cce8de4a360b) Change-Id: I64dc48fae5f7a23f87b0eee0545add9a1ebd5672 Reviewed-on: https://gerrit.libreoffice.org/80655 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/configure.ac b/configure.ac index 717dafe71648..a0c69e8cb3b6 100644 --- a/configure.ac +++ b/configure.ac @@ -7009,7 +7009,7 @@ if test "$COM_IS_CLANG" = "TRUE"; then fi # Assume Clang is self-built, but allow overriding COMPILER_PLUGINS_CXX to the compiler Clang was built with. if test -z "$COMPILER_PLUGINS_CXX"; then -COMPILER_PLUGINS_CXX=$CXX +COMPILER_PLUGINS_CXX=[$(echo $CXX | sed -e 's/-fsanitize=[^ ]*//g')] fi clangbindir=$CLANGDIR/bin if test "$build_os" = "cygwin"; then ___ 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/inc/UndoInsert.hxx | 24
sw/source/core/undo/unins.cxx | 56 +++---
2 files changed, 40 insertions(+), 40 deletions(-)
New commits:
commit 9933ec22f0c7a0e787c99f35e919a5a57231dd11
Author: Miklos Vajna
AuthorDate: Mon Oct 14 09:39:45 2019 +0200
Commit: Miklos Vajna
CommitDate: Mon Oct 14 10:36:25 2019 +0200
sw: prefix members of SwUndoInsertLabel
See tdf#94879 for motivation.
Change-Id: I9d0b4ee6fc6794dc4b2e94e23c6dd83465c1191b
Reviewed-on: https://gerrit.libreoffice.org/80751
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/source/core/inc/UndoInsert.hxx
b/sw/source/core/inc/UndoInsert.hxx
index c5d8848dba20..b290cbdcbb35 100644
--- a/sw/source/core/inc/UndoInsert.hxx
+++ b/sw/source/core/inc/UndoInsert.hxx
@@ -167,18 +167,18 @@ class SwUndoInsertLabel : public SwUndo
} NODE;
};
-OUString const sText;
+OUString const m_sText;
// #i39983# the separator is drawn with a character style
-OUString const sSeparator;
-OUString const sNumberSeparator;
-OUString const sCharacterStyle;
+OUString const m_sSeparator;
+OUString const m_sNumberSeparator;
+OUString const m_sCharacterStyle;
// #i26791# - re-store of drawing object position no longer needed
-sal_uInt16 const nFieldId;
-SwLabelType const eType;
-SdrLayerID nLayerId; // for character objects
-bool const bBefore:1;
-bool bUndoKeep :1;
-bool const bCpyBrd:1;
+sal_uInt16 const m_nFieldId;
+SwLabelType const m_eType;
+SdrLayerID m_nLayerId; // for character objects
+bool const m_bBefore:1;
+bool m_bUndoKeep :1;
+bool const m_bCopyBorder:1;
public:
SwUndoInsertLabel( const SwLabelType eTyp, const OUString &rText,
@@ -211,9 +211,9 @@ public:
static SwRewriter CreateRewriter(const OUString &rStr);
void SetNodePos( sal_uLong nNd )
-{ if( LTYPE_OBJECT != eType ) NODE.nNode = nNd; }
+{ if( LTYPE_OBJECT != m_eType ) NODE.nNode = nNd; }
-void SetUndoKeep() { bUndoKeep = true; }
+void SetUndoKeep() { m_bUndoKeep = true; }
void SetFlys( SwFrameFormat& rOldFly, SfxItemSet const & rChgSet,
SwFrameFormat& rNewFly );
void SetDrawObj( SdrLayerID nLayerId );
};
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index 7d59f85c2fe4..b1f1cb4ab25a 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -859,24 +859,24 @@ SwUndoInsertLabel::SwUndoInsertLabel( const SwLabelType
eTyp,
const bool bCpyBorder,
const SwDoc* pDoc )
: SwUndo( SwUndoId::INSERTLABEL, pDoc ),
- sText( rText ),
- sSeparator( rSeparator ),
- sNumberSeparator( rNumberSeparator ),//#i61007# order of captions
- sCharacterStyle( rCharacterStyle ),
- nFieldId( nInitId ),
- eType( eTyp ),
- nLayerId( 0 ),
- bBefore( bBef ),
- bCpyBrd( bCpyBorder )
+ m_sText( rText ),
+ m_sSeparator( rSeparator ),
+ m_sNumberSeparator( rNumberSeparator ),//#i61007# order of captions
+ m_sCharacterStyle( rCharacterStyle ),
+ m_nFieldId( nInitId ),
+ m_eType( eTyp ),
+ m_nLayerId( 0 ),
+ m_bBefore( bBef ),
+ m_bCopyBorder( bCpyBorder )
{
-bUndoKeep = false;
+m_bUndoKeep = false;
OBJECT.pUndoFly = nullptr;
OBJECT.pUndoAttr = nullptr;
}
SwUndoInsertLabel::~SwUndoInsertLabel()
{
-if( LTYPE_OBJECT == eType || LTYPE_DRAW == eType )
+if( LTYPE_OBJECT == m_eType || LTYPE_DRAW == m_eType )
{
delete OBJECT.pUndoFly;
delete OBJECT.pUndoAttr;
@@ -889,27 +889,27 @@ void SwUndoInsertLabel::UndoImpl(::sw::UndoRedoContext &
rContext)
{
SwDoc & rDoc = rContext.GetDoc();
-if( LTYPE_OBJECT == eType || LTYPE_DRAW == eType )
+if( LTYPE_OBJECT == m_eType || LTYPE_DRAW == m_eType )
{
OSL_ENSURE( OBJECT.pUndoAttr && OBJECT.pUndoFly, "Pointer not
initialized" );
SwFrameFormat* pFormat;
SdrObject *pSdrObj = nullptr;
if( OBJECT.pUndoAttr &&
nullptr != (pFormat =
static_cast(OBJECT.pUndoAttr->GetFormat( rDoc ))) &&
-( LTYPE_DRAW != eType ||
+( LTYPE_DRAW != m_eType ||
nullptr != (pSdrObj = pFormat->FindSdrObject()) ) )
{
OBJECT.pUndoAttr->UndoImpl(rContext);
OBJECT.pUndoFly->UndoImpl(rContext);
-if( LTYPE_DRAW == eType )
+if( LTYPE_DRAW == m_eType )
{
-pSdrObj->SetLayer( nLayerId );
+pSdrObj->SetLayer( m_nLayerId );
}
}
}
else if( NODE.nNode )
{
-if ( eType == LTYPE_TABLE && bUndoKeep )
+if ( m_eType == LTYPE_TABLE && m_bUndoKeep )
{
SwTableNod
Re: Configure options for faster Jenkins builds
On 13/10/2019 21:15, Luboš Luňák wrote: And --disable-symbols is basically like adding -g0 to CXXFLAGS. Most setups build with --enable-dbgutils to build with full debug builds, but in fact generating debug symbols mostly seems like a waste for Jenkins builds. Is that actually used for something? I know unittests on Linux print backtraces on crashes/aborts, but I've just tried adding abort() in a random unittest and the backtrace is not very useful, because it doesn't use debug symbols anyway. And with just 'make starmath.build' adding 'ENABLE_SYMBOLS_FOR=' saves again about 10% of build time here. Was the backtrace printed by gdb inspecting the core file, or was it printed from within the implementation of abort(2) in glibc? For the tests to print gdb-generated backtraces on Linux, core files must be enabled (`ulimit -c unlimited`) and be stored as files named core* in cwd (see /proc/sys/kernel/core_pattern). When those conditions are not met anyway for the relevant Gerrit/Jenkins builds, --enable-symbols likely doesn't give any benefit. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtkinst.cxx | 16 1 file changed, 12 insertions(+), 4 deletions(-) New commits: commit 137e14ec4c3d3258df3802426b5ffe469f7fbde3 Author: Caolán McNamara AuthorDate: Sun Oct 13 20:55:03 2019 +0100 Commit: Caolán McNamara CommitDate: Mon Oct 14 09:53:13 2019 +0200 Related: tdf#124729 avoid GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT for 0 width or height Change-Id: I1452d0e6c5470d855cae96308e689e87e1d582d5 Reviewed-on: https://gerrit.libreoffice.org/80746 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index d050f624797c..b1d3eed73097 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -1419,12 +1419,17 @@ private: int width = m_aGLWin.Width * scale; int height = m_aGLWin.Height * scale; +// seen in tdf#124729 width/height of 0 leading to GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT +int allocwidth = std::max(width, 1); +int allocheight = std::max(height, 1); + gtk_gl_area_make_current(GTK_GL_AREA(m_pGLArea)); glBindRenderbuffer(GL_RENDERBUFFER, m_nRenderBuffer); -glRenderbufferStorage(GL_RENDERBUFFER, GL_RGB8, width, height); +glRenderbufferStorage(GL_RENDERBUFFER, GL_RGB8, allocwidth, allocheight); glBindRenderbuffer(GL_RENDERBUFFER, m_nDepthBuffer); -glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24, width, height); +glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24, allocwidth, allocheight); glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_nAreaFrameBuffer); + glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_RENDERBUFFER_EXT, m_nRenderBuffer); glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, @@ -1434,6 +1439,7 @@ private: glBindRenderbuffer(GL_RENDERBUFFER, m_nRenderBuffer); glBindRenderbuffer(GL_RENDERBUFFER, m_nDepthBuffer); glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_nFrameBuffer); + glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_RENDERBUFFER_EXT, m_nRenderBuffer); glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, @@ -1441,14 +1447,16 @@ private: glViewport(0, 0, width, height); glBindRenderbuffer(GL_RENDERBUFFER, m_nRenderScratchBuffer); -glRenderbufferStorage(GL_RENDERBUFFER, GL_RGB8, width, height); +glRenderbufferStorage(GL_RENDERBUFFER, GL_RGB8, allocwidth, allocheight); glBindRenderbuffer(GL_RENDERBUFFER, m_nDepthScratchBuffer); -glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24, width, height); +glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT24, allocwidth, allocheight); glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_nFrameScratchBuffer); + glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_RENDERBUFFER_EXT, m_nRenderScratchBuffer); glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, m_nDepthScratchBuffer); + glViewport(0, 0, width, height); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtkinst.cxx |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit fb098c51e731ab92198db9822d4de757469ee804 Author: Caolán McNamara AuthorDate: Sun Oct 13 20:48:14 2019 +0100 Commit: Caolán McNamara CommitDate: Mon Oct 14 09:52:58 2019 +0200 Related: tdf#124729 check error status before continuing Change-Id: Ic39e569121b2646995b8dec50c3941db65fdd500 Reviewed-on: https://gerrit.libreoffice.org/80745 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 38fc905c8091..d050f624797c 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -1472,7 +1472,12 @@ private: GdkWindow *pWindow = gtk_widget_get_window(pParent); m_pContext = gdk_window_create_gl_context(pWindow, nullptr); -gdk_gl_context_realize(m_pContext, nullptr); +if (!m_pContext) +return false; + +if (!gdk_gl_context_realize(m_pContext, nullptr)) +return false; + gdk_gl_context_make_current(m_pContext); glGenFramebuffersEXT(1, &m_nFrameBuffer); glGenRenderbuffersEXT(1, &m_nRenderBuffer); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/cib_contract3756' - package/source sfx2/source
package/source/zippackage/ZipPackage.cxx |4 ++--
sfx2/source/dialog/filedlghelper.cxx |2 +-
sfx2/source/doc/objserv.cxx | 15 +--
sfx2/source/doc/objstor.cxx |4 ++--
4 files changed, 18 insertions(+), 7 deletions(-)
New commits:
commit a191d98dea79284e25154cb955ec75e7b54ed204
Author: Vasily Melenchuk
AuthorDate: Mon Oct 14 00:01:52 2019 +0300
Commit: Vasily Melenchuk
CommitDate: Mon Oct 14 10:34:48 2019 +0300
temporary: do not clean up EncryptionData during SaveAs
This clean up can ruin sensetive encryption details saving document
in plain mode which is not expected.
Relaization is not final and requires more atention.
Change-Id: I46b757af81e68ad4781e83b1a0e0b6da3a5e13e1
diff --git a/package/source/zippackage/ZipPackage.cxx
b/package/source/zippackage/ZipPackage.cxx
index f5d8ca351ba9..97c079d088c8 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -1756,7 +1756,7 @@ void SAL_CALL ZipPackage::setPropertyValue( const
OUString& aPropertyName, const
if ( !( aValue >>= aKeys ) )
throw IllegalArgumentException(THROW_WHERE, uno::Reference<
uno::XInterface >(), 2 );
-if ( aKeys.hasElements() )
+/*if ( aKeys.hasElements() )
{
bool bHasSHA256 = false;
bool bHasSHA1 = false;
@@ -1770,7 +1770,7 @@ void SAL_CALL ZipPackage::setPropertyValue( const
OUString& aPropertyName, const
if ( !bHasSHA256 && !bHasSHA1 )
throw IllegalArgumentException(THROW_WHERE "Expected keys are
not provided!", uno::Reference< uno::XInterface >(), 2 );
-}
+}*/
m_aStorageEncryptionKeys = aKeys;
m_aEncryptionKey.realloc( 0 );
diff --git a/sfx2/source/dialog/filedlghelper.cxx
b/sfx2/source/dialog/filedlghelper.cxx
index 11a4d2b7e9ab..aab06bbe30f7 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1415,7 +1415,7 @@ ErrCode FileDialogHelper_Impl::execute(
std::vector& rpURLList,
// the password will be set in case user decide so
rpSet->ClearItem( SID_PASSWORDINTERACTION );
rpSet->ClearItem( SID_PASSWORD );
-rpSet->ClearItem( SID_ENCRYPTIONDATA );
+//rpSet->ClearItem( SID_ENCRYPTIONDATA );
rpSet->ClearItem( SID_RECOMMENDREADONLY );
rpSet->ClearItem( SID_MODIFYPASSWORDINFO );
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 8cc196c015ce..53af3948917e 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -810,10 +810,21 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
bool bPreselectPassword = false;
-const SfxUnoAnyItem* pOldEncryptionDataItem =
SfxItemSet::GetItem(GetMedium()->GetItemSet(),
SID_ENCRYPTIONDATA, false);
const SfxStringItem* pOldPasswordItem =
SfxItemSet::GetItem(GetMedium()->GetItemSet(), SID_PASSWORD,
false);
-if ( pOldEncryptionDataItem || pOldPasswordItem )
+if (pOldPasswordItem)
+{
bPreselectPassword = true;
+}
+else
+{
+const SfxUnoAnyItem* pOldEncryptionDataItem =
SfxItemSet::GetItem(GetMedium()->GetItemSet(),
SID_ENCRYPTIONDATA, false);
+if (pOldEncryptionDataItem)
+{
+uno::Sequence< beans::NamedValue > aEncryptionData;
+pOldEncryptionDataItem->GetValue() >>= aEncryptionData;
+
+}
+}
uno::Sequence< beans::PropertyValue > aDispatchArgs;
if ( rReq.GetArgs() )
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index b703f0ffdfeb..005669ffc28e 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2757,11 +2757,11 @@ bool SfxObjectShell::PreDoSaveAs_Impl(const OUString&
rFileName, const OUString&
std::unique_ptr pMergedParams(new SfxAllItemSet(
*pMedium->GetItemSet() ));
// in "SaveAs" title and password will be cleared ( maybe the new itemset
contains new values, otherwise they will be empty )
-pMergedParams->ClearItem( SID_ENCRYPTIONDATA );
+//pMergedParams->ClearItem( SID_ENCRYPTIONDATA );
pMergedParams->ClearItem( SID_PASSWORD );
// #i119366# - As the SID_ENCRYPTIONDATA and SID_PASSWORD are using for
setting password together, we need to clear them both.
// Also, ( maybe the new itemset contains new values, otherwise they will
be empty )
-pMergedParams->ClearItem( SID_ENCRYPTIONDATA );
+//pMergedParams->ClearItem( SID_ENCRYPTIONDATA );
pMergedParams->ClearItem( SID_DOCINFO_TITLE );
pMergedParams->ClearItem( SID_INPUTSTREAM );
___
Libreoffice-commits mailing list
