date:20201118

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

2020-11-18 Thread Noel Grandin (via logerrit)

 xmloff/source/chart/SchXMLLegendContext.cxx |   91 ++--
 xmloff/source/chart/SchXMLLegendContext.hxx |3 
 2 files changed, 24 insertions(+), 70 deletions(-)

New commits:
commit bcfd9f8f166aec58ee92642e8e70dc5a94a3119f
Author: Noel Grandin 
AuthorDate: Wed Nov 18 19:21:37 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Nov 19 08:59:11 2020 +0100

fastparser in SchXMLLegendContext

Change-Id: I9fe41436f4a5dd15867e172d4a43775ca49d29df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106070
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/xmloff/source/chart/SchXMLLegendContext.cxx 
b/xmloff/source/chart/SchXMLLegendContext.cxx
index e043edb1f65f..758863a688c6 100644
--- a/xmloff/source/chart/SchXMLLegendContext.cxx
+++ b/xmloff/source/chart/SchXMLLegendContext.cxx
@@ -34,59 +34,14 @@
 using namespace ::xmloff::token;
 using namespace com::sun::star;
 
-namespace
-{
-
-enum LegendAttributeTokens
-{
-XML_TOK_LEGEND_POSITION,
-XML_TOK_LEGEND_OVERLAY,
-XML_TOK_LEGEND_X,
-XML_TOK_LEGEND_Y,
-XML_TOK_LEGEND_STYLE_NAME,
-XML_TOK_LEGEND_EXPANSION,
-XML_TOK_LEGEND_EXPANSION_ASPECT_RATIO,
-XML_TOK_LEGEND_WIDTH,
-XML_TOK_LEGEND_WIDTH_EXT,
-XML_TOK_LEGEND_HEIGHT,
-XML_TOK_LEGEND_HEIGHT_EXT
-};
-
-const SvXMLTokenMapEntry aLegendAttributeTokenMap[] =
-{
-{ XML_NAMESPACE_CHART,  XML_LEGEND_POSITION,
XML_TOK_LEGEND_POSITION },
-{ XML_NAMESPACE_LO_EXT, XML_OVERLAY,XML_TOK_LEGEND_OVERLAY 
 },
-{ XML_NAMESPACE_SVG,XML_X,  XML_TOK_LEGEND_X   
 },
-{ XML_NAMESPACE_SVG,XML_Y,  XML_TOK_LEGEND_Y   
 },
-{ XML_NAMESPACE_CHART,  XML_STYLE_NAME, 
XML_TOK_LEGEND_STYLE_NAME   },
-{ XML_NAMESPACE_STYLE,  XML_LEGEND_EXPANSION,   
XML_TOK_LEGEND_EXPANSION},
-{ XML_NAMESPACE_STYLE,  XML_LEGEND_EXPANSION_ASPECT_RATIO,   
XML_TOK_LEGEND_EXPANSION_ASPECT_RATIO},
-{ XML_NAMESPACE_SVG,XML_WIDTH,  XML_TOK_LEGEND_WIDTH   
 },
-{ XML_NAMESPACE_CHART_EXT,  XML_WIDTH,  
XML_TOK_LEGEND_WIDTH_EXT},
-{ XML_NAMESPACE_SVG,XML_HEIGHT, XML_TOK_LEGEND_HEIGHT  
 },
-{ XML_NAMESPACE_CHART_EXT,  XML_HEIGHT, 
XML_TOK_LEGEND_HEIGHT_EXT   },
-XML_TOKEN_MAP_END
-};
-
-class LegendAttributeTokenMap : public SvXMLTokenMap
-{
-public:
-LegendAttributeTokenMap(): SvXMLTokenMap( aLegendAttributeTokenMap ) {}
-virtual ~LegendAttributeTokenMap() {}
-};
-
-//a LegendAttributeTokenMap Singleton
-struct theLegendAttributeTokenMap : public rtl::Static< 
LegendAttributeTokenMap, theLegendAttributeTokenMap > {};
-
-}//end anonymous namespace
-
 SchXMLLegendContext::SchXMLLegendContext( SchXMLImportHelper& rImpHelper, 
SvXMLImport& rImport ) :
 SvXMLImportContext( rImport ),
 mrImportHelper( rImpHelper )
 {
 }
 
-void SchXMLLegendContext::StartElement( const uno::Reference< 
xml::sax::XAttributeList >& xAttrList )
+void SchXMLLegendContext::startFastElement( sal_Int32 /*nElement*/,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList )
 {
 uno::Reference< chart::XChartDocument > xDoc = 
mrImportHelper.GetChartDocument();
 if( !xDoc.is() )
@@ -115,9 +70,6 @@ void SchXMLLegendContext::StartElement( const 
uno::Reference< xml::sax::XAttribu
 }
 
 // parse attributes
-sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
-const SvXMLTokenMap& rAttrTokenMap = theLegendAttributeTokenMap::get();
-
 awt::Point aLegendPos;
 bool bOverlay = false;
 bool bHasXPosition=false;
@@ -131,16 +83,12 @@ void SchXMLLegendContext::StartElement( const 
uno::Reference< xml::sax::XAttribu
 OUString sAutoStyleName;
 uno::Any aAny;
 
-for( sal_Int16 i = 0; i < nAttrCount; i++ )
+for( auto& aIter : sax_fastparser::castToFastAttributeList(xAttrList) )
 {
-OUString sAttrName = xAttrList->getNameByIndex( i );
-OUString aLocalName;
-OUString aValue = xAttrList->getValueByIndex( i );
-sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( 
sAttrName, &aLocalName );
-
-switch( rAttrTokenMap.Get( nPrefix, aLocalName ))
+OUString aValue = aIter.toString();
+switch(aIter.getToken())
 {
-case XML_TOK_LEGEND_POSITION:
+case XML_ELEMENT(CHART, XML_LEGEND_POSITION):
 try
 {
 if( 
SchXMLEnumConverter::getLegendPositionConverter().importXML( aValue, aAny, 
GetImport().GetMM100UnitConverter() ) )
@@ -151,10 +99,10 @@ void SchXMLLegendContext::StartElement( const 
uno::Reference< xml::sax::XAttribu
 SAL_INFO("xmloff.chart", "Property Alignment (legend) not 
found" );
 }
 break;
-case XML_TOK_LEGEND_OVERLAY:
+case  XML_ELEMENT(

[Libreoffice-commits] core.git: include/svtools

2020-11-18 Thread Roman Kuznetsov (via logerrit)

 include/svtools/DocumentToGraphicRenderer.hxx  |5 +
 include/svtools/HtmlWriter.hxx |5 +
 include/svtools/PlaceEditDialog.hxx|4 +---
 include/svtools/acceleratorexecute.hxx |5 +
 include/svtools/accessibilityoptions.hxx   |5 +
 include/svtools/addresstemplate.hxx|5 +
 include/svtools/apearcfg.hxx   |5 +
 include/svtools/asynclink.hxx  |5 +
 include/svtools/bindablecontrolhelper.hxx  |6 +-
 include/svtools/borderhelper.hxx   |5 +
 include/svtools/borderline.hxx |5 +
 include/svtools/brwbox.hxx |6 +-
 include/svtools/brwhead.hxx|5 +
 include/svtools/cliplistener.hxx   |5 +
 include/svtools/collatorres.hxx|5 +
 include/svtools/colorcfg.hxx   |4 +---
 include/svtools/colrdlg.hxx|5 +
 include/svtools/ctrlbox.hxx|6 +-
 include/svtools/ctrltool.hxx   |5 +
 include/svtools/dialogclosedlistener.hxx   |6 +-
 include/svtools/editbrowsebox.hxx  |6 +-
 include/svtools/ehdl.hxx   |5 +
 include/svtools/embedhlp.hxx   |5 +
 include/svtools/embedtransfer.hxx  |5 +
 include/svtools/extcolorcfg.hxx|4 +---
 include/svtools/filechangedchecker.hxx |5 +
 include/svtools/fontsubstconfig.hxx|6 +-
 include/svtools/framestatuslistener.hxx|5 +
 include/svtools/genericunodialog.hxx   |6 +-
 include/svtools/helpids.h  |5 +
 include/svtools/helpopt.hxx|5 +
 include/svtools/htmlcfg.hxx|6 +-
 include/svtools/htmlkywd.hxx   |5 +
 include/svtools/htmlout.hxx|5 +
 include/svtools/htmltokn.h |5 +
 include/svtools/imagemgr.hxx   |5 +
 include/svtools/imageresourceaccess.hxx|5 +
 include/svtools/imgdef.hxx |5 +
 include/svtools/indexentryres.hxx  |6 +-
 include/svtools/inettbc.hxx|5 +
 include/svtools/insdlg.hxx |5 +
 include/svtools/javacontext.hxx|5 +
 include/svtools/javainteractionhandler.hxx |5 +
 include/svtools/langhelp.hxx   |5 +
 include/svtools/langtab.hxx|5 +
 include/svtools/menuoptions.hxx|5 +
 include/svtools/miscopt.hxx|5 +
 include/svtools/openfiledroptargetlistener.hxx |5 +
 include/svtools/optionsdrawinglayer.hxx|5 +
 include/svtools/parhtml.hxx|5 +
 include/svtools/parrtf.hxx |5 +
 include/svtools/place.hxx  |5 +
 include/svtools/popupmenucontrollerbase.hxx|5 +
 include/svtools/popupwindowcontroller.hxx  |5 +
 include/svtools/printoptions.hxx   |5 +
 include/svtools/prnsetup.hxx   |5 +
 include/svtools/querydelete.hxx|5 +
 include/svtools/restartdialog.hxx  |5 +
 include/svtools/rtfkeywd.hxx   |5 +
 include/svtools/rtfout.hxx |6 +-
 include/svtools/rtftoken.h |5 +
 include/svtools/ruler.hxx  |5 +
 include/svtools/sampletext.hxx |5 +
 include/svtools/scriptedtext.hxx   |6 +-
 include/svtools/sfxecode.hxx   |6 +-
 include/svtools/slidesorterbaropt.hxx  |5 +
 include/svtools/soerr.hxx  |5 +
 include/svtools/statusbarcontroller.hxx|5 +
 include/svtools/strings.hrc|4 +---
 include/svtools/stringtransfer.hxx |5 +
 include/svtools/svparser.hxx   |5 +
 include/svtools/svtdllapi.h|5 +
 include/svtools/svtresid.hxx   |5 +
 include/svtools/tabbar.hxx |5 +
 include/svtools/templatefoldercache.hxx|6 +-
 include/svtools/toolbarmenu.hxx|5 +
 include/svtools/toolboxcontroller.hxx  |5 +
 include/svtools/unitconv.hxx   |5 +
 include/svtools/unoevent.hxx   |5 +
 include/svtools/unoimap.hxx|5 +
 include/svtools/urlfilter.hxx  |5 +
 include/svtools/valueset.hxx   |

[Libreoffice-commits] core.git: compilerplugins/clang connectivity/source dbaccess/source forms/source reportdesign/source sc/source sw/source vbahelper/source

2020-11-18 Thread Stephan Bergmann (via logerrit)

 compilerplugins/clang/stringview.cxx  |   34 
 compilerplugins/clang/test/stringview.cxx |8 ++
 connectivity/source/commontools/dbtools2.cxx  |2 
 dbaccess/source/core/dataaccess/databasedocument.cxx  |2 
 forms/source/xforms/resourcehelper.cxx|6 +-
 reportdesign/source/ui/inspection/GeometryHandler.cxx |2 
 sc/source/ui/vba/vbaapplication.cxx   |4 -
 sc/source/ui/vba/vbaaxis.cxx  |   50 +-
 sc/source/ui/vba/vbaformat.cxx|   50 +-
 sc/source/ui/vba/vbaformatcondition.cxx   |8 +-
 sc/source/ui/vba/vbaformatconditions.cxx  |   16 ++---
 sc/source/ui/vba/vbapagebreaks.cxx|2 
 sc/source/ui/vba/vbarange.cxx |   24 
 sc/source/ui/vba/vbastyle.cxx |   14 ++---
 sc/source/ui/vba/vbastyles.cxx|8 +-
 sw/source/filter/html/swhtml.cxx  |8 +-
 sw/source/ui/vba/vbadocument.cxx  |2 
 sw/source/ui/vba/vbafield.cxx |2 
 sw/source/ui/vba/vbaoptions.cxx   |2 
 sw/source/ui/vba/vbaparagraphformat.cxx   |2 
 sw/source/ui/vba/vbarange.cxx |4 -
 sw/source/ui/vba/vbaselection.cxx |8 +-
 sw/source/ui/vba/vbastyles.cxx|2 
 sw/source/ui/vba/vbatabstops.cxx  |2 
 sw/source/ui/vba/vbaview.cxx  |6 +-
 vbahelper/source/vbahelper/vbahelper.cxx  |2 
 26 files changed, 156 insertions(+), 114 deletions(-)

New commits:
commit 19926ed35ebb623fc896942b1f232b83edf1fc1e
Author: Stephan Bergmann 
AuthorDate: Wed Nov 18 23:30:24 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Nov 19 07:09:58 2020 +0100

loplugin:stringview: Flag empty string converted to string view

Change-Id: Idf412dc5f235230512160cb4fb7e1a00baa1cfa7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106085
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/compilerplugins/clang/stringview.cxx 
b/compilerplugins/clang/stringview.cxx
index 530cf43d95a0..5a70d01de841 100644
--- a/compilerplugins/clang/stringview.cxx
+++ b/compilerplugins/clang/stringview.cxx
@@ -52,6 +52,7 @@ public:
 bool VisitCXXConstructExpr(CXXConstructExpr const*);
 bool VisitFunctionDecl(FunctionDecl const*);
 bool VisitCXXOperatorCallExpr(CXXOperatorCallExpr const*);
+bool VisitImplicitCastExpr(ImplicitCastExpr const*);
 };
 
 bool StringView::VisitCallExpr(CallExpr const* callExpr)
@@ -180,6 +181,39 @@ bool StringView::VisitCXXConstructExpr(CXXConstructExpr 
const* constructExpr)
 return true;
 }
 
+bool StringView::VisitImplicitCastExpr(ImplicitCastExpr const* expr)
+{
+if (ignoreLocation(expr))
+{
+return true;
+}
+if 
(!loplugin::TypeCheck(expr->getType()).ClassOrStruct("basic_string_view").StdNamespace())
+{
+return true;
+}
+auto const e = 
dyn_cast(expr->getSubExprAsWritten()->IgnoreParens());
+if (e == nullptr)
+{
+return true;
+}
+if (e->getNumArgs() != 0)
+{
+return true;
+}
+auto const tc = loplugin::TypeCheck(e->getType());
+if (!(tc.Class("OString").Namespace("rtl").GlobalNamespace()
+  || tc.Class("OUString").Namespace("rtl").GlobalNamespace()))
+{
+return true;
+}
+report(DiagnosticsEngine::Warning,
+   "instead of an empty %0, pass an empty 
'%select{std::string_view|std::u16string_view}1'",
+   e->getLocation())
+<< e->getType() << 
(tc.Class("OString").Namespace("rtl").GlobalNamespace() ? 0 : 1)
+<< e->getSourceRange();
+return true;
+}
+
 loplugin::Plugin::Registration stringview("stringview");
 }
 
diff --git a/compilerplugins/clang/test/stringview.cxx 
b/compilerplugins/clang/test/stringview.cxx
index 96d4927e533a..3c15d9cc4437 100644
--- a/compilerplugins/clang/test/stringview.cxx
+++ b/compilerplugins/clang/test/stringview.cxx
@@ -93,4 +93,12 @@ void f4(OUString s1, OUString s2)
 }
 }
 
+void f5()
+{
+// expected-error@+1 {{instead of an empty 'rtl::OString', pass an empty 
'std::string_view' [loplugin:stringview]}}
+call_view(OString());
+// expected-error@+1 {{instead of an empty 'rtl::OUString', pass an empty 
'std::u16string_view' [loplugin:stringview]}}
+call_view(OUString());
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/connectivity/source/commontools/dbtools2.cxx 
b/connectivity/source/commontools/dbtools2.cxx
index b2626dd6fbe6..59f7dd50136e 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -380,7 +380,7 @@ OUString createStandardKeyState

[Libreoffice-commits] core.git: include/comphelper

2020-11-18 Thread Ashod Nakashian (via logerrit)

 include/comphelper/lok.hxx |   10 --
 1 file changed, 10 deletions(-)

New commits:
commit 8f79f590662145b054661846e018a4fc1837db8a
Author: Ashod Nakashian 
AuthorDate: Fri Sep 18 17:11:09 2020 -0400
Commit: Ashod Nakashian 
CommitDate: Thu Nov 19 05:55:00 2020 +0100

lok: remove unused API

Change-Id: Ibf3039f0f5d8b580e8d93c77d7adb9c4b90ba67a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105365
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian 

diff --git a/include/comphelper/lok.hxx b/include/comphelper/lok.hxx
index b8276ea49fc6..2391ceab3661 100644
--- a/include/comphelper/lok.hxx
+++ b/include/comphelper/lok.hxx
@@ -26,16 +26,6 @@ namespace comphelper::LibreOfficeKit
 
 COMPHELPER_DLLPUBLIC void setActive(bool bActive = true);
 
-// Call either setMobilePhone() or setTablet() for a view, and at most once. 
(If neither is called,
-// the view is assumed to be on a desktop browser.) In the future, this will 
possibly be changed
-// into using an enum for the kind of the view, that can be DESKTOP, 
MOBILEPHONE, or TABLET.
-
-// Tell that LOK view is on a mobile phone (regardless what its pixel 
resolution is, whether its form factor is "phablet" or not)
-COMPHELPER_DLLPUBLIC void setMobilePhone(int nViewId);
-
-// Tell that LOK view is on a tablet
-COMPHELPER_DLLPUBLIC void setTablet(int nViewId);
-
 enum class statusIndicatorCallbackType { Start, SetValue, Finish };
 
 COMPHELPER_DLLPUBLIC void setStatusIndicatorCallback(void (*callback)(void 
*data, statusIndicatorCallbackType type, int percent), void *data);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: getting started with libreoffice online

2020-11-18 Thread Dan Lewis


I found this link:

https://documentation.libreoffice.org/en/english-documentation/

This is version 6.3. We are working on updating to 7.0, but this may 
take some time.


Dan

On 11/18/20 17:28, Marc Roos wrote:
  


Dan, can you help with this?




-Original Message-

To: libreoffice
Subject: RE: getting started with libreoffice online

  


Can anyone point me to a manual where I can just run the libreoffice
online and edit some files on a tablet for instance?

Are these strange questions wanting to know what the rest api
documentation is?


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



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

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - extensions/source

2020-11-18 Thread Caolán McNamara (via logerrit)

 extensions/source/propctrlr/usercontrol.hxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit acddc14fef3f3d34c9f2218545364ff37815b507
Author: Caolán McNamara 
AuthorDate: Wed Nov 18 10:48:24 2020 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Nov 19 02:21:01 2020 +0100

Resolves: tdf#138271 flag formatted spinbuttons as modified on any entry 
change

formattedspinbuttons should send value-changed on losing focus, but this
is sufficient for this use case and safe to backport

Change-Id: Ie0cf5ab22152d95169dc5579423a4173be678a33
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105999
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/extensions/source/propctrlr/usercontrol.hxx 
b/extensions/source/propctrlr/usercontrol.hxx
index 93969d2afb21..b72fcbd8048d 100644
--- a/extensions/source/propctrlr/usercontrol.hxx
+++ b/extensions/source/propctrlr/usercontrol.hxx
@@ -58,6 +58,7 @@ namespace pcr
 m_xEntry->connect_focus_in( LINK( this, 
CommonBehaviourControlHelper, GetFocusHdl ) );
 m_xEntry->connect_focus_out( LINK( this, 
CommonBehaviourControlHelper, LoseFocusHdl ) );
 m_xSpinButton->connect_value_changed(LINK(this, 
CommonBehaviourControlHelper, FormattedModifiedHdl));
+m_xSpinButton->connect_changed(LINK(this, 
CommonBehaviourControlHelper, EditModifiedHdl));
 }
 
 void SetFormatSupplier(const SvNumberFormatsSupplierObj* pSupplier);
@@ -105,6 +106,7 @@ namespace pcr
 {
 OFormattedNumericControl_Base::SetModifyHandler();
 getTypedControlWindow()->connect_value_changed(LINK(this, 
CommonBehaviourControlHelper, FormattedModifiedHdl));
+getTypedControlWindow()->connect_changed(LINK(this, 
CommonBehaviourControlHelper, EditModifiedHdl));
 }
 
 virtual weld::Widget* getWidget() override { return 
getTypedControlWindow(); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - svx/source

2020-11-18 Thread Caolán McNamara (via logerrit)

 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2b433a52c164558b85ec85b6b8ccf6b11776695c
Author: Caolán McNamara 
AuthorDate: Wed Nov 18 11:22:42 2020 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Nov 19 02:18:28 2020 +0100

tdf#137397 Faulty Height value in Position and Size content panel

Change-Id: Ie7439371cb2d216ca1d95f21db44d203cccd9ea8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106001
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 248675f7ee1f..f6f6b242e884 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -1057,9 +1057,9 @@ void PosSizePropertyPanel::SetPosSizeMinMax()
 
 double fMaxWidth = maWorkArea.getWidth() - (maRect.getWidth() - fLeft);
 double fMaxHeight = maWorkArea.getHeight() - (maRect.getHeight() - fTop);
-mxMtrWidth->set_max(basegfx::fround64(fMaxWidth*100), FieldUnit::NONE);
+mxMtrWidth->set_max(std::min(INT_MAX, 
basegfx::fround64(fMaxWidth*100)), FieldUnit::NONE);
 limitWidth(*mxMtrWidth);
-mxMtrHeight->set_max(basegfx::fround64(fMaxHeight*100), FieldUnit::NONE);
+mxMtrHeight->set_max(std::min(INT_MAX, 
basegfx::fround64(fMaxHeight*100)), FieldUnit::NONE);
 limitWidth(*mxMtrHeight);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sc/source svx/source

2020-11-18 Thread Caolán McNamara (via logerrit)

 sc/source/core/data/postit.cxx |3 +++
 svx/source/svdraw/svdotxat.cxx |3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 0d36233d4555b5f160a407328661825eb9305c98
Author: Caolán McNamara 
AuthorDate: Wed Nov 18 17:09:52 2020 +
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Nov 19 02:17:40 2020 +0100

Resolves: tdf#114956 skip broadcast optimization for ScPostIts

so we can resize the ScPostIt as was the case before

commit f06b48a5dddab20fd1bbf9b5f3e8543593f5e590
Date:   Fri Aug 4 18:56:43 2017 +0200

editviewoverlay: Allow EditView to run in Overlay

Change-Id: Idd92716a9b38058f6f275769d4f2523eddac500c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106005
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index d0ac658f3e35..9ccb6c31a8f5 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -382,6 +382,9 @@ void ScCaptionCreator::CreateCaption( bool bShown, bool 
bTailFront )
 *mrDoc.GetDrawLayer(), //  should ret a ref?
 aTextRect,
 aTailPos));
+// tdf#114956 a way to recognize that this SdrCaption is for a ScPostit in
+// SdrTextObj::AdjustTextFrameWidthAndHeight
+mxCaption->SetName("ScPostIt");
 // basic caption settings
 ScCaptionUtil::SetBasicCaptionSettings( *mxCaption, bShown );
 }
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index 6f4559fd33ca..6f97960b5377 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -278,7 +278,8 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight()
 GetTextEditOutliner() &&
 GetTextEditOutliner()->hasEditViewCallbacks());
 
-if (!bSuppressChangeWhenEditOnOverlay)
+// tdf#114956 always broadcast change for ScPostIts
+if (!bSuppressChangeWhenEditOnOverlay || GetName() == "ScPostIt")
 {
 SetChanged();
 BroadcastObjectChange();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/source

2020-11-18 Thread Michael Stahl (via logerrit)

 sw/source/core/crsr/pam.cxx |   24 
 1 file changed, 16 insertions(+), 8 deletions(-)

New commits:
commit cb9ec4a95b0f2ac3db6cb51678bd55f73c44c874
Author: Michael Stahl 
AuthorDate: Tue Nov 17 17:58:33 2020 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Nov 19 02:17:04 2020 +0100

sw_redlinehide: replace bogus implementation of SwPaM::InvalidatePaM()

Sending SwInsText will mess up merged paragraphs. Instead, send
SwUpdateAttr with which-id 0, which results in InvalidateRange_() being
called with at least 1 character.

This appears to be called only by fieldmark UI, and now asserts in
UITest_writer_tests5 
DateFormFieldPropertiesDialog.dateFormFieldDialog.test_date_field_with_custom_format

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106022
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 93b1adf7442839dcfbf16660b1fbe1139f14a4d0)

sw_redlinehide: use correct node in SwPaM::InvalidatePaM()
(oopsie from 93b1adf7442839dcfbf16660b1fbe1139f14a4d0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106046
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 53c69d392b1e55267a44994a889688cc80fbbd98)

Change-Id: I948ddefa3acece8809e4bf3d2beee6cec3ed56f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106065
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 0473d8bacfd1..d1fccd357f5e 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -1121,15 +1121,23 @@ OUString SwPaM::GetText() const
 
 void SwPaM::InvalidatePaM()
 {
-const SwNode &_pNd = GetNode();
-const SwTextNode *_pTextNd = _pNd.GetTextNode();
-if (_pTextNd != nullptr)
+for (SwNodeIndex index = Start()->nNode; index <= End()->nNode; ++index)
 {
-// pretend that the PaM marks inserted text to recalc the portion...
-SwInsText aHint( Start()->nContent.GetIndex(),
-End()->nContent.GetIndex() - 
Start()->nContent.GetIndex() + 1 );
-SwModify *_pModify=const_cast(static_cast(_pTextNd));
-_pModify->ModifyNotification( nullptr, &aHint);
+if (SwTextNode *const pTextNode = index.GetNode().GetTextNode())
+{
+// pretend that the PaM marks changed formatting to reformat...
+sal_Int32 const nStart(
+index == Start()->nNode ? Start()->nContent.GetIndex() : 0);
+// this should work even for length of 0
+SwUpdateAttr const aHint(
+nStart,
+index == End()->nNode
+? End()->nContent.GetIndex() - nStart
+: pTextNode->Len() - nStart,
+0);
+pTextNode->CallSwClientNotify(sw::LegacyModifyHint(&aHint, 
&aHint));
+}
+// other node types not invalidated
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-11-18 Thread Miklos Vajna (via logerrit)

 sfx2/source/view/sfxbasecontroller.cxx|   12 +-
 sw/qa/uibase/uiview/data/update-replacement-nosetting.odt |binary
 sw/qa/uibase/uiview/uiview.cxx|   25 ++
 sw/source/uibase/uiview/view.cxx  |2 -
 4 files changed, 34 insertions(+), 5 deletions(-)

New commits:
commit 693f12ad57912c2356a197d9a794e6108ce79ef2
Author: Miklos Vajna 
AuthorDate: Wed Nov 18 17:55:13 2020 +0100
Commit: Miklos Vajna 
CommitDate: Thu Nov 19 01:37:50 2020 +0100

sw replacement image creation: fix this when an ODT's settings.xml is 
invalid

This builds on top of commit c123bfff501229f398a1b679fc7434b82d53685c
(Bin overly eager early return that stops replacement image creation,
2020-08-20), and handles a similar case, when
SwView::ReadUserDataSequence() is not called at all.

The result is the same: no shell is selected on the command dispatcher
stack, so .uno:UpdateAll is ignored and the replacement images are not
created.

Change-Id: If8b74424b0ad88e63129fd8f7efd09f85e300895
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106068
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sfx2/source/view/sfxbasecontroller.cxx 
b/sfx2/source/view/sfxbasecontroller.cxx
index cecf046bfbe9..23b1aad5c3d0 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -1334,12 +1334,18 @@ void SfxBaseController::ConnectSfxFrame_Impl( const 
ConnectSfxFrame i_eConnect )
 break;
 }
 }
-if ( nViewDataIndex < nCount )
+if (nViewDataIndex < nCount || !xViewData.is())
 {
 Sequence< PropertyValue > aViewData;
-OSL_VERIFY( xViewData->getByIndex( nViewDataIndex ) 
>>= aViewData );
-if ( aViewData.hasElements() )
+if (xViewData.is())
+{
+OSL_VERIFY(xViewData->getByIndex(nViewDataIndex) 
>>= aViewData);
+}
+if (aViewData.hasElements() || !xViewData.is())
+{
+// Tolerate empty xViewData, 
ReadUserDataSequence() has side effects.
 m_pData->m_pViewShell->ReadUserDataSequence( 
aViewData );
+}
 }
 }
 catch (const Exception&)
diff --git a/sw/qa/uibase/uiview/data/update-replacement-nosetting.odt 
b/sw/qa/uibase/uiview/data/update-replacement-nosetting.odt
new file mode 100644
index ..055c3d1a2c2a
Binary files /dev/null and 
b/sw/qa/uibase/uiview/data/update-replacement-nosetting.odt differ
diff --git a/sw/qa/uibase/uiview/uiview.cxx b/sw/qa/uibase/uiview/uiview.cxx
index 8827cea10752..4d622aafaa5f 100644
--- a/sw/qa/uibase/uiview/uiview.cxx
+++ b/sw/qa/uibase/uiview/uiview.cxx
@@ -12,6 +12,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -87,6 +88,30 @@ CPPUNIT_TEST_FIXTURE(SwUibaseUiviewTest, 
testUpdateAllObjectReplacements)
 CPPUNIT_ASSERT(xNameAccess->hasByName("ObjectReplacements/Components_1"));
 }
 
+CPPUNIT_TEST_FIXTURE(SwUibaseUiviewTest, testUpdateReplacementNosetting)
+{
+// Load a copy of the document in hidden mode.
+OUString aSourceURL
+= m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"update-replacement-nosetting.odt";
+CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, osl::File::copy(aSourceURL, 
maTempFile.GetURL()));
+mxComponent = loadFromDesktop(maTempFile.GetURL(), 
"com.sun.star.text.TextDocument",
+  { comphelper::makePropertyValue("Hidden", 
true) });
+
+// Update "everything" (including object replacements) and save it.
+dispatchCommand(mxComponent, ".uno:UpdateAll", {});
+uno::Reference xStorable(mxComponent, uno::UNO_QUERY);
+xStorable->storeSelf({});
+
+// Check the contents of the updated copy.
+uno::Reference xContext = 
comphelper::getProcessComponentContext();
+uno::Reference xNameAccess
+= packages::zip::ZipFileAccess::createWithURL(xContext, 
maTempFile.GetURL());
+
+// Without the accompanying fix in place, this test would have failed, 
because the embedded
+// object replacement image was not generated.
+CPPUNIT_ASSERT(xNameAccess->hasByName("ObjectReplacements/Components"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 2b5670cffc11..0e12a868f88d 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -1283,8 +1283,6 @@ void SwView::ReadUserDataSequence ( const uno::Sequence < 
beans::PropertyValue >
 if(GetDocShell()->IsPreview()||m_bIsPrevi

[Libreoffice-commits] core.git: lotuswordpro/inc lotuswordpro/source solenv/clang-format

2020-11-18 Thread Philipp Hofer (via logerrit)

 lotuswordpro/inc/localtime.hxx |   20 
 lotuswordpro/inc/lwpatomholder.hxx |   18 
 lotuswordpro/inc/lwpbasetype.hxx   |   15 
 lotuswordpro/inc/lwpfilehdr.hxx|   14 
 lotuswordpro/inc/lwpfrib.hxx   |   37 -
 lotuswordpro/inc/lwpglobalmgr.hxx  |   16 
 lotuswordpro/inc/lwpobj.hxx|   15 
 lotuswordpro/inc/lwpobjstrm.hxx|   30 -
 lotuswordpro/inc/lwpsvstream.hxx   |   20 
 lotuswordpro/inc/xfilter/ixfstream.hxx |   14 
 lotuswordpro/inc/xfilter/ixfstyle.hxx  |   22 
 lotuswordpro/inc/xfilter/xfannotation.hxx  |   32 -
 lotuswordpro/inc/xfilter/xfarrowstyle.hxx  |   52 -
 lotuswordpro/inc/xfilter/xfbgimage.hxx |   32 -
 lotuswordpro/inc/xfilter/xfcellstyle.hxx   |   33 -
 lotuswordpro/inc/xfilter/xfchange.hxx  |   35 -
 lotuswordpro/inc/xfilter/xfcolstyle.hxx|   20 
 lotuswordpro/inc/xfilter/xfconfigmanager.hxx   |   12 
 lotuswordpro/inc/xfilter/xfcontentcontainer.hxx|   20 
 lotuswordpro/inc/xfilter/xfcrossref.hxx|   18 
 lotuswordpro/inc/xfilter/xfdatestyle.hxx   |   52 -
 lotuswordpro/inc/xfilter/xfdrawgroup.hxx   |   21 
 lotuswordpro/inc/xfilter/xfdrawpath.hxx|   27 
 lotuswordpro/inc/xfilter/xfdrawpolyline.hxx|   10 
 lotuswordpro/inc/xfilter/xfdrawrect.hxx|   14 
 lotuswordpro/inc/xfilter/xfdrawstyle.hxx   |   31 -
 lotuswordpro/inc/xfilter/xfentry.hxx   |   37 -
 lotuswordpro/inc/xfilter/xffloatframe.hxx  |9 
 lotuswordpro/inc/xfilter/xffontdecl.hxx|   10 
 lotuswordpro/inc/xfilter/xffooter.hxx  |   12 
 lotuswordpro/inc/xfilter/xffooterstyle.hxx |   11 
 lotuswordpro/inc/xfilter/xffootnote.hxx|   36 -
 lotuswordpro/inc/xfilter/xfglobal.hxx  |   40 -
 lotuswordpro/inc/xfilter/xfheader.hxx  |   13 
 lotuswordpro/inc/xfilter/xfheaderstyle.hxx |   36 -
 lotuswordpro/inc/xfilter/xfhyperlink.hxx   |   59 --
 lotuswordpro/inc/xfilter/xfimagestyle.hxx  |   30 -
 lotuswordpro/inc/xfilter/xflinebreak.hxx   |   10 
 lotuswordpro/inc/xfilter/xflist.hxx|   22 
 lotuswordpro/inc/xfilter/xflistitem.hxx|   36 -
 lotuswordpro/inc/xfilter/xfmasterpage.hxx  |   10 
 lotuswordpro/inc/xfilter/xfofficemeta.hxx  |   22 
 lotuswordpro/inc/xfilter/xfpagecount.hxx   |   10 
 lotuswordpro/inc/xfilter/xfpagenumber.hxx  |   21 
 lotuswordpro/inc/xfilter/xfplaceholder.hxx |   53 -
 lotuswordpro/inc/xfilter/xfrowstyle.hxx|   22 
 lotuswordpro/inc/xfilter/xfruby.hxx|   40 -
 lotuswordpro/inc/xfilter/xfrubystyle.hxx   |   31 -
 lotuswordpro/inc/xfilter/xfsectionstyle.hxx|   16 
 lotuswordpro/inc/xfilter/xfstyle.hxx   |   24 
 lotuswordpro/inc/xfilter/xfstylecont.hxx   |   27 
 lotuswordpro/inc/xfilter/xftablestyle.hxx  |   32 -
 lotuswordpro/inc/xfilter/xftabstop.hxx |   10 
 lotuswordpro/inc/xfilter/xftextspan.hxx|   15 
 lotuswordpro/inc/xfilter/xftextstyle.hxx   |   18 
 lotuswordpro/inc/xfilter/xfutil.hxx|   26 
 lotuswordpro/source/filter/benlist.cxx |   23 
 lotuswordpro/source/filter/benobj.cxx  |   15 
 lotuswordpro/source/filter/explode.hxx |   37 -
 lotuswordpro/source/filter/first.hxx   |6 
 lotuswordpro/source/filter/localtime.cxx   |   32 -
 lotuswordpro/source/filter/lwp9reader.cxx  |   58 +-
 lotuswordpro/source/filter/lwp9reader.hxx  |8 
 lotuswordpro/source/filter/lwpatomholder.cxx   |   18 
 lotuswordpro/source/filter/lwpbackgroundstuff.cxx  |   28 -
 lotuswordpro/source/filter/lwpbackgroundstuff.hxx  |   12 
 lotuswordpro/source/filter/lwpbasetype.cxx |   14 
 lotuswordpro/source/filter/lwpbreaksoverride.cxx   |   29 -
 lotuswordpro/source/filter/lwpbreaksoverride.hxx   |   41 -
 lotuswordpro/source/filter/lwpcharacterstyle.cxx   |   28 -
 lotuswordpro/source/filter/lwpcharborderoverride.hxx   |   14 
 lotuswordpro/source/filter/lwpcharsetmgr.cxx   |   53 -
 lotuswordpro/source/filter/lwpcontent.cxx  |   15 
 lotuswordpro/source/filter/lwpdivinfo.cxx  |   20 
 lotuswordpro/source/filter/lwpdivinfo.hxx  |   21 
 lotuswordpro/source/filter/lwpdivopts.hxx  |   10 
 lotuswordpro/source/filter/lwpdlvlist.cxx  |   51 -
 lotuswordpro/source/filter/lwpdlvlist.h

[Libreoffice-commits] core.git: scaddins/source sc/inc sc/qa sc/source solenv/clang-format

2020-11-18 Thread Philipp Hofer (via logerrit)

 sc/inc/bulkdatahint.hxx|   13 
 sc/inc/calcconfig.hxx  |   24 -
 sc/inc/celltextattr.hxx|7 
 sc/inc/cellvalues.hxx  |   53 +--
 sc/inc/chartarr.hxx|   20 -
 sc/inc/clipoptions.hxx |5 
 sc/inc/columniterator.hxx  |   10 
 sc/inc/columnset.hxx   |7 
 sc/inc/datamapper.hxx  |   10 
 sc/inc/datastreamgettime.hxx   |8 
 sc/inc/documentstreamaccess.hxx|   15 
 sc/inc/dpfilteredcache.hxx |   35 +-
 sc/inc/dpresfilter.hxx |   24 -
 sc/inc/edittextiterator.hxx|7 
 sc/inc/formulaiter.hxx |5 
 sc/inc/generalfunction.hxx |   14 
 sc/inc/listenercontext.hxx |   27 -
 sc/inc/listenerquery.hxx   |   21 -
 sc/inc/macromgr.hxx|8 
 sc/inc/mid.h   |8 
 sc/inc/numformat.hxx   |9 
 sc/inc/pageuno.hxx |6 
 sc/inc/reffind.hxx |8 
 sc/inc/refreshtimerprotector.hxx   |4 
 sc/inc/scdllapi.h  |4 
 sc/inc/scopetools.hxx  |   25 -
 sc/inc/segmenttree.hxx |   49 +-
 sc/inc/stylehelper.hxx |4 
 sc/inc/tokenstringcontext.hxx  |   21 -
 sc/inc/unitconv.hxx|   17 -
 sc/inc/userlist.hxx|   20 -
 sc/inc/zforauto.hxx|   12 
 sc/qa/extras/check_data_pilot_field.cxx|   61 +--
 sc/qa/extras/recordchanges-test.cxx|   27 -
 sc/qa/extras/sccellrangesobj.cxx   |   39 +-
 sc/qa/extras/scmodelobj.cxx|   25 -
 sc/qa/extras/scoutlineobj.cxx  |   17 -
 sc/qa/extras/scsubtotalfieldobj.cxx|   29 -
 sc/qa/unit/dataproviders_test.cxx  |   45 +-
 sc/qa/unit/test_ScChartListenerCollection.cxx  |   38 +-
 sc/source/core/data/table5.cxx |  279 -
 sc/source/core/inc/arraysumfunctor.hxx |   13 
 sc/source/core/inc/cellkeytranslator.hxx   |   12 
 sc/source/core/inc/doubleref.hxx   |   19 -
 sc/source/core/inc/scrdata.hxx |7 
 sc/source/core/tool/addincfg.cxx   |   19 -
 sc/source/core/tool/math.cxx   |   27 -
 sc/source/core/tool/subtotal.cxx   |   52 +--
 sc/source/filter/excel/xltracer.cxx|   66 +---
 sc/source/filter/inc/optab.h   |   10 
 sc/source/filter/inc/qpro.hxx  |   10 
 sc/source/filter/inc/qproform.hxx  |   19 -
 sc/source/filter/inc/sharedformulagroups.hxx   |   13 
 sc/source/filter/inc/xepivotxml.hxx|   25 -
 sc/source/filter/lotus/memory.cxx  |   14 
 sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx |   10 
 sc/source/filter/xml/XMLEmptyContext.hxx   |9 
 sc/source/filter/xml/XMLExportDatabaseRanges.hxx   |7 
 sc/source/filter/xml/XMLTrackedChangesContext.hxx  |   18 -
 sc/source/filter/xml/importcontext.hxx |5 
 sc/source/filter/xml/pivotsource.hxx   |   29 -
 sc/source/filter/xml/xmlcvali.hxx  |8 
 sc/source/ui/Accessibility/AccessibleDocumentBase.cxx  |9 
 sc/source/ui/attrdlg/scuiexp.cxx   |   19 -
 sc/source/ui/cctrl/cbnumberformat.cxx  |   11 
 sc/source/ui/dataprovider/htmldataprovider.hxx |7 
 sc/source/ui/dbgui/PivotLayoutTreeList.cxx |   18 -
 sc/source/ui/formdlg/formdata.cxx  |9 
 sc/source/ui/inc/AccessibleDocumentBase.hxx|7 
 sc/source/ui/inc/IAnyRefDialog.hxx |   12 
 sc/source/ui/inc/PivotLayoutTreeListBase.hxx   |7 
 sc/source/ui/inc/PivotLayoutTreeListLabel.hxx  |3 
 sc/source/ui/inc/attrdlg.hxx   |6 
 sc/source/ui/inc/chartsh.hxx   |5 
 sc/source/ui/inc/condformatdlgitem.hxx |   18 -
 sc/source/ui/inc/dapitype.hxx  |   10 
 sc/source/ui/inc/dataproviderdlg.hxx   |   11 
 sc/sour

[Libreoffice-commits] core.git: solenv/clang-format sw/inc sw/qa sw/source

2020-11-18 Thread Philipp Hofer (via logerrit)

 solenv/clang-format/excludelist|  202 --
 sw/inc/HandleAnchorNodeChg.hxx |   10 
 sw/inc/IDocumentChartDataProviderAccess.hxx|9 
 sw/inc/IDocumentDeviceAccess.hxx   |   21 -
 sw/inc/IDocumentDrawModelAccess.hxx|   10 
 sw/inc/IDocumentSettingAccess.hxx  |   42 +-
 sw/inc/IDocumentState.hxx  |4 
 sw/inc/IDocumentStatistics.hxx |7 
 sw/inc/IDocumentStylePoolAccess.hxx|   21 -
 sw/inc/IDocumentTimerAccess.hxx|2 
 sw/inc/IGrammarContact.hxx |   11 
 sw/inc/IShellCursorSupplier.hxx|   10 
 sw/inc/PageColumnPopup.hxx |5 
 sw/inc/PageMarginPopup.hxx |4 
 sw/inc/PageOrientationPopup.hxx|4 
 sw/inc/PageSizePopup.hxx   |5 
 sw/inc/SidebarWindowsTypes.hxx |   10 
 sw/inc/SwCapObjType.hxx|5 
 sw/inc/SwDocIdle.hxx   |   11 
 sw/inc/SwGetPoolIdFromName.hxx |   13 
 sw/inc/SwNodeNum.hxx   |   30 -
 sw/inc/SwNumberTree.hxx|   85 +---
 sw/inc/SwNumberTreeTypes.hxx   |4 
 sw/inc/SwRewriter.hxx  |4 
 sw/inc/SwSmartTagMgr.hxx   |6 
 sw/inc/ToxWhitespaceStripper.hxx   |   12 
 sw/inc/UndoParagraphSignature.hxx  |   13 
 sw/inc/checkit.hxx |7 
 sw/inc/colwd.hxx   |4 
 sw/inc/dbgoutsw.hxx|   58 +-
 sw/inc/dobjfac.hxx |2 
 sw/inc/docfac.hxx  |4 
 sw/inc/docfunc.hxx |   50 +-
 sw/inc/drawdoc.hxx |4 
 sw/inc/flddropdown.hxx |   34 -
 sw/inc/hintids.hxx |  422 ++---
 sw/inc/pausethreadstarting.hxx |   12 
 sw/inc/prtopt.hxx  |6 
 sw/inc/sw_primitivetypes2d.hxx |8 
 sw/inc/swcli.hxx   |6 
 sw/inc/swcommands.h|3 
 sw/inc/swddetbl.hxx|   12 
 sw/inc/swdll.hxx   |9 
 sw/inc/swdllapi.h  |4 
 sw/inc/toxe.hxx|2 
 sw/inc/unoprnms.hxx|3 
 sw/qa/core/test_ToxMiscTest.cxx|7 
 sw/qa/core/test_ToxWhitespaceStripper.cxx  |   28 -
 sw/qa/extras/htmlexport/htmlexport.cxx |  113 +++--
 sw/qa/extras/ooxmlexport/ooxmlencryption.cxx   |5 
 sw/qa/extras/ooxmlexport/ooxmllinks.cxx|   11 
 sw/source/core/access/accheaderfooter.hxx  |   22 -
 sw/source/core/attr/fmtfollowtextflow.cxx  |2 
 sw/source/core/bastyp/SwSmartTagMgr.cxx|   24 -
 sw/source/core/bastyp/checkit.cxx  |2 
 sw/source/core/bastyp/proofreadingiterator.cxx |   21 -
 sw/source/core/bastyp/swtypes.cxx  |   14 
 sw/source/core/crsr/BlockCursor.cxx|9 
 sw/source/core/doc/swstylemanager.hxx  |2 
 sw/source/core/docnode/cancellablejob.hxx  |8 
 sw/source/core/docnode/ndsect.hxx  |3 
 sw/source/core/docnode/pausethreadstarting.cxx |8 
 sw/source/core/docnode/swthreadjoiner.cxx  |   17 
 sw/source/core/edit/edfldexp.cxx   |   15 
 sw/source/core/inc/DocumentDeviceManager.hxx   |   29 -
 sw/source/core/inc/DocumentDrawModelManager.hxx|   12 
 sw/source/core/inc/DocumentExternalDataManager.hxx |   10 
 sw/source/core/inc/DocumentStatisticsManager.hxx   |   22 -
 sw/source/core/inc/DocumentTimerManager.hxx|8 
 sw/source/core/inc/SwGrammarMarkUp.hxx |   23 -
 sw/source/core/inc/SwUndoTOXChange.hxx |8 
 sw/source/core/inc/UndoBookmark.hxx|   49 +-
 sw/source/core/inc/UndoDraw.hxx|   43 +-
 sw/source/core/inc/colfrm.hxx  |6 
 sw/source/core/inc/docedt.hxx  |4 
 sw/source/core/inc/docredln.hxx|2 
 sw/source/core/inc/environmentofanchoredobject.hxx |  132 +++---
 sw/source/core/inc/fefly.hxx   |3 
 sw/source/core/inc/fieldhint.hxx   |6 
 sw/source/core/inc/node2lay.hxx|   12 
 sw/source/core/inc/noteurl.hxx |2 
 sw/source/core/inc/paintfrm.hxx|7 
 sw/source/c

Trouble with SdrMeasureObj (dimension line)

2020-11-18 Thread Regina Henschel


Hi all,

I have wondered why a SdrMeasureObj, which is anchored "to cell (resize 
with cell), does not work in Calc (e.g. tdf#137576).

Problems detected so far:

(A) TRGetBaseGeometry does not include a rotation angle. So a chain of 
TRGetBaseGeometry followed by TRSetBaseGeometry does not work. I'm going 
to change ScXMLExport::WriteShapes so that is does not use matrices. I 
think, a fix for TR*BaseGeometry is a larger effort.


(B) Neither "drag create", nor ctor, nor "create default" set maRect. 
Because SdrMeasureObj has no own NbcGetLogicRect it uses the inherited 
one from SdrTextObj, which simple results maRect. Thus Calc uses in some 
cases an empty rectangle, when it calculates NonRotatedAnchor. The 
latter is used when saving the document.


(C) Setting start or end point does not update maRect. The method 
includes SetRectsDirty(). A call to GetSnapRect() will then trigger 
RecalSnapRect(), but that does not affect maRect.


(D) Both NbcSetLogicRect and NbcSetSnapRect use the inherited one from 
SdrTextObj and therefor do not set start and end point. Fixing that 
looks like a larger effort to me too.


TakeUnrotatedSnapRect can calculate a logic rectangle of the current 
state of a SdrMeasureObj. I can add this to 
FuConstRectangle::CreateDefaultObject, which is responsible for a 
default SdrMeasureObj (used for accessibility), and to 
SdrMeasureObj::EndCreate. That will work for creating measure lines in 
the UI of Calc.


Implementing a SdrMeasureObj::GetLogicRect(), which recalculates maRect, 
is not possible because of const-ness.


Questions:
Should I add TakeUnrotatedSnapRect to other places too? Candidates are
ctor SdrMeasureObj::SdrMeasureObj(SdrModel& rSdrModel, const Point& 
rPt1, const Point& rPt2)

SdrMeasureObj::RecalcSnapRect()
SdrMeasureObj::NbcSetPoint(const Point& rPnt, sal_uInt32 i)

Do you know other places which need to be changed, or which are sensible 
and need testing?


Do you have better ideas?

Do you have a suggestion for the order, things to do?

Do you know examples for unit tests with "drag create" and for unit 
tests with "create default objects"?


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

RE: getting started with libreoffice online

2020-11-18 Thread Marc Roos

 

Dan, can you help with this?




-Original Message-

To: libreoffice
Subject: RE: getting started with libreoffice online

 

Can anyone point me to a manual where I can just run the libreoffice 
online and edit some files on a tablet for instance?

Are these strange questions wanting to know what the rest api 
documentation is?


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


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

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

2020-11-18 Thread Xisco Fauli (via logerrit)

 sc/qa/uitest/calc_tests7/tdf137397.py |   49 ++
 sc/qa/uitest/data/tdf137397.ods   |binary
 2 files changed, 49 insertions(+)

New commits:
commit a930f12c30f31d306ba60c5344cd8308d9fa4ee1
Author: Xisco Fauli 
AuthorDate: Wed Nov 18 13:58:54 2020 +0100
Commit: Xisco Fauli 
CommitDate: Wed Nov 18 21:20:26 2020 +0100

tdf#137397: sc: Add UItest

Change-Id: I53530cc74dadae79b674d98076b92489a0508680
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106057
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/calc_tests7/tdf137397.py 
b/sc/qa/uitest/calc_tests7/tdf137397.py
new file mode 100644
index ..fe8b34a31d48
--- /dev/null
+++ b/sc/qa/uitest/calc_tests7/tdf137397.py
@@ -0,0 +1,49 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import change_measurement_unit
+import org.libreoffice.unotest
+import pathlib
+
+def get_url_for_data_file(file_name):
+return 
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+
+class tdf137397(UITestCase):
+
+def test_tdf137397(self):
+
+calc_doc = 
self.ui_test.load_file(get_url_for_data_file("tdf137397.ods"))
+
+change_measurement_unit(self, 'Centimeter')
+
+xCalcDoc = self.xUITest.getTopFocusWindow()
+xGridWin = xCalcDoc.getChild("grid_window")
+
+xGridWin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Shape"}))
+
+self.xUITest.executeCommand(".uno:Sidebar")
+xGridWin.executeAction("SIDEBAR", mkPropertyValues({"PANEL": 
"TextPropertyPanel"}))
+
+xCalcDoc = self.xUITest.getTopFocusWindow()
+
+
+self.ui_test.wait_until_child_is_available(xCalcDoc, 'selectwidth')
+
self.assertEqual(get_state_as_dict(xCalcDoc.getChild('selectwidth'))['Text'], 
'6.00 cm')
+
+# Without the fix in place, this test would have failed with
+# AssertionError: '-14,585,309.84 cm' != '2.00 cm'
+self.ui_test.wait_until_child_is_available(xCalcDoc, 'selectheight')
+
self.assertEqual(get_state_as_dict(xCalcDoc.getChild('selectheight'))['Text'], 
'2.00 cm')
+
+
+self.xUITest.executeCommand(".uno:Sidebar")
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/data/tdf137397.ods b/sc/qa/uitest/data/tdf137397.ods
new file mode 100644
index ..203484804872
Binary files /dev/null and b/sc/qa/uitest/data/tdf137397.ods differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-11-18 Thread Caolán McNamara (via logerrit)

 sw/source/core/layout/pagechg.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4535e2291741bb9262ca274cb50f80a2618cdcc2
Author: Caolán McNamara 
AuthorDate: Wed Nov 18 15:24:10 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Nov 18 20:36:45 2020 +0100

crashtesting: export ooo88744-1.odt to .doc and load

intermittently on ctrl+end the layout crashes

Change-Id: I4b9b5ab8d1514a3847b4993afd6f4de414544d05
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106059
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/core/layout/pagechg.cxx 
b/sw/source/core/layout/pagechg.cxx
index f386afa1bdfd..a40b9d18bdcc 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1229,7 +1229,8 @@ void SwFrame::CheckPageDescs( SwPageFrame *pStart, bool 
bNotifyFields, SwPageFra
 #endif
 }
 assert(!bIsEmpty || !isPageFrameEmpty);
-if (bIsEmpty || isPageFrameEmpty)
+const bool bWantRemovePage = bIsEmpty || isPageFrameEmpty;
+if (bWantRemovePage && !pPage->IsDeleteForbidden())
 {
 // It also might be that an empty page is not needed at all.
 // However, the algorithm above cannot determine that. It is not 
needed if the following
___
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.4' - chart2/source desktop/source

2020-11-18 Thread Jan Holesovsky (via logerrit)

 chart2/source/controller/sidebar/ChartElementsPanel.cxx |   20 +---
 desktop/source/lib/init.cxx |   10 +++-
 2 files changed, 21 insertions(+), 9 deletions(-)

New commits:
commit c5bd74c0ace401812be416a295c71a6604f8240d
Author: Jan Holesovsky 
AuthorDate: Fri Oct 16 14:34:43 2020 +0200
Commit: Jan Holesovsky 
CommitDate: Wed Nov 18 19:52:08 2020 +0100

lok: Make the chart (sub)title work even from the mobile-wizard.

Change-Id: Ic6346a403639e283ade47429f581f91e7a468f63
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104436
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105617
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx 
b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index 68175acd46d2..a4771b76ee0c 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -427,19 +427,23 @@ void ChartElementsPanel::updateData()
 
 bool hasTitle = isTitleVisisble(mxModel, TitleHelper::MAIN_TITLE);
 mpCBTitle->Check(hasTitle);
-if (!mpEditTitle->HasFocus())
-{
-
mpEditTitle->SetText(TitleHelper::getCompleteString(TitleHelper::getTitle(TitleHelper::MAIN_TITLE,
 mxModel)));
+
+OUString title = mpEditTitle->GetText();
+OUString newTitle = 
TitleHelper::getCompleteString(TitleHelper::getTitle(TitleHelper::MAIN_TITLE, 
mxModel));
+if (title != newTitle)
+mpEditTitle->SetText(newTitle);
+if (mpEditTitle->IsEnabled() != hasTitle)
 mpEditTitle->Enable(hasTitle);
-}
 
 bool hasSubtitle = isTitleVisisble(mxModel, TitleHelper::SUB_TITLE);
 mpCBSubtitle->Check(hasSubtitle);
-if (!mpEditSubtitle->HasFocus())
-{
-
mpEditSubtitle->SetText(TitleHelper::getCompleteString(TitleHelper::getTitle(TitleHelper::SUB_TITLE,
 mxModel)));
+
+OUString subtitle = mpEditSubtitle->GetText();
+OUString newSubtitle = 
TitleHelper::getCompleteString(TitleHelper::getTitle(TitleHelper::SUB_TITLE, 
mxModel));
+if (subtitle != newSubtitle)
+mpEditSubtitle->SetText(newSubtitle);
+if (mpEditSubtitle->IsEnabled() != hasSubtitle)
 mpEditSubtitle->Enable(hasSubtitle);
-}
 
 mpCBXAxisTitle->Check(isTitleVisisble(mxModel, TitleHelper::X_AXIS_TITLE));
 mpCBYAxisTitle->Check(isTitleVisisble(mxModel, TitleHelper::Y_AXIS_TITLE));
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index f527656333b6..b37c85ffbc63 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3724,6 +3724,7 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned long
 {
 static const OUString sClickAction("CLICK");
 static const OUString sSelectAction("SELECT");
+static const OUString sSetAction("SET");
 static const OUString sClearAction("CLEAR");
 static const OUString sTypeAction("TYPE");
 static const OUString sUpAction("UP");
@@ -3749,6 +3750,7 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned long
 
 if (!bIsWeldedDialog)
 {
+OUString sControlType = aMap["type"];
 OUString sAction((aMap.find("cmd") != aMap.end())? 
aMap["cmd"]: "");
 WindowUIObject aUIObject(pWindow);
 std::unique_ptr 
pUIWindow(aUIObject.get_visible_child(aMap["id"]));
@@ -3774,9 +3776,15 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* 
/*pThis*/, unsigned long
 {
 aMap["TEXT"] = aMap["data"];
 
-pUIWindow->execute(sClearAction, aMap);
+pUIWindow->execute(sClearAction, aMap); // FIXME - 
change the "CLEAR"&"TYPE" to "SET" and test thoroughly; the "TYPE" really types 
a character by character
 pUIWindow->execute(sTypeAction, aMap);
 }
+else if (sControlType == "edit" && sAction == "change") // 
FIXME - shouldn't "edit" issue "set" instead of "change"?
+{
+aMap["TEXT"] = aMap["data"];
+
+pUIWindow->execute(sSetAction, aMap);
+}
 else if (sAction == "value")
 {
 aMap["VALUE"] = aMap["data"];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-11-18 Thread Julien Nabet (via logerrit)

 connectivity/source/drivers/firebird/DatabaseMetaData.cxx |   22 ++
 connectivity/source/drivers/firebird/ResultSet.cxx|9 -
 2 files changed, 23 insertions(+), 8 deletions(-)

New commits:
commit 5c6340d06b4e58529f6122ecf3b26c6d4456226b
Author: Julien Nabet 
AuthorDate: Tue Nov 17 21:30:42 2020 +0100
Commit: Lionel Mamane 
CommitDate: Wed Nov 18 19:19:04 2020 +0100

Related tdf#121886: Firebird Datatype Image(BLOB) is not working properly

xBlob->length() returns sal_Int64 not sal_Int32
so deal with it in:
- OResultSet::getBytes
- ODatabaseMetaData::getColumns
and warn if blob is more than SAL_MAX_INT32

also rename xDescriptionBlob into xBlob

Change-Id: Ib79930c4c8fb00b1682c9a9530a3dee9b040e7ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106029
Tested-by: Jenkins
Reviewed-by: Lionel Mamane 

diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx 
b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index 28880a378b0a..9aabd39cb52a 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -1246,13 +1246,23 @@ uno::Reference< XResultSet > SAL_CALL 
ODatabaseMetaData::getColumns(
 // 12. Comments -- may be omitted
 {
 OUString aDescription;
-uno::Reference< XBlob > xDescriptionBlob = xRow->getBlob(3);
-if (xDescriptionBlob.is())
+uno::Reference< XBlob > xBlob = xRow->getBlob(3);
+if (xBlob.is())
 {
-sal_Int32 aBlobLength = 
static_cast(xDescriptionBlob->length());
-aDescription = 
OUString(reinterpret_cast(xDescriptionBlob->getBytes(1, 
aBlobLength).getArray()),
-aBlobLength,
-RTL_TEXTENCODING_UTF8);
+const sal_Int64 aBlobLength = xBlob->length();
+if (aBlobLength > SAL_MAX_INT32)
+{
+SAL_WARN("connectivity.firebird", "getBytes can't return " 
<< aBlobLength << " bytes but only max " << SAL_MAX_INT32);
+aDescription = 
OUString(reinterpret_cast(xBlob->getBytes(1, SAL_MAX_INT32).getArray()),
+SAL_MAX_INT32,
+RTL_TEXTENCODING_UTF8);
+}
+else
+{
+aDescription = 
OUString(reinterpret_cast(xBlob->getBytes(1, 
static_cast(aBlobLength)).getArray()),
+aBlobLength,
+RTL_TEXTENCODING_UTF8);
+}
 }
 aCurrentRow[12] = new ORowSetValueDecorator(aDescription);
 }
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx 
b/connectivity/source/drivers/firebird/ResultSet.cxx
index e1b5107ae42c..7ae77c607e0d 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -674,8 +674,13 @@ Sequence< sal_Int8 > SAL_CALL 
OResultSet::getBytes(sal_Int32 nColumnIndex)
 Reference< XBlob> xBlob = getBlob(nColumnIndex);
 if (xBlob.is())
 {
-sal_Int32 aBlobLength = static_cast(xBlob->length());
-return xBlob->getBytes(1, aBlobLength);
+const sal_Int64 aBlobLength = xBlob->length();
+if (aBlobLength > SAL_MAX_INT32)
+{
+SAL_WARN("connectivity.firebird", "getBytes can't return " << 
aBlobLength << " bytes but only max " << SAL_MAX_INT32);
+return xBlob->getBytes(1, SAL_MAX_INT32);
+}
+return xBlob->getBytes(1, static_cast(aBlobLength));
 }
 else
 return Sequence< sal_Int8 >();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-11-18 Thread Andrea Gelmini (via logerrit)

 sw/qa/extras/uiwriter/uiwriter3.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 041c811b563f0839181e5339a5b417efd3574ad2
Author: Andrea Gelmini 
AuthorDate: Tue Nov 17 23:56:09 2020 +0100
Commit: Julien Nabet 
CommitDate: Wed Nov 18 19:02:32 2020 +0100

Fix typo

Change-Id: I0331154fa1a56d13cb6200856814393d4d444e5a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106035
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 841b03493bf6..de5892c4b7bf 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -1885,7 +1885,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, AtPageTextBoxCrash)
 
 // The page anchored objects must not have content anchor
 // unless this will lead to crash later, for example on
-// removing the paragraph where it is achored to...
+// removing the paragraph where it is anchored to...
 CPPUNIT_ASSERT_EQUAL(RndStdIds::FLY_AT_PAGE, 
pTxBxFrm->GetAnchor().GetAnchorId());
 CPPUNIT_ASSERT(!pTxBxFrm->GetAnchor().GetContentAnchor());
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-11-18 Thread Andrea Gelmini (via logerrit)

 sc/qa/unit/copy_paste_test.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5aec36e65c8ac19df6d6d745256b7d6708de6c11
Author: Andrea Gelmini 
AuthorDate: Tue Nov 17 23:56:08 2020 +0100
Commit: Julien Nabet 
CommitDate: Wed Nov 18 19:02:01 2020 +0100

Fix typo

Change-Id: I39e78f7b36a32b0b111d5b686730a3aff9665b9a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106034
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx
index 87d8311bdc9b..6c91afad30ea 100644
--- a/sc/qa/unit/copy_paste_test.cxx
+++ b/sc/qa/unit/copy_paste_test.cxx
@@ -841,7 +841,7 @@ void ScCopyPasteTest::tdf113500_autofillMixed()
 
 // compare the results of fill-right / -left with the reference stored in 
the test file
 // this compares the whole area blindly, for specific test cases, check 
the test file
-// do not check the 3. row: a1,b2,a3. It is an other bug to fix
+// do not check the 3. row: a1,b2,a3. It is another bug to fix
 for (int nCol = 1; nCol <= 9; nCol++)
 {
 for (int nRow = 5; nRow <= 6; nRow++)
@@ -857,7 +857,7 @@ void ScCopyPasteTest::tdf113500_autofillMixed()
 }
 
 // compare the results of fill-up / -down
-// do not check the 2. column: 1st,3st. It is an other bug to fix
+// do not check the 2. column: 1st,3st. It is another bug to fix
 for (int nCol = 1; nCol <= 3; nCol+=2)
 {
 for (int nRow = 16; nRow <= 21; nRow++)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

2020-11-18 Thread Tor Lillqvist (via logerrit)

 configure.ac |   10 --
 1 file changed, 10 deletions(-)

New commits:
commit e58213ebfc60d639198ce86723878c6d948d8170
Author: Tor Lillqvist 
AuthorDate: Wed Nov 18 10:33:39 2020 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Nov 18 18:18:40 2020 +0100

AC_CHECK_SIZEOF works fine when cross-compiling, no need to hard-code for 
iOS

Possibly it didn't work when cross-compiling back when that
hard-coding was added.

Change-Id: I763d26ae1922907265636ba0be0757700bfe2a8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106058
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index 250f43054e17..abaceb94ee0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6625,22 +6625,12 @@ dnl 
===
 
 if test "$_os" != "WINNT"; then
 
-if test "$_os" = "iOS"; then
-AC_MSG_CHECKING([iOS setting sizes long, short, int, long long, double, 
voidp])
-ac_cv_sizeof_long=8
-ac_cv_sizeof_short=2
-ac_cv_sizeof_int=4
-ac_cv_sizeof_long_long=8
-ac_cv_sizeof_double=8
-ac_cv_sizeof_voidp=8
-else
 AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long long)
 AC_CHECK_SIZEOF(double)
 AC_CHECK_SIZEOF(void*)
-fi
 
 SAL_TYPES_SIZEOFSHORT=$ac_cv_sizeof_short
 SAL_TYPES_SIZEOFINT=$ac_cv_sizeof_int
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-11-18 Thread Stephan Bergmann (via logerrit)

 winaccessibility/source/UAccCOM/UAccCOM.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1cb9a11e69b8d009d38f1d61f220ccf01312d43e
Author: Stephan Bergmann 
AuthorDate: Wed Nov 18 13:47:50 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 18 18:16:29 2020 +0100

Fix mis-clang-format'ed comment

...making it more obvious again what it appertains to

Change-Id: If96b748b0eeac46364b17e716abcb7a4ac782b72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106056
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/winaccessibility/source/UAccCOM/UAccCOM.cxx 
b/winaccessibility/source/UAccCOM/UAccCOM.cxx
index 403aa86db41c..0a981541cc3a 100644
--- a/winaccessibility/source/UAccCOM/UAccCOM.cxx
+++ b/winaccessibility/source/UAccCOM/UAccCOM.cxx
@@ -33,8 +33,8 @@
 
 #if defined __clang__
 #pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wextra-tokens"
-// "#endif !_MIDL_USE_GUIDDEF_" in midl-generated code
+#pragma clang diagnostic ignored   
\
+"-Wextra-tokens" // "#endif !_MIDL_USE_GUIDDEF_" in midl-generated code
 #endif
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

ESC meeting agenda: 2020-11-19 16:00 Berlin time

2020-11-18 Thread Miklos Vajna


Hi,

The prototype agenda is below, the bug metrics sheet is attached. Extra
items are appreciated either in this document or as a reply to this
mail:

https://nextcloud.documentfoundation.org/apps/files/?dir=/Common2/esc-minutes

You can join using Jitsi here:

https://jitsi.documentfoundation.org/esc

Regards,

Miklos



* Present:
   +

* Completed Action Items:
   + None

* Pending Action Items:
   + Update bug-metrics ODS generator to extend the chart ranges past 
2019-12-10, till e.g. the end of this year (Xisco)
   [ investigated, pending deployment ]

* Release Engineering update (Cloph)
   + 7.1 status:
 + feature freeze: week 47 (2020-11-16) – late features, please ask for it!
   + also beta1 and branch-off
   + late feature: working on hiding of fieldmarks (Michael S)
 + to be able to switch between the command and the result of the field
 + UI / l10n freeze upcoming in mid-December
   + 7.0 status
 + 7.0.4 scheduled normally for 24th November
   + Remotes
   + Android viewer

* Documentation (Olivier)

* UX Update (Heiko)
   + Bugzilla (topicUI) statistics
   246(246) (topicUI) bugs open, 245(245) (needsUXEval) needs to be 
evaluated by the UXteam
   + Updates:
   BZ changes   1 week   1 month   3 months   12 months
added 10(6) 19(4) 51(2)  163(4)
commented 85(36)   300(2)987(11)3882(9)
  removed  0(-1) 3(-1)10(-1)  55(-2)
 resolved 12(2) 45(0)137(7)  452(2)
   + top 10 contributors:
 Heiko Tietze made 227 changes in 1 month, and 2322 changes in 1 year
 Telesto made 78 changes in 1 month, and 600 changes in 1 year
 Foote, V Stuart made 47 changes in 1 month, and 637 changes in 1 year
 Ilmari Lauhakangas made 29 changes in 1 month, and 235 changes in 1 
year
 Kainz, Andreas made 27 changes in 1 month, and 474 changes in 1 year
 Cor Nouws made 23 changes in 1 month, and 110 changes in 1 year
 Dieter Praas made 23 changes in 1 month, and 477 changes in 1 year
 Roman Kuznetsov made 22 changes in 1 month, and 279 changes in 1 year
 Seth Chaiklin made 22 changes in 1 month, and 199 changes in 1 year
 Timur made 13 changes in 1 month, and 261 changes in 1 year

* Crash Reporting (Caolan)
   + 24(+18) import failure, 13(+13) export failures
   + ??? coverity issues
   + Google / ossfuzz: ?? fuzzers active now

* Crash Reporting (Xisco)
   + 7.0.0.369024(+2769)
   + 7.0.1.256077(+4455)
   + 7.0.2.222920(+3263)
   + 7.0.3.110153(+5627)

* Mentoring/easyhack update
 committer...   1 week 1 month 3 months12 months
 open  82(-2) 126(-4) 129(-4)  132(-5)
  reviews 508(116)   1502(174)   4288(64)18473(-32)
   merged 317(88)1203(54)4213(-27)   19111(-84)
abandoned  23(7)   65(2)  235(3)  1055(5)
  own commits 246(38)1021(50)3332(4) 15142(-82)
   review commits  94(0)  413(50)1159(3)  4761(28)
   contributor...   1 week  1 month 3 months12 months
 open   71(47)  97(46)   97(46)  99(46)
  reviews 1060(278)   3242(288)   10146(0)44796(18)
   merged   55(22) 172(38)  414(28)1705(31)
abandoned9(-2)  38(5)92(1)  434(-137)
  own commits   54(4)  225(39)  479(9) 1884(41)
   review commits0(0)0(0) 0(0)0(0)
   + easyHack statistics:
  needsDevEval 9(9)   needsUXEval 3(3)   cleanup_comments 253(253)
  total 299(299)   assigned 15(15)   open 259(259)
   + top 10 contributors:
 Johnny_M made 88 patches in 1 month, and 395 patches in 1 year
 Philipp Hofer made 40 patches in 1 month, and 40 patches in 1 year
 Attila Szűcs made 8 patches in 1 month, and 26 patches in 1 year
 Dante DM made 8 patches in 1 month, and 12 patches in 1 year
 Gleb Popov made 7 patches in 1 month, and 12 patches in 1 year
 Ayhan Yalçınsoy made 6 patches in 1 month, and 29 patches in 1 year
 Szabolcs Toth made 6 patches in 1 month, and 10 patches in 1 year
 Weblate made 4 patches in 1 month, and 77 patches in 1 year
 Dániel Arató made 4 patches in 1 month, and 27 patches in 1 year
 Chris Mayo made 4 patches in 1 month, and 5 patches in 1 year
   + top 10 reviewers:
 Mehrbrodt, Samuel made 110 review comments in 1 month, and 256 in 1 
year
 Olivier Hallot made 110 review comments in 1 month, and 850 in 1 year
 Németh, László made 100 review comments in 1 month, and 690 in 1 year
 Kaganski, Mike made 94 review comments in 1 month, and 798 in 1 year
 Grandin, Noel made 94 review comments in 1 month, and 924 in 1 year
 Michael Stahl made 86

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

2020-11-18 Thread Michael Stahl (via logerrit)

 sw/source/core/crsr/pam.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 53c69d392b1e55267a44994a889688cc80fbbd98
Author: Michael Stahl 
AuthorDate: Wed Nov 18 10:42:45 2020 +0100
Commit: Michael Stahl 
CommitDate: Wed Nov 18 17:00:46 2020 +0100

sw_redlinehide: use correct node in SwPaM::InvalidatePaM()

(oopsie from 93b1adf7442839dcfbf16660b1fbe1139f14a4d0)

Change-Id: Id48ee8686aa9a6268838fe572ccc321482314442
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106046
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index b44a2cb2a73f..55775a358826 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -1121,7 +1121,7 @@ OUString SwPaM::GetText() const
 
 void SwPaM::InvalidatePaM()
 {
-for (SwNodeIndex index = Start()->nNode; index != End()->nNode; ++index)
+for (SwNodeIndex index = Start()->nNode; index <= End()->nNode; ++index)
 {
 if (SwTextNode *const pTextNode = index.GetNode().GetTextNode())
 {
@@ -1133,9 +1133,9 @@ void SwPaM::InvalidatePaM()
 nStart,
 index == End()->nNode
 ? End()->nContent.GetIndex() - nStart
-: End()->nNode.GetNode().GetTextNode()->Len() - nStart,
+: pTextNode->Len() - nStart,
 0);
-pTextNode->TriggerNodeUpdate(sw::LegacyModifyHint(nullptr, 
&aHint));
+pTextNode->TriggerNodeUpdate(sw::LegacyModifyHint(&aHint, &aHint));
 }
 // other node types not invalidated
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-11-18 Thread Mike Kaganski (via logerrit)

 sw/source/core/layout/legacyitem.cxx |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 179812eff88b85f34cb85eaa9b9ad027cb6a979c
Author: Mike Kaganski 
AuthorDate: Wed Nov 18 08:53:01 2020 +0100
Commit: Mike Kaganski 
CommitDate: Wed Nov 18 16:47:09 2020 +0100

This doesn't depend on SAL_TYPES_SIZEOFLONG anymore

Change-Id: I0848a30073613df32da9321def0662272f03f61b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105996
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sw/source/core/layout/legacyitem.cxx 
b/sw/source/core/layout/legacyitem.cxx
index 932afa918550..281b71d83bc7 100644
--- a/sw/source/core/layout/legacyitem.cxx
+++ b/sw/source/core/layout/legacyitem.cxx
@@ -66,11 +66,10 @@ namespace legacy::SwFormatVert
 
 SvStream& Store(const SwFormatVertOrient& rItem, SvStream& rStrm, 
sal_uInt16)
 {
-#if SAL_TYPES_SIZEOFLONG == 8
-rStrm.WriteInt64(rItem.GetPos());
-#else
-rStrm.WriteInt32(rItem.GetPos());
-#endif
+if constexpr(sizeof(rItem.GetPos()) >= 8)
+rStrm.WriteInt64(rItem.GetPos());
+else
+rStrm.WriteInt32(rItem.GetPos());
 
rStrm.WriteInt16(rItem.GetVertOrient()).WriteInt16(rItem.GetRelationOrient());
 return rStrm;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-11-18 Thread Caolán McNamara (via logerrit)

 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1f904541c780207ccb37d1ef41f8b897e50c58cf
Author: Caolán McNamara 
AuthorDate: Wed Nov 18 11:22:42 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Nov 18 16:41:37 2020 +0100

tdf#137397 Faulty Height value in Position and Size content panel

Change-Id: Ie7439371cb2d216ca1d95f21db44d203cccd9ea8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106053
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 47a7d405c6e5..aac8619a448e 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -1057,9 +1057,9 @@ void PosSizePropertyPanel::SetPosSizeMinMax()
 
 double fMaxWidth = maWorkArea.getWidth() - (maRect.getWidth() - fLeft);
 double fMaxHeight = maWorkArea.getHeight() - (maRect.getHeight() - fTop);
-mxMtrWidth->set_max(basegfx::fround64(fMaxWidth*100), FieldUnit::NONE);
+mxMtrWidth->set_max(std::min(INT_MAX, 
basegfx::fround64(fMaxWidth*100)), FieldUnit::NONE);
 limitWidth(*mxMtrWidth);
-mxMtrHeight->set_max(basegfx::fround64(fMaxHeight*100), FieldUnit::NONE);
+mxMtrHeight->set_max(std::min(INT_MAX, 
basegfx::fround64(fMaxHeight*100)), FieldUnit::NONE);
 limitWidth(*mxMtrHeight);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-11-18 Thread Stephan Bergmann (via logerrit)

 vcl/inc/graphic/Manager.hxx|3 +--
 vcl/source/graphic/Manager.cxx |   17 -
 2 files changed, 9 insertions(+), 11 deletions(-)

New commits:
commit 5ec0eb98ce870b5da5ef1711b93b09edf36170bd
Author: Stephan Bergmann 
AuthorDate: Wed Nov 18 11:13:40 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 18 16:23:44 2020 +0100

Remove unused Manager::registerGraphic rsContext parameter

unused ever since the code was introduced in
a2b53fece14f745853bcfe1a300c3dceb580e148 "vcl: Add a internal (memory) 
manager
for Graphic objects"

Change-Id: I0e16983e7f34cded77435ae12d8adf0c3eee5f11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106048
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/vcl/inc/graphic/Manager.hxx b/vcl/inc/graphic/Manager.hxx
index 51b68d95c4c4..bff72780cbd7 100644
--- a/vcl/inc/graphic/Manager.hxx
+++ b/vcl/inc/graphic/Manager.hxx
@@ -40,8 +40,7 @@ private:
 
 Manager();
 
-void registerGraphic(const std::shared_ptr& rImpGraphic,
- std::u16string_view rsContext);
+void registerGraphic(const std::shared_ptr& rImpGraphic);
 
 DECL_LINK(SwapOutTimerHandler, Timer*, void);
 
diff --git a/vcl/source/graphic/Manager.cxx b/vcl/source/graphic/Manager.cxx
index 6bcd709480e8..88e1f6e622df 100644
--- a/vcl/source/graphic/Manager.cxx
+++ b/vcl/source/graphic/Manager.cxx
@@ -124,8 +124,7 @@ IMPL_LINK(Manager, SwapOutTimerHandler, Timer*, pTimer, 
void)
 pTimer->Start();
 }
 
-void Manager::registerGraphic(const std::shared_ptr& pImpGraphic,
-  std::u16string_view /*rsContext*/)
+void Manager::registerGraphic(const std::shared_ptr& pImpGraphic)
 {
 std::scoped_lock aGuard(maMutex);
 
@@ -167,28 +166,28 @@ void Manager::unregisterGraphic(ImpGraphic* pImpGraphic)
 std::shared_ptr Manager::copy(std::shared_ptr const& 
rImpGraphicPtr)
 {
 auto pReturn = std::make_shared(*rImpGraphicPtr);
-registerGraphic(pReturn, u"Copy");
+registerGraphic(pReturn);
 return pReturn;
 }
 
 std::shared_ptr Manager::newInstance()
 {
 auto pReturn = std::make_shared();
-registerGraphic(pReturn, u"Empty");
+registerGraphic(pReturn);
 return pReturn;
 }
 
 std::shared_ptr Manager::newInstance(const BitmapEx& rBitmapEx)
 {
 auto pReturn = std::make_shared(rBitmapEx);
-registerGraphic(pReturn, u"BitmapEx");
+registerGraphic(pReturn);
 return pReturn;
 }
 
 std::shared_ptr Manager::newInstance(const Animation& rAnimation)
 {
 auto pReturn = std::make_shared(rAnimation);
-registerGraphic(pReturn, u"Animation");
+registerGraphic(pReturn);
 return pReturn;
 }
 
@@ -196,21 +195,21 @@ std::shared_ptr
 Manager::newInstance(const std::shared_ptr& 
rVectorGraphicDataPtr)
 {
 auto pReturn = std::make_shared(rVectorGraphicDataPtr);
-registerGraphic(pReturn, u"VectorGraphic");
+registerGraphic(pReturn);
 return pReturn;
 }
 
 std::shared_ptr Manager::newInstance(const GDIMetaFile& rMetaFile)
 {
 auto pReturn = std::make_shared(rMetaFile);
-registerGraphic(pReturn, u"Metafile");
+registerGraphic(pReturn);
 return pReturn;
 }
 
 std::shared_ptr Manager::newInstance(const GraphicExternalLink& 
rGraphicLink)
 {
 auto pReturn = std::make_shared(rGraphicLink);
-registerGraphic(pReturn, u"GraphicExternalLink");
+registerGraphic(pReturn);
 return pReturn;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sc/uiconfig

2020-11-18 Thread andreas kainz (via logerrit)

 sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui |   44 +
 1 file changed, 17 insertions(+), 27 deletions(-)

New commits:
commit 6d9cc23a057ceccae1398e0c89596c5599404666
Author: andreas kainz 
AuthorDate: Wed Sep 9 14:47:26 2020 +0200
Commit: Xisco Fauli 
CommitDate: Wed Nov 18 15:47:29 2020 +0100

tdf#128135 update Pivot Table Layout to fit minimum height

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102319
Tested-by: Jenkins
Reviewed-by: Andreas Kainz 
(cherry picked from commit d435997f446941adaa76fe4b253946cd08861ffd)

Change-Id: I450625ccac06aec54371ede6bf9b50a221e1ba8f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104936
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 
(cherry picked from commit bdc19e66f2bc1455b0cf3aff5f520e94365aba73)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106002
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui 
b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
index 4ecf7859557f..076564d1c014 100644
--- a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
+++ b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui
@@ -49,7 +49,7 @@
 0
 0
 dialog
-
+
   
 
 
@@ -128,7 +128,6 @@
 False
 True
 True
-6
 6
 
   
@@ -212,7 +211,7 @@
   
   
 1
-1
+0
   
 
 
@@ -289,7 +288,7 @@
   
   
 1
-2
+1
   
 
 
@@ -364,7 +363,7 @@
   
   
 0
-2
+1
   
 
 
@@ -442,12 +441,8 @@
   
 0
 0
-2
   
 
-
-  
-
   
   
 True
@@ -533,7 +528,7 @@
 
   
   
-True
+False
 True
 0
   
@@ -564,15 +559,15 @@
 False
 12
 6
-6
+3
 12
+True
 
   
 Ignore empty 
rows
 True
 True
 False
-True
 True
 0
 True
@@ -588,7 +583,6 @@
 True
 True
 False
-True
 True
 0
 True
@@ -604,7 +598,6 @@
 True
 True
 False
-True
 True
 0
 True
@@ -620,7 +613,6 @@
 True
 True
 False
-True
 True
 0
 True
@@ -636,7 +628,6 @@
 True
 True
 False
-True
 True
 0
 True
@@ -652,7 +643,6 @@
 True
 True
 False
-True
 True
 0
 True
@@ -693,7 +683,6 @@
 12
 6
 True
-True
 6
 12
 
@@ -701,7 +690,6 @@
 True
 False
 True
-True
 0
 none
 
@@ -715,9 +703,8 @@
 True
 False
 True
-True
-6
-12
+3
+6

[Libreoffice-commits] core.git: sal/rtl store/source

2020-11-18 Thread Mike Kaganski (via logerrit)

 sal/rtl/alloc_impl.hxx|   22 --
 store/source/storcach.cxx |   11 ++-
 2 files changed, 18 insertions(+), 15 deletions(-)

New commits:
commit d9af7ac4d697be1d520ea751eb7f8fc77a2ca03e
Author: Mike Kaganski 
AuthorDate: Wed Nov 18 10:24:08 2020 +0100
Commit: Mike Kaganski 
CommitDate: Wed Nov 18 15:18:25 2020 +0100

Replace #if with if constexpr()

This allows to test the actual type, not something unrelated

Change-Id: I82d0714f6355fc5ae7bd3205af3472a43f1f1051
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105998
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sal/rtl/alloc_impl.hxx b/sal/rtl/alloc_impl.hxx
index bdacba04a29d..29c24cc998d7 100644
--- a/sal/rtl/alloc_impl.hxx
+++ b/sal/rtl/alloc_impl.hxx
@@ -60,13 +60,14 @@ static inline unsigned int highbit(sal_Size n)
 
   if (n == 0)
 return 0;
-#if SAL_TYPES_SIZEOFLONG == 8
-  if (n & 0xul)
+  if constexpr (sizeof(n) >= 8)
   {
-k |= 32;
-n >>= 32;
+if (n & 0x)
+{
+  k |= 32;
+  n >>= 32;
+}
   }
-#endif
   if (n & 0x)
   {
 k |= 16;
@@ -103,13 +104,14 @@ static inline unsigned int lowbit(sal_Size n)
   if (n == 0)
 return 0;
 
-#if SAL_TYPES_SIZEOFLONG == 8
-  if (!(n & 0x))
+  if constexpr (sizeof(n) >= 8)
   {
-k |= 32;
-n >>= 32;
+if (!(n & 0x))
+{
+  k |= 32;
+  n >>= 32;
+}
   }
-#endif
 
   if (!(n & 0x))
   {
diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx
index c3db00d21f84..cefd963813a6 100644
--- a/store/source/storcach.cxx
+++ b/store/source/storcach.cxx
@@ -136,13 +136,14 @@ static int highbit(std::size_t n)
 
 if (n == 0)
 return 0;
-#if SAL_TYPES_SIZEOFLONG == 8
-if (n & 0xul)
+if constexpr (sizeof(n) == 8)
 {
-k |= 32;
-n >>= 32;
+if (n & 0x)
+{
+k |= 32;
+n >>= 32;
+}
 }
-#endif
 if (n & 0x)
 {
 k |= 16;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-11-18 Thread Caolán McNamara (via logerrit)

 dbaccess/source/core/dataaccess/documenteventnotifier.cxx |   22 --
 1 file changed, 13 insertions(+), 9 deletions(-)

New commits:
commit 20bc83ee9e63c0c099ad9962ecc483ec5af88991
Author: Caolán McNamara 
AuthorDate: Fri Oct 2 17:07:57 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Nov 18 15:11:48 2020 +0100

crashtesting: intermittent failure on tdf118824-1.odb

this thread has been in the wars before:

commit 490f83d4807a4223bae61d34913e5bd2bf952f3a
Date:   Fri Mar 9 09:12:54 2012 +0100

fdo#47021: the naive join attempt leads to deadlock

commit a2095b151409f0fb57aa8feaa4c6282f84040245
Date:   Tue Jul 26 23:42:36 2016 +0200

comphelper,vcl: let DeInitVCL() join some AsyncEventNotifier threads

current backtrace is...

Thread 1 (Thread 0x7fb9d9af6700 (LWP 32393)):
0  0x7fb9eff83705 in  () at /lib/x86_64-linux-gnu/libstdc++.so.6
1  0x7fb9eff8375e in  () at /lib/x86_64-linux-gnu/libstdc++.so.6
2  0x7fb9dcc308df in 
__gnu_debug::_Safe_iterator_base::_Safe_iterator_base(__gnu_debug::_Safe_sequence_base
 const*, bool) (__constant=false, __seq=, this=0x7fb9d9af4338) 
at /usr/include/c++/8/debug/safe_base.h:91
3  0x7fb9dcc308df in 
__gnu_debug::_Safe_iterator > >, 
std::__debug::map, 
std::less, std::allocator > > > 
>::_Safe_iterator(std::_Rb_tree_iterator > > const&, 
__gnu_debug::_Safe_sequence_base const*) (__seq=, __i=..., 
this=0x7fb9d9af4330) at /usr/include/c++/8/debug/safe_iterator.h:130
4  0x7fb9dcc308df in std::__debug::map, 
std::less, std::allocator > > 
>::end() (this=) at /usr/include/c++/8/debug/map.h:181
5  0x7fb9dcc308df in dbaccess::DocumentEvents::hasByName(rtl::OUString 
const&) (this=0x559229945690, Name="OnLoad") at 
/home/buildslave/source/libo-core/dbaccess/source/core/dataaccess/documentevents.cxx:199
6  0x7fb9dcc2a4de in 
dbaccess::DocumentEventExecutor::documentEventOccured(com::sun::star::document::DocumentEvent
 const&) (this=0x559229981050, Event=...) at 
/home/buildslave/source/libo-core/include/com/sun/star/uno/Reference.h:380
   aScriptDescriptor = {m_pImpl = std::unique_ptr = {get() = 0x5592297d7700}}
   bScriptAssigned = 
   bDispatchScriptURL = 
   bNonEmptyScript = 
   sEventType = 
"\004\000æ™¦æ™¦îº°â¦¾å–’\000\000\000\000\000ä„¨\xdce2ç¾¹\000Â°â§˜å–’\000èŒâ§’å–’\000Â°â§˜å–’\000\001æ™¦æ™¦æ™¦ä…¨\xdce2ç¾¹\000ä†
 \xdce2ç¾¹\000ä‰ 
\xdce2ç¾¹\000äŠ¨\xdce2ç¾¹\000äŒ€\xdce2ç¾¹\000äŒ¸\xdce2ç¾¹\000ä¸\xdce2ç¾¹\000äŽ¸\xdce2ç¾¹\000ä¸\xdce2ç¾¹\000ä¸\xdce2ç¾¹\000ä‘°\xdce2ç¾¹\000ä’
 \xdce2ç¾¹\000ä“˜\xdce2ç¾¹\000ä”ˆ\xdce2ç¾¹\000ä• \xdce2ç¾¹\000ä– 
\xdce2ç¾¹\000ä—\xdce2ç¾¹\000ä˜€\xdce2ç¾¹\000ä˜°\xdce2ç¾¹\000ä™¨\xdce2ç¾¹\000äš¨\xdce2ç¾¹\000ä›
 
\xdce2ç¾¹\000äœ˜\xdce2ç¾¹\000ä\xdce2ç¾¹\000\000\000\000\000\000\000\000\000Â°â§˜å–’\000\000æ™¦æ™¦æ™¦\000\000\000\000Â°â§˜å–’\000\000æ™¦æ™¦æ™¦\000\000\000\000Â°â§˜å–’\000\000æ™¦æ™¦æ™¦åšâ¦”å–’\000áâ¦˜å–’\000ë‹°â¦¨å–’",
 
 '\000' , "\001\000æ™¦æ™¦\000\000\000\000"...
   sScript = 
"\004\000æ™¦æ™¦îº°â¦¾å–’\000\000\000\000\000ä„¨\xdce2ç¾¹\000Â°â§˜å–’\000èŒâ§’å–’\000Â°â§˜å–’\000\001æ™¦æ™¦æ™¦ä…¨\xdce2ç¾¹\000ä†
 \xdce2ç¾¹\000ä‰ 
\xdce2ç¾¹\000äŠ¨\xdce2ç¾¹\000äŒ€\xdce2ç¾¹\000äŒ¸\xdce2ç¾¹\000ä¸\xdce2ç¾¹\000äŽ¸\xdce2ç¾¹\000ä¸\xdce2ç¾¹\000ä¸\xdce2ç¾¹\000ä‘°\xdce2ç¾¹\000ä’
 \xdce2ç¾¹\000ä“˜\xdce2ç¾¹\000ä”ˆ\xdce2ç¾¹\000ä• \xdce2ç¾¹\000ä– 
\xdce2ç¾¹\000ä—\xdce2ç¾¹\000ä˜€\xdce2ç¾¹\000ä˜°\xdce2ç¾¹\000ä™¨\xdce2ç¾¹\000äš¨\xdce2ç¾¹\000ä›
 
\xdce2ç¾¹\000äœ˜\xdce2ç¾¹\000ä\xdce2ç¾¹\000\000\000\000\000\000\000\000\000Â°â§˜å–’\000\000æ™¦æ™¦æ™¦\000\000\000\000Â°â§˜å–’\000\000æ™¦æ™¦æ™¦\000\000\000\000Â°â§˜å–’\000\000æ™¦æ™¦æ™¦åšâ¦”å–’\000áâ¦˜å–’\000ë‹°â¦¨å–’",
 '\0
 00' , "\001\000æ™¦æ™¦\000\000\000\000"...
   xEventsSupplier = uno::Reference to (class 
dbaccess::ODatabaseDocument *) 0x559229d80188
   xDocument = uno::Reference to (class dbaccess::ODatabaseDocument *) 
0x559229d80108
   __func__ = "documentEventOccured"
7  0x7fb9dcc2b3cb in 
comphelper::OInterfaceContainerHelper2::NotifySingleListener::operator()(com::sun::star::uno::Reference
 const&) const (listener=#8  0x7fb9dcc2b3cb in 
comphelper::OInterfaceContainerHelper2::forEach 
>(comphelper::OInterfaceContainerHelper2::NotifySingleListener const&) (func=..., 
this=0x559229a8b340) at 
/home/buildslave/source/libo-core/include/comphelper/interfacecontainer2.hxx:266
   iter = {rCont = @0x559229a8b340, aData = {pAsVector = 
0x559229b71540, pAsInterface = 0x559229b71540}, nRemain = 0, bIsList = true}
   __func__ = "impl_notifyEvent_nothrow"
9  0x7fb9dcc2b3cb in 
comphelper::OInterfaceContainerHelper2::notifyEach(void 
(com::sun::star::document::XDocumentEventListener::*)(com::sun::star::document::DocumentEvent
 const&), com::sun::star::document::DocumentEvent const&) (Event=..., 
NotificationMethod=, this=0x559229a8b340) at 
/home/buildslave/source/libo-core/include

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - include/vcl xmlsecurity/qa xmlsecurity/source

2020-11-18 Thread Miklos Vajna (via logerrit)

 include/vcl/filter/PDFiumLibrary.hxx  |2 
 xmlsecurity/qa/unit/pdfsigning/data/bad-cert-p3-stamp.pdf |binary
 xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx |   16 +++
 xmlsecurity/source/pdfio/pdfdocument.cxx  |   64 --
 4 files changed, 77 insertions(+), 5 deletions(-)

New commits:
commit fcab45e0e22f4cf46e71856dba7ae5abd6f99bc5
Author: Miklos Vajna 
AuthorDate: Wed Nov 4 21:39:04 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Nov 18 15:08:19 2020 +0100

xmlsecurity: reject a few dangerous annotation types during pdf sig verify

(cherry picked from commit f231dacde9df1c4aa5f4e0970535c4f4093364a7)

Conflicts:
xmlsecurity/source/helper/pdfsignaturehelper.cxx

Change-Id: I950b49a6e7181639daf27348ddfa0f36586baa65
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105926
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/include/vcl/filter/PDFiumLibrary.hxx 
b/include/vcl/filter/PDFiumLibrary.hxx
index 3e2851d21e0e..2d93710ec5f8 100644
--- a/include/vcl/filter/PDFiumLibrary.hxx
+++ b/include/vcl/filter/PDFiumLibrary.hxx
@@ -57,6 +57,8 @@ public:
 FPDF_ClosePage(mpPage);
 }
 
+FPDF_PAGE getPointer() { return mpPage; }
+
 /// Get bitmap checksum of the page, without annotations/commenting.
 BitmapChecksum getChecksum(int nMDPPerm);
 };
diff --git a/xmlsecurity/qa/unit/pdfsigning/data/bad-cert-p3-stamp.pdf 
b/xmlsecurity/qa/unit/pdfsigning/data/bad-cert-p3-stamp.pdf
new file mode 100644
index ..b30f5b03867c
Binary files /dev/null and 
b/xmlsecurity/qa/unit/pdfsigning/data/bad-cert-p3-stamp.pdf differ
diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx 
b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
index 59d86637c9b3..7659fe9485c5 100644
--- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
+++ b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
@@ -423,6 +423,22 @@ CPPUNIT_TEST_FIXTURE(PDFSigningTest, testBadCertP1)
  rInformation.nStatus);
 }
 
+CPPUNIT_TEST_FIXTURE(PDFSigningTest, testBadCertP3Stamp)
+{
+std::vector aInfos
+= verify(m_directories.getURLFromSrc(DATA_DIRECTORY) + 
"bad-cert-p3-stamp.pdf", 1,
+ /*rExpectedSubFilter=*/OString());
+CPPUNIT_ASSERT(!aInfos.empty());
+SignatureInformation& rInformation = aInfos[0];
+
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 0 (SecurityOperationStatus_UNKNOWN)
+// - Actual  : 1 (SecurityOperationStatus_OPERATION_SUCCEEDED)
+// i.e. adding a stamp annotation was not considered as a bad modification.
+
CPPUNIT_ASSERT_EQUAL(xml::crypto::SecurityOperationStatus::SecurityOperationStatus_UNKNOWN,
+ rInformation.nStatus);
+}
+
 /// Test writing a PAdES signature.
 CPPUNIT_TEST_FIXTURE(PDFSigningTest, testSigningCertificateAttribute)
 {
diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx 
b/xmlsecurity/source/pdfio/pdfdocument.cxx
index 3744b7b9290b..35c8c07ced70 100644
--- a/xmlsecurity/source/pdfio/pdfdocument.cxx
+++ b/xmlsecurity/source/pdfio/pdfdocument.cxx
@@ -24,6 +24,11 @@
 #include 
 #include 
 #include 
+#include 
+
+#if HAVE_FEATURE_PDFIUM
+#include 
+#endif
 
 using namespace com::sun::star;
 
@@ -139,8 +144,30 @@ bool IsCompleteSignature(SvStream& rStream, 
vcl::filter::PDFDocument& rDocument,
 }
 
 #if HAVE_FEATURE_PDFIUM
+
+/**
+ * Contains checksums of a PDF page, which is rendered without annotations. It 
also contains
+ * the geometry of a few dangerous annotation types.
+ */
+struct PageChecksum
+{
+BitmapChecksum m_nPageContent;
+std::vector m_aAnnotations;
+bool operator==(const PageChecksum& rChecksum) const;
+};
+
+bool PageChecksum::operator==(const PageChecksum& rChecksum) const
+{
+if (m_nPageContent != rChecksum.m_nPageContent)
+{
+return false;
+}
+
+return m_aAnnotations == rChecksum.m_aAnnotations;
+}
+
 /// Collects the checksum of each page of one version of the PDF.
-void AnalyizeSignatureStream(SvMemoryStream& rStream, 
std::vector& rPageChecksums,
+void AnalyizeSignatureStream(SvMemoryStream& rStream, 
std::vector& rPageChecksums,
  int nMDPPerm)
 {
 auto pPdfium = vcl::pdf::PDFiumLibrary::get();
@@ -156,8 +183,35 @@ void AnalyizeSignatureStream(SvMemoryStream& rStream, 
std::vectorgetChecksum(nMDPPerm);
-rPageChecksums.push_back(nPageChecksum);
+PageChecksum aPageChecksum;
+aPageChecksum.m_nPageContent = pPdfPage->getChecksum(nMDPPerm);
+for (int i = 0; i < FPDFPage_GetAnnotCount(pPdfPage->getPointer()); 
++i)
+{
+FPDF_ANNOTATION pAnnotation = 
FPDFPage_GetAnnot(pPdfPage->getPointer(), i);
+int nType = FPDFAnnot_GetSubtype(pAnnotation);
+switch (nType)
+{
+case FPDF_ANNOT_UNKNOWN:
+case FPDF_ANNOT_FREETEXT:
+

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

2020-11-18 Thread Caolán McNamara (via logerrit)

 vcl/source/app/salvtables.cxx |   24 +++-
 1 file changed, 23 insertions(+), 1 deletion(-)

New commits:
commit 7f5a87c501ba1291a93bf330cc1a1de19ea1d89c
Author: Caolán McNamara 
AuthorDate: Wed Nov 18 10:00:51 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Nov 18 15:07:22 2020 +0100

tdf#138271 send value-changed on FormattedSpinButton losing focus

Change-Id: Iaa6882f41ee756b0645818694f6942d90243ba13
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106049
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index caf7a5f5fafd..e866997880b8 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -5486,6 +5486,10 @@ class SalInstanceFormattedSpinButton : public 
SalInstanceEntry,
 private:
 VclPtr m_xButton;
 weld::EntryFormatter* m_pFormatter;
+Link m_aLoseFocusHdl;
+
+DECL_LINK(UpDownHdl, SpinField&, void);
+DECL_LINK(LoseFocusHdl, Control&, void);
 
 public:
 SalInstanceFormattedSpinButton(FormattedField* pButton, 
SalInstanceBuilder* pBuilder,
@@ -5494,6 +5498,9 @@ public:
 , m_xButton(pButton)
 , m_pFormatter(nullptr)
 {
+m_xButton->SetUpHdl(LINK(this, SalInstanceFormattedSpinButton, 
UpDownHdl));
+m_xButton->SetDownHdl(LINK(this, SalInstanceFormattedSpinButton, 
UpDownHdl));
+m_xButton->SetLoseFocusHdl(LINK(this, SalInstanceFormattedSpinButton, 
LoseFocusHdl));
 }
 
 virtual void set_text(const OUString& rText) override
@@ -5517,7 +5524,7 @@ public:
 {
 if (!m_pFormatter) // once a formatter is set, it takes over 
"focus-out"
 {
-SalInstanceEntry::connect_focus_out(rLink);
+m_aLoseFocusHdl = rLink;
 return;
 }
 m_pFormatter->connect_focus_out(rLink);
@@ -5548,8 +,23 @@ public:
 {
 return m_xButton->GetFormatter();
 }
+
+virtual ~SalInstanceFormattedSpinButton() override
+{
+m_xButton->SetLoseFocusHdl(Link());
+m_xButton->SetDownHdl(Link());
+m_xButton->SetUpHdl(Link());
+}
 };
 
+IMPL_LINK_NOARG(SalInstanceFormattedSpinButton, UpDownHdl, SpinField&, void) { 
signal_value_changed(); }
+
+IMPL_LINK_NOARG(SalInstanceFormattedSpinButton, LoseFocusHdl, Control&, void)
+{
+signal_value_changed();
+m_aLoseFocusHdl.Call(*this);
+}
+
 }
 
 SalInstanceLabel::SalInstanceLabel(Control* pLabel, SalInstanceBuilder* 
pBuilder,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-11-18 Thread Caolán McNamara (via logerrit)

 extensions/source/propctrlr/usercontrol.hxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 2a9e6792b85bd7f747f74da62d575720469485f3
Author: Caolán McNamara 
AuthorDate: Wed Nov 18 10:48:24 2020 +
Commit: Caolán McNamara 
CommitDate: Wed Nov 18 15:06:18 2020 +0100

Resolves: tdf#138271 flag formatted spinbuttons as modified on any entry 
change

formattedspinbuttons should send value-changed on losing focus, but this
is sufficient for this use case and safe to backport

Change-Id: Ie0cf5ab22152d95169dc5579423a4173be678a33
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106051
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/extensions/source/propctrlr/usercontrol.hxx 
b/extensions/source/propctrlr/usercontrol.hxx
index 002c209ce7b1..facc2621707f 100644
--- a/extensions/source/propctrlr/usercontrol.hxx
+++ b/extensions/source/propctrlr/usercontrol.hxx
@@ -58,6 +58,7 @@ namespace pcr
 m_xEntry->connect_focus_in( LINK( this, 
CommonBehaviourControlHelper, GetFocusHdl ) );
 m_xEntry->connect_focus_out( LINK( this, 
CommonBehaviourControlHelper, LoseFocusHdl ) );
 m_xSpinButton->connect_value_changed(LINK(this, 
CommonBehaviourControlHelper, FormattedModifiedHdl));
+m_xSpinButton->connect_changed(LINK(this, 
CommonBehaviourControlHelper, EditModifiedHdl));
 }
 
 void SetFormatSupplier(const SvNumberFormatsSupplierObj* pSupplier);
@@ -105,6 +106,7 @@ namespace pcr
 {
 OFormattedNumericControl_Base::SetModifyHandler();
 getTypedControlWindow()->connect_value_changed(LINK(this, 
CommonBehaviourControlHelper, FormattedModifiedHdl));
+getTypedControlWindow()->connect_changed(LINK(this, 
CommonBehaviourControlHelper, EditModifiedHdl));
 }
 
 virtual weld::Widget* getWidget() override { return 
getTypedControlWindow(); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-11-18 Thread Martin van Zijl (via logerrit)

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |8 
 sc/inc/inputopt.hxx  |3 +
 sc/inc/sc.hrc|2 +
 sc/source/core/tool/inputopt.cxx |   10 -
 sc/source/ui/app/scmod.cxx   |   10 +
 sc/source/ui/inc/tpview.hxx  |1 
 sc/source/ui/optdlg/tpview.cxx   |   11 +
 sc/source/ui/view/gridwin.cxx|6 ++-
 sc/uiconfig/scalc/ui/scgeneralpage.ui|   30 +++
 9 files changed, 72 insertions(+), 9 deletions(-)

New commits:
commit a6e1647612cc3d39e8a6e44c9365ccecb1da2fe6
Author: Martin van Zijl 
AuthorDate: Sat Jun 6 15:57:54 2020 +1200
Commit: Eike Rathke 
CommitDate: Wed Nov 18 13:55:59 2020 +0100

tdf#34686 calc: add option to disable paste with enter key

Change-Id: Ie20a8931a16f6609ac5be23032a0b2e3a7ad1784
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95627
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 0762279bf3db..5b3a2043e63b 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -754,6 +754,14 @@
 
 false
   
+  
+
+
+  Press Enter to paste and clear clipboard
+  Press Enter to paste and clear clipboard
+
+true
+  
   
 
 
diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx
index 4cff5d14cf48..52811ee93c5c 100644
--- a/sc/inc/inputopt.hxx
+++ b/sc/inc/inputopt.hxx
@@ -38,6 +38,7 @@ private:
 boolbTextWysiwyg;
 boolbReplCellsWarn;
 boolbLegacyCellSelection;
+boolbEnterPasteMode;
 
 public:
 ScInputOptions();
@@ -68,6 +69,8 @@ public:
 boolGetReplaceCellsWarn() const { return bReplCellsWarn; }
 voidSetLegacyCellSelection(bool bSet)   { bLegacyCellSelection = 
bSet; }
 boolGetLegacyCellSelection() const  { return 
bLegacyCellSelection; }
+voidSetEnterPasteMode(bool bSet){ bEnterPasteMode = bSet; }
+boolGetEnterPasteMode() const   { return bEnterPasteMode; }
 };
 
 // CfgItem for input options
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index b493545ec810..e80825624dea 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -113,6 +113,8 @@
 // misc:
 #define SID_LINKS   (SC_VIEW_START + 60)
 #define SID_INSERT_SMATH(SC_VIEW_START + 63)
+// Put this here since all available slots for "SC_INPUT" are taken
+#define SID_SC_INPUT_ENTER_PASTE_MODE (SC_VIEW_START + 64)
 #define SID_MIRROR_VERTICAL (SC_VIEW_START + 65)
 #define SID_MIRROR_HORIZONTAL   (SC_VIEW_START + 66)
 #define SID_CELL_FORMAT_RESET   (SC_VIEW_START + 67)
diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx
index 0ceefd1fa9f1..380c4391f307 100644
--- a/sc/source/core/tool/inputopt.cxx
+++ b/sc/source/core/tool/inputopt.cxx
@@ -69,6 +69,7 @@ void ScInputOptions::SetDefaults()
 #define SCINPUTOPT_TEXTWYSIWYG 9
 #define SCINPUTOPT_REPLCELLSWARN  10
 #define SCINPUTOPT_LEGACY_CELL_SELECTION  11
+#define SCINPUTOPT_ENTER_PASTE_MODE   12
 
 Sequence ScInputCfg::GetPropertyNames()
 {
@@ -83,7 +84,8 @@ Sequence ScInputCfg::GetPropertyNames()
 "UseTabCol",// SCINPUTOPT_USETABCOL
 "UsePrinterMetrics",// SCINPUTOPT_TEXTWYSIWYG
 "ReplaceCellsWarning",  // SCINPUTOPT_REPLCELLSWARN
-"LegacyCellSelection"}; // SCINPUTOPT_LEGACY_CELL_SELECTION
+"LegacyCellSelection",  // SCINPUTOPT_LEGACY_CELL_SELECTION
+"EnterPasteMode"};  // SCINPUTOPT_ENTER_PASTE_MODE
 }
 
 ScInputCfg::ScInputCfg() :
@@ -142,6 +144,9 @@ ScInputCfg::ScInputCfg() :
 case SCINPUTOPT_LEGACY_CELL_SELECTION:
 SetLegacyCellSelection( 
ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
 break;
+case SCINPUTOPT_ENTER_PASTE_MODE:
+SetEnterPasteMode( ScUnoHelpFunctions::GetBoolFromAny( 
pValues[nProp] ) );
+break;
 }
 }
 }
@@ -193,6 +198,9 @@ void ScInputCfg::ImplCommit()
 case SCINPUTOPT_LEGACY_CELL_SELECTION:
 pValues[nProp] <<= GetLegacyCellSelection();
 break;
+case SCINPUTOPT_ENTER_PASTE_MODE:
+pValues[nProp] <<= GetEnterPasteMode();
+break;
 }
 }
 PutProperties(aNames, aValues);
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index d39c9df9a683..f0a992e774bf 100644
--- a/sc/source/ui/app/scmod.cxx

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

2020-11-18 Thread Stephan Bergmann (via logerrit)

 xmloff/source/table/XMLTableImport.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 87946f2cfb2626d648ca4df2b0a5d026626e24f5
Author: Stephan Bergmann 
AuthorDate: Wed Nov 18 11:52:15 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 18 13:53:12 2020 +0100

Remove unused XMLTableImportContext::ImportColumn nPrefix, rLocalName params

unused since f3797630be6ab21179e2496cc56a6d41f0ee8144 "return nullptr from
CreateChildContext methods in subclasses"

Change-Id: I5c4c820500b98444c9f24641d6e45ea9b830ec3b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106052
Reviewed-by: Noel Grandin 
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins

diff --git a/xmloff/source/table/XMLTableImport.cxx 
b/xmloff/source/table/XMLTableImport.cxx
index a40af746ab73..8eb7a22f7be4 100644
--- a/xmloff/source/table/XMLTableImport.cxx
+++ b/xmloff/source/table/XMLTableImport.cxx
@@ -104,7 +104,7 @@ public:
 
 void InitColumns();
 
-SvXMLImportContextRef ImportColumn( sal_uInt16 nPrefix, 
std::u16string_view rLocalName, const Reference< XAttributeList >& xAttrList );
+SvXMLImportContextRef ImportColumn( const Reference< XAttributeList >& 
xAttrList );
 SvXMLImportContext * ImportRow( sal_uInt16 nPrefix, const OUString& 
rLocalName, const Reference< XAttributeList >& xAttrList );
 SvXMLImportContextRef ImportCell( sal_uInt16 nPrefix, const OUString& 
rLocalName, const Reference< XAttributeList >& xAttrList );
 
@@ -368,7 +368,7 @@ XMLTableImportContext::XMLTableImportContext( const 
rtl::Reference< XMLTableImpo
 {
 }
 
-SvXMLImportContextRef XMLTableImportContext::ImportColumn( sal_uInt16 
/*nPrefix*/, std::u16string_view /*rLocalName*/, const Reference< 
XAttributeList >& xAttrList )
+SvXMLImportContextRef XMLTableImportContext::ImportColumn( const Reference< 
XAttributeList >& xAttrList )
 {
 if( mxColumns.is() && (mnCurrentRow == -1) ) try
 {
@@ -571,7 +571,7 @@ SvXMLImportContextRef 
XMLTableImportContext::CreateChildContext( sal_uInt16 nPre
 if( nPrefix == XML_NAMESPACE_TABLE )
 {
 if( IsXMLToken( rLocalName, XML_TABLE_COLUMN ) )
-return ImportColumn( nPrefix, rLocalName, xAttrList );
+return ImportColumn( xAttrList );
 else if( IsXMLToken( rLocalName, XML_TABLE_ROW ) )
 return ImportRow( nPrefix, rLocalName, xAttrList );
 else if( IsXMLToken( rLocalName, XML_TABLE_CELL ) || IsXMLToken( 
rLocalName, XML_COVERED_TABLE_CELL ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-11-18 Thread Stephan Bergmann (via logerrit)

 vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx |4 ++--
 vcl/unx/gtk3/fpicker/SalGtkFilePicker.hxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 68f32bc430ee831480c5b99de66a8cdd3566dd94
Author: Stephan Bergmann 
AuthorDate: Wed Nov 18 11:35:38 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 18 13:12:11 2020 +0100

Remove unused SalGtkFilePicker::implAddFilterGroup _rFilter parameter

unused ever since at least e335eb1438ed99260a5ca050548b2693b5b22b1c
"gtk3: move gtk+ file picker into vcl - a more sensible place for it"

Change-Id: Ib8687b113f4a66e500a0787511125bac8c08e3fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106050
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx 
b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
index 815d0dbe5e06..9becbc3c8319 100644
--- a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
@@ -1880,7 +1880,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const 
OUString& rFilter, const O
 return filter;
 }
 
-void SalGtkFilePicker::implAddFilterGroup( std::u16string_view /*_rFilter*/, 
const Sequence< StringPair >& _rFilters )
+void SalGtkFilePicker::implAddFilterGroup( const Sequence< StringPair >& 
_rFilters )
 {
 // Gtk+ has no filter group concept I think so ...
 // implAddFilter( _rFilter, String() );
@@ -1936,7 +1936,7 @@ void SalGtkFilePicker::SetFilters()
 css::uno::Sequence< css::beans::StringPair > aSubFilters;
 filter.getSubFilters( aSubFilters );
 
-implAddFilterGroup( filter.getTitle(), aSubFilters );
+implAddFilterGroup( aSubFilters );
 }
 else
 {
diff --git a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.hxx 
b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.hxx
index ac4959e4a571..82171c4b04d9 100644
--- a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.hxx
+++ b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.hxx
@@ -213,7 +213,7 @@ class SalGtkFilePicker : public SalGtkPicker, public 
SalGtkFilePicker_Base
 
 void implChangeType( GtkTreeSelection *selection );
 GtkFileFilter * implAddFilter( const OUString& rFilter, const 
OUString& rType );
-void implAddFilterGroup( std::u16string_view rFilter,
+void implAddFilterGroup(
  const css::uno::Sequence< css::beans::StringPair>& 
_rFilters );
 void updateCurrentFilterFromName(const gchar* filtername);
 void unselect_type();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: o3tl/qa solenv/clang-format

2020-11-18 Thread Philipp Hofer (via logerrit)

 o3tl/qa/test-lru_map.cxx|   59 ++--
 o3tl/qa/test-safeint.cxx|   14 +
 solenv/clang-format/excludelist |2 -
 3 files changed, 36 insertions(+), 39 deletions(-)

New commits:
commit 6d5ff94b994e7279cea3d54d9d546f4f1a8cdb4d
Author: Philipp Hofer 
AuthorDate: Thu Nov 12 13:07:41 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Nov 18 12:55:43 2020 +0100

tdf#123936 Formatting files in module o3tl with clang-format

Change-Id: Ieb1229869cae8c14480243af98b270b9053fbde1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105691
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/o3tl/qa/test-lru_map.cxx b/o3tl/qa/test-lru_map.cxx
index a03a6bf37200..ba9ee71835ce 100644
--- a/o3tl/qa/test-lru_map.cxx
+++ b/o3tl/qa/test-lru_map.cxx
@@ -103,7 +103,6 @@ void lru_map_test::testReplaceValue()
 CPPUNIT_ASSERT_EQUAL(size_t(2), lru.size());
 CPPUNIT_ASSERT_EQUAL(6, lru.find(1)->second);
 CPPUNIT_ASSERT_EQUAL(300, lru.find(3)->second);
-
 }
 
 void lru_map_test::testReplaceKey()
@@ -182,8 +181,8 @@ void lru_map_test::testLruRemoval()
 CPPUNIT_ASSERT_EQUAL(700, lru.find(7)->second);
 }
 
-namespace {
-
+namespace
+{
 struct TestClassKey
 {
 int mA;
@@ -192,13 +191,10 @@ struct TestClassKey
 TestClassKey(int a, int b)
 : mA(a)
 , mB(b)
-{}
-
-bool operator==(TestClassKey const& aOther) const
 {
-return mA == aOther.mA
-&& mB == aOther.mB;
 }
+
+bool operator==(TestClassKey const& aOther) const { return mA == aOther.mA 
&& mB == aOther.mB; }
 };
 
 struct TestClassKeyHashFunction
@@ -211,7 +207,6 @@ struct TestClassKeyHashFunction
 return seed;
 }
 };
-
 }
 
 void lru_map_test::testCustomHash()
@@ -220,45 +215,47 @@ void lru_map_test::testCustomHash()
 o3tl::lru_map lru(2);
 CPPUNIT_ASSERT_EQUAL(size_t(0), lru.size());
 
-lru.insert(std::make_pair(TestClassKey(1,1), 2));
+lru.insert(std::make_pair(TestClassKey(1, 1), 2));
 CPPUNIT_ASSERT_EQUAL(size_t(1), lru.size());
 
-lru.insert(std::make_pair(TestClassKey(1,1), 7));
+lru.insert(std::make_pair(TestClassKey(1, 1), 7));
 CPPUNIT_ASSERT_EQUAL(size_t(1), lru.size());
 
-lru.insert(std::make_pair(TestClassKey(1,2), 9));
+lru.insert(std::make_pair(TestClassKey(1, 2), 9));
 CPPUNIT_ASSERT_EQUAL(size_t(2), lru.size());
 
-CPPUNIT_ASSERT(bool(lru.end() == lru.find(TestClassKey(0,0; // non 
existent
-CPPUNIT_ASSERT_EQUAL(7, lru.find(TestClassKey(1,1))->second);
-CPPUNIT_ASSERT_EQUAL(9, lru.find(TestClassKey(1,2))->second);
+CPPUNIT_ASSERT(bool(lru.end() == lru.find(TestClassKey(0, 0; // non 
existent
+CPPUNIT_ASSERT_EQUAL(7, lru.find(TestClassKey(1, 1))->second);
+CPPUNIT_ASSERT_EQUAL(9, lru.find(TestClassKey(1, 2))->second);
 
-lru.insert(std::make_pair(TestClassKey(2,1), 13));
+lru.insert(std::make_pair(TestClassKey(2, 1), 13));
 
 CPPUNIT_ASSERT_EQUAL(size_t(2), lru.size());
 
-CPPUNIT_ASSERT(bool(lru.end() == lru.find(TestClassKey(1,1;
-CPPUNIT_ASSERT_EQUAL(9,  lru.find(TestClassKey(1,2))->second);
-CPPUNIT_ASSERT_EQUAL(13, lru.find(TestClassKey(2,1))->second);
+CPPUNIT_ASSERT(bool(lru.end() == lru.find(TestClassKey(1, 1;
+CPPUNIT_ASSERT_EQUAL(9, lru.find(TestClassKey(1, 2))->second);
+CPPUNIT_ASSERT_EQUAL(13, lru.find(TestClassKey(2, 1))->second);
 }
 
 void lru_map_test::testRemoveIf()
 {
 typedef o3tl::lru_map IntMap;
 typedef IntMap::key_value_pair_t IntMapPair;
-struct limit_except : public std::exception {};
+struct limit_except : public std::exception
+{
+};
 
 IntMap lru(6);
 int i = 0;
 for (; i < 8; i++)
-lru.insert({i, i});
+lru.insert({ i, i });
 CPPUNIT_ASSERT_EQUAL(size_t(6), lru.size());
 // now contains 7..2
 
 // remove everything < 4 from the back
 try
 {
-lru.remove_if([] (IntMapPair const& rPair) {
+lru.remove_if([](IntMapPair const& rPair) {
 if (rPair.first >= 4)
 throw limit_except();
 return true;
@@ -272,26 +269,26 @@ void lru_map_test::testRemoveIf()
 }
 
 // remove all even numbers
-lru.remove_if([] (IntMapPair const& rPair) { return (0 == rPair.first % 
2); });
+lru.remove_if([](IntMapPair const& rPair) { return (0 == rPair.first % 2); 
});
 CPPUNIT_ASSERT_EQUAL(size_t(2), lru.size());
 // contains 7, 5
 
-lru.insert({5, 5});
+lru.insert({ 5, 5 });
 // contains 5, 7
 
 i = 5;
-for (auto &rPair : lru)
+for (auto& rPair : lru)
 {
 CPPUNIT_ASSERT_EQUAL(i, rPair.first);
 i += 2;
 }
 
 // remove the first item
-lru.remove_if([] (IntMapPair const& rPair) { return (rPair.first == 5); });
+lru.remove_if([](IntMapPair const& rPair) { return (rPair.first == 5); });
 CPPUNIT_ASSERT_EQUAL(size_t(1), lru.size());
 
 // remov

[Libreoffice-commits] core.git: jvmfwk/inc jvmfwk/plugins solenv/clang-format

2020-11-18 Thread Philipp Hofer (via logerrit)

 jvmfwk/inc/elements.hxx  |   69 +++
 jvmfwk/inc/fwkbase.hxx   |   13 +---
 jvmfwk/inc/libxmlutil.hxx|   40 ++---
 jvmfwk/inc/vendorbase.hxx|   40 +
 jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx |   13 +---
 jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx   |8 +-
 jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx |8 +-
 jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx |   21 +++
 jvmfwk/plugins/sunmajor/pluginlib/util_cocoa.hxx |2 
 solenv/clang-format/excludelist  |9 ---
 10 files changed, 98 insertions(+), 125 deletions(-)

New commits:
commit 856bdfb0585cea3c67eedfb535c6477d51e4c352
Author: Philipp Hofer 
AuthorDate: Thu Nov 12 13:04:38 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Nov 18 12:55:23 2020 +0100

tdf#123936 Formatting files in module jvmfwk with clang-format

Change-Id: Ie643402fbf10ac837c975d29068b7973e9dd6210
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105685
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/jvmfwk/inc/elements.hxx b/jvmfwk/inc/elements.hxx
index 58ad6044f300..3fde096c44a4 100644
--- a/jvmfwk/inc/elements.hxx
+++ b/jvmfwk/inc/elements.hxx
@@ -36,7 +36,6 @@ struct JavaInfo;
 
 namespace jfw
 {
-
 /** gets the value of the updated element from the javavendors.xml.
  */
 OString getElementUpdated();
@@ -47,9 +46,7 @@ OString getElementUpdated();
 [out]If true then the respective structure of elements was added and the
 document needs to be saved.
  */
-void createSettingsStructure(
-xmlDoc * document, bool * bNeedsSave);
-
+void createSettingsStructure(xmlDoc* document, bool* bNeedsSave);
 
 /** represents the settings saved in the /java/javaInfo element.
 It is used within class NodeJava which determines the settings
@@ -91,12 +88,12 @@ public:
 If javaInfo@xsi:nil = true then member bNil is set to true
 and no further elements are read.
  */
-void loadFromNode(xmlDoc * pDoc,xmlNode * pJavaInfo);
+void loadFromNode(xmlDoc* pDoc, xmlNode* pJavaInfo);
 /** The attribute nil will be set to false. The function gets the value
 javaSettings/updated from the javavendors.xml and writes it to
 javaInfo@vendorUpdate in javasettings.xml
  */
-void writeToNode(xmlDoc * pDoc, xmlNode * pJavaInfo) const;
+void writeToNode(xmlDoc* pDoc, xmlNode* pJavaInfo) const;
 
 /** returns NULL if javaInfo is nil.
  */
@@ -116,9 +113,13 @@ public:
 class NodeJava
 {
 public:
-enum Layer { USER, SHARED };
-private:
+enum Layer
+{
+USER,
+SHARED
+};
 
+private:
 /** creates settings file and fills it with default values.
 
 When this function is called then it creates the
@@ -147,7 +148,7 @@ private:
 
 /** Verifies if the respective settings file exist.
  */
-static jfw::FileStatus checkSettingsFileStatus(OUString const & sURL);
+static jfw::FileStatus checkSettingsFileStatus(OUString const& sURL);
 
 /** Determines the layer for which the instance the loads and writes the
 data.
@@ -164,7 +165,7 @@ private:
 If /java/userClassPath@xsi:nil == true then the value is uninitialized
 after a call to load().
 */
-std::optional< OUString> m_userClassPath;
+std::optional m_userClassPath;
 /** User configurable option.  /java/javaInfo
 If /java/javaInfo@xsi:nil == true then the value is uninitialized
 after a call to load.
@@ -174,15 +175,14 @@ private:
 If /java/vmParameters@xsi:nil == true then the value is uninitialized
 after a call to load.
 */
-std::optional< ::std::vector< OUString> > m_vmParameters;
+std::optional<::std::vector> m_vmParameters;
 /** User configurable option. /java/jreLocations
 If /java/jreLocations@xsi:nil == true then the value is uninitialized
 after a call to load.
 */
-std::optional< ::std::vector< OUString> > m_JRELocations;
+std::optional<::std::vector> m_JRELocations;
 
 public:
-
 explicit NodeJava(Layer theLayer);
 
 /** sets m_enabled.
@@ -192,14 +192,14 @@ public:
 
 /** sets m_sUserClassPath. See setEnabled.
  */
-void setUserClassPath(const OUString & sClassPath);
+void setUserClassPath(const OUString& sClassPath);
 
 /** sets m_aInfo. See setEnabled.
 @param bAutoSelect
 true- called by jfw_setSelectedJRE
 false called by jfw_findAndSelectJRE
  */
-void setJavaInfo(const JavaInfo * pInfo, bool bAutoSelect);
+void setJavaInfo(const JavaInfo* pInfo, bool bAutoSelect);
 
 /** sets the /java/vmParameters/param elements.
 When this method all previous values are removed and replaced
@@ -207,12 +207,12 @@ public:
 /java/vmParameters@xsi:nil will be set to true when write() is
 called.

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

2020-11-18 Thread Jean-Pierre Ledure (via logerrit)

 wizards/source/scriptforge/SF_Utils.xba |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 11a7e6640197db97cd89630857b6ff5ba742d183
Author: Jean-Pierre Ledure 
AuthorDate: Wed Nov 18 12:43:21 2020 +0100
Commit: Jean-Pierre Ledure 
CommitDate: Wed Nov 18 12:48:08 2020 +0100

ScriptForge - Fix script invocation when scope is not in lower case

The scope can be expressed as "document" or "application"
but also as "Document" or "DOCUMENT"

Change-Id: Id70407cc1167cfcac727d63f1ab29fbba4fc6645
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106054
Tested-by: Jean-Pierre Ledure 
Reviewed-by: Jean-Pierre Ledure 

diff --git a/wizards/source/scriptforge/SF_Utils.xba 
b/wizards/source/scriptforge/SF_Utils.xba
index f24d5825f53e..67aa32f29c77 100644
--- a/wizards/source/scriptforge/SF_Utils.xba
+++ b/wizards/source/scriptforge/SF_Utils.xba
@@ -398,7 +398,7 @@ Dim vNodePath As Variant
Set _GetUNOService = .PathSubstitution
Case "ScriptProvider"
If IsMissing(pvArg) Then pvArg = 
SF_Session.SCRIPTISAPPLICATION
-   Select Case pvArg
+   Select Case LCase(pvArg)
Case SF_Session.SCRIPTISEMBEDDED
'  Document
If Not IsNull(ThisComponent) 
Then Set _GetUNOService = ThisComponent.getScriptProvider()
Case Else
@@ -964,4 +964,4 @@ Dim iType As Integer'  VarType of argument
 End Function   '  ScriptForge.SF_Utils._VarTypeExt
 
 REM = END OF 
SCRIPTFORGE.SF_UTILS
-
+
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - oox/inc oox/source

2020-11-18 Thread Gülşah Köse (via logerrit)

 oox/inc/drawingml/scene3dcontext.hxx   |   10 ++
 oox/inc/drawingml/shape3dproperties.hxx|7 +++-
 oox/inc/drawingml/textbody.hxx |5 +++
 oox/source/drawingml/scene3dcontext.cxx|   33 +
 oox/source/drawingml/shape.cxx |   20 
 oox/source/drawingml/shape3dproperties.cxx |   30 +--
 oox/source/drawingml/textbodypropertiescontext.cxx |2 -
 oox/source/export/drawingml.cxx|   28 +++--
 oox/source/export/shapes.cxx   |   12 +++
 9 files changed, 125 insertions(+), 22 deletions(-)

New commits:
commit 935c558a8d2edccca341515509a7e577aac58dc1
Author: Gülşah Köse 
AuthorDate: Tue Nov 17 12:43:12 2020 +0300
Commit: Gülşah Köse 
CommitDate: Wed Nov 18 12:46:16 2020 +0100

tdf#128213 Fix text camera z rotation import and export.

Text3DProperties is added to distinguish shape and text 3D effects.
Before there was implementation error about text camera z rotation
support. We were using shape effects for text. We already have not
support shape 3D rotation but we have text camera z rotation. This
patch includes import and export filter changes about text camera z
rotation.

Change-Id: I623392b82edf4585888d2f15ad91ffb2109d8f96
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106033
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106047
Tested-by: Jenkins CollaboraOffice 

diff --git a/oox/inc/drawingml/scene3dcontext.hxx 
b/oox/inc/drawingml/scene3dcontext.hxx
index 13b2a9e3fe70..7645139b47ef 100644
--- a/oox/inc/drawingml/scene3dcontext.hxx
+++ b/oox/inc/drawingml/scene3dcontext.hxx
@@ -49,6 +49,16 @@ private:
 Shape3DProperties& mr3DProperties;
 };
 
+class SceneText3DPropertiesContext final : public ::oox::core::ContextHandler2
+{
+public:
+SceneText3DPropertiesContext( ::oox::core::ContextHandler2Helper const & 
rParent, Text3DProperties& rText3DProperties ) throw();
+::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const 
::oox::AttributeList& rAttribs ) override;
+
+private:
+Text3DProperties& mr3DProperties;
+};
+
 class Shape3DPropertiesContext : public ::oox::core::ContextHandler2
 {
 public:
diff --git a/oox/inc/drawingml/shape3dproperties.hxx 
b/oox/inc/drawingml/shape3dproperties.hxx
index e44d0468eeca..95115d101bba 100644
--- a/oox/inc/drawingml/shape3dproperties.hxx
+++ b/oox/inc/drawingml/shape3dproperties.hxx
@@ -49,7 +49,7 @@ struct BevelProperties
 OptValue< sal_Int32 > mnHeight;
 };
 
-struct Shape3DProperties
+struct Generic3DProperties
 {
 OptValue< sal_Int32 > mnPreset;
 OptValue< float > mfFieldOfVision;
@@ -84,6 +84,11 @@ struct Shape3DProperties
 const Color& rColor, const GraphicHelper& rGraphicHelper, ::Color 
rPhClr );
 };
 
+struct Shape3DProperties : Generic3DProperties
+{};
+
+struct Text3DProperties : Generic3DProperties
+{};
 
 } // namespace drawingml
 } // namespace oox
diff --git a/oox/inc/drawingml/textbody.hxx b/oox/inc/drawingml/textbody.hxx
index 38996abe03ea..8cc3a70b254a 100644
--- a/oox/inc/drawingml/textbody.hxx
+++ b/oox/inc/drawingml/textbody.hxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace com { namespace sun { namespace star {
 namespace text { class XText; }
@@ -54,6 +55,9 @@ public:
 const TextBodyProperties&   getTextProperties() const { return 
maTextProperties; }
 TextBodyProperties& getTextProperties() { return 
maTextProperties; }
 
+Text3DProperties&   get3DProperties() { return 
ma3DProperties; }
+const Text3DProperties& get3DProperties() const { return 
ma3DProperties; }
+
 /** insert the text body at the text cursor */
 voidinsertAt(
 const ::oox::core::XmlFilterBase& rFilterBase,
@@ -73,6 +77,7 @@ protected:
 TextParagraphVector maParagraphs;
 TextBodyProperties  maTextProperties;
 TextListStyle   maTextListStyle;
+Text3DPropertiesma3DProperties;
 };
 
 } }
diff --git a/oox/source/drawingml/scene3dcontext.cxx 
b/oox/source/drawingml/scene3dcontext.cxx
index f6e0ee38d5fc..267d0f24c8b2 100644
--- a/oox/source/drawingml/scene3dcontext.cxx
+++ b/oox/source/drawingml/scene3dcontext.cxx
@@ -68,6 +68,39 @@ ContextHandlerRef Scene3DPropertiesContext::onCreateContext( 
sal_Int32 aElementT
 return nullptr;
 }
 
+SceneText3DPropertiesContext::SceneText3DPropertiesContext( 
ContextHandler2Helper const & rParent, Text3DProperties& r3DProperties ) throw()
+: ContextHandler2( rParent )
+, mr3DProperties( r3DProperties )
+{
+}
+
+ContextHandlerRef SceneText3DPropertiesContext::onCreateContext( sal_Int32 
aElementToken, const AttributeList& rAttribs )
+{
+switch( aElementToken )
+{
+case A_TOKEN( camera ):
+

[Libreoffice-commits] core.git: solenv/clang-format unotest/source

2020-11-18 Thread Philipp Hofer (via logerrit)

 solenv/clang-format/excludelist |5 -
 unotest/source/cpp/bootstrapfixturebase.cxx |   13 +++--
 unotest/source/cpp/directories.cxx  |   22 --
 unotest/source/cpp/getargument.cxx  |8 
 unotest/source/cpp/gettestargument.cxx  |8 
 unotest/source/cpp/macros_test.cxx  |   14 +-
 6 files changed, 32 insertions(+), 38 deletions(-)

New commits:
commit afb92ffc62ba140ee1366ac5ecd526706e3d8a74
Author: Philipp Hofer 
AuthorDate: Thu Nov 12 13:24:41 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Nov 18 12:30:50 2020 +0100

tdf#123936 Formatting files in module unotest with clang-format

Change-Id: Ic67aedc492e3382eeea92f5bda0b4e7ab7e2857c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105725
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index d826e9d6eb13..aec80462806b 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -15623,13 +15623,8 @@ unoidl/source/unoidl-write.cxx
 unoidl/source/unoidl.cxx
 unoidl/source/unoidlprovider.cxx
 unoidl/source/unoidlprovider.hxx
-unotest/source/cpp/bootstrapfixturebase.cxx
-unotest/source/cpp/directories.cxx
 unotest/source/cpp/filters-test.cxx
-unotest/source/cpp/getargument.cxx
 unotest/source/cpp/getargument.hxx
-unotest/source/cpp/gettestargument.cxx
-unotest/source/cpp/macros_test.cxx
 unotest/source/cpp/officeconnection.cxx
 unotest/source/cpp/toabsolutefileurl.cxx
 unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx
diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx 
b/unotest/source/cpp/bootstrapfixturebase.cxx
index 4b93b1d6de94..5c5b3bcc3a9c 100644
--- a/unotest/source/cpp/bootstrapfixturebase.cxx
+++ b/unotest/source/cpp/bootstrapfixturebase.cxx
@@ -19,13 +19,9 @@ using namespace ::com::sun::star;
 // test function in a rather non-intuitive way. This is why all the 'real'
 // heavy lifting is deferred until setUp. setUp and tearDown are interleaved
 // between the tests as you might expect.
-test::BootstrapFixtureBase::BootstrapFixtureBase()
-{
-}
+test::BootstrapFixtureBase::BootstrapFixtureBase() {}
 
-test::BootstrapFixtureBase::~BootstrapFixtureBase()
-{
-}
+test::BootstrapFixtureBase::~BootstrapFixtureBase() {}
 
 void test::BootstrapFixtureBase::setUp()
 {
@@ -34,9 +30,6 @@ void test::BootstrapFixtureBase::setUp()
 m_xSFactory.set(m_xFactory, uno::UNO_QUERY_THROW);
 }
 
-void test::BootstrapFixtureBase::tearDown()
-{
-StarBASIC::DetachAllDocBasicItems();
-}
+void test::BootstrapFixtureBase::tearDown() { 
StarBASIC::DetachAllDocBasicItems(); }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotest/source/cpp/directories.cxx 
b/unotest/source/cpp/directories.cxx
index 6635fafa030f..54f106b212d6 100644
--- a/unotest/source/cpp/directories.cxx
+++ b/unotest/source/cpp/directories.cxx
@@ -13,31 +13,33 @@
 #include 
 #include 
 
-namespace {
-
-OUString getFileURLFromSystemPath(OUString const & path) {
+namespace
+{
+OUString getFileURLFromSystemPath(OUString const& path)
+{
 OUString url;
 osl::FileBase::RC e = osl::FileBase::getFileURLFromSystemPath(path, url);
 CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, e);
-if (!url.endsWith("/")) {
+if (!url.endsWith("/"))
+{
 url += "/";
 }
 return url;
 }
-
 }
 
-test::Directories::Directories() {
-const char* pSrcRoot = getenv( "SRC_ROOT" );
+test::Directories::Directories()
+{
+const char* pSrcRoot = getenv("SRC_ROOT");
 CPPUNIT_ASSERT_MESSAGE("SRC_ROOT env variable not set", pSrcRoot != 
nullptr);
 CPPUNIT_ASSERT_MESSAGE("SRC_ROOT env variable not set", pSrcRoot[0] != 0);
-const char* pWorkdirRoot = getenv( "WORKDIR_FOR_BUILD" );
+const char* pWorkdirRoot = getenv("WORKDIR_FOR_BUILD");
 CPPUNIT_ASSERT_MESSAGE("$WORKDIR_FOR_BUILD env variable not set", 
pWorkdirRoot != nullptr);
 CPPUNIT_ASSERT_MESSAGE("$WORKDIR_FOR_BUILD env variable not set", 
pWorkdirRoot[0] != 0);
-m_aSrcRootPath = OUString::createFromAscii( pSrcRoot );
+m_aSrcRootPath = OUString::createFromAscii(pSrcRoot);
 m_aSrcRootURL = getFileURLFromSystemPath(m_aSrcRootPath);
 
-m_aWorkdirRootPath = OUString::createFromAscii( pWorkdirRoot );
+m_aWorkdirRootPath = OUString::createFromAscii(pWorkdirRoot);
 m_aWorkdirRootURL = getFileURLFromSystemPath(m_aWorkdirRootPath);
 }
 
diff --git a/unotest/source/cpp/getargument.cxx 
b/unotest/source/cpp/getargument.cxx
index 007cc775b7d7..cb1df427758e 100644
--- a/unotest/source/cpp/getargument.cxx
+++ b/unotest/source/cpp/getargument.cxx
@@ -25,13 +25,13 @@
 
 #include "getargument.hxx"
 
-namespace test::detail {
-
-bool getArgument(OUString const & name, OUString * value) {
+namespace test::detail
+{
+bool getArgument(OUString const& name, OUString* value)
+{
 OSL_ASSERT(value != nullptr);
 return rt

[Libreoffice-commits] core.git: solenv/clang-format toolkit/inc toolkit/source

2020-11-18 Thread Philipp Hofer (via logerrit)

 solenv/clang-format/excludelist|7 
 toolkit/inc/controls/geometrycontrolmodel_impl.hxx |   25 ++-
 toolkit/inc/helper/tkresmgr.hxx|3 -
 toolkit/source/awt/vclxwindow1.cxx |   35 ++---
 toolkit/source/awt/vclxwindows_internal.hxx|4 +-
 toolkit/source/controls/svmedit.cxx|   11 +++---
 toolkit/source/controls/tree/treecontrol.hxx   |   17 +-
 toolkit/source/helper/tkresmgr.cxx |   17 +-
 8 files changed, 54 insertions(+), 65 deletions(-)

New commits:
commit 0ce86801128b0955dd46aca5e5b5add4b719df0a
Author: Philipp Hofer 
AuthorDate: Thu Nov 12 13:22:46 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Nov 18 12:30:04 2020 +0100

tdf#123936 Formatting files in module toolkit with clang-format

Change-Id: Ib4ee991a05335247d65343dfd3c3bcaf214a9e06
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105720
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 0f2d277460db..d826e9d6eb13 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -15153,7 +15153,6 @@ toolkit/inc/controls/eventcontainer.hxx
 toolkit/inc/controls/filectrl.hxx
 toolkit/inc/controls/formattedcontrol.hxx
 toolkit/inc/controls/geometrycontrolmodel.hxx
-toolkit/inc/controls/geometrycontrolmodel_impl.hxx
 toolkit/inc/controls/roadmapcontrol.hxx
 toolkit/inc/controls/roadmapentry.hxx
 toolkit/inc/controls/stdtabcontroller.hxx
@@ -15169,7 +15168,6 @@ toolkit/inc/helper/accessibilityclient.hxx
 toolkit/inc/helper/btndlg.hxx
 toolkit/inc/helper/imagealign.hxx
 toolkit/inc/helper/scrollabledialog.hxx
-toolkit/inc/helper/tkresmgr.hxx
 toolkit/inc/helper/unopropertyarrayhelper.hxx
 toolkit/inc/helper/unowrapper.hxx
 toolkit/source/awt/animatedimagespeer.cxx
@@ -15193,9 +15191,7 @@ toolkit/source/awt/vclxtabpagecontainer.cxx
 toolkit/source/awt/vclxtoolkit.cxx
 toolkit/source/awt/vclxtopwindow.cxx
 toolkit/source/awt/vclxwindow.cxx
-toolkit/source/awt/vclxwindow1.cxx
 toolkit/source/awt/vclxwindows.cxx
-toolkit/source/awt/vclxwindows_internal.hxx
 toolkit/source/controls/accessiblecontrolcontext.cxx
 toolkit/source/controls/animatedimages.cxx
 toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -15218,13 +15214,11 @@ toolkit/source/controls/roadmapentry.cxx
 toolkit/source/controls/spinningprogress.cxx
 toolkit/source/controls/stdtabcontroller.cxx
 toolkit/source/controls/stdtabcontrollermodel.cxx
-toolkit/source/controls/svmedit.cxx
 toolkit/source/controls/tabpagecontainer.cxx
 toolkit/source/controls/tabpagemodel.cxx
 toolkit/source/controls/tkscrollbar.cxx
 toolkit/source/controls/tkspinbutton.cxx
 toolkit/source/controls/tree/treecontrol.cxx
-toolkit/source/controls/tree/treecontrol.hxx
 toolkit/source/controls/tree/treecontrolpeer.cxx
 toolkit/source/controls/tree/treedatamodel.cxx
 toolkit/source/controls/unocontrol.cxx
@@ -15239,7 +15233,6 @@ toolkit/source/helper/formpdfexport.cxx
 toolkit/source/helper/imagealign.cxx
 toolkit/source/helper/listenermultiplexer.cxx
 toolkit/source/helper/property.cxx
-toolkit/source/helper/tkresmgr.cxx
 toolkit/source/helper/unopropertyarrayhelper.cxx
 toolkit/source/helper/unowrapper.cxx
 toolkit/source/helper/vclunohelper.cxx
diff --git a/toolkit/inc/controls/geometrycontrolmodel_impl.hxx 
b/toolkit/inc/controls/geometrycontrolmodel_impl.hxx
index f19e84327c22..37a3983f6888 100644
--- a/toolkit/inc/controls/geometrycontrolmodel_impl.hxx
+++ b/toolkit/inc/controls/geometrycontrolmodel_impl.hxx
@@ -19,33 +19,32 @@
 
 // no include protection. This is included from within 
geometrycontrolmodel.hxx only
 
-
 //= OGeometryControlModel
 
-
 template 
-OGeometryControlModel::OGeometryControlModel( const 
css::uno::Reference< css::uno::XComponentContext >& i_factory )
-:OGeometryControlModel_Base(new CONTROLMODEL( i_factory ) )
+OGeometryControlModel::OGeometryControlModel(
+const css::uno::Reference& i_factory)
+: OGeometryControlModel_Base(new CONTROLMODEL(i_factory))
 {
 }
 
-
 template 
-OGeometryControlModel::OGeometryControlModel(css::uno::Reference<
 css::util::XCloneable >& _rxAggregateInstance)
-:OGeometryControlModel_Base(_rxAggregateInstance)
+OGeometryControlModel::OGeometryControlModel(
+css::uno::Reference& _rxAggregateInstance)
+: OGeometryControlModel_Base(_rxAggregateInstance)
 {
 }
 
-
 template 
 ::cppu::IPropertyArrayHelper& SAL_CALL 
OGeometryControlModel::getInfoHelper()
 {
 return *this->getArrayHelper();
 }
 
-
 template 
-void OGeometryControlModel::fillProperties(css::uno::Sequence< 
css::beans::Property >& _rProps, css::uno::Sequence< css::beans::Property >& 
_rAggregateProps) const
+void OGeometryControlModel::fillProperties(
+css::uno::Sequence& _rProps,
+css::uno::Sequence& _rAggregateProps) const
 {
 // our own properties
 OPrope

[Libreoffice-commits] core.git: solenv/clang-format unoidl/source

2020-11-18 Thread Philipp Hofer (via logerrit)

 solenv/clang-format/excludelist  |2 --
 unoidl/source/sourcefileprovider.hxx |   17 -
 unoidl/source/sourcetreeprovider.hxx |   18 +-
 3 files changed, 17 insertions(+), 20 deletions(-)

New commits:
commit 49fbda99b4e563be54ee7c85560a5929f0627654
Author: Philipp Hofer 
AuthorDate: Thu Nov 12 13:24:18 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Nov 18 12:29:42 2020 +0100

tdf#123936 Formatting files in module unoidl with clang-format

Change-Id: If315a05bcb237dc2922981c0d041b0c0b5d152d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105724
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index d120c0cf86db..0f2d277460db 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -15621,11 +15621,9 @@ unodevtools/source/unodevtools/options.cxx
 unoidl/source/legacyprovider.cxx
 unoidl/source/legacyprovider.hxx
 unoidl/source/sourcefileprovider.cxx
-unoidl/source/sourcefileprovider.hxx
 unoidl/source/sourceprovider-parser-requires.hxx
 unoidl/source/sourceprovider-scanner.hxx
 unoidl/source/sourcetreeprovider.cxx
-unoidl/source/sourcetreeprovider.hxx
 unoidl/source/unoidl-check.cxx
 unoidl/source/unoidl-read.cxx
 unoidl/source/unoidl-write.cxx
diff --git a/unoidl/source/sourcefileprovider.hxx 
b/unoidl/source/sourcefileprovider.hxx
index 4229301ded50..2d986cc1f39d 100644
--- a/unoidl/source/sourcefileprovider.hxx
+++ b/unoidl/source/sourcefileprovider.hxx
@@ -16,26 +16,25 @@
 #include 
 #include 
 
-namespace unoidl::detail {
-
-class SourceFileProvider: public Provider {
+namespace unoidl::detail
+{
+class SourceFileProvider : public Provider
+{
 public:
 // throws FileFormatException, NoSuchFileException:
-SourceFileProvider(
-rtl::Reference const & manager, OUString const & uri);
+SourceFileProvider(rtl::Reference const& manager, OUString const& 
uri);
 
 // throws FileFormatException:
 virtual rtl::Reference createRootCursor() const override;
 
 // throws FileFormatException:
-virtual rtl::Reference findEntity(OUString const & name) const 
override;
+virtual rtl::Reference findEntity(OUString const& name) const 
override;
 
 private:
-virtual ~SourceFileProvider() throw () override;
+virtual ~SourceFileProvider() throw() override;
 
-std::map< OUString, rtl::Reference > rootMap_;
+std::map> rootMap_;
 };
-
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unoidl/source/sourcetreeprovider.hxx 
b/unoidl/source/sourcetreeprovider.hxx
index ece737f5256e..e98ee7383fad 100644
--- a/unoidl/source/sourcetreeprovider.hxx
+++ b/unoidl/source/sourcetreeprovider.hxx
@@ -17,27 +17,27 @@
 #include 
 #include 
 
-namespace unoidl::detail {
-
-class SourceTreeProvider: public Provider {
+namespace unoidl::detail
+{
+class SourceTreeProvider : public Provider
+{
 public:
 // throws FileFormatException, NoSuchFileException:
-SourceTreeProvider(Manager & manager, OUString const & uri);
+SourceTreeProvider(Manager& manager, OUString const& uri);
 
 // throws FileFormatException:
 virtual rtl::Reference createRootCursor() const override;
 
 // throws FileFormatException:
-virtual rtl::Reference findEntity(OUString const & name) const 
override;
+virtual rtl::Reference findEntity(OUString const& name) const 
override;
 
 private:
-virtual ~SourceTreeProvider() throw () override;
+virtual ~SourceTreeProvider() throw() override;
 
-Manager & manager_;
+Manager& manager_;
 OUString uri_;
-mutable std::map< OUString, rtl::Reference > cache_; //TODO: at 
manager
+mutable std::map> cache_; //TODO: at 
manager
 };
-
 }
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/clang-format winaccessibility/inc winaccessibility/source

2020-11-18 Thread Philipp Hofer (via logerrit)

 solenv/clang-format/excludelist |   29 
 winaccessibility/inc/AccComponentEventListener.hxx  |   17 +-
 winaccessibility/inc/AccDialogEventListener.hxx |9 -
 winaccessibility/inc/AccEventListener.hxx   |   15 +-
 winaccessibility/inc/AccFrameEventListener.hxx  |   10 -
 winaccessibility/inc/AccListEventListener.hxx   |   12 -
 winaccessibility/inc/AccMenuEventListener.hxx   |9 -
 winaccessibility/inc/AccParagraphEventListener.hxx  |9 -
 winaccessibility/inc/AccTableEventListener.hxx  |   10 -
 winaccessibility/inc/AccTextComponentEventListener.hxx  |7 -
 winaccessibility/inc/AccTopWindowListener.hxx   |   27 ++-
 winaccessibility/inc/AccTreeEventListener.hxx   |9 -
 winaccessibility/inc/AccWindowEventListener.hxx |   10 -
 winaccessibility/inc/ResIDGenerator.hxx |   12 -
 winaccessibility/inc/accHelper.hxx  |   12 -
 winaccessibility/inc/unomsaaevent.hxx   |   60 

 winaccessibility/source/UAccCOM/AccActionBase.h |   22 +--
 winaccessibility/source/UAccCOM/AccComponent.cxx|   13 -
 winaccessibility/source/UAccCOM/AccComponentBase.cxx|   42 
++
 winaccessibility/source/UAccCOM/AccComponentBase.h  |   16 --
 winaccessibility/source/UAccCOM/AccImage.cxx|   22 +--
 winaccessibility/source/UAccCOM/AccTextBase.h   |   44 
+++---
 winaccessibility/source/UAccCOM/AccValue.cxx|   60 

 winaccessibility/source/UAccCOM/AccessibleKeyStroke.h   |   11 -
 winaccessibility/source/UAccCOM/UAccCOM.cxx |   22 +--
 winaccessibility/source/UAccCOM/UNOXWrapper.cxx |8 -
 winaccessibility/source/UAccCOM/UNOXWrapper.h   |   10 -
 winaccessibility/source/service/AccEventListener.cxx|   69 
--
 winaccessibility/source/service/AccObjectContainerEventListener.cxx |   11 -
 winaccessibility/source/service/ResIDGenerator.cxx  |4 
 30 files changed, 267 insertions(+), 344 deletions(-)

New commits:
commit 65717f77c43ca7cbf91e4c158d643a02a181e439
Author: Philipp Hofer 
AuthorDate: Thu Nov 12 13:27:36 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Nov 18 12:29:18 2020 +0100

tdf#123936 Formatting files in module winaccessibility with clang-format

Change-Id: I9d5b9697cb241b306d0614fb563feb5594c19887
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105729
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 3bebbdf749d8..d120c0cf86db 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -16953,42 +16953,22 @@ vcl/workben/ww6fuzzer.cxx
 vcl/workben/ww8fuzzer.cxx
 vcl/workben/xbmfuzzer.cxx
 vcl/workben/xpmfuzzer.cxx
-winaccessibility/inc/AccComponentEventListener.hxx
 winaccessibility/inc/AccContainerEventListener.hxx
 winaccessibility/inc/AccDescendantManagerEventListener.hxx
-winaccessibility/inc/AccDialogEventListener.hxx
-winaccessibility/inc/AccEventListener.hxx
-winaccessibility/inc/AccFrameEventListener.hxx
-winaccessibility/inc/AccListEventListener.hxx
-winaccessibility/inc/AccMenuEventListener.hxx
 winaccessibility/inc/AccObject.hxx
 winaccessibility/inc/AccObjectContainerEventListener.hxx
 winaccessibility/inc/AccObjectManagerAgent.hxx
 winaccessibility/inc/AccObjectWinManager.hxx
-winaccessibility/inc/AccParagraphEventListener.hxx
-winaccessibility/inc/AccTableEventListener.hxx
-winaccessibility/inc/AccTextComponentEventListener.hxx
-winaccessibility/inc/AccTopWindowListener.hxx
-winaccessibility/inc/AccTreeEventListener.hxx
-winaccessibility/inc/AccWindowEventListener.hxx
-winaccessibility/inc/ResIDGenerator.hxx
-winaccessibility/inc/accHelper.hxx
-winaccessibility/inc/unomsaaevent.hxx
 winaccessibility/source/UAccCOM/AccAction.cxx
 winaccessibility/source/UAccCOM/AccAction.h
 winaccessibility/source/UAccCOM/AccActionBase.cxx
-winaccessibility/source/UAccCOM/AccActionBase.h
-winaccessibility/source/UAccCOM/AccComponent.cxx
 winaccessibility/source/UAccCOM/AccComponent.h
-winaccessibility/source/UAccCOM/AccComponentBase.cxx
-winaccessibility/source/UAccCOM/AccComponentBase.h
 winaccessibility/source/UAccCOM/AccEditableText.cxx
 winaccessibility/source/UAccCOM/AccEditableText.h
 winaccessibility/source/UAccCOM/AccHyperLink.cxx
 winaccessibility/source/UAccCOM/AccHyperLink.h
 winaccessibility/source/UAccCOM/AccHypertext.cxx
 winaccessibility/source/UAccCOM/AccHypertext.h
-winaccessibility/source/UAccCOM/AccImage.cxx
 winaccess

[Libreoffice-commits] core.git: solenv/clang-format vbahelper/source

2020-11-18 Thread Philipp Hofer (via logerrit)

 solenv/clang-format/excludelist   |3 ---
 vbahelper/source/msforms/vbanewfont.hxx   |   25 +++--
 vbahelper/source/vbahelper/vbadialogbase.cxx  |   12 ++--
 vbahelper/source/vbahelper/vbadialogsbase.cxx |6 ++
 4 files changed, 19 insertions(+), 27 deletions(-)

New commits:
commit b9e9ac51a731a1b9515d935fd543218b2ee107c1
Author: Philipp Hofer 
AuthorDate: Thu Nov 12 13:25:31 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Nov 18 12:28:54 2020 +0100

tdf#123936 Formatting files in module vbahelper with clang-format

Change-Id: Id058e96d2d3c78fa6efce41b0dbc39c69921ea99
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105727
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index fa01006ff459..3bebbdf749d8 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -15831,7 +15831,6 @@ vbahelper/source/msforms/vbalistcontrolhelper.hxx
 vbahelper/source/msforms/vbamultipage.cxx
 vbahelper/source/msforms/vbamultipage.hxx
 vbahelper/source/msforms/vbanewfont.cxx
-vbahelper/source/msforms/vbanewfont.hxx
 vbahelper/source/msforms/vbapages.cxx
 vbahelper/source/msforms/vbapages.hxx
 vbahelper/source/msforms/vbaprogressbar.cxx
@@ -15863,8 +15862,6 @@ vbahelper/source/vbahelper/vbacommandbarhelper.cxx
 vbahelper/source/vbahelper/vbacommandbarhelper.hxx
 vbahelper/source/vbahelper/vbacommandbars.cxx
 vbahelper/source/vbahelper/vbacommandbars.hxx
-vbahelper/source/vbahelper/vbadialogbase.cxx
-vbahelper/source/vbahelper/vbadialogsbase.cxx
 vbahelper/source/vbahelper/vbadocumentbase.cxx
 vbahelper/source/vbahelper/vbadocumentsbase.cxx
 vbahelper/source/vbahelper/vbaeventshelperbase.cxx
diff --git a/vbahelper/source/msforms/vbanewfont.hxx 
b/vbahelper/source/msforms/vbanewfont.hxx
index 6f00a2724bf6..fb928f9e0c50 100644
--- a/vbahelper/source/msforms/vbanewfont.hxx
+++ b/vbahelper/source/msforms/vbanewfont.hxx
@@ -24,37 +24,34 @@
 #include 
 #include 
 
-
-class VbaNewFont : public cppu::WeakImplHelper< ov::msforms::XNewFont >
+class VbaNewFont : public cppu::WeakImplHelper
 {
 public:
 /// @throws css::uno::RuntimeException
-explicit VbaNewFont(
-const css::uno::Reference< css::beans::XPropertySet >& rxModelProps );
+explicit VbaNewFont(const css::uno::Reference& 
rxModelProps);
 
 // XNewFont attributes
 virtual OUString SAL_CALL getName() override;
-virtual void SAL_CALL setName( const OUString& rName ) override;
+virtual void SAL_CALL setName(const OUString& rName) override;
 virtual double SAL_CALL getSize() override;
-virtual void SAL_CALL setSize( double fSize ) override;
+virtual void SAL_CALL setSize(double fSize) override;
 virtual sal_Int16 SAL_CALL getCharset() override;
-virtual void SAL_CALL setCharset( sal_Int16 nCharset ) override;
+virtual void SAL_CALL setCharset(sal_Int16 nCharset) override;
 virtual sal_Int16 SAL_CALL getWeight() override;
-virtual void SAL_CALL setWeight( sal_Int16 nWeight ) override;
+virtual void SAL_CALL setWeight(sal_Int16 nWeight) override;
 virtual sal_Bool SAL_CALL getBold() override;
-virtual void SAL_CALL setBold( sal_Bool bBold ) override;
+virtual void SAL_CALL setBold(sal_Bool bBold) override;
 virtual sal_Bool SAL_CALL getItalic() override;
-virtual void SAL_CALL setItalic( sal_Bool bItalic ) override;
+virtual void SAL_CALL setItalic(sal_Bool bItalic) override;
 virtual sal_Bool SAL_CALL getUnderline() override;
-virtual void SAL_CALL setUnderline( sal_Bool bUnderline ) override;
+virtual void SAL_CALL setUnderline(sal_Bool bUnderline) override;
 virtual sal_Bool SAL_CALL getStrikethrough() override;
-virtual void SAL_CALL setStrikethrough( sal_Bool bStrikethrough ) override;
+virtual void SAL_CALL setStrikethrough(sal_Bool bStrikethrough) override;
 
 private:
-css::uno::Reference< css::beans::XPropertySet > mxProps;
+css::uno::Reference mxProps;
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vbahelper/source/vbahelper/vbadialogbase.cxx 
b/vbahelper/source/vbahelper/vbadialogbase.cxx
index 6e5ae97857b1..a1aa0b053436 100644
--- a/vbahelper/source/vbahelper/vbadialogbase.cxx
+++ b/vbahelper/source/vbahelper/vbadialogbase.cxx
@@ -25,14 +25,14 @@ using namespace ::com::sun::star;
 
 void SAL_CALL VbaDialogBase::Show()
 {
-if ( m_xModel.is() )
+if (m_xModel.is())
 {
-OUString aURL = mapIndexToName( mnIndex );
-if( aURL.isEmpty() )
-throw uno::RuntimeException( "Unable to open the specified dialog" 
);
+OUString aURL = mapIndexToName(mnIndex);
+if (aURL.isEmpty())
+throw uno::RuntimeException("Unable to open the specified dialog");
 
-uno::Sequence< beans::PropertyValue > dispatchProps(0);
-dispatchRequests( m_xModel, aURL, dis

[Libreoffice-commits] core.git: solenv/clang-format xmlscript/source

2020-11-18 Thread Philipp Hofer (via logerrit)

 solenv/clang-format/excludelist  |2 --
 xmlscript/source/inc/xml_import.hxx  |   10 ++
 xmlscript/source/xmldlg_imexp/common.hxx |   14 ++
 3 files changed, 8 insertions(+), 18 deletions(-)

New commits:
commit 25e14502fdeac6c03dfed125d789b2822f488cfe
Author: Philipp Hofer 
AuthorDate: Thu Nov 12 13:29:33 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Nov 18 12:28:35 2020 +0100

tdf#123936 Formatting files in module xmlscript with clang-format

Change-Id: Icf80c9d282d31c5513daf38c81802988e4fe300b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105733
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index b1ed3d35e339..fa01006ff459 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -17782,11 +17782,9 @@ xmlreader/source/pad.cxx
 xmlreader/source/span.cxx
 xmlreader/source/xmlreader.cxx
 xmlscript/source/inc/misc.hxx
-xmlscript/source/inc/xml_import.hxx
 xmlscript/source/xml_helper/xml_byteseq.cxx
 xmlscript/source/xml_helper/xml_element.cxx
 xmlscript/source/xml_helper/xml_impctx.cxx
-xmlscript/source/xmldlg_imexp/common.hxx
 xmlscript/source/xmldlg_imexp/exp_share.hxx
 xmlscript/source/xmldlg_imexp/imp_share.hxx
 xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx
diff --git a/xmlscript/source/inc/xml_import.hxx 
b/xmlscript/source/inc/xml_import.hxx
index d4a2a4839890..913634738a47 100644
--- a/xmlscript/source/inc/xml_import.hxx
+++ b/xmlscript/source/inc/xml_import.hxx
@@ -23,8 +23,6 @@
 
 namespace xmlscript
 {
-
-
 //  IMPORTING
 
 /** Creates a document handler to be used for SAX1 parser that can handle
@@ -39,12 +37,8 @@ namespace xmlscript
 @return
 document handler for parser
 */
-css::uno::Reference< css::xml::sax::XDocumentHandler >
-createDocumentHandler(
-css::uno::Reference<
-css::xml::input::XRoot > const & xRoot );
-
+css::uno::Reference
+createDocumentHandler(css::uno::Reference const& 
xRoot);
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlscript/source/xmldlg_imexp/common.hxx 
b/xmlscript/source/xmldlg_imexp/common.hxx
index ef2358f3c402..88b32b0a4889 100644
--- a/xmlscript/source/xmldlg_imexp/common.hxx
+++ b/xmlscript/source/xmldlg_imexp/common.hxx
@@ -21,8 +21,8 @@
 
 #include 
 
-namespace xmlscript {
-
+namespace xmlscript
+{
 const sal_Int16 BORDER_NONE = 0;
 const sal_Int16 BORDER_3D = 1;
 const sal_Int16 BORDER_SIMPLE = 2;
@@ -30,14 +30,12 @@ const sal_Int16 BORDER_SIMPLE_COLOR = 3;
 
 struct StringTriple
 {
-char const * first;
-char const * second;
-char const * third;
+char const* first;
+char const* second;
+char const* third;
 };
 
-extern StringTriple const * const g_pEventTranslations;
-
+extern StringTriple const* const g_pEventTranslations;
 }
 
-
 /* 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: solenv/clang-format xmlhelp/source

2020-11-18 Thread Philipp Hofer (via logerrit)

 solenv/clang-format/excludelist  |1 -
 xmlhelp/source/cxxhelp/test/abidebug.hxx |2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit c4286f91f2d8dce8d42bad2dda85c13658d5e0b9
Author: Philipp Hofer 
AuthorDate: Thu Nov 12 13:28:35 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Nov 18 12:28:12 2020 +0100

tdf#123936 Formatting files in module xmlhelp with clang-format

Change-Id: Iea20b06c8268ac67c1ae2a99fa27f5aab7ee95e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105731
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 671f9ebf6eed..b1ed3d35e339 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -17152,7 +17152,6 @@ xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
 xmlhelp/source/cxxhelp/provider/resultsetforroot.hxx
 xmlhelp/source/cxxhelp/provider/urlparameter.cxx
 xmlhelp/source/cxxhelp/provider/urlparameter.hxx
-xmlhelp/source/cxxhelp/test/abidebug.hxx
 xmlhelp/source/cxxhelp/test/searchdemo.cxx
 xmlhelp/source/treeview/tvfactory.cxx
 xmlhelp/source/treeview/tvread.cxx
diff --git a/xmlhelp/source/cxxhelp/test/abidebug.hxx 
b/xmlhelp/source/cxxhelp/test/abidebug.hxx
index e1a661c1032c..df42d7a3d32b 100644
--- a/xmlhelp/source/cxxhelp/test/abidebug.hxx
+++ b/xmlhelp/source/cxxhelp/test/abidebug.hxx
@@ -23,7 +23,7 @@
 #include 
 #include 
 
-ostream& operator<<( ostream& out,const OUString& bla );
+ostream& operator<<(ostream& out, const OUString& bla);
 
 #endif // INCLUDED_XMLHELP_SOURCE_CXXHELP_TEST_ABIDEBUG_HXX
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/clang-format ucb/source

2020-11-18 Thread Philipp Hofer (via logerrit)

 solenv/clang-format/excludelist  |   10 
 ucb/source/core/identify.cxx |   26 +++
 ucb/source/core/identify.hxx |6 +
 ucb/source/ucp/ftp/ftpcfunc.hxx  |7 +-
 ucb/source/ucp/ftp/ftpintreq.cxx |   26 ++-
 ucb/source/ucp/gio/gio_provider.hxx  |   25 --
 ucb/source/ucp/gio/gio_seekable.hxx  |   16 ++
 ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx |   18 +++
 ucb/source/ucp/webdav-neon/LockEntrySequence.hxx |6 +
 ucb/source/ucp/webdav/DAVSessionFactory.hxx  |   19 +++-
 ucb/source/ucp/webdav/webdavresponseparser.hxx   |   11 +
 11 files changed, 61 insertions(+), 109 deletions(-)

New commits:
commit b58f43e13902517dae5343913e584b7232cc2155
Author: Philipp Hofer 
AuthorDate: Thu Nov 12 13:23:36 2020 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Nov 18 12:27:52 2020 +0100

tdf#123936 Formatting files in module ucb with clang-format

Change-Id: I645c81c1454d3eeea6083387f1d343985b4b6d96
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105722
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 04317cf9cd4a..671f9ebf6eed 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -15299,8 +15299,6 @@ ucb/source/cacher/dynamicresultsetwrapper.hxx
 ucb/source/core/FileAccess.cxx
 ucb/source/core/cmdenv.cxx
 ucb/source/core/cmdenv.hxx
-ucb/source/core/identify.cxx
-ucb/source/core/identify.hxx
 ucb/source/core/providermap.hxx
 ucb/source/core/provprox.cxx
 ucb/source/core/provprox.hxx
@@ -15381,7 +15379,6 @@ ucb/source/ucp/file/filtask.hxx
 ucb/source/ucp/file/prov.cxx
 ucb/source/ucp/file/prov.hxx
 ucb/source/ucp/ftp/ftpcfunc.cxx
-ucb/source/ucp/ftp/ftpcfunc.hxx
 ucb/source/ucp/ftp/ftpcontainer.hxx
 ucb/source/ucp/ftp/ftpcontent.cxx
 ucb/source/ucp/ftp/ftpcontent.hxx
@@ -15394,7 +15391,6 @@ ucb/source/ucp/ftp/ftpdirp.cxx
 ucb/source/ucp/ftp/ftpdirp.hxx
 ucb/source/ucp/ftp/ftpdynresultset.cxx
 ucb/source/ucp/ftp/ftpdynresultset.hxx
-ucb/source/ucp/ftp/ftpintreq.cxx
 ucb/source/ucp/ftp/ftpintreq.hxx
 ucb/source/ucp/ftp/ftploaderthread.cxx
 ucb/source/ucp/ftp/ftploaderthread.hxx
@@ -15416,11 +15412,9 @@ ucb/source/ucp/gio/gio_mount.hxx
 ucb/source/ucp/gio/gio_outputstream.cxx
 ucb/source/ucp/gio/gio_outputstream.hxx
 ucb/source/ucp/gio/gio_provider.cxx
-ucb/source/ucp/gio/gio_provider.hxx
 ucb/source/ucp/gio/gio_resultset.cxx
 ucb/source/ucp/gio/gio_resultset.hxx
 ucb/source/ucp/gio/gio_seekable.cxx
-ucb/source/ucp/gio/gio_seekable.hxx
 ucb/source/ucp/hierarchy/dynamicresultset.cxx
 ucb/source/ucp/hierarchy/dynamicresultset.hxx
 ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -15459,7 +15453,6 @@ ucb/source/ucp/tdoc/tdoc_docmgr.hxx
 ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
 ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx
 ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
-ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx
 ucb/source/ucp/tdoc/tdoc_provider.cxx
 ucb/source/ucp/tdoc/tdoc_provider.hxx
 ucb/source/ucp/tdoc/tdoc_resultset.cxx
@@ -15491,7 +15484,6 @@ ucb/source/ucp/webdav-neon/DateTimeHelper.hxx
 ucb/source/ucp/webdav-neon/LinkSequence.cxx
 ucb/source/ucp/webdav-neon/LinkSequence.hxx
 ucb/source/ucp/webdav-neon/LockEntrySequence.cxx
-ucb/source/ucp/webdav-neon/LockEntrySequence.hxx
 ucb/source/ucp/webdav-neon/LockSequence.cxx
 ucb/source/ucp/webdav-neon/LockSequence.hxx
 ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx
@@ -15536,7 +15528,6 @@ ucb/source/ucp/webdav/DAVResourceAccess.cxx
 ucb/source/ucp/webdav/DAVResourceAccess.hxx
 ucb/source/ucp/webdav/DAVSession.hxx
 ucb/source/ucp/webdav/DAVSessionFactory.cxx
-ucb/source/ucp/webdav/DAVSessionFactory.hxx
 ucb/source/ucp/webdav/DAVTypes.hxx
 ucb/source/ucp/webdav/DateTimeHelper.cxx
 ucb/source/ucp/webdav/DateTimeHelper.hxx
@@ -15589,7 +15580,6 @@ ucb/source/ucp/webdav/webdavdatasupplier.hxx
 ucb/source/ucp/webdav/webdavprovider.cxx
 ucb/source/ucp/webdav/webdavprovider.hxx
 ucb/source/ucp/webdav/webdavresponseparser.cxx
-ucb/source/ucp/webdav/webdavresponseparser.hxx
 ucb/source/ucp/webdav/webdavresultset.cxx
 ucb/source/ucp/webdav/webdavresultset.hxx
 ucb/source/ucp/webdav/webdavservices.cxx
diff --git a/ucb/source/core/identify.cxx b/ucb/source/core/identify.cxx
index 912163080154..41f5db735afa 100644
--- a/ucb/source/core/identify.cxx
+++ b/ucb/source/core/identify.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 /**
 TODO
  **
@@ -30,39 +29,30 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using name

[Libreoffice-commits] core.git: solenv/clang-format ucbhelper/source

2020-11-18 Thread Philipp Hofer (via logerrit)

 solenv/clang-format/excludelist|3 ---
 ucbhelper/source/client/activedatasink.cxx |9 ++---
 ucbhelper/source/client/activedatastreamer.cxx |8 ++--
 ucbhelper/source/client/activedatastreamer.hxx |   11 ---
 4 files changed, 8 insertions(+), 23 deletions(-)

New commits:
commit 8e7f1188899023de3be07c99f146196b39dfd584
Author: Philipp Hofer 
AuthorDate: Thu Nov 12 13:23:57 2020 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Wed Nov 18 12:14:56 2020 +0100

tdf#123936 Formatting files in module ucbhelper with clang-format

Change-Id: Ic18cb095646f060046f83663f7b369533ffb481a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105723
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index ce665e06989d..04317cf9cd4a 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -15593,9 +15593,6 @@ ucb/source/ucp/webdav/webdavresponseparser.hxx
 ucb/source/ucp/webdav/webdavresultset.cxx
 ucb/source/ucp/webdav/webdavresultset.hxx
 ucb/source/ucp/webdav/webdavservices.cxx
-ucbhelper/source/client/activedatasink.cxx
-ucbhelper/source/client/activedatastreamer.cxx
-ucbhelper/source/client/activedatastreamer.hxx
 ucbhelper/source/client/commandenvironment.cxx
 ucbhelper/source/client/content.cxx
 ucbhelper/source/client/interceptedinteraction.cxx
diff --git a/ucbhelper/source/client/activedatasink.cxx 
b/ucbhelper/source/client/activedatasink.cxx
index bf92699de69b..fdbcbdccb977 100644
--- a/ucbhelper/source/client/activedatasink.cxx
+++ b/ucbhelper/source/client/activedatasink.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 /**
 TODO
  **
@@ -33,17 +32,13 @@ namespace ucbhelper
 // XActiveDataSink methods.
 
 // virtual
-void SAL_CALL ActiveDataSink::setInputStream( const uno::Reference< 
io::XInputStream >& aStream )
+void SAL_CALL ActiveDataSink::setInputStream(const 
uno::Reference& aStream)
 {
 m_xStream = aStream;
 }
 
-
 // virtual
-uno::Reference< io::XInputStream > SAL_CALL ActiveDataSink::getInputStream()
-{
-return m_xStream;
-}
+uno::Reference SAL_CALL ActiveDataSink::getInputStream() { 
return m_xStream; }
 
 } // namespace ucbhelper
 
diff --git a/ucbhelper/source/client/activedatastreamer.cxx 
b/ucbhelper/source/client/activedatastreamer.cxx
index aab9cef0df29..8438cae49f53 100644
--- a/ucbhelper/source/client/activedatastreamer.cxx
+++ b/ucbhelper/source/client/activedatastreamer.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 /**
 TODO
  **
@@ -34,16 +33,13 @@ namespace ucbhelper
 // XActiveDataStreamer methods.
 
 // virtual
-void SAL_CALL ActiveDataStreamer::setStream( const uno::Reference< io::XStream 
>& xStream )
+void SAL_CALL ActiveDataStreamer::setStream(const uno::Reference& 
xStream)
 {
 m_xStream = xStream;
 }
 
 // virtual
-uno::Reference< io::XStream > SAL_CALL ActiveDataStreamer::getStream()
-{
-return m_xStream;
-}
+uno::Reference SAL_CALL ActiveDataStreamer::getStream() { return 
m_xStream; }
 
 } // namespace ucbhelper
 
diff --git a/ucbhelper/source/client/activedatastreamer.hxx 
b/ucbhelper/source/client/activedatastreamer.hxx
index ae4f53736913..84ee10ac96df 100644
--- a/ucbhelper/source/client/activedatastreamer.hxx
+++ b/ucbhelper/source/client/activedatastreamer.hxx
@@ -25,23 +25,20 @@
 
 namespace ucbhelper
 {
-
-
 /**
   * This class implements the interface css::io::XActiveDataStreamer.
   * Instances of this class can be passed with the parameters of an
   * "open" command.
   */
 
-class ActiveDataStreamer final :
-public cppu::WeakImplHelper< css::io::XActiveDataStreamer >
+class ActiveDataStreamer final : public 
cppu::WeakImplHelper
 {
-css::uno::Reference< css::io::XStream > m_xStream;
+css::uno::Reference m_xStream;
 
 public:
 // XActiveDataStreamer methods.
-virtual void SAL_CALL setStream( const css::uno::Reference< 
css::io::XStream >& xStream ) override;
-virtual css::uno::Reference< css::io::XStream > SAL_CALL getStream() 
override;
+virtual void SAL_CALL setStream(const 
css::uno::Reference& xStream) override;
+virtual css::uno::Reference SAL_CALL getStream() 
override;
 };
 
 } /* namespace ucbhelper */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/clang-format tools/qa tools/source

2020-11-18 Thread Philipp Hofer (via logerrit)

 solenv/clang-format/excludelist|7 --
 tools/qa/cppunit/test_date.cxx |   72 ++---
 tools/qa/cppunit/test_pathutils.cxx|   25 +++
 tools/qa/cppunit/test_rectangle.cxx|9 --
 tools/source/generic/svborder.cxx  |   14 ++--
 tools/source/misc/cpuid.cxx|   31 -
 tools/source/misc/extendapplicationenvironment.cxx |   24 ---
 tools/source/ref/ref.cxx   |6 -
 8 files changed, 89 insertions(+), 99 deletions(-)

New commits:
commit 1582d9a2c5ef9f28bc97a74e25c3948a7611fac1
Author: Philipp Hofer 
AuthorDate: Thu Nov 12 13:23:10 2020 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Wed Nov 18 12:04:58 2020 +0100

tdf#123936 Formatting files in module tools with clang-format

Change-Id: I0f66d02e67388cc4d21c5e96bf84b6848e8de63a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105721
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 872142284d0e..ce665e06989d 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -15245,11 +15245,8 @@ toolkit/source/helper/unowrapper.cxx
 toolkit/source/helper/vclunohelper.cxx
 tools/inc/poly.h
 tools/qa/cppunit/test_color.cxx
-tools/qa/cppunit/test_date.cxx
 tools/qa/cppunit/test_fract.cxx
 tools/qa/cppunit/test_inetmime.cxx
-tools/qa/cppunit/test_pathutils.cxx
-tools/qa/cppunit/test_rectangle.cxx
 tools/qa/cppunit/test_reversemap.cxx
 tools/qa/cppunit/test_stream.cxx
 tools/qa/cppunit/test_urlobj.cxx
@@ -15270,16 +15267,12 @@ tools/source/generic/line.cxx
 tools/source/generic/point.cxx
 tools/source/generic/poly.cxx
 tools/source/generic/poly2.cxx
-tools/source/generic/svborder.cxx
 tools/source/inet/inetmime.cxx
 tools/source/inet/inetmsg.cxx
 tools/source/inet/inetstrm.cxx
 tools/source/memtools/multisel.cxx
-tools/source/misc/cpuid.cxx
-tools/source/misc/extendapplicationenvironment.cxx
 tools/source/misc/pathutils.cxx
 tools/source/ref/globname.cxx
-tools/source/ref/ref.cxx
 tools/source/reversemap/bestreversemap.cxx
 tools/source/stream/stream.cxx
 tools/source/stream/strmunx.cxx
diff --git a/tools/qa/cppunit/test_date.cxx b/tools/qa/cppunit/test_date.cxx
index ca6c39d84109..9a243cce504c 100644
--- a/tools/qa/cppunit/test_date.cxx
+++ b/tools/qa/cppunit/test_date.cxx
@@ -14,7 +14,6 @@
 
 namespace tools
 {
-
 class DateTest : public CppUnit::TestFixture
 {
 public:
@@ -43,45 +42,45 @@ public:
 
 void DateTest::testDate()
 {
-const Date aCE(1,1,1);  // first day CE
-const Date aBCE(31,12,-1);  // last day BCE
-const Date aMin(1,1,-32768);// minimum date
-const Date aMax(31,12,32767);   // maximum date
+const Date aCE(1, 1, 1); // first day CE
+const Date aBCE(31, 12, -1); // last day BCE
+const Date aMin(1, 1, -32768); // minimum date
+const Date aMax(31, 12, 32767); // maximum date
 Date aDate(Date::EMPTY);
 const sal_Int32 kMinDays = -11968265;
-const sal_Int32 kMaxDays =  11967900;
+const sal_Int32 kMaxDays = 11967900;
 
 // Last day BCE to first day CE is 1 day difference.
-CPPUNIT_ASSERT_EQUAL( static_cast(1), aCE - aBCE);
-CPPUNIT_ASSERT_EQUAL( static_cast(-1), aBCE - aCE);
+CPPUNIT_ASSERT_EQUAL(static_cast(1), aCE - aBCE);
+CPPUNIT_ASSERT_EQUAL(static_cast(-1), aBCE - aCE);
 aDate = aBCE;
 aDate.AddDays(1);
-CPPUNIT_ASSERT_EQUAL( aCE.GetDate(), aDate.GetDate());
+CPPUNIT_ASSERT_EQUAL(aCE.GetDate(), aDate.GetDate());
 aDate = aCE;
 aDate.AddDays(-1);
-CPPUNIT_ASSERT_EQUAL( aBCE.GetDate(), aDate.GetDate());
+CPPUNIT_ASSERT_EQUAL(aBCE.GetDate(), aDate.GetDate());
 
 // The entire BCE and CE ranges cover that many days. Day 0 is -0001-12-31
-CPPUNIT_ASSERT_EQUAL( kMaxDays, aMax - aBCE);
-CPPUNIT_ASSERT_EQUAL( kMinDays, aMin - aBCE);
+CPPUNIT_ASSERT_EQUAL(kMaxDays, aMax - aBCE);
+CPPUNIT_ASSERT_EQUAL(kMinDays, aMin - aBCE);
 
 // Truncate at limits, not under-/overflow or wrap.
 aDate = aMin;
 aDate.AddDays(-1);
-CPPUNIT_ASSERT_EQUAL( aMin.GetDate(), aDate.GetDate());
+CPPUNIT_ASSERT_EQUAL(aMin.GetDate(), aDate.GetDate());
 aDate = aMax;
 aDate.AddDays(1);
-CPPUNIT_ASSERT_EQUAL( aMax.GetDate(), aDate.GetDate());
+CPPUNIT_ASSERT_EQUAL(aMax.GetDate(), aDate.GetDate());
 aDate = aBCE;
-aDate.AddDays(kMinDays-10);
-CPPUNIT_ASSERT_EQUAL( aMin.GetDate(), aDate.GetDate());
+aDate.AddDays(kMinDays - 10);
+CPPUNIT_ASSERT_EQUAL(aMin.GetDate(), aDate.GetDate());
 aDate = aBCE;
-aDate.AddDays(kMaxDays+10);
-CPPUNIT_ASSERT_EQUAL( aMax.GetDate(), aDate.GetDate());
+aDate.AddDays(kMaxDays + 10);
+CPPUNIT_ASSERT_EQUAL(aMax.GetDate(), aDate.GetDate());
 aDate = aMax;
 aDate.SetDay(32);
 aDate.Normalize();
-CPPUNIT_ASSERT_EQUAL( aMax.GetDate(), aDat

[Libreoffice-commits] core.git: solenv/clang-format test/source

2020-11-18 Thread Philipp Hofer (via logerrit)

 solenv/clang-format/excludelist|   20 
 test/source/container/xnamed.cxx   |8 +--
 test/source/setupvcl.hxx   |5 --
 test/source/sheet/cellproperties.cxx   |9 +--
 test/source/sheet/databaserange.cxx|   45 +-
 test/source/sheet/datapilotitem.cxx|   10 +---
 test/source/sheet/xcelladdressable.cxx |7 +-
 test/source/sheet/xcellrangereferrer.cxx   |   10 ++--
 test/source/sheet/xdatabaserange.cxx   |   71 +
 test/source/sheet/xdatapilottable.cxx  |   18 ++-
 test/source/sheet/xgoalseek.cxx|   13 ++---
 test/source/sheet/xsheetoperation.cxx  |   15 ++
 test/source/sheet/xspreadsheetdocument.cxx |   13 ++---
 test/source/sheet/xsubtotaldescriptor.cxx  |   11 ++--
 test/source/sheet/xviewfreezable.cxx   |9 +--
 test/source/sheet/xviewpane.cxx|   11 ++--
 test/source/text/xtext.cxx |5 --
 test/source/text/xtextcontent.cxx  |   15 ++
 test/source/unoapi_test.cxx|9 ++-
 test/source/util/xreplaceable.cxx  |   25 +-
 test/source/util/xsearchable.cxx   |   29 +--
 21 files changed, 158 insertions(+), 200 deletions(-)

New commits:
commit f5e3b2e83ab463064f100a9cd93f09cadaae2292
Author: Philipp Hofer 
AuthorDate: Thu Nov 12 13:22:23 2020 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Wed Nov 18 12:04:26 2020 +0100

tdf#123936 Formatting files in module test with clang-format

Change-Id: I8b2cc4917564626432ce0219e24f253a534ce8e8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105719
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 540f8de33912..872142284d0e 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -15092,30 +15092,20 @@ sw/source/uibase/wrtsh/wrtsh4.cxx
 sw/source/uibase/wrtsh/wrtundo.cxx
 test/source/bootstrapfixture.cxx
 test/source/calc_unoapi_test.cxx
-test/source/container/xnamed.cxx
 test/source/diff/diff.cxx
 test/source/htmltesttools.cxx
 test/source/isheadless.hxx
 test/source/screenshot_test.cxx
 test/source/setupvcl.cxx
-test/source/setupvcl.hxx
-test/source/sheet/cellproperties.cxx
-test/source/sheet/databaserange.cxx
 test/source/sheet/datapilotfield.cxx
-test/source/sheet/datapilotitem.cxx
 test/source/sheet/xarealink.cxx
 test/source/sheet/xarealinks.cxx
-test/source/sheet/xcelladdressable.cxx
 test/source/sheet/xcellrangedata.cxx
-test/source/sheet/xcellrangereferrer.cxx
 test/source/sheet/xcellrangesquery.cxx
 test/source/sheet/xcellseries.cxx
-test/source/sheet/xdatabaserange.cxx
 test/source/sheet/xdatapilotdescriptor.cxx
 test/source/sheet/xdatapilotfieldgrouping.cxx
-test/source/sheet/xdatapilottable.cxx
 test/source/sheet/xdatapilottable2.cxx
-test/source/sheet/xgoalseek.cxx
 test/source/sheet/xnamedrange.cxx
 test/source/sheet/xprintareas.cxx
 test/source/sheet/xsheetannotation.cxx
@@ -15123,26 +15113,16 @@ test/source/sheet/xsheetannotations.cxx
 test/source/sheet/xsheetannotationshapesupplier.cxx
 test/source/sheet/xsheetfilterable.cxx
 test/source/sheet/xsheetlinkable.cxx
-test/source/sheet/xsheetoperation.cxx
 test/source/sheet/xsheetoutline.cxx
 test/source/sheet/xsheetpagebreak.cxx
 test/source/sheet/xspreadsheet.cxx
-test/source/sheet/xspreadsheetdocument.cxx
 test/source/sheet/xspreadsheets.cxx
 test/source/sheet/xspreadsheets2.cxx
 test/source/sheet/xsubtotalcalculatable.cxx
-test/source/sheet/xsubtotaldescriptor.cxx
 test/source/sheet/xsubtotalfield.cxx
 test/source/sheet/xuniquecellformatrangessupplier.cxx
 test/source/sheet/xusedareacursor.cxx
-test/source/sheet/xviewfreezable.cxx
-test/source/sheet/xviewpane.cxx
 test/source/sheet/xviewsplitable.cxx
-test/source/text/xtext.cxx
-test/source/text/xtextcontent.cxx
-test/source/unoapi_test.cxx
-test/source/util/xreplaceable.cxx
-test/source/util/xsearchable.cxx
 test/source/vclbootstrapprotector.cxx
 test/source/xmltesttools.cxx
 testtools/source/bridgetest/bridgetest.cxx
diff --git a/test/source/container/xnamed.cxx b/test/source/container/xnamed.cxx
index 799011f41ebd..000a9f62e094 100644
--- a/test/source/container/xnamed.cxx
+++ b/test/source/container/xnamed.cxx
@@ -20,17 +20,17 @@
 using namespace css;
 using namespace css::uno;
 
-namespace apitest {
-
+namespace apitest
+{
 void XNamed::testGetName()
 {
-uno::Reference< container::XNamed > xNamed(init(), UNO_QUERY_THROW);
+uno::Reference xNamed(init(), UNO_QUERY_THROW);
 CPPUNIT_ASSERT_EQUAL(m_aTestName, xNamed->getName());
 }
 
 void XNamed::testSetName()
 {
-uno::Reference< container::XNamed > xNamed(init(), UNO_QUERY_THROW);
+uno::Reference xNamed(init(), UNO_QUERY_THROW);
 OUString aTestName("NewName");
 
 xNamed->setName(aTestName);
diff --git a/test/source/setupvcl.hxx b/test/source/setupvcl.hxx
index 78d4683e50ce..5da3b19

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

2020-11-18 Thread Stephan Bergmann (via logerrit)

 external/skia/UnpackedTarball_skia.mk |3 ++-
 external/skia/ubsan.patch.0   |   32 
 2 files changed, 34 insertions(+), 1 deletion(-)

New commits:
commit 831148376eed244292638d57099ab92fe4bdffbe
Author: Stephan Bergmann 
AuthorDate: Wed Nov 18 07:40:01 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 18 11:43:33 2020 +0100

external/skia: UBSan needs GrContext_Base RTTI now

...in vcl:

> [GAL] sounds
> instdir/program/gengal.bin: symbol lookup error: 
instdir/program/libvcllo.so: undefined symbol: _ZTI14GrContext_Base
> make[1]: *** [solenv/gbuild/Gallery.mk:56: workdir/Gallery/sounds.done] 
Error 1

(I didn't check what source exactly causes UBSan to require it now.)

Marking both the class and some of its members as SK_API would cause MSVC to
fail with

> error: attribute 'dllexport' cannot be applied to member of 'dllexport' 
class

so remove it from the class members.

Change-Id: I9f5ed397d32f1f445bfa1d70bcff494e78c16046
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106039
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/skia/UnpackedTarball_skia.mk 
b/external/skia/UnpackedTarball_skia.mk
index b4aab05a80c5..319b33716a96 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -35,7 +35,8 @@ skia_patches := \
 fix-windows-dwrite.patch.1 \
 c++20.patch.0 \
 constexpr-debug-std-max.patch.1 \
-swap-buffers-rect.patch.1
+swap-buffers-rect.patch.1 \
+ubsan.patch.0
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
 
diff --git a/external/skia/ubsan.patch.0 b/external/skia/ubsan.patch.0
new file mode 100644
index ..c249b02f3f14
--- /dev/null
+++ b/external/skia/ubsan.patch.0
@@ -0,0 +1,32 @@
+--- include/private/GrContext_Base.h
 include/private/GrContext_Base.h
+@@ -20,7 +20,7 @@
+ class GrImageContext;
+ class GrRecordingContext;
+ 
+-class GrContext_Base : public SkRefCnt {
++class SK_API GrContext_Base : public SkRefCnt {
+ public:
+ ~GrContext_Base() override;
+ 
+@@ -32,7 +32,7 @@
+ /*
+  * The 3D API backing this context
+  */
+-SK_API GrBackendApi backend() const;
++GrBackendApi backend() const;
+ 
+ /*
+  * Retrieve the default GrBackendFormat for a given SkColorType and 
renderability.
+@@ -41,9 +41,9 @@
+  *
+  * The caller should check that the returned format is valid.
+  */
+-SK_API GrBackendFormat defaultBackendFormat(SkColorType, GrRenderable) 
const;
++GrBackendFormat defaultBackendFormat(SkColorType, GrRenderable) const;
+ 
+-SK_API GrBackendFormat compressedBackendFormat(SkImage::CompressionType) 
const;
++GrBackendFormat compressedBackendFormat(SkImage::CompressionType) const;
+ 
+ // TODO: When the public version is gone, rename to refThreadSafeProxy 
and add raw ptr ver.
+ sk_sp threadSafeProxy();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-11-18 Thread Stephan Bergmann (via logerrit)

 include/vcl/GraphicObject.hxx|3 +--
 svx/source/svdraw/svdograf.cxx   |2 +-
 sw/source/core/graphic/ndgrf.cxx |   12 ++--
 vcl/source/graphic/GraphicObject.cxx |7 +--
 4 files changed, 9 insertions(+), 15 deletions(-)

New commits:
commit 6318f3a9805c9a8831a06e8bd471dea095fcf8ba
Author: Stephan Bergmann 
AuthorDate: Wed Nov 18 10:04:49 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 18 11:42:39 2020 +0100

Remove unused GraphicObject::SetGraphic pCopyObj and rLink parameters

The defaulted pCopyObj parameter of the first SetGraphic overload became 
unused
with ea3d755ac949c1b6dada5c341e018f8c23f5d395 "vcl: detach usage and remove
GraphicManager and GraphicCache", and then the rLink parameter of the second
overload became unused with e4eb416c3ef81d098ed61caabd2077cbbb2418bc "remove
swapping and link from GraphicObject and Graphic" (removing the need to 
have two
different overloads).

Change-Id: I15a648845ed474ee302e2a9836776ba74b9c44a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106045
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/include/vcl/GraphicObject.hxx b/include/vcl/GraphicObject.hxx
index c302387995ff..d10b46b92c4c 100644
--- a/include/vcl/GraphicObject.hxx
+++ b/include/vcl/GraphicObject.hxx
@@ -166,8 +166,7 @@ public:
 booloperator!=( const GraphicObject& rCacheObj ) const 
{ return !( *this == rCacheObj ); }
 
 const Graphic&  GetGraphic() const;
-voidSetGraphic( const Graphic& rGraphic, const 
GraphicObject* pCopyObj = nullptr);
-voidSetGraphic( const Graphic& rGraphic, 
std::u16string_view rLink );
+voidSetGraphic( const Graphic& rGraphic);
 
 /** Get graphic transformed according to given attributes
 
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 217d953d532d..f175f9c33181 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -749,7 +749,7 @@ SdrGrafObj& SdrGrafObj::operator=( const SdrGrafObj& rObj )
 if (mbIsSignatureLine && rObj.mpSignatureLineUnsignedGraphic)
 mpGraphicObject->SetGraphic(rObj.mpSignatureLineUnsignedGraphic);
 else
-mpGraphicObject->SetGraphic( rObj.GetGraphic(), 
&rObj.GetGraphicObject() );
+mpGraphicObject->SetGraphic( rObj.GetGraphic() );
 
 if( rObj.IsLinkedGraphic() )
 {
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index ab4057eaebf9..df244ccf1865 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -106,7 +106,7 @@ SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
 mbIsStreamReadOnly( false )
 {
 Graphic aGrf; aGrf.SetDefaultType();
-maGrfObj.SetGraphic( aGrf, rGrfName );
+maGrfObj.SetGraphic( aGrf );
 
 mbInSwapIn = mbChangeTwipSize =
 mbFrameInPaint = mbScaleImageMap = false;
@@ -190,7 +190,7 @@ bool SwGrfNode::ReRead(
 
 if( pGraphic )
 {
-maGrfObj.SetGraphic( *pGraphic, sURLLink );
+maGrfObj.SetGraphic( *pGraphic );
 onGraphicChanged();
 bReadGrf = true;
 }
@@ -199,7 +199,7 @@ bool SwGrfNode::ReRead(
 // reset data of the old graphic so that the correct placeholder is
 // shown in case the new link could not be loaded
 Graphic aGrf; aGrf.SetDefaultType();
-maGrfObj.SetGraphic( aGrf, sURLLink );
+maGrfObj.SetGraphic( aGrf );
 
 if( mxLink.is() )
 {
@@ -235,7 +235,7 @@ bool SwGrfNode::ReRead(
 {
 if( pGraphic )
 {
-maGrfObj.SetGraphic( *pGraphic, sURLLink );
+maGrfObj.SetGraphic( *pGraphic );
 onGraphicChanged();
 bReadGrf = true;
 // create connection without update, as we have the graphic
@@ -245,7 +245,7 @@ bool SwGrfNode::ReRead(
 {
 Graphic aGrf;
 aGrf.SetDefaultType();
-maGrfObj.SetGraphic( aGrf, sURLLink );
+maGrfObj.SetGraphic( aGrf );
 onGraphicChanged();
 if ( bNewGrf )
 {
@@ -356,7 +356,7 @@ void SwGrfNode::onGraphicChanged()
 
 void SwGrfNode::SetGraphic(const Graphic& rGraphic)
 {
-maGrfObj.SetGraphic(rGraphic, OUString());
+maGrfObj.SetGraphic(rGraphic);
 onGraphicChanged();
 }
 
diff --git a/vcl/source/graphic/GraphicObject.cxx 
b/vcl/source/graphic/GraphicObject.cxx
index 6728ab5d170e..aa5435d3ad50 100644
--- a/vcl/source/graphic/GraphicObject.cxx
+++ b/vcl/source/graphic/GraphicObject.cxx
@@ -602,16 +602,11 @@ const Graphic& GraphicObject::GetGraphic() const
 return maGraphic;
 }
 
-void GraphicObject::SetGraphic( const Graphic& rGraphic, const GraphicObject* 
/*pCopyObj*/)
+void GraphicObject::SetGra

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/source

2020-11-18 Thread Jim Raykowski (via logerrit)

 sw/source/core/frmedt/feshview.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 46d6effe3373a39938bde57b43dc45c4a30ce33f
Author: Jim Raykowski 
AuthorDate: Mon Nov 16 08:09:11 2020 -0900
Commit: Xisco Fauli 
CommitDate: Wed Nov 18 11:28:23 2020 +0100

tdf#130629 Don't add object insert undo twice

Change-Id: I074afd4397b6fc4631bd00655de56b8a154d7dff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105955
Tested-by: Jenkins
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 
Reviewed-by: Jim Raykowski 
(cherry picked from commit 5110cca39cc55c8977b81f7b09873e626144b29b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105995

diff --git a/sw/source/core/frmedt/feshview.cxx 
b/sw/source/core/frmedt/feshview.cxx
index ac98cefd0c63..9da71abf8b8c 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -3137,7 +3137,12 @@ long SwFEShell::GetSectionWidth( SwFormat const & 
rFormat ) const
 }
 SdrPageView* pPageView = pDrawView->GetSdrPageView();
 SdrCreateView::SetupObjLayer(pPageView, pDrawView->GetActiveLayer(), 
pObj);
+// switch undo off or this combined with ImpEndCreate will cause two 
undos
+// see comment made in SwFEShell::EndCreate (we create our own 
undo-object!)
+const bool bUndo(GetDoc()->GetIDocumentUndoRedo().DoesUndo());
+GetDoc()->GetIDocumentUndoRedo().DoUndo(false);
 pDrawView->InsertObjectAtView(pObj, *pPageView);
+GetDoc()->GetIDocumentUndoRedo().DoUndo(bUndo);
 }
 ImpEndCreate();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

2020-11-18 Thread Tor Lillqvist (via logerrit)

 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 71af21f7b0e4a0e95a1814c211bab24b6e3aed9c
Author: Tor Lillqvist 
AuthorDate: Fri Nov 13 13:39:17 2020 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Nov 18 10:49:41 2020 +0100

Accept iOS SDK 14.2

Change-Id: Icd30133588f3cffb5de41303dc03cb325c20fe83
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105788
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106044
Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index 8f104514ec19..250f43054e17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3386,8 +3386,8 @@ dnl 
===
 
 if test $_os = iOS; then
 AC_MSG_CHECKING([what iOS SDK to use])
-current_sdk_ver=14.1
-older_sdk_vers="14.0 13.7 13.6 13.5 13.4 13.2 13.1 13.0 12.4 12.2"
+current_sdk_ver=14.2
+older_sdk_vers="14.1 14.0 13.7 13.6 13.5 13.4 13.2 13.1 13.0 12.4 12.2"
 if test "$enable_ios_simulator" = "yes"; then
 platform=iPhoneSimulator
 versionmin=-mios-simulator-version-min=12.2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-11-18 Thread Gülşah Köse (via logerrit)

 oox/inc/drawingml/scene3dcontext.hxx   |   13 +++-
 oox/inc/drawingml/shape3dproperties.hxx|7 +++-
 oox/inc/drawingml/textbody.hxx |5 +++
 oox/source/drawingml/scene3dcontext.cxx|   33 +
 oox/source/drawingml/shape.cxx |   20 
 oox/source/drawingml/shape3dproperties.cxx |   30 +--
 oox/source/drawingml/textbodypropertiescontext.cxx |2 -
 oox/source/export/drawingml.cxx|   28 +++--
 oox/source/export/shapes.cxx   |   12 +++
 9 files changed, 126 insertions(+), 24 deletions(-)

New commits:
commit 72998fc859a83f063698c287d035f3fdc8b4481c
Author: Gülşah Köse 
AuthorDate: Tue Nov 17 12:43:12 2020 +0300
Commit: Gülşah Köse 
CommitDate: Wed Nov 18 10:36:07 2020 +0100

tdf#128213 Fix text camera z rotation import and export.

Text3DProperties is added to distinguish shape and text 3D effects.
Before there was implementation error about text camera z rotation
support. We were using shape effects for text. We already have not
support shape 3D rotation but we have text camera z rotation. This
patch includes import and export filter changes about text camera z
rotation.

Change-Id: I623392b82edf4585888d2f15ad91ffb2109d8f96
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106033
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 

diff --git a/oox/inc/drawingml/scene3dcontext.hxx 
b/oox/inc/drawingml/scene3dcontext.hxx
index efc9e694f659..400cfff98063 100644
--- a/oox/inc/drawingml/scene3dcontext.hxx
+++ b/oox/inc/drawingml/scene3dcontext.hxx
@@ -41,14 +41,23 @@ private:
 class Scene3DPropertiesContext final : public ::oox::core::ContextHandler2
 {
 public:
-Scene3DPropertiesContext( ::oox::core::ContextHandler2Helper const & 
rParent, Shape3DProperties& r3DProperties ) throw();
-
+Scene3DPropertiesContext( ::oox::core::ContextHandler2Helper const & 
rParent, Shape3DProperties& rShape3DProperties ) throw();
 ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const 
::oox::AttributeList& rAttribs ) override;
 
 private:
 Shape3DProperties& mr3DProperties;
 };
 
+class SceneText3DPropertiesContext final : public ::oox::core::ContextHandler2
+{
+public:
+SceneText3DPropertiesContext( ::oox::core::ContextHandler2Helper const & 
rParent, Text3DProperties& rText3DProperties ) throw();
+::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const 
::oox::AttributeList& rAttribs ) override;
+
+private:
+Text3DProperties& mr3DProperties;
+};
+
 class Shape3DPropertiesContext final : public ::oox::core::ContextHandler2
 {
 public:
diff --git a/oox/inc/drawingml/shape3dproperties.hxx 
b/oox/inc/drawingml/shape3dproperties.hxx
index 683a771b8bdc..c43e643aae5c 100644
--- a/oox/inc/drawingml/shape3dproperties.hxx
+++ b/oox/inc/drawingml/shape3dproperties.hxx
@@ -44,7 +44,7 @@ struct BevelProperties
 OptValue< sal_Int32 > mnHeight;
 };
 
-struct Shape3DProperties
+struct Generic3DProperties
 {
 OptValue< sal_Int32 > mnPreset;
 OptValue< float > mfFieldOfVision;
@@ -79,6 +79,11 @@ struct Shape3DProperties
 const Color& rColor, const GraphicHelper& rGraphicHelper, ::Color 
rPhClr );
 };
 
+struct Shape3DProperties : Generic3DProperties
+{};
+
+struct Text3DProperties : Generic3DProperties
+{};
 
 } // namespace oox::drawingml
 
diff --git a/oox/inc/drawingml/textbody.hxx b/oox/inc/drawingml/textbody.hxx
index db4c03c6f702..5e6d156e7ce4 100644
--- a/oox/inc/drawingml/textbody.hxx
+++ b/oox/inc/drawingml/textbody.hxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace com::sun::star::text {
 class XText;
@@ -53,6 +54,9 @@ public:
 const TextBodyProperties&   getTextProperties() const { return 
maTextProperties; }
 TextBodyProperties& getTextProperties() { return 
maTextProperties; }
 
+Text3DProperties&   get3DProperties() { return 
ma3DProperties; }
+const Text3DProperties& get3DProperties() const { return 
ma3DProperties; }
+
 /** insert the text body at the text cursor */
 voidinsertAt(
 const ::oox::core::XmlFilterBase& rFilterBase,
@@ -72,6 +76,7 @@ protected:
 TextParagraphVector maParagraphs;
 TextBodyProperties  maTextProperties;
 TextListStyle   maTextListStyle;
+Text3DPropertiesma3DProperties;
 };
 
 }
diff --git a/oox/source/drawingml/scene3dcontext.cxx 
b/oox/source/drawingml/scene3dcontext.cxx
index 262d2dfe61ea..91b73f0bbd95 100644
--- a/oox/source/drawingml/scene3dcontext.cxx
+++ b/oox/source/drawingml/scene3dcontext.cxx
@@ -63,6 +63,39 @@ ContextHandlerRef Scene3DPropertiesContext::onCreateContext( 
sal_Int32 aElementT
 return nullptr;
 }
 
+SceneText3DPropertiesContext::SceneText3DPropertiesContext( 
ContextH

[Libreoffice-commits] core.git: basic/source compilerplugins/clang desktop/source i18nlangtag/source include/editeng sc/source sw/source vcl/source

2020-11-18 Thread Stephan Bergmann (via logerrit)

 basic/source/inc/sbunoobj.hxx  |4 +++-
 compilerplugins/clang/stringviewparam.cxx  |4 
 desktop/source/deployment/registry/dp_registry.cxx |3 ++-
 i18nlangtag/source/languagetag/languagetag.cxx |3 ++-
 include/editeng/svxacorr.hxx   |3 ++-
 sc/source/filter/excel/xistyle.cxx |3 ++-
 sc/source/filter/inc/workbookhelper.hxx|4 +++-
 sc/source/filter/oox/workbookhelper.cxx|2 +-
 sw/source/filter/ww8/docxattributeoutput.cxx   |3 ++-
 sw/source/filter/ww8/ww8par.hxx|3 ++-
 vcl/source/helper/driverblocklist.cxx  |6 +-
 11 files changed, 24 insertions(+), 14 deletions(-)

New commits:
commit 6fa1161d3113d43f38acdf9207627659fbc137c8
Author: Stephan Bergmann 
AuthorDate: Wed Nov 18 08:46:33 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 18 10:22:44 2020 +0100

loplugin:stringviewparam: No good reason to exclude operator functions

(at least not in general)

Change-Id: I71337b53dc9735e90a37ee532d0a8a08797b518c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106043
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index e06b0e0137d2..d2458ef6b86b 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -31,6 +31,8 @@
 #include 
 #include 
 #include 
+
+#include 
 #include 
 #include 
 #include 
@@ -63,7 +65,7 @@ class SbUnoStructRefObject: public SbxObject
 {
 struct caseLessComp
 {
-bool operator() (const OUString& rProp, const OUString& rOtherProp ) 
const
+bool operator() (const OUString& rProp, std::u16string_view rOtherProp 
) const
 {
 return rProp.compareToIgnoreAsciiCase( rOtherProp ) < 0;
 }
diff --git a/compilerplugins/clang/stringviewparam.cxx 
b/compilerplugins/clang/stringviewparam.cxx
index 040f8f63b502..0f5ebfc70a3b 100644
--- a/compilerplugins/clang/stringviewparam.cxx
+++ b/compilerplugins/clang/stringviewparam.cxx
@@ -435,10 +435,6 @@ private:
 return false;
 }
 }
-if (decl->isOverloadedOperator()) // e.g. operator()(const OUString&, 
const OUString&)
-{
-return false;
-}
 if (decl->isFunctionTemplateSpecialization())
 {
 return false;
diff --git a/desktop/source/deployment/registry/dp_registry.cxx 
b/desktop/source/deployment/registry/dp_registry.cxx
index 50d0c0c4d68e..90248158056a 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -44,6 +44,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -69,7 +70,7 @@ class PackageRegistryImpl : private MutexHolder, public 
t_helper
 }
 };
 struct ci_string_equals {
-bool operator () ( OUString const & str1, OUString const & str2 ) 
const{
+bool operator () ( OUString const & str1, std::u16string_view str2 ) 
const{
 return str1.equalsIgnoreAsciiCase( str2 );
 }
 };
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index ab9e33019428..b9b6cc20a2d8 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 //#define erDEBUG
@@ -88,7 +89,7 @@ static const KnownTagSet & getKnowns()
 namespace {
 struct compareIgnoreAsciiCaseLess
 {
-bool operator()( const OUString& r1, const OUString& r2 ) const
+bool operator()( const OUString& r1, std::u16string_view r2 ) const
 {
 return r1.compareToIgnoreAsciiCase( r2) < 0;
 }
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index 52f7bfdd5271..4e5d929405f0 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 
 class CharClass;
 class SfxPoolItem;
@@ -43,7 +44,7 @@ namespace tools { template  class SvRef; }
 
 struct CompareSvStringsISortDtor
 {
-bool operator()( OUString const& lhs, OUString const& rhs ) const
+bool operator()( OUString const& lhs, std::u16string_view rhs ) const
 {
 return lhs.compareToIgnoreAsciiCase( rhs ) < 0;
 }
diff --git a/sc/source/filter/excel/xistyle.cxx 
b/sc/source/filter/excel/xistyle.cxx
index 98c91ab6f8c2..a2d76b6e8d54 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -68,6 +68,7 @@
 #include 
 #include 
 
+#include 
 #include 
 
 #include 
@@ -1598,7 +1599,7 @@ namespace {
 /** Functor for case-insensitive string comparison, usable in maps etc. */
 struct IgnoreCaseCompare
 {
-bool operator()( const OUString& rName1, const OUString& rName2 ) const
+bool operator()( const

[Libreoffice-commits] core.git: filter/source include/svx sc/source sd/source svx/source sw/source

2020-11-18 Thread Stephan Bergmann (via logerrit)

 filter/source/msfilter/msdffimp.cxx |7 ++-
 include/svx/svdograf.hxx|3 +--
 sc/source/filter/rtf/eeimpars.cxx   |2 +-
 sc/source/ui/drawfunc/fuins1.cxx|   11 +--
 sc/source/ui/inc/drawview.hxx   |3 +--
 sc/source/ui/inc/viewfunc.hxx   |2 +-
 sc/source/ui/view/drawview.cxx  |5 ++---
 sc/source/ui/view/tabvwsh9.cxx  |2 +-
 sc/source/ui/view/viewfun3.cxx  |6 +++---
 sc/source/ui/view/viewfun4.cxx  |8 +++-
 sc/source/ui/view/viewfun5.cxx  |2 +-
 sc/source/ui/view/viewfun7.cxx  |   11 +--
 sd/source/ui/func/fuinsert.cxx  |9 ++---
 sd/source/ui/view/sdview4.cxx   |2 +-
 svx/source/svdraw/svdograf.cxx  |7 ++-
 sw/source/core/frmedt/fecopy.cxx|8 +---
 sw/source/uibase/shells/drawsh.cxx  |   10 +-
 17 files changed, 33 insertions(+), 65 deletions(-)

New commits:
commit 7938cae5178a4ce4093fd6494a058ab879ba303b
Author: Stephan Bergmann 
AuthorDate: Wed Nov 18 08:24:24 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 18 10:22:16 2020 +0100

Remove unused SdrGrafObj::SetGraphicLink rReferer, rFilterName parameters

unused since 9fb7aaf570c03c8a26d763f1205fb8c890e8211a "Make linked graphic
register into LinkedManager again", and remove further function parameters 
and
class members that turn out to be unused now, too

Change-Id: I3dd2b138fd8787d12b89547526da751ea5954845
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106041
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index aee695bf3990..30d08a3e6d34 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -3759,7 +3759,7 @@ static void lcl_ApplyCropping( const DffPropSet& 
rPropSet, SfxItemSet* pSet, Gra
 SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, SfxItemSet& rSet, 
const DffObjData& rObjData )
 {
 SdrObject*  pRet = nullptr;
-OUStringaLinkFileName, aLinkFilterName;
+OUStringaLinkFileName;
 tools::Rectangle   aVisArea;
 
 auto eFlags = GetPropertyValue(DFF_Prop_pibFlags, mso_blipflagDefault);
@@ -3968,9 +3968,6 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, 
SfxItemSet& rSet, cons
 }
 if( aAbsURL.GetProtocol() != INetProtocol::NotValid )
 {
-GraphicFilter &rGrfFilter = 
GraphicFilter::GetGraphicFilter();
-aLinkFilterName = rGrfFilter.GetImportFormatName(
-rGrfFilter.GetImportFormatNumberForShortName( 
aAbsURL.getExtension() ) );
 aLinkFileName = aAbsURL.GetMainURL( 
INetURLObject::DecodeMechanism::ToIUri );
 }
 else
@@ -4001,7 +3998,7 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt, 
SfxItemSet& rSet, cons
 {
 if( aLinkFileName.getLength() )
 {
-static_cast(pRet)->SetGraphicLink( aLinkFileName, 
u""/*TODO?*/, aLinkFilterName );
+static_cast(pRet)->SetGraphicLink( aLinkFileName );
 Graphic aGraphic(static_cast(pRet)->GetGraphic());
 aGraphic.setOriginURL(aLinkFileName);
 }
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index 5fd2b3ff1946..27f38203edbe 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -92,7 +92,6 @@ private:
 GraphicAttr aGrafInfo;
 
 OUString aFileName; // If it's a Link, the filename can be found in here
-OUString aReferer;
 OUString aFilterName;
 std::unique_ptr mpGraphicObject; // In order to speed up 
output of bitmaps, especially rotated ones
 std::unique_ptr mpReplacementGraphicObject;
@@ -163,7 +162,7 @@ private:
 voidForceSwapIn() const;
 
 public:
-voidSetGraphicLink(const OUString& rFileName, 
std::u16string_view rReferer, std::u16string_view rFilterName);
+voidSetGraphicLink(const OUString& rFileName);
 voidReleaseGraphicLink();
 bool IsLinkedGraphic() const;
 
diff --git a/sc/source/filter/rtf/eeimpars.cxx 
b/sc/source/filter/rtf/eeimpars.cxx
index ce164d24103f..220c733a4da7 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -604,7 +604,7 @@ void ScEEImport::InsertGraphic( SCCOL nCol, SCROW nRow, 
SCTAB nTab,
 // SetGraphicLink has to be used after inserting the object,
 // otherwise an empty graphic is swapped in and the contact stuff 
crashes.
 // See #i37444#.
-pObj->SetGraphicLink( pI->aURL, u""/*TODO?*/, pI->aFilterName );
+pObj->SetGraphicLink( pI->aURL );
 
 pObj->SetLogicRect( aRect ); // Only after InsertObject!
 }
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index

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

2020-11-18 Thread Stephan Bergmann (via logerrit)

 external/icu/ubsan.patch.1 |   38 ++
 1 file changed, 38 insertions(+)

New commits:
commit 904fb08b1ee9a632bbacd80439ef5919468c9464
Author: Stephan Bergmann 
AuthorDate: Wed Nov 18 07:36:06 2020 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Nov 18 09:42:38 2020 +0100

external/icu: Silence UBSan misaligned-pointer-use

...seen when e.g. building CustomTarget/i18npool/breakiterator/char_in.brk:

> rbbitblb.cpp:1405:18: runtime error: member access within misaligned 
address 0x62726987 for type 'icu_68::RBBIStateTableRow', which requires 2 
byte alignment
> 0x62726987: note: pointer points here
>  00 00 00 00 00  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  00 00 
00 00 00 00 00 00  00 00 00
>  ^

and

> rbbitblb.cpp:1607:18: runtime error: member access within misaligned 
address 0x62726ecf for type 'icu_68::RBBIStateTableRow', which requires 2 
byte alignment
> 0x62726ecf: note: pointer points here
>  00 00 00 00 00  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  00 00 
00 00 00 00 00 00  00 00 00
>  ^

(i.e., even though those code branches only access the byte-sized
RBBIStateTableRow8 data, they did so through a RBBIStateTableRow union 
pointer,
which has stronger alignment requirements)

Change-Id: I0abe5bd756758e33e495538f548e80f99460f43c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106038
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/external/icu/ubsan.patch.1 b/external/icu/ubsan.patch.1
index 1c10f8cefcc2..1d7006347bd3 100644
--- a/external/icu/ubsan.patch.1
+++ b/external/icu/ubsan.patch.1
@@ -1,3 +1,41 @@
+--- a/source/common/rbbitblb.cpp
 a/source/common/rbbitblb.cpp
+@@ -1402,12 +1402,13 @@
+ U_ASSERT (sd->fAccepting <= 255);
+ U_ASSERT (sd->fLookAhead <= 255);
+ U_ASSERT (0 <= sd->fTagsIdx && sd->fTagsIdx <= 255);
+-row->r8.fAccepting = sd->fAccepting;
+-row->r8.fLookAhead = sd->fLookAhead;
+-row->r8.fTagsIdx   = sd->fTagsIdx;
++RBBIStateTableRow8 *row8 = reinterpret_cast(row);
++row8->fAccepting = sd->fAccepting;
++row8->fLookAhead = sd->fLookAhead;
++row8->fTagsIdx   = sd->fTagsIdx;
+ for (col=0; colfDtran->elementAti(col) <= 
kMaxStateFor8BitsTable);
+-row->r8.fNextState[col] = sd->fDtran->elementAti(col);
++row8->fNextState[col] = sd->fDtran->elementAti(col);
+ }
+ } else {
+ U_ASSERT (sd->fAccepting <= 0x);
+@@ -1603,12 +1603,13 @@
+ UnicodeString *rowString = (UnicodeString 
*)fSafeTable->elementAt(state);
+ RBBIStateTableRow   *row = (RBBIStateTableRow *)(table->fTableData + 
state*table->fRowLen);
+ if (use8BitsForSafeTable()) {
+-row->r8.fAccepting = 0;
+-row->r8.fLookAhead = 0;
+-row->r8.fTagsIdx= 0;
++RBBIStateTableRow8 *row8 = reinterpret_cast(row);
++row8->fAccepting = 0;
++row8->fLookAhead = 0;
++row8->fTagsIdx= 0;
+ for (col=0; colcharAt(col) <= kMaxStateFor8BitsTable);
+-row->r8.fNextState[col] = 
static_cast(rowString->charAt(col));
++row8->fNextState[col] = 
static_cast(rowString->charAt(col));
+ }
+ } else {
+ row->r16.fAccepting = 0;
 diff -ur icu.org/source/tools/genrb/rbutil.c icu/source/tools/genrb/rbutil.c
 --- icu.org/source/tools/genrb/rbutil.c2020-10-28 22:21:12.0 
+0100
 +++ icu/source/tools/genrb/rbutil.c2020-11-16 19:50:44.005119253 +0100
___
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.4' - external/apr

2020-11-18 Thread Tor Lillqvist (via logerrit)

 external/apr/UnpackedTarball_apr.mk |1 +
 external/apr/exit.patch |   26 ++
 2 files changed, 27 insertions(+)

New commits:
commit ac9099140eeea974c9746528eeb96203d248d1e0
Author: Tor Lillqvist 
AuthorDate: Tue Nov 3 20:54:13 2020 +0200
Commit: Tor Lillqvist 
CommitDate: Wed Nov 18 09:35:06 2020 +0100

Fix apr build with current Xcode: Include  for exit()

(Or whatever it is that had broken it.)

Change-Id: I72bc42e618f011518c05a2cdb875cfe64515b4d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105269
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106042
Tested-by: Jenkins CollaboraOffice 

diff --git a/external/apr/UnpackedTarball_apr.mk 
b/external/apr/UnpackedTarball_apr.mk
index 5f82b8413d64..c3be6167024d 100644
--- a/external/apr/UnpackedTarball_apr.mk
+++ b/external/apr/UnpackedTarball_apr.mk
@@ -14,6 +14,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,apr,$(APR_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,apr,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,apr, \
+external/apr/exit.patch \
 external/apr/uuid.patch \
 ))
 
diff --git a/external/apr/exit.patch b/external/apr/exit.patch
new file mode 100644
index ..5db6a94717cb
--- /dev/null
+++ b/external/apr/exit.patch
@@ -0,0 +1,26 @@
+--- configure
 configure
+@@ -23549,6 +23549,7 @@
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include 
++#include 
+ #include 
+ #ifdef WIN32
+ #define binmode "b"
+@@ -23910,6 +23910,7 @@
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include 
++#include 
+ #include 
+ #ifdef WIN32
+ #define binmode "b"
+@@ -24347,6 +24347,7 @@
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include 
++#include 
+ #include 
+ #include 
+ #ifdef WIN32
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-11-18 Thread Noel Grandin (via logerrit)

 xmloff/source/chart/SchXMLChartContext.cxx |   47 -
 xmloff/source/chart/SchXMLChartContext.hxx |   10 ++---
 xmloff/source/chart/SchXMLParagraphContext.cxx |   11 -
 xmloff/source/chart/SchXMLParagraphContext.hxx |3 -
 xmloff/source/chart/SchXMLTableContext.cxx |2 -
 xmloff/source/chart/SchXMLTextListContext.cxx  |2 -
 6 files changed, 31 insertions(+), 44 deletions(-)

New commits:
commit 388b624dde64fd6c86f15b21f8ac3e42ce9a9db5
Author: Noel Grandin 
AuthorDate: Tue Nov 17 21:40:53 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Nov 18 09:28:16 2020 +0100

fastparser in SchXMLTitleContext

Change-Id: Ie11234a520f344e775d6ae4c030cef5c741233a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106026
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/xmloff/source/chart/SchXMLChartContext.cxx 
b/xmloff/source/chart/SchXMLChartContext.cxx
index a183d0b1e5f4..968bf0cfa76a 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -1205,40 +1205,39 @@ SchXMLTitleContext::SchXMLTitleContext( 
SchXMLImportHelper& rImpHelper, SvXMLImp
 SchXMLTitleContext::~SchXMLTitleContext()
 {}
 
-void SchXMLTitleContext::StartElement( const uno::Reference< 
xml::sax::XAttributeList >& xAttrList )
+void SchXMLTitleContext::startFastElement( sal_Int32 /*nElement*/,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttrList )
 {
-sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
-
 css::awt::Point aPosition;
 bool bHasXPosition=false;
 bool bHasYPosition=false;
 
-for( sal_Int16 i = 0; i < nAttrCount; i++ )
+for( auto& aIter : sax_fastparser::castToFastAttributeList(xAttrList) )
 {
-OUString sAttrName = xAttrList->getNameByIndex( i );
-OUString aLocalName;
-OUString aValue = xAttrList->getValueByIndex( i );
-sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( 
sAttrName, &aLocalName );
-
-if( nPrefix == XML_NAMESPACE_SVG )
+OUString aValue = aIter.toString();
+switch (aIter.getToken())
 {
-if( IsXMLToken( aLocalName, XML_X ) )
+case XML_ELEMENT(SVG, XML_X):
+case XML_ELEMENT(SVG_COMPAT, XML_X):
 {
 GetImport().GetMM100UnitConverter().convertMeasureToCore(
 aPosition.X, aValue );
 bHasXPosition = true;
+break;
 }
-else if( IsXMLToken( aLocalName, XML_Y ) )
+case XML_ELEMENT(SVG, XML_Y):
+case XML_ELEMENT(SVG_COMPAT, XML_Y):
 {
 GetImport().GetMM100UnitConverter().convertMeasureToCore(
 aPosition.Y, aValue );
 bHasYPosition = true;
+break;
 }
-}
-else if( nPrefix == XML_NAMESPACE_CHART )
-{
-if( IsXMLToken( aLocalName, XML_STYLE_NAME ) )
+case XML_ELEMENT(CHART, XML_STYLE_NAME):
 msAutoStyleName = aValue;
+break;
+default:
+XMLOFF_WARN_UNKNOWN("xmloff", aIter);
 }
 }
 
@@ -1252,19 +1251,19 @@ void SchXMLTitleContext::StartElement( const 
uno::Reference< xml::sax::XAttribut
 }
 }
 
-SvXMLImportContextRef SchXMLTitleContext::CreateChildContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const uno::Reference< xml::sax::XAttributeList >& )
+css::uno::Reference< css::xml::sax::XFastContextHandler > 
SchXMLTitleContext::createFastChildContext(
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >& 
/*xAttrList*/ )
 {
 SvXMLImportContext* pContext = nullptr;
 
-if( (nPrefix == XML_NAMESPACE_TEXT ||
-nPrefix == XML_NAMESPACE_LO_EXT) &&
-IsXMLToken( rLocalName, XML_P ) )
+if( nElement == XML_ELEMENT(TEXT, XML_P) ||
+nElement == XML_ELEMENT(LO_EXT, XML_P) )
 {
-pContext = new SchXMLParagraphContext( GetImport(), rLocalName, 
mrTitle );
+pContext = new SchXMLParagraphContext( GetImport(), mrTitle );
 }
+else
+XMLOFF_WARN_UNKNOWN_ELEMENT("xmloff", nElement);
 
 return pContext;
 }
diff --git a/xmloff/source/chart/SchXMLChartContext.hxx 
b/xmloff/source/chart/SchXMLChartContext.hxx
index ce1868b0adc3..251431912d75 100644
--- a/xmloff/source/chart/SchXMLChartContext.hxx
+++ b/xmloff/source/chart/SchXMLChartContext.hxx
@@ -143,11 +143,11 @@ public:
 css::uno::Reference< css::drawing::XShape > const & 
xTitleShape );
 virtual ~SchXMLTitleContext() override;
 
-virtual void StartElement( const css::uno::Reference< 
css::xml::sax::XAttributeList >& xAttrList ) override;
-virtual SvXMLImportContextRef CreateChildContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const css::u

62 matches

Mail list logo