[Libreoffice-commits] core.git: lingucomponent/source

[Libreoffice Gerrit user]

 lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit af836fe33dd42c6043ef70f897c90c8b3ba826a7
Author: Andrea Gelmini 
AuthorDate: Tue Mar 12 01:52:25 2019 +
Commit: Julien Nabet 
CommitDate: Tue Mar 12 07:06:19 2019 +0100

Fix typo

Change-Id: I08c974135f1936e6fc4f992091e5038d66d524c3
Reviewed-on: https://gerrit.libreoffice.org/69073
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx 
b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
index 92107c94c136..8ad50fa36915 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
@@ -129,7 +129,7 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales()
 
 // to prefer dictionaries with configuration entries we will only
 // use those old style dictionaries that add a language that
-// is not yet supported by the list od new style dictionaries
+// is not yet supported by the list of new style dictionaries
 MergeNewStyleDicsAndOldStyleDics( aDics, aOldStyleDics );
 
 sal_Int32 numdict = aDics.size();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sw/source

[Libreoffice Gerrit user]

 sw/source/filter/xml/xmlimp.cxx |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit f053400c3f8c89ae122387dc64c63d2cfba86bbb
Author: Michael Stahl 
AuthorDate: Wed Mar 6 12:03:32 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Tue Mar 12 04:15:07 2019 +0100

tdf#116195 sw: remove DisableOffPagePositioning handling from ODF import

SwXMLImport::SetConfigurationSettings() needs to handle only those
settings for which the default is different vs. old OOo/LO versions;
DisableOffPagePositioning however defaults to false, so we can just rely
on that default.  The inverted bDisableOffPagePositioning check is
wrong.

(regression from fe3d5766fa3c42f6cf8d1ea47af820e0b1c1cf48)

Change-Id: I300fa597f58b586b49089bb555a00a6923862abe
Reviewed-on: https://gerrit.libreoffice.org/68801
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 8f3df3a5a1570eea4d931f737c474df8601377ec)
Reviewed-on: https://gerrit.libreoffice.org/69037
Reviewed-by: Thorsten Behrens 

diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index d838a8adb8a6..1f4d243f6c93 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1358,7 +1358,6 @@ void SwXMLImport::SetConfigurationSettings(const Sequence 
< PropertyValue > & aC
 aExcludeWhenNotLoadingUserSettings.insert("TabOverMargin");
 
aExcludeWhenNotLoadingUserSettings.insert("PropLineSpacingShrinksFirstLine");
 aExcludeWhenNotLoadingUserSettings.insert("SubtractFlysAnchoredAtFlys");
-aExcludeWhenNotLoadingUserSettings.insert("DisableOffPagePositioning");
 
 sal_Int32 nCount = aConfigProps.getLength();
 const PropertyValue* pValues = aConfigProps.getConstArray();
@@ -1392,7 +1391,6 @@ void SwXMLImport::SetConfigurationSettings(const Sequence 
< PropertyValue > & aC
 bool bTabOverMargin = false;
 bool bPropLineSpacingShrinksFirstLine = false;
 bool bSubtractFlysAnchoredAtFlys = false;
-bool bDisableOffPagePositioning = false;
 bool bCollapseEmptyCellPara = false;
 
 const PropertyValue* currentDatabaseDataSource = nullptr;
@@ -1486,8 +1484,6 @@ void SwXMLImport::SetConfigurationSettings(const Sequence 
< PropertyValue > & aC
 bPropLineSpacingShrinksFirstLine = true;
 else if (pValues->Name == "SubtractFlysAnchoredAtFlys")
 bSubtractFlysAnchoredAtFlys = true;
-else if (pValues->Name == "DisableOffPagePositioning")
-bDisableOffPagePositioning = true;
 else if (pValues->Name == "CollapseEmptyCellPara")
 bCollapseEmptyCellPara = true;
 }
@@ -1650,9 +1646,6 @@ void SwXMLImport::SetConfigurationSettings(const Sequence 
< PropertyValue > & aC
 if (!bSubtractFlysAnchoredAtFlys)
 xProps->setPropertyValue("SubtractFlysAnchoredAtFlys", makeAny(true));
 
-if ( bDisableOffPagePositioning )
-xProps->setPropertyValue("DisableOffPagePositioning", makeAny(true));
-
 if (!bCollapseEmptyCellPara)
 xProps->setPropertyValue("CollapseEmptyCellPara", makeAny(false));
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - oox/source sd/qa

[Libreoffice Gerrit user]

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |   22 +++-
 sd/qa/unit/data/pptx/smartart-autoTxRot.pptx|binary
 sd/qa/unit/import-tests-smartart.cxx|   91 
 3 files changed, 109 insertions(+), 4 deletions(-)

New commits:
commit aa773560eef3caebe010160f253084abbdce81c1
Author: Mike Kaganski 
AuthorDate: Sat Dec 1 17:51:11 2018 +0300
Commit: Thorsten Behrens 
CommitDate: Tue Mar 12 04:14:33 2019 +0100

tdf#121844: properly implement autoTxRot support

... after commit cf7b97d1328ec2f2c8254abb9ce67d63d9c54c80

Change-Id: If46265f49a85d92254fedb719d76ff7319c092cc
Reviewed-on: https://gerrit.libreoffice.org/64396
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/69050
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 876eb3d06c8d..0b0c77f40fd5 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -1007,20 +1007,34 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 break;
 }
 
+// ECMA-376-1:2016 21.4.7.5 ST_AutoTextRotation (Auto Text 
Rotation)
 const sal_Int32 nautoTxRot = maMap.count(XML_autoTxRot) ? 
maMap.find(XML_autoTxRot)->second : XML_upr;
+sal_Int32 nShapeRot = rShape->getRotation();
+while (nShapeRot < 0)
+nShapeRot += 360 * PER_DEGREE;
+while (nShapeRot > 360 * PER_DEGREE)
+nShapeRot -= 360 * PER_DEGREE;
 
 switch(nautoTxRot)
 {
 case XML_upr:
 {
-if (rShape->getRotation())
-pTextBody->getTextProperties().moRotation = 
-F_PI180*90*rShape->getRotation();
+int n90x = 0;
+if (nShapeRot >= 315 * PER_DEGREE)
+/* keep 0 */;
+else if (nShapeRot > 225 * PER_DEGREE)
+n90x = -3;
+else if (nShapeRot >= 135 * PER_DEGREE)
+n90x = -2;
+else if (nShapeRot > 45 * PER_DEGREE)
+n90x = -1;
+pTextBody->getTextProperties().moRotation = n90x * 90 * 
PER_DEGREE;
 }
 break;
 case XML_grav:
 {
-if (rShape->getRotation()==90*F_PI180 || 
rShape->getRotation()==180*F_PI180)
-pTextBody->getTextProperties().moRotation = 
180*F_PI180;
+if (nShapeRot > (90 * PER_DEGREE) && nShapeRot < (270 * 
PER_DEGREE))
+pTextBody->getTextProperties().moRotation = -180 * 
PER_DEGREE;
 }
 break;
 case XML_none:
diff --git a/sd/qa/unit/data/pptx/smartart-autoTxRot.pptx 
b/sd/qa/unit/data/pptx/smartart-autoTxRot.pptx
new file mode 100644
index ..30e69a6de6c1
Binary files /dev/null and b/sd/qa/unit/data/pptx/smartart-autoTxRot.pptx differ
diff --git a/sd/qa/unit/import-tests-smartart.cxx 
b/sd/qa/unit/import-tests-smartart.cxx
index 9de4061a072b..5317ac19c919 100644
--- a/sd/qa/unit/import-tests-smartart.cxx
+++ b/sd/qa/unit/import-tests-smartart.cxx
@@ -45,6 +45,7 @@ public:
 void testDir();
 void testMaxDepth();
 void testRotation();
+void testTextAutoRotation();
 void testVertialBoxList();
 void testVertialBracketList();
 void testTableList();
@@ -61,6 +62,7 @@ public:
 CPPUNIT_TEST(testDir);
 CPPUNIT_TEST(testMaxDepth);
 CPPUNIT_TEST(testRotation);
+CPPUNIT_TEST(testTextAutoRotation);
 CPPUNIT_TEST(testVertialBoxList);
 CPPUNIT_TEST(testVertialBracketList);
 CPPUNIT_TEST(testTableList);
@@ -216,6 +218,95 @@ void SdImportTestSmartArt::testRotation()
 xDocShRef->DoClose();
 }
 
+void SdImportTestSmartArt::testTextAutoRotation()
+{
+sd::DrawDocShellRef xDocShRef = loadURL(
+
m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-autoTxRot.pptx"), 
PPTX);
+
+auto testText = [&](int pageNo, sal_Int32 txtNo, const OUString& expTx, 
sal_Int32 expShRot,
+sal_Int32 expTxRot) {
+OString msgText = "Page: " + OString::number(pageNo) + " text: " + 
OString::number(txtNo);
+uno::Reference xShapeGroup(getShapeFromPage(0, 
pageNo, xDocShRef),
+ uno::UNO_QUERY_THROW);
+
+uno::Reference xTxt(xShapeGroup->getByIndex(txtNo), 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(msgText.getStr(), expTx, 
xTxt->getString());
+uno::Reference xTxtProps(xTxt, 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(msgText.getStr(), expShRot,
+ 
xTxtP

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - oox/source

[Libreoffice Gerrit user]

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |   31 
 1 file changed, 31 insertions(+)

New commits:
commit 994cb67e02342a1548a4a77dd3a6a73a368a25ca
Author: ekuiitr 
AuthorDate: Tue Jul 10 23:28:56 2018 +0530
Commit: Thorsten Behrens 
CommitDate: Tue Mar 12 04:13:34 2019 +0100

SmartArt Pyramid: Now lays out shapes

This algorithm was initially not implemented, because of that it was
not able to show shapes which relates to pyramid, but with this patch,
It rendered correctly except some minor adjustement values issues which
can be fixed in upcoming patches.

Change-Id: I298c812615956d67eb00e1b7544d7b171a4ac14a
Reviewed-on: https://gerrit.libreoffice.org/57241
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
Reviewed-on: https://gerrit.libreoffice.org/69051
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 13b327943159..876eb3d06c8d 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -821,7 +821,38 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 }
 
 case XML_pyra:
+{
+if (rShape->getChildren().empty() || rShape->getSize().Width == 0 
|| rShape->getSize().Height == 0)
+break;
+
+// const sal_Int32 nDir = maMap.count(XML_linDir) ? 
maMap.find(XML_linDir)->second : XML_fromT;
+// const sal_Int32 npyraAcctPos = maMap.count(XML_pyraAcctPos) ? 
maMap.find(XML_pyraAcctPos)->second : XML_bef;
+// const sal_Int32 ntxDir = maMap.count(XML_txDir) ? 
maMap.find(XML_txDir)->second : XML_fromT;
+// const sal_Int32 npyraLvlNode = maMap.count(XML_pyraLvlNode) ? 
maMap.find(XML_pyraLvlNode)->second : XML_level;
+// uncomment when use in code.
+
+sal_Int32 nCount = rShape->getChildren().size();
+double fAspectRatio = 0.32;
+
+awt::Size aChildSize = rShape->getSize();
+aChildSize.Width /= nCount;
+aChildSize.Height /= nCount;
+
+awt::Point aCurrPos(0, 0);
+aCurrPos.X = fAspectRatio*aChildSize.Width*(nCount-1);
+aCurrPos.Y = fAspectRatio*aChildSize.Height;
+
+for (auto & aCurrShape : rShape->getChildren())
+{
+aCurrShape->setPosition(aCurrPos);
+aCurrPos.X -=  aChildSize.Height/(nCount-1);
+aChildSize.Width += aChildSize.Height;
+aCurrShape->setSize(aChildSize);
+aCurrShape->setChildSize(aChildSize);
+aCurrPos.Y += (aChildSize.Height);
+}
 break;
+}
 
 case XML_snake:
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - cui/source include/vcl vcl/qa vcl/source

[Libreoffice Gerrit user]

 cui/source/dialogs/FontFeaturesDialog.cxx |4 
 include/vcl/font/Feature.hxx  |   44 ---
 include/vcl/font/FeatureParser.hxx|   11 -
 vcl/qa/cppunit/FontFeatureTest.cxx|  182 ++
 vcl/source/font/Feature.cxx   |   35 -
 vcl/source/font/FeatureParser.cxx |   38 ++
 vcl/source/gdi/CommonSalLayout.cxx|4 
 7 files changed, 242 insertions(+), 76 deletions(-)

New commits:
commit 3450311c403af714d3fc0ba14b9f7673c717a6a2
Author: Khaled Hosny 
AuthorDate: Mon Mar 11 20:55:24 2019 +0200
Commit: Khaled Hosny 
CommitDate: Tue Mar 12 03:38:19 2019 +0100

tdf#123304: Allow the full feature syntax as pre 6.2

Fix regression from:

commit dc9ee533dc707cc10b99d537eaccc3ee5aa555fe
Author: Tomaž Vajngerl 
Date:   Fri Jun 15 19:32:15 2018 +0200

vcl: parser of font features included in the font name

Where hb_feature_from_string() was replaced by a simple parser that supports
avery limited subset of the syntax it supports (as documented in
https://harfbuzz.github.io/harfbuzz-hb-common.html#hb-feature-from-string)

Reviewed-on: https://gerrit.libreoffice.org/69062
Reviewed-by: Khaled Hosny 
Tested-by: Khaled Hosny 
(cherry picked from commit 45deb5b714d2d011eb2a5ad91721a9c2c508a426)

Change-Id: I613190a677d24183e8c718fcfcaf9cf9b37a1e8f
Reviewed-on: https://gerrit.libreoffice.org/69068
Reviewed-by: Khaled Hosny 
Tested-by: Khaled Hosny 

diff --git a/cui/source/dialogs/FontFeaturesDialog.cxx 
b/cui/source/dialogs/FontFeaturesDialog.cxx
index 8da13eda49e6..f9276441c1a8 100644
--- a/cui/source/dialogs/FontFeaturesDialog.cxx
+++ b/cui/source/dialogs/FontFeaturesDialog.cxx
@@ -74,7 +74,7 @@ void FontFeaturesDialog::initialize()
 void FontFeaturesDialog::fillGrid(std::vector const& 
rFontFeatures)
 {
 vcl::font::FeatureParser aParser(m_sFontName);
-std::unordered_map aExistingFeatures = 
aParser.getFeaturesMap();
+auto aExistingFeatures = aParser.getFeaturesMap();
 
 sal_Int32 i = 0;
 for (vcl::font::Feature const& rFontFeature : rFontFeatures)
@@ -89,7 +89,7 @@ void 
FontFeaturesDialog::fillGrid(std::vector const& rFontFe
 
 m_aFeatureItems.emplace_back(m_xContentGrid.get());
 
-sal_uInt32 nValue = 0;
+uint32_t nValue = 0;
 if (aExistingFeatures.find(nFontFeatureCode) != 
aExistingFeatures.end())
 nValue = aExistingFeatures.at(nFontFeatureCode);
 
diff --git a/include/vcl/font/Feature.hxx b/include/vcl/font/Feature.hxx
index 299d0a55a9f2..76ba597b1ba2 100644
--- a/include/vcl/font/Feature.hxx
+++ b/include/vcl/font/Feature.hxx
@@ -21,13 +21,13 @@ namespace vcl
 {
 namespace font
 {
-constexpr sal_uInt32 featureCode(const char sFeature[4])
+constexpr uint32_t featureCode(const char sFeature[4])
 {
-return static_cast(sFeature[0]) << 24U | 
static_cast(sFeature[1]) << 16U
-   | static_cast(sFeature[2]) << 8U | 
static_cast(sFeature[3]);
+return static_cast(sFeature[0]) << 24U | 
static_cast(sFeature[1]) << 16U
+   | static_cast(sFeature[2]) << 8U | 
static_cast(sFeature[3]);
 }
 
-VCL_DLLPUBLIC OUString featureCodeAsString(sal_uInt32 nFeature);
+VCL_DLLPUBLIC OUString featureCodeAsString(uint32_t nFeature);
 
 enum class FeatureParameterType
 {
@@ -44,22 +44,22 @@ enum class FeatureType
 struct VCL_DLLPUBLIC FeatureParameter
 {
 private:
-sal_uInt32 m_nCode;
+uint32_t m_nCode;
 OUString m_sDescription;
 const char* m_pDescriptionID;
 
 public:
-FeatureParameter(sal_uInt32 nCode, OUString aDescription);
-FeatureParameter(sal_uInt32 nCode, const char* pDescriptionID);
+FeatureParameter(uint32_t nCode, OUString aDescription);
+FeatureParameter(uint32_t nCode, const char* pDescriptionID);
 
-sal_uInt32 getCode() const;
+uint32_t getCode() const;
 OUString getDescription() const;
 };
 
 class VCL_DLLPUBLIC FeatureDefinition
 {
 private:
-sal_uInt32 m_nCode;
+uint32_t m_nCode;
 OUString m_sDescription;
 const char* m_pDescriptionID;
 OUString m_sNumericPart;
@@ -69,18 +69,18 @@ private:
 
 public:
 FeatureDefinition();
-FeatureDefinition(sal_uInt32 nCode, OUString const& rDescription,
+FeatureDefinition(uint32_t nCode, OUString const& rDescription,
   FeatureParameterType eType = FeatureParameterType::BOOL,
   std::vector const& rEnumParameters
   = std::vector{});
-FeatureDefinition(sal_uInt32 nCode, const char* pDescriptionID,
+FeatureDefinition(uint32_t nCode, const char* pDescriptionID,
   OUString const& rNumericPart = OUString());
-FeatureDefinition(sal_uInt32 nCode, const char* pDescriptionID,
+FeatureDefinition(uint32_t nCode, const char* pDescriptionID,
   std::vector aEnumParameters);
 
 const std::vector& getEnumParameters() const;
 OUString 

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - include/o3tl vcl/inc vcl/source

[Libreoffice Gerrit user]

 include/o3tl/lru_map.hxx|6 ++
 vcl/inc/svdata.hxx  |1 +
 vcl/source/gdi/FileDefinitionWidgetDraw.cxx |2 +-
 vcl/source/gdi/WidgetDefinition.cxx |2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit ab71569a7c1e1a262bfbfac998cf4acb092ed383
Author: Tomaž Vajngerl 
AuthorDate: Tue Mar 12 01:11:20 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Tue Mar 12 01:11:20 2019 +0100

fix build failures because of diff against master

Change-Id: Iefe4683f456750b53c96e1634d7930f4b042e573

diff --git a/include/o3tl/lru_map.hxx b/include/o3tl/lru_map.hxx
index 2f41521795fc..53b5d5c8d004 100644
--- a/include/o3tl/lru_map.hxx
+++ b/include/o3tl/lru_map.hxx
@@ -132,6 +132,12 @@ public:
 {
 return mLruList.size();
 }
+
+void clear()
+{
+mLruMap.clear();
+mLruList.clear();
+}
 };
 
 }
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 10051ec30660..9a17b6f176ef 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -41,6 +41,7 @@
 #include "ControlCacheKey.hxx"
 #include "schedulerimpl.hxx"
 #include 
+#include 
 
 struct ImplPostEventData;
 struct ImplTimerData;
diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx 
b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 06b85f9a2928..d4ee5a1d6dd7 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -211,7 +211,7 @@ void drawFromDrawCommands(gfx::DrawRoot const& rDrawRoot, 
SalGraphics& rGraphics
 {
 for (size_t i = 0; i < rPolygon.count(); ++i)
 {
-auto& rPoint = rPolygon.getB2DPoint(i);
+auto const& rPoint = rPolygon.getB2DPoint(i);
 double x = rPoint.getX();
 double y = rPoint.getY();
 
diff --git a/vcl/source/gdi/WidgetDefinition.cxx 
b/vcl/source/gdi/WidgetDefinition.cxx
index 668fe74bf403..069e0b99e0f0 100644
--- a/vcl/source/gdi/WidgetDefinition.cxx
+++ b/vcl/source/gdi/WidgetDefinition.cxx
@@ -184,7 +184,7 @@ void WidgetDefinitionState::addDrawImage(OUString const& 
sSource)
 
 void WidgetDefinitionState::addDrawExternal(OUString const& sSource)
 {
-auto pCommand(std::make_unique());
+auto pCommand(std::make_shared());
 pCommand->msSource = sSource;
 mpDrawCommands.push_back(std::move(pCommand));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Libreoffice Gerrit user]

 sc/source/core/tool/sharedformula.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 5c27a048658afcd2f78ef4d7e6c7128554ed3f4c
Author: Eike Rathke 
AuthorDate: Mon Mar 11 21:39:00 2019 +0100
Commit: Eike Rathke 
CommitDate: Tue Mar 12 01:07:14 2019 +0100

Resolves: tdf#120013 tdf#123714 split-off group or single cell needs 
listening

Change-Id: Ic511f618e9dde2288491c01cfcd889970fd6e4e5
Reviewed-on: https://gerrit.libreoffice.org/69066
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/sc/source/core/tool/sharedformula.cxx 
b/sc/source/core/tool/sharedformula.cxx
index 5a488aa36258..4fa12a6dfaed 100644
--- a/sc/source/core/tool/sharedformula.cxx
+++ b/sc/source/core/tool/sharedformula.cxx
@@ -71,6 +71,9 @@ bool SharedFormulaUtil::splitFormulaCellGroup(const 
CellStoreType::position_type
 else
 rPrevTop.EndListeningTo( rPrevTop.GetDocument(), nullptr, 
ScAddress( ScAddress::UNINITIALIZED));
 rPrevTop.SetNeedsListening(true);
+
+// The new group or remaining single cell needs a new listening.
+rTop.SetNeedsListening(true);
 }
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source include/vcl vcl/qa vcl/source

[Libreoffice Gerrit user]

 cui/source/dialogs/FontFeaturesDialog.cxx |4 
 include/vcl/font/Feature.hxx  |   44 ---
 include/vcl/font/FeatureParser.hxx|   11 -
 vcl/qa/cppunit/FontFeatureTest.cxx|  182 ++
 vcl/source/font/Feature.cxx   |   35 -
 vcl/source/font/FeatureParser.cxx |   35 ++---
 vcl/source/gdi/CommonSalLayout.cxx|4 
 7 files changed, 240 insertions(+), 75 deletions(-)

New commits:
commit 45deb5b714d2d011eb2a5ad91721a9c2c508a426
Author: Khaled Hosny 
AuthorDate: Mon Mar 11 20:55:24 2019 +0200
Commit: Khaled Hosny 
CommitDate: Tue Mar 12 00:54:29 2019 +0100

tdf#123304: Allow the full feature syntax as pre 6.2

Fix regression from:

commit dc9ee533dc707cc10b99d537eaccc3ee5aa555fe
Author: Tomaž Vajngerl 
Date:   Fri Jun 15 19:32:15 2018 +0200

vcl: parser of font features included in the font name

Where hb_feature_from_string() was replaced by a simple parser that supports
avery limited subset of the syntax it supports (as documented in
https://harfbuzz.github.io/harfbuzz-hb-common.html#hb-feature-from-string)

Change-Id: I613190a677d24183e8c718fcfcaf9cf9b37a1e8f
Reviewed-on: https://gerrit.libreoffice.org/69062
Reviewed-by: Khaled Hosny 
Tested-by: Khaled Hosny 

diff --git a/cui/source/dialogs/FontFeaturesDialog.cxx 
b/cui/source/dialogs/FontFeaturesDialog.cxx
index 85a07e63971b..b4dd8e7fc63e 100644
--- a/cui/source/dialogs/FontFeaturesDialog.cxx
+++ b/cui/source/dialogs/FontFeaturesDialog.cxx
@@ -76,7 +76,7 @@ void FontFeaturesDialog::initialize()
 void FontFeaturesDialog::fillGrid(std::vector const& 
rFontFeatures)
 {
 vcl::font::FeatureParser aParser(m_sFontName);
-std::unordered_map aExistingFeatures = 
aParser.getFeaturesMap();
+auto aExistingFeatures = aParser.getFeaturesMap();
 
 sal_Int32 i = 0;
 for (vcl::font::Feature const& rFontFeature : rFontFeatures)
@@ -91,7 +91,7 @@ void 
FontFeaturesDialog::fillGrid(std::vector const& rFontFe
 
 m_aFeatureItems.emplace_back(m_xContentGrid.get());
 
-sal_uInt32 nValue = 0;
+uint32_t nValue = 0;
 if (aExistingFeatures.find(nFontFeatureCode) != 
aExistingFeatures.end())
 nValue = aExistingFeatures.at(nFontFeatureCode);
 
diff --git a/include/vcl/font/Feature.hxx b/include/vcl/font/Feature.hxx
index 85e0d1bcfd0d..390abe33f8b7 100644
--- a/include/vcl/font/Feature.hxx
+++ b/include/vcl/font/Feature.hxx
@@ -18,13 +18,13 @@ namespace vcl
 {
 namespace font
 {
-constexpr sal_uInt32 featureCode(const char sFeature[4])
+constexpr uint32_t featureCode(const char sFeature[4])
 {
-return static_cast(sFeature[0]) << 24U | 
static_cast(sFeature[1]) << 16U
-   | static_cast(sFeature[2]) << 8U | 
static_cast(sFeature[3]);
+return static_cast(sFeature[0]) << 24U | 
static_cast(sFeature[1]) << 16U
+   | static_cast(sFeature[2]) << 8U | 
static_cast(sFeature[3]);
 }
 
-VCL_DLLPUBLIC OUString featureCodeAsString(sal_uInt32 nFeature);
+VCL_DLLPUBLIC OUString featureCodeAsString(uint32_t nFeature);
 
 enum class FeatureParameterType
 {
@@ -41,22 +41,22 @@ enum class FeatureType
 struct VCL_DLLPUBLIC FeatureParameter
 {
 private:
-sal_uInt32 m_nCode;
+uint32_t m_nCode;
 OUString m_sDescription;
 const char* m_pDescriptionID;
 
 public:
-FeatureParameter(sal_uInt32 nCode, OUString aDescription);
-FeatureParameter(sal_uInt32 nCode, const char* pDescriptionID);
+FeatureParameter(uint32_t nCode, OUString aDescription);
+FeatureParameter(uint32_t nCode, const char* pDescriptionID);
 
-sal_uInt32 getCode() const;
+uint32_t getCode() const;
 OUString getDescription() const;
 };
 
 class VCL_DLLPUBLIC FeatureDefinition
 {
 private:
-sal_uInt32 m_nCode;
+uint32_t m_nCode;
 OUString m_sDescription;
 const char* m_pDescriptionID;
 OUString m_sNumericPart;
@@ -66,18 +66,18 @@ private:
 
 public:
 FeatureDefinition();
-FeatureDefinition(sal_uInt32 nCode, OUString const& rDescription,
+FeatureDefinition(uint32_t nCode, OUString const& rDescription,
   FeatureParameterType eType = FeatureParameterType::BOOL,
   std::vector const& rEnumParameters
   = std::vector{});
-FeatureDefinition(sal_uInt32 nCode, const char* pDescriptionID,
+FeatureDefinition(uint32_t nCode, const char* pDescriptionID,
   OUString const& rNumericPart = OUString());
-FeatureDefinition(sal_uInt32 nCode, const char* pDescriptionID,
+FeatureDefinition(uint32_t nCode, const char* pDescriptionID,
   std::vector aEnumParameters);
 
 const std::vector& getEnumParameters() const;
 OUString getDescription() const;
-sal_uInt32 getCode() const;
+uint32_t getCode() const;
 FeatureParameterType getType() const;
 
 operator bool() const;
@@ -85,9 +85,9 @@ public:
 
 str

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 3 commits - vcl/inc vcl/source vcl/uiconfig

[Libreoffice Gerrit user]

 vcl/inc/svdata.hxx|4 
 vcl/source/app/svmain.cxx |3 
 vcl/source/gdi/FileDefinitionWidgetDraw.cxx   |  146 +++---
 vcl/uiconfig/theme_definitions/definition.xml |2 
 4 files changed, 96 insertions(+), 59 deletions(-)

New commits:
commit fe4da4c2ec02159afe6206db78920e8fde7691d0
Author: Tomaž Vajngerl 
AuthorDate: Mon Mar 11 17:08:18 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Tue Mar 12 00:38:24 2019 +0100

widget theme: change the tab item height to (min) 32 px

Change-Id: I1919300071a06242fe832880b46c944989daa4b6
Reviewed-on: https://gerrit.libreoffice.org/69057
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 212a40aaf7ec3316d5209b688f5f79821f99fbdc)

diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx 
b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index a15010014aa4..06b85f9a2928 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -775,10 +775,12 @@ bool FileDefinitionWidgetDraw::getNativeControlRegion(
 if (!pPart)
 return false;
 
-rNativeBoundingRegion = tools::Rectangle(
-rBoundingControlRegion.TopLeft(),
-Size(rBoundingControlRegion.GetWidth() + pPart->mnMarginWidth,
- rBoundingControlRegion.GetHeight() + 
pPart->mnMarginHeight));
+long nWidth = std::max(rBoundingControlRegion.GetWidth() + 
pPart->mnMarginWidth,
+   long(pPart->mnWidth));
+long nHeight = std::max(rBoundingControlRegion.GetHeight() + 
pPart->mnMarginHeight,
+long(pPart->mnHeight));
+
+rNativeBoundingRegion = tools::Rectangle(aLocation, Size(nWidth, 
nHeight));
 rNativeContentRegion = rNativeBoundingRegion;
 return true;
 }
diff --git a/vcl/uiconfig/theme_definitions/definition.xml 
b/vcl/uiconfig/theme_definitions/definition.xml
index e91953109554..5a4be114ea97 100644
--- a/vcl/uiconfig/theme_definitions/definition.xml
+++ b/vcl/uiconfig/theme_definitions/definition.xml
@@ -320,7 +320,7 @@
 
 
 
-
+
 
 
 
commit 7a6e7ed16ed57e131079ee79d06b03141117d9d7
Author: Tomaž Vajngerl 
AuthorDate: Mon Mar 11 16:52:37 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Tue Mar 12 00:38:11 2019 +0100

better adjustment algorithm for dynamic sized widgets

A algorithm that gives better results for dynamically sized
widgets is to increase proportionally only the points in shapes
that are over the half of the widget width (or height, when
adjusting the other dimension). This preserves the margins and
doesn't distort the shape of the paths, which is especially
visible when the source needs to be largely resized in one
dimension only.

Change-Id: I2cceb249063387c0f7400ef8d75adb5899aa8c23
Reviewed-on: https://gerrit.libreoffice.org/69056
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 897f6f6252f38e93764aa0e72135768ab1ec3679)

diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx 
b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index ae303d966897..a15010014aa4 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -168,24 +168,18 @@ void drawFromDrawCommands(gfx::DrawRoot const& rDrawRoot, 
SalGraphics& rGraphics
 
 basegfx::B2DRange aInputRectangle(rRectangle.maRectangle);
 
+double fDeltaX = aTargetSurface.getWidth() - 
aSVGRect.getWidth();
+double fDeltaY = aTargetSurface.getHeight() - 
aSVGRect.getHeight();
+
 basegfx::B2DRange aFinalRectangle(
-aTargetSurface.getMinX() + aInputRectangle.getMinX(),
-aTargetSurface.getMinY() + aInputRectangle.getMinY(),
-aTargetSurface.getMaxX() - (aSVGRect.getMaxX() - 
aInputRectangle.getMaxX()),
-aTargetSurface.getMaxY() - (aSVGRect.getMaxY() - 
aInputRectangle.getMaxY()));
-
-
aInputRectangle.transform(basegfx::utils::createTranslateB2DHomMatrix(
--aInputRectangle.getMinX(), -aInputRectangle.getMinY()));
-
aInputRectangle.transform(basegfx::utils::createScaleB2DHomMatrix(
-aFinalRectangle.getWidth() / aInputRectangle.getWidth(),
-aFinalRectangle.getHeight() / 
aInputRectangle.getHeight()));
-
aInputRectangle.transform(basegfx::utils::createTranslateB2DHomMatrix(
-aFinalRectangle.getMinX() - 0.5,
-aFinalRectangle.getMinY()
-- 0.5)); // compensate 0.5 for different 
interpretation of where the center of a pixel is
+aInputRectangle.getMinX(), aInput

[Libreoffice-commits] core.git: 2 commits - vcl/source vcl/uiconfig

[Libreoffice Gerrit user]

 vcl/source/gdi/FileDefinitionWidgetDraw.cxx   |   74 +++---
 vcl/uiconfig/theme_definitions/definition.xml |2 
 2 files changed, 35 insertions(+), 41 deletions(-)

New commits:
commit 212a40aaf7ec3316d5209b688f5f79821f99fbdc
Author: Tomaž Vajngerl 
AuthorDate: Mon Mar 11 17:08:18 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Mon Mar 11 23:09:18 2019 +0100

widget theme: change the tab item height to (min) 32 px

Change-Id: I1919300071a06242fe832880b46c944989daa4b6
Reviewed-on: https://gerrit.libreoffice.org/69057
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx 
b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 213547cc2d3a..64ef751c7476 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -776,10 +776,12 @@ bool FileDefinitionWidgetDraw::getNativeControlRegion(
 if (!pPart)
 return false;
 
-rNativeBoundingRegion = tools::Rectangle(
-rBoundingControlRegion.TopLeft(),
-Size(rBoundingControlRegion.GetWidth() + pPart->mnMarginWidth,
- rBoundingControlRegion.GetHeight() + 
pPart->mnMarginHeight));
+long nWidth = std::max(rBoundingControlRegion.GetWidth() + 
pPart->mnMarginWidth,
+   long(pPart->mnWidth));
+long nHeight = std::max(rBoundingControlRegion.GetHeight() + 
pPart->mnMarginHeight,
+long(pPart->mnHeight));
+
+rNativeBoundingRegion = tools::Rectangle(aLocation, Size(nWidth, 
nHeight));
 rNativeContentRegion = rNativeBoundingRegion;
 return true;
 }
diff --git a/vcl/uiconfig/theme_definitions/definition.xml 
b/vcl/uiconfig/theme_definitions/definition.xml
index e91953109554..5a4be114ea97 100644
--- a/vcl/uiconfig/theme_definitions/definition.xml
+++ b/vcl/uiconfig/theme_definitions/definition.xml
@@ -320,7 +320,7 @@
 
 
 
-
+
 
 
 
commit 897f6f6252f38e93764aa0e72135768ab1ec3679
Author: Tomaž Vajngerl 
AuthorDate: Mon Mar 11 16:52:37 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Mon Mar 11 23:09:08 2019 +0100

better adjustment algorithm for dynamic sized widgets

A algorithm that gives better results for dynamically sized
widgets is to increase proportionally only the points in shapes
that are over the half of the widget width (or height, when
adjusting the other dimension). This preserves the margins and
doesn't distort the shape of the paths, which is especially
visible when the source needs to be largely resized in one
dimension only.

Change-Id: I2cceb249063387c0f7400ef8d75adb5899aa8c23
Reviewed-on: https://gerrit.libreoffice.org/69056
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx 
b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 3c0ad43c99b7..213547cc2d3a 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -165,24 +165,18 @@ void drawFromDrawCommands(gfx::DrawRoot const& rDrawRoot, 
SalGraphics& rGraphics
 
 basegfx::B2DRange aInputRectangle(rRectangle.maRectangle);
 
+double fDeltaX = aTargetSurface.getWidth() - 
aSVGRect.getWidth();
+double fDeltaY = aTargetSurface.getHeight() - 
aSVGRect.getHeight();
+
 basegfx::B2DRange aFinalRectangle(
-aTargetSurface.getMinX() + aInputRectangle.getMinX(),
-aTargetSurface.getMinY() + aInputRectangle.getMinY(),
-aTargetSurface.getMaxX() - (aSVGRect.getMaxX() - 
aInputRectangle.getMaxX()),
-aTargetSurface.getMaxY() - (aSVGRect.getMaxY() - 
aInputRectangle.getMaxY()));
-
-
aInputRectangle.transform(basegfx::utils::createTranslateB2DHomMatrix(
--aInputRectangle.getMinX(), -aInputRectangle.getMinY()));
-
aInputRectangle.transform(basegfx::utils::createScaleB2DHomMatrix(
-aFinalRectangle.getWidth() / aInputRectangle.getWidth(),
-aFinalRectangle.getHeight() / 
aInputRectangle.getHeight()));
-
aInputRectangle.transform(basegfx::utils::createTranslateB2DHomMatrix(
-aFinalRectangle.getMinX() - 0.5,
-aFinalRectangle.getMinY()
-- 0.5)); // compensate 0.5 for different 
interpretation of where the center of a pixel is
+aInputRectangle.getMinX(), aInputRectangle.getMinY(),
+aInputRectangle.getMaxX() + fDeltaX, 
aInputRectangle.getMaxY() + fDeltaY);
+
+
aFinalRectangle.transform(basegfx::utils::createTranslateB2DHomMatrix(
+aTargetSurface.getMinX() -

[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

[Libreoffice Gerrit user]

 ios/CustomTarget_iOS_setup.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6088eeb6ea1c92be96418116556e32de6d33d038
Author: Tor Lillqvist 
AuthorDate: Mon Mar 11 17:16:20 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Mar 11 23:33:33 2019 +0200

We need share/theme_definitions in the iOS app

Change-Id: I460a71f363eb3b7f89786b8bd02f4b8f9521f4c7

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index e651dd63f5bb..faf8d25bf629 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -67,6 +67,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
cp -R $(INSTDIR)/share/registry $(IOSRES)
cp $(INSTDIR)/share/config/*zip $(IOSRES)/share/config
cp -R $(INSTDIR)/share/liblangtag $(IOSRES)/share
+   cp -R $(INSTDIR)/share/theme_definitions $(IOSRES)/share
mkdir -p $(IOSRES)/share/fonts/truetype
cp $(INSTDIR)/share/fonts/truetype/Liberation* 
$(IOSRES)/share/fonts/truetype
cp $(SRCDIR)/ios/welcome.odt $(IOSRES)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/build loleaflet/js loleaflet/Makefile.am loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/Makefile.am   |   10 +++---
 loleaflet/build/deps.js |4 
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 315fc0b3e8d4ccd968984d15e5913600316add99
Author: Henry Castro 
AuthorDate: Mon Mar 11 16:53:39 2019 -0400
Commit: Henry Castro 
CommitDate: Mon Mar 11 17:30:07 2019 -0400

loleaflet: move main.js to src/ directory

Simplify building loleaflet.

Change-Id: I3cdc6455b21e683b0331997766badd606c6aca43

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index e64869516..00953227f 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -308,8 +308,7 @@ $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_DST) \
$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
$(builddir)/dist/global.js \
$(builddir)/dist/jquery.mCustomScrollbar.js \
-   $(builddir)/dist/w2ui-1.5.rc1.js \
-   $(builddir)/dist/main.js
+   $(builddir)/dist/w2ui-1.5.rc1.js
@touch $@
 else
 $(LOLEAFLET_PREFIX)/dist/loleaflet-src.js: $(LOLEAFLET_JS_SRC)
@@ -335,8 +334,7 @@ $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
$(builddir)/dist/global.js \
$(srcdir)/js/jquery.mCustomScrollbar.js \
-   $(srcdir)/js/w2ui-1.5.rc1.js \
-   $(srcdir)/js/main.js
+   $(srcdir)/js/w2ui-1.5.rc1.js
@echo "Uglify loleaflet js files..."
NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
node_modules/uglify-js/bin/uglifyjs \
$(L10N_IOS_ALL_JS) \
@@ -344,7 +342,6 @@ $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
$(srcdir)/js/jquery.mCustomScrollbar.js \
$(srcdir)/js/w2ui-1.5.rc1.js \
$(builddir)/build/dist/loleaflet-src.js \
-   $(srcdir)/js/main.js \
--output $@
 endif
 
@@ -362,8 +359,7 @@ $(builddir)/dist/loleaflet.html: 
$(srcdir)/html/loleaflet.html.m4 $(LOLEAFLET_HT
-DLOLEAFLET_JS="$(subst $(SPACE),$(COMMA),$(NODE_MODULES_JS) \
jquery.mCustomScrollbar.js \
w2ui-1.5.rc1.js \
-   $(call LOLEAFLET_JS,$(srcdir)/build/build.js) \
-   main.js)" \
+   $(call LOLEAFLET_JS,$(srcdir)/build/build.js))" \
$(srcdir)/html/loleaflet.html.m4 > $@
 
 node_modules: npm-shrinkwrap.json
diff --git a/loleaflet/build/deps.js b/loleaflet/build/deps.js
index c1247ab54..88f60116f 100644
--- a/loleaflet/build/deps.js
+++ b/loleaflet/build/deps.js
@@ -499,6 +499,10 @@ var deps = {
DivOverlay: {
src: ['layer/marker/DivOverlay.js'],
desc: 'Div overlay to put on the map.'
+   },
+
+   Main: {
+   src: ['main.js']
}
 };
 
diff --git a/loleaflet/js/main.js b/loleaflet/src/main.js
similarity index 100%
rename from loleaflet/js/main.js
rename to loleaflet/src/main.js
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/CppunitTest_vcl_gen.mk vcl/Module_vcl.mk vcl/opengl vcl/qa

[Libreoffice Gerrit user]

 vcl/CppunitTest_vcl_gen.mk|   42 +
 vcl/Module_vcl.mk |6 ++
 vcl/opengl/salbmp.cxx |7 --
 vcl/qa/cppunit/gen/data/tdf121120.png |binary
 vcl/qa/cppunit/gen/gen.cxx|   84 ++
 5 files changed, 132 insertions(+), 7 deletions(-)

New commits:
commit 20726c61680242eb647253651302dc048348687d
Author: Miklos Vajna 
AuthorDate: Fri Mar 8 16:36:03 2019 +0100
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 22:26:36 2019 +0100

tdf#121120 vcl opengl: handle 8-bit palette bitmap as 24 bit RGB texture

This fixes the black rectangle instead of actual image content in the
bugdoc.

An alternative would be to handle this in the PNG import, but commit
66dbd4da3afcadb1393daf9be9cecff71b86509a (tdf#113918: Workaround: Load
1bpp indexed PNG as 8bpp indexed Bitmap, 2017-11-20) already tried
something similar and failed, leading to the revert in commit
25cd843664919974f0d21ca7a0b02cc43e9eeabb (tdf#115297: alternative fix
for displaying 1bit images, 2018-02-27).

The test is especially useful with SAL_FORCEGL=1 SAL_USE_VCLPLUGIN=gen
specified on Linux, so the GL codepath is triggered.

(cherry picked from commit ba0abd02df8d62342497018f516535a2f1597fb6)

Change-Id: Ia9d049d09dce2ac34826ee427f74616a96a35c88
Reviewed-on: https://gerrit.libreoffice.org/69036
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/CppunitTest_vcl_gen.mk b/vcl/CppunitTest_vcl_gen.mk
new file mode 100644
index ..84dd0ca25bb0
--- /dev/null
+++ b/vcl/CppunitTest_vcl_gen.mk
@@ -0,0 +1,42 @@
+# -*- Mode: makefile-gmake; 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/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,vcl_gen))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,vcl_gen, \
+   vcl/qa/cppunit/gen/gen \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,vcl_gen, \
+   comphelper \
+   cppu \
+   cppuhelper \
+   sal \
+   sfx \
+   subsequenttest \
+   test \
+   tl \
+   unotest \
+   vcl \
+))
+
+$(eval $(call gb_CppunitTest_use_external,vcl_gen,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,vcl_gen))
+
+$(eval $(call gb_CppunitTest_use_ure,vcl_gen))
+$(eval $(call gb_CppunitTest_use_vcl_non_headless,vcl_gen))
+
+$(eval $(call gb_CppunitTest_use_rdb,vcl_gen,services))
+
+$(eval $(call gb_CppunitTest_use_configuration,vcl_gen))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index baef5f31e34e..cd50d11771f1 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -251,4 +251,10 @@ $(eval $(call gb_Module_add_screenshot_targets,vcl,\
 CppunitTest_vcl_dialogs_test \
 ))
 
+ifneq ($(DISPLAY),)
+$(eval $(call gb_Module_add_slowcheck_targets,vcl,\
+CppunitTest_vcl_gen \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index ca8f118c8003..2a579e813a5b 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -496,13 +496,6 @@ GLuint OpenGLSalBitmap::CreateTexture()
 
 determineTextureFormat(mnBits, nFormat, nType);
 }
-else if( mnBits == 8 && maPalette.IsGreyPalette() )
-{
-// no conversion needed for grayscale
-pData = mpUserBuffer.get();
-nFormat = GL_LUMINANCE;
-nType = GL_UNSIGNED_BYTE;
-}
 else
 {
 VCL_GL_INFO( "::CreateTexture - convert from " << mnBits << " to 
24 bits" );
diff --git a/vcl/qa/cppunit/gen/data/tdf121120.png 
b/vcl/qa/cppunit/gen/data/tdf121120.png
new file mode 100644
index ..8e48fba385f9
Binary files /dev/null and b/vcl/qa/cppunit/gen/data/tdf121120.png differ
diff --git a/vcl/qa/cppunit/gen/gen.cxx b/vcl/qa/cppunit/gen/gen.cxx
new file mode 100644
index ..f5d1c1c6769c
--- /dev/null
+++ b/vcl/qa/cppunit/gen/gen.cxx
@@ -0,0 +1,84 @@
+/* -*- 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 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+using namespace com::sun::star;
+
+/// This test uses the gen backend (i.e. intentionally not

[Libreoffice-commits] core.git: cui/source cui/uiconfig filter/source include/svtools sc/source svtools/source svx/source

[Libreoffice Gerrit user]

 cui/source/options/dbregister.cxx |   10 -
 cui/source/options/doclinkdialog.cxx  |  114 +-
 cui/source/options/doclinkdialog.hxx  |   35 ++
 cui/uiconfig/ui/databaselinkdialog.ui |   20 ++-
 filter/source/xsltdialog/xmlfiltertabpagexslt.cxx |8 -
 include/svtools/inettbc.hxx   |   12 +-
 include/svtools/urlcontrol.hxx|2 
 sc/source/ui/miscdlgs/datastreamdlg.cxx   |4 
 sc/source/ui/miscdlgs/linkarea.cxx|8 -
 svtools/source/control/inettbc.cxx|   37 ++-
 svx/source/form/datanavi.cxx  |2 
 svx/source/inc/datanavi.hxx   |6 -
 12 files changed, 139 insertions(+), 119 deletions(-)

New commits:
commit 5f9368a35d641c5b611fab9945969e92a0f368a1
Author: Caolán McNamara 
AuthorDate: Mon Mar 11 15:55:24 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 22:23:21 2019 +0100

weld ODocumentLinkDialog

Change-Id: I9dd3a25e68da00acff24f5ccfafbfc97d9efcf54
Reviewed-on: https://gerrit.libreoffice.org/69058
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/options/dbregister.cxx 
b/cui/source/options/dbregister.cxx
index a30e059c7c10..e71fac5ccd80 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -403,15 +403,15 @@ void DbRegistrationOptionsPage::insertNewEntry( const 
OUString& _sName,const OUS
 
 void DbRegistrationOptionsPage::openLinkDialog(const OUString& _sOldName,const 
OUString& _sOldLocation,SvTreeListEntry const * _pEntry)
 {
-ScopedVclPtrInstance< ODocumentLinkDialog > aDlg(this,_pEntry == nullptr);
+ODocumentLinkDialog aDlg(GetDialogFrameWeld(), _pEntry == nullptr);
 
-aDlg->setLink(_sOldName,_sOldLocation);
-aDlg->setNameValidator(LINK( this, DbRegistrationOptionsPage, 
NameValidator ) );
+aDlg.setLink(_sOldName,_sOldLocation);
+aDlg.setNameValidator(LINK( this, DbRegistrationOptionsPage, NameValidator 
) );
 
-if ( aDlg->Execute() == RET_OK )
+if (aDlg.run() == RET_OK)
 {
 OUString sNewName,sNewLocation;
-aDlg->getLink(sNewName,sNewLocation);
+aDlg.getLink(sNewName,sNewLocation);
 if ( _pEntry == nullptr || sNewName != _sOldName || sNewLocation != 
_sOldLocation )
 {
 if ( _pEntry )
diff --git a/cui/source/options/doclinkdialog.cxx 
b/cui/source/options/doclinkdialog.cxx
index 201cb18c7549..1baf362e778b 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -33,80 +33,60 @@
 
 namespace svx
 {
-
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::ucb;
 using namespace ::svt;
 
-ODocumentLinkDialog::ODocumentLinkDialog( vcl::Window* _pParent, bool 
_bCreateNew )
-: ModalDialog(_pParent, "DatabaseLinkDialog",
-"cui/ui/databaselinkdialog.ui")
+ODocumentLinkDialog::ODocumentLinkDialog(weld::Window* pParent, bool 
_bCreateNew)
+: GenericDialogController(pParent, "cui/ui/databaselinkdialog.ui", 
"DatabaseLinkDialog")
+, m_xBrowseFile(m_xBuilder->weld_button("browse"))
+, m_xName(m_xBuilder->weld_entry("name"))
+, m_xOK(m_xBuilder->weld_button("ok"))
+, m_xAltTitle(m_xBuilder->weld_label("alttitle"))
+, m_xURL(new URLBox(m_xBuilder->weld_combo_box("url")))
 {
-get(m_pURL, "url");
-get(m_pOK, "ok");
-get(m_pName, "name");
-get(m_pBrowseFile, "browse");
-
 if (!_bCreateNew)
-SetText(get("alttitle")->GetText());
+m_xDialog->set_title(m_xAltTitle->get_label());
 
-m_pURL->SetFilter("*.odb");
+m_xURL->SetSmartProtocol(INetProtocol::File);
+m_xURL->DisableHistory();
+m_xURL->SetFilter("*.odb");
 
-m_pName->SetModifyHdl( LINK(this, ODocumentLinkDialog, OnTextModified) 
);
-m_pURL->SetModifyHdl( LINK(this, ODocumentLinkDialog, OnTextModified) 
);
-m_pBrowseFile->SetClickHdl( LINK(this, ODocumentLinkDialog, 
OnBrowseFile) );
-m_pOK->SetClickHdl( LINK(this, ODocumentLinkDialog, OnOk) );
-
-m_pURL->SetDropDownLineCount(10);
+m_xName->connect_changed( LINK(this, ODocumentLinkDialog, 
OnEntryModified) );
+m_xURL->connect_changed( LINK(this, ODocumentLinkDialog, 
OnComboBoxModified) );
+m_xBrowseFile->connect_clicked( LINK(this, ODocumentLinkDialog, 
OnBrowseFile) );
+m_xOK->connect_clicked( LINK(this, ODocumentLinkDialog, OnOk) );
 
 validate();
-
-m_pURL->SetDropDownLineCount( 5 );
 }
 
 ODocumentLinkDialog::~ODocumentLinkDialog()
 {
-disposeOnce();
 }
 
-void ODocumentLinkDialog::dispose()
+void ODocumentLinkDialog::setLink(const OUString& rName, const OUString& 
rURL)
 {
-  

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - svgio/qa

[Libreoffice Gerrit user]

 svgio/qa/cppunit/SvgRead.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8a82814679c986e5627151ae84340974c468ac18
Author: Mike Kaganski 
AuthorDate: Mon Mar 11 22:18:14 2019 +0300
Commit: Tomaž Vajngerl 
CommitDate: Mon Mar 11 21:26:07 2019 +0100

Fix build

[CXX] svgio/qa/cppunit/SvgRead.cxx
C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(103): error C2440: 
'': cannot convert from 'Color' to 'sal_Int32'
C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(103): note: No 
user-defined-conversion operator available that can perform this conversion, or 
the operator
cannot be called
C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(103): error C2672: 
'CppUnit::assertEquals': no matching overloaded function found
C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(103): error C2780: 'void 
CppUnit::assertEquals(const T &,const T &,CppUnit::SourceLine,const std::string
&)': expects 4 arguments - 3 provided

C:\lo\src\core2\workdir\UnpackedTarball\cppunit\include\cppunit/TestAssert.h(127):
 note: see declaration of 'CppUnit::assertEquals'
C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(105): error C2440: 
'': cannot convert from 'Color' to 'sal_Int32'
C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(105): note: No 
user-defined-conversion operator available that can perform this conversion, or 
the operator
cannot be called
C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(105): error C2672: 
'CppUnit::assertEquals': no matching overloaded function found
C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(105): error C2780: 'void 
CppUnit::assertEquals(const T &,const T &,CppUnit::SourceLine,const std::string
&)': expects 4 arguments - 3 provided

C:\lo\src\core2\workdir\UnpackedTarball\cppunit\include\cppunit/TestAssert.h(127):
 note: see declaration of 'CppUnit::assertEquals'
C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(134): error C2440: 
'': cannot convert from 'Color' to 'sal_Int32'
C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(134): note: No 
user-defined-conversion operator available that can perform this conversion, or 
the operator
cannot be called
C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(134): error C2672: 
'CppUnit::assertEquals': no matching overloaded function found
C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(134): error C2780: 'void 
CppUnit::assertEquals(const T &,const T &,CppUnit::SourceLine,const std::string
&)': expects 4 arguments - 3 provided

C:\lo\src\core2\workdir\UnpackedTarball\cppunit\include\cppunit/TestAssert.h(127):
 note: see declaration of 'CppUnit::assertEquals'
C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(136): error C2440: 
'': cannot convert from 'Color' to 'sal_Int32'
C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(136): note: No 
user-defined-conversion operator available that can perform this conversion, or 
the operator
cannot be called
C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(136): error C2672: 
'CppUnit::assertEquals': no matching overloaded function found
C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(136): error C2780: 'void 
CppUnit::assertEquals(const T &,const T &,CppUnit::SourceLine,const std::string
&)': expects 4 arguments - 3 provided

C:\lo\src\core2\workdir\UnpackedTarball\cppunit\include\cppunit/TestAssert.h(127):
 note: see declaration of 'CppUnit::assertEquals'
make[1]: *** [C:/lo/src/core2/solenv/gbuild/LinkTarget.mk:293: 
C:/lo/src/core2/workdir/CxxObject/svgio/qa/cppunit/SvgRead.o] Error 2
make: *** [Makefile:166: CppunitTest_svgio_read] Error 2

Change-Id: I4e1cf222a416772f1920194ccfcf459f40b577d6
Reviewed-on: https://gerrit.libreoffice.org/69064
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 

diff --git a/svgio/qa/cppunit/SvgRead.cxx b/svgio/qa/cppunit/SvgRead.cxx
index 996be9d21f08..8b13bd68bb45 100644
--- a/svgio/qa/cppunit/SvgRead.cxx
+++ b/svgio/qa/cppunit/SvgRead.cxx
@@ -100,9 +100,9 @@ void TestParsing::testSimpleRectangle()
 CPPUNIT_ASSERT_EQUAL(basegfx::B2DRange(10, 10, 110, 110), 
pDrawRect->maRectangle);
 CPPUNIT_ASSERT_EQUAL(3.0, pDrawRect->mnStrokeWidth);
 CPPUNIT_ASSERT(bool(pDrawRect->mpStrokeColor));
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0xff), 
sal_Int32(Color(*pDrawRect->mpStrokeColor)));
+CPPUNIT_ASSERT_EQUAL(ColorData(0xff), 
Color(*pDrawRect->mpStrokeColor).GetRGBColor());
 CPPUNIT_ASSERT(bool(pDrawRect->mpFillColor));
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0x00cc00), 
sal_Int32(Color(*pDrawRect->mpFillColor)));
+CPPUNIT_ASSERT_EQUAL(ColorData(0x00cc00), 
Color(*pDrawRect->mpFillColor).GetRGBColor());
 }
 
 void TestParsing::testPath()
@@ -131,9 +131,9 @@ void TestParsing::testPath()
  
basegfx::utils::exportToSvgD(pDrawPath->maPolyPolygon, true, true, false));
 CPPUNIT_ASSERT_EQUAL(0.0, pDrawPath->mnStrokeWidth);
 CPPUNIT_ASSERT(bool(pDrawPath->mpStrokeColor));
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0xff

[Libreoffice-commits] core.git: vcl/inc vcl/source

[Libreoffice Gerrit user]

 vcl/inc/svdata.hxx  |4 +
 vcl/source/app/svmain.cxx   |3 +
 vcl/source/gdi/FileDefinitionWidgetDraw.cxx |   72 +---
 3 files changed, 61 insertions(+), 18 deletions(-)

New commits:
commit 805b15ce536e3d6c40d0dc4f98b5aa6ffa5344c0
Author: Tomaž Vajngerl 
AuthorDate: Mon Mar 11 16:38:32 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Mon Mar 11 21:21:50 2019 +0100

cache file based widget images and draw commands

It is wasteful to parse svg icons all the time so lets cache the
result when this make sense in a LRU map.

Change-Id: I95cc317c9301138a9e384d270223ba147a123e59
Reviewed-on: https://gerrit.libreoffice.org/69055
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index cb666e718943..c5b3482642a2 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -42,6 +42,7 @@
 #include 
 #include "ControlCacheKey.hxx"
 #include "schedulerimpl.hxx"
+#include 
 
 struct ImplPostEventData;
 struct ImplTimerData;
@@ -199,6 +200,9 @@ struct ImplSVGDIData
 longmnAppFontX = 0; // AppFont 
X-Numenator for 40/tel Width
 longmnAppFontY = 0; // AppFont 
Y-Numenator for 80/tel Height
 boolmbFontSubChanged = false;   // true: 
FontSubstitution was changed between Begin/End
+
+o3tl::lru_map maThemeImageCache = 
o3tl::lru_map(10);
+o3tl::lru_map maThemeDrawCommandsCache = 
o3tl::lru_map(50);
 };
 
 struct ImplSVWinData
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 7f23e366cc67..6319208896ae 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -575,6 +575,9 @@ void DeInitVCL()
 pSVData->maGDIData.maScaleCache.remove_if([](const 
o3tl::lru_map::key_value_pair_t&)
 { return true; });
 
+pSVData->maGDIData.maThemeDrawCommandsCache.clear();
+pSVData->maGDIData.maThemeImageCache.clear();
+
 // Deinit Sal
 if (pSVData->mpDefInst)
 {
diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx 
b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index e321734e9a6e..3c0ad43c99b7 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -343,9 +343,26 @@ void 
munchDrawCommands(std::vector> const& rDrawCom
 nScaleFactor = comphelper::LibreOfficeKit::getDPIScale();
 
 auto const& rDrawCommand = static_cast(*pDrawCommand);
-SvFileStream aFileStream(rDrawCommand.msSource, 
StreamMode::READ);
+auto& rCacheImages = 
ImplGetSVData()->maGDIData.maThemeImageCache;
+OUString rCacheKey = rDrawCommand.msSource + "@" + 
OUString::number(nScaleFactor);
+auto& aIterator = rCacheImages.find(rCacheKey);
+
 BitmapEx aBitmap;
-vcl::bitmap::loadFromSvg(aFileStream, "", aBitmap, 
nScaleFactor);
+if (aIterator == rCacheImages.end())
+{
+SvFileStream aFileStream(rDrawCommand.msSource, 
StreamMode::READ);
+
+vcl::bitmap::loadFromSvg(aFileStream, "", aBitmap, 
nScaleFactor);
+if (!!aBitmap)
+{
+rCacheImages.insert(std::make_pair(rCacheKey, 
aBitmap));
+}
+}
+else
+{
+aBitmap = aIterator->second;
+}
+
 long nImageWidth = aBitmap.GetSizePixel().Width();
 long nImageHeight = aBitmap.GetSizePixel().Height();
 SalTwoRect aTR(0, 0, nImageWidth, nImageHeight, nX, nY, 
nImageWidth / nScaleFactor,
@@ -370,27 +387,46 @@ void 
munchDrawCommands(std::vector> const& rDrawCom
 case DrawCommandType::EXTERNAL:
 {
 auto const& rDrawCommand = static_cast(*pDrawCommand);
-SvFileStream aFileStream(rDrawCommand.msSource, 
StreamMode::READ);
 
-uno::Reference xContext(
-comphelper::getProcessComponentContext());
-const uno::Reference xSvgParser
-= graphic::SvgTools::create(xContext);
+auto& rCacheDrawCommands = 
ImplGetSVData()->maGDIData.maThemeDrawCommandsCache;
 
-std::size_t nSize = aFileStream.remainingSize();
-std::vector aBuffer(nSize + 1);
-aFileStream.ReadBytes(aBuffer.data(), nSize);
-aBuffer[nSize] = 0;
+auto& aIterator = 
rCacheDrawCommands.find(rDrawCommand.msSource);
 
-uno::Sequence aData(aBuffer.data(), nSize + 1);
-uno::Reference aInputStream(
-new comphelper::SequenceInputStream(aData));
+gfx::DrawRoot aDrawRoot;
 
-

[Libreoffice-commits] core.git: connectivity/registry

[Libreoffice Gerrit user]

 connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu  |4 
+---
 connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu |4 
+---
 connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu |4 
+---
 3 files changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 812316f63bc07520c9736af0360c711780fcbf55
Author: Caolán McNamara 
AuthorDate: Mon Mar 11 11:35:26 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 21:00:54 2019 +0100

Related: tdf#123975 I think this needs to be initially unset

i.e. 
https://help.libreoffice.org/Common/Special_Settings#Supports_primary_keys

"This tri-state check box by default is set to the undetermined state"

otherwise the fix for tdf#123975 has no effect

this change initially in...

commit 3208fcb3a36d75d6290d9c548430682f153b09db
Date:   Thu Sep 13 22:57:58 2018 +0200

tdf#119743: add Features entries in Properties block Drivers.xcu

Change-Id: Ic08fb1330985b90eec10662d50462f4ec127b9f9
Reviewed-on: https://gerrit.libreoffice.org/69042
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git 
a/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu 
b/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu
index 22880e912407..91c9a15cfb0a 100644
--- a/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -99,9 +99,7 @@
   
 
 
-  
-true
-  
+  
 
 
   
diff --git 
a/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu 
b/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu
index 03b4ee371cd1..65a0d72a2ed1 100644
--- a/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -134,9 +134,7 @@
   
 
 
-  
-true
-  
+  
 
 
   
diff --git 
a/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu 
b/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
index f0d1e03a7bec..f2dbd91c8ed7 100644
--- a/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -141,9 +141,7 @@
   
 
 
-  
-true
-  
+  
 
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/ui/dlg/advancedsettings.cxx |   31 +++-
 dbaccess/source/ui/dlg/advancedsettings.hxx |3 ++
 2 files changed, 33 insertions(+), 1 deletion(-)

New commits:
commit d89dc81a63a36d75f13064ae2a321f1d8903bf30
Author: Caolán McNamara 
AuthorDate: Mon Mar 11 11:35:44 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 21:00:07 2019 +0100

Resolves: tdf#123975 support tri-state for PrimaryKey ui

typically indeterminate is an initial state which is not returnable
to, this is not the case for PrimaryKey

Change-Id: I82f318e18ad9beabd9ca6e3003a736fee9a5e931
Reviewed-on: https://gerrit.libreoffice.org/69043
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx 
b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 3a60598aac8f..38c50c6467bc 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -87,7 +87,10 @@ namespace dbaui
 const SfxPoolItem& rItem = _rCoreAttrs.Get(nItemId);
 booleanSetting.bOptionalBool = dynamic_cast(&rItem) != nullptr;
 booleanSetting.xControl = 
m_xBuilder->weld_check_button(booleanSetting.sControlId);
-booleanSetting.xControl->connect_toggled(LINK(this, 
SpecialSettingsPage, OnToggleHdl));
+if (booleanSetting.bOptionalBool)
+booleanSetting.xControl->connect_toggled(LINK(this, 
SpecialSettingsPage, OnTriStateToggleHdl));
+else
+booleanSetting.xControl->connect_toggled(LINK(this, 
SpecialSettingsPage, OnToggleHdl));
 booleanSetting.xControl->show();
 }
 }
@@ -112,6 +115,25 @@ namespace dbaui
 }
 }
 
+IMPL_LINK(SpecialSettingsPage, OnTriStateToggleHdl, weld::ToggleButton&, 
rToggle, void)
+{
+auto eOldState = m_aTriStates[&rToggle];
+switch (eOldState)
+{
+case TRISTATE_INDET:
+rToggle.set_state(TRISTATE_FALSE);
+break;
+case TRISTATE_TRUE:
+rToggle.set_state(TRISTATE_INDET);
+break;
+case TRISTATE_FALSE:
+rToggle.set_state(TRISTATE_TRUE);
+break;
+}
+m_aTriStates[&rToggle] = rToggle.get_state();
+OnToggleHdl(rToggle);
+}
+
 IMPL_LINK(SpecialSettingsPage, OnToggleHdl, weld::ToggleButton&, rBtn, 
void)
 {
 if (&rBtn == m_xAppendTableAlias.get() && m_xAsBeforeCorrelationName)
@@ -172,12 +194,16 @@ namespace dbaui
 return;
 }
 
+m_aTriStates.clear();
+
 // the boolean items
 for (auto const& booleanSetting : m_aBooleanSettings)
 {
 if (!booleanSetting.xControl)
 continue;
 
+bool bTriState = false;
+
 boost::optional aValue;
 
 const SfxPoolItem* pItem = 
_rSet.GetItem(booleanSetting.nItemId);
@@ -188,6 +214,7 @@ namespace dbaui
 else if (const OptionalBoolItem *pOptionalItem = 
dynamic_cast( pItem) )
 {
 aValue = pOptionalItem->GetFullValue();
+bTriState = true;
 }
 else
 OSL_FAIL( "SpecialSettingsPage::implInitControls: unknown 
boolean item type!" );
@@ -203,6 +230,8 @@ namespace dbaui
 bValue = !bValue;
 booleanSetting.xControl->set_active(bValue);
 }
+if (bTriState)
+m_aTriStates[booleanSetting.xControl.get()] = 
booleanSetting.xControl->get_state();
 }
 
 if (m_xAppendTableAlias && m_xAsBeforeCorrelationName)
diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx 
b/dbaccess/source/ui/dlg/advancedsettings.hxx
index c4b7d7894c71..2c6314606135 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.hxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.hxx
@@ -59,6 +59,8 @@ namespace dbaui
 std::unique_ptr m_xMaxRowScanLabel;
 std::unique_ptr m_xMaxRowScan;
 
+std::map m_aTriStates;
+
 BooleanSettingDescs m_aBooleanSettings;
 
 boolm_bHasBooleanComparisonMode;
@@ -66,6 +68,7 @@ namespace dbaui
 
 public:
 DECL_LINK(OnToggleHdl, weld::ToggleButton&, void);
+DECL_LINK(OnTriStateToggleHdl, weld::ToggleButton&, void);
 
 virtual boolFillItemSet ( SfxItemSet* _rCoreAttrs ) override;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sc/qa sc/source

[Libreoffice Gerrit user]

 sc/qa/unit/data/ods/pivot-table-str-and-err-in-data.ods |binary
 sc/qa/unit/pivottable_filters_test.cxx  |   29 
 sc/source/filter/excel/xepivotxml.cxx   |7 ++-
 3 files changed, 34 insertions(+), 2 deletions(-)

New commits:
commit ebc7f46f65cb853845eae9c2f7b96f341e4b0cb4
Author: Mike Kaganski 
AuthorDate: Fri Mar 8 14:01:03 2019 +0300
Commit: Mike Kaganski 
CommitDate: Mon Mar 11 20:18:35 2019 +0100

tdf#123939: string and error are same type for pivot cache in XLSX

Change-Id: Id39d322661f7537e8999acafee655c0cc16a78c1
Reviewed-on: https://gerrit.libreoffice.org/68911
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/69063
Tested-by: Mike Kaganski 

diff --git a/sc/qa/unit/data/ods/pivot-table-str-and-err-in-data.ods 
b/sc/qa/unit/data/ods/pivot-table-str-and-err-in-data.ods
new file mode 100644
index ..9c58dc8958ae
Binary files /dev/null and 
b/sc/qa/unit/data/ods/pivot-table-str-and-err-in-data.ods differ
diff --git a/sc/qa/unit/pivottable_filters_test.cxx 
b/sc/qa/unit/pivottable_filters_test.cxx
index 1a046296357f..4674ebb2533f 100644
--- a/sc/qa/unit/pivottable_filters_test.cxx
+++ b/sc/qa/unit/pivottable_filters_test.cxx
@@ -85,6 +85,7 @@ public:
 void testPivotTableTabularModeXLSX();
 void testTdf112106();
 void testTdf123923();
+void testTdf123939();
 
 CPPUNIT_TEST_SUITE(ScPivotTableFiltersTest);
 
@@ -124,6 +125,7 @@ public:
 CPPUNIT_TEST(testPivotTableTabularModeXLSX);
 CPPUNIT_TEST(testTdf112106);
 CPPUNIT_TEST(testTdf123923);
+CPPUNIT_TEST(testTdf123939);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -2334,6 +2336,33 @@ void ScPivotTableFiltersTest::testTdf123923()
 "v", "#REF!");
 }
 
+void ScPivotTableFiltersTest::testTdf123939()
+{
+// tdf#123939: Excel warns on containsMixedTypes="1" if sharedItems has 
only strings and errors
+
+ScDocShellRef xShell = loadDoc("pivot-table-str-and-err-in-data.", 
FORMAT_ODS);
+CPPUNIT_ASSERT(xShell.is());
+
+std::shared_ptr pXPathFile
+= ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
+xmlDocPtr pTable = XPathHelper::parseExport(pXPathFile, m_xSFactory,
+
"xl/pivotCache/pivotCacheDefinition1.xml");
+CPPUNIT_ASSERT(pTable);
+
+assertXPathNoAttribute(pTable,
+   
"/x:pivotCacheDefinition/x:cacheFields/x:cacheField[1]/x:sharedItems",
+   "containsMixedTypes");
+
+// But we must emit containsMixedTypes="1" for a mix of errors and 
non-string types!
+
+pTable = XPathHelper::parseExport(pXPathFile, m_xSFactory,
+  
"xl/pivotCache/pivotCacheDefinition2.xml");
+CPPUNIT_ASSERT(pTable);
+
+assertXPath(pTable, 
"/x:pivotCacheDefinition/x:cacheFields/x:cacheField[1]/x:sharedItems",
+"containsMixedTypes", "1");
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ScPivotTableFiltersTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/filter/excel/xepivotxml.cxx 
b/sc/source/filter/excel/xepivotxml.cxx
index 5d47d628cee7..2ed98873202f 100644
--- a/sc/source/filter/excel/xepivotxml.cxx
+++ b/sc/source/filter/excel/xepivotxml.cxx
@@ -267,6 +267,9 @@ void XclExpXmlPivotCaches::SavePivotCacheXml( 
XclExpXmlStream& rStrm, const Entr
 for (; it != itEnd; ++it)
 {
 ScDPItemData::Type eType = it->GetType();
+// tdf#123939 : error and string are same for cache; if both are 
present, keep only one
+if (eType == ScDPItemData::Error)
+eType = ScDPItemData::String;
 aDPTypes.insert(eType);
 if (eType == ScDPItemData::Value)
 {
@@ -292,8 +295,8 @@ void XclExpXmlPivotCaches::SavePivotCacheXml( 
XclExpXmlStream& rStrm, const Entr
 std::set aDPTypesWithoutBlank = aDPTypes;
 aDPTypesWithoutBlank.erase(ScDPItemData::Empty);
 
-bool isContainsString = 
aDPTypesWithoutBlank.find(ScDPItemData::String) != aDPTypesWithoutBlank.end() ||
-aDPTypesWithoutBlank.find(ScDPItemData::Error) 
!= aDPTypesWithoutBlank.end();
+const bool isContainsString
+= aDPTypesWithoutBlank.find(ScDPItemData::String) != 
aDPTypesWithoutBlank.end();
 bool isContainsBlank = aDPTypes.find(ScDPItemData::Empty) != 
aDPTypeEnd;
 bool isContainsNumber = !isContainsDate && 
aDPTypesWithoutBlank.find(ScDPItemData::Value) != aDPTypesWithoutBlank.end();
 bool isContainsNonDate = !(isContainsDate && 
aDPTypesWithoutBlank.size() <= 1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b7f767f6886c46f2ace34ab3e169ebf6ffc2b20a
Author: LibreOfficiant 
AuthorDate: Mon Mar 11 16:37:55 2019 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Mar 11 20:12:13 2019 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Compiler error due to incorrect indentation

Change-Id: I041f9ac5d160ef2ebb23e77ce3d35f02e3b703e4
Reviewed-on: https://gerrit.libreoffice.org/69053
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 496aaf8cbcd0..669ede5358fc 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 496aaf8cbcd030c1ddfbc3776c23edd08307b96e
+Subproject commit 669ede5358fc7aa63420bd61b62548f2d0b54519
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Libreoffice Gerrit user]

 source/text/sbasic/python/python_import.xhp |   36 ++--
 1 file changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 669ede5358fc7aa63420bd61b62548f2d0b54519
Author: LibreOfficiant 
AuthorDate: Mon Mar 11 16:37:55 2019 +0100
Commit: Olivier Hallot 
CommitDate: Mon Mar 11 20:12:13 2019 +0100

Compiler error due to incorrect indentation

Change-Id: I041f9ac5d160ef2ebb23e77ce3d35f02e3b703e4
Reviewed-on: https://gerrit.libreoffice.org/69053
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/sbasic/python/python_import.xhp 
b/source/text/sbasic/python/python_import.xhp
index 3ac240d87..43ec28107 100644
--- a/source/text/sbasic/python/python_import.xhp
+++ b/source/text/sbasic/python/python_import.xhp
@@ -85,24 +85,24 @@
 
 adapted from 
'Bibliothèque de fonctions' by Hubert Lambert
 at 
https://forum.openoffice.org/fr/forum/viewtopic.php?p=286213 
"""
-def 
isImportedModule(module_name: str) -> bool:
-
""" Check run time module list """
-return 
(module_name in sys.modules.keys())
-def 
isLoadedLibrary(lib_name: str) -> bool:
-
""" Check PYTHON_PATH content """
-return 
(lib_name in sys.path)
-def 
loadLibrary(lib_name: str, module_name=None):
-
""" add directory to PYTHON_PATH, import named module 
"""
-doc = 
XSCRIPTCONTEXT.getDocument()
-url = 
uno.fileUrlToSystemPath(
-
'{}/{}'.format(doc.URL,'Scripts/python/'+lib_name)
-if not url in 
sys.path:
-
sys.path.insert(0, url)
-if 
module_name and not module_name in sys.modules.keys():
-return 
zipimport.zipimporter(url).load_module(module_name)
-def 
unloadLibrary(lib_name: str):
-
""" remove directory from PYTHON_PATH 
"""
-
sys.path.remove(lib_name)
+def 
isImportedModule(module_name: str) -> bool:
+
""" Check run time module list """
+return 
(module_name in sys.modules.keys())
+def 
isLoadedLibrary(lib_name: str) -> bool:
+
""" Check PYTHON_PATH content """
+return 
(lib_name in sys.path)
+def 
loadLibrary(lib_name: str, module_name=None):
+
""" add directory to PYTHON_PATH, import named module 
"""
+doc = 
XSCRIPTCONTEXT.getDocument()
+url = 
uno.fileUrlToSystemPath(
+
'{}/{}'.format(doc.URL,'Scripts/python/'+lib_name)
+if not 
url in sys.path:
+
sys.path.insert(0, url)
+if 
module_name and not module_name in sys.modules.keys():
+
return zipimport.zipimporter(url).load_module(module_name)
+def 
unloadLibrary(lib_name: str):
+
""" remove directory from PYTHON_PATH 
"""
+
sys.path.remove(lib_name)
 
 g_exportedScripts 
= (OnDocPostOpenLoadPython, OnDocQueryCloseUnloadPython)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/build loleaflet/js loleaflet/Makefile.am loleaflet/src scripts/unocommands.py

[Libreoffice Gerrit user]

 loleaflet/Makefile.am   |6 +-
 loleaflet/build/deps.js |6 ++
 scripts/unocommands.py  |2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit c1ba96f951661ee047af9fabe20ce00a1527acfe
Author: Henry Castro 
AuthorDate: Mon Mar 11 14:27:47 2019 -0400
Commit: Henry Castro 
CommitDate: Mon Mar 11 14:51:56 2019 -0400

loleaflet: move toolbar.js to src/control directory

Simplify building loleaflet.

TODO. Convert to L.Control.Toolbar

Change-Id: I6abedd19caa6f0c22267c661e67480507dcd8336

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index d21a104d0..e64869516 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -309,7 +309,6 @@ $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_DST) \
$(builddir)/dist/global.js \
$(builddir)/dist/jquery.mCustomScrollbar.js \
$(builddir)/dist/w2ui-1.5.rc1.js \
-   $(builddir)/dist/toolbar.js \
$(builddir)/dist/main.js
@touch $@
 else
@@ -337,7 +336,6 @@ $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
$(builddir)/dist/global.js \
$(srcdir)/js/jquery.mCustomScrollbar.js \
$(srcdir)/js/w2ui-1.5.rc1.js \
-   $(srcdir)/js/toolbar.js \
$(srcdir)/js/main.js
@echo "Uglify loleaflet js files..."
NODE_PATH=$(abs_builddir)/node_modules $(NODE) 
node_modules/uglify-js/bin/uglifyjs \
@@ -346,7 +344,6 @@ $(builddir)/dist/bundle.js: $(NODE_MODULES_JS_SRC) \
$(srcdir)/js/jquery.mCustomScrollbar.js \
$(srcdir)/js/w2ui-1.5.rc1.js \
$(builddir)/build/dist/loleaflet-src.js \
-   $(srcdir)/js/toolbar.js \
$(srcdir)/js/main.js \
--output $@
 endif
@@ -366,7 +363,6 @@ $(builddir)/dist/loleaflet.html: 
$(srcdir)/html/loleaflet.html.m4 $(LOLEAFLET_HT
jquery.mCustomScrollbar.js \
w2ui-1.5.rc1.js \
$(call LOLEAFLET_JS,$(srcdir)/build/build.js) \
-   toolbar.js \
main.js)" \
$(srcdir)/html/loleaflet.html.m4 > $@
 
@@ -448,7 +444,7 @@ pot:
admin/src/AdminSocketOverview.js \
admin/src/AdminSocketSettings.js \
admin/src/Util.js \
-   js/toolbar.js \
+   scr/control/toolbar.js \
src/control/Control.AlertDialog.js \
src/control/Control.ContextMenu.js \
src/control/Control.DocumentRepair.js \
diff --git a/loleaflet/build/deps.js b/loleaflet/build/deps.js
index ec9c8565a..c1247ab54 100644
--- a/loleaflet/build/deps.js
+++ b/loleaflet/build/deps.js
@@ -291,6 +291,12 @@ var deps = {
desc: 'Makes markers draggable (by mouse or touch).'
},
 
+   ControlToolbar: {
+   src: ['control/toolbar.js'],
+   heading: 'Controls',
+   desc: 'LibreOffice Online toolbar'
+   },
+
ControlPartsPreview: {
src: ['control/Control.js',
  'control/Control.PartsPreview.js'],
diff --git a/loleaflet/js/toolbar.js b/loleaflet/src/control/toolbar.js
similarity index 100%
rename from loleaflet/js/toolbar.js
rename to loleaflet/src/control/toolbar.js
diff --git a/scripts/unocommands.py b/scripts/unocommands.py
index 27fca0d84..df29ef8e5 100755
--- a/scripts/unocommands.py
+++ b/scripts/unocommands.py
@@ -122,7 +122,7 @@ def extractToolbarCommands(path):
 commands = []
 
 # extract from the menu specifications
-f = open(path + '/loleaflet/js/toolbar.js', 'r')
+f = open(path + '/loleaflet/src/control/toolbar.js', 'r')
 for line in f:
 if line.find("_UNO(") >= 0:
 commands += commandFromMenuLine(line)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang

[Libreoffice Gerrit user]

 compilerplugins/clang/dyncastvisibility.cxx |4 ++--
 compilerplugins/clang/simplifyconstruct.cxx |4 ++--
 compilerplugins/clang/stringstatic.cxx  |5 ++---
 compilerplugins/clang/weakobject.cxx|5 ++---
 4 files changed, 8 insertions(+), 10 deletions(-)

New commits:
commit a62ad33b0eb1dac70f91a409d11ac1bcdb624842
Author: Luboš Luňák 
AuthorDate: Tue Mar 5 16:15:22 2019 +0100
Commit: Noel Grandin 
CommitDate: Mon Mar 11 19:44:33 2019 +0100

change some clang plugins to FilteringPlugins

As far as I can tell these do not need to scan everything, so the filtering
(and faster) base plugin is sufficient.

Change-Id: I0912a730bb5ec9670d1faa5c83f573902118cc95
Reviewed-on: https://gerrit.libreoffice.org/68872
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/dyncastvisibility.cxx 
b/compilerplugins/clang/dyncastvisibility.cxx
index 6a1d84d91d3e..8b29f0735ca9 100644
--- a/compilerplugins/clang/dyncastvisibility.cxx
+++ b/compilerplugins/clang/dyncastvisibility.cxx
@@ -79,11 +79,11 @@ StringRef vis(Visibility v) {
 }
 
 class DynCastVisibility final:
-public RecursiveASTVisitor, public loplugin::Plugin
+public loplugin::FilteringPlugin
 {
 public:
 explicit DynCastVisibility(loplugin::InstantiationData const & data):
-Plugin(data) {}
+FilteringPlugin(data) {}
 
 bool shouldVisitTemplateInstantiations() const { return true; }
 
diff --git a/compilerplugins/clang/simplifyconstruct.cxx 
b/compilerplugins/clang/simplifyconstruct.cxx
index 172a1bd48029..b48764302eae 100644
--- a/compilerplugins/clang/simplifyconstruct.cxx
+++ b/compilerplugins/clang/simplifyconstruct.cxx
@@ -18,11 +18,11 @@
 
 namespace
 {
-class SimplifyConstruct : public RecursiveASTVisitor, 
public loplugin::Plugin
+class SimplifyConstruct : public loplugin::FilteringPlugin
 {
 public:
 explicit SimplifyConstruct(loplugin::InstantiationData const& data)
-: Plugin(data)
+: FilteringPlugin(data)
 {
 }
 
diff --git a/compilerplugins/clang/stringstatic.cxx 
b/compilerplugins/clang/stringstatic.cxx
index 7fa14c0766c7..1a46fdd3dee8 100644
--- a/compilerplugins/clang/stringstatic.cxx
+++ b/compilerplugins/clang/stringstatic.cxx
@@ -22,13 +22,12 @@
 namespace {
 
 class StringStatic
-: public clang::RecursiveASTVisitor
-, public loplugin::Plugin
+: public loplugin::FilteringPlugin
 {
 
 public:
 explicit StringStatic(loplugin::InstantiationData const& rData):
-Plugin(rData) {}
+FilteringPlugin(rData) {}
 
 void run() override;
 bool VisitVarDecl(VarDecl const*);
diff --git a/compilerplugins/clang/weakobject.cxx 
b/compilerplugins/clang/weakobject.cxx
index 70e81baa411a..1f801d6acdd2 100644
--- a/compilerplugins/clang/weakobject.cxx
+++ b/compilerplugins/clang/weakobject.cxx
@@ -19,12 +19,11 @@
 namespace {
 
 class WeakObject
-: public clang::RecursiveASTVisitor
-, public loplugin::Plugin
+: public loplugin::FilteringPlugin
 {
 
 public:
-explicit WeakObject(loplugin::InstantiationData const& rData): 
Plugin(rData)
+explicit WeakObject(loplugin::InstantiationData const& rData): 
FilteringPlugin(rData)
 {}
 
 void run() override {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Libreoffice Gerrit user]

 sw/source/core/txtnode/txatbase.cxx |   18 --
 1 file changed, 16 insertions(+), 2 deletions(-)

New commits:
commit 99f25bc344e931e66366e20664a23dc263fe3113
Author: Miklos Vajna 
AuthorDate: Mon Mar 11 16:11:03 2019 +0100
Commit: Miklos Vajna 
CommitDate: Mon Mar 11 19:28:53 2019 +0100

sw doc model xml dump: show text node's field hints

Change-Id: I17927231da389ce54d2fb8ade0091c7e7033a808
Reviewed-on: https://gerrit.libreoffice.org/69049
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/source/core/txtnode/txatbase.cxx 
b/sw/source/core/txtnode/txatbase.cxx
index 82015ad57df2..8497116f1d7f 100644
--- a/sw/source/core/txtnode/txatbase.cxx
+++ b/sw/source/core/txtnode/txatbase.cxx
@@ -122,6 +122,11 @@ void SwTextAttr::dumpAsXml(xmlTextWriterPtr pWriter) const
 pWhich = "meta";
 break;
 }
+case RES_TXTATR_FIELD:
+{
+pWhich = "field";
+break;
+}
 default:
 break;
 }
@@ -129,8 +134,17 @@ void SwTextAttr::dumpAsXml(xmlTextWriterPtr pWriter) const
 xmlTextWriterWriteAttribute(pWriter, BAD_CAST("which"), 
BAD_CAST(pWhich));
 if (oValue)
 xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), 
BAD_CAST(oValue->getStr()));
-if (Which() == RES_TXTATR_AUTOFMT)
-GetAutoFormat().dumpAsXml(pWriter);
+switch (Which())
+{
+case RES_TXTATR_AUTOFMT:
+GetAutoFormat().dumpAsXml(pWriter);
+break;
+case RES_TXTATR_FIELD:
+GetFormatField().dumpAsXml(pWriter);
+break;
+default:
+break;
+}
 
 xmlTextWriterEndElement(pWriter);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/inc sw/source

[Libreoffice Gerrit user]

 sw/inc/strings.hrc |1 +
 sw/source/uibase/inc/swcont.hxx|2 +-
 sw/source/uibase/utlui/content.cxx |   15 +--
 3 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit 9ccdb944a6bfde317febbf7cfc37ae8e6e6df8c9
Author: Wenzhe Pei 
AuthorDate: Mon Mar 11 01:25:52 2019 +
Commit: Michael Stahl 
CommitDate: Mon Mar 11 19:07:19 2019 +0100

tdf#123395 Add "Send Outline to Clipboard" to Navigator->Context menu

Change-Id: Ice8f6a99e437e99c7e169e230e034a04f42eea0d
Reviewed-on: https://gerrit.libreoffice.org/69026
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 2093a2d8c14f..fe4ab39acd33 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -621,6 +621,7 @@
 #define STR_ACCESS_TL_CONTENT   NC_("STR_ACCESS_TL_CONTENT", 
"Content Navigation View")
 #define STR_OUTLINE_LEVEL   NC_("STR_OUTLINE_LEVEL", 
"Outline Level")
 #define STR_DRAGMODENC_("STR_DRAGMODE", "Drag 
Mode")
+#define STR_SEND_OUTLINE_TO_CLIPBOARD_ENTRY 
NC_("STR_SEND_OUTLINE_TO_CLIPBOARD_ENTRY", "Send Outline to Clipboard")
 #define STR_HYPERLINK   NC_("STR_HYPERLINK", "Insert 
as Hyperlink")
 #define STR_LINK_REGION NC_("STR_LINK_REGION", "Insert 
as Link")
 #define STR_COPY_REGION NC_("STR_COPY_REGION", "Insert 
as Copy")
diff --git a/sw/source/uibase/inc/swcont.hxx b/sw/source/uibase/inc/swcont.hxx
index 3d0aaf69a113..f116935d2edf 100644
--- a/sw/source/uibase/inc/swcont.hxx
+++ b/sw/source/uibase/inc/swcont.hxx
@@ -44,7 +44,7 @@ enum class ContentTypeId
 };
 
 // strings for context menus
-#define CONTEXT_COUNT   12
+#define CONTEXT_COUNT   13
 #define GLOBAL_CONTEXT_COUNT 14
 
 // modes for Drag 'n Drop
diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 9d27cd0ef02f..a59152b00210 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -828,7 +828,8 @@ enum STR_CONTEXT_IDX
 IDX_STR_ACTIVE = 8,
 IDX_STR_INACTIVE = 9,
 IDX_STR_EDIT_ENTRY = 10,
-IDX_STR_DELETE_ENTRY = 11
+IDX_STR_DELETE_ENTRY = 11,
+IDX_STR_SEND_OUTLINE_TO_CLIPBOARD_ENTRY = 12
 };
 
 static const char* STR_CONTEXT_ARY[] =
@@ -844,7 +845,8 @@ static const char* STR_CONTEXT_ARY[] =
 STR_ACTIVE,
 STR_INACTIVE,
 STR_EDIT_ENTRY,
-STR_DELETE_ENTRY
+STR_DELETE_ENTRY,
+STR_SEND_OUTLINE_TO_CLIPBOARD_ENTRY
 };
 
 SwContentTree::SwContentTree(vcl::Window* pParent, SwNavigationPI* pDialog)
@@ -1316,6 +1318,10 @@ VclPtr SwContentTree::CreateContextMenu()
 {
 
assert(dynamic_cast(static_cast(pEntry->GetUserData(;
 SwContentType* pType = 
static_cast(pEntry->GetUserData());
+if(ContentTypeId::OUTLINE == pType->GetType())
+{
+pPop->InsertItem(700, 
m_aContextStrings[IDX_STR_SEND_OUTLINE_TO_CLIPBOARD_ENTRY]);
+}
 if ( (pType->GetType() == ContentTypeId::POSTIT) &&  
(!m_pActiveShell->GetView().GetDocShell()->IsReadOnly()) && ( 
pType->GetMemberCount() > 0) )
 {
 bSubPop4 = true;
@@ -3116,6 +3122,11 @@ void SwContentTree::ExecuteContextMenuAction( sal_uInt16 
nSelectedPopupEntry )
 m_pActiveShell->GetView().GetPostItMgr()->Delete();
 break;
 }
+case 700:
+{
+
m_pActiveShell->GetView().GetViewFrame()->GetDispatcher()->Execute(FN_OUTLINE_TO_CLIPBOARD);
+break;
+}
 //Display
 default:
 if(nSelectedPopupEntry > 300 && nSelectedPopupEntry < 400)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sc/qa sc/source

[Libreoffice Gerrit user]

 sc/qa/unit/data/ods/pivot-table-err-in-cache.ods |binary
 sc/qa/unit/pivottable_filters_test.cxx   |   19 +++
 sc/source/core/tool/interpr1.cxx |1 +
 3 files changed, 20 insertions(+)

New commits:
commit 0640e800c532cac0905412fe961efb03474ecc3f
Author: Mike Kaganski 
AuthorDate: Thu Mar 7 16:38:20 2019 +0300
Commit: Mike Kaganski 
CommitDate: Mon Mar 11 18:33:02 2019 +0100

tdf#123923: make COUNTIF propagate errors in its first parameter

In a specific case, Err:504 was emitted by COUNTIF when its 1st
parameter was #REF!. This value was written into pivot cache definition
when exporting to XLSX. Clearly Excel only expected propagated #REF!
there, emitted error to user, and dropped the pivot table.

This problem made XLSX pivot table cache generated by Calc unusable
by Excel, despite ECMA-376 Part 1, 18.10.1.27 tells that the error
value is application-dependent.

The change makes COUNTIF to propagate errors received in its 1st
parameter, instead of owerwriting them with own Err:504. This will
likely need to be extended to other functions, if similar problems
would arise.

Change-Id: I459fa163a0e3e5f2c658631d66e096f4d46b1ace
Reviewed-on: https://gerrit.libreoffice.org/68868
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 1f970c20a25deed282dbaf08a4be5af25e4951db)
Reviewed-on: https://gerrit.libreoffice.org/69039
Tested-by: Mike Kaganski 

diff --git a/sc/qa/unit/data/ods/pivot-table-err-in-cache.ods 
b/sc/qa/unit/data/ods/pivot-table-err-in-cache.ods
new file mode 100644
index ..b566a61f8898
Binary files /dev/null and b/sc/qa/unit/data/ods/pivot-table-err-in-cache.ods 
differ
diff --git a/sc/qa/unit/pivottable_filters_test.cxx 
b/sc/qa/unit/pivottable_filters_test.cxx
index bb989d2b1b83..1a046296357f 100644
--- a/sc/qa/unit/pivottable_filters_test.cxx
+++ b/sc/qa/unit/pivottable_filters_test.cxx
@@ -84,6 +84,7 @@ public:
 void testPivotTableDuplicatedMemberFilterXLSX();
 void testPivotTableTabularModeXLSX();
 void testTdf112106();
+void testTdf123923();
 
 CPPUNIT_TEST_SUITE(ScPivotTableFiltersTest);
 
@@ -122,6 +123,7 @@ public:
 CPPUNIT_TEST(testPivotTableDuplicatedMemberFilterXLSX);
 CPPUNIT_TEST(testPivotTableTabularModeXLSX);
 CPPUNIT_TEST(testTdf112106);
+CPPUNIT_TEST(testTdf123923);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -2315,6 +2317,23 @@ void ScPivotTableFiltersTest::testTdf112106()
 xDocSh->DoClose();
 }
 
+void ScPivotTableFiltersTest::testTdf123923()
+{
+// tdf#123923: Excel fails when it finds "Err:504" instead of "#REF!" in 
pivot table cache
+
+ScDocShellRef xShell = loadDoc("pivot-table-err-in-cache.", FORMAT_ODS);
+CPPUNIT_ASSERT(xShell.is());
+
+std::shared_ptr pXPathFile
+= ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
+xmlDocPtr pTable = XPathHelper::parseExport(pXPathFile, m_xSFactory,
+
"xl/pivotCache/pivotCacheDefinition1.xml");
+CPPUNIT_ASSERT(pTable);
+
+assertXPath(pTable, 
"/x:pivotCacheDefinition/x:cacheFields/x:cacheField[1]/x:sharedItems/x:e",
+"v", "#REF!");
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ScPivotTableFiltersTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index cb0ac61a3cc6..bd5963bc1c97 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -5606,6 +5606,7 @@ void ScInterpreter::ScCountIf()
 }
 break;
 default:
+PopError(); // Propagate it further
 PushIllegalParameter();
 return ;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Google summer of coffee

[Muhammet Kara]

Hi Uvaish,

Welcome to LibreOffice! It is nice to see you are interested in applying 
for a GSoC project. Having skill/knowledge/experience in programming, 
and especially in C++ helps a lot while working on the LibreOffice 
code-base.


As the student application date for GSoC is approaching, we suggest you to

* Go through the LibreOffice development getting started page [0]
* Start with solving some 'beginner' easyHacks [1]
* Solve at least one 'interesting' easyHack
* Start discussing your ideas with possible mentors, and preparing your 
proposal

* Don't leave your proposal to the last day. Sooner is better.

Also checking the GSoC ideas page first, and trying to choose the 
easyHacks related to your probable idea(s) might be a good idea [2], and 
perhaps also the page for ideas without a mentor yet [3].


If you ever get stuck (after doing the usual leg-work (re(search), try, 
debug etc.) yourself), please don't hesitate to ask your questions 
either on the #libreoffice-dev IRC channel, or on this mailing list.


Best,
Muhammet

[0] https://wiki.documentfoundation.org/Development/GetInvolved
[1] 
https://wiki.documentfoundation.org/Development/EasyHacks/by_Required_Skill

[2] https://wiki.documentfoundation.org/Development/GSoC/Ideas
[3] 
https://wiki.documentfoundation.org/Development/GSoC/Ideas_without_a_mentor


--
Consultant Software Engineer
Collabora Productivity


On 10.03.2019 14:42, solo learn wrote:


sorry, for typing errors in the previous mail. i intended to write 
"Google summer of code" and "my name in Uvaish zafri". hope you don't 
mind that.


On Mar 10, 2019 5:09 PM, "solo learn" > wrote:


hello sir/madam, my band is Uvaish Zafri. I am an information
technology undergraduate from India and would like to work on
"move the gallery code to use ZIP files" idea under libreoffice
project. please provide me guidance for further procedures.


___
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

remove unused columns in list of LibreOffice ODF Extensions

[Regina Henschel]

Hi all,

the table in 
https://wiki.documentfoundation.org/Development/ODF_Implementer_Notes/List_of_LibreOffice_ODF_Extensions
has the columns 'ODF Version(s) Extended' and 'False Positive Validation 
Errors'. These columns have no entries. Because the table is already 
very wide, I'm going to remove these two columns.


Any objections?

Kind regards
Regina
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - ooo_custom_images/dev

[Libreoffice Gerrit user]

 ooo_custom_images/dev/introabout/about.png |binary
 1 file changed

New commits:
commit 54a3185d5e735017cdb32ed0f6188a0fb5b954da
Author: Matthias Seidel 
AuthorDate: Mon Mar 11 16:14:22 2019 +
Commit: Matthias Seidel 
CommitDate: Mon Mar 11 16:14:22 2019 +

Updated graphic for Developer Snaphot.

diff --git a/ooo_custom_images/dev/introabout/about.png 
b/ooo_custom_images/dev/introabout/about.png
index a4b3a3b9f004..86d694fe1895 100755
Binary files a/ooo_custom_images/dev/introabout/about.png and 
b/ooo_custom_images/dev/introabout/about.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source sc/uiconfig sc/UIConfig_scalc.mk solenv/sanitizers

[Libreoffice Gerrit user]

 sc/UIConfig_scalc.mk |1 
 sc/source/ui/inc/retypepassdlg.hxx   |   44 -
 sc/source/ui/miscdlgs/retypepassdlg.cxx  |  145 ---
 sc/source/ui/view/tabvwshh.cxx   |   10 +-
 sc/uiconfig/scalc/ui/passfragment.ui |   48 ++
 sc/uiconfig/scalc/ui/retypepassdialog.ui |1 
 solenv/sanitizers/ui/modules/scalc.suppr |1 
 7 files changed, 136 insertions(+), 114 deletions(-)

New commits:
commit c677598d146edef71898b92d087150b1534ac60a
Author: Caolán McNamara 
AuthorDate: Mon Mar 11 13:38:16 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 18:03:40 2019 +0100

weld ScRetypePassDlg

Change-Id: I50c9ce27e7a5e469423d2d23e45038b73983fec5
Reviewed-on: https://gerrit.libreoffice.org/69045
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 8b36d066b932..9523c42f574d 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -180,6 +180,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/pastespecial \
sc/uiconfig/scalc/ui/paradialog \
sc/uiconfig/scalc/ui/paratemplatedialog \
+   sc/uiconfig/scalc/ui/passfragment \
sc/uiconfig/scalc/ui/pivotfielddialog \
sc/uiconfig/scalc/ui/pivotfilterdialog \
sc/uiconfig/scalc/ui/pivottablelayoutdialog \
diff --git a/sc/source/ui/inc/retypepassdlg.hxx 
b/sc/source/ui/inc/retypepassdlg.hxx
index 89543e312270..967d5bb839c0 100644
--- a/sc/source/ui/inc/retypepassdlg.hxx
+++ b/sc/source/ui/inc/retypepassdlg.hxx
@@ -20,31 +20,33 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_RETYPEPASSDLG_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_RETYPEPASSDLG_HXX
 
-#include 
-#include 
-#include 
-#include 
 #include 
-
 #include 
-
 #include 
 
-namespace vcl { class Window; }
 class ScDocument;
 
-class ScRetypePassDlg : public ModalDialog
+struct PassFragment
+{
+std::unique_ptr m_xBuilder;
+std::unique_ptr m_xSheetsBox;
+std::unique_ptr m_xName;
+std::unique_ptr m_xStatus;
+std::unique_ptr m_xButton;
+
+PassFragment(weld::Widget* pParent);
+};
+
+class ScRetypePassDlg : public weld::GenericDialogController
 {
 public:
 typedef std::shared_ptrDocProtectionPtr;
 typedef std::shared_ptr  TabProtectionPtr;
 
-ScRetypePassDlg() = delete;
-explicit ScRetypePassDlg(vcl::Window* pParent);
+explicit ScRetypePassDlg(weld::Window* pParent);
 virtual ~ScRetypePassDlg() override;
-virtual void dispose() override;
 
-virtual short Execute() override;
+virtual short run() override;
 
 void SetDataFromDocument(const ScDocument& rDoc);
 void SetDesiredHash(ScPasswordHash eHash);
@@ -66,20 +68,13 @@ private:
 void DeleteSheets();
 
 private:
-VclPtr   mpBtnOk;
-VclPtr  mpTextDocStatus;
-VclPtr mpBtnRetypeDoc;
-VclPtrmpSheetsBox;
-
-std::vector> maSheets;
-
 OUString constmaTextNotProtected;
 OUString constmaTextNotPassProtected;
 OUString constmaTextHashBad;
 OUString constmaTextHashGood;
 
-DECL_LINK( OKHdl, Button*, void );
-DECL_LINK( RetypeBtnHdl, Button*, void );
+DECL_LINK(OKHdl, weld::Button&, void);
+DECL_LINK(RetypeBtnHdl, weld::Button&, void);
 
 struct TableItem
 {
@@ -90,6 +85,13 @@ private:
 
 DocProtectionPtrmpDocItem;
 ScPasswordHash  meDesiredHash;
+
+std::unique_ptr mxBtnOk;
+std::unique_ptr mxTextDocStatus;
+std::unique_ptr mxBtnRetypeDoc;
+std::unique_ptr mxScrolledWindow;
+std::unique_ptr mxSheetsBox;
+std::vector> maSheets;
 };
 
 class ScRetypePassInputDlg : public weld::GenericDialogController
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx 
b/sc/source/ui/miscdlgs/retypepassdlg.cxx
index 2af3344b94dd..84f8ef182b54 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.cxx
+++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx
@@ -17,72 +17,56 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 
-ScRetypePassDlg::ScRetypePassDlg(vcl::Window* pParent) :
-ModalDialog(pParent, "RetypePass", "modules/scalc/ui/retypepassdialog.ui"),
-
-maTextNotProtected(ScResId(STR_NOT_PROTECTED)),
-maTextNotPassProtected(ScResId(STR_NOT_PASS_PROTECTED)),
-maTextHashBad(ScResId(STR_HASH_BAD)),
-maTextHashGood(ScResId(STR_HASH_GOOD)),
-
-mpDocItem(static_cast(nullptr)),
-meDesiredHash(PASSHASH_SHA1)
+ScRetypePassDlg::ScRetypePassDlg(weld::Window* pParent)
+: GenericDialogController(pParent, "modules/scalc/ui/retypepassdialog.ui", 
"RetypePass")
+, maTextNotProtected(ScResId(STR_NOT_PROTECTED))
+, maTextNotPassProtected(ScResId(STR_NOT_PASS_PROTECTED))
+, maTextHashBad(ScResId(STR_HASH_BAD))
+, maTextHashGood(ScResId(STR_HASH_GOOD))
+, mpDocItem(static_cast(nullptr))
+, 

[Libreoffice-commits] core.git: 2 commits - android/Bootstrap include/LibreOfficeKit sal/android

[Libreoffice Gerrit user]

 android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java |   18 
 android/Bootstrap/version.map |2 
 include/LibreOfficeKit/LibreOfficeKitInit.h   |4 
 sal/android/libreofficekit-jni.c  |   42 --
 4 files changed, 38 insertions(+), 28 deletions(-)

New commits:
commit bd050920ffdeb694d0b4a8feaf72625626e851d7
Author: Jan Holesovsky 
AuthorDate: Fri Feb 15 16:01:55 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Mon Mar 11 17:46:09 2019 +0100

android: Set the FONTCONFIG_FILE envvar to the fonts.conf (if exists).

Change-Id: Ic9fd97a2ff8a6d96ffcc7ad300ef30201d786528
Reviewed-on: https://gerrit.libreoffice.org/67876
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 

diff --git a/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java 
b/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java
index ce84b7409c1f..f6658d64806a 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java
@@ -67,19 +67,6 @@ public final class LibreOfficeKit
 String cacheDir = 
activity.getApplication().getCacheDir().getAbsolutePath();
 String apkFile = activity.getApplication().getPackageResourcePath();
 
-// If there is a fonts.conf file in the apk that can be extracted, 
automatically
-// set the FONTCONFIG_FILE env var.
-InputStream inputStream;
-try {
-inputStream = 
activity.getAssets().open("unpack/etc/fonts/fonts.conf");
-} catch (java.io.IOException exception) {
-inputStream = null;
-}
-
-if (inputStream != null) {
-putenv("FONTCONFIG_FILE=" + dataDir + "/etc/fonts/fonts.conf");
-}
-
 if (!initializeNative(dataDir, cacheDir, apkFile, mgr)) {
 Log.e(LOGTAG, "Initialize native failed!");
 return;
diff --git a/sal/android/libreofficekit-jni.c b/sal/android/libreofficekit-jni.c
index abbf3edaed10..c11f7dd4eb09 100644
--- a/sal/android/libreofficekit-jni.c
+++ b/sal/android/libreofficekit-jni.c
@@ -74,6 +74,9 @@ jboolean libreofficekit_initialize(JNIEnv* env,
 const char *cacheDirPath;
 const char *apkFilePath;
 
+const char *fontsConf = "/etc/fonts/fonts.conf";
+char *fontsConfPath;
+
 setenv("OOO_DISABLE_RECOVERY", "1", 1);
 
 native_asset_manager = AAssetManager_fromJava(env, assetManager);
@@ -89,6 +92,18 @@ jboolean libreofficekit_initialize(JNIEnv* env,
 // TMPDIR is used by osl_getTempDirURL()
 setenv("TMPDIR", cache_dir, 1);
 
+fontsConfPath = malloc(strlen(data_dir) + sizeof(fontsConf));
+strcpy(fontsConfPath, data_dir);
+strcat(fontsConfPath, fontsConf);
+
+fd = open(fontsConfPath, O_RDONLY);
+if (fd != -1) {
+close(fd);
+LOGI("Setting FONTCONFIG_FILE to %s", fontsConfPath);
+setenv("FONTCONFIG_FILE", fontsConfPath, 1);
+}
+free(fontsConfPath);
+
 apkFilePath =  (*env)->GetStringUTFChars(env, apkFile, NULL);
 
 fd = open(apkFilePath, O_RDONLY);
commit cb6d77987c614449a42162541ec3afa36a2959e7
Author: Jan Holesovsky 
AuthorDate: Fri Feb 15 11:46:36 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Mon Mar 11 17:45:56 2019 +0100

android: Separate the Android-specific setup from the actual LOK init.

Change-Id: I433376dfea0a43c63827ba15308a614f3466fb71
Reviewed-on: https://gerrit.libreoffice.org/67875
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 

diff --git a/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java 
b/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java
index c82f7b16b01a..ce84b7409c1f 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/LibreOfficeKit.java
@@ -76,15 +76,10 @@ public final class LibreOfficeKit
 inputStream = null;
 }
 
-putenv("OOO_DISABLE_RECOVERY=1");
-
 if (inputStream != null) {
 putenv("FONTCONFIG_FILE=" + dataDir + "/etc/fonts/fonts.conf");
 }
 
-// TMPDIR is used by osl_getTempDirURL()
-putenv("TMPDIR=" + cacheDir);
-
 if (!initializeNative(dataDir, cacheDir, apkFile, mgr)) {
 Log.e(LOGTAG, "Initialize native failed!");
 return;
diff --git a/android/Bootstrap/version.map b/android/Bootstrap/version.map
index de561bfc296b..930e1e071999 100644
--- a/android/Bootstrap/version.map
+++ b/android/Bootstrap/version.map
@@ -3,7 +3,7 @@ dummy {
 Java_*;
 JNI_OnLoad;
 _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions
-libreofficekit_hook*;
+libreofficekit_*;
 local:
 *;
 };
diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h 
b/include/LibreOfficeKit/LibreOfficeKitInit.h
index 5dbf2f83f988..c00c33193648 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h

[Libreoffice-commits] core.git: desktop/source

[Libreoffice Gerrit user]

 desktop/source/lib/init.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit e745b06352cfe358ba927c9b4ef938452907a14f
Author: Jan Holesovsky 
AuthorDate: Fri Feb 15 16:04:51 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Mon Mar 11 17:46:27 2019 +0100

android: Set the program path sensibly when we've got nullptr.

Change-Id: I4415459ca5d758d06d866faeca85e1cf154d0567
Reviewed-on: https://gerrit.libreoffice.org/67877
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 65da82f294ad..0ec7bdf3bad7 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -24,6 +24,10 @@
 #include 
 #endif
 
+#ifdef ANDROID
+#include 
+#endif
+
 #include 
 #include 
 #include 
@@ -4457,11 +4461,16 @@ static int lo_initialize(LibreOfficeKit* pThis, const 
char* pAppPath, const char
 }
 else
 {
+#ifdef ANDROID
+aAppPath = OUString::fromUtf8(lo_get_app_data_dir()) + "/program";
+#else
 // Fun conversion dance back and forth between URLs and system paths...
 OUString aAppURL;
 ::osl::Module::getUrlFromAddress( reinterpret_cast< oslGenericFunction 
>(lo_initialize),
   aAppURL);
 osl::FileBase::getSystemPathFromFileURL( aAppURL, aAppPath );
+#endif
+
 #ifdef IOS
 // The above gives something like
 // 
"/private/var/containers/Bundle/Application/953AA851-CC15-4C60-A2CB-C2C6F24E6F71/Foo.app/Foo",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/osl sal/android

[Libreoffice Gerrit user]

 include/osl/detail/android-bootstrap.h |4 
 sal/android/lo-bootstrap.c |7 +++
 2 files changed, 11 insertions(+)

New commits:
commit f43483ce36b8a50ecc9266f26bc7b4ac302c6661
Author: Jan Holesovsky 
AuthorDate: Mon Feb 18 13:25:40 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Mon Mar 11 17:44:10 2019 +0100

android: Expose setting of the JavaVM.

Needed when we use the liblo-native-code as a library.

Change-Id: Ia4d1d72f2203a96d1196d015b521201919bbb165
Reviewed-on: https://gerrit.libreoffice.org/67965
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 

diff --git a/include/osl/detail/android-bootstrap.h 
b/include/osl/detail/android-bootstrap.h
index 5a5c7fcbd82d..169f3efaf282 100644
--- a/include/osl/detail/android-bootstrap.h
+++ b/include/osl/detail/android-bootstrap.h
@@ -35,6 +35,10 @@ int lo_apk_closedir(lo_apk_dir *dirp);
 
 int lo_apk_lstat(const char *path, struct stat *statp);
 
+/// "libreofficekit_" prefix, because it is exported from the .so, when we are
+/// initializing the JNI externally.
+void libreofficekit_set_javavm(JavaVM *vm);
+
 JavaVM *lo_get_javavm(void);
 
 const char *lo_get_app_data_dir(void);
diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c
index d1ecd810ab19..0af8cfbb4cd3 100644
--- a/sal/android/lo-bootstrap.c
+++ b/sal/android/lo-bootstrap.c
@@ -898,6 +898,13 @@ 
Java_org_libreoffice_android_Bootstrap_address_1of_1direct_1byte_1buffer(JNIEnv
 }
 
 __attribute__ ((visibility("default")))
+void
+libreofficekit_set_javavm(JavaVM *vm)
+{
+the_java_vm = vm;
+}
+
+__attribute__ ((visibility("default")))
 JavaVM *
 lo_get_javavm(void)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: android/Bootstrap desktop/source

[Libreoffice Gerrit user]

 android/Bootstrap/Makefile.shared |2 +-
 android/Bootstrap/version.map |1 +
 desktop/source/lib/init.cxx   |4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 35cae83fd9ff174327092cc7fd9cc769ace71f4d
Author: Jan Holesovsky 
AuthorDate: Thu Feb 14 14:54:02 2019 +0100
Commit: Jan Holesovsky 
CommitDate: Mon Mar 11 17:42:48 2019 +0100

android: Generate liblo-native-code.so so that it can be linked against.

And used for LibreOfficeKit directly, without a JNI wrapper.

Change-Id: If4231f53b579417b6c9c90b39541193bf2e8f27c
Reviewed-on: https://gerrit.libreoffice.org/67874
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/android/Bootstrap/Makefile.shared 
b/android/Bootstrap/Makefile.shared
index f77679853d39..942f5f8179ee 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -59,7 +59,7 @@ WHOLELIBS = \
 $(OBJLOCAL)/liblo-native-code.so : native-code.cxx $(ALL_STATIC_LIBS)
@echo "Linking $@"
mkdir -p $(OBJLOCAL)
-   $(CXX) -Wl,--build-id=sha1 -Wl,--gc-sections 
-Wl,--version-script=../Bootstrap/version.map -Wl,--no-keep-files-mapped 
-Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o 
$(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include 
native-code.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) 
-lc++_static -lc++abi -landroid_support $(if $(filter 
armeabi-v7a,$(ANDROID_APP_ABI)),-lunwind) $(addprefix -l,$(NSSLIBS)) -lGLESv2 
-landroid -ljnigraphics -llog -lz
+   $(CXX) -Wl,--build-id=sha1 -Wl,--gc-sections 
-Wl,--version-script=../Bootstrap/version.map -Wl,--no-keep-files-mapped 
-Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared 
-Wl,-soname,liblo-native-code.so -o $(OBJLOCAL)/liblo-native-code.so 
-I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx 
-L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -lc++_static -lc++abi 
-landroid_support $(if $(filter armeabi-v7a,$(ANDROID_APP_ABI)),-lunwind) 
$(addprefix -l,$(NSSLIBS)) -lGLESv2 -landroid -ljnigraphics -llog -lz
 
 $(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so
mkdir -p $(SODEST)
diff --git a/android/Bootstrap/version.map b/android/Bootstrap/version.map
index 067785410a7a..de561bfc296b 100644
--- a/android/Bootstrap/version.map
+++ b/android/Bootstrap/version.map
@@ -3,6 +3,7 @@ dummy {
 Java_*;
 JNI_OnLoad;
 _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions
+libreofficekit_hook*;
 local:
 *;
 };
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 6e254d961331..65da82f294ad 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4629,7 +4629,7 @@ static int lo_initialize(LibreOfficeKit* pThis, const 
char* pAppPath, const char
 return bInitialized;
 }
 
-SAL_DLLPUBLIC_EXPORT
+SAL_JNI_EXPORT
 LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const char* 
user_profile_url)
 {
 if (!gImpl)
@@ -4645,7 +4645,7 @@ LibreOfficeKit *libreofficekit_hook_2(const char* 
install_path, const char* user
 return static_cast(gImpl);
 }
 
-SAL_DLLPUBLIC_EXPORT
+SAL_JNI_EXPORT
 LibreOfficeKit *libreofficekit_hook(const char* install_path)
 {
 return libreofficekit_hook_2(install_path, nullptr);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/oox oox/source sd/qa

[Libreoffice Gerrit user]

 include/oox/drawingml/shape.hxx   |   23 --
 oox/source/drawingml/shape.cxx|   35 +++---
 oox/source/ppt/pptshape.cxx   |4 ++
 sd/qa/unit/data/pptx/smartart-interopgrabbag.pptx |binary
 sd/qa/unit/import-tests-smartart.cxx  |   21 +
 5 files changed, 62 insertions(+), 21 deletions(-)

New commits:
commit dba1f992d0757b9c353dd41d55dd89ecafd70603
Author: Grzegorz Araminowicz 
AuthorDate: Fri Mar 8 12:45:24 2019 +0100
Commit: Miklos Vajna 
CommitDate: Mon Mar 11 17:38:07 2019 +0100

PPTX import: save SmartArt markup into InteropGrabBag

it will allow to preserve SmartArt when saving PPTX files

Change-Id: I9bb66c59d202b4ce426864599014d042d4aa04b0
Reviewed-on: https://gerrit.libreoffice.org/68916
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 0e3263179fa6..4b25aa49e223 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -229,6 +229,15 @@ public:
 
 protected:
 
+enum FrameType
+{
+FRAMETYPE_GENERIC, ///< Generic shape, no special type.
+FRAMETYPE_OLEOBJECT, ///< OLE object embedded in a shape.
+FRAMETYPE_CHART, ///< Chart embedded in a shape.
+FRAMETYPE_DIAGRAM, ///< Complex diagram drawing shape.
+FRAMETYPE_TABLE ///< A table embedded in a shape.
+};
+
 css::uno::Reference< css::drawing::XShape > const &
 createAndInsert(
 ::oox::core::XmlFilterBase& rFilterBase,
@@ -250,7 +259,8 @@ protected:
 ShapeIdMap* pShapeMap,
 const basegfx::B2DHomMatrix& aTransformation );
 
-voidkeepDiagramCompatibilityInfo( 
::oox::core::XmlFilterBase const & rFilterBase );
+voidkeepDiagramCompatibilityInfo();
+voidconvertSmartArtToMetafile( ::oox::core::XmlFilterBase 
const& rFilterBase );
 
 css::uno::Reference< css::drawing::XShape >
 renderDiagramToGraphic( ::oox::core::XmlFilterBase 
const & rFilterBase );
@@ -310,20 +320,13 @@ protected:
 ::std::vector maExtDrawings;
 Color   maFontRefColorForNodes;
 
+FrameType   meFrameType; ///< Type for graphic frame 
shapes.
+
 private:
-enum FrameType
-{
-FRAMETYPE_GENERIC,  ///< Generic shape, no special type.
-FRAMETYPE_OLEOBJECT,///< OLE object embedded in a shape.
-FRAMETYPE_CHART,///< Chart embedded in a shape.
-FRAMETYPE_DIAGRAM,  ///< Complex diagram drawing shape.
-FRAMETYPE_TABLE ///< A table embedded in a shape.
-};
 
 typedef std::shared_ptr< ::oox::vml::OleObjectInfo >OleObjectInfoRef;
 typedef std::shared_ptr< ChartShapeInfo >   ChartShapeInfoRef;
 
-FrameType   meFrameType;///< Type for graphic frame shapes.
 OleObjectInfoRefmxOleObjectInfo;///< Additional data for OLE 
objects.
 ChartShapeInfoRef   mxChartShapeInfo;   ///< Additional data for chart 
shapes.
 
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index e35a9b2e7703..0c522bdfe63e 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -283,8 +283,9 @@ void Shape::addShape(
 
 if( meFrameType == FRAMETYPE_DIAGRAM )
 {
+keepDiagramCompatibilityInfo();
 if( !SvtFilterOptions::Get().IsSmartArt2Shape() )
-keepDiagramCompatibilityInfo( rFilterBase );
+convertSmartArtToMetafile( rFilterBase );
 }
 }
 }
@@ -1387,7 +1388,7 @@ Reference< XShape > const & Shape::createAndInsert(
 return mxShape;
 }
 
-void Shape::keepDiagramCompatibilityInfo( XmlFilterBase const & rFilterBase )
+void Shape::keepDiagramCompatibilityInfo()
 {
 try
 {
@@ -1418,21 +1419,33 @@ void Shape::keepDiagramCompatibilityInfo( XmlFilterBase 
const & rFilterBase )
 xSet->setPropertyValue( aGrabBagPropName, Any( aGrabBag ) );
 } else
 xSet->setPropertyValue( aGrabBagPropName, Any( maDiagramDoms ) );
+}
+catch( const Exception& e )
+{
+SAL_WARN( "oox.drawingml", "Shape::keepDiagramCompatibilityInfo: " << 
e );
+}
+}
 
-xSet->setPropertyValue( "MoveProtect", Any( true ) );
-xSet->setPropertyValue( "SizeProtect", Any( true ) );
+void Shape::convertSmartArtToMetafile(XmlFilterBase const & rFilterBase)
+{
+try
+{
+Reference xSet(mxShape, UNO_QUERY_THROW);
+
+xSet->setPropertyValue("MoveProtect", Any(true));
+xSet->setPropertyValue("SizeProtect", Any(true));
 
 // Replace existing shapes with a new Graphic Object rendered
 // from them
-

[Libreoffice-commits] online.git: loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/layer/tile/TileLayer.js |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 3b0478baab1e58a45fc723e9265942bf5d4c10fa
Author: Szymon Kłos 
AuthorDate: Mon Mar 11 15:57:24 2019 +0100
Commit: Szymon Kłos 
CommitDate: Mon Mar 11 16:16:34 2019 +0100

Always show cursor header

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 9c677a9f8..3ca9336f0 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1701,6 +1701,8 @@ L.TileLayer = L.GridLayer.extend({
else if (viewCursorMarker) {
this._viewLayerGroup.removeLayer(viewCursorMarker);
}
+
+   this._viewCursors[viewId].marker.showCursorHeader();
},
 
updateAllViewCursors : function() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - ios/CustomTarget_iOS_setup.mk

[Libreoffice Gerrit user]

 ios/CustomTarget_iOS_setup.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c074ef82352c70f38d797eefbd72783ac3346f25
Author: Tor Lillqvist 
AuthorDate: Mon Mar 11 17:16:20 2019 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Mar 11 17:16:20 2019 +0200

We need share/theme_definitions in the iOS app

Change-Id: I460a71f363eb3b7f89786b8bd02f4b8f9521f4c7

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 2501ebecee53..aaeaa5c1cc41 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -48,6 +48,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/ios/CustomTarget_i
cp -R $(INSTDIR)/share/registry $(IOSRES)
cp $(INSTDIR)/share/config/*zip $(IOSRES)/share/config
cp -R $(INSTDIR)/share/liblangtag $(IOSRES)/share
+   cp -R $(INSTDIR)/share/theme_definitions $(IOSRES)/share
mkdir -p $(IOSRES)/share/fonts/truetype
cp $(INSTDIR)/share/fonts/truetype/Liberation* 
$(IOSRES)/share/fonts/truetype
 
___
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' - loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/layer/tile/TileLayer.js |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 6c3db87af104fda1c985d807cba1f660fa7d862f
Author: Szymon Kłos 
AuthorDate: Mon Mar 11 15:57:24 2019 +0100
Commit: Szymon Kłos 
CommitDate: Mon Mar 11 15:57:24 2019 +0100

Always show cursor header

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 6932cc4f2..643a9ba06 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1710,6 +1710,8 @@ L.TileLayer = L.GridLayer.extend({
else if (viewCursorMarker) {
this._viewLayerGroup.removeLayer(viewCursorMarker);
}
+
+   this._viewCursors[viewId].marker.showCursorHeader();
},
 
updateAllViewCursors : function() {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/inc basctl/sdi basctl/source basctl/uiconfig extensions/inc extensions/source include/svx officecfg/registry svx/sdi toolkit/source xmlscript/dtd xmlscript/sourc

[Libreoffice Gerrit user]

 basctl/inc/strings.hxx   |1 
 basctl/sdi/baside.sdi|6 +++
 basctl/source/basicide/baside3.cxx   |4 ++
 basctl/source/basicide/basides1.cxx  |1 
 basctl/source/basicide/basidesh.cxx  |1 
 basctl/source/dlged/dlgedfac.cxx |3 +
 basctl/source/dlged/dlgedobj.cxx |8 

 basctl/source/dlged/propbrw.cxx  |4 ++
 basctl/source/inc/dlgeddef.hxx   |   15 

 basctl/uiconfig/basicide/toolbar/insertcontrolsbar.xml   |1 
 extensions/inc/helpids.h |1 
 extensions/inc/strings.hrc   |1 
 extensions/source/propctrlr/formcomponenthandler.cxx |1 
 extensions/source/propctrlr/formmetadata.cxx |3 +
 extensions/source/propctrlr/formmetadata.hxx |1 
 extensions/source/propctrlr/formstrings.hxx  |1 
 include/svx/svxcommands.h|1 
 include/svx/svxids.hrc   |2 -
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |8 

 svx/sdi/svx.sdi  |   17 
++
 toolkit/source/controls/controlmodelcontainerbase.cxx|1 
 xmlscript/dtd/dialog.dtd |   14 
+++-
 xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx   |1 
 xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx   |1 
 24 files changed, 85 insertions(+), 12 deletions(-)

New commits:
commit 4c4ccdf724dedebce23cc9abd7b74bee43f184d7
Author: Shubham Goyal <22shub...@gmail.com>
AuthorDate: Sat Mar 9 06:10:58 2019 +0530
Commit: Samuel Mehrbrodt 
CommitDate: Mon Mar 11 15:51:16 2019 +0100

i#119731 Hyperlink Control on dialog Editor

Change-Id: I34132931eba103aec5f9622be9c3bf2dd4de237d
Reviewed-on: https://gerrit.libreoffice.org/69001
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/basctl/inc/strings.hxx b/basctl/inc/strings.hxx
index 506886afc3e3..fe12c7c0125b 100644
--- a/basctl/inc/strings.hxx
+++ b/basctl/inc/strings.hxx
@@ -36,6 +36,7 @@
 #define RID_STR_CLASS_TREECONTROL   "TreeControl"
 #define RID_STR_CLASS_GRIDCONTROL   "GridControl"
 #define RID_STR_CLASS_SPINCONTROL   "SpinButton"
+#define RID_STR_CLASS_HYPERLINKCONTROL  "HyperlinkControl"
 
 #endif
 
diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index 61ecb19cf6df..447e5ad6fd71 100644
--- a/basctl/sdi/baside.sdi
+++ b/basctl/sdi/baside.sdi
@@ -547,6 +547,12 @@ shell basctl_Shell
 StateMethod = GetState;
 ]
 
+SID_INSERT_HYPERLINKCONTROL
+[
+ExecMethod  = ExecuteDialog;
+StateMethod = GetState;
+]
+
 SID_EXPORT_DIALOG
 [
 ExecMethod  = ExecuteDialog;
diff --git a/basctl/source/basicide/baside3.cxx 
b/basctl/source/basicide/baside3.cxx
index 264bdc202116..ca885f3ca67e 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -357,6 +357,7 @@ void DialogWindow::GetState( SfxItemSet& rSet )
 case SID_INSERT_FILECONTROL:
 case SID_INSERT_SPINBUTTON:
 case SID_INSERT_GRIDCONTROL:
+case SID_INSERT_HYPERLINKCONTROL:
 case SID_INSERT_TREECONTROL:
 {
 if ( IsReadOnly() )
@@ -508,6 +509,9 @@ void DialogWindow::ExecuteCommand( SfxRequest& rReq )
 case SID_INSERT_GRIDCONTROL:
 nInsertObj = OBJ_DLG_GRIDCONTROL;
 break;
+case SID_INSERT_HYPERLINKCONTROL:
+nInsertObj = OBJ_DLG_HYPERLINKCONTROL;
+break;
 case SID_INSERT_TREECONTROL:
 nInsertObj = OBJ_DLG_TREECONTROL;
 break;
diff --git a/basctl/source/basicide/basides1.cxx 
b/basctl/source/basicide/basides1.cxx
index 1ab4d275dcb3..54c750716630 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -898,6 +898,7 @@ void Shell::GetState(SfxItemSet &rSet)
 case SID_INSERT_FILECONTROL:
 case SID_INSERT_SPINBUTTON:
 case SID_INSERT_GRIDCONTROL:
+case SID_INSERT_HYPERLINKCONTROL:
 case SID_INSERT_TREECONTROL:
 case SID_INSERT_FORM_RADIO:
 case SID_INSERT_FORM_CHECK:
diff --git a/basctl/source/basicide/basidesh.cxx 
b/basctl/source/basicide/basidesh.cxx
index 4fd29d359337..c21aa3039584 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@

[Libreoffice-commits] core.git: cui/source

[Libreoffice Gerrit user]

 cui/source/factory/dlgfact.cxx |   27 ---
 cui/source/factory/dlgfact.hxx |   11 ---
 2 files changed, 38 deletions(-)

New commits:
commit 50d91e7294700ea38fc4933b0636a19d4684eede
Author: Caolán McNamara 
AuthorDate: Sun Mar 10 19:24:18 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 15:37:26 2019 +0100

CuiAbstractTabDialog_Impl is now unused

Change-Id: I6b561e7ec313c23ca780f039de48e44874dac0c7
Reviewed-on: https://gerrit.libreoffice.org/69014
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 9e342f482353..b155a8685b9a 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -110,7 +110,6 @@ short CuiAbstractSingleTabController_Impl::Execute()
 }
 
 IMPL_ABSTDLG_BASE(CuiVclAbstractDialog_Impl)
-IMPL_ABSTDLG_BASE(CuiAbstractTabDialog_Impl);
 
 short AbstractSvxDistributeDialog_Impl::Execute()
 {
@@ -298,32 +297,6 @@ short AbstractSignSignatureLineDialog_Impl::Execute()
 
 IMPL_ABSTDLG_BASE(AbstractScreenshotAnnotationDlg_Impl);
 
-
-void CuiAbstractTabDialog_Impl::SetCurPageId( const OString& rName )
-{
-pDlg->SetCurPageId( rName );
-}
-
-const SfxItemSet* CuiAbstractTabDialog_Impl::GetOutputItemSet() const
-{
-return pDlg->GetOutputItemSet();
-}
-
-const sal_uInt16* CuiAbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& 
pItem )
-{
-return pDlg->GetInputRanges( pItem );
-}
-
-void CuiAbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
-{
- pDlg->SetInputSet( pInSet );
-}
-//From class Window.
-void CuiAbstractTabDialog_Impl::SetText( const OUString& rStr )
-{
-pDlg->SetText( rStr );
-}
-
 short CuiAbstractTabController_Impl::Execute()
 {
 return m_xDlg->run();
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 021cbc0ba1de..44ad834a3b50 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -120,17 +120,6 @@ public:
 virtual void  SetText( const OUString& rStr ) override;
 };
 
-class CuiAbstractTabDialog_Impl : public SfxAbstractTabDialog
-{
-DECL_ABSTDLG_BASE(CuiAbstractTabDialog_Impl,SfxTabDialog)
-virtual voidSetCurPageId( const OString& rName ) override;
-virtual const SfxItemSet*   GetOutputItemSet() const override;
-virtual const sal_uInt16*   GetInputRanges( const SfxItemPool& pItem ) 
override;
-virtual voidSetInputSet( const SfxItemSet* pInSet ) 
override;
-//From class Window.
-virtual voidSetText( const OUString& rStr ) override;
-};
-
 class CuiAbstractTabController_Impl : public SfxAbstractTabDialog
 {
 std::shared_ptr m_xDlg;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source cui/uiconfig include/sfx2 include/vcl sfx2/source vcl/source vcl/unx

[Libreoffice Gerrit user]

 cui/source/customize/CommandCategoryListBox.cxx |   29 +-
 cui/source/customize/SvxMenuConfigPage.cxx  |   22 -
 cui/source/customize/SvxToolbarConfigPage.cxx   |   32 +-
 cui/source/customize/acccfg.cxx |8 
 cui/source/customize/cfg.cxx|   60 +---
 cui/source/customize/cfgutil.cxx|   50 +--
 cui/source/dialogs/hangulhanjadlg.cxx   |2 
 cui/source/factory/dlgfact.cxx  |   10 
 cui/source/factory/dlgfact.hxx  |2 
 cui/source/inc/CommandCategoryListBox.hxx   |3 
 cui/source/inc/cfg.hxx  |   11 
 cui/source/inc/cfgutil.hxx  |   19 +
 cui/uiconfig/ui/accelconfigpage.ui  |3 
 cui/uiconfig/ui/customizedialog.ui  |  128 ++
 cui/uiconfig/ui/menuassignpage.ui   |  304 
 include/sfx2/sfxdlg.hxx |2 
 include/vcl/outdev.hxx  |4 
 include/vcl/weld.hxx|4 
 sfx2/source/appl/appserv.cxx|2 
 vcl/source/app/salvtables.cxx   |   12 
 vcl/unx/gtk3/gtk3gtkinst.cxx|   30 ++
 21 files changed, 505 insertions(+), 232 deletions(-)

New commits:
commit 3a42ee3284df7020ef111293a4d11148c1bf3a50
Author: Caolán McNamara 
AuthorDate: Fri Mar 8 09:06:21 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 15:37:05 2019 +0100

weld SvxConfigDialog

Change-Id: Ia6983fd658521cf8704ca1ed95ecff6590ddde09
Reviewed-on: https://gerrit.libreoffice.org/68906
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/customize/CommandCategoryListBox.cxx 
b/cui/source/customize/CommandCategoryListBox.cxx
index 2f9a9a451512..110a1d1eb322 100644
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -273,9 +273,10 @@ OUString CommandCategoryListBox::getCommandName(const 
OUString& sCommand)
 }
 
 void CommandCategoryListBox::categorySelected(CuiConfigFunctionListBox* 
pFunctionListBox,
-  const OUString& filterTerm , 
SaveInData *pCurrentSaveInData)
+  const OUString& filterTerm, 
SaveInData *pCurrentSaveInData)
 {
 SfxGroupInfo_Impl *pInfo = 
reinterpret_cast(m_xControl->get_active_id().toInt64());
+std::vector> aNodesToExpand;
 pFunctionListBox->freeze();
 pFunctionListBox->ClearAll();
 
@@ -292,6 +293,9 @@ void 
CommandCategoryListBox::categorySelected(CuiConfigFunctionListBox* pFunctio
 SfxGroupInfo_Impl *pCurrentInfo =
 
reinterpret_cast(m_xControl->get_id(nCurPos).toInt64());
 
+if (!pCurrentInfo) //seperator
+continue;
+
 if (pCurrentInfo->nKind == SfxCfgKind::GROUP_FUNCTION)
 {
 css::uno::Sequence< css::frame::DispatchInformation > 
lCommands;
@@ -376,10 +380,10 @@ void 
CommandCategoryListBox::categorySelected(CuiConfigFunctionListBox* pFunctio
 m_aGroupInfo.push_back(
 std::make_unique(
 SfxCfgKind::GROUP_SCRIPTCONTAINER, 0 ) );
-std::unique_ptr 
xMacroGroup(pFunctionListBox->append_ondemand(OUString::number(reinterpret_cast(m_aGroupInfo.back().get())),
 sUIName));
+std::unique_ptr 
xMacroGroup(pFunctionListBox->tree_append(OUString::number(reinterpret_cast(m_aGroupInfo.back().get())),
 sUIName));
 
 //Add the children and the grand children
-addChildren(xMacroGroup.get(), childGroup, 
pFunctionListBox, filterTerm, pCurrentSaveInData);
+addChildren(xMacroGroup.get(), childGroup, 
pFunctionListBox, filterTerm, pCurrentSaveInData, aNodesToExpand);
 
 // Remove the main group if empty
 if (!pFunctionListBox->iter_has_child(*xMacroGroup))
@@ -388,7 +392,7 @@ void 
CommandCategoryListBox::categorySelected(CuiConfigFunctionListBox* pFunctio
 }
 else if (!filterTerm.isEmpty())
 {
-pFunctionListBox->expand_row(*xMacroGroup);
+
aNodesToExpand.emplace_back(std::move(xMacroGroup));
 }
 }
 }
@@ -410,7 +414,7 @@ void 
CommandCategoryListBox::categorySelected(CuiConfigFunctionListBox* pFunctio
 
 m_aGroupInfo.push_back( std::make_unique( 
SfxCfgKind::GROUP_STYLES, 0 ) );
 // pIt.sLabel is Name of the style family
-std::unique_ptr 
xFuncEntry(pFunctionListBox->append_ondemand(OUString::number(reinterpret_cast(m_aGroupInfo.back().get())),
 pIt

Parameter out of range (here we go again.)

[Dan Lewis]

I ran into a problem yesterday when my timezone in the US went from 
standard time to daylight savings time. The MySQL J/connector 8.0.15 has 
a bug that prevents a connection to the MySQL server with a modification 
of the database name. I solved this problem. But then when I opened a 
form with a subform, the data would not load with an explanation 
beginning with "Parameter index out of range...".  I filed this bug 
report: 123999.


I and others had a similar problem when opening a database that had been 
created before LibreOffice 6.2 but opened with version 6.2. The problem 
was "db parameter-name-substitution="false" in the context.xml file in 
the database file. So this had already been removed, and the form had 
worked properly the day before the time change.


I wondered if beginning with a new database on LibreOffice 6.2.1.2 to 
connect to the MySQL server would work. It did not. In fact, when I 
edited the content.xml file, I located "db 
parameter-name-substitution="false" in it. (Is this a regression?)


Dan

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/uiconfig

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/ui/retypepassdialog.ui |   15 +++
 1 file changed, 11 insertions(+), 4 deletions(-)

New commits:
commit 231c06c5c2320c0465df0cbeab4c754937a05a9b
Author: Caolán McNamara 
AuthorDate: Sun Mar 10 21:52:30 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 14:44:08 2019 +0100

reorient dialog to standard direction

Change-Id: Ide0be3c66e155540fb73ed8c915c91f2eb678255
Reviewed-on: https://gerrit.libreoffice.org/69024
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/uiconfig/scalc/ui/retypepassdialog.ui 
b/sc/uiconfig/scalc/ui/retypepassdialog.ui
index 0cd23763c4fc..f550063536db 100644
--- a/sc/uiconfig/scalc/ui/retypepassdialog.ui
+++ b/sc/uiconfig/scalc/ui/retypepassdialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -9,18 +9,24 @@
 6
 Re-type Password
 False
+True
+0
+0
 dialog
+
+  
+
 
   
 False
 True
 True
+vertical
 12
 
   
 False
-vertical
-start
+end
 
   
 gtk-ok
@@ -63,6 +69,7 @@
 False
 True
 2
+True
   
 
   
@@ -86,10 +93,10 @@
 True
 False
 start
-0
 The document you are about to export has 
one or more protected items with password that cannot be exported. Please 
re-type your password to be able to export your document.
 True
 60
+0
   
   
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/harfbuzz

[Libreoffice Gerrit user]

 external/harfbuzz/ExternalProject_harfbuzz.mk |1 +
 external/harfbuzz/UnpackedTarball_harfbuzz.mk |6 --
 external/harfbuzz/harfbuzz-rtti.patch |   13 -
 3 files changed, 1 insertion(+), 19 deletions(-)

New commits:
commit a8727ea40b3b1334fd9a8a20ab559d338a065f17
Author: Khaled Hosny 
AuthorDate: Fri Mar 8 16:06:19 2019 +0200
Commit: Khaled Hosny 
CommitDate: Mon Mar 11 14:41:29 2019 +0100

Add -frtti to HarfBuzz CXXFLAGS instead of paching configure.ac

Change-Id: Ibc16c4e9c4a305d6fff764fcf3964a63c5322e14
Reviewed-on: https://gerrit.libreoffice.org/68921
Tested-by: Jenkins
Reviewed-by: Khaled Hosny 

diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk 
b/external/harfbuzz/ExternalProject_harfbuzz.mk
index 82e10ecb76cc..b0bcc301cd66 100644
--- a/external/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/external/harfbuzz/ExternalProject_harfbuzz.mk
@@ -46,6 +46,7 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
$(if $(filter 
$(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS)) \
$(if $(ENABLE_OPTIMIZED), \

$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
+   $(if $(ENABLE_RUNTIME_OPTIMIZATIONS),,-frtti) \
$(CXXFLAGS) $(CXXFLAGS_CXX11) \
$(ICU_UCHAR_TYPE) \
$(if $(filter 
LINUX,$(OS)),-fvisibility=hidden)' \
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk 
b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index bfe7b2a9981d..8101f244f4df 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -21,10 +21,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
 external/harfbuzz/msvc.patch \
 ))
 
-ifneq ($(ENABLE_RUNTIME_OPTIMIZATIONS),TRUE)
-$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
-external/harfbuzz/harfbuzz-rtti.patch \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/harfbuzz/harfbuzz-rtti.patch 
b/external/harfbuzz/harfbuzz-rtti.patch
deleted file mode 100644
index 545e63981982..
--- a/external/harfbuzz/harfbuzz-rtti.patch
+++ /dev/null
@@ -1,13 +0,0 @@
 configure
-+++ configure
-@@ -18959,9 +18959,7 @@
-   # No threadsafe statics in C++ as we do it ourselves.
-   # We don't use these features, so it's safe to disable them
-   # even in the cases where we DO link to libstdc++.
--  # Put -fno-rtti before $CXXFLAGS such that users can re-enable it
--  # by overriding CXXFLAGS.
--  CXXFLAGS="-fno-rtti $CXXFLAGS -fno-exceptions -fno-threadsafe-statics"
-+  CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-threadsafe-statics"
- 
-   case "$host" in
-   *-*-mingw*)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/qa

[Libreoffice Gerrit user]

 sc/qa/extras/scstylefamilyobj.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bf8e781f2717a59c02390cccbe0b488c7bd533f4
Author: Andrea Gelmini 
AuthorDate: Mon Mar 11 12:08:11 2019 +0100
Commit: Julien Nabet 
CommitDate: Mon Mar 11 14:37:53 2019 +0100

Fix typos in code (path)

Change-Id: Id93fe19fe6dc0148f042ebe56508de0be85f08d6
Reviewed-on: https://gerrit.libreoffice.org/69040
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git a/sc/qa/extras/scstylefamilyobj.cxx 
b/sc/qa/extras/scstylefamilyobj.cxx
index 2ca381c92d33..bbe8b7d6457b 100644
--- a/sc/qa/extras/scstylefamilyobj.cxx
+++ b/sc/qa/extras/scstylefamilyobj.cxx
@@ -72,7 +72,7 @@ private:
 };
 
 ScStyleFamilyObj::ScStyleFamilyObj()
-: CalcUnoApiTest("/sc/qa/extras/testdocuemts")
+: CalcUnoApiTest("/sc/qa/extras/testdocuments")
 , XElementAccess(cppu::UnoType::get())
 , XIndexAccess(19)
 , XNameAccess("Default")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 71 commits - include/basegfx include/vcl offapi/com Repository.mk svgio/CppunitTest_svgio_read.mk svgio/inc svgio/Library_svgio.mk sv

[Libreoffice Gerrit user]

 Repository.mk   |1 
 include/basegfx/DrawCommands.hxx|   99 +
 include/vcl/alpha.hxx   |   14 
 offapi/com/sun/star/graphic/XSvgParser.idl  |   14 
 svgio/CppunitTest_svgio_read.mk |   67 
 svgio/Library_svgio.mk  |1 
 svgio/Module_svgio.mk   |1 
 svgio/inc/svgnode.hxx   |   12 
 svgio/inc/svgvisitor.hxx|   41 
 svgio/qa/cppunit/SvgRead.cxx|  144 +
 svgio/qa/cppunit/data/path.svg  |3 
 svgio/source/svgreader/svgnode.cxx  |4 
 svgio/source/svgreader/svgvisitor.cxx   |  130 +
 svgio/source/svguno/xsvgparser.cxx  |  116 +
 vcl/CppunitTest_vcl_widget_definition_reader_test.mk|   52 
 vcl/Library_vcl.mk  |3 
 vcl/Module_vcl.mk   |6 
 vcl/Package_theme_definitions.mk|   54 
 vcl/headless/svpgdi.cxx |9 
 vcl/inc/FileDefinitionWidgetDraw.hxx|   57 
 vcl/inc/salgdi.hxx  |   21 
 vcl/inc/widgetdraw/WidgetDefinition.hxx |  280 +++
 vcl/inc/widgetdraw/WidgetDefinitionReader.hxx   |   45 
 vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx|   97 +
 vcl/qa/cppunit/widgetdraw/data/definition1.xml  |   82 +
 vcl/quartz/salgdi.cxx   |4 
 vcl/source/gdi/FileDefinitionWidgetDraw.cxx |  926 
 vcl/source/gdi/WidgetDefinition.cxx |  194 ++
 vcl/source/gdi/WidgetDefinitionReader.cxx   |  473 ++
 vcl/source/gdi/salgdilayout.cxx |   61 
 vcl/source/outdev/nativecontrols.cxx|2 
 vcl/uiconfig/theme_definitions/arrow-down.svgx  |5 
 vcl/uiconfig/theme_definitions/arrow-up.svgx|5 
 vcl/uiconfig/theme_definitions/combobox-disabled.svgx   |4 
 vcl/uiconfig/theme_definitions/combobox.svgx|4 
 vcl/uiconfig/theme_definitions/common-rect-disabled.svgx|3 
 vcl/uiconfig/theme_definitions/common-rect.svgx |3 
 vcl/uiconfig/theme_definitions/definition.xml   |  466 ++
 vcl/uiconfig/theme_definitions/pushbutton-default.svgx  |3 
 vcl/uiconfig/theme_definitions/pushbutton-disabled.svgx |3 
 vcl/uiconfig/theme_definitions/pushbutton-rollover.svgx |3 
 vcl/uiconfig/theme_definitions/scrollbar-horizontal.svgx|4 
 vcl/uiconfig/theme_definitions/scrollbar-vertical.svgx  |4 
 vcl/uiconfig/theme_definitions/slider-button.svgx   |3 
 vcl/uiconfig/theme_definitions/spinbox-left-disabled.svgx   |4 
 vcl/uiconfig/theme_definitions/spinbox-left-pressed.svgx|4 
 vcl/uiconfig/theme_definitions/spinbox-left-rollover.svgx   |4 
 vcl/uiconfig/theme_definitions/spinbox-left.svgx|4 
 vcl/uiconfig/theme_definitions/spinbox-right-disabled.svgx  |7 
 vcl/uiconfig/theme_definitions/spinbox-right-pressed.svgx   |5 
 vcl/uiconfig/theme_definitions/spinbox-right-rollover.svgx  |5 
 vcl/uiconfig/theme_definitions/spinbox-right.svgx   |5 
 vcl/uiconfig/theme_definitions/switch-off-disabled.svgx |  182 ++
 vcl/uiconfig/theme_definitions/switch-off-pressed.svgx  |  159 ++
 vcl/uiconfig/theme_definitions/switch-off.svgx  |  182 ++
 vcl/uiconfig/theme_definitions/switch-on-disabled.svgx  |  144 +
 vcl/uiconfig/theme_definitions/switch-on-pressed.svgx   |  146 +
 vcl/uiconfig/theme_definitions/switch-on.svgx   |  144 +
 vcl/uiconfig/theme_definitions/tabitem-first-selected.svgx  |3 
 vcl/uiconfig/theme_definitions/tabitem-first.svgx   |3 
 vcl/uiconfig/theme_definitions/tabitem-last-selected.svgx   |3 
 vcl/uiconfig/theme_definitions/tabitem-last.svgx|3 
 vcl/uiconfig/theme_definitions/tabitem-middle-selected.svgx |3 
 vcl/uiconfig/theme_definitions/tabitem-middle.svgx  |3 
 vcl/uiconfig/theme_definitions/tick-off-disabled.svgx   |   93 +
 vcl/uiconfig/theme_definitions/tick-off-pressed.svgx|  126 +
 vcl/uiconfig/theme_definitions/tick-off.svgx|  113 +
 vcl/uiconfig/theme_definitions/tick-on-disabled.svgx|  125 +
 vcl/uiconfig/theme_definitions/tick-on-pressed.svgx |  116 +
 vcl/uiconfig/theme_definitions/tick-on.svgx |  116 +
 vcl/unx/gtk/salnativewidgets-gtk.cxx|2 
 71 files changed, 5166 insertions(+), 61 deletion

[Libreoffice-commits] core.git: vcl/source

[Libreoffice Gerrit user]

 vcl/source/app/salvtables.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 34d25edec00b812dedbb0616a98c5f82d221263a
Author: Andrea Gelmini 
AuthorDate: Mon Mar 11 12:09:35 2019 +0100
Commit: Julien Nabet 
CommitDate: Mon Mar 11 13:35:28 2019 +0100

Fix typo

Change-Id: Ia4ca41607d13553f7924f0cce6276c114608216e
Reviewed-on: https://gerrit.libreoffice.org/69041
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 3a9d59a8bdb2..572ed4aa3694 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -3376,7 +3376,7 @@ class SalInstanceLabel : public SalInstanceWidget, public 
virtual weld::Label
 private:
 // Control instead of FixedText so we can also use this for
 // SelectableFixedText which is derived from Edit. We just typically need
-// [G|S]etText which exists in their shared basesclass
+// [G|S]etText which exists in their shared baseclass
 VclPtr m_xLabel;
 public:
 SalInstanceLabel(Control* pLabel, SalInstanceBuilder *pBuilder, bool 
bTakeOwnership)
___
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

[Libreoffice Gerrit user]

 sw/qa/uitest/writer_tests5/DropDownFormFieldPropertiesDialog.py |2 +-
 sw/source/ui/fldui/DropDownFormFieldDialog.cxx  |3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 31f1789c810970fda7b300b2943f20e10761a5e0
Author: Tamás Zolnai 
AuthorDate: Mon Mar 11 10:21:29 2019 +0100
Commit: Tamás Zolnai 
CommitDate: Mon Mar 11 13:21:35 2019 +0100

MSForms: Fix removal of all items on the drop-down form field dialog 2

Change-Id: I37ffbbe48a8b08cc10c83d4bb68946908475776d
Reviewed-on: https://gerrit.libreoffice.org/69038
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 

diff --git a/sw/qa/uitest/writer_tests5/DropDownFormFieldPropertiesDialog.py 
b/sw/qa/uitest/writer_tests5/DropDownFormFieldPropertiesDialog.py
index 9b28759e4771..08797d9bb3ee 100644
--- a/sw/qa/uitest/writer_tests5/DropDownFormFieldPropertiesDialog.py
+++ b/sw/qa/uitest/writer_tests5/DropDownFormFieldPropertiesDialog.py
@@ -146,7 +146,7 @@ class dropDownFormFieldDialog(UITestCase):
 removeButton.executeAction("CLICK", tuple())
 
 self.assertEqual(get_state_as_dict(removeButton)["Enabled"], "false")
-self.assertEqual(get_state_as_dict(itemsList)["Children"], "1")
+self.assertEqual(get_state_as_dict(itemsList)["Children"], "0")
 
 xOKBtn = xDialog.getChild("ok")
 self.ui_test.close_dialog_through_button(xOKBtn)
diff --git a/sw/source/ui/fldui/DropDownFormFieldDialog.cxx 
b/sw/source/ui/fldui/DropDownFormFieldDialog.cxx
index 8bbb73b066f9..42312bca3693 100644
--- a/sw/source/ui/fldui/DropDownFormFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFormFieldDialog.cxx
@@ -71,7 +71,8 @@ IMPL_LINK(DropDownFormFieldDialog, ButtonPushedHdl, 
weld::Button&, rButton, void
 if (&rButton == m_xListRemoveButton.get())
 {
 m_xListItemsTreeView->remove(nSelPos);
-m_xListItemsTreeView->select(nSelPos - 1);
+if (m_xListItemsTreeView->n_children() > 0)
+m_xListItemsTreeView->select(nSelPos ? nSelPos - 1 : 0);
 }
 else if (&rButton == m_xListUpButton.get())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - configure.ac sc/IwyuFilter_sc.yaml sc/source

[Libreoffice Gerrit user]

 configure.ac  |3 +++
 sc/IwyuFilter_sc.yaml |7 +++
 sc/source/ui/formdlg/dwfunctr.cxx |9 -
 sc/source/ui/formdlg/formula.cxx  |   10 +++---
 sc/source/ui/inc/dataproviderdlg.hxx  |2 +-
 sc/source/ui/inc/namemgrtable.hxx |1 +
 sc/source/ui/inc/tpview.hxx   |2 +-
 sc/source/ui/miscdlgs/acredlin.cxx|2 --
 sc/source/ui/miscdlgs/anyrefdg.cxx|3 ---
 sc/source/ui/miscdlgs/autofmt.cxx |7 ---
 sc/source/ui/miscdlgs/datafdlg.cxx|2 --
 sc/source/ui/miscdlgs/dataproviderdlg.cxx |2 +-
 sc/source/ui/miscdlgs/datastreamdlg.cxx   |1 -
 sc/source/ui/miscdlgs/filldlg.cxx |1 -
 sc/source/ui/miscdlgs/highred.cxx |2 --
 sc/source/ui/miscdlgs/instbdlg.cxx|1 -
 sc/source/ui/miscdlgs/linkarea.cxx|3 ---
 sc/source/ui/miscdlgs/mvtabdlg.cxx|1 -
 sc/source/ui/miscdlgs/optsolver.cxx   |7 +++
 sc/source/ui/miscdlgs/protectiondlg.cxx   |2 --
 sc/source/ui/miscdlgs/redcom.cxx  |5 +++--
 sc/source/ui/miscdlgs/scuiautofmt.cxx |   19 ++-
 sc/source/ui/miscdlgs/sharedocdlg.cxx |1 -
 sc/source/ui/miscdlgs/simpref.cxx |4 
 sc/source/ui/miscdlgs/solveroptions.cxx   |4 
 sc/source/ui/miscdlgs/solvrdlg.cxx|1 -
 sc/source/ui/miscdlgs/strindlg.cxx|1 -
 sc/source/ui/miscdlgs/tabbgcolordlg.cxx   |7 ---
 sc/source/ui/miscdlgs/tabopdlg.cxx|2 --
 sc/source/ui/miscdlgs/textdlgs.cxx|1 -
 sc/source/ui/miscdlgs/warnbox.cxx |1 -
 sc/source/ui/namedlg/namedefdlg.cxx   |1 -
 sc/source/ui/namedlg/namedlg.cxx  |2 --
 sc/source/ui/namedlg/namemgrtable.cxx |   12 ++--
 sc/source/ui/navipi/content.cxx   |7 ---
 sc/source/ui/navipi/navcitem.cxx  |1 -
 sc/source/ui/navipi/navipi.cxx|8 
 sc/source/ui/optdlg/calcoptionsdlg.cxx|   17 -
 sc/source/ui/optdlg/calcoptionsdlg.hxx|1 -
 sc/source/ui/optdlg/opredlin.cxx  |   11 +--
 sc/source/ui/optdlg/tpcalc.cxx|8 +---
 sc/source/ui/optdlg/tpcompatibility.cxx   |5 +++--
 sc/source/ui/optdlg/tpdefaults.cxx|1 -
 sc/source/ui/optdlg/tpformula.cxx |4 +---
 sc/source/ui/optdlg/tpview.cxx|9 +
 45 files changed, 38 insertions(+), 163 deletions(-)

New commits:
commit b8a0f8c6f34c7f916e53935e410a5a68931bb739
Author: Gabor Kelemen 
AuthorDate: Thu Mar 7 07:51:39 2019 +0100
Commit: Miklos Vajna 
CommitDate: Mon Mar 11 12:43:48 2019 +0100

tdf#42949 Fix IWYU warnings in sc/source/ui/[f-o]*/*cxx

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: I56e32029f40a7c440143e395d851396fb2740fa8
Reviewed-on: https://gerrit.libreoffice.org/68837
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index dc3b4ab96723..d04da62d06f1 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -521,6 +521,9 @@ blacklist:
 sc/source/ui/inc/StatisticsTwoVariableDialog.hxx:
 # base class has to be a complete type
 - viewdata.hxx
+sc/source/ui/inc/tpview.hxx:
+# Needed for VclPtr type
+- svx/colorbox.hxx
 sc/source/ui/unoobj/exceldetect.hxx:
 # base class has to be a complete type
 - com/sun/star/document/XExtendedFilterDetection.hpp
@@ -860,3 +863,7 @@ blacklist:
 sc/source/ui/drawfunc/futext3.cxx:
 # Needed for direct member access
 - svx/svdocapt.hxx
+sc/source/ui/formdlg/formula.cxx:
+# Complete type is needed
+- com/sun/star/sheet/XFormulaParser.hpp
+- com/sun/star/sheet/XFormulaOpCodeMapper.hpp
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx 
b/sc/source/ui/formdlg/dwfunctr.cxx
index f2c52f45fad7..bc99704c9dbc 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -19,23 +19,14 @@
 
 #include 
 #include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
 
-#include 
 #include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 
 #include 
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 23f4479722ee..56d96a456ea9 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -24,17 +24,13 @@
 #include 
 #include 
 #include 
-#include 
 #include 
-#include 
-#include 
-#include 
 #include 
 #include 
 #include 
 #include 
 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -43,10 +39,8 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -54,6 +48,8 @@
 #include 
 
 #include 
+#include 
+#include 
 
 using namespace formula;
 using

[Libreoffice-commits] core.git: sc/uiconfig

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/ui/solverdlg.ui |   33 ++---
 1 file changed, 14 insertions(+), 19 deletions(-)

New commits:
commit a7bdd3eeb875350059b684df91e4900ba0886660
Author: Olivier Hallot 
AuthorDate: Sun Mar 3 07:15:49 2019 -0300
Commit: Olivier Hallot 
CommitDate: Mon Mar 11 12:32:27 2019 +0100

tdf#112897 Put Help button on the left of dialog

Change-Id: I2edd44d575dcd4f45f5a2141e92c43baef315ae2
Reviewed-on: https://gerrit.libreoffice.org/68638
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/sc/uiconfig/scalc/ui/solverdlg.ui 
b/sc/uiconfig/scalc/ui/solverdlg.ui
index 6ac525c8229c..99aba126eef4 100644
--- a/sc/uiconfig/scalc/ui/solverdlg.ui
+++ b/sc/uiconfig/scalc/ui/solverdlg.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -8,6 +8,9 @@
 6
 Solver
 dialog
+
+  
+
 
   
 False
@@ -29,7 +32,6 @@
 False
 True
 0
-True
   
 
 
@@ -44,15 +46,18 @@
 False
 True
 1
+True
   
 
 
-  
-gtk-close
+  
+_Solve
 True
 True
+True
+True
 True
-True
+True
   
   
 False
@@ -61,14 +66,12 @@
   
 
 
-  
-_Solve
+  
+gtk-close
 True
 True
-True
-True
 True
-True
+True
   
   
 False
@@ -516,8 +519,6 @@
   
 True
 False
-0
-1
 
   <=
   =
@@ -540,8 +541,6 @@
   
 True
 False
-0
-1
 
   <=
   =
@@ -564,8 +563,6 @@
   
 True
 False
-0
-1
 
   <=
   =
@@ -588,8 +585,6 @@
   
 True
 False
-0
-1
 
   <=
   =
@@ -822,8 +817,8 @@
 
   options
   help
-  close
   solve
+  close
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Wenzhe Pei license statement

[Wenzhe Pei]

All of my past & future contributions to LibreOffice may be licensed under
the MPLv2/LGPLv3+ dual license.

Wenzhe Pei
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - toolkit/CppunitTest_toolkit.mk toolkit/qa

[Libreoffice Gerrit user]

 toolkit/CppunitTest_toolkit.mk |5 ++
 toolkit/qa/cppunit/Dialog.cxx  |   82 +
 2 files changed, 87 insertions(+)

New commits:
commit 4be972520e040ab3403645a7e266ce7316dbe38a
Author: Samuel Mehrbrodt 
AuthorDate: Mon Mar 4 17:15:34 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Mar 11 12:15:50 2019 +0100

tdf#123772 Add test

Reviewed-on: https://gerrit.libreoffice.org/68701
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 9c2cf30333a3d1434c4184ed7a1e824c9fa3abb5)

Change-Id: Id46bf2b293c4465f5c58f503c75904639d59f168
Reviewed-on: https://gerrit.libreoffice.org/68900
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/toolkit/CppunitTest_toolkit.mk b/toolkit/CppunitTest_toolkit.mk
index c2c804b38a31..5afa7a616188 100644
--- a/toolkit/CppunitTest_toolkit.mk
+++ b/toolkit/CppunitTest_toolkit.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_CppunitTest_CppunitTest,toolkit))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,toolkit, \
+   toolkit/qa/cppunit/Dialog \
toolkit/qa/cppunit/UnitConversion \
 ))
 
@@ -32,6 +33,10 @@ $(eval $(call gb_CppunitTest_use_api,toolkit,\
udkapi \
 ))
 
+$(eval $(call gb_CppunitTest_use_externals,toolkit,\
+boost_headers \
+))
+
 $(eval $(call gb_CppunitTest_use_ure,toolkit))
 
 $(eval $(call gb_CppunitTest_use_configuration,toolkit))
diff --git a/toolkit/qa/cppunit/Dialog.cxx b/toolkit/qa/cppunit/Dialog.cxx
new file mode 100644
index ..7689b886c333
--- /dev/null
+++ b/toolkit/qa/cppunit/Dialog.cxx
@@ -0,0 +1,82 @@
+/* -*- 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 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+using namespace css;
+
+namespace
+{
+/// Test dialogs constructed via UNO
+class DialogTest : public test::BootstrapFixture, public unotest::MacrosTest
+{
+protected:
+uno::Reference mxContext;
+
+public:
+void testDialogSizeable();
+virtual void setUp() override;
+
+CPPUNIT_TEST_SUITE(DialogTest);
+CPPUNIT_TEST(testDialogSizeable);
+CPPUNIT_TEST_SUITE_END();
+};
+
+void DialogTest::setUp()
+{
+test::BootstrapFixture::setUp();
+
+mxContext.set(comphelper::getComponentContext(getMultiServiceFactory()));
+}
+
+void DialogTest::testDialogSizeable()
+{
+uno::Reference xDialog;
+uno::Reference 
xFactory(mxContext->getServiceManager(),
+  
uno::UNO_QUERY_THROW);
+uno::Reference xControlModel(
+
xFactory->createInstanceWithContext("com.sun.star.awt.UnoControlDialogModel", 
mxContext),
+uno::UNO_QUERY_THROW);
+
+uno::Reference xPropSet(xControlModel, 
uno::UNO_QUERY_THROW);
+xPropSet->setPropertyValue("Sizeable", uno::Any(true));
+
+uno::Reference xControl = 
awt::UnoControlDialog::create(mxContext);
+xControl->setModel(xControlModel);
+uno::Reference xWindow(xControl, uno::UNO_QUERY);
+xWindow->setVisible(true);
+xDialog.set(xControl, uno::UNO_QUERY_THROW);
+xDialog->execute();
+
+VclPtr pWindow = VCLUnoHelper::GetWindow(xControl->getPeer());
+CPPUNIT_ASSERT(pWindow);
+CPPUNIT_ASSERT(pWindow->GetStyle() & WB_SIZEABLE);
+
+xDialog->endExecute();
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(DialogTest);
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - chart2/qa include/oox oox/source

[Libreoffice Gerrit user]

 chart2/qa/extras/chart2export.cxx |   15 +++
 chart2/qa/extras/data/docx/tdf121744.docx |binary
 include/oox/export/chartexport.hxx|2 +-
 oox/source/export/chartexport.cxx |   26 ++
 4 files changed, 34 insertions(+), 9 deletions(-)

New commits:
commit 25e391fb6273c444bac8314213d49089403a7f04
Author: Jozsef Szakacs 
AuthorDate: Wed Nov 28 09:13:03 2018 +0100
Commit: Aron Budea 
CommitDate: Mon Mar 11 12:11:06 2019 +0100

tdf#121744 XLSX Export Combinated Chart (Column and Line)

Each of the Column and Line Chart creates it's own x and y Axes.
So now the LineChart Exporter Method uses the same Axes as the BarChart.

Thanks for the help:
- Balazs Varga
- Adam Kovacs

Reviewed-on: https://gerrit.libreoffice.org/64146
Tested-by: Jenkins
Reviewed-by: László Németh 
Reviewed-on: https://gerrit.libreoffice.org/65449
(cherry picked from commit d58d92d72b00f45c56a3b0fe55ca9fd837d244a9)

Change-Id: Ie763cf831c2ce63ef204d1fdcbff634e7ca8fad5

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 60166b8deb4a..d08dd31a8e19 100755
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -121,6 +121,7 @@ public:
 void testCustomDataLabelMultipleSeries();
 void testTdf119029();
 void testTdf122031();
+void testTdf121744();
 
 CPPUNIT_TEST_SUITE(Chart2ExportTest);
 CPPUNIT_TEST(testErrorBarXLSX);
@@ -204,6 +205,7 @@ public:
 CPPUNIT_TEST(testCustomDataLabelMultipleSeries);
 CPPUNIT_TEST(testTdf119029);
 CPPUNIT_TEST(testTdf122031);
+CPPUNIT_TEST(testTdf121744);
 CPPUNIT_TEST_SUITE_END();
 
 protected:
@@ -1939,6 +1941,19 @@ void Chart2ExportTest::testTdf122031()
 assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[3]/c:numFmt", 
"formatCode", "0.000%");
 }
 
+void Chart2ExportTest::testTdf121744()
+{
+load("/chart2/qa/extras/data/docx/", "tdf121744.docx");
+xmlDocPtr pXmlDoc = parseExport("word/charts/chart","Office Open XML 
Text");
+CPPUNIT_ASSERT(pXmlDoc);
+
+OUString XValueId = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:axId[1]", "val");
+OUString YValueId = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:axId[2]", "val");
+
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:axId[1]", "val", XValueId );
+assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:axId[2]", "val", YValueId );
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/docx/tdf121744.docx 
b/chart2/qa/extras/data/docx/tdf121744.docx
new file mode 100644
index ..b5ff10098c6a
Binary files /dev/null and b/chart2/qa/extras/data/docx/tdf121744.docx differ
diff --git a/include/oox/export/chartexport.hxx 
b/include/oox/export/chartexport.hxx
index 56fbcf935c74..93621f11b919 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -197,7 +197,7 @@ private:
 sal_Int32 nAxisType,
 const char* sAxisPos,
 const AxisIdPair& rAxisIdPair );
-void exportAxesId(bool bPrimaryAxes);
+void exportAxesId(bool bPrimaryAxes, bool bCheckCombinedAxes = false);
 void exportView3D();
 bool isDeep3dChart();
 
diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 37c267dcbcd3..aa7d8a543d7e 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1619,7 +1619,7 @@ void ChartExport::exportLineChart( const Reference< 
chart2::XChartType >& xChart
 FSEND );
 }
 
-exportAxesId(bPrimaryAxes);
+exportAxesId(bPrimaryAxes, true);
 
 pFS->endElement( FSNS( XML_c, nTypeId ) );
 }
@@ -,14 +,24 @@ void ChartExport::exportDataPoints(
 }
 }
 
-void ChartExport::exportAxesId(bool bPrimaryAxes)
+void ChartExport::exportAxesId(bool bPrimaryAxes, bool bCheckCombinedAxes)
 {
-sal_Int32 nAxisIdx = lcl_generateRandomValue();
-sal_Int32 nAxisIdy = lcl_generateRandomValue();
-AxesType eXAxis = bPrimaryAxes ? AXIS_PRIMARY_X : AXIS_SECONDARY_X;
-AxesType eYAxis = bPrimaryAxes ? AXIS_PRIMARY_Y : AXIS_SECONDARY_Y;
-maAxes.emplace_back( eXAxis, nAxisIdx, nAxisIdy );
-maAxes.emplace_back( eYAxis, nAxisIdy, nAxisIdx );
+sal_Int32 nAxisIdx, nAxisIdy;
+// tdf#114181 keep axes of combined charts
+if ( bCheckCombinedAxes && bPrimaryAxes && maAxes.size() == 2 )
+{
+nAxisIdx = maAxes[0].nAxisId;
+nAxisIdy = maAxes[1].nAxisId;
+}
+else
+{
+nAxisIdx = lcl_generateRandomValue();
+nAxisIdy = lcl_generateRandomValue();
+AxesType eXAxis = bPrimaryAxes ? AXIS_PRIMARY_X : AXIS_SECONDARY_X;
+AxesType eYAxis = bPrimaryAxes ? AXIS_PRIMARY_Y : AXIS_SECONDARY_

[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang

[Libreoffice Gerrit user]

 compilerplugins/clang/blockblock.cxx|4 ++--
 compilerplugins/clang/pluginhandler.cxx |5 -
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 67dd4dcbfc203d74b00f577a4e34c0a36e3cbe20
Author: Luboš Luňák 
AuthorDate: Tue Mar 5 16:07:44 2019 +0100
Commit: Noel Grandin 
CommitDate: Mon Mar 11 11:54:40 2019 +0100

blockblock clang plugin does not do rewriting

Change-Id: Iee879980d8dbaa4cdbdf8f4f5859236367f30ccb
Reviewed-on: https://gerrit.libreoffice.org/68871
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/blockblock.cxx 
b/compilerplugins/clang/blockblock.cxx
index 6c9ef887cf10..9358845abc47 100644
--- a/compilerplugins/clang/blockblock.cxx
+++ b/compilerplugins/clang/blockblock.cxx
@@ -20,11 +20,11 @@
 namespace {
 
 class BlockBlock:
-public loplugin::FilteringRewritePlugin
+public loplugin::FilteringPlugin
 {
 public:
 explicit BlockBlock(loplugin::InstantiationData const & data):
-FilteringRewritePlugin(data) {}
+FilteringPlugin(data) {}
 
 virtual void run() override
 {
commit 571a63d5591aa6a9bbf7cdc1fc7c8d2824411d2d
Author: Luboš Luňák 
AuthorDate: Sun Feb 24 17:46:22 2019 +0100
Commit: Noel Grandin 
CommitDate: Mon Mar 11 11:54:25 2019 +0100

avoid a possible crash in loplugin's ignoreLocation()

For the built-in(?) __int128_t there's apparently no valid presumed 
location.

Change-Id: I1b2f1a827bc914d2f288dd1e02718bf45a50dd1e
Reviewed-on: https://gerrit.libreoffice.org/68870
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/pluginhandler.cxx 
b/compilerplugins/clang/pluginhandler.cxx
index 5a31368bdee0..540e58dcd222 100644
--- a/compilerplugins/clang/pluginhandler.cxx
+++ b/compilerplugins/clang/pluginhandler.cxx
@@ -204,7 +204,10 @@ bool PluginHandler::checkIgnoreLocation(SourceLocation loc)
 SourceLocation expansionLoc = compiler.getSourceManager().getExpansionLoc( 
loc );
 if( compiler.getSourceManager().isInSystemHeader( expansionLoc ))
 return true;
-const char* bufferName = compiler.getSourceManager().getPresumedLoc( 
expansionLoc ).getFilename();
+PresumedLoc presumedLoc = compiler.getSourceManager().getPresumedLoc( 
expansionLoc );
+if( presumedLoc.isInvalid())
+return true;
+const char* bufferName = presumedLoc.getFilename();
 if (bufferName == NULL
 || hasPathnamePrefix(bufferName, SRCDIR "/external/")
 || isSamePathname(bufferName, SRCDIR 
"/sdext/source/pdfimport/wrapper/keyword_list") )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang

[Libreoffice Gerrit user]

 compilerplugins/clang/check.cxx   |   29 +
 compilerplugins/clang/check.hxx   |6 ++
 compilerplugins/clang/refcounting.cxx |   33 +
 3 files changed, 36 insertions(+), 32 deletions(-)

New commits:
commit 990163534cb5bc63ac500d5204f4caeab056bdf3
Author: Luboš Luňák 
AuthorDate: Wed Mar 6 14:39:13 2019 +0100
Commit: Noel Grandin 
CommitDate: Mon Mar 11 11:53:50 2019 +0100

move isDerivedFrom() from a clang plugin to shared code, for reuse

Change-Id: I7b9b41a7081281214a387cdf02080866e9b9dfe7
Reviewed-on: https://gerrit.libreoffice.org/68873
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/check.cxx b/compilerplugins/clang/check.cxx
index acda74adacd6..f2443e44a1f2 100644
--- a/compilerplugins/clang/check.cxx
+++ b/compilerplugins/clang/check.cxx
@@ -280,6 +280,35 @@ bool isOkToRemoveArithmeticCast(
 return true;
 }
 
+
+static bool BaseCheckNotSubclass(const clang::CXXRecordDecl *BaseDefinition, 
void *p) {
+if (!BaseDefinition)
+return true;
+auto const & base = *static_cast(p);
+if (base(BaseDefinition)) {
+return false;
+}
+return true;
+}
+
+bool isDerivedFrom(const clang::CXXRecordDecl *decl, DeclChecker base) {
+if (!decl)
+return false;
+if (base(decl))
+return true;
+if (!decl->hasDefinition()) {
+return false;
+}
+if (!decl->forallBases(
+[&base](const clang::CXXRecordDecl *BaseDefinition) -> bool
+{ return BaseCheckNotSubclass(BaseDefinition, &base); },
+true))
+{
+return true;
+}
+return false;
+}
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/check.hxx b/compilerplugins/clang/check.hxx
index 4ae65f139955..0d636636a81a 100644
--- a/compilerplugins/clang/check.hxx
+++ b/compilerplugins/clang/check.hxx
@@ -140,6 +140,12 @@ private:
 bool const satisfied_;
 };
 
+
+typedef std::function DeclChecker;
+// Returns true if the class has a base matching the checker, or if the class 
itself matches.
+bool isDerivedFrom(const clang::CXXRecordDecl *decl, DeclChecker base);
+
+
 namespace detail {
 
 ContextCheck checkRecordDecl(
diff --git a/compilerplugins/clang/refcounting.cxx 
b/compilerplugins/clang/refcounting.cxx
index 6ae861cfcad9..535808a3a0ca 100644
--- a/compilerplugins/clang/refcounting.cxx
+++ b/compilerplugins/clang/refcounting.cxx
@@ -35,7 +35,7 @@ not delete on last 'release'.
 
 */
 
-namespace {
+namespace loplugin {
 
 class RefCounting:
 public loplugin::FilteringPlugin
@@ -72,37 +72,6 @@ private:
 bool visitTemporaryObjectExpr(Expr const * expr);
 };
 
-typedef std::function DeclChecker;
-
-bool BaseCheckNotSubclass(const CXXRecordDecl *BaseDefinition, void *p) {
-if (!BaseDefinition)
-return true;
-auto const & base = *static_cast(p);
-if (base(BaseDefinition)) {
-return false;
-}
-return true;
-}
-
-bool isDerivedFrom(const CXXRecordDecl *decl, DeclChecker base) {
-if (!decl)
-return false;
-if (base(decl))
-return true;
-if (!decl->hasDefinition()) {
-return false;
-}
-if (!decl->forallBases(
-[&base](const CXXRecordDecl *BaseDefinition) -> bool
-{ return BaseCheckNotSubclass(BaseDefinition, &base); },
-true))
-{
-return true;
-}
-return false;
-}
-
-
 bool containsXInterfaceSubclass(const clang::Type* pType0);
 
 bool containsXInterfaceSubclass(const QualType& qType) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/inc sw/source

[Libreoffice Gerrit user]

 sw/inc/doc.hxx  |4 ++--
 sw/inc/swcalwrp.hxx |4 ++--
 sw/source/core/bastyp/init.cxx  |   14 +++---
 sw/source/core/inc/fntcache.hxx |2 +-
 sw/source/core/txtnode/fntcache.cxx |4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 803b43efe86b51366a516648015efd3b39255f75
Author: Miklos Vajna 
AuthorDate: Mon Mar 11 09:46:35 2019 +0100
Commit: Miklos Vajna 
CommitDate: Mon Mar 11 10:44:36 2019 +0100

sw: prefix members of SwCalendarWrapper, SwDoc and SwFntAccess

Change-Id: Ia233670c8cc01442aa91588fd7aa5d65443af077
Reviewed-on: https://gerrit.libreoffice.org/69033
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index e0b38cbf51f8..3ebbec5e1cc2 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -320,7 +320,7 @@ private:
 //   Thus, certain adjustment needed during formatting for these kind 
of anchored objects.
 bool mbContainsAtPageObjWithContentAnchor : 1;
 
-static SwAutoCompleteWord *mpACmpltWords;  //< List of all words for 
AutoComplete
+static SwAutoCompleteWord *s_pAutoCompleteWords;  //< List of all words 
for AutoComplete
 
 // private methods
 SwFlyFrameFormat* MakeFlySection_( const SwPosition& rAnchPos,
@@ -1516,7 +1516,7 @@ public:
 SwExtTextInput* GetExtTextInput() const;
 
 // Interface for access to AutoComplete-List.
-static SwAutoCompleteWord& GetAutoCompleteWords() { return *mpACmpltWords; 
}
+static SwAutoCompleteWord& GetAutoCompleteWords() { return 
*s_pAutoCompleteWords; }
 
 bool ContainsMSVBasic() const  { return mbContains_MSVBasic; }
 void SetContainsMSVBasic( bool bFlag )  { mbContains_MSVBasic = bFlag; }
diff --git a/sw/inc/swcalwrp.hxx b/sw/inc/swcalwrp.hxx
index 00711143736d..c4e6b0d634ab 100644
--- a/sw/inc/swcalwrp.hxx
+++ b/sw/inc/swcalwrp.hxx
@@ -31,11 +31,11 @@ template  class SingletonRef;
 
 class SwCalendarWrapper : public CalendarWrapper
 {
-LanguageType nLang;
+LanguageType m_nLang;
 
 public:
 SwCalendarWrapper( const css::uno::Reference< css::uno::XComponentContext 
> & rxContext = ::comphelper::getProcessComponentContext() )
-: CalendarWrapper( rxContext ), nLang( LANGUAGE_SYSTEM )
+: CalendarWrapper( rxContext ), m_nLang( LANGUAGE_SYSTEM )
 {}
 
 void LoadDefaultCalendar( LanguageType nLang );
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index c918d7919e53..3986bab90e51 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -432,7 +432,7 @@ SfxItemInfo aSlotTab[] =
 
 std::vector *pGlobalOLEExcludeList = nullptr;
 
-SwAutoCompleteWord* SwDoc::mpACmpltWords = nullptr;
+SwAutoCompleteWord* SwDoc::s_pAutoCompleteWords = nullptr;
 
 SwCheckIt* pCheckIt = nullptr;
 static CharClass* pAppCharClass = nullptr;
@@ -653,12 +653,12 @@ void InitCore()
 if (!utl::ConfigManager::IsFuzzing())
 {
 const SvxSwAutoFormatFlags& rAFlags = 
SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags();
-SwDoc::mpACmpltWords = new SwAutoCompleteWord( 
rAFlags.nAutoCmpltListLen,
+SwDoc::s_pAutoCompleteWords = new SwAutoCompleteWord( 
rAFlags.nAutoCmpltListLen,
 rAFlags.nAutoCmpltWordLen );
 }
 else
 {
-SwDoc::mpACmpltWords = new SwAutoCompleteWord( 0, 0 );
+SwDoc::s_pAutoCompleteWords = new SwAutoCompleteWord( 0, 0 );
 }
 }
 
@@ -687,7 +687,7 @@ void FinitCore()
 if ( aAttrTab[0]->GetRefCount() )
 SfxItemPool::ReleaseDefaults( &aAttrTab );
 #endif
-delete SwDoc::mpACmpltWords;
+delete SwDoc::s_pAutoCompleteWords;
 
 delete SwStyleNameMapper::s_pTextUINameArray;
 delete SwStyleNameMapper::s_pListsUINameArray;
@@ -750,10 +750,10 @@ CharClass& GetAppCharClass()
 
 void SwCalendarWrapper::LoadDefaultCalendar( LanguageType eLang )
 {
-if( eLang != nLang )
+if( eLang != m_nLang )
 {
-nLang = eLang;
-loadDefaultCalendar( LanguageTag::convertToLocale( nLang ));
+m_nLang = eLang;
+loadDefaultCalendar( LanguageTag::convertToLocale( m_nLang ));
 }
 }
 
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index 04cfc4abc219..c025c6c283ac 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -148,7 +148,7 @@ SwFntObj *SwFntCache::Next( SwFntObj *pFntObj)
 
 class SwFntAccess : public SwCacheAccess
 {
-SwViewShell const *pShell;
+SwViewShell const *m_pShell;
 protected:
 virtual SwCacheObj *NewObj( ) override;
 
diff --git a/sw/source/core/txtnode/fntcache.cxx 
b/sw/source/core/txtnode/fntcache.cxx
index 1a9ad25b933c..f9352dcc5936 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -2263,7 +2263,7 @@ SwFntAccess::SwFntAccess( const void* & rnFontCacheId,
 sal_uInt16 &rIndex, cons

[Libreoffice-commits] core.git: sw/qa

[Libreoffice Gerrit user]

 sw/qa/extras/uiwriter/uiwriter2.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 768fe3967da6a8e51a4040f1cfb6cb6055d6010f
Author: Andrea Gelmini 
AuthorDate: Sun Mar 10 12:36:13 2019 +
Commit: Julien Nabet 
CommitDate: Mon Mar 11 10:22:12 2019 +0100

Fix typo

Change-Id: Ifcd15fe961f9e797b22845fcebdffe6b3684888e
Reviewed-on: https://gerrit.libreoffice.org/69027
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index b47676d17fbf..70d002897c9b 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -853,7 +853,7 @@ void SwUiWriterTest2::testTdf122942()
 CPPUNIT_ASSERT_EQUAL(static_cast(2), rFormats.size());
 
 // Without the accompanying fix in place, this test would have failed with
-// 'Expected less than: 0; Actual  : 1030', i.e. the shape was below the
+// 'Expected less than: 0; Actual: 1030', i.e. the shape was below the
 // paragraph mark, not above it.
 const SwFormatVertOrient& rVert = rFormats[1]->GetVertOrient();
 CPPUNIT_ASSERT_LESS(static_cast(0), rVert.GetPos());
@@ -870,7 +870,7 @@ void SwUiWriterTest2::testTdf122942()
 
 const tools::Rectangle& rOutRect = pObject->GetLastBoundRect();
 // Without the accompanying fix in place, this test would have failed with
-// 'Expected greater than: 5000; Actual  : 2817', i.e. the shape moved up
+// 'Expected greater than: 5000; Actual: 2817', i.e. the shape moved up
 // after a reload(), while it's expected to not change its position (5773).
 CPPUNIT_ASSERT_GREATER(static_cast(5000), rOutRect.Top());
 }
@@ -962,7 +962,7 @@ void SwUiWriterTest2::testTextFormFieldInsertion()
 CPPUNIT_ASSERT(pFieldmark);
 CPPUNIT_ASSERT_EQUAL(OUString(ODF_FORMTEXT), pFieldmark->GetFieldname());
 
-// The text form field has the placholder text in it
+// The text form field has the placeholder text in it
 uno::Reference xPara = getParagraph(1);
 sal_Unicode vEnSpaces[5] = { 8194, 8194, 8194, 8194, 8194 };
 CPPUNIT_ASSERT_EQUAL(OUString(vEnSpaces, 5), xPara->getString());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: uno commands icons

[Miklos Vajna]

Hi Andreas,

On Mon, Mar 11, 2019 at 12:29:04AM +0100, "kainz.a"  wrote:
> how can I add icons for the command
> - .uno:adddirect
> - .uno:recentfilelist

Does icon-themes/README:56 not work out of the box for these cases? I
would expect it just does. If not, then probably it is worth fixing the
root cause there, so icons for these commands are also picked up
automatically.

Regards,

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/qa writerfilter/source

[Libreoffice Gerrit user]

 sw/qa/extras/ooxmlexport/data/tdf115719.docx  |binary
 sw/qa/extras/ooxmlexport/data/tdf123243.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|7 +++
 sw/qa/extras/ooxmlimport/data/tdf115719b.docx |binary
 writerfilter/source/dmapper/PropertyMap.cxx   |5 +++--
 5 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit f12f26e798b4251a0acc6af21a49150f7a13ad86
Author: Miklos Vajna 
AuthorDate: Mon Mar 4 21:24:58 2019 +0100
Commit: Mike Kaganski 
CommitDate: Mon Mar 11 10:18:41 2019 +0100

tdf#123243 DOCX import: make increased anchored obj spacing cond more strict

Regression from commit 8b73bafbc18acb4dd8911d2f2de8158d98eb6144
(tdf#115719 DOCX import: increase paragraph spacing for anchored
objects, 2018-02-14), which is an import-time workaround for a Word
layout bug.

Re-checking the original document from that bug, this only happens with
more anchored shapes (to the same paragraph), so make the workaround
condition more strict, fixing the layout of this bugdoc.

(Which means tdf115719.docx and tdf115719b.docx are modified to be more
close to the original bugdoc.)

Just checked, sadly Word's layout bug is still there in MSO 2019, so
can't revert our emulation of it (not yet).

(cherry picked from commit fa10258d723a0c50941166ba13274308fb0cfcbe)

Change-Id: I26f74a497b7718f8f3a2eadac481c8722e85e680
Reviewed-on: https://gerrit.libreoffice.org/68884
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf115719.docx 
b/sw/qa/extras/ooxmlexport/data/tdf115719.docx
index 9519a2a14524..f98f8b4a05dc 100644
Binary files a/sw/qa/extras/ooxmlexport/data/tdf115719.docx and 
b/sw/qa/extras/ooxmlexport/data/tdf115719.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/tdf123243.docx 
b/sw/qa/extras/ooxmlexport/data/tdf123243.docx
new file mode 100644
index ..9519a2a14524
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf123243.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 7874762db678..51d847229698 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -292,6 +292,13 @@ DECLARE_OOXMLEXPORT_TEST(testTdf115719, "tdf115719.docx")
 CPPUNIT_ASSERT_EQUAL(2, getPages());
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf123243, "tdf123243.docx")
+{
+// Without the accompanying fix in place, this test would have failed with 
'Expected: 1; Actual:
+// 2'; i.e. unexpected paragraph margin created 2 pages.
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf116410, "tdf116410.docx")
 {
 // Opposite of the above, was 2 pages, should be 1 page.
diff --git a/sw/qa/extras/ooxmlimport/data/tdf115719b.docx 
b/sw/qa/extras/ooxmlimport/data/tdf115719b.docx
index 551b9871fe60..8c552baf76c1 100644
Binary files a/sw/qa/extras/ooxmlimport/data/tdf115719b.docx and 
b/sw/qa/extras/ooxmlimport/data/tdf115719b.docx differ
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index b52d1da6c253..e965db4f919b 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1242,8 +1242,9 @@ void 
SectionPropertyMap::HandleIncreasedAnchoredObjectSpacing(DomainMapper_Impl&
 std::vector& rAnchoredObjectAnchors = 
rDM_Impl.m_aAnchoredObjectAnchors;
 for (auto& rAnchor : rAnchoredObjectAnchors)
 {
-// Ignore this paragraph when there is a single shape only.
-if (rAnchor.m_aAnchoredObjects.size() < 2)
+// Ignore this paragraph when there are not enough shapes to trigger 
the Word bug we
+// emulate.
+if (rAnchor.m_aAnchoredObjects.size() < 4)
 continue;
 
 // Analyze the anchored objects of this paragraph, now that we know the
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 54/e5bbd24348f97f876f57e9a9d442b7e4d6964c

[Libreoffice Gerrit user]

 54/e5bbd24348f97f876f57e9a9d442b7e4d6964c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 87c250298c1c34175371d671b95137c4c22944b4
Author: Caolán McNamara 
AuthorDate: Mon Mar 11 09:05:11 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 09:05:11 2019 +

Notes added by 'git notes add'

diff --git a/54/e5bbd24348f97f876f57e9a9d442b7e4d6964c 
b/54/e5bbd24348f97f876f57e9a9d442b7e4d6964c
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/54/e5bbd24348f97f876f57e9a9d442b7e4d6964c
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 4d/4cce1760759d6b83f87bb8a7cb93218b2f3265 aa/91b06c25d9a26f48942ca55f374a4178913adc

[Libreoffice Gerrit user]

 4d/4cce1760759d6b83f87bb8a7cb93218b2f3265 |1 +
 aa/91b06c25d9a26f48942ca55f374a4178913adc |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 16b8890b32e0c986743606df6b620611bbb746e0
Author: Caolán McNamara 
AuthorDate: Mon Mar 11 09:04:53 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 09:04:53 2019 +

Notes added by 'git notes add'

diff --git a/aa/91b06c25d9a26f48942ca55f374a4178913adc 
b/aa/91b06c25d9a26f48942ca55f374a4178913adc
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/aa/91b06c25d9a26f48942ca55f374a4178913adc
@@ -0,0 +1 @@
+ignore: aoo
commit 59d02b6d6c887c49804afeb918e922eb5c8de403
Author: Caolán McNamara 
AuthorDate: Mon Mar 11 09:04:41 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 09:04:41 2019 +

Notes added by 'git notes add'

diff --git a/4d/4cce1760759d6b83f87bb8a7cb93218b2f3265 
b/4d/4cce1760759d6b83f87bb8a7cb93218b2f3265
new file mode 100644
index ..de6c5fe0075b
--- /dev/null
+++ b/4d/4cce1760759d6b83f87bb8a7cb93218b2f3265
@@ -0,0 +1 @@
+prefer: 00657aef09d854c74fb426a935a3e8b1fc390bb0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 35/87ff8a29468b01e901468d6e33cf371e333bc8 37/0d5ba301cb2164957450346208dec30ad07349

[Libreoffice Gerrit user]

 35/87ff8a29468b01e901468d6e33cf371e333bc8 |1 +
 37/0d5ba301cb2164957450346208dec30ad07349 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit e102cc21259d504332d082fff54016157509a98e
Author: Caolán McNamara 
AuthorDate: Mon Mar 11 09:03:50 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 09:03:50 2019 +

Notes added by 'git notes add'

diff --git a/35/87ff8a29468b01e901468d6e33cf371e333bc8 
b/35/87ff8a29468b01e901468d6e33cf371e333bc8
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/35/87ff8a29468b01e901468d6e33cf371e333bc8
@@ -0,0 +1 @@
+ignore: aoo
commit ec98c1ef5f3c8a5bf3ddbce3baefc08589b9a571
Author: Caolán McNamara 
AuthorDate: Mon Mar 11 09:03:38 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 09:03:38 2019 +

Notes added by 'git notes add'

diff --git a/37/0d5ba301cb2164957450346208dec30ad07349 
b/37/0d5ba301cb2164957450346208dec30ad07349
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/37/0d5ba301cb2164957450346208dec30ad07349
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 39/4056f42370747214d8dfb9773c205593f5f003 b5/2ecd430d34311b384fe9a27e62027ff9c45bcd

[Libreoffice Gerrit user]

 39/4056f42370747214d8dfb9773c205593f5f003 |1 +
 b5/2ecd430d34311b384fe9a27e62027ff9c45bcd |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 98129cb2077693b07d5c3398d108864f791cf89b
Author: Caolán McNamara 
AuthorDate: Mon Mar 11 09:04:08 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 09:04:08 2019 +

Notes added by 'git notes add'

diff --git a/39/4056f42370747214d8dfb9773c205593f5f003 
b/39/4056f42370747214d8dfb9773c205593f5f003
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/39/4056f42370747214d8dfb9773c205593f5f003
@@ -0,0 +1 @@
+ignore: aoo
commit a732c949d26d9a0a01ec0a0848b83a8128e0d97e
Author: Caolán McNamara 
AuthorDate: Mon Mar 11 09:03:56 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 09:03:56 2019 +

Notes added by 'git notes add'

diff --git a/b5/2ecd430d34311b384fe9a27e62027ff9c45bcd 
b/b5/2ecd430d34311b384fe9a27e62027ff9c45bcd
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/b5/2ecd430d34311b384fe9a27e62027ff9c45bcd
@@ -0,0 +1 @@
+ignore: aoo
___
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

[Libreoffice Gerrit user]

 sw/qa/extras/ooxmlexport/data/tdf123054.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|6 ++
 sw/source/core/doc/DocumentRedlineManager.cxx |   61 +-
 3 files changed, 38 insertions(+), 29 deletions(-)

New commits:
commit b3265d6e11200a55a068902e2d78c2de374e973b
Author: László Németh 
AuthorDate: Fri Mar 8 22:35:46 2019 +0100
Commit: László Németh 
CommitDate: Mon Mar 11 10:01:52 2019 +0100

tdf#123054 track changes: fix paragraph style regression

caused by the commit 173069a1f6ac060a06f04908a94a1a8420461795
"fix paragraph join with change tracking" and commit
1bbbe57dfc0b43d6b5444798d77dcdf5e4e76e49 "change tracking:
show layout changes at paragraph join".

Change-Id: I05203255b04094ae118fd4967398045d6e0ad9fa
Reviewed-on: https://gerrit.libreoffice.org/68947
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf123054.docx 
b/sw/qa/extras/ooxmlexport/data/tdf123054.docx
new file mode 100644
index ..d857479d5add
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf123054.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index a8306385e12c..08e0480e1322 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -967,6 +967,12 @@ DECLARE_OOXMLIMPORT_TEST(testTdf121176, "tdf121176.docx")
 CPPUNIT_ASSERT_EQUAL( OUString( "must" ), getRun( getParagraph( 1 ), 2 
)->getString());
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf123054, "tdf123054.docx")
+{
+CPPUNIT_ASSERT_EQUAL(OUString("No Spacing"),
+ getProperty(getParagraph(20), 
"ParaStyleName"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index e55b04bd5279..de113562139a 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -1916,37 +1916,40 @@ DocumentRedlineManager::AppendRedline(SwRangeRedline* 
pNewRedl, bool const bCall
 }
 else
 {
-if (pStt->nContent == 0)
+if ( bCallDelete && nsRedlineType_t::REDLINE_DELETE == 
pNewRedl->GetType() )
 {
-// tdf#54819 to keep the style of the paragraph
-// after the fully deleted paragraphs (normal behaviour
-// of editing without change tracking), we copy its style
-// to the first removed paragraph.
-SwTextNode* pDelNode = pStt->nNode.GetNode().GetTextNode();
-SwTextNode* pTextNode = 
pEnd->nNode.GetNode().GetTextNode();
-if (pDelNode != nullptr && pTextNode != nullptr && 
pDelNode != pTextNode)
-pTextNode->CopyCollFormat( *pDelNode );
-}
-else if ( bCallDelete && nsRedlineType_t::REDLINE_DELETE == 
pNewRedl->GetType() )
-{
-// tdf#119571 update the style of the joined paragraph
-// after a partially deleted paragraph to show its correct 
style
-// in "Show changes" mode, too. All removed paragraphs
-// get the style of the first (partially deleted) paragraph
-// to avoid text insertion with bad style in the deleted
-// area later.
-SwContentNode* pDelNd = 
pStt->nNode.GetNode().GetContentNode();
-SwContentNode* pTextNd = 
pEnd->nNode.GetNode().GetContentNode();
-SwTextNode* pDelNode = pStt->nNode.GetNode().GetTextNode();
-SwTextNode* pTextNode;
-SwNodeIndex aIdx( pEnd->nNode.GetNode() );
-
-while (pDelNode != nullptr && pTextNd != nullptr && 
pDelNd->GetIndex() < pTextNd->GetIndex())
+if ( pStt->nContent == 0 )
 {
-pTextNode = pTextNd->GetTextNode();
-if (pTextNode && pDelNode != pTextNode )
-pDelNode->CopyCollFormat( *pTextNode );
-pTextNd = SwNodes::GoPrevious( &aIdx );
+// tdf#54819 to keep the style of the paragraph
+// after the fully deleted paragraphs (normal behaviour
+// of editing without change tracking), we copy its 
style
+// to the first removed paragraph.
+SwTextNode* pDelNode = 
pStt->nNode.GetNode().GetTextNode();
+SwTextNode* pTextNode = 
pEnd->nNode.GetNode().GetTextNode();
+if (pDelNode != nullptr && pTextNode != nullptr && 
pDelNode != pTextNode)
+

[Libreoffice-commits] core.git: sc/inc sc/source sc/uiconfig

[Libreoffice Gerrit user]

 sc/inc/scabstdlg.hxx|4 
 sc/source/ui/attrdlg/scdlgfact.cxx  |5 -
 sc/source/ui/attrdlg/scdlgfact.hxx  |4 
 sc/source/ui/dbgui/subtdlg.cxx  |   31 ++-
 sc/source/ui/inc/subtdlg.hxx|9 --
 sc/source/ui/view/cellsh1.cxx   |2 
 sc/uiconfig/scalc/ui/subtotaldialog.ui  |  136 +++-
 sc/uiconfig/scalc/ui/subtotalgrppage.ui |   28 ++
 8 files changed, 150 insertions(+), 69 deletions(-)

New commits:
commit c31e7723915a20e45698d8288816288ce9104af8
Author: Caolán McNamara 
AuthorDate: Sat Mar 9 20:20:34 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 10:01:02 2019 +0100

weld ScSubTotalDlg

Change-Id: I34db4ff89aa8e91d882bcde94e9ecfb88f25d9a6
Reviewed-on: https://gerrit.libreoffice.org/68984
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 9fc0bdbf32a7..3c6812562c48 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -528,8 +528,8 @@ public:
   SfxStyleSheetBase&  
rStyleBase,
   bool bPage /*true : 
page, false: para*/) = 0;
 
-virtual VclPtr CreateScSubTotalDlg( vcl::Window* 
pParent,
-const SfxItemSet*   
pArgSet ) = 0;
+virtual VclPtr CreateScSubTotalDlg(weld::Window* 
pParent,
+ const SfxItemSet* 
pArgSet) = 0;
 
 virtual VclPtr CreateScCharDlg(weld::Window* pParent,
 const SfxItemSet* pAttr, const SfxObjectShell* pDocShell) = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index dcf8de1a42f2..86d8966b0409 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -1038,10 +1038,9 @@ VclPtr 
ScAbstractDialogFactory_Impl::CreateScStyleDlg(weld
 return 
VclPtr::Create(std::make_unique(pParent,
 rStyleBase, bPage));
 }
 
-VclPtr 
ScAbstractDialogFactory_Impl::CreateScSubTotalDlg(vcl::Window* pParent, const 
SfxItemSet* pArgSet)
+VclPtr 
ScAbstractDialogFactory_Impl::CreateScSubTotalDlg(weld::Window* pParent, const 
SfxItemSet* pArgSet)
 {
-VclPtr pDlg = VclPtr::Create( pParent, 
pArgSet );
-return VclPtr::Create( pDlg );
+return 
VclPtr::Create(std::make_unique(pParent,
 pArgSet));
 }
 
 VclPtr ScAbstractDialogFactory_Impl::CreateScCharDlg(
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 6577714f44a4..471d22a9e8cb 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -714,8 +714,8 @@ public:
   SfxStyleSheetBase& 
rStyleBase,
   bool bPage) override;
 
-virtual VclPtr CreateScSubTotalDlg( vcl::Window* 
pParent,
-const SfxItemSet*   
pArgSet ) override;
+virtual VclPtr CreateScSubTotalDlg(weld::Window* 
pParent,
+ const SfxItemSet* 
pArgSet) override;
 virtual VclPtr CreateScCharDlg(weld::Window* pParent,
 const SfxItemSet* pAttr, const SfxObjectShell* pDocShell) override;
 
diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx
index 1c931ec082e6..36c692b2f37f 100644
--- a/sc/source/ui/dbgui/subtdlg.cxx
+++ b/sc/source/ui/dbgui/subtdlg.cxx
@@ -23,36 +23,25 @@
 #include 
 #include 
 
-ScSubTotalDlg::ScSubTotalDlg(vcl::Window* pParent, const SfxItemSet* pArgSet)
-: SfxTabDialog(pParent, "SubTotalDialog",
-"modules/scalc/ui/subtotaldialog.ui", pArgSet)
+ScSubTotalDlg::ScSubTotalDlg(weld::Window* pParent, const SfxItemSet* pArgSet)
+: SfxTabDialogController(pParent, "modules/scalc/ui/subtotaldialog.ui", 
"SubTotalDialog", pArgSet)
+, m_xBtnRemove(m_xBuilder->weld_button("remove"))
 {
-get(m_pBtnRemove, "remove");
 
-AddTabPage("1stgroup",  ScTpSubTotalGroup1::Create);
-AddTabPage("2ndgroup",  ScTpSubTotalGroup2::Create);
-AddTabPage("3rdgroup",  ScTpSubTotalGroup3::Create);
-AddTabPage("options", ScTpSubTotalOptions::Create);
-m_pBtnRemove->SetClickHdl( LINK( this, ScSubTotalDlg, RemoveHdl ) );
+AddTabPage("1stgroup",  ScTpSubTotalGroup1::Create, nullptr);
+AddTabPage("2ndgroup",  ScTpSubTotalGroup2::Create, nullptr);
+AddTabPage("3rdgroup",  ScTpSubTotalGroup3::Create, nullptr);
+AddTabPage("options", ScTpSubTotalOptions::Create, nullptr);
+m_xBtnRemove->connect_clicked( LINK( this, ScSubTotalDlg, RemoveHdl ) );
 }
 
 ScSubTotalDlg::~ScSubTotalDlg()
 {
-disposeOnce();
 }
 
-void ScSubTotalDlg::dispose()
+IMPL_LINK_NOARG(ScSubTotalDlg, RemoveHdl, weld::Button&, void)
 {
-m_pBtnRemove.clear

[Libreoffice-commits] core.git: basctl/source cui/source cui/uiconfig extras/source include/vcl sd/source solenv/bin solenv/sanitizers sw/source uitest/writer_tests vcl/inc vcl/source vcl/unx vcl/win

[Libreoffice Gerrit user]

 basctl/source/basicide/bastype2.cxx |   12 
 basctl/source/basicide/bastype3.cxx |2 
 basctl/source/inc/bastype2.hxx  |   12 
 cui/source/customize/CommandCategoryListBox.cxx |  159 ++
 cui/source/customize/SvxMenuConfigPage.cxx  |  260 +
 cui/source/customize/SvxToolbarConfigPage.cxx   |  635 +---
 cui/source/customize/acccfg.cxx |   10 
 cui/source/customize/cfg.cxx|  567 +++--
 cui/source/customize/cfgutil.cxx|   85 ---
 cui/source/dialogs/scriptdlg.cxx|   10 
 cui/source/inc/CommandCategoryListBox.hxx   |   21 
 cui/source/inc/SvxMenuConfigPage.hxx|   27 -
 cui/source/inc/SvxToolbarConfigPage.hxx |   52 -
 cui/source/inc/acccfg.hxx   |3 
 cui/source/inc/cfg.hxx  |  141 ++---
 cui/source/inc/cfgutil.hxx  |   48 +
 cui/source/inc/scriptdlg.hxx|8 
 cui/uiconfig/ui/menuassignpage.ui   |  316 ---
 extras/source/glade/libreoffice-catalog.xml.in  |6 
 include/vcl/weld.hxx|   59 +-
 sd/source/ui/dlg/sdtreelb.cxx   |4 
 sd/source/ui/inc/sdtreelb.hxx   |2 
 solenv/bin/native-code.py   |2 
 solenv/sanitizers/ui/cui.suppr  |4 
 sw/source/uibase/dbui/dbtree.cxx|2 
 sw/source/uibase/inc/dbtree.hxx |2 
 uitest/writer_tests/customizeDialog.py  |3 
 vcl/inc/salframe.hxx|   11 
 vcl/inc/treeglue.hxx|   79 ++
 vcl/source/app/salvtables.cxx   |  154 -
 vcl/source/treelist/treelistbox.cxx |2 
 vcl/source/uitest/uiobject.cxx  |2 
 vcl/source/window/builder.cxx   |   52 -
 vcl/unx/gtk3/gtk3gtkinst.cxx|  205 +--
 vcl/win/gdi/salprn.cxx  |2 
 35 files changed, 1487 insertions(+), 1472 deletions(-)

New commits:
commit ccb2b0078f07194befa61f1e3fd88e53ff236871
Author: Caolán McNamara 
AuthorDate: Mon Mar 4 17:31:24 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 10:00:31 2019 +0100

weld SvxMenuConfigPage/SvxToolbarConfigPage

Change-Id: I166ac6c0be8461ea38db711796d1e14fc5b78998
Reviewed-on: https://gerrit.libreoffice.org/68889
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/basctl/source/basicide/bastype2.cxx 
b/basctl/source/basicide/bastype2.cxx
index a5b0057803ed..129865c4087c 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -917,7 +917,7 @@ void SbTreeListBox::ScanEntry( const ScriptDocument& 
rDocument, LibraryLocation
 m_xControl->thaw();
 }
 
-void SbTreeListBox::ImpCreateLibEntries(weld::TreeIter& rIter, const 
ScriptDocument& rDocument, LibraryLocation eLocation)
+void SbTreeListBox::ImpCreateLibEntries(const weld::TreeIter& rIter, const 
ScriptDocument& rDocument, LibraryLocation eLocation)
 {
 // get a sorted list of library names
 Sequence< OUString > aLibNames( rDocument.getLibraryNames() );
@@ -976,7 +976,7 @@ void SbTreeListBox::ImpCreateLibEntries(weld::TreeIter& 
rIter, const ScriptDocum
 }
 }
 
-void SbTreeListBox::ImpCreateLibSubEntries(weld::TreeIter& rLibRootEntry, 
const ScriptDocument& rDocument, const OUString& rLibName)
+void SbTreeListBox::ImpCreateLibSubEntries(const weld::TreeIter& 
rLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName)
 {
 // modules
 if ( nMode & BrowseMode::Modules )
@@ -1075,7 +1075,7 @@ void 
SbTreeListBox::ImpCreateLibSubEntries(weld::TreeIter& rLibRootEntry, const
 }
 }
 
-void SbTreeListBox::ImpCreateLibSubEntriesInVBAMode(weld::TreeIter& 
rLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName )
+void SbTreeListBox::ImpCreateLibSubEntriesInVBAMode(const weld::TreeIter& 
rLibRootEntry, const ScriptDocument& rDocument, const OUString& rLibName )
 {
 auto const aEntries = {
 std::make_pair( OBJ_TYPE_DOCUMENT_OBJECTS, 
IDEResId(RID_STR_DOCUMENT_OBJECTS) ),
@@ -1102,7 +1102,7 @@ void 
SbTreeListBox::ImpCreateLibSubEntriesInVBAMode(weld::TreeIter& rLibRootEntr
 }
 }
 
-void SbTreeListBox::ImpCreateLibSubSubEntriesInVBAMode(weld::TreeIter& 
rLibSubRootEntry, const ScriptDocument& rDocument, const OUString& rLibName)
+void SbTreeListBox::ImpCreateLibSubSubEntriesInVBAMode(const weld::TreeIter& 
rLibSubRootEntry, const ScriptDocument& rDocument, const OUString& rLibName)
 {
 uno::Reference< container::XNameContainer > xLib = 
rDocument.getOrCreateLibrary( E_SCRIPTS, rLibName );
 if( !xLib.is() )
@@ -1347,7 +1347,7 @@ bool SbTreeListBox::IsEntryProtected(const 
weld::TreeIter* pEntry)
 void SbTreeListBox::AddEntry(
 const OUS

[Libreoffice-commits] core.git: include/sfx2 include/svtools sfx2/source svtools/source vcl/source vcl/unx

[Libreoffice Gerrit user]

 include/sfx2/dinfdlg.hxx |   53 +-
 include/svtools/imagemgr.hxx |2 
 sfx2/source/dialog/dinfdlg.cxx   |  196 +++
 svtools/source/misc/imagemgr.cxx |4 
 vcl/source/app/salvtables.cxx|   13 +-
 vcl/unx/gtk3/gtk3gtkinst.cxx |1 
 6 files changed, 119 insertions(+), 150 deletions(-)

New commits:
commit 96d0cf0d7bccfea0b9d867cf00a17c7a2409aa87
Author: Caolán McNamara 
AuthorDate: Sun Mar 10 14:13:07 2019 +
Commit: Caolán McNamara 
CommitDate: Mon Mar 11 09:59:53 2019 +0100

weld SfxDocumentPage

Change-Id: I99f342ad1c0620147ce23b4670323056d7ccc508
Reviewed-on: https://gerrit.libreoffice.org/69008
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 72ba726c58be..ee1d81c9c1cb 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -171,50 +171,49 @@ public:
 class SfxDocumentPage : public SfxTabPage
 {
 private:
-VclPtrm_pBmp;
-VclPtr   m_pNameED;
-VclPtrm_pChangePassBtn;
+OUStringm_aUnknownSize;
+OUStringm_aMultiSignedStr;
 
-VclPtr   m_pShowTypeFT;
-VclPtr   m_pFileValEd;
-VclPtr   m_pShowSizeFT;
+boolbEnableUseUserData  : 1,
+bHandleDelete   : 1;
 
-VclPtr   m_pCreateValFt;
-VclPtr   m_pChangeValFt;
-VclPtr   m_pSignedValFt;
-VclPtrm_pSignatureBtn;
-VclPtr   m_pPrintValFt;
-VclPtr   m_pTimeLogValFt;
-VclPtr   m_pDocNoValFt;
+std::unique_ptr m_xBmp;
+std::unique_ptr m_xNameED;
+std::unique_ptr m_xChangePassBtn;
 
-VclPtr  m_pUseUserDataCB;
-VclPtrm_pDeleteBtn;
-VclPtr  m_pUseThumbnailSaveCB;
+std::unique_ptr m_xShowTypeFT;
+std::unique_ptr m_xFileValEd;
+std::unique_ptr m_xShowSizeFT;
 
-VclPtr m_pTemplFt;
-VclPtr   m_pTemplValFt;
+std::unique_ptr m_xCreateValFt;
+std::unique_ptr m_xChangeValFt;
+std::unique_ptr m_xSignedValFt;
+std::unique_ptr m_xSignatureBtn;
+std::unique_ptr m_xPrintValFt;
+std::unique_ptr m_xTimeLogValFt;
+std::unique_ptr m_xDocNoValFt;
 
-OUStringm_aUnknownSize;
-OUStringm_aMultiSignedStr;
+std::unique_ptr m_xUseUserDataCB;
+std::unique_ptr m_xDeleteBtn;
+std::unique_ptr m_xUseThumbnailSaveCB;
 
-boolbEnableUseUserData  : 1,
-bHandleDelete   : 1;
+std::unique_ptr m_xTemplFt;
+std::unique_ptr m_xTemplValFt;
 
-DECL_LINK(DeleteHdl, Button*, void);
-DECL_LINK(SignatureHdl, Button*, void);
-DECL_LINK(ChangePassHdl, Button*, void);
+DECL_LINK(DeleteHdl, weld::Button&, void);
+DECL_LINK(SignatureHdl, weld::Button&, void);
+DECL_LINK(ChangePassHdl, weld::Button&, void);
 voidImplUpdateSignatures();
 voidImplCheckPasswordState();
 
 protected:
 virtual ~SfxDocumentPage() override;
-virtual void dispose() override;
 
 virtual boolFillItemSet( SfxItemSet* ) override;
 virtual voidReset( const SfxItemSet* ) override;
 
 public:
-SfxDocumentPage( vcl::Window* pParent, const SfxItemSet& );
+SfxDocumentPage(TabPageParent pParent, const SfxItemSet&);
 static VclPtr Create( TabPageParent pParent, const SfxItemSet* 
);
 
 voidEnableUseUserData();
diff --git a/include/svtools/imagemgr.hxx b/include/svtools/imagemgr.hxx
index a72566586eb8..45212829b5c6 100644
--- a/include/svtools/imagemgr.hxx
+++ b/include/svtools/imagemgr.hxx
@@ -118,7 +118,7 @@ private:
 static OUStringGetDescription_Impl( const INetURLObject& rObject, bool 
bDetectFolder );
 
 public:
-SVT_DLLPUBLIC static OUString GetImageId( const INetURLObject& rURL );
+SVT_DLLPUBLIC static OUString GetImageId( const INetURLObject& rURL, bool 
bBig = false );
 SVT_DLLPUBLIC static Image  GetImage( const INetURLObject& rURL, bool bBig 
= false );
 SVT_DLLPUBLIC static OUString GetFileImageId( const INetURLObject& rURL );
 SVT_DLLPUBLIC static Image  GetFileImage( const INetURLObject& rURL );
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 4c243102653d..9bd17f6309b3 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -710,49 +710,46 @@ void SfxDocumentDescPage::Reset(const SfxItemSet *rSet)
 }
 }
 
-SfxDocumentPage::SfxDocumentPage(vcl::Window* pParent, const SfxItemSet& 
rItemSet)
-: SfxTabPage(pParent, "DocumentInfoPage", "sfx/ui/documentinfopage.ui", 
&rItemSet)
+SfxDocumentPage::SfxDocumentPage(TabPageParent pParent, const SfxItemSet& 
rItemSet)
+: SfxTabPage(pParent, "sfx/ui/documentinfopage.ui", "DocumentInfoPage", 
&rItemSet)
 , bEnableUseUse

[Libreoffice-commits] core.git: vcl/inc vcl/source

[Libreoffice Gerrit user]

 vcl/inc/impglyphitem.hxx   |   28 +---
 vcl/inc/sallayout.hxx  |2 +-
 vcl/source/gdi/CommonSalLayout.cxx |2 +-
 vcl/source/gdi/impglyphitem.cxx|8 
 4 files changed, 15 insertions(+), 25 deletions(-)

New commits:
commit bea1fe240010d4870d2fd3877ee07ba31d1dcda0
Author: Noel Grandin 
AuthorDate: Mon Mar 11 08:15:13 2019 +0200
Commit: Noel Grandin 
CommitDate: Mon Mar 11 09:27:07 2019 +0100

merge SalLayoutGlyphsImpl and SalGenericLayoutGlyphsImpl

Change-Id: I5697d2b7961ce714835316879610f23aeabbd8ec
Reviewed-on: https://gerrit.libreoffice.org/69030
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/vcl/inc/impglyphitem.hxx b/vcl/inc/impglyphitem.hxx
index 009be6cc2506..24690216db63 100644
--- a/vcl/inc/impglyphitem.hxx
+++ b/vcl/inc/impglyphitem.hxx
@@ -92,33 +92,23 @@ VCL_DLLPUBLIC bool 
GlyphItem::GetGlyphOutline(basegfx::B2DPolyPolygon& rPoly) co
 
 class SalLayoutGlyphsImpl : public std::vector
 {
-protected:
-void SetPImpl(SalLayoutGlyphs* pFacade) { pFacade->m_pImpl = this; }
+friend class GenericSalLayout;
 
 public:
-virtual ~SalLayoutGlyphsImpl();
-virtual SalLayoutGlyphsImpl* clone(SalLayoutGlyphs&) const = 0;
-virtual bool IsValid() const = 0;
-virtual void Invalidate() = 0;
-};
-
-class SalGenericLayoutGlyphsImpl : public SalLayoutGlyphsImpl
-{
-friend class GenericSalLayout;
+~SalLayoutGlyphsImpl();
+SalLayoutGlyphsImpl* clone(SalLayoutGlyphs& rGlyphs) const;
+LogicalFontInstance& GetFont() const { return *m_rFontInstance; }
+bool IsValid() const;
+void Invalidate();
 
+private:
 mutable rtl::Reference m_rFontInstance;
 
-SalGenericLayoutGlyphsImpl(SalLayoutGlyphs& rGlyphs, LogicalFontInstance& 
rFontInstance)
+SalLayoutGlyphsImpl(SalLayoutGlyphs& rGlyphs, LogicalFontInstance& 
rFontInstance)
 : m_rFontInstance(&rFontInstance)
 {
-SetPImpl(&rGlyphs);
+rGlyphs.m_pImpl = this;
 }
-
-public:
-SalLayoutGlyphsImpl* clone(SalLayoutGlyphs& rGlyphs) const override;
-LogicalFontInstance& GetFont() const { return *m_rFontInstance; }
-bool IsValid() const override;
-void Invalidate() override;
 };
 
 #endif // INCLUDED_VCL_IMPGLYPHITEM_HXX
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 373b8e93695f..e71359e48165 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -182,7 +182,7 @@ public:
 
 // used by display layers
 LogicalFontInstance& GetFont() const
-{ return 
static_cast(m_GlyphItems.Impl())->GetFont(); }
+{ return m_GlyphItems.Impl()->GetFont(); }
 
 boolGetNextGlyph(const GlyphItem** pGlyph, Point& rPos, int& 
nStart,
  const PhysicalFontFace** pFallbackFont = 
nullptr,
diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index fad1000d880f..94dfa3b427a4 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -60,7 +60,7 @@ GenericSalLayout::GenericSalLayout(LogicalFontInstance &rFont)
 : mpVertGlyphs(nullptr)
 , mbFuzzing(utl::ConfigManager::IsFuzzing())
 {
-new SalGenericLayoutGlyphsImpl(m_GlyphItems, rFont);
+new SalLayoutGlyphsImpl(m_GlyphItems, rFont);
 }
 
 GenericSalLayout::~GenericSalLayout()
diff --git a/vcl/source/gdi/impglyphitem.cxx b/vcl/source/gdi/impglyphitem.cxx
index 809b70bc91bc..64096020f172 100644
--- a/vcl/source/gdi/impglyphitem.cxx
+++ b/vcl/source/gdi/impglyphitem.cxx
@@ -55,14 +55,14 @@ void SalLayoutGlyphs::Invalidate()
 
 SalLayoutGlyphsImpl::~SalLayoutGlyphsImpl() {}
 
-SalLayoutGlyphsImpl* SalGenericLayoutGlyphsImpl::clone(SalLayoutGlyphs& 
rGlyphs) const
+SalLayoutGlyphsImpl* SalLayoutGlyphsImpl::clone(SalLayoutGlyphs& rGlyphs) const
 {
-SalLayoutGlyphsImpl* pNew = new SalGenericLayoutGlyphsImpl(rGlyphs, 
*m_rFontInstance);
+SalLayoutGlyphsImpl* pNew = new SalLayoutGlyphsImpl(rGlyphs, 
*m_rFontInstance);
 *pNew = *this;
 return pNew;
 }
 
-bool SalGenericLayoutGlyphsImpl::IsValid() const
+bool SalLayoutGlyphsImpl::IsValid() const
 {
 if (!m_rFontInstance.is())
 return false;
@@ -79,7 +79,7 @@ bool SalGenericLayoutGlyphsImpl::IsValid() const
 return true;
 }
 
-void SalGenericLayoutGlyphsImpl::Invalidate()
+void SalLayoutGlyphsImpl::Invalidate()
 {
 m_rFontInstance.clear();
 clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Intrested to contribute

[Heiko Tietze]

Hi Sravan

Welcome to LibreOffice! It is nice to see you are interested in applying for a 
GSoC project. Having skill/knowledge/experience in programming, and especially 
in C++ helps a lot while working on the LibreOffice code-base.

As the student application date for GSoC is approaching, we suggest you to

* Go through the LibreOffice development getting started page [1]
* Start with solving some 'beginner' easyHacks [2] 
* Solve at least one 'interesting' easyHack
* Start discussing your ideas with possible mentors, and preparing your proposal
* Don't leave your proposal to the last day. Sooner is better.

Also checking the GSoC ideas page first, and trying to choose the easyHacks 
related to your probable idea(s) might be a good idea [3], and perhaps also the 
page for ideas without a mentor yet [4].

If you ever get stuck (after doing the usual leg-work (re(search), try, debug 
etc.) yourself), please don't hesitate to ask your questions either on the 
#libreoffice-dev IRC channel, or on this mailing list.

Best regards,
Heiko

[1] https://wiki.documentfoundation.org/Development/GetInvolved
[2] https://wiki.documentfoundation.org/Development/EasyHacks/by_Required_Skill
[3] https://wiki.documentfoundation.org/Development/GSoC/Ideas
[4] https://wiki.documentfoundation.org/Development/GSoC/Ideas_without_a_mentor

On 10.03.19 19:47, sravan jain wrote:
> Good evening sir,
> 
> My name is sravan jain from KL University ,India.I have been working on 
> opensource technologies since 2years especially on Machine Learning and I 
> have been using library office quite often for documentation.I think we 
> advance this more applying machine learning techniques to optimize it to a 
> greater extent.
> 
> So please update me soon sir with any idea or work.
> 
> Waiting for your reply.
> 
>  
> 
>  
> 
> Sent from Mail  for Windows 10
> 
>  
> 
> 
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
> 

-- 
Dr. Heiko Tietze
UX designer
Tel. +49 (0)179/1268509



signature.asc
Description: OpenPGP digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - 3 commits - wsd/ClientSession.cpp wsd/DocumentBroker.cpp wsd/DocumentBroker.hpp wsd/LOOLWSD.cpp

[Libreoffice Gerrit user]

 wsd/ClientSession.cpp  |5 -
 wsd/DocumentBroker.cpp |   23 +--
 wsd/DocumentBroker.hpp |   21 +
 wsd/LOOLWSD.cpp|   30 ++
 4 files changed, 52 insertions(+), 27 deletions(-)

New commits:
commit 0f2e3641fcd27e7f6bbbdc13eb24462568eacec6
Author: Michael Meeks 
AuthorDate: Fri Mar 1 22:25:44 2019 +0100
Commit: Andras Timar 
CommitDate: Mon Mar 11 08:58:39 2019 +0100

tdf#123482 - cleanup convert-to folder more reliably.

Change-Id: I029bb4136984e05485e462c92da80b92b00fdebc
Reviewed-on: https://gerrit.libreoffice.org/68601
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 
Reviewed-by: Andras Timar 

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 3c53fdb53..f3afc4efc 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -867,11 +867,6 @@ bool ClientSession::handleKitToClientMessage(const char* 
buffer, const int lengt
 
 // Now terminate.
 docBroker->stop("Finished saveas handler.");
-
-// Remove file and directory
-Poco::Path path = docBroker->getDocKey();
-Poco::File(path).remove();
-Poco::File(path.makeParent()).remove();
 }
 
 return true;
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index aba041044..d9b205801 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -1887,6 +1888,18 @@ void DocumentBroker::getIOStats(uint64_t &sent, uint64_t 
&recv)
 }
 }
 
+ConvertToBroker::~ConvertToBroker()
+{
+if (!_uriOrig.empty())
+{
+// Remove source file and directory
+Poco::Path path = _uriOrig;
+Poco::File(path).remove();
+Poco::File(path.makeParent()).remove();
+FileUtil::removeFile(_uriOrig);
+}
+}
+
 void DocumentBroker::dumpState(std::ostream& os)
 {
 std::unique_lock lock(_mutex);
diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp
index a27442014..6d5a3e63b 100644
--- a/wsd/DocumentBroker.hpp
+++ b/wsd/DocumentBroker.hpp
@@ -223,7 +223,7 @@ public:
const Poco::URI& uriPublic,
const std::string& docKey);
 
-~DocumentBroker();
+virtual ~DocumentBroker();
 
 /// Start processing events
 void startThread();
@@ -402,8 +402,9 @@ private:
 /// Sum the I/O stats from all connected sessions
 void getIOStats(uint64_t &sent, uint64_t &recv);
 
-private:
+protected:
 const std::string _uriOrig;
+private:
 const Poco::URI _uriPublic;
 /// URL-based key. May be repeated during the lifetime of WSD.
 const std::string _docKey;
@@ -472,6 +473,19 @@ private:
 static std::atomic DocBrokerId;
 };
 
+class ConvertToBroker : public DocumentBroker
+{
+public:
+/// Construct DocumentBroker with URI and docKey
+ConvertToBroker(const std::string& uri,
+const Poco::URI& uriPublic,
+const std::string& docKey)
+: DocumentBroker(uri, uriPublic, docKey)
+{
+}
+virtual ~ConvertToBroker();
+};
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index a0c9e31c2..9227f6f3f 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -593,6 +593,7 @@ public:
 if (!params.has("filename"))
 return;
 
+// FIXME: needs wrapping - until then - keep in sync with 
~ConvertToBroker
 Path tempPath = _convertTo? 
Path::forDirectory(Poco::TemporaryFile::tempName("/tmp/convert-to") + "/") :
 
Path::forDirectory(Poco::TemporaryFile::tempName() + "/");
 File(tempPath).createDirectories();
@@ -2369,7 +2370,7 @@ private:
 std::unique_lock 
docBrokersLock(DocBrokersMutex);
 
 LOG_DBG("New DocumentBroker for docKey [" << docKey << 
"].");
-auto docBroker = 
std::make_shared(fromPath, uriPublic, docKey);
+auto docBroker = 
std::make_shared(fromPath, uriPublic, docKey);
 
 cleanupDocBrokers();
 
commit b79002b3ce57d9016cd6704fd70d5487e51297c0
Author: Michael Meeks 
AuthorDate: Fri Mar 1 22:03:35 2019 +0100
Commit: Andras Timar 
CommitDate: Mon Mar 11 08:58:32 2019 +0100

Simpify DocumentBroker constructor.

Change-Id: I0bf29df9316b129d34862c7464bb6636d42a850d
Reviewed-on: https://gerrit.libreoffice.org/68600
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 
Reviewed-by: Andras Timar 

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index b0052142e..aba041044 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -160,13 +160,11 @@ std::atomic DocumentBroker::DocBrokerId(1);
 
 DocumentBroker::DocumentBroker(const std::string& uri,
const Poco::URI& uriPublic,
- 

[Libreoffice-commits] core.git: vcl/source vcl/uiconfig

[Libreoffice Gerrit user]

 vcl/source/gdi/FileDefinitionWidgetDraw.cxx   |3 +--
 vcl/uiconfig/theme_definitions/definition.xml |6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 2513e6864fee07da9ec8ea5489ada82de0991b15
Author: Tomaž Vajngerl 
AuthorDate: Sun Mar 10 22:27:54 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Mon Mar 11 08:12:18 2019 +0100

widget theme: slight window borders, use font 10 instead of 12

Change-Id: I6b0ba769817894b99c3f757d23948783a66fce12
Reviewed-on: https://gerrit.libreoffice.org/69023
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 

diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx 
b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 59f0947e7eea..e321734e9a6e 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -830,7 +830,6 @@ bool FileDefinitionWidgetDraw::getNativeControlRegion(
 return true;
 }
 break;
-
 default:
 break;
 }
@@ -895,7 +894,7 @@ bool FileDefinitionWidgetDraw::updateSettings(AllSettings& 
rSettings)
 aStyleSet.SetToolTextColor(pDefinitionStyle->maToolTextColor);
 aStyleSet.SetFontColor(pDefinitionStyle->maFontColor);
 
-vcl::Font aFont(FAMILY_SWISS, Size(0, 12));
+vcl::Font aFont(FAMILY_SWISS, Size(0, 10));
 aFont.SetCharSet(osl_getThreadTextEncoding());
 aFont.SetWeight(WEIGHT_NORMAL);
 aFont.SetFamilyName("Liberation Sans");
diff --git a/vcl/uiconfig/theme_definitions/definition.xml 
b/vcl/uiconfig/theme_definitions/definition.xml
index a4394de98ec5..e91953109554 100644
--- a/vcl/uiconfig/theme_definitions/definition.xml
+++ b/vcl/uiconfig/theme_definitions/definition.xml
@@ -361,7 +361,7 @@
 
 
 
-
+
 
 
 
@@ -369,12 +369,12 @@
 
 
 
-
+
 
 
 
 
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/Package_theme_definitions.mk vcl/uiconfig

[Libreoffice Gerrit user]

 vcl/Package_theme_definitions.mk|1 +
 vcl/uiconfig/theme_definitions/definition.xml   |5 -
 vcl/uiconfig/theme_definitions/pushbutton-disabled.svgx |3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 5d535ffbe34b09a75f8e41fc46be1ed0eb1fbdfa
Author: Tomaž Vajngerl 
AuthorDate: Sun Mar 10 22:26:42 2019 +0100
Commit: Tomaž Vajngerl 
CommitDate: Mon Mar 11 08:11:52 2019 +0100

widget theme: support disabled pushbutton

Change-Id: I8c6e019f5d1f12c85334f3440e09ef755ed6863d
Reviewed-on: https://gerrit.libreoffice.org/69022
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/vcl/Package_theme_definitions.mk b/vcl/Package_theme_definitions.mk
index 143152d7327a..a30ca8179850 100644
--- a/vcl/Package_theme_definitions.mk
+++ b/vcl/Package_theme_definitions.mk
@@ -35,6 +35,7 @@ $(eval $(call 
gb_Package_add_files,vcl_theme_definitions,$(LIBO_SHARE_FOLDER)/th
common-rect-disabled.svgx \
pushbutton-default.svgx \
pushbutton-rollover.svgx \
+   pushbutton-disabled.svgx \
tabitem-first.svgx \
tabitem-middle.svgx \
tabitem-last.svgx \
diff --git a/vcl/uiconfig/theme_definitions/definition.xml 
b/vcl/uiconfig/theme_definitions/definition.xml
index 4789b9a844ed..a4394de98ec5 100644
--- a/vcl/uiconfig/theme_definitions/definition.xml
+++ b/vcl/uiconfig/theme_definitions/definition.xml
@@ -67,12 +67,15 @@
 
 
 
-
+
 
 
 
 
 
+
+
+
 
 
 
diff --git a/vcl/uiconfig/theme_definitions/pushbutton-disabled.svgx 
b/vcl/uiconfig/theme_definitions/pushbutton-disabled.svgx
new file mode 100644
index ..e4c1f63599d7
--- /dev/null
+++ b/vcl/uiconfig/theme_definitions/pushbutton-disabled.svgx
@@ -0,0 +1,3 @@
+http://www.w3.org/2000/svg";>
+ 
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits