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

[Attila Bakos (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf135655.odt  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport15.cxx   |7 +++
 sw/source/filter/ww8/docxattributeoutput.cxx |   52 ++-
 3 files changed, 42 insertions(+), 17 deletions(-)

New commits:
commit 6bdf4ee8368fdc0bb20a82c250038b371b37f27d
Author: Attila Bakos 
AuthorDate: Wed Aug 12 13:36:22 2020 +0200
Commit: László Németh 
CommitDate: Wed Sep 2 08:42:10 2020 +0200

tdf#135655 OOXML export: Fix OLE background color

Follow-up of commit 636d16efe45a55c1a5a7a451c46fbb8618bf0393
(tdf#135653 OOXML import: fix OLE background color).

Co-authored-by: Daniel Arato (NISZ)

Change-Id: Iee927898884e229108b489d6d26a83ef7ad2f9a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100924
Tested-by: László Németh 
Reviewed-by: László Németh 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf135655.odt 
b/sw/qa/extras/ooxmlexport/data/tdf135655.odt
new file mode 100644
index ..06933eb3fa36
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf135655.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index 65004941acc6..1eff36be4eb6 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -404,6 +404,13 @@ DECLARE_OOXMLEXPORT_TEST(testTdf131561_necessaryBorder, 
"tdf131561_necessaryBord
 CPPUNIT_ASSERT_MESSAGE("Border between A3 and B3", (aBorderR.LineWidth + 
aBorderL.LineWidth) > 0);
 }
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf135655, "tdf135655.odt")
+{
+const xmlDocUniquePtr pExpDoc = parseExport();
+const OUString sXFillColVal = getXPath(pExpDoc, 
"/w:document/w:body/w:p/w:r/w:object/v:shape", "fillcolor");
+CPPUNIT_ASSERT_EQUAL(OUString("#00A933"), sXFillColVal);
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf134609_gridAfter, "tdf134609_gridAfter.docx")
 {
 uno::Reference xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 6a1593d265e4..094589dd3454 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -88,9 +88,11 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -5521,8 +5523,10 @@ void DocxAttributeOutput::WritePostponedOLE()
 m_pPostponedOLEs.reset();
 }
 
-void DocxAttributeOutput::WriteOLE( SwOLENode& rNode, const Size& rSize, const 
SwFlyFrameFormat* rFlyFrameFormat )
+void DocxAttributeOutput::WriteOLE( SwOLENode& rNode, const Size& rSize, const 
SwFlyFrameFormat* pFlyFrameFormat )
 {
+OSL_ASSERT(pFlyFrameFormat);
+
 // get interoperability information about embedded objects
 uno::Reference< beans::XPropertySet > xPropSet( 
m_rExport.m_pDoc->GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW );
 uno::Sequence< beans::PropertyValue > aGrabBag, 
aObjectsInteropList,aObjectInteropAttributes;
@@ -5563,7 +5567,7 @@ void DocxAttributeOutput::WriteOLE( SwOLENode& rNode, 
const Size& rSize, const S
 {
 // the embedded file could not be saved
 // fallback: save as an image
-FlyFrameGraphic( nullptr, rSize, rFlyFrameFormat, &rNode );
+FlyFrameGraphic( nullptr, rSize, pFlyFrameFormat, &rNode );
 return;
 }
 
@@ -5603,18 +5607,18 @@ void DocxAttributeOutput::WriteOLE( SwOLENode& rNode, 
const Size& rSize, const S
 //This string will store the relative position for aPos
 OString aAnch;
 
-if (rFlyFrameFormat && rFlyFrameFormat->GetAnchor().GetAnchorId() != 
RndStdIds::FLY_AS_CHAR)
+if (pFlyFrameFormat->GetAnchor().GetAnchorId() != RndStdIds::FLY_AS_CHAR)
 {
 //Get the horizontal alignment of the OLE via the frame format, to 
aHAlign
-OString aHAlign = 
convertToOOXMLHoriOrient(rFlyFrameFormat->GetHoriOrient().GetHoriOrient(),
-rFlyFrameFormat->GetHoriOrient().IsPosToggle());
+OString aHAlign = 
convertToOOXMLHoriOrient(pFlyFrameFormat->GetHoriOrient().GetHoriOrient(),
+pFlyFrameFormat->GetHoriOrient().IsPosToggle());
 //Get the vertical alignment of the OLE via the frame format to aVAlign
-OString aVAlign = 
convertToOOXMLVertOrient(rFlyFrameFormat->GetVertOrient().GetVertOrient());
+OString aVAlign = 
convertToOOXMLVertOrient(pFlyFrameFormat->GetVertOrient().GetVertOrient());
 
 //Get the relative horizontal positions for the anchors
-OString aHAnch = 
convertToOOXMLHoriOrientRel(rFlyFrameFormat->GetHoriOrient().GetRelationOrient());
+OString aHAnch = 
convertToOOXMLHoriOrientRel(pFlyFrameFormat->GetHoriOrient().GetRelationOrient());
 //Get the relative vertical positions for the anchors
-OString aVAnch = 
convertToOOXMLVertOrientRel(rFlyFrameFormat->GetVertOrient().GetRelationOrient());
+OString aVAnch = 
conv

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

[Noel Grandin (via logerrit)]

 include/xmloff/contextid.hxx |5 -
 xmloff/source/style/xmlimppr.cxx |  137 ++-
 2 files changed, 64 insertions(+), 78 deletions(-)

New commits:
commit 17d6ee0c45dcaff8aa12f7b975587820be62b7c8
Author: Noel Grandin 
AuthorDate: Tue Sep 1 15:57:02 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 2 08:28:34 2020 +0200

remove dead CTF_ALIEN_ATTRIBUTE_IMPORT

ever since
commit 9a081484321b3f42bee3b43d18c4bd75b9603b01
Date:   Fri Sep 14 13:42:47 2012 +0200
fdo#49571: ODF import: ignore "text:enable-numbering" attribute

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

diff --git a/include/xmloff/contextid.hxx b/include/xmloff/contextid.hxx
index bf6cb1e4c134..654641f320e8 100644
--- a/include/xmloff/contextid.hxx
+++ b/include/xmloff/contextid.hxx
@@ -38,11 +38,6 @@
 
 #define CTF_FORMS_DATA_STYLE( XML_FORM_CTF_START +  0 )
 
-/** use together with MID_FLAG_NO_PROPERTY to import the specified
-attribute into the alien attribute container */
-
-#define CTF_ALIEN_ATTRIBUTE_IMPORT  0x7fff
-
 #endif // INCLUDED_XMLOFF_CONTEXTID_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/style/xmlimppr.cxx b/xmloff/source/style/xmlimppr.cxx
index adc23848b542..8607e9c9fa2d 100644
--- a/xmloff/source/style/xmlimppr.cxx
+++ b/xmloff/source/style/xmlimppr.cxx
@@ -183,7 +183,6 @@ void SvXMLImportPropertyMapper::importXMLAttribute(
 // for better error reporting: this should be set true if no
 // warning is needed
 bool bNoWarning = false;
-bool bAlienImport = false;
 
 do
 {
@@ -196,100 +195,92 @@ void SvXMLImportPropertyMapper::importXMLAttribute(
 // create a XMLPropertyState with an empty value
 
 nFlags = maPropMapper->GetEntryFlags( nIndex );
-if( (( nFlags & MID_FLAG_NO_PROPERTY ) == MID_FLAG_NO_PROPERTY) && 
(maPropMapper->GetEntryContextId( nIndex ) == CTF_ALIEN_ATTRIBUTE_IMPORT) )
+if( ( nFlags & MID_FLAG_ELEMENT_ITEM_IMPORT ) == 0 )
 {
-bAlienImport = true;
-nIndex = -1;
-}
-else
-{
-if( ( nFlags & MID_FLAG_ELEMENT_ITEM_IMPORT ) == 0 )
-{
-XMLPropertyState aNewProperty( nIndex );
-sal_Int32 nReference = -1;
+XMLPropertyState aNewProperty( nIndex );
+sal_Int32 nReference = -1;
 
-// if this is a multi attribute check if another attribute 
already set
-// this any. If so use this as an initial value
-if( ( nFlags & MID_FLAG_MERGE_PROPERTY ) != 0 )
+// if this is a multi attribute check if another attribute 
already set
+// this any. If so use this as an initial value
+if( ( nFlags & MID_FLAG_MERGE_PROPERTY ) != 0 )
+{
+const OUString aAPIName( maPropMapper->GetEntryAPIName( 
nIndex ) );
+const sal_Int32 nSize = rProperties.size();
+for( nReference = 0; nReference < nSize; nReference++ )
 {
-const OUString aAPIName( 
maPropMapper->GetEntryAPIName( nIndex ) );
-const sal_Int32 nSize = rProperties.size();
-for( nReference = 0; nReference < nSize; nReference++ )
+sal_Int32 nRefIdx = rProperties[nReference].mnIndex;
+if( (nRefIdx != -1) && (nIndex != nRefIdx) &&
+(maPropMapper->GetEntryAPIName( nRefIdx ) == 
aAPIName ))
 {
-sal_Int32 nRefIdx = 
rProperties[nReference].mnIndex;
-if( (nRefIdx != -1) && (nIndex != nRefIdx) &&
-(maPropMapper->GetEntryAPIName( nRefIdx ) == 
aAPIName ))
-{
-aNewProperty = rProperties[nReference];
-aNewProperty.mnIndex = nIndex;
-break;
-}
+aNewProperty = rProperties[nReference];
+aNewProperty.mnIndex = nIndex;
+break;
 }
-
-if( nReference == nSize )
-nReference = -1;
 }
 
-bool bSet = false;
-if( ( nFlags & MID_FLAG_SPECIAL_ITEM_IMPORT ) == 0 )
-{
-// let the XMLPropertySetMapper decide how to import 
the value
-bSet = maPropMapper->importXML( sValue, aNewProperty,
- 

[Libreoffice-commits] core.git: compilerplugins/clang include/vcl include/xmloff sd/source vcl/source xmloff/source

[Noel Grandin (via logerrit)]

 compilerplugins/clang/unusedmethods.results |   98 +++-
 include/vcl/edit.hxx|4 -
 include/xmloff/txtimp.hxx   |2 
 sd/source/ui/func/fusearch.cxx  |5 -
 sd/source/ui/inc/fusearch.hxx   |1 
 vcl/source/control/edit.cxx |8 --
 vcl/source/control/imivctl.hxx  |3 
 vcl/source/control/imivctl1.cxx |   32 -
 xmloff/source/text/txtimp.cxx   |   12 ---
 9 files changed, 27 insertions(+), 138 deletions(-)

New commits:
commit ee438031e6c0a1765cd607486d3ec65749d1dd62
Author: Noel Grandin 
AuthorDate: Tue Sep 1 12:57:07 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 2 08:28:07 2020 +0200

loplugin:unusedmethods

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

diff --git a/compilerplugins/clang/unusedmethods.results 
b/compilerplugins/clang/unusedmethods.results
index 1f87cf481176..e60976544df9 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -72,8 +72,6 @@ connectivity/source/drivers/firebird/Util.hxx:72
 short connectivity::firebird::ColumnTypeInfo::getSubType() const
 connectivity/source/drivers/firebird/Util.hxx:74
 const class rtl::OUString & 
connectivity::firebird::ColumnTypeInfo::getCharacterSet() const
-connectivity/source/drivers/mork/mork_helper.cxx:37
-int main(int,char **)
 connectivity/source/drivers/mysqlc/mysqlc_connection.hxx:176
 class rtl::OUString 
connectivity::mysqlc::OConnection::transFormPreparedStatement(const class 
rtl::OUString &)
 connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx:94
@@ -500,14 +498,14 @@ include/comphelper/sequence.hxx:200
 Sequence 
comphelper::containerToSequence(type-parameter-?-? const (&)[_Num])
 include/comphelper/sequence.hxx:200
 Sequence 
comphelper::containerToSequence(type-parameter-?-? const (&)[S])
+include/comphelper/sequence.hxx:200
+Sequence 
comphelper::containerToSequence(type-parameter-?-? const (&)[_Bound])
 include/comphelper/sequence.hxx:200
 Sequence 
comphelper::containerToSequence(type-parameter-?-? const (&)[N])
 include/comphelper/sequence.hxx:200
 Sequence 
comphelper::containerToSequence(type-parameter-?-? const (&)[_Nm])
 include/comphelper/sequence.hxx:200
 Sequence 
comphelper::containerToSequence(type-parameter-?-? const (&)[SrcSize])
-include/comphelper/sequence.hxx:200
-Sequence 
comphelper::containerToSequence(type-parameter-?-? const (&)[_Bound])
 include/comphelper/servicedecl.hxx:108
  comphelper::service_decl::ServiceDecl::ServiceDecl(const 
type-parameter-?-? &,const char *,const char *)
 include/comphelper/unique_disposing_ptr.hxx:46
@@ -676,10 +674,6 @@ include/svx/ClassificationField.hxx:47
 const class rtl::OUString & svx::ClassificationResult::getDisplayText() 
const
 include/svx/ClassificationField.hxx:52
 _Bool svx::ClassificationResult::operator==(const class 
svx::ClassificationResult &) const
-include/svx/dbaexchange.hxx:170
- svx::ODataAccessObjectTransferable::ODataAccessObjectTransferable(const 
class rtl::OUString &,const int,const class rtl::OUString &,const class 
com::sun::star::uno::Reference &)
-include/svx/dbaexchange.hxx:192
- svx::ODataAccessObjectTransferable::ODataAccessObjectTransferable(const 
class rtl::OUString &,const int,const class rtl::OUString &)
 include/svx/DiagramDataInterface.hxx:33
 class rtl::OUString DiagramDataInterface::getString() const
 include/svx/dlgctrl.hxx:244
@@ -692,7 +686,7 @@ include/svx/framelink.hxx:170
 _Bool svx::frame::operator>(const class svx::frame::Style &,const class 
svx::frame::Style &)
 include/svx/gallery1.hxx:58
 const class std::unique_ptr > & 
GalleryThemeEntry::getGalleryBinaryEngineEntry() const
-include/svx/gallerybinaryengine.hxx:63
+include/svx/gallerybinaryengine.hxx:69
 const class INetURLObject & GalleryBinaryEngine::GetStrURL() const
 include/svx/langbox.hxx:94
 void SvxLanguageBox::show()
@@ -840,6 +834,8 @@ include/vcl/customweld.hxx:142
 void weld::CustomWeld::queue_draw_area(int,int,int,int)
 include/vcl/customweld.hxx:157
 void weld::CustomWeld::set_visible(_Bool)
+include/vcl/edit.hxx:240
+class Size Edit::GetMinimumEditSize()
 include/vcl/errcode.hxx:86
 _Bool ErrCode::operator<(const class ErrCode &) const
 include/vcl/errcode.hxx:87
@@ -868,7 +864,7 @@ include/vcl/ITiledRenderable.hxx:214
 enum PointerStyle vcl::ITiledRenderable::getPointer()
 include/vcl/lok.hxx:22
 void vcl::lok::unregisterPollCallbacks()
-include/vcl/NotebookBarAddonsMerger.hxx:63
+include/vcl/NotebookBarAddonsMerger.hxx:55
  NotebookBarAddonsMerger::NotebookBarAddonsMerger()
 include/vcl/opengl/OpenGLHelper.hxx:67
 void OpenGLHelper::renderToFile(long,long,const class rt

[Libreoffice-commits] core.git: compilerplugins/clang include/vcl include/xmloff vcl/source xmloff/inc xmloff/source

[Noel Grandin (via logerrit)]

 compilerplugins/clang/unusedfields.only-used-in-constructor.results |   12 +--
 compilerplugins/clang/unusedfields.readonly.results |4 -
 compilerplugins/clang/unusedfields.untouched.results|   38 
+++---
 compilerplugins/clang/unusedfields.writeonly.results|   16 +---
 include/vcl/toolkit/ivctrl.hxx  |1 
 include/xmloff/xmlstyle.hxx |1 
 vcl/source/control/ivctrl.cxx   |1 
 xmloff/inc/XMLTextColumnsContext.hxx|2 
 xmloff/source/draw/sdxmlimp_impl.hxx|8 --
 xmloff/source/style/xmlnumfi.cxx|1 
 xmloff/source/text/XMLTextColumnsContext.cxx|   20 
-
 xmloff/source/text/txtimp.cxx   |1 
 12 files changed, 40 insertions(+), 65 deletions(-)

New commits:
commit d8759f225c5246465194b71b1407c84904752cc9
Author: Noel Grandin 
AuthorDate: Tue Sep 1 12:41:37 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 2 08:27:49 2020 +0200

loplugin:unusedfields

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

diff --git 
a/compilerplugins/clang/unusedfields.only-used-in-constructor.results 
b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
index a66a8db6d3eb..55cdaa2dee90 100644
--- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results
+++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results
@@ -174,6 +174,8 @@ dbaccess/source/core/dataaccess/connection.hxx:102
 dbaccess::OConnection m_nInAppend std::atomic
 dbaccess/source/core/inc/databasecontext.hxx:85
 dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
+desktop/qa/desktop_lib/test_desktop_lib.cxx:2832
+  class AllSettings &
 drawinglayer/inc/texture/texture3d.hxx:57
 drawinglayer::texture::GeoTexSvxBitmapEx maBitmap class Bitmap
 drawinglayer/inc/texture/texture3d.hxx:59
@@ -358,12 +360,8 @@ include/vcl/font/Feature.hxx:100
 vcl::font::Feature m_eType enum vcl::font::FeatureType
 include/vcl/NotebookBarAddonsMerger.hxx:36
 NotebookBarAddonsItem aImage class Image
-include/vcl/NotebookBarAddonsMerger.hxx:43
-AddonsParams sImageId class rtl::OUString
-include/vcl/NotebookBarAddonsMerger.hxx:44
-AddonsParams sControlType class rtl::OUString
-include/vcl/NotebookBarAddonsMerger.hxx:45
-AddonsParams nWidth sal_uInt16
+include/vcl/toolkit/ivctrl.hxx:67
+SvxIconChoiceCtrlEntry pUserData void *
 include/xmloff/shapeimport.hxx:140
 SdXML3DLightContext mbSpecular _Bool
 libreofficekit/qa/gtktiledviewer/gtv-application-window.hxx:51
@@ -750,8 +748,6 @@ sw/source/core/text/inftxt.hxx:682
 SwTextSlot aText class rtl::OUString
 sw/source/core/text/porfld.cxx:140
 (anonymous namespace)::SwFieldSlot aText class rtl::OUString
-sw/source/core/text/porlay.cxx:1312
-  const sw::MergedPara *const &
 sw/source/uibase/docvw/romenu.hxx:34
 SwReadOnlyPopup m_aBuilder class VclBuilder
 sw/source/uibase/docvw/romenu.hxx:46
diff --git a/compilerplugins/clang/unusedfields.readonly.results 
b/compilerplugins/clang/unusedfields.readonly.results
index 468015125711..008b0353cea8 100644
--- a/compilerplugins/clang/unusedfields.readonly.results
+++ b/compilerplugins/clang/unusedfields.readonly.results
@@ -248,9 +248,9 @@ framework/inc/helper/uiconfigelementwrapperbase.hxx:128
 framework::UIConfigElementWrapperBase m_bConfigListening _Bool
 framework/inc/xml/menudocumenthandler.hxx:187
 framework::OReadMenuPopupHandler m_bMenuMode _Bool
-framework/source/fwe/classes/addonsoptions.cxx:344
-framework::AddonsOptions_Impl m_aEmptyAddonToolBar 
Sequence >
 framework/source/fwe/classes/addonsoptions.cxx:345
+framework::AddonsOptions_Impl m_aEmptyAddonToolBar 
Sequence >
+framework/source/fwe/classes/addonsoptions.cxx:346
 framework::AddonsOptions_Impl m_aEmptyAddonNotebookBar 
Sequence >
 i18npool/inc/textconversion.hxx:79
 i18npool::(anonymous) code sal_Unicode
diff --git a/compilerplugins/clang/unusedfields.untouched.results 
b/compilerplugins/clang/unusedfields.untouched.results
index 746700e1d380..96e0f6e2b919 100644
--- a/compilerplugins/clang/unusedfields.untouched.results
+++ b/compilerplugins/clang/unusedfields.untouched.results
@@ -42,6 +42,8 @@ dbaccess/source/core/inc/databasecontext.hxx:85
 dbaccess::ODatabaseContext m_aBasicDLL class BasicDLL
 dbaccess/source/sdbtools/inc/connectiondependent.hxx:115
 sdbtools::ConnectionDependentComponent::EntryGuard m_aMutexGuard 
::osl::MutexGuard
+desktop/qa/desktop_lib/test_desktop_lib.cxx:2832
+  class AllSettings &
 emfio/source/emfuno/xemfparser.cxx:48
 emfio::emfreader::(anonymous namespace)::XEmfParser conte

[Libreoffice-commits] core.git: codemaker/source compilerplugins/clang config_host/config_global.h.in configure.ac i18npool/source include/rtl sal/qa

[Stephan Bergmann (via logerrit)]

 codemaker/source/javamaker/javaoptions.cxx  |2 
 compilerplugins/clang/compat.hxx|   24 
 compilerplugins/clang/stringconcatliterals.cxx  |2 
 compilerplugins/clang/test/stringconcatliterals.cxx |2 
 compilerplugins/clang/unusedmember.cxx  |3 
 config_host/config_global.h.in  |4 
 configure.ac|   13 ++
 i18npool/source/breakiterator/breakiterator_unicode.cxx |2 
 include/rtl/string.hxx  |   90 +---
 sal/qa/rtl/digest/rtl_digest.cxx|   15 +-
 sal/qa/rtl/strings/test_ostring_concat.cxx  |   10 +
 sal/qa/rtl/textenc/rtl_textcvt.cxx  |2 
 12 files changed, 118 insertions(+), 51 deletions(-)

New commits:
commit 4b9e440c51be3e40326bc90c33ae69885bfb51e4
Author: Stephan Bergmann 
AuthorDate: Mon Aug 31 21:19:22 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Sep 2 08:12:04 2020 +0200

Turn OStringLiteral into a consteval'ed, static-refcound rtl_String

...from which an OString can cheaply be instantiated.

The one downside is that OStringLiteral now needs to be a template 
abstracting
over the string length.  But any uses for which that is a problem (e.g., as 
the
element type of a containers that would no longer be homogeneous, or in the
signature of a function that shall not be turned into a template for one 
reason
or another) can be replaced with std::string_view, without loss of 
efficiency
compared to the original OStringLiteral, and without loss of expressivity 
(esp.
with the newly introduced OString(std::string_view) ctor).

The new OStringLiteral ctor code would probably not be very efficient if it 
were
ever executed at runtime, but it is intended to be only executed at compile
time.  Where available, C++20 "consteval" is used to statically ensure that.

The intended use of the new OStringLiteral is in all cases where an
object that shall itself not be an OString (e.g., because it shall be a
global static variable for which the OString ctor/dtor would be detrimental 
at
library load/unload) must be converted to an OString instance in at least 
one
place.  Other string literal abstractions could use std::string_view (or 
just
plain char const[N]), but interestingly OStringLiteral might be more 
efficient
than constexpr std::string_view even for such cases, as it should not need 
any
relocations at library load time.  For now, no existing uses of 
OUStringLiteral
have been changed to some other abstraction (unless technically necessary as
discussed above), and no additional places that would benefit from
OUStringLiteral have been changed to use it.

sal/qa/rtl/strings/test_ostring_concat.cxx documents some workarounds for 
GCC
bug  "Failed class 
template
argument deduction in unevaluated, parenthesized context".  Those places, as
well as uses of OStringLiteral in 
incodemaker/source/javamaker/javaoptions.cxx
and i18npool/source/breakiterator/breakiterator_unicode.cxx, which have been
replaced with OString::Concat (and which is arguably a better choice, 
anyway),
also caused failures with at least Clang 5.0.2 (but would not have caused
failures with at least recent Clang 12 trunk, so appear to be bugs in Clang 
that
have meanwhile been fixed).

This change also revealed a bug in at least recent Clang 12 trunk
CastExpr::getSubExprAsWritten (still to be reported to LLVM), triggered at 
least
in some calls from loplugin code (for which it can be fixed for now in the
existing compat::getSubStringAsWritten).

A similar commit for OUStringLiteral is planned, too.

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

diff --git a/codemaker/source/javamaker/javaoptions.cxx 
b/codemaker/source/javamaker/javaoptions.cxx
index 31e43414c68c..c86f35e6cf15 100644
--- a/codemaker/source/javamaker/javaoptions.cxx
+++ b/codemaker/source/javamaker/javaoptions.cxx
@@ -86,7 +86,7 @@ bool JavaOptions::initOptions(int ac, char* av[], bool 
bCmdFile)
 case 'n':
 if (av[i][2] != 'D' || av[i][3] != '\0')
 {
-OString tmp(OStringLiteral("'-nD', please check your 
input '") + av[i] + "'");
+OString tmp(OString::Concat("'-nD', please check your 
input '") + av[i] + "'");
 throw IllegalArgument(tmp);
 }
 
diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index fb8791f978b4..70b462e54e4b 100644
--- a/compilerplugins/clang/compat.hxx
+

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

[gokaysatir (via logerrit)]

 svx/source/sidebar/area/AreaPropertyPanelBase.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 5aba7d0bc54a03247fbd5e6514f79fff846f527c
Author: gokaysatir 
AuthorDate: Sat Aug 8 16:27:48 2020 +0300
Commit: Andras Timar 
CommitDate: Wed Sep 2 08:11:14 2020 +0200

Online: Hide shape area bitmap import button.

This patch is for Online.
Online handles "import" actions differently. This patch disables "Import" 
button for only Online.

Change-Id: I6f6987ea82c102fc5ac44a1c48a234c9f43484e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100391
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 
(cherry picked from commit 4a31a63c5e4d4dac01426581c39bc1ef9278f6cb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100367
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100658
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx 
b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 5768e54002a0..60f9290aac59 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace css;
 using namespace css::uno;
@@ -388,7 +389,8 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, SelectFillTypeHdl, 
weld::ComboBox&, void)
 GraphicObject aBitmap;
 if(nPos == static_cast< sal_Int32 >(BITMAP))
 {
-mxBmpImport->show();
+if (!comphelper::LibreOfficeKit::isActive())
+mxBmpImport->show();
 const SvxBitmapListItem* pItem = pSh->GetItem(SID_BITMAP_LIST);
 if(pItem)
 {
@@ -1235,7 +1237,8 @@ void AreaPropertyPanelBase::Update()
 {
 if(pSh && pSh->GetItem(SID_BITMAP_LIST) && eXFS == BITMAP)
 {
-mxBmpImport->show();
+if (!comphelper::LibreOfficeKit::isActive())
+mxBmpImport->show();
 mxLbFillType->set_active(sal_uInt32(BITMAP));
 SvxFillAttrBox::Fill(*mxLbFillAttr, 
pSh->GetItem(SID_BITMAP_LIST)->GetBitmapList());
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src

[Henry Castro (via logerrit)]

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

New commits:
commit d8dacec1e1e22df3595b72ae96dcb1b26674d296
Author: Henry Castro 
AuthorDate: Thu Jul 16 15:51:06 2020 -0400
Commit: Aron Budea 
CommitDate: Wed Sep 2 08:10:54 2020 +0200

loleaflet: no scroll if editing a cell formula

Change-Id: I2b1bca30c795043c7172dd080e51cfe37c0dc008
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98931
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Henry Castro 
(cherry picked from commit f6667cfea18fb3aa6bc8a5769da5994a7e06e322)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101817
Reviewed-by: Aron Budea 

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index 726a5a5b2..eb030a2e6 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -781,6 +781,10 @@ L.TileLayer = L.GridLayer.extend({
}
},
 
+   _isEditFormula: function () {
+   return this._lastFormula && this._map._isCursorVisible;
+   },
+
_onCellAddressMsg: function (textMsg) {
// When the user moves the focus to a different cell, a 
'cellformula'
// message is received from lowsd, *then* a 'celladdress' 
message.
@@ -2235,7 +2239,8 @@ L.TileLayer = L.GridLayer.extend({
center.y = Math.round(center.y < 0 ? 0 : center.y);
if (!(this._selectionHandles.start && 
this._selectionHandles.start.isDragged) &&
!(this._selectionHandles.end && 
this._selectionHandles.end.isDragged) &&
-   !(docLayer._followEditor || 
docLayer._followUser)) {
+   !(docLayer._followEditor || 
docLayer._followUser) &&
+   !this._isEditFormula()) {
this._map.fire('scrollto', {x: center.x, y: 
center.y, calledFromInvalidateCursorMsg: scroll !== undefined});
}
}
@@ -2929,7 +2934,8 @@ L.TileLayer = L.GridLayer.extend({

this._map.dialog._updateTextSelection(inputBarId);
}
var mapBounds = this._map.getBounds();
-   if (!mapBounds.contains(this._cellCursor) && 
!this._cellCursorXY.equals(this._prevCellCursorXY)) {
+   if (!mapBounds.contains(this._cellCursor) && 
!this._cellCursorXY.equals(this._prevCellCursorXY) &&
+   !this._isEditFormula()) {
var scrollX = 0, scrollY = 0;
if (onPgUpDn) {
var mapHalfHeight = 
(mapBounds.getNorth() - mapBounds.getSouth()) / 2;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'libreoffice-7-0' - loleaflet/src

[Gary Kim (via logerrit)]

 loleaflet/src/core/Socket.js |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 22b8be43c0be4011af59d36a7b335578f30860e4
Author: Gary Kim 
AuthorDate: Mon May 18 23:14:07 2020 +0800
Commit: Andras Timar 
CommitDate: Wed Sep 2 08:08:40 2020 +0200

fix: remove target="_blank" on javascript open links

Using target="_blank" on these links cause them
to not work in browsers.

This commit removes the attribute to fix the issue.

Change-Id: I157f15589b17722aa5c0ef5eada02084fe5b2a5e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94435
Tested-by: Jenkins CollaboraOffice 
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101888
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 9f48d3145..80decbee2 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -283,7 +283,7 @@ L.Socket = L.Class.extend({
this.WSDServer = 
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
var h = this.WSDServer.Hash;
if (parseInt(h,16).toString(16) === 
h.toLowerCase().replace(/^0+/, '')) {
-   h = 'https://hub.libreoffice.org/git-online/' + h + 
'\');">' + h + '';
+   h = 'https://hub.libreoffice.org/git-online/' + h + 
'\');">' + h + '';

$('#loolwsd-version').html(this.WSDServer.Version + ' (git hash: ' + h + ')');
}
else {
@@ -306,7 +306,7 @@ L.Socket = L.Class.extend({
var lokitVersionObj = 
JSON.parse(textMsg.substring(textMsg.indexOf('{')));
h = lokitVersionObj.BuildId.substring(0, 7);
if (parseInt(h,16).toString(16) === 
h.toLowerCase().replace(/^0+/, '')) {
-   h = 'https://hub.libreoffice.org/git-core/' + h + 
'\');">' + h + '';
+   h = 'https://hub.libreoffice.org/git-core/' + h + 
'\');">' + h + '';
}
$('#lokit-version').html(lokitVersionObj.ProductName + 
' ' +
 lokitVersionObj.ProductVersion 
+ lokitVersionObj.ProductExtension.replace('.10.','-') +
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[László Németh (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf134649_pageBreak.fodt |   86 +
 sw/qa/extras/ooxmlexport/ooxmlexport15.cxx |6 +
 sw/source/filter/ww8/docxattributeoutput.cxx   |7 +
 3 files changed, 99 insertions(+)

New commits:
commit 4a96b2b7787900b6ca45e772daa0fc284b3a4e0f
Author: László Németh 
AuthorDate: Tue Sep 1 08:48:53 2020 +0200
Commit: László Németh 
CommitDate: Wed Sep 2 08:01:44 2020 +0200

tdf#134649 DOCX export: fix page break between tables

Section break between tables wasn't exported,
resulting missing page break and table content.

For example, a table on a new landscape page was
merged to the previous table, removing not only the
landscape page, but hiding half of the table because
of the narrower width of the previous page with
portrait orientation.

Change-Id: Id02529d023a6306fb5be42486d25f252d8821f2f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101823
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf134649_pageBreak.fodt 
b/sw/qa/extras/ooxmlexport/data/tdf134649_pageBreak.fodt
new file mode 100644
index ..7d05c3e3ce99
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/tdf134649_pageBreak.fodt
@@ -0,0 +1,86 @@
+
+http://openoffice.org/2009/office"; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text">
+ 
+  
+  
+  
+   
+  
+  
+   
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+   
+   
+  
+ 
+ 
+  
+  
+ 
+ 
+  
+   Two tables, one pagebreak:
+   
+
+
+
+ 
+  Hello1
+ 
+ 
+  
+ 
+
+
+ 
+  World1
+ 
+ 
+  
+ 
+
+   
+   
+
+
+
+ 
+  Hello2
+ 
+ 
+  
+ 
+
+
+ 
+  World2
+ 
+ 
+  
+ 
+
+   
+   
+  
+ 
+
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index 397b9040e026..65004941acc6 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -263,6 +263,12 @@ DECLARE_OOXMLEXPORT_TEST(testTdf133370_columnBreak, 
"tdf133370_columnBreak.odt")
 CPPUNIT_ASSERT_EQUAL(1, getPages());
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf134649_pageBreak, "tdf134649_pageBreak.fodt")
+{
+// This was 1 (missing page break between tables).
+CPPUNIT_ASSERT_EQUAL(2, getPages());
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf135343_columnSectionBreak_c14, 
"tdf135343_columnSectionBreak_c14.docx")
 {
 uno::Reference xTextSection = 
getProperty>(getParagraph(1), 
"TextSection");
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 4bd72ebf247a..6a1593d265e4 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1027,6 +1027,13 @@ void DocxAttributeOutput::SectionBreaks(const SwNode& 
rNode)
 if (rNode.StartOfSectionNode()->IsTableNode() || 
rNode.StartOfSectionNode()->IsSectionNode())
 m_rExport.OutputSectionBreaks(pTextNode->GetpSwAttrSet(), 
*pTextNode, m_tableReference->m_bTableCellOpen);
 }
+else if (aNextIndex.GetNode().IsTableNode())
+{
+// Handle section break between tables.
+const SwTableNode* pTableNode = 
static_cast(&aNextIndex.GetNode());
+const SwFrameFormat *pFormat = 
pTableNode->GetTable().GetFrameFormat();
+m_rExport.OutputSectionBreaks(&(pFormat->GetAttrSet()), 
*pTableNode);
+}
 }
 }
 
___
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' - cui/source

[Heiko Tietze (via logerrit)]

 cui/source/dialogs/tipofthedaydlg.cxx |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit e21768ce2898453226aedd5f8ce19d8075f5bec5
Author: Heiko Tietze 
AuthorDate: Mon Aug 31 11:38:35 2020 +0200
Commit: Heiko Tietze 
CommitDate: Wed Sep 2 07:37:25 2020 +0200

Resolves tdf#135790 - Support for multiple %MOD1/2 entries

While loop added

Change-Id: I81386bb23381e5248f3c045ad2b998a92346ec34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101700
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit db5f204b1d3d96975d902b587d6d18bc06610eea)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101860

diff --git a/cui/source/dialogs/tipofthedaydlg.cxx 
b/cui/source/dialogs/tipofthedaydlg.cxx
index 7d6a05b72a0f..4775ed0578b9 100644
--- a/cui/source/dialogs/tipofthedaydlg.cxx
+++ b/cui/source/dialogs/tipofthedaydlg.cxx
@@ -89,11 +89,17 @@ void TipOfTheDayDialog::UpdateTip()
 #endif
 sal_Int32 aPos;
 aPos = aText.indexOf("%MOD1");
-if (aPos != -1)
+while (aPos != -1)
+{
 aText = aText.replaceAt(aPos, 5, aMOD1);
+aPos = aText.indexOf("%MOD1");
+}
 aPos = aText.indexOf("%MOD2");
-if (aPos != -1)
+while (aPos != -1)
+{
 aText = aText.replaceAt(aPos, 5, aMOD2);
+aPos = aText.indexOf("%MOD2");
+}
 m_pText->set_label(aText);
 
 // hyperlink
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna (via logerrit)]

 sw/source/filter/html/htmlreqifreader.cxx |   56 +++---
 1 file changed, 37 insertions(+), 19 deletions(-)

New commits:
commit 4d33262b1b652b57f222c9f1cce7d976725399d4
Author: Miklos Vajna 
AuthorDate: Tue Sep 1 13:36:48 2020 +0200
Commit: Miklos Vajna 
CommitDate: Wed Sep 2 01:37:53 2020 +0200

sw reqif-xhtml export, embedded objects: prepare pres data earlier

If an embedded object has some native data, we provide presentation data
(replacement graphic) for it in the OLE1 container. We usually take this
from the OLE2 container, but it's OK to omit the presentation data
there.

So refactor to have the presentation data available from the OLE node
(already used for RTF purposes) earlier, that'll allow taking the OLE1
presentation data from RTF if it's missing from OLE2.

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

diff --git a/sw/source/filter/html/htmlreqifreader.cxx 
b/sw/source/filter/html/htmlreqifreader.cxx
index 523bc973c587..87368da014bd 100644
--- a/sw/source/filter/html/htmlreqifreader.cxx
+++ b/sw/source/filter/html/htmlreqifreader.cxx
@@ -231,7 +231,8 @@ OString 
InsertOLE1HeaderFromOle10NativeStream(tools::SvRef& xStorage
 
 /// Inserts an OLE1 header before an OLE2 storage.
 OString InsertOLE1Header(SvStream& rOle2, SvStream& rOle1, sal_uInt32& nWidth, 
sal_uInt32& nHeight,
- SwOLENode& rOLENode)
+ SwOLENode& rOLENode, const sal_uInt8* 
/*pPresentationData*/,
+ sal_uInt64 /*nPresentationData*/)
 {
 rOle2.Seek(0);
 tools::SvRef xStorage(new SotStorage(rOle2));
@@ -279,6 +280,7 @@ OString InsertOLE1Header(SvStream& rOle2, SvStream& rOle1, 
sal_uInt32& nWidth, s
 SvMemoryStream aPresentationData;
 if (ParseOLE2Presentation(rOle2, nWidth, nHeight, aPresentationData))
 {
+// Take presentation data for OLE1 from OLE2.
 // OLEVersion.
 rOle1.WriteUInt32(0x0501);
 // FormatID: constant means the ClassName field is present.
@@ -307,8 +309,9 @@ OString InsertOLE1Header(SvStream& rOle2, SvStream& rOle1, 
sal_uInt32& nWidth, s
 return aClassName;
 }
 
-/// Writes rGraphic with size from rOLENode to rRtf as an RTF hexdump.
-void WrapOleGraphicInRtf(SvStream& rRtf, const SwOLENode& rOLENode, const 
Graphic& rGraphic)
+/// Writes presentation data with the specified size to rRtf as an RTF hexdump.
+void WrapOleGraphicInRtf(SvStream& rRtf, sal_uInt32 nWidth, sal_uInt32 nHeight,
+ const sal_uInt8* pPresentationData, sal_uInt64 
nPresentationData)
 {
 // Start result.
 rRtf.WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_RESULT);
@@ -317,23 +320,18 @@ void WrapOleGraphicInRtf(SvStream& rRtf, const SwOLENode& 
rOLENode, const Graphi
 rRtf.WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_PICT);
 
 rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_WMETAFILE "8");
-Size aSize(rOLENode.GetTwipSize());
 rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PICW);
-rRtf.WriteOString(OString::number(aSize.getWidth()));
+rRtf.WriteOString(OString::number(nWidth));
 rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PICH);
-rRtf.WriteOString(OString::number(aSize.getHeight()));
+rRtf.WriteOString(OString::number(nHeight));
 rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PICWGOAL);
-rRtf.WriteOString(OString::number(aSize.getWidth()));
+rRtf.WriteOString(OString::number(nWidth));
 rRtf.WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PICHGOAL);
-rRtf.WriteOString(OString::number(aSize.getHeight()));
-SvMemoryStream aGraphicStream;
-if (GraphicConverter::Export(aGraphicStream, rGraphic, 
ConvertDataFormat::WMF) == ERRCODE_NONE)
+rRtf.WriteOString(OString::number(nHeight));
+if (pPresentationData)
 {
-auto pGraphicAry = static_cast(aGraphicStream.GetData());
-sal_uInt64 nSize = aGraphicStream.TellEnd();
-msfilter::rtfutil::StripMetafileHeader(pGraphicAry, nSize);
 rRtf.WriteCharPtr(SAL_NEWLINE_STRING);
-msfilter::rtfutil::WriteHex(pGraphicAry, nSize, &rRtf);
+msfilter::rtfutil::WriteHex(pPresentationData, nPresentationData, 
&rRtf);
 }
 
 // End pict.
@@ -394,9 +392,27 @@ bool WrapOleInRtf(SvStream& rOle2, SvStream& rRtf, 
SwOLENode& rOLENode)
 
 // Write OLE1 header, then the RTF wrapper.
 SvMemoryStream aOLE1;
-sal_uInt32 nWidth = 0;
-sal_uInt32 nHeight = 0;
-OString aClassName = InsertOLE1Header(rOle2, aOLE1, nWidth, nHeight, 
rOLENode);
+
+// Prepare presentation data early, so it's available to both OLE1 and RTF.
+Size aSize(rOLENode.GetTwipSize());
+sal_uInt32 nWidth = aSize.getWidth();
+sal_uInt32 nHeight = aSize.getHeight();
+const Graphic* pGraphic = rOLENode.GetGraphic();
+const sal_uInt8* pPresentationData = nullptr;
+sal_uInt64 nPresen

[Libreoffice-commits] dev-tools.git: esc-reporting/esc-analyze.py

[Guilhem Moulin (via logerrit)]

 esc-reporting/esc-analyze.py |   11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 8804bcdcbb6715ed00cdea8b36faaca579f883af
Author: Guilhem Moulin 
AuthorDate: Thu Jul 23 19:11:25 2020 +0200
Commit: Guilhem Moulin 
CommitDate: Wed Sep 2 01:04:34 2020 +0200

esc-analyze: remove 'fullid' field and use number change IDs instead.

fullid needs to uniquely identify a changeset, which the Change-ID does
not.  (Cherry-picks preserve Change-IDs, which might cause `gerrit 
set-reviewers $CHANGE_ID`
to fail when the Change-ID matches several changes.)

We used to specify changes by Change-ID and not by change number due to
potential conflicts between change numbers and abbreviated commit IDs,
but the ambiguity is fixed since gerrit 1.14.5.1, see

https://bugs.chromium.org/p/gerrit/issues/detail?id=1707
https://gerrit-review.googlesource.com/c/gerrit/+/71936
https://gerrit.libreoffice.org/Documentation/cmd-set-reviewers.html

I guess it'll be more robust to replace the old-style change numeric IDs
with full IDs $PROJECT~$BRANCH~$CHANGE_ID, but that's a more intrusive
change.

Change-Id: Ibf5bb02ed1ab5479a0994dc3fbf1763c288edc23
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/99333
Reviewed-by: Xisco Fauli 
Reviewed-by: Guilhem Moulin 
Tested-by: Guilhem Moulin 

diff --git a/esc-reporting/esc-analyze.py b/esc-reporting/esc-analyze.py
index dabca7c..1176c32 100755
--- a/esc-reporting/esc-analyze.py
+++ b/esc-reporting/esc-analyze.py
@@ -687,10 +687,7 @@ def analyze_reports():
 row['status'] = 'NEW'
   xDate = datetime.datetime.strptime(row['updated'], '%Y-%m-%d 
%H:%M:%S.%f000')
   ownerEmail = util_check_mail(row['owner']['name'], row['owner']['email'])
-  # while web is happy with the unique project~branch~changeID label, 
commandline interface
-  # only accepts ambiguous changeID, doesn't help, so fullid is not really 
fullid, but at least
-  # less prone to conflicts than just changeset-number that also can 
easily prefix-match commit-hashes
-  entry = {'id': key, 'fullid': row['change_id'], 'name': 
row['owner']['name'], 'email': ownerEmail, 'title': row['subject']}
+  entry = {'id': key, 'name': row['owner']['name'], 'email': ownerEmail, 
'title': row['subject']}
 
   if row['status'] != 'ABANDONED':
 if ownerEmail is None:
@@ -738,7 +735,7 @@ def analyze_reports():
   else:
 automateList['gerrit']['to_abandon_comment'][entry['id']] = 
patchset
 if cntReview == 0 and not 
statList['people'][ownerEmail]['isCommitter']:
-tmpListToReview.append({'id': entry['id'], 'fullid': 
entry['fullid'], 'patchset': patchset})
+tmpListToReview.append({'id': entry['id'], 'patchset': patchset})
 
 for rowTmp in tmpListToReview:
   if gerritData['patch'][rowTmp['id']]['project'] == 'online':
@@ -763,8 +760,8 @@ def analyze_reports():
 except Exception as e:
   pass
   x = statList['people'][reviewEmail]
-  automateList['gerrit']['to_review'][rowTmp['fullid']] = {'name': 
statList['people'][reviewEmail]['gerrit']['reviewName'],
-   'patchset': 
rowTmp['patchset'], 'id': rowTmp['id']}
+  automateList['gerrit']['to_review'][rowTmp['id']] = {'name': 
statList['people'][reviewEmail]['gerrit']['reviewName'],
+   'patchset': 
rowTmp['patchset'], 'id': rowTmp['id']}
 
 for key, row in bugzillaData['bugs'].items():
   if not 'cc' in row:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: common/Authorization.cpp common/Util.cpp common/Util.hpp

[Gülşah Köse (via logerrit)]

 common/Authorization.cpp |   33 ++---
 common/Util.cpp  |   34 +-
 common/Util.hpp  |7 ---
 3 files changed, 31 insertions(+), 43 deletions(-)

New commits:
commit 845554a6a3a76dc4161409f9d6648b8ff4133068
Author: Gülşah Köse 
AuthorDate: Tue Sep 1 20:15:30 2020 +0300
Commit: Gülşah Köse 
CommitDate: Tue Sep 1 23:17:03 2020 +0200

Revert "wsd: parse headers with Poco::MessageHeader"

This reverts commit dbc562d9abc997b196fd6d4e5e71f42d442488d0.

tst-05694-05694 2020-08-26 12:59:14.343136 [ unittest ]
ERR Invalid HTTP header [def]: Malformed message:
Field name too long/no colon found| ../common/Util.cpp:980

Following part of the code tests a request with corrupted http header:
Authorization auth2(Authorization::Type::Header, "def");
Poco::Net::HTTPRequest req2;
auth2.authorizeRequest(req2);
LOK_ASSERT(!req2.has("Authorization"));

Poco library throws exception.

Change-Id: Ic31a80c0e1e325de27c23059e2bcb3f00d39ad16
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101887
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Gülşah Köse 

diff --git a/common/Authorization.cpp b/common/Authorization.cpp
index 5613aa91a..93c5704fc 100644
--- a/common/Authorization.cpp
+++ b/common/Authorization.cpp
@@ -45,15 +45,42 @@ void 
Authorization::authorizeRequest(Poco::Net::HTTPRequest& request) const
 switch (_type)
 {
 case Type::Token:
-Util::setHttpHeaders(request, "Authorization: Bearer " + _data);
-assert(request.has("Authorization") && "HTTPRequest missing 
Authorization header");
+request.set("Authorization", "Bearer " + _data);
 break;
 case Type::Header:
+{
 // there might be more headers in here; like
 //   Authorization: Basic 
 //   X-Something-Custom: Huh
-Util::setHttpHeaders(request, _data);
+// Split based on \n's or \r's and trim, to avoid nonsense in the
+// headers
+StringVector tokens(Util::tokenizeAnyOf(_data, "\n\r"));
+for (auto it = tokens.begin(); it != tokens.end(); ++it)
+{
+std::string token = tokens.getParam(*it);
+
+size_t separator = token.find_first_of(':');
+if (separator != std::string::npos)
+{
+size_t headerStart = token.find_first_not_of(' ', 0);
+size_t headerEnd = token.find_last_not_of(' ', separator - 
1);
+
+size_t valueStart = token.find_first_not_of(' ', separator 
+ 1);
+size_t valueEnd = token.find_last_not_of(' ');
+
+// set the header
+if (headerStart != std::string::npos && headerEnd != 
std::string::npos &&
+valueStart != std::string::npos && valueEnd != 
std::string::npos)
+{
+size_t headerLength = headerEnd - headerStart + 1;
+size_t valueLength = valueEnd - valueStart + 1;
+
+request.set(token.substr(headerStart, headerLength), 
token.substr(valueStart, valueLength));
+}
+}
+}
 break;
+}
 default:
 // assert(false);
 throw BadRequestException("Invalid HTTP request type");
diff --git a/common/Util.cpp b/common/Util.cpp
index f1cd61b69..e0ce00250 100644
--- a/common/Util.cpp
+++ b/common/Util.cpp
@@ -59,7 +59,7 @@
 #include 
 
 #include "Common.hpp"
-#include 
+#include "Log.hpp"
 #include "Protocol.hpp"
 #include "Util.hpp"
 
@@ -953,38 +953,6 @@ namespace Util
 return std::ctime(&t);
 }
 
-void setHttpHeaders(Poco::Net::HTTPRequest& request, const std::string& 
headers)
-{
-// Look for either \r or \n and replace them with a single \r\n
-// as prescribed by rfc2616 as valid header delimeter, removing
-// any invalid line breaks, to avoid nonsense in the headers.
-const StringVector tokens = Util::tokenizeAnyOf(headers, "\n\r");
-const std::string header = tokens.cat("\r\n", 0);
-try
-{
-// Now parse to preserve folded headers and other
-// corner cases that is conformant to the rfc,
-// detecting any errors and/or invalid entries.
-// NB: request.read() expects full message and will fail.
-Poco::Net::MessageHeader msgHeader;
-std::istringstream iss(header);
-msgHeader.read(iss);
-for (const auto& entry : msgHeader)
-{
-// Set each header entry.
-request.set(Util::trimmed(entry.first), 
Util::trimmed(entry.second));
-}
-}
-catch (cons

[Libreoffice-commits] online.git: Branch 'feature/calc-canvas' - loleaflet/src

[Michael Meeks (via logerrit)]

 loleaflet/src/layer/tile/CanvasTileLayer.js |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 071824e9a8c50c4159abbdc865bae19f41741930
Author: Michael Meeks 
AuthorDate: Tue Sep 1 21:35:35 2020 +0100
Commit: Michael Meeks 
CommitDate: Tue Sep 1 21:35:35 2020 +0100

calc canvas: paint invalid tiles until their replacement arrives.

This avoids display corruption when panning, whereby stale/old
canvas content would continue to be rendered in the 'holes'
where invalid tiles were not rendered.

Change-Id: Ic886c0924c5a930116b1437c8e0cf35726ab76a5

diff --git a/loleaflet/src/layer/tile/CanvasTileLayer.js 
b/loleaflet/src/layer/tile/CanvasTileLayer.js
index 8643f8bf7..6d6aacecd 100644
--- a/loleaflet/src/layer/tile/CanvasTileLayer.js
+++ b/loleaflet/src/layer/tile/CanvasTileLayer.js
@@ -253,7 +253,7 @@ L.CanvasTilePainter = L.Class.extend({
!splitPosChanged &&
!scaleChanged);
 
-   console.debug('Tile size: ' + this._layer._getTileSize());
+// console.debug('Tile size: ' + this._layer._getTileSize());
 
if (skipUpdate)
return;
@@ -306,10 +306,14 @@ L.CanvasTilePainter = L.Class.extend({
 
var key = coords.key();
var tile = this._layer._tiles[key];
-   var invalid = tile && 
tile._invalidCount && tile._invalidCount > 0;
-   if (tile && tile.loaded && !invalid) {
+// var invalid = tile && 
tile._invalidCount && tile._invalidCount > 0;
+   if (tile && tile.loaded) {
this.paint(tile, ctx);
}
+/* else
+   console.log('missing tile at ' 
+ i + ', ' + j + ' ' +
+   tile + ' ' + (tile 
&& tile.loaded) + ' ' +
+   (tile ? 
tile._invalidCount : -42) + ' ' + invalid); */
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 svtools/source/control/valueset.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6a9e01ed889e92772e32ad5255fc60bd6dd7ee2a
Author: Caolán McNamara 
AuthorDate: Tue Sep 1 10:45:52 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Sep 1 22:13:37 2020 +0200

tdf#136319 do logging before calling handler which might destroy the 
valueset

though doing this logging always when ~100% of the time there is noone
listening seems wasteful

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

diff --git a/svtools/source/control/valueset.cxx 
b/svtools/source/control/valueset.cxx
index 9fb267e7b6cf..280d8eaff848 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -165,8 +165,8 @@ void ValueSet::ImplDeleteItems()
 
 void ValueSet::Select()
 {
-maSelectHdl.Call( this );
 
collectUIInformation(OStringToOUString(GetDrawingArea()->get_buildable_name(),RTL_TEXTENCODING_UTF8)
 , OStringToOUString(GetDrawingArea()->get_help_id(),RTL_TEXTENCODING_UTF8) , 
OUString::number(GetSelectedItemId()));
+maSelectHdl.Call( this );
 }
 
 void ValueSet::UserDraw( const UserDrawEvent& )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/html

[Pranam Lashkari (via logerrit)]

 loleaflet/html/loleaflet-help.html |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b31e6d9b00f4740ccdb993ce73f4311886eb8bb3
Author: Pranam Lashkari 
AuthorDate: Tue Sep 1 22:10:43 2020 +0530
Commit: Pranam Lashkari 
CommitDate: Tue Sep 1 22:08:07 2020 +0200

leaflet: updated paste shortcuts in the help menu

Change-Id: Ie151debcbe169f59e662512448f4df5372cf52a6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101886
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Pranam Lashkari 
(cherry picked from commit 35cc34c420995b89ecafc9bc16f2d973a2a5dc29)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101862

diff --git a/loleaflet/html/loleaflet-help.html 
b/loleaflet/html/loleaflet-help.html
index c81924837..44b62d72d 100644
--- a/loleaflet/html/loleaflet-help.html
+++ b/loleaflet/html/loleaflet-help.html
@@ -23,7 +23,8 @@
  Undo Ctrl + 
Z 
  Redo Ctrl + 
Y 
  Cut Ctrl + 
X 
- Paste as unformatted text Ctrl + Alt + Shift + V 
+ Paste as unformatted text Ctrl + Shift + V 
+ Paste special Ctrl + Alt + Shift + V 
  Print (Download as PDF) Ctrl + P 
  Display the Keyboard shortcuts help 
Ctrl + Shift + ? 
 
@@ -299,7 +300,7 @@
 To continue editing, click on the document and the layover and message 
disappear. Any changes that may have been made by other users – while 
collaboratively editing the document – are re-loaded.
 Pasting
 When you paste content copied from within the same document, the format 
and elements are maintained. If you copy from another document, in another tab 
or browser window, or from outside of the browser, the pasted content will 
preserve rich text.
-You can paste as unformatted text with the keyboard shortcut: Ctrl + Alt + Shift + V
+You can paste as unformatted text with the keyboard shortcut: Ctrl + Shift + V
 When you paste text from within the document, formatting will be 
respected. You can also paste objects, such as images, if they are copied from 
the document you are working in.
 When you paste text from outside of the document (another browser 
window or a desktop application, it will be pasted as rich text.
 When you have internal cut or copied content, you can paste this 
content using the context menu.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 linguistic/source/spelldsp.cxx |   28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

New commits:
commit e772c8e86dcdb7c5b80b04d57b454158909ffe61
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 16:10:12 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 22:03:39 2020 +0200

Fix typo in code

It passed "make check" on Linux

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

diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index a1390c916c77..fb58843a0efb 100644
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -453,7 +453,7 @@ Reference< XSpellAlternatives > 
SpellCheckerDispatcher::spell_Impl(
 // try already instantiated services first
 {
 const Reference< XSpellChecker >  *pRef  = 
pEntry->aSvcRefs.getConstArray();
-sal_Int32 nNumSugestions = -1;
+sal_Int32 nNumSuggestions = -1;
 while (i <= pEntry->nLastTriedSvcIndex
&&  (!bTmpResValid || xTmpRes.is()) )
 {
@@ -483,17 +483,17 @@ Reference< XSpellAlternatives > 
SpellCheckerDispatcher::spell_Impl(
 if (!xRes.is() && bTmpResValid)
 {
 xRes = xTmpRes;
-nNumSugestions = 0;
+nNumSuggestions = 0;
 if (xRes.is())
-nNumSugestions = xRes->getAlternatives().getLength();
+nNumSuggestions = xRes->getAlternatives().getLength();
 }
-sal_Int32 nTmpNumSugestions = 0;
+sal_Int32 nTmpNumSuggestions = 0;
 if (xTmpRes.is() && bTmpResValid)
-nTmpNumSugestions = xTmpRes->getAlternatives().getLength();
-if (xRes.is() && nNumSugestions == 0 && nTmpNumSugestions > 0)
+nTmpNumSuggestions = 
xTmpRes->getAlternatives().getLength();
+if (xRes.is() && nNumSuggestions == 0 && nTmpNumSuggestions > 
0)
 {
 xRes = xTmpRes;
-nNumSugestions = nTmpNumSugestions;
+nNumSuggestions = nTmpNumSuggestions;
 }
 
 ++i;
@@ -514,7 +514,7 @@ Reference< XSpellAlternatives > 
SpellCheckerDispatcher::spell_Impl(
 Sequence< Any > aArgs(2);
 aArgs.getArray()[0] <<= GetPropSet();
 
-sal_Int32 nNumSugestions = -1;
+sal_Int32 nNumSuggestions = -1;
 while (i < nLen  &&  (!bTmpResValid || xTmpRes.is()))
 {
 // create specific service via it's implementation name
@@ -562,17 +562,17 @@ Reference< XSpellAlternatives > 
SpellCheckerDispatcher::spell_Impl(
 if (!xRes.is() && bTmpResValid)
 {
 xRes = xTmpRes;
-nNumSugestions = 0;
+nNumSuggestions = 0;
 if (xRes.is())
-nNumSugestions = xRes->getAlternatives().getLength();
+nNumSuggestions = xRes->getAlternatives().getLength();
 }
-sal_Int32 nTmpNumSugestions = 0;
+sal_Int32 nTmpNumSuggestions = 0;
 if (xTmpRes.is() && bTmpResValid)
-nTmpNumSugestions = xTmpRes->getAlternatives().getLength();
-if (xRes.is() && nNumSugestions == 0 && nTmpNumSugestions > 0)
+nTmpNumSuggestions = 
xTmpRes->getAlternatives().getLength();
+if (xRes.is() && nNumSuggestions == 0 && nTmpNumSuggestions > 
0)
 {
 xRes = xTmpRes;
-nNumSugestions = nTmpNumSugestions;
+nNumSuggestions = nTmpNumSuggestions;
 }
 
 pEntry->nLastTriedSvcIndex = static_cast(i);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 ucb/source/ucp/ext/ucpext_content.cxx |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit cdf8e4f6496391b2b77741c7ffb8bba6f70a6557
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 16:07:04 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 22:03:13 2020 +0200

Fix typo in code

It passed "make check" on linux

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

diff --git a/ucb/source/ucp/ext/ucpext_content.cxx 
b/ucb/source/ucp/ext/ucpext_content.cxx
index 58d0dcb31fad..86d265db5535 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -174,7 +174,7 @@ namespace ucb::ucp::ext
 }
 
 
-Any SAL_CALL Content::execute( const Command& aCommand, sal_Int32 /* 
CommandId */, const Reference< XCommandEnvironment >& i_rEvironment )
+Any SAL_CALL Content::execute( const Command& aCommand, sal_Int32 /* 
CommandId */, const Reference< XCommandEnvironment >& i_rEnvironment )
 {
 Any aRet;
 
@@ -185,11 +185,11 @@ namespace ucb::ucp::ext
 {
 ::ucbhelper::cancelCommandExecution( makeAny( 
IllegalArgumentException(
 OUString(), *this, -1 ) ),
-i_rEvironment );
+i_rEnvironment );
 // unreachable
 }
 
-aRet <<= getPropertyValues( Properties, i_rEvironment );
+aRet <<= getPropertyValues( Properties, i_rEnvironment );
 }
 else if ( aCommand.Name == "setPropertyValues" )
 {
@@ -198,7 +198,7 @@ namespace ucb::ucp::ext
 {
 ::ucbhelper::cancelCommandExecution( makeAny( 
IllegalArgumentException(
 OUString(), *this, -1 ) ),
-i_rEvironment );
+i_rEnvironment );
 // unreachable
 }
 
@@ -206,7 +206,7 @@ namespace ucb::ucp::ext
 {
 ::ucbhelper::cancelCommandExecution( makeAny( 
IllegalArgumentException(
 OUString(), *this, -1 ) ),
-i_rEvironment );
+i_rEnvironment );
 // unreachable
 }
 
@@ -215,12 +215,12 @@ namespace ucb::ucp::ext
 else if ( aCommand.Name == "getPropertySetInfo" )
 {
 // implemented by base class.
-aRet <<= getPropertySetInfo( i_rEvironment );
+aRet <<= getPropertySetInfo( i_rEnvironment );
 }
 else if ( aCommand.Name == "getCommandInfo" )
 {
 // implemented by base class.
-aRet <<= getCommandInfo( i_rEvironment );
+aRet <<= getCommandInfo( i_rEnvironment );
 }
 else if ( aCommand.Name == "open" )
 {
@@ -229,7 +229,7 @@ namespace ucb::ucp::ext
 {
 ::ucbhelper::cancelCommandExecution( makeAny( 
IllegalArgumentException(
 OUString(), *this, -1 ) ),
-i_rEvironment );
+i_rEnvironment );
 // unreachable
 }
 
@@ -241,14 +241,14 @@ namespace ucb::ucp::ext
 
 if ( bOpenFolder && impl_isFolder() )
 {
-Reference< XDynamicResultSet > xSet = new ResultSet( 
m_xContext, this, aOpenCommand, i_rEvironment );
+Reference< XDynamicResultSet > xSet = new ResultSet( 
m_xContext, this, aOpenCommand, i_rEnvironment );
 aRet <<= xSet;
   }
 
 if ( aOpenCommand.Sink.is() )
 {
 const OUString sPhysicalContentURL( getPhysicalURL() );
-::ucbhelper::Content aRequestedContent( sPhysicalContentURL, 
i_rEvironment, m_xContext );
+::ucbhelper::Content aRequestedContent( sPhysicalContentURL, 
i_rEnvironment, m_xContext );
 aRet = aRequestedContent.executeCommand( "open", makeAny( 
aOpenCommand ) );
 }
 }
@@ -257,7 +257,7 @@ namespace ucb::ucp::ext
 {
 ::ucbhelper::cancelCommandExecution( makeAny( 
UnsupportedCommandException(
 OUString(), *this ) ),
-i_rEvironment );
+i_rEnvironment );
 // unreachable
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/sanitizers svx/uiconfig

[Caolán McNamara (via logerrit)]

 solenv/sanitizers/ui/svx.suppr   |2 --
 svx/uiconfig/ui/findreplacedialog.ui |2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7645530fdb142a01755cc772499b2d79bd58182d
Author: Caolán McNamara 
AuthorDate: Tue Sep 1 10:22:42 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Sep 1 21:57:10 2020 +0200

tdf#134923 missing mnemonic widget target for labels

presumably since...

commit beeef93480fae65840646e4e36aa888efe92579a
Date:   Tue Mar 8 19:54:57 2016 +0530

tdf#98417, tdf#98539: DIALOG: Improvements to the Find & Replace dialog.

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

diff --git a/solenv/sanitizers/ui/svx.suppr b/solenv/sanitizers/ui/svx.suppr
index 2df028122c84..f8ac4847858e 100644
--- a/solenv/sanitizers/ui/svx.suppr
+++ b/solenv/sanitizers/ui/svx.suppr
@@ -29,10 +29,8 @@ 
svx/uiconfig/ui/docrecoverybrokendialog.ui://GtkLabel[@id='label1'] orphan-label
 svx/uiconfig/ui/docrecoveryprogressdialog.ui://GtkLabel[@id='label2'] 
orphan-label
 svx/uiconfig/ui/docrecoveryrecoverdialog.ui://GtkLabel[@id='desc'] orphan-label
 svx/uiconfig/ui/docrecoverysavedialog.ui://GtkLabel[@id='label1'] orphan-label
-svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='label4'] orphan-label
 svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='searchdesc'] orphan-label
 svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='entirecells'] orphan-label
-svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='label5'] orphan-label
 svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='replacedesc'] orphan-label
 svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='label7'] orphan-label
 svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='searchinlabel'] 
orphan-label
diff --git a/svx/uiconfig/ui/findreplacedialog.ui 
b/svx/uiconfig/ui/findreplacedialog.ui
index cee932875ea8..ed3337fdf7ab 100644
--- a/svx/uiconfig/ui/findreplacedialog.ui
+++ b/svx/uiconfig/ui/findreplacedialog.ui
@@ -147,6 +147,7 @@
 center
 _Find:
 True
+searchterm
 0
 0.400059604645
 
@@ -422,6 +423,7 @@
 center
 Re_place:
 True
+replaceterm
 0
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 include/vcl/keycod.hxx   |6 ++
 vcl/source/window/keycod.cxx |   17 +++--
 2 files changed, 5 insertions(+), 18 deletions(-)

New commits:
commit edf46578b8cba12cc72f3463fee2ceb45a041c67
Author: Caolán McNamara 
AuthorDate: Tue Sep 1 09:44:25 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Sep 1 21:56:54 2020 +0200

reduce KeyFuncType down to just the used categories

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

diff --git a/include/vcl/keycod.hxx b/include/vcl/keycod.hxx
index 63bbf372f382..6219897b55cb 100644
--- a/include/vcl/keycod.hxx
+++ b/include/vcl/keycod.hxx
@@ -26,11 +26,9 @@
 
 namespace vcl { class Window; }
 
-enum class KeyFuncType : sal_Int32 { DONTKNOW, NEW, OPEN, SAVE,
-   SAVEAS, PRINT, CLOSE, QUIT,
+enum class KeyFuncType : sal_Int32 { DONTKNOW,
CUT, COPY, PASTE, UNDO,
-   REDO, DELETE, REPEAT, FIND,
-   FINDBACKWARD, PROPERTIES, FRONT };
+   REDO, DELETE, REPEAT };
 
 namespace vcl
 {
diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx
index 0c8939ae0979..193115f5a6a1 100644
--- a/vcl/source/window/keycod.cxx
+++ b/vcl/source/window/keycod.cxx
@@ -26,27 +26,16 @@
 #include 
 #include 
 
-const sal_uInt16 aImplKeyFuncTab[(static_cast(KeyFuncType::FRONT)+1)*4] =
+const sal_uInt16 aImplKeyFuncTab[(static_cast(KeyFuncType::REPEAT)+1)*4] =
 {
 0, 0, 0, 0,// 
KeyFuncType::DONTKNOW
-KEY_N | KEY_MOD1, 0, 0, 0, // 
KeyFuncType::NEW
-KEY_O | KEY_MOD1, KEY_OPEN, 0, 0,  // 
KeyFuncType::OPEN
-KEY_S | KEY_MOD1, 0, 0, 0, // 
KeyFuncType::SAVE
-KEY_S | KEY_SHIFT | KEY_MOD1, 0, 0, 0, // 
KeyFuncType::SAVEAS
-KEY_P | KEY_MOD1, 0, 0, 0, // 
KeyFuncType::PRINT
-KEY_W | KEY_MOD1, KEY_F4 | KEY_MOD1, 0, 0, // 
KeyFuncType::CLOSE
-KEY_Q | KEY_MOD1, KEY_F4 | KEY_MOD2, 0, 0, // 
KeyFuncType::QUIT
 KEY_X | KEY_MOD1, KEY_DELETE | KEY_SHIFT, KEY_CUT, 0,  // 
KeyFuncType::CUT
 KEY_C | KEY_MOD1, KEY_INSERT | KEY_MOD1, KEY_COPY, 0,  // 
KeyFuncType::COPY
 KEY_V | KEY_MOD1, KEY_INSERT | KEY_SHIFT, KEY_PASTE, 0,// 
KeyFuncType::PASTE
 KEY_Z | KEY_MOD1, KEY_BACKSPACE | KEY_MOD2, KEY_UNDO, 0,   // 
KeyFuncType::UNDO
 KEY_Y | KEY_MOD1, KEY_UNDO | KEY_SHIFT, 0, 0,  // 
KeyFuncType::REDO
 KEY_DELETE, 0, 0, 0,   // 
KeyFuncType::DELETE
-KEY_REPEAT, 0, 0, 0,   // 
KeyFuncType::REPEAT
-KEY_F | KEY_MOD1, KEY_FIND, 0, 0,  // 
KeyFuncType::FIND
-KEY_F | KEY_SHIFT | KEY_MOD1, KEY_SHIFT | KEY_FIND, 0, 0,  // 
KeyFuncType::FINDBACKWARD
-KEY_RETURN | KEY_MOD2, 0, 0, 0,// 
KeyFuncType::PROPERTIES
-0, 0, 0, 0 // 
KeyFuncType::FRONT
+KEY_REPEAT, 0, 0, 0// 
KeyFuncType::REPEAT
 };
 
 bool ImplGetKeyCode( KeyFuncType eFunc, sal_uInt16& rCode1, sal_uInt16& 
rCode2, sal_uInt16& rCode3, sal_uInt16& rCode4 )
@@ -90,7 +79,7 @@ KeyFuncType vcl::KeyCode::GetFunction() const
 sal_uInt16 nCompCode = GetModifier() | GetCode();
 if ( nCompCode )
 {
-for ( sal_uInt16 i = sal_uInt16(KeyFuncType::NEW); i < 
sal_uInt16(KeyFuncType::FRONT); i++ )
+for ( sal_uInt16 i = sal_uInt16(KeyFuncType::CUT); i <= 
sal_uInt16(KeyFuncType::REPEAT); i++ )
 {
 sal_uInt16 nKeyCode1;
 sal_uInt16 nKeyCode2;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src

[Pranam Lashkari (via logerrit)]

 loleaflet/src/core/Util.js|   17 
 loleaflet/src/map/Clipboard.js|   41 --
 loleaflet/src/map/handler/Map.Keyboard.js |   25 ++
 3 files changed, 65 insertions(+), 18 deletions(-)

New commits:
commit 8f509a4b509e3e870bdcc121086b25104e72d706
Author: Pranam Lashkari 
AuthorDate: Tue Aug 18 19:33:13 2020 +0530
Commit: Andras Timar 
CommitDate: Tue Sep 1 21:56:13 2020 +0200

clipboard: leaflet: unformatted paste shortcut changed

Problems:
1: Browsers hard-code ctrl+shift+v as "paste without formatting" - ie. 
plain text
We need access to the clipboard to get the rich data needed for 
paste-special,
which we can only get security context /  access to with a ctrl-v keypress
2: we cannot directly access the clipboard data with ctrl+shift+alt+v

Solution:
Externally copied data could not be pasted directly with paste special
and unformatted paste due to no access to the clipboard data

To access the data copied externally we rely on user to trigger paste event
We use default browser shortcut for unformatted paste(ctrl+shift+v)
this triggers a paste event

for paste special we ask user to press ctrl+v with a popup and then
if that popup is open and paste event is triggered we trigger paste special

New shortcuts:
Paste: ctrl+v
unformatted Paste: ctrl+shift+v
Paste special: ctrl+shift+alt+v

Change-Id: Ib15c701f5e03123cb91e36d1c1d64f0c12aa9cfb
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100927
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 
(cherry picked from commit 457fc3d538aed7bc2bc41fd022399749f4c5a3e4)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101861
Reviewed-by: Andras Timar 

diff --git a/loleaflet/src/core/Util.js b/loleaflet/src/core/Util.js
index 596dfa756..b2900b62b 100644
--- a/loleaflet/src/core/Util.js
+++ b/loleaflet/src/core/Util.js
@@ -207,6 +207,23 @@ L.Util = {
context.font = font;
var metrics = context.measureText(text);
return Math.floor(metrics.width);
+   },
+
+   replaceCtrlInMac: function(msg) {
+   if (navigator.appVersion.indexOf('Mac') != -1 || 
navigator.userAgent.indexOf('Mac') != -1) {
+   var ctrl = /Ctrl/g;
+   if (String.locale.startsWith('de') || 
String.locale.startsWith('dsb') || String.locale.startsWith('hsb')) {
+   ctrl = /Strg/g;
+   }
+   if (String.locale.startsWith('lt')) {
+   ctrl = /Vald/g;
+   }
+   if (String.locale.startsWith('sl')) {
+   ctrl = /Krmilka/g;
+   }
+   return msg.replace(ctrl, '⌘');
+   }
+   return msg;
}
 };
 
diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index 8043a1a98..c0204266a 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -264,8 +264,15 @@ L.Clipboard = L.Class.extend({
that._doAsyncDownload(
'POST', dest, formData,
function() {
-   console.log('up-load done, now 
paste');
-   
that._map._socket.sendMessage('uno .uno:Paste');
+   if (this.pasteSpecialVex && 
this.pasteSpecialVex.isOpen) {
+   
vex.close(this.pasteSpecialVex);
+   console.log('up-load 
done, now paste special');
+   
that.map._socket.sendMessage('uno .uno:PasteSpecial');
+   } else {
+   console.log('up-load 
done, now paste');
+   
that._map._socket.sendMessage('uno .uno:Paste');
+   }
+
},
function(progress) { return 50 + 
progress/2; }
);
@@ -292,8 +299,15 @@ L.Clipboard = L.Class.extend({
that._doAsyncDownload(
'POST', dest, formData,
function() {
-   console.log('up-load of 
fallback done, now paste');
-   
that._map._socket.sendMessage('uno .uno:Paste');
+   if 

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

[Caolán McNamara (via logerrit)]

 vcl/source/control/edit.cxx |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 8b712e8fb5c7fe03ffb61a5ecf40a8516a8b5aa8
Author: Caolán McNamara 
AuthorDate: Mon Aug 31 20:33:35 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Sep 1 21:47:54 2020 +0200

check if Edit was disposed while insert special character was still open

seen when testing renaming tabs in basic IDE

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

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index f90a7f0bd8ed..b14789aaf133 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2022,11 +2022,14 @@ void Edit::Command( const CommandEvent& rCEvt )
 else if (sCommand == "specialchar" && pImplFncGetSpecialChars)
 {
 OUString aChars = pImplFncGetSpecialChars(GetFrameWeld(), 
GetFont());
-SetSelection( aSaveSel );
-if (!aChars.isEmpty())
+if (!IsDisposed()) // destroyed while the insert special character 
dialog was still open
 {
-ImplInsertText( aChars );
-Modify();
+SetSelection( aSaveSel );
+if (!aChars.isEmpty())
+{
+ImplInsertText( aChars );
+Modify();
+}
 }
 }
 pPopup.clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sw/source/core/text/txtfld.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3db362c4788864b250c511c930c1b908d4b47ca7
Author: Caolán McNamara 
AuthorDate: Tue Sep 1 08:48:23 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Sep 1 21:02:55 2020 +0200

cid#1466575 Dereference null return value

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

diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index 7e7aa65f3c43..79944f166ed0 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -478,8 +478,8 @@ static void 
checkApplyParagraphMarkFormatToNumbering(SwFont* pNumFnt, SwTextForm
 {
 // Copy from parent sets only allowed items which will not 
overwrite
 // values explicitly defined in current set (pCleanedSet) or 
in pFormat
-const SfxPoolItem* pItem = rStyleAttrs.GetItem(nWhich, true);
-pCleanedSet->Put(*pItem);
+if (const SfxPoolItem* pItem = rStyleAttrs.GetItem(nWhich, 
true))
+pCleanedSet->Put(*pItem);
 }
 nWhich = aIter.NextWhich();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'libreoffice-7-0' - .gitreview

[Gary Kim (via logerrit)]

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

New commits:
commit b4698ad57a52e4bcf782bc75fcbe348483f86497
Author: Gary Kim 
AuthorDate: Tue Sep 1 13:48:29 2020 -0400
Commit: Michael Meeks 
CommitDate: Tue Sep 1 20:46:00 2020 +0200

Fix incorrect spelling of branch in .gitreview

Change-Id: Ic6d48e484ddd81fe6dfb9916fcd6144d954f7be5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101889
Tested-by: Michael Meeks 
Reviewed-by: Michael Meeks 

diff --git a/.gitreview b/.gitreview
index 0f0114e0e..f7d0683a6 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=gerrit.libreoffice.org
 port=29418
 project=online
 defaultremote=logerrit
-defaultbranch=libreofiice-7-0
+defaultbranch=libreoffice-7-0
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pranam Lashkari (via logerrit)]

 loleaflet/html/loleaflet-help.html |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 35cc34c420995b89ecafc9bc16f2d973a2a5dc29
Author: Pranam Lashkari 
AuthorDate: Tue Sep 1 22:10:43 2020 +0530
Commit: Pranam Lashkari 
CommitDate: Tue Sep 1 20:06:24 2020 +0200

leaflet: updated paste shortcuts in the help menu

Change-Id: Ie151debcbe169f59e662512448f4df5372cf52a6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101886
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Pranam Lashkari 

diff --git a/loleaflet/html/loleaflet-help.html 
b/loleaflet/html/loleaflet-help.html
index c81924837..44b62d72d 100644
--- a/loleaflet/html/loleaflet-help.html
+++ b/loleaflet/html/loleaflet-help.html
@@ -23,7 +23,8 @@
  Undo Ctrl + 
Z 
  Redo Ctrl + 
Y 
  Cut Ctrl + 
X 
- Paste as unformatted text Ctrl + Alt + Shift + V 
+ Paste as unformatted text Ctrl + Shift + V 
+ Paste special Ctrl + Alt + Shift + V 
  Print (Download as PDF) Ctrl + P 
  Display the Keyboard shortcuts help 
Ctrl + Shift + ? 
 
@@ -299,7 +300,7 @@
 To continue editing, click on the document and the layover and message 
disappear. Any changes that may have been made by other users – while 
collaboratively editing the document – are re-loaded.
 Pasting
 When you paste content copied from within the same document, the format 
and elements are maintained. If you copy from another document, in another tab 
or browser window, or from outside of the browser, the pasted content will 
preserve rich text.
-You can paste as unformatted text with the keyboard shortcut: Ctrl + Alt + Shift + V
+You can paste as unformatted text with the keyboard shortcut: Ctrl + Shift + V
 When you paste text from within the document, formatting will be 
respected. You can also paste objects, such as images, if they are copied from 
the document you are working in.
 When you paste text from outside of the document (another browser 
window or a desktop application, it will be pasted as rich text.
 When you have internal cut or copied content, you can paste this 
content using the context menu.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 test/source/text/textdocumentindex.cxx |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit f700902e903ee610cb5ff58769ee4ca345b4f696
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 16:04:19 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 19:54:19 2020 +0200

Fix typo in code

It passed "make check" on Linux

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

diff --git a/test/source/text/textdocumentindex.cxx 
b/test/source/text/textdocumentindex.cxx
index 63873e2b4742..67f161cf3472 100644
--- a/test/source/text/textdocumentindex.cxx
+++ b/test/source/text/textdocumentindex.cxx
@@ -18,19 +18,19 @@ TextDocumentIndex::~TextDocumentIndex() {}
 
 void TextDocumentIndex::testDocumentIndexProperties()
 {
-css::uno::Reference xDocumnetIndex(init(), 
css::uno::UNO_QUERY_THROW);
+css::uno::Reference xDocumentIndex(init(), 
css::uno::UNO_QUERY_THROW);
 
-testBooleanProperty(xDocumnetIndex, "UseAlphabeticalSeparators");
-testBooleanProperty(xDocumnetIndex, "UseKeyAsEntry");
-testBooleanProperty(xDocumnetIndex, "UseCombinedEntries");
-testBooleanProperty(xDocumnetIndex, "IsCaseSensitive");
-testBooleanProperty(xDocumnetIndex, "UsePP");
-testBooleanProperty(xDocumnetIndex, "UseDash");
-testBooleanProperty(xDocumnetIndex, "UseUpperCase");
-testStringOptionalProperty(xDocumnetIndex, "MainEntryCharacterStyleName");
+testBooleanProperty(xDocumentIndex, "UseAlphabeticalSeparators");
+testBooleanProperty(xDocumentIndex, "UseKeyAsEntry");
+testBooleanProperty(xDocumentIndex, "UseCombinedEntries");
+testBooleanProperty(xDocumentIndex, "IsCaseSensitive");
+testBooleanProperty(xDocumentIndex, "UsePP");
+testBooleanProperty(xDocumentIndex, "UseDash");
+testBooleanProperty(xDocumentIndex, "UseUpperCase");
+testStringOptionalProperty(xDocumentIndex, "MainEntryCharacterStyleName");
 //  [readonly, property] sequence 
 DocumentIndexMarks;
 //  [property] com::sun::star::lang::Locale  Locale;
-testStringProperty(xDocumnetIndex, "SortAlgorithm", "Value");
+testStringProperty(xDocumentIndex, "SortAlgorithm", "Value");
 }
 }
 /* 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: chart2/source toolkit/source

[Andrea Gelmini (via logerrit)]

 chart2/source/controller/uitest/uiobject.cxx|6 +++---
 toolkit/source/controls/unocontrolcontainer.cxx |6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 62ca189dbc9d21a11fd638245c3c2abd438d39ac
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 14:41:23 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 19:54:59 2020 +0200

Fix typo in code

It passed "make check" on Linux

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

diff --git a/chart2/source/controller/uitest/uiobject.cxx 
b/chart2/source/controller/uitest/uiobject.cxx
index e850573b97f2..651c407565d7 100644
--- a/chart2/source/controller/uitest/uiobject.cxx
+++ b/chart2/source/controller/uitest/uiobject.cxx
@@ -150,15 +150,15 @@ namespace {
 
 void recursiveAdd(chart::ObjectIdentifier const & rID, std::set& 
rChildren, const chart::ObjectHierarchy& rHierarchy)
 {
-std::vector aChildIndentifiers = 
rHierarchy.getChildren(rID);
-std::transform(aChildIndentifiers.begin(), aChildIndentifiers.end(), 
std::inserter(rChildren, rChildren.begin()),
+std::vector aChildIdentifiers = 
rHierarchy.getChildren(rID);
+std::transform(aChildIdentifiers.begin(), aChildIdentifiers.end(), 
std::inserter(rChildren, rChildren.begin()),
 [](const chart::ObjectIdentifier& rObject)
 {
 return rObject.getObjectCID();
 }
 );
 
-for (const chart::ObjectIdentifier& ID: aChildIndentifiers)
+for (const chart::ObjectIdentifier& ID: aChildIdentifiers)
 recursiveAdd(ID, rChildren, rHierarchy);
 }
 
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx 
b/toolkit/source/controls/unocontrolcontainer.cxx
index 552b9ee52af8..b1d0454fc492 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -184,11 +184,11 @@ void UnoControlHolderList::getControls( uno::Sequence< 
uno::Reference< awt::XCon
 void UnoControlHolderList::getIdentifiers( uno::Sequence< sal_Int32 >& 
_out_rIdentifiers ) const
 {
 _out_rIdentifiers.realloc( maControls.size() );
-sal_Int32* pIndentifiers = _out_rIdentifiers.getArray();
+sal_Int32* pIdentifiers = _out_rIdentifiers.getArray();
 for (const auto& rEntry : maControls)
 {
-*pIndentifiers = rEntry.first;
-++pIndentifiers;
+*pIdentifiers = rEntry.first;
+++pIdentifiers;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sc/source/filter/excel/xestyle.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b728086a822d52fc5f2efbc855ae632e4147fb69
Author: Caolán McNamara 
AuthorDate: Sun May 3 16:43:06 2020 +0100
Commit: Aron Budea 
CommitDate: Tue Sep 1 19:51:27 2020 +0200

Resolves: tdf#130108 ensure we don't reuse the last SetSearchMask setting

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93366
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit c8a4fa577e5daec6520a810b4df753a67d9dd5a8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93372
Reviewed-by: Xisco Faulí 
Reviewed-by: Thorsten Behrens 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 636e1dff386d130e46ab39417d0d447241f33dde)

Change-Id: Iddc4438b8bd30576be4531d47b6be0ac70847a9c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101884
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Aron Budea 

diff --git a/sc/source/filter/excel/xestyle.cxx 
b/sc/source/filter/excel/xestyle.cxx
index a9f31e0ac953..c3be0d7830cc 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -3035,7 +3035,7 @@ XclExpDxfs::XclExpDxfs( const XclExpRoot& rRoot )
 {
 maStyleNameToDxfId.insert(std::pair(aStyleName, nIndex));
 
-SfxStyleSheetBase* pStyle = 
rRoot.GetDoc().GetStyleSheetPool()->Find(aStyleName);
+SfxStyleSheetBase* pStyle = 
rRoot.GetDoc().GetStyleSheetPool()->Find(aStyleName, SfxStyleFamily::Para);
 if(!pStyle)
 continue;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin (via logerrit)]

 xmloff/source/draw/ximpstyl.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit b13c2808127b36052a747aee35ecf607fc46d7ce
Author: Noel Grandin 
AuthorDate: Tue Sep 1 13:39:55 2020 +0200
Commit: Noel Grandin 
CommitDate: Tue Sep 1 19:46:20 2020 +0200

reduce log noise

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

diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 4115de5ea24b..2515b245859a 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -879,6 +879,8 @@ SvXMLStyleContext* 
SdXMLStylesContext::CreateStyleChildContext(
 case XML_ELEMENT(PRESENTATION, XML_FOOTER_DECL):
 case XML_ELEMENT(PRESENTATION, XML_DATE_TIME_DECL):
 return new SdXMLHeaderFooterDeclContext( GetImport(), xAttrList );
+case XML_ELEMENT(STYLE, XML_STYLE):
+break; // ignore
 default:
 SAL_WARN("xmloff", "unknown element " << 
SvXMLImport::getPrefixAndNameFromToken(nElement));
 }
___
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

[andreas kainz (via logerrit)]

 sc/uiconfig/scalc/ui/sidebaralignment.ui |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 39585d37e31de0754d6d66c9c5338ae9429b83c7
Author: andreas kainz 
AuthorDate: Fri Aug 28 23:34:12 2020 +0200
Commit: Andreas Kainz 
CommitDate: Tue Sep 1 19:17:47 2020 +0200

tdf#134491 Calc sidebar alignment fix

Change-Id: I9ea341f5980dfc4998075a7f9d8f6432145c1d13
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101588
Tested-by: Jenkins
Reviewed-by: Andreas Kainz 
(cherry picked from commit 977a97f3148c0aece0a54304aae81ec44ced07e0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101468

diff --git a/sc/uiconfig/scalc/ui/sidebaralignment.ui 
b/sc/uiconfig/scalc/ui/sidebaralignment.ui
index ce04c242bddf..7be5dfd29066 100644
--- a/sc/uiconfig/scalc/ui/sidebaralignment.ui
+++ b/sc/uiconfig/scalc/ui/sidebaralignment.ui
@@ -337,10 +337,11 @@
 0
 True
 False
+standard
   
   
 False
-True
+False
 0
   
 
@@ -356,10 +357,11 @@
 0
 True
 False
+standard
   
   
 False
-True
+False
 1
   
 
@@ -379,7 +381,7 @@
   
   
 False
-True
+False
 2
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Luboš Luňák (via logerrit)]

 vcl/skia/gdiimpl.cxx |   53 +++
 1 file changed, 53 insertions(+)

New commits:
commit 7957a3c6ab6ba4b61b0a237b680e6393029cc426
Author: Luboš Luňák 
AuthorDate: Mon Aug 31 15:48:42 2020 +0200
Commit: Luboš Luňák 
CommitDate: Tue Sep 1 18:52:25 2020 +0200

no polygon merge in Skia if they contain no straight lines (tdf#136240)

Merging polygons with beziers is even more expensive, and those are
very unlikely to be parts of a larger polygon that are meant to line
up perfectly.

Change-Id: Ic9d641d3264b962896347ed52addeca2a0d5ea22
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101742
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index a0299160496c..15c9937c26e7 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -132,6 +132,54 @@ void addPolyPolygonToPath(const basegfx::B2DPolyPolygon& 
rPolyPolygon, SkPath& r
 }
 }
 
+// Check if the given polygon contains a straight line. If not, it consists
+// solely of curves.
+bool polygonContainsLine(const basegfx::B2DPolyPolygon& rPolyPolygon)
+{
+if (!rPolyPolygon.areControlPointsUsed())
+return true; // no curves at all
+for (const auto& rPolygon : rPolyPolygon)
+{
+const sal_uInt32 nPointCount(rPolygon.count());
+bool bFirst = true;
+
+const bool bClosePath(rPolygon.isClosed());
+
+sal_uInt32 nCurrentIndex = 0;
+sal_uInt32 nPreviousIndex = nPointCount - 1;
+
+basegfx::B2DPoint aCurrentPoint;
+basegfx::B2DPoint aPreviousPoint;
+
+for (sal_uInt32 nIndex = 0; nIndex <= nPointCount; nIndex++)
+{
+if (nIndex == nPointCount && !bClosePath)
+continue;
+
+// Make sure we loop the last point to first point
+nCurrentIndex = nIndex % nPointCount;
+if (bFirst)
+bFirst = false;
+else
+{
+basegfx::B2DPoint aPreviousControlPoint
+= rPolygon.getNextControlPoint(nPreviousIndex);
+basegfx::B2DPoint aCurrentControlPoint
+= rPolygon.getPrevControlPoint(nCurrentIndex);
+
+if (aPreviousControlPoint.equal(aPreviousPoint)
+&& aCurrentControlPoint.equal(aCurrentPoint))
+{
+return true; // found a straight line
+}
+}
+aPreviousPoint = aCurrentPoint;
+nPreviousIndex = nCurrentIndex;
+}
+}
+return false; // no straight line found
+}
+
 SkColor toSkColor(Color color)
 {
 return SkColorSetARGB(255 - color.GetTransparency(), color.GetRed(), 
color.GetGreen(),
@@ -818,6 +866,11 @@ bool SkiaSalGraphicsImpl::delayDrawPolyPolygon(const 
basegfx::B2DPolyPolygon& aP
 // so they do not need joining.
 if (aPolyPolygon.count() != 1)
 return false;
+// If a polygon does not contain a straight line, i.e. it's all curves, 
then do not merge.
+// First of all that's even more expensive, and second it's very unlikely 
that it's a polygon
+// split into more polygons.
+if (!polygonContainsLine(aPolyPolygon))
+return false;
 
 if (mLastPolyPolygonInfo.polygons.size() != 0
 && (mLastPolyPolygonInfo.transparency != fTransparency
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Luboš Luňák (via logerrit)]

 vcl/skia/gdiimpl.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 8a930585b102eb9b63f7e43b646a8f07ad780ac3
Author: Luboš Luňák 
AuthorDate: Mon Aug 31 11:58:36 2020 +0200
Commit: Luboš Luňák 
CommitDate: Tue Sep 1 18:52:00 2020 +0200

do not try to merge a single polypolygon (tdf#136240)

Change-Id: Idad860288baf736caeefe9883d12ab50cca37dff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101702
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index b80fcc301d8a..a0299160496c 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -841,8 +841,11 @@ void SkiaSalGraphicsImpl::checkPendingDrawing()
 std::swap(polygons, mLastPolyPolygonInfo.polygons);
 double transparency = mLastPolyPolygonInfo.transparency;
 mLastPolyPolygonInfo.bounds.reset();
-basegfx::B2DPolyPolygon merged = 
basegfx::utils::mergeToSinglePolyPolygon(polygons);
-performDrawPolyPolygon(merged, transparency, true);
+if (polygons.size() == 1)
+performDrawPolyPolygon(polygons.front(), transparency, true);
+else
+
performDrawPolyPolygon(basegfx::utils::mergeToSinglePolyPolygon(polygons), 
transparency,
+   true);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pranam Lashkari (via logerrit)]

 loleaflet/src/core/Util.js|   17 
 loleaflet/src/map/Clipboard.js|   41 --
 loleaflet/src/map/handler/Map.Keyboard.js |   25 ++
 3 files changed, 65 insertions(+), 18 deletions(-)

New commits:
commit 457fc3d538aed7bc2bc41fd022399749f4c5a3e4
Author: Pranam Lashkari 
AuthorDate: Tue Aug 18 19:33:13 2020 +0530
Commit: Michael Meeks 
CommitDate: Tue Sep 1 18:23:03 2020 +0200

clipboard: leaflet: unformatted paste shortcut changed

Problems:
1: Browsers hard-code ctrl+shift+v as "paste without formatting" - ie. 
plain text
We need access to the clipboard to get the rich data needed for 
paste-special,
which we can only get security context /  access to with a ctrl-v keypress
2: we cannot directly access the clipboard data with ctrl+shift+alt+v

Solution:
Externally copied data could not be pasted directly with paste special
and unformatted paste due to no access to the clipboard data

To access the data copied externally we rely on user to trigger paste event
We use default browser shortcut for unformatted paste(ctrl+shift+v)
this triggers a paste event

for paste special we ask user to press ctrl+v with a popup and then
if that popup is open and paste event is triggered we trigger paste special

New shortcuts:
Paste: ctrl+v
unformatted Paste: ctrl+shift+v
Paste special: ctrl+shift+alt+v

Change-Id: Ib15c701f5e03123cb91e36d1c1d64f0c12aa9cfb
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100927
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Michael Meeks 

diff --git a/loleaflet/src/core/Util.js b/loleaflet/src/core/Util.js
index 596dfa756..b2900b62b 100644
--- a/loleaflet/src/core/Util.js
+++ b/loleaflet/src/core/Util.js
@@ -207,6 +207,23 @@ L.Util = {
context.font = font;
var metrics = context.measureText(text);
return Math.floor(metrics.width);
+   },
+
+   replaceCtrlInMac: function(msg) {
+   if (navigator.appVersion.indexOf('Mac') != -1 || 
navigator.userAgent.indexOf('Mac') != -1) {
+   var ctrl = /Ctrl/g;
+   if (String.locale.startsWith('de') || 
String.locale.startsWith('dsb') || String.locale.startsWith('hsb')) {
+   ctrl = /Strg/g;
+   }
+   if (String.locale.startsWith('lt')) {
+   ctrl = /Vald/g;
+   }
+   if (String.locale.startsWith('sl')) {
+   ctrl = /Krmilka/g;
+   }
+   return msg.replace(ctrl, '⌘');
+   }
+   return msg;
}
 };
 
diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index ede448410..85925f4a2 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -264,8 +264,15 @@ L.Clipboard = L.Class.extend({
that._doAsyncDownload(
'POST', dest, formData,
function() {
-   console.log('up-load done, now 
paste');
-   
that._map._socket.sendMessage('uno .uno:Paste');
+   if (this.pasteSpecialVex && 
this.pasteSpecialVex.isOpen) {
+   
vex.close(this.pasteSpecialVex);
+   console.log('up-load 
done, now paste special');
+   
that.map._socket.sendMessage('uno .uno:PasteSpecial');
+   } else {
+   console.log('up-load 
done, now paste');
+   
that._map._socket.sendMessage('uno .uno:Paste');
+   }
+
},
function(progress) { return 50 + 
progress/2; }
);
@@ -292,8 +299,15 @@ L.Clipboard = L.Class.extend({
that._doAsyncDownload(
'POST', dest, formData,
function() {
-   console.log('up-load of 
fallback done, now paste');
-   
that._map._socket.sendMessage('uno .uno:Paste');
+   if (this.pasteSpecialVex && 
this.pasteSpecialVex.isOpen) {
+   
vex.close(this.pasteSpecialVex);
+ 

Physics Based Animation Effects - Final Report

[Sarper Akdemir]

Hello everyone,

Checkout the final report if you're interested in what's the end
result in physics animations, *there's also a demonstration video in
the middle of the post*:
https://quwex.com/gsoc20-final-report/

I was really lucky to work on LibreOffice with you people this summer!
Thanks y'all for the opportunity, I have grown and had so much fun :)
Special thanks to Thorsten Behrens for mentoring me & being there for
me throughout the project!

I have no plans to stop contributing to LibreOffice, my plan for the
coming days is to work on bugs and features on Impress. So hopefully
I'll be around to bother you with my questions!

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

[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sd/qa

[Gülşah Köse (via logerrit)]

 sd/qa/unit/data/pptx/multicol.pptx |binary
 sd/qa/unit/import-tests.cxx|   29 +
 2 files changed, 29 insertions(+)

New commits:
commit 6b6fc688ba334c4f08996b9a258018ef3912ae50
Author: Gülşah Köse 
AuthorDate: Tue Aug 11 00:43:49 2020 +0300
Commit: Xisco Fauli 
CommitDate: Tue Sep 1 18:02:37 2020 +0200

tdf#133015 Add test for multicolumn textboxes.

Change-Id: I92d6af17313fb5a4a27fc8768b8f3fbe64db1816
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100452
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101751

diff --git a/sd/qa/unit/data/pptx/multicol.pptx 
b/sd/qa/unit/data/pptx/multicol.pptx
new file mode 100644
index ..3590d84c1a6b
Binary files /dev/null and b/sd/qa/unit/data/pptx/multicol.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 632872f40084..b285b490894b 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -145,6 +145,7 @@ public:
 void testPredefinedTableStyle();
 void testBnc591147();
 void testCreationDate();
+void testMultiColTexts();
 void testBnc584721_1();
 void testBnc584721_2();
 void testBnc584721_4();
@@ -254,6 +255,7 @@ public:
 CPPUNIT_TEST(testPredefinedTableStyle);
 CPPUNIT_TEST(testBnc591147);
 CPPUNIT_TEST(testCreationDate);
+CPPUNIT_TEST(testMultiColTexts);
 CPPUNIT_TEST(testBnc584721_1);
 CPPUNIT_TEST(testBnc584721_2);
 CPPUNIT_TEST(testBnc584721_4);
@@ -931,6 +933,33 @@ void SdImportTest::testCreationDate()
 xDocShRef->DoClose();
 }
 
+void SdImportTest::testMultiColTexts()
+{
+sd::DrawDocShellRef xDocShRef = loadURL( 
m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/multicol.pptx"), PPTX );
+const SdrPage *pPage = GetPage( 1, xDocShRef );
+
+sdr::table::SdrTableObj *pTableObj = 
dynamic_cast(pPage->GetObj(0));
+CPPUNIT_ASSERT( pTableObj );
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), pTableObj->getRowCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), pTableObj->getColumnCount());
+
+sdr::table::SdrTableObj *pMasterTableObj = 
dynamic_cast(pPage->TRG_GetMasterPage().GetObj(0));
+CPPUNIT_ASSERT( pMasterTableObj );
+
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), pMasterTableObj->getRowCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), pMasterTableObj->getColumnCount());
+
+uno::Reference< table::XCellRange > xTable(pMasterTableObj->getTable(), 
uno::UNO_QUERY_THROW);
+uno::Reference< beans::XPropertySet > xCell;
+xCell.set(xTable->getCellByPosition(0, 0), uno::UNO_QUERY_THROW);
+uno::Reference xParagraph(getParagraphFromShape(0, 
xCell));
+uno::Reference xRun( getRunFromParagraph (0, xParagraph 
) );
+OUString sText = xRun->getString();
+
+CPPUNIT_ASSERT_EQUAL(OUString(""), sText); //We don't import master table 
text for multicolumn case.
+}
+
 void SdImportTest::testPredefinedTableStyle()
 {
 // 073A0DAA-6AF3-43AB-8588-CEC1D06C72B9 (Medium Style 2)
___
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' - oox/source

[Gülşah Köse (via logerrit)]

 oox/source/drawingml/table/tableproperties.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e479eb8048aecb8b7309b02b83234592660f6417
Author: Gülşah Köse 
AuthorDate: Mon Aug 10 10:04:51 2020 +0300
Commit: Xisco Fauli 
CommitDate: Tue Sep 1 18:01:59 2020 +0200

tdf#133015 Fix table position during import multicol textbox.

Change-Id: Ied1a03ff9f4556a551738b698ccb284fe74299da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100414
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101750

diff --git a/oox/source/drawingml/table/tableproperties.cxx 
b/oox/source/drawingml/table/tableproperties.cxx
index bf7d0dcfe7a2..1c12c10eda47 100644
--- a/oox/source/drawingml/table/tableproperties.cxx
+++ b/oox/source/drawingml/table/tableproperties.cxx
@@ -145,7 +145,7 @@ void TableProperties::pushToPropSet(const 
::oox::core::XmlFilterBase& rFilterBas
 for (auto& tableRow : mvTableRows)
 {
 sal_Int32 nColumn = 0;
-sal_Int32 nColumnSize = tableRow.getTableCells().size();
+sal_Int32 nColumnSize = mvTableGrid.size();
 sal_Int32 nRemovedColumn = 0; //
 
 for (sal_Int32 nColIndex = 0; nColIndex < nColumnSize; nColIndex++)
___
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' - oox/source

[Gülşah Köse (via logerrit)]

 oox/source/ppt/pptshape.cxx |   13 +
 1 file changed, 13 insertions(+)

New commits:
commit 8faf8f173fe75bfa27b615db0ea177941a775724
Author: Gülşah Köse 
AuthorDate: Sat Aug 8 00:34:37 2020 +0300
Commit: Xisco Fauli 
CommitDate: Tue Sep 1 18:00:44 2020 +0200

tdf#133015 Inherit numCol from placeholder.

Change-Id: I402a40be7e8899ca017996f2bf77a2fb884b9462
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100372
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101749

diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 3a8e1bac0951..7e67de80100e 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -229,6 +229,19 @@ void PPTShape::addShape(
 {
 if (TextBodyPtr pTextBody = getTextBody())
 {
+// If slide shape has not numCol but placeholder has we should 
inherit from placeholder.
+if (pTextBody->getTextProperties().mnNumCol == 1 &&
+mnSubType &&
+getSubTypeIndex().has() &&
+rSlidePersist.getMasterPersist())
+{
+oox::drawingml::ShapePtr pPlaceholder = 
PPTShape::findPlaceholderByIndex(
+
getSubTypeIndex().get(),
+
rSlidePersist.getMasterPersist()->getShapes()->getChildren());
+if (pPlaceholder && pPlaceholder->getTableProperties())
+pTextBody->getTextProperties().mnNumCol = 
pPlaceholder->getTableProperties()->getTableGrid().size();
+}
+
 sal_Int32 nNumCol = pTextBody->getTextProperties().mnNumCol;
 if (nNumCol > 1)
 {
___
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' - oox/inc oox/source

[Gülşah Köse (via logerrit)]

 oox/inc/drawingml/table/tableproperties.hxx|2 +-
 oox/source/drawingml/table/tableproperties.cxx |5 -
 oox/source/ppt/pptshape.cxx|2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 30646d9db67cca8902a1a456f57dfdc9c30b
Author: Gülşah Köse 
AuthorDate: Fri Aug 7 14:53:13 2020 +0300
Commit: Xisco Fauli 
CommitDate: Tue Sep 1 18:00:21 2020 +0200

tdf#133015 Do not import multicol table text on master.

Change-Id: I0a1b1dc2f9b314858ed90347065407bcd1dbbb73
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100311
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101748

diff --git a/oox/inc/drawingml/table/tableproperties.hxx 
b/oox/inc/drawingml/table/tableproperties.hxx
index dcdf41b17ed0..ec8b3c4c5b60 100644
--- a/oox/inc/drawingml/table/tableproperties.hxx
+++ b/oox/inc/drawingml/table/tableproperties.hxx
@@ -59,7 +59,7 @@ public:
 const ::oox::drawingml::TextListStylePtr& pMasterTextListStyle );
 
 /// Distributes text body with multiple columns in table cells.
-void pullFromTextBody(oox::drawingml::TextBodyPtr pTextBody, sal_Int32 
nShapeWidth, bool bhasSameSubTypeIndex);
+void pullFromTextBody(oox::drawingml::TextBodyPtr pTextBody, sal_Int32 
nShapeWidth, bool bhasSameSubTypeIndex, bool bMaster);
 
 private:
 
diff --git a/oox/source/drawingml/table/tableproperties.cxx 
b/oox/source/drawingml/table/tableproperties.cxx
index 1ecea1363659..bf7d0dcfe7a2 100644
--- a/oox/source/drawingml/table/tableproperties.cxx
+++ b/oox/source/drawingml/table/tableproperties.cxx
@@ -207,7 +207,7 @@ void TableProperties::pushToPropSet(const 
::oox::core::XmlFilterBase& rFilterBas
 xTableStyleToDelete.reset();
 }
 
-void TableProperties::pullFromTextBody(oox::drawingml::TextBodyPtr pTextBody, 
sal_Int32 nShapeWidth, bool bhasSameSubTypeIndex)
+void TableProperties::pullFromTextBody(oox::drawingml::TextBodyPtr pTextBody, 
sal_Int32 nShapeWidth, bool bhasSameSubTypeIndex, bool bMaster)
 {
 // Create table grid and a single row.
 sal_Int32 nNumCol = pTextBody->getTextProperties().mnNumCol;
@@ -245,6 +245,9 @@ void 
TableProperties::pullFromTextBody(oox::drawingml::TextBodyPtr pTextBody, sa
 // Copy properties provided by .
 pCellTextBody->getTextListStyle() = pTextBody->getTextListStyle();
 
+if (bMaster)
+continue;
+
 for (sal_Int32 nParaInCol = 0; nParaInCol < nParaPerCol; ++nParaInCol)
 {
 if (nPara < pTextBody->getParagraphs().size())
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 53e429df3da4..3a8e1bac0951 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -236,7 +236,7 @@ void PPTShape::addShape(
 // represent that as a table.
 sServiceName = "com.sun.star.drawing.TableShape";
 oox::drawingml::table::TablePropertiesPtr pTableProperties 
= getTableProperties();
-pTableProperties->pullFromTextBody(pTextBody, 
maSize.Width, bhasSameSubTypeIndex);
+pTableProperties->pullFromTextBody(pTextBody, 
maSize.Width, bhasSameSubTypeIndex, meShapeLocation == Layout);
 setTextBody(nullptr);
 }
 }
___
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' - include/oox oox/inc oox/source

[Gülşah Köse (via logerrit)]

 include/oox/ppt/pptimport.hxx  |3 ++
 include/oox/ppt/pptshape.hxx   |3 +-
 include/oox/ppt/slidepersist.hxx   |1 
 oox/inc/drawingml/table/tableproperties.hxx|2 -
 oox/source/drawingml/table/tableproperties.cxx |   21 ++
 oox/source/ppt/pptimport.cxx   |1 
 oox/source/ppt/pptshape.cxx|5 ++-
 oox/source/ppt/slidepersist.cxx|   36 +++--
 8 files changed, 60 insertions(+), 12 deletions(-)

New commits:
commit ed057e1ecbdfaa067d635f38e46501ff3ec776a1
Author: Gülşah Köse 
AuthorDate: Thu Jul 23 13:45:51 2020 +0300
Commit: Xisco Fauli 
CommitDate: Tue Sep 1 17:59:33 2020 +0200

tdf#133015 Fix duplicated row and column problem.

LibreOffice imports multicolumn texboxes as tables. When
document has numCols=2 (or more) attribute at slidelayout and slide,
the table rows and columns duplicates.

maPPTShapes vector holds our PPTShape objects, hasSameSubTypeIndex
function finds the status that I mention above. So that we can prevent
that duplication.

Change-Id: Iee03d130452a16e9b46d471a9b6ed5910e6351ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99279
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101747

diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx
index 28ae6df51da6..e96f04b70374 100644
--- a/include/oox/ppt/pptimport.hxx
+++ b/include/oox/ppt/pptimport.hxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -76,6 +77,8 @@ public:
 
 ::Color getSchemeColor( sal_Int32 nToken ) const;
 
+static std::vector< PPTShape* > maPPTShapes;
+
 #if OSL_DEBUG_LEVEL > 0
 static XmlFilterBase* mpDebugFilterBase;
 #endif
diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx
index f452e585abcf..e67a77635111 100644
--- a/include/oox/ppt/pptshape.hxx
+++ b/include/oox/ppt/pptshape.hxx
@@ -66,7 +66,8 @@ public:
 const oox::drawingml::Theme* pTheme,
 const css::uno::Reference< css::drawing::XShapes >& rxShapes,
 basegfx::B2DHomMatrix& aTransformation,
-::oox::drawingml::ShapeIdMap* pShapeMap );
+::oox::drawingml::ShapeIdMap* pShapeMap,
+bool bhasSameSubTypeIndex = false );
 
 ShapeLocation getShapeLocation() const { return meShapeLocation; };
 void setReferenced( bool bReferenced ){ mbReferenced = bReferenced; };
diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx
index 3dd9d65977b0..c09e5f0b0da0 100644
--- a/include/oox/ppt/slidepersist.hxx
+++ b/include/oox/ppt/slidepersist.hxx
@@ -67,6 +67,7 @@ public:
 oox::drawingml::ShapePtr const & pShapesPtr, const 
::oox::drawingml::TextListStylePtr & );
 ~SlidePersist();
 
+
 const css::uno::Reference< css::drawing::XDrawPage >& getPage() const { 
return mxPage; };
 
 #if OSL_DEBUG_LEVEL > 0
diff --git a/oox/inc/drawingml/table/tableproperties.hxx 
b/oox/inc/drawingml/table/tableproperties.hxx
index 67a08f49b03e..dcdf41b17ed0 100644
--- a/oox/inc/drawingml/table/tableproperties.hxx
+++ b/oox/inc/drawingml/table/tableproperties.hxx
@@ -59,7 +59,7 @@ public:
 const ::oox::drawingml::TextListStylePtr& pMasterTextListStyle );
 
 /// Distributes text body with multiple columns in table cells.
-void pullFromTextBody(oox::drawingml::TextBodyPtr pTextBody, sal_Int32 
nShapeWidth);
+void pullFromTextBody(oox::drawingml::TextBodyPtr pTextBody, sal_Int32 
nShapeWidth, bool bhasSameSubTypeIndex);
 
 private:
 
diff --git a/oox/source/drawingml/table/tableproperties.cxx 
b/oox/source/drawingml/table/tableproperties.cxx
index 1c59b4ef47f2..1ecea1363659 100644
--- a/oox/source/drawingml/table/tableproperties.cxx
+++ b/oox/source/drawingml/table/tableproperties.cxx
@@ -207,16 +207,25 @@ void TableProperties::pushToPropSet(const 
::oox::core::XmlFilterBase& rFilterBas
 xTableStyleToDelete.reset();
 }
 
-void TableProperties::pullFromTextBody(oox::drawingml::TextBodyPtr pTextBody, 
sal_Int32 nShapeWidth)
+void TableProperties::pullFromTextBody(oox::drawingml::TextBodyPtr pTextBody, 
sal_Int32 nShapeWidth, bool bhasSameSubTypeIndex)
 {
 // Create table grid and a single row.
 sal_Int32 nNumCol = pTextBody->getTextProperties().mnNumCol;
 std::vector& rTableGrid(getTableGrid());
-sal_Int32 nColWidth = nShapeWidth / nNumCol;
-for (sal_Int32 nCol = 0; nCol < nNumCol; ++nCol)
-rTableGrid.push_back(nColWidth);
 std::vector& rTableRows(getTableRows());
-rTableRows.emplace_back();
+sal_Int32 nColWidth = nShapeWidth / nNumCol;
+
+if(!bhasSameSubTypeIndex)
+{
+for (sal_Int32 nCol = 0; nCol < nNumCol; ++nCol)
+rTableGrid.push_back(nColWidth);
+
+rTableRows.emplace_back();
+}
+
+

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

[Caolán McNamara (via logerrit)]

 solenv/sanitizers/ui/svx.suppr   |2 --
 svx/uiconfig/ui/findreplacedialog.ui |2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dcdfa57df779f6abdc8eb7c83320d05132d431ff
Author: Caolán McNamara 
AuthorDate: Tue Sep 1 10:22:42 2020 +0100
Commit: Xisco Fauli 
CommitDate: Tue Sep 1 17:54:51 2020 +0200

tdf#134923 missing mnemonic widget target for labels

presumably since...

commit beeef93480fae65840646e4e36aa888efe92579a
Date:   Tue Mar 8 19:54:57 2016 +0530

tdf#98417, tdf#98539: DIALOG: Improvements to the Find & Replace dialog.

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

diff --git a/solenv/sanitizers/ui/svx.suppr b/solenv/sanitizers/ui/svx.suppr
index 8adf225a594e..efafb4e53813 100644
--- a/solenv/sanitizers/ui/svx.suppr
+++ b/solenv/sanitizers/ui/svx.suppr
@@ -30,10 +30,8 @@ 
svx/uiconfig/ui/docrecoverybrokendialog.ui://GtkLabel[@id='label1'] orphan-label
 svx/uiconfig/ui/docrecoveryprogressdialog.ui://GtkLabel[@id='label2'] 
orphan-label
 svx/uiconfig/ui/docrecoveryrecoverdialog.ui://GtkLabel[@id='desc'] orphan-label
 svx/uiconfig/ui/docrecoverysavedialog.ui://GtkLabel[@id='label1'] orphan-label
-svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='label4'] orphan-label
 svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='searchdesc'] orphan-label
 svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='entirecells'] orphan-label
-svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='label5'] orphan-label
 svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='replacedesc'] orphan-label
 svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='label7'] orphan-label
 svx/uiconfig/ui/findreplacedialog.ui://GtkLabel[@id='searchinlabel'] 
orphan-label
diff --git a/svx/uiconfig/ui/findreplacedialog.ui 
b/svx/uiconfig/ui/findreplacedialog.ui
index 4b27a9064a58..613db0250bdd 100644
--- a/svx/uiconfig/ui/findreplacedialog.ui
+++ b/svx/uiconfig/ui/findreplacedialog.ui
@@ -140,6 +140,7 @@
 center
 _Find:
 True
+searchterm
 0
 0.4000596046448
 
@@ -390,6 +391,7 @@
 center
 Re_place:
 True
+replaceterm
 0
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'feature/calc-canvas' - 3 commits - loleaflet/src

[Michael Meeks (via logerrit)]

 loleaflet/src/layer/tile/CalcTileLayer.js   |5 ++---
 loleaflet/src/layer/tile/CanvasTileLayer.js |   22 +++---
 2 files changed, 17 insertions(+), 10 deletions(-)

New commits:
commit cd1f1293d9a33f77e37397ac7d69a9cb0b765fea
Author: Michael Meeks 
AuthorDate: Tue Sep 1 16:53:02 2020 +0100
Commit: Michael Meeks 
CommitDate: Tue Sep 1 16:53:02 2020 +0100

calc tiles: don't send un-necessary zoom / visible area changes.

Lots of redundant zoom messages seem unhelpful.

Change-Id: I944a3202739adfc89aab81902b467a4e34977202

diff --git a/loleaflet/src/layer/tile/CanvasTileLayer.js 
b/loleaflet/src/layer/tile/CanvasTileLayer.js
index 8ef3cb886..8643f8bf7 100644
--- a/loleaflet/src/layer/tile/CanvasTileLayer.js
+++ b/loleaflet/src/layer/tile/CanvasTileLayer.js
@@ -697,9 +697,8 @@ L.CanvasTileLayer = L.TileLayer.extend({
}
}
 
-   this._sendClientVisibleArea(true);
-
-   this._sendClientZoom(true);
+   this._sendClientVisibleArea();
+   this._sendClientZoom();
 
if (queue.length !== 0) {
if (cancelTiles) {
commit ebacd1a031e41dfe873128a35f1ab6cb1c51b101
Author: Michael Meeks 
AuthorDate: Tue Sep 1 16:52:35 2020 +0100
Commit: Michael Meeks 
CommitDate: Tue Sep 1 16:52:35 2020 +0100

calc tiles: use canvas rendering for mobile too.

This way the row/column headers line up - and it's the future.

Change-Id: I56b2c2527dcc751ed06fc3b30aff22544ec4c269

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js 
b/loleaflet/src/layer/tile/CalcTileLayer.js
index 403f2e27e..7bc11901e 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -4,8 +4,7 @@
  */
 
 /* global */
-var BaseTileLayer = L.Browser.mobile ? L.TileLayer : L.CanvasTileLayer;
-L.CalcTileLayer = BaseTileLayer.extend({
+L.CalcTileLayer = L.CanvasTileLayer.extend({
options: {
// TODO: sync these automatically from SAL_LOK_OPTIONS
sheetGeometryDataEnabled: true,
@@ -82,7 +81,7 @@ L.CalcTileLayer = BaseTileLayer.extend({
map.addControl(L.control.tabs());
map.addControl(L.control.columnHeader());
map.addControl(L.control.rowHeader());
-   BaseTileLayer.prototype.onAdd.call(this, map);
+   L.CanvasTileLayer.prototype.onAdd.call(this, map);
 
map.on('resize', function () {
if (this.isCursorVisible()) {
commit ee15411f94a9bd90c84facd4cb9b09057fa6a768
Author: Michael Meeks 
AuthorDate: Tue Sep 1 16:24:18 2020 +0100
Commit: Michael Meeks 
CommitDate: Tue Sep 1 16:24:18 2020 +0100

calc canvas: ensure that the fraction width rounds to the pixel width.

Slave CSS geometry from integral canvas pixels, don't attempt the
reverse.

Change-Id: I369ed1bea3c4a5a199192aa1e84bb4e03dcb2e94

diff --git a/loleaflet/src/layer/tile/CanvasTileLayer.js 
b/loleaflet/src/layer/tile/CanvasTileLayer.js
index 4983fef2a..8ef3cb886 100644
--- a/loleaflet/src/layer/tile/CanvasTileLayer.js
+++ b/loleaflet/src/layer/tile/CanvasTileLayer.js
@@ -96,11 +96,20 @@ L.CanvasTilePainter = L.Class.extend({
},
 
_setCanvasSize: function (widthCSSPx, heightCSSPx) {
-   this._canvas.style.width = widthCSSPx + 'px';
-   this._canvas.style.height = heightCSSPx + 'px';
-   this._canvas.width = Math.floor(widthCSSPx * this._dpiScale);
-   this._canvas.height = Math.floor(heightCSSPx * this._dpiScale);
+   var pixWidth = Math.floor(widthCSSPx * this._dpiScale);
+   var pixHeight = Math.floor(heightCSSPx * this._dpiScale);
 
+   // real pixels have to be integral
+   this._canvas.width = pixWidth;
+   this._canvas.height = pixHeight;
+
+   // CSS pixels can be fractional, but need to round to the same 
real pixels
+   var cssWidth = pixWidth / this._dpiScale; // NB. beware
+   var cssHeight = pixHeight / this._dpiScale;
+   this._canvas.style.width = cssWidth.toFixed(4) + 'px';
+   this._canvas.style.height = cssHeight.toFixed(4) + 'px';
+
+   // FIXME: is this a good idea ? :
this._width = parseInt(this._canvas.style.width);
this._height = parseInt(this._canvas.style.height);
this.clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - 2 commits - loleaflet/css loleaflet/images

[Pedro Pinto Silva (via logerrit)]

 loleaflet/css/mobilewizard.css   |1 +
 loleaflet/css/toolbar.css|2 +-
 loleaflet/images/lc_tableautofitmenu.svg |1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 041d4d4d16c0f700f5e2be6d0841993559808cc2
Author: Pedro Pinto Silva 
AuthorDate: Thu Aug 27 15:49:06 2020 +0200
Commit: Pedro Silva 
CommitDate: Tue Sep 1 17:32:00 2020 +0200

Mobile: Cell size icon missing, headers works

- Add lc_tableautofitmenu.svg
(used in the context menu when inside of a cell)
- Sometimes headers do not get properly set from JS:
missing "justify-content: space-between;" and so set it in the CSS side

Change-Id: If383b15fc5920f1074c6eb88dd45bd2667095d66
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101481
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Pedro Silva 
(cherry picked from commit a1b73c4001e007a33b3f1fb86ab9df15d3fb2e82)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101856

diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index ace890f29..72350c49d 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -314,6 +314,7 @@ p.mobile-wizard.ui-combobox-text.selected {
flex-direction: row;
align-items: center;
background-color: #fff;
+   justify-content: space-between;
 }
 
 .ui-header.mobile-wizard.disabled .ui-header-left * {
diff --git a/loleaflet/images/lc_tableautofitmenu.svg 
b/loleaflet/images/lc_tableautofitmenu.svg
new file mode 100644
index 0..2b2b8590f
--- /dev/null
+++ b/loleaflet/images/lc_tableautofitmenu.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg";>
\ No newline at end of file
commit 765d71be8601a0a1a023c93b44760e92d30e2e09
Author: Pedro Pinto Silva 
AuthorDate: Wed Aug 26 14:27:04 2020 +0200
Commit: Pedro Silva 
CommitDate: Tue Sep 1 17:31:51 2020 +0200

Mobile: Hamburger Menu: Add right padding to checkmarks

Change-Id: Ia4f5f95749661b2f0cb881d34b9c6c92ae682eed
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101404
Tested-by: Jenkins
Tested-by: Pedro Silva 
Reviewed-by: Pedro Silva 
(cherry picked from commit 48bb33748b9fb115be7641a85676ca67a5783807)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101855
Tested-by: Jenkins CollaboraOffice 

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index d1c11613b..5f87541ee 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -856,7 +856,7 @@ tr.useritem > td > img {
 }
 
 .menu-entry-checked {
-   background: url(images/lc_listitem-selected.svg) no-repeat right;
+   background: url('images/lc_listitem-selected.svg') no-repeat 97% center;
 }
 
 .menu-entry-with-icon {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot (via logerrit)]

 formula/uiconfig/ui/functionpage.ui |   22 
 formula/uiconfig/ui/parameter.ui|   22 
 formula/uiconfig/ui/structpage.ui   |8 +
 sc/uiconfig/scalc/ui/advancedfilterdialog.ui|   52 +++
 sc/uiconfig/scalc/ui/analysisofvariancedialog.ui|   23 ++--
 sc/uiconfig/scalc/ui/autoformattable.ui |   50 ++
 sc/uiconfig/scalc/ui/cellprotectionpage.ui  |   27 +
 sc/uiconfig/scalc/ui/chisquaretestdialog.ui |   13 +-
 sc/uiconfig/scalc/ui/condformatmanager.ui   |   33 ++-
 sc/uiconfig/scalc/ui/conditionalformatdialog.ui |   25 +
 sc/uiconfig/scalc/ui/consolidatedialog.ui   |   60 
 sc/uiconfig/scalc/ui/correlationdialog.ui   |   13 +-
 sc/uiconfig/scalc/ui/covariancedialog.ui|   13 +-
 sc/uiconfig/scalc/ui/createnamesdialog.ui   |   33 ++-
 sc/uiconfig/scalc/ui/datafielddialog.ui |   43 -
 sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui  |   82 +++--
 sc/uiconfig/scalc/ui/dataform.ui|   13 +-
 sc/uiconfig/scalc/ui/datastreams.ui |   13 +-
 sc/uiconfig/scalc/ui/definedatabaserangedialog.ui   |   40 
 sc/uiconfig/scalc/ui/definename.ui  |   58 +++-
 sc/uiconfig/scalc/ui/deletecells.ui |   29 +-
 sc/uiconfig/scalc/ui/deletecontents.ui  |   49 ++
 sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui |   13 +-
 sc/uiconfig/scalc/ui/doubledialog.ui|   13 +-
 sc/uiconfig/scalc/ui/dropmenu.ui|   17 +++
 sc/uiconfig/scalc/ui/erroralerttabpage.ui   |   27 +
 sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui  |   19 ++--
 sc/uiconfig/scalc/ui/externaldata.ui|   38 +++-
 sc/uiconfig/scalc/ui/filldlg.ui |   88 +-
 sc/uiconfig/scalc/ui/fourieranalysisdialog.ui   |   13 +-
 sc/uiconfig/scalc/ui/functionpanel.ui   |   12 ++
 sc/uiconfig/scalc/ui/goalseekdlg.ui |   20 
 sc/uiconfig/scalc/ui/headerfootercontent.ui |   62 -
 sc/uiconfig/scalc/ui/inputstringdialog.ui   |   14 ++
 sc/uiconfig/scalc/ui/insertcells.ui |   29 +-
 sc/uiconfig/scalc/ui/insertname.ui  |   29 +-
 sc/uiconfig/scalc/ui/insertsheet.ui |   68 --
 sc/uiconfig/scalc/ui/integerdialog.ui   |   13 +-
 sc/uiconfig/scalc/ui/managenamesdialog.ui   |   55 +++
 sc/uiconfig/scalc/ui/mergecellsdialog.ui|   13 +-
 sc/uiconfig/scalc/ui/movecopysheet.ui   |   24 -
 sc/uiconfig/scalc/ui/movingaveragedialog.ui |   13 +-
 sc/uiconfig/scalc/ui/multipleoperationsdialog.ui|   20 
 sc/uiconfig/scalc/ui/namerangesdialog.ui|   35 +++
 sc/uiconfig/scalc/ui/navigatorpanel.ui  |   68 ++
 sc/uiconfig/scalc/ui/optimalcolwidthdialog.ui   |   19 +++-
 sc/uiconfig/scalc/ui/optimalrowheightdialog.ui  |   19 +++-
 sc/uiconfig/scalc/ui/pivotfielddialog.ui|   23 
 sc/uiconfig/scalc/ui/pivotfilterdialog.ui   |   83 -
 sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui  |   85 ++
 sc/uiconfig/scalc/ui/printareasdialog.ui|   35 +++
 sc/uiconfig/scalc/ui/protectsheetdlg.ui |   33 ---
 sc/uiconfig/scalc/ui/randomnumbergenerator.ui   |   43 -
 sc/uiconfig/scalc/ui/regressiondialog.ui|   19 ++--
 sc/uiconfig/scalc/ui/samplingdialog.ui  |   13 +-
 sc/uiconfig/scalc/ui/scenariodialog.ui  |   49 +-
 sc/uiconfig/scalc/ui/scenariomenu.ui|   12 ++
 sc/uiconfig/scalc/ui/selectdatasource.ui|   23 
 sc/uiconfig/scalc/ui/selectrange.ui |   18 ++-
 sc/uiconfig/scalc/ui/selectsource.ui|   62 -
 sc/uiconfig/scalc/ui/sheetprintpage.ui  |   94 +++-
 sc/uiconfig/scalc/ui/showdetaildialog.ui|   13 +-
 sc/uiconfig/scalc/ui/showsheetdialog.ui |9 +
 sc/uiconfig/scalc/ui/solverdlg.ui   |   48 +-
 sc/uiconfig/scalc/ui/solveroptionsdialog.ui |   18 ++-
 sc/uiconfig/scalc/ui/sortcriteriapage.ui|7 +
 sc/uiconfig/scalc/ui/sortkey.ui |   22 
 sc/uiconfig/scalc/ui/sortoptionspage.ui |   60 
 sc/uiconfig/scalc/ui/standardfilterdialog.ui|   37 +++
 sc/uiconfig/scalc/ui/subtotalgrppage.ui |   22 
 sc/uiconfig/scalc/ui/subtotaloptionspage.ui |   47 +-
 sc/uiconfig/scalc/ui/ttestdialog.ui |   13 +-
 sc/uiconfig/scalc/ui/validationcriteriapage.ui  |   47 +-
 sc/uiconfig/scalc/ui/validationhelptabpage.ui   |   22 
 sc/uic

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

[Caolán McNamara (via logerrit)]

 i18npool/source/textconversion/textconversion_zh.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 78aea95703c0111f333b28c690e6b46aae77bf45
Author: Caolán McNamara 
AuthorDate: Tue Sep 1 09:09:48 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Sep 1 17:28:36 2020 +0200

cid#1466573 Dereference after null check

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

diff --git a/i18npool/source/textconversion/textconversion_zh.cxx 
b/i18npool/source/textconversion/textconversion_zh.cxx
index 3f7ff96d8a15..d45baa553e53 100644
--- a/i18npool/source/textconversion/textconversion_zh.cxx
+++ b/i18npool/source/textconversion/textconversion_zh.cxx
@@ -212,7 +212,7 @@ TextConversion_zh::getWordConversion(const OUString& aText, 
sal_Int32 nStartPos,
 }
 }
 
-if (!found && index[len+1] - index[len] > 0) {
+if (wordData && !found && index[len+1] - index[len] > 0) {
 sal_Int32 bottom = static_cast(index[len]);
 sal_Int32 top = static_cast(index[len+1]) - 1;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 xmloff/source/draw/XMLNumberStyles.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2a20061420b87ee37fa85b20fbc75f0a82f409f2
Author: Caolán McNamara 
AuthorDate: Tue Sep 1 09:03:29 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Sep 1 17:28:16 2020 +0200

cid#1466574 Uninitialized scalar field

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

diff --git a/xmloff/source/draw/XMLNumberStyles.cxx 
b/xmloff/source/draw/XMLNumberStyles.cxx
index 4406f4e85a06..cf171cba5c85 100644
--- a/xmloff/source/draw/XMLNumberStyles.cxx
+++ b/xmloff/source/draw/XMLNumberStyles.cxx
@@ -583,6 +583,7 @@ void SdXMLNumberFormatMemberImportContext::characters( 
const OUString& rChars )
 SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext( SdXMLImport& 
rImport, sal_Int32 nElement, SvXMLNumImpData* pNewData, SvXMLStylesTokens 
nNewType, const css::uno::Reference< css::xml::sax::XFastAttributeList>& 
xAttrList, SvXMLStylesContext& rStyles)
 :   SvXMLNumFormatContext(rImport, nElement, pNewData, nNewType, xAttrList, 
rStyles),
 mbAutomatic( false ),
+mnElements{},
 mnIndex(0),
 mnKey( -1 )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: ios/CollaboraOnlineWebViewKeyboardManager ios/Mobile loleaflet/html loleaflet/src

[Tor Lillqvist (via logerrit)]

 
ios/CollaboraOnlineWebViewKeyboardManager/CollaboraOnlineWebViewKeyboardManager.m
 |   22 +-
 ios/Mobile/DocumentViewController.mm   
   |   27 +++
 loleaflet/html/loleaflet.html.m4   
   |   15 
 loleaflet/src/layer/marker/TextInput.js
   |   35 --
 4 files changed, 86 insertions(+), 13 deletions(-)

New commits:
commit 3df718aac72138849ecafadc13f0207c3ec52283
Author: Tor Lillqvist 
AuthorDate: Tue Sep 1 16:58:17 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Sep 1 17:24:36 2020 +0200

tdf#133284: Improve hardware and on-screen keyboard in the iOS app

This is a quite complicated change that should both fix tdf#133284
(cursor keys on a hardware keyboard do not work in a spreadsheet
document) and also improve the interaction with
CollaboraOnlineWebViewKeyboardManager that manages the on-screen
keyboard. We need to jump through complicated hoops in order to get
the hardware cursor keys handled right after loading a spreadsheet
document.

In the CollaboraOnlineWebViewKeyboardManager case we try harder to
keep loleaflet's _textArea buffer in sync with what the UITextView in
CollaboraOnlineWebViewKeyboardManager uses to provide suggestions
above the on-screen keyboard.

Also merges in related changes from today to
CollaboraOnlineWebViewKeyboardManager.

Change-Id: Ic4acb54bd4e815aa8bfb2bf40b08493446ae5ab0
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101878
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 

diff --git 
a/ios/CollaboraOnlineWebViewKeyboardManager/CollaboraOnlineWebViewKeyboardManager.m
 
b/ios/CollaboraOnlineWebViewKeyboardManager/CollaboraOnlineWebViewKeyboardManager.m
index 561b726d6..fd1bcaff3 100644
--- 
a/ios/CollaboraOnlineWebViewKeyboardManager/CollaboraOnlineWebViewKeyboardManager.m
+++ 
b/ios/CollaboraOnlineWebViewKeyboardManager/CollaboraOnlineWebViewKeyboardManager.m
@@ -79,6 +79,18 @@
 
 NSMutableString *quotedText = [NSMutableString string];
 
+int location = range.location;
+
+if (location < self.text.length && location + range.length == 
self.text.length) {
+// To guard against possible mismatch between our self.text and the 
_textArea.value in
+// TextInput.js, we indicate deletion or replacement from the end with 
negative location.
+location = location - self.text.length;
+}
+else if (range.location == 0 && range.length == 0 && text.length == 0) {
+// Backspace without anything known about preceding text
+location = -1;
+}
+
 for (unsigned i = 0; i < text.length; i++) {
 const unichar c = [text characterAtIndex:i];
 if (c == '\'' || c == '\\') {
@@ -93,7 +105,7 @@
 
 NSMutableString *message = [NSMutableString string];
 
-[message appendFormat:@"{id: 'COKbdMgr', command: 'replaceText', location: 
%lu, length: %lu, text: '", range.location, range.length];
+[message appendFormat:@"{id: 'COKbdMgr', command: 'replaceText', location: 
%d, length: %lu, text: '", location, range.length];
 [message appendString:quotedText];
 [message appendString:@"'}"];
 
@@ -209,15 +221,15 @@
 // will be added.
 control.autocapitalizationType = UITextAutocapitalizationTypeNone;
 
-control.text = text;
-control.selectedRange = NSMakeRange(location, 0);
-
 lastCommandIsHide = NO;
 
 [self->webView addSubview:control];
 NSLog(@"COKbdMgr: Added _COWVKMKeyInputControl to webView");
 [control becomeFirstResponder];
 }
+control.text = text;
+control.selectedRange = NSMakeRange(location, 0);
+
 }
 
 - (void)hideKeyboard {
@@ -253,6 +265,8 @@
 NSString *text = message.body[@"text"];
 NSNumber *location = message.body[@"location"];
 NSLog(@"COKbdMgr: command=display type=%@ text=%@ location=%@", 
type, text, location);
+if (text == nil)
+text = @"";
 [self displayKeyboardOfType:type withText:text at:(location != nil 
? [location unsignedIntegerValue] : UINT_MAX)];
 } else if ([stringCommand isEqualToString:@"hide"]) {
 lastCommandIsHide = YES;
diff --git a/ios/Mobile/DocumentViewController.mm 
b/ios/Mobile/DocumentViewController.mm
index 2a2d870c3..5be21cd0f 100644
--- a/ios/Mobile/DocumentViewController.mm
+++ b/ios/Mobile/DocumentViewController.mm
@@ -102,8 +102,10 @@ static IMP standardImpOfInputAccessoryView = nil;
 // contents is handled fully in JavaScript, the WebView has no knowledge 
of that.)
 self.webView.scrollView.delegate = self;
 
-keyboardManager =
-[[CollaboraOnlineWebViewKeyboardManager alloc] 
initForWebView:self.webView];
+if (!isExternalKeyboardAttached()) {
+keyboardManager =
+[[CollaboraOnlineWebViewKeyboardMa

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

[Tor Lillqvist (via logerrit)]

 loleaflet/src/map/Map.js |   30 +++---
 1 file changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 05d10aba03aa1eaf5d2ea441088a59e931c74890
Author: Tor Lillqvist 
AuthorDate: Tue Sep 1 17:03:26 2020 +0300
Commit: Tor Lillqvist 
CommitDate: Tue Sep 1 17:22:11 2020 +0200

Comment out some debug spew

Change-Id: I40a96ea71a78c76b2eb1a7f878320dec1dfd1205
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101877
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tor Lillqvist 

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 6f5677a26..9f3633929 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -838,7 +838,7 @@ L.Map = L.Evented.extend({
// We have one global winId that controls what window (dialog, sidebar, 
or
// the main document) has the actual focus.  0 means the document.
setWinId: function (id) {
-   console.log('winId set to: ' + id);
+   // console.log('winId set to: ' + id);
if (typeof id === 'string')
id = parseInt(id);
this._winId = id;
@@ -1253,7 +1253,7 @@ L.Map = L.Evented.extend({
},
 
makeActive: function() {
-   console.log('Force active');
+   // console.log('Force active');
this.lastActiveTime = Date.now();
return this._activate();
},
@@ -1263,13 +1263,13 @@ L.Map = L.Evented.extend({
return false;
}
 
-   console.debug('_activate:');
+   // console.debug('_activate:');
clearTimeout(vex.timer);
 
if (!this._active) {
// Only activate when we are connected.
if (this._socket.connected()) {
-   console.debug('sending useractive');
+   // console.debug('sending useractive');
this._socket.sendMessage('useractive');
this._active = true;
if (this._docLayer) {
@@ -1322,7 +1322,7 @@ L.Map = L.Evented.extend({
return;
}
 
-   console.debug('_dim:');
+   // console.debug('_dim:');
if (!this._socket.connected() || isAnyVexDialogActive()) {
return;
}
@@ -1339,13 +1339,13 @@ L.Map = L.Evented.extend({
var multiplier = 1;
if (!this.documentHidden(true))
{
-   console.debug('document visible');
+   // console.debug('document visible');
multiplier = 4; // quadruple the grace period
}
if (inactiveMs <= this.options.outOfFocusTimeoutSecs * 1000 * 
multiplier) {
-   console.debug('had activity ' + inactiveMs + 'ms ago 
vs. threshold ' +
- (this.options.outOfFocusTimeoutSecs * 
1000 * multiplier) +
- ' - so fending off the dim');
+   // console.debug('had activity ' + inactiveMs + 'ms ago 
vs. threshold ' +
+   //(this.options.outOfFocusTimeoutSecs * 
1000 * multiplier) +
+   //' - so fending off the dim');
vex.timer = setTimeout(function() {
map._dim();
}, map.options.outOfFocusTimeoutSecs * 1000);
@@ -1365,7 +1365,7 @@ L.Map = L.Evented.extend({
afterOpen: function() {
var $vexContent = $(this.contentEl);
$vexContent.bind('click.vex', function() {
-   console.debug('_dim: click.vex 
function');
+   // console.debug('_dim: click.vex 
function');
return map._activate();
});
},
@@ -1373,7 +1373,7 @@ L.Map = L.Evented.extend({
});
$('.vex-overlay').addClass('loleaflet-user-idle-overlay');
this._doclayer && this._docLayer._onMessage('textselection:', 
null);
-   console.debug('_dim: sending userinactive');
+   // console.debug('_dim: sending userinactive');
map.fire('postMessage', {msgId: 'User_Idle'});
this._socket.sendMessage('userinactive');
},
@@ -1386,7 +1386,7 @@ L.Map = L.Evented.extend({
},
 
_dimIfInactive: function () {
-   console.debug('_dimIfInactive: diff=' + (Date.now() - 
this.lastActiveTime));
+   // console.debug('_dimIfInactive: diff=' + (Date.now() - 
this.lastActiveTime));

[Libreoffice-commits] core.git: Branch 'feature/windows-cross-build' - 839 commits - accessibility/inc accessibility/source android/source animations/source avmedia/source basctl/inc basctl/Library_ba

[Jan-Marek Glogowski (via logerrit)]

Rebased ref, commits from common ancestor:
commit 344b8d0e479db2d80a006d389a0349b142ecc4dd
Author: Jan-Marek Glogowski 
AuthorDate: Wed Jul 29 12:04:03 2020 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Tue Sep 1 17:13:04 2020 +0200

cross-build: fix Java NI linking

LibreOffice has a JNI component on Windows and Linux, the
officebean. Therefore we need a host JDK for linkage to the
jawt, and a build JDK to compile the Java code.

Change-Id: I4138628ab3ea2ef5900a5b4e9281050ae84e4eb5

diff --git a/config_host.mk.in b/config_host.mk.in
index e3014b015a48..6cea6ccf795e 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -267,7 +267,6 @@ export HARFBUZZ_LIBS=$(gb_SPACE)@HARFBUZZ_LIBS@
 export GSSAPI_LIBS=@GSSAPI_LIBS@
 export GSTREAMER_1_0_CFLAGS=$(gb_SPACE)@GSTREAMER_1_0_CFLAGS@
 export GSTREAMER_1_0_LIBS=$(gb_SPACE)@GSTREAMER_1_0_LIBS@
-export GTHREAD_CFLAGS=$(gb_SPACE)@GTHREAD_CFLAGS@
 export GTK3_CFLAGS=$(gb_SPACE)@GTK3_CFLAGS@
 export GTK3_LIBS=$(gb_SPACE)@GTK3_LIBS@
 export USING_X11=@USING_X11@
@@ -320,15 +319,18 @@ export IWYU_PATH=@IWYU_PATH@
 export JAVACOMPILER=@JAVACOMPILER@
 export JAVADOC=@JAVADOC@
 export JAVADOCISGJDOC=@JAVADOCISGJDOC@
-export JAVAFLAGS=@JAVAFLAGS@
+export JAVACFLAGS=@JAVACFLAGS@
 export JAVAIFLAGS=@JAVAIFLAGS@
+export JAVAIFLAGS_FOR_BUILD=@JAVAIFLAGS@
 export JAVA_CLASSPATH_NOT_SET=@JAVA_CLASSPATH_NOT_SET@
 export JAVAINTERPRETER=@JAVAINTERPRETER@
 export JAVA_HOME=@JAVA_HOME@
+export JAVA_HOME_FOR_BUILD=@JAVA_HOME_FOR_BUILD@
 export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@
 export JAVA_TARGET_VER=@JAVA_TARGET_VER@
 export JAWTLIB=@JAWTLIB@
 export JDK=@JDK@
+export JDK_FOR_BUILD=@JDK_FOR_BUILD@
 export JFREEREPORT_JAR=@JFREEREPORT_JAR@
 export JITC_PROCESSOR_TYPE=@JITC_PROCESSOR_TYPE@
 export JVM_ONE_PATH_CHECK=@JVM_ONE_PATH_CHECK@
diff --git a/configure.ac b/configure.ac
index bd026b3d5a06..9a65d10afc6f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4903,7 +4903,18 @@ if test "$cross_compiling" = "yes"; then
 sub_conf_opts=""
 test -n "$enable_ccache" && sub_conf_opts="$sub_conf_opts 
--enable-ccache=$enable_ccache"
 test -n "$with_ant_home" && sub_conf_opts="$sub_conf_opts 
--with-ant-home=$with_ant_home"
-test $with_junit = no && sub_conf_opts="$sub_conf_opts --without-junit"
+test "$with_junit" = "no" && sub_conf_opts="$sub_conf_opts --without-junit"
+if test -n "$ENABLE_JAVA"; then
+if test "$_os" != "iOS" -a "$_os" != "Android"; then
+if ! echo "$with_build_platform_configure_options" | grep -q -- 
'--with-jdk-home='; then
+AC_MSG_ERROR([Missing build JDK (see 
--with-build-platform-configure-options, --with-jdk-home and use 'cygpath -ms' 
on Windows)!])
+fi
+else
+test -n "$with_jdk_home" && sub_conf_opts="$sub_conf_opts 
--with-jdk-home=$with_jdk_home"
+fi
+else
+sub_conf_opts="$sub_conf_opts --without-java"
+fi
 test -n "$TARFILE_LOCATION" && sub_conf_opts="$sub_conf_opts 
--with-external-tar=$TARFILE_LOCATION"
 test "$with_system_icu_for_build" = "yes" -o "$with_system_icu_for_build" 
= "force" && sub_conf_opts="$sub_conf_opts --with-system-icu"
 sub_conf_opts="$sub_conf_opts $with_build_platform_configure_options"
@@ -4923,7 +4934,6 @@ if test "$cross_compiling" = "yes"; then
 --disable-skia \
 --enable-icecream="$enable_icecream" \
 --without-doxygen \
---without-java \
 --without-webdav \
 --with-parallelism="$with_parallelism" \
 --with-theme="$with_theme" \
@@ -4975,15 +4985,53 @@ if test "$cross_compiling" = "yes"; then
 mkdir -p ../config_build
 mv config_host/*.h ../config_build
 
+# all these will get a _FOR_BUILD postfix
+DIRECT_FOR_BUILD_SETTINGS="
+CC
+CXX
+ILIB
+JAVA_HOME
+JAVAIFLAGS
+JDK
+LIBO_BIN_FOLDER
+LIBO_LIB_FOLDER
+LIBO_URE_LIB_FOLDER
+LIBO_URE_MISC_FOLDER
+OS
+SDKDIRNAME
+SYSTEM_LIBXML
+SYSTEM_LIBXSLT
+"
+# these overwrite host config with build config
+OVERWRITING_SETTINGS="
+ANT
+ANT_HOME
+ANT_LIB
+HSQLDB_USE_JDBC_4_1
+JAVA_CLASSPATH_NOT_SET
+JAVA_SOURCE_VER
+JAVA_TARGET_VER
+JAVACFLAGS
+JAVACOMPILER
+JAVADOC
+JAVADOCISGJDOC
+"
+# these need some special handling
+EXTRA_HANDLED_SETTINGS="
+INSTDIR
+INSTROOT
+PATH
+WORKDIR
+"
 OLD_PATH=$PATH
-. ./bin/get_config_variables CC CXX ILIB INSTDIR INSTROOT LIBO_BIN_FOLDER 
LIBO_LIB_FOLDER LIBO_URE_LIB_FOLDER LIBO_URE_MISC_FOLDER OS PATH SDKDIRNAME 
SYSTEM_LIBXML SYSTEM_LIBXSLT WORKDIR
+. ./bin/get_config_variables $DIRECT_FOR_BUILD_SETTINGS 
$OVERWRITING_SETTINGS $EXTRA_HANDLED_SETTINGS
 BUILD_PATH=$PATH
 PATH=$OLD_PATH
 
 line=`echo "LO_PATH_FOR_BUILD='${BUILD_PATH}'" | sed -e 
's,/CONF-FOR-BUILD,,g

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

[Andrea Gelmini (via logerrit)]

 chart2/source/tools/AxisHelper.cxx   |8 
 chart2/source/view/main/VButton.cxx  |   10 +-
 include/sfx2/shell.hxx   |2 +-
 svx/source/form/fmshell.cxx  |4 ++--
 sw/source/filter/ww8/docxattributeoutput.hxx |2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 9146658c0108120c91ce6f759e37b9fa64e47660
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 16:15:17 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 16:59:29 2020 +0200

Fix typo in code

It passed "make check" on Linux

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

diff --git a/chart2/source/tools/AxisHelper.cxx 
b/chart2/source/tools/AxisHelper.cxx
index 735f00a430c7..a68fbc8dfa5e 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -689,14 +689,14 @@ bool AxisHelper::areAxisLabelsVisible( const Reference< 
beans::XPropertySet >& x
 return bRet;
 }
 
-bool AxisHelper::isGridVisible( const Reference< beans::XPropertySet >& 
xGridProperies )
+bool AxisHelper::isGridVisible( const Reference< beans::XPropertySet >& 
xGridproperties )
 {
 bool bRet = false;
 
-if( xGridProperies.is() )
+if( xGridproperties.is() )
 {
-xGridProperies->getPropertyValue( "Show" ) >>= bRet;
-bRet = bRet && LinePropertiesHelper::IsLineVisible( xGridProperies );
+xGridproperties->getPropertyValue( "Show" ) >>= bRet;
+bRet = bRet && LinePropertiesHelper::IsLineVisible( xGridproperties );
 }
 
 return bRet;
diff --git a/chart2/source/view/main/VButton.cxx 
b/chart2/source/view/main/VButton.cxx
index 088df5850416..5e609348b914 100644
--- a/chart2/source/view/main/VButton.cxx
+++ b/chart2/source/view/main/VButton.cxx
@@ -51,7 +51,7 @@ uno::Reference 
VButton::createTriangle(awt::Size aSize)
 if (!xShape.is())
 return xShape;
 
-uno::Reference xProperies(xShape, uno::UNO_QUERY);
+uno::Reference xproperties(xShape, uno::UNO_QUERY);
 
 drawing::PolyPolygonShape3D aPolyPolygon;
 aPolyPolygon.SequenceX.realloc(1);
@@ -82,10 +82,10 @@ uno::Reference 
VButton::createTriangle(awt::Size aSize)
 pInnerSequenceY[2] = 0.0;
 pInnerSequenceZ[2] = 0.0;
 
-xProperies->setPropertyValue("Name", uno::makeAny(m_sCID));
-xProperies->setPropertyValue(UNO_NAME_POLYPOLYGON, 
uno::Any(PolyToPointSequence(aPolyPolygon)));
-xProperies->setPropertyValue("LineStyle", 
uno::makeAny(drawing::LineStyle_NONE));
-xProperies->setPropertyValue("FillColor", uno::makeAny(m_nArrowColor));
+xproperties->setPropertyValue("Name", uno::makeAny(m_sCID));
+xproperties->setPropertyValue(UNO_NAME_POLYPOLYGON, 
uno::Any(PolyToPointSequence(aPolyPolygon)));
+xproperties->setPropertyValue("LineStyle", 
uno::makeAny(drawing::LineStyle_NONE));
+xproperties->setPropertyValue("FillColor", uno::makeAny(m_nArrowColor));
 
 return xShape;
 }
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index 36374f3841ac..5b6edb8a0d48 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.hxx
@@ -79,7 +79,7 @@ enum class SfxShellFeature
 // Forms only, class FmFormShell
 FormShowDatabaseBar = 0x0008,
 FormShowField   = 0x0010,
-FormShowProperies   = 0x0020,
+FormShowproperties  = 0x0020,
 FormShowExplorer= 0x0040,
 FormShowFilterBar   = 0x0080,
 FormShowFilterNavigator = 0x0100,
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 31170e1ec6d6..14f5fb4577c9 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -146,7 +146,7 @@ void FmFormShell::InitInterface_Impl()
 
SfxShellFeature::FormShowTextControlBar);
 
 GetStaticInterface()->RegisterChildWindow(SID_FM_ADD_FIELD, false, 
SfxShellFeature::FormShowField);
-GetStaticInterface()->RegisterChildWindow(SID_FM_SHOW_PROPERTIES, false, 
SfxShellFeature::FormShowProperies);
+GetStaticInterface()->RegisterChildWindow(SID_FM_SHOW_PROPERTIES, false, 
SfxShellFeature::FormShowproperties);
 GetStaticInterface()->RegisterChildWindow(SID_FM_SHOW_FMEXPLORER, false, 
SfxShellFeature::FormShowExplorer);
 GetStaticInterface()->RegisterChildWindow(SID_FM_FILTER_NAVIGATOR, false, 
SfxShellFeature::FormShowFilterNavigator);
 GetStaticInterface()->RegisterChildWindow(SID_FM_SHOW_DATANAVIGATOR, 
false, SfxShellFeature::FormShowDataNavigator);
@@ -292,7 +292,7 @@ bool FmFormShell::HasUIFeature(SfxShellFeature nFeature) 
const
 {
 bResult = m_bDesignMode && m_pFormView && m_bHasForms;
 }
-else if (nFeature & SfxShellFeature::FormShowProperies)
+else if (nFeature & SfxShellFeature::FormShowproperties)
 {
 bResult = m_bDesignMode && m_pFormView && m_bHasForms;
 

[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - sc/source

[Tomaž Vajngerl (via logerrit)]

 sc/source/ui/inc/FilterFloatingWindow.hxx |   37 +
 sc/source/ui/inc/FilterListBox.hxx|   64 ++
 sc/source/ui/inc/gridwin.hxx  |6 +-
 sc/source/ui/view/gridwin.cxx |   60 
 4 files changed, 104 insertions(+), 63 deletions(-)

New commits:
commit c3d1908ee30a6f9b8653cece8c65ed0ad6f3e1c7
Author: Tomaž Vajngerl 
AuthorDate: Tue Sep 1 16:29:15 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Tue Sep 1 16:29:15 2020 +0200

sc: move FilterFloatingWindow and FilterListBox out of gridwin.cxx

Change-Id: Ic6e4bb2be86f8c89ac1e5386eb78fe17036b4cc5

diff --git a/sc/source/ui/inc/FilterFloatingWindow.hxx 
b/sc/source/ui/inc/FilterFloatingWindow.hxx
new file mode 100644
index ..71c13c62c864
--- /dev/null
+++ b/sc/source/ui/inc/FilterFloatingWindow.hxx
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include 
+
+class ScFilterFloatingWindow : public FloatingWindow
+{
+private:
+bool m_bGridHadMouseCaptured;
+
+public:
+ScFilterFloatingWindow(vcl::Window* pParent);
+virtual ~ScFilterFloatingWindow() override;
+virtual void dispose() override;
+
+bool MouseWasCaptured() const { return m_bGridHadMouseCaptured; }
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/FilterListBox.hxx 
b/sc/source/ui/inc/FilterListBox.hxx
new file mode 100644
index ..e65c72ae1107
--- /dev/null
+++ b/sc/source/ui/inc/FilterListBox.hxx
@@ -0,0 +1,64 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include 
+#include 
+
+enum class ScFilterBoxMode
+{
+DataSelect,
+Scenario
+};
+
+class ScFilterListBox final : public InterimItemWindow
+{
+private:
+std::unique_ptr xTreeView;
+VclPtr pGridWin;
+SCCOL nCol;
+SCROW nRow;
+bool bInit;
+bool bCancelled;
+sal_uLong nSel;
+ScFilterBoxMode eMode;
+ImplSVEvent* nAsyncSelectHdl;
+
+DECL_LINK(SelectHdl, weld::TreeView&, bool);
+DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
+DECL_LINK(AsyncSelectHdl, void*, void);
+
+public:
+ScFilterListBox(vcl::Window* pParent, ScGridWindow* pGrid, SCCOL nNewCol, 
SCROW nNewRow,
+ScFilterBoxMode eNewMode);
+virtual ~ScFilterListBox() override;
+virtual void dispose() override;
+
+weld::TreeView& get_widget() { return *xTreeView; }
+
+SCCOL GetCol() const { return nCol; }
+SCROW GetRow() const { return nRow; }
+ScFilterBoxMode GetMode() const { return eMode; }
+void EndInit();
+bool IsInInit() const { return bInit; }
+void SetCancelled() { bCancelled = true; }
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 8bdee8a55190..dc66b6ad3092 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -31,6 +31,9 @@
 #include 
 #include 
 
+#include 
+#include 
+
 namespace editeng {
 struct MisspellRanges;
 }
@@ -46,7 +49,6 @@ struct ScTableInfo;
 class ScDPObject;
 class ScDPFieldButton;
 class ScOutputData;
-class ScFilterListBox;
 class SdrObject;
 class SdrEditView;
 class ScNoteMarker;
@@ -8

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css loleaflet/html loleaflet/src

[Pedro Pinto Silva (via logerrit)]

 loleaflet/css/menubar.css  |   16 
 loleaflet/css/toolbar.css  |   17 ++---
 loleaflet/html/loleaflet.html.m4   |2 +-
 loleaflet/src/control/Control.DocumentNameInput.js |2 +-
 4 files changed, 24 insertions(+), 13 deletions(-)

New commits:
commit 65bef93e5e0ff4274a97fa42931d7443fa2e5d65
Author: Pedro Pinto Silva 
AuthorDate: Thu Aug 20 12:35:10 2020 +0200
Commit: Pedro Silva 
CommitDate: Tue Sep 1 16:00:12 2020 +0200

Document Name Input: make it flexible (dynamic width)

document-title container: remove table display and add min width

Change-Id: Id4289af91562790edd23c83d4e70a16688e44fe3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101048
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Pedro Silva 
(cherry picked from commit 1c4dcc1f587876b6c3880d3b0e8e7b593eeb26b6)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101451

diff --git a/loleaflet/css/menubar.css b/loleaflet/css/menubar.css
index cab048379..0b3f90eac 100644
--- a/loleaflet/css/menubar.css
+++ b/loleaflet/css/menubar.css
@@ -27,19 +27,27 @@
 }
 
 .document-title {
-display: table-cell;
-vertical-align: middle;
 height: 30px;
+min-width: 84px;
 white-space: nowrap;
+display: flex;
+align-items: center;
+justify-content: flex-start;
 }
 
 #document-titlebar {
 position: relative;
-display: inline-block;
+display: inline-table; /*new*/
 table-layout: fixed;
-border-spacing: 5px 0px;
+border-spacing: 5px 0;
 max-height: 39px;
 z-index: 1000;
+width: calc(100% - 890px);
+right: 0px;
+}
+
+.main-nav.hasnotebookbar #document-titlebar {
+   top: -10px;
 }
 
 .main-nav {
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index b6619f968..d1c11613b 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -153,10 +153,9 @@ w2ui-toolbar {
visibility: visible;
width: 24px;
height: 18px;
-   position: absolute;
-   right: 10px;
+   position: relative;
+   right: 24px;
background: url('images/baseline-edit.svg') right center no-repeat, 
radial-gradient(circle, #fff 20%, #fff0 100%);
-   top: 5px;
padding: 1px 0px;
margin: 0px;
border: none;
@@ -167,9 +166,12 @@ w2ui-toolbar {
 }
 
 #document-name-input {
-   font-size: 16px;
-   border: 1px solid transparent;
-   background-color: transparent;
+   font-size: 16px;
+   border: 1px solid transparent;
+   background-color: transparent;
+   border-radius: 1px;
+   padding: 0px 2px;
+   transition: 0.5s;
 }
 
 #document-name-input.editable {
@@ -181,12 +183,13 @@ w2ui-toolbar {
text-overflow:ellipsis;
height: 18px;
 }
-
 #document-name-input.editable:focus {
border: none;
box-shadow: inset 0 0 2px 1px #f0f0f0, 0 0 0.1px 1px #bbb;
background-color: white;
background-image: none;
+   outline: none;
+   flex: 2;
 }
 
 #document-name-input.editable:hover:not(:focus) {
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 8724b4394..9f42ed9f9 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -145,8 +145,8 @@ m4_ifelse(MOBILEAPP,[true],


  
-   

+   
  

  
diff --git a/loleaflet/src/control/Control.DocumentNameInput.js 
b/loleaflet/src/control/Control.DocumentNameInput.js
index 16dd68dbd..0a79ff736 100644
--- a/loleaflet/src/control/Control.DocumentNameInput.js
+++ b/loleaflet/src/control/Control.DocumentNameInput.js
@@ -129,7 +129,7 @@ L.Control.DocumentNameInput = L.Control.extend({
var documentNameInput = $('#document-name-input');
var content = (typeof tail === 'string') ? 
documentNameInput.val() + tail : documentNameInput.val();
var font = documentNameInput.css('font');
-   var textWidth = L.getTextWidth(content, font) + 10;
+   var textWidth = L.getTextWidth(content, font) + 24;
var maxWidth = this._getMaxAvailableWidth();
//console.log('_setNameInputWidth: textWidth: ' + textWidth + 
', maxWidth: ' + maxWidth);
textWidth = Math.min(textWidth, maxWidth);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 forms/source/xforms/xpathlib/xpathlib.cxx |   12 ++--
 forms/source/xforms/xpathlib/xpathlib.hxx |6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 59fee59094a9bf9e4bcd729139f9a43ccea3d35c
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 15:57:20 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 15:30:50 2020 +0200

Fix typo in code

It passed "make check"

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

diff --git a/forms/source/xforms/xpathlib/xpathlib.cxx 
b/forms/source/xforms/xpathlib/xpathlib.cxx
index cc4034d87d88..68cb43a6cdba 100644
--- a/forms/source/xforms/xpathlib/xpathlib.cxx
+++ b/forms/source/xforms/xpathlib/xpathlib.cxx
@@ -74,11 +74,11 @@ xmlXPathFunction xforms_lookupFunc(void *, const xmlChar 
*xname, const xmlChar *
 else if ((strcmp("seconds-from-dateTime", name))==0)
 return xforms_secondsFromDateTimeFunction;
 else if ((strcmp("seconds", name))==0)
-return xforms_secondsFuction;
+return xforms_secondsFunction;
 else if ((strcmp("months", name))==0)
-return xforms_monthsFuction;
+return xforms_monthsFunction;
 else if ((strcmp("instance", name))==0)
-return xforms_instanceFuction;
+return xforms_instanceFunction;
 else if ((strcmp("current", name))==0)
 return xforms_currentFunction;
 else
@@ -417,7 +417,7 @@ static bool parseDuration(const xmlChar* aString, bool& 
bNegative, sal_Int32& nY
 return true;
 }
 
-void xforms_secondsFuction(xmlXPathParserContextPtr ctxt, int nargs)
+void xforms_secondsFunction(xmlXPathParserContextPtr ctxt, int nargs)
 {
 // convert a xsd:duration to seconds
 // (-)PnYnMnDTnHnMnS
@@ -447,7 +447,7 @@ void xforms_secondsFuction(xmlXPathParserContextPtr ctxt, 
int nargs)
 xmlXPathReturnNumber(ctxt, xmlXPathNAN);
 }
 
-void xforms_monthsFuction(xmlXPathParserContextPtr ctxt, int nargs)
+void xforms_monthsFunction(xmlXPathParserContextPtr ctxt, int nargs)
 {
 // convert a xsd:duration to seconds
 // (-)PnYnMnDTnHnMnS
@@ -477,7 +477,7 @@ void xforms_monthsFuction(xmlXPathParserContextPtr ctxt, 
int nargs)
 }
 
 // Node-set Functions
-void xforms_instanceFuction(xmlXPathParserContextPtr ctxt, int nargs)
+void xforms_instanceFunction(xmlXPathParserContextPtr ctxt, int nargs)
 {
 if (nargs != 1) XP_ERROR(XPATH_INVALID_ARITY);
 xmlChar *pString = xmlXPathPopString(ctxt);
diff --git a/forms/source/xforms/xpathlib/xpathlib.hxx 
b/forms/source/xforms/xpathlib/xpathlib.hxx
index 05a5baedd235..e1c07965df01 100644
--- a/forms/source/xforms/xpathlib/xpathlib.hxx
+++ b/forms/source/xforms/xpathlib/xpathlib.hxx
@@ -58,11 +58,11 @@ void xforms_propertyFunction(xmlXPathParserContextPtr ctxt, 
int nargs);
 void xforms_nowFunction(xmlXPathParserContextPtr ctxt, int nargs);
 void xforms_daysFromDateFunction(xmlXPathParserContextPtr ctxt, int nargs);
 void xforms_secondsFromDateTimeFunction(xmlXPathParserContextPtr ctxt, int 
nargs);
-void xforms_secondsFuction(xmlXPathParserContextPtr ctxt, int nargs);
-void xforms_monthsFuction(xmlXPathParserContextPtr ctxt, int nargs);
+void xforms_secondsFunction(xmlXPathParserContextPtr ctxt, int nargs);
+void xforms_monthsFunction(xmlXPathParserContextPtr ctxt, int nargs);
 
 // Node-set Functions
-void xforms_instanceFuction(xmlXPathParserContextPtr ctxt, int nargs);
+void xforms_instanceFunction(xmlXPathParserContextPtr ctxt, int nargs);
 
 // Node-set Functions; XForms 1.1
 void xforms_currentFunction(xmlXPathParserContextPtr ctxt, int nargs);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sw/source/uibase/misc/swruler.cxx |   28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

New commits:
commit df3bfbb8a74ff6572b7eb29a219c861f2b564220
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 16:12:26 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 15:30:08 2020 +0200

Fix typo in code

IT passed "make check" on Linux

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

diff --git a/sw/source/uibase/misc/swruler.cxx 
b/sw/source/uibase/misc/swruler.cxx
index 80ef575f18fc..fb117e8e3b95 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -44,36 +44,36 @@ namespace
 void ImplDrawArrow(vcl::RenderContext& rRenderContext, long nX, long nY, long 
nSize,
const Color& rColor, bool bCollapsed)
 {
-tools::Polygon aTriaglePolygon(4);
+tools::Polygon aTrianglePolygon(4);
 
 if (bCollapsed)
 {
 if (AllSettings::GetLayoutRTL()) // <
 {
-aTriaglePolygon.SetPoint({ nX + nSize / 2, nY }, 0);
-aTriaglePolygon.SetPoint({ nX + nSize / 2, nY + nSize }, 1);
-aTriaglePolygon.SetPoint({ nX, nY + nSize / 2 }, 2);
-aTriaglePolygon.SetPoint({ nX + nSize / 2, nY }, 3);
+aTrianglePolygon.SetPoint({ nX + nSize / 2, nY }, 0);
+aTrianglePolygon.SetPoint({ nX + nSize / 2, nY + nSize }, 1);
+aTrianglePolygon.SetPoint({ nX, nY + nSize / 2 }, 2);
+aTrianglePolygon.SetPoint({ nX + nSize / 2, nY }, 3);
 }
 else // >
 {
-aTriaglePolygon.SetPoint({ nX, nY }, 0);
-aTriaglePolygon.SetPoint({ nX + nSize / 2, nY + nSize / 2 }, 1);
-aTriaglePolygon.SetPoint({ nX, nY + nSize }, 2);
-aTriaglePolygon.SetPoint({ nX, nY }, 3);
+aTrianglePolygon.SetPoint({ nX, nY }, 0);
+aTrianglePolygon.SetPoint({ nX + nSize / 2, nY + nSize / 2 }, 1);
+aTrianglePolygon.SetPoint({ nX, nY + nSize }, 2);
+aTrianglePolygon.SetPoint({ nX, nY }, 3);
 }
 }
 else // v
 {
-aTriaglePolygon.SetPoint({ nX, nY + nSize / 2 }, 0);
-aTriaglePolygon.SetPoint({ nX + nSize, nY + nSize / 2 }, 1);
-aTriaglePolygon.SetPoint({ nX + nSize / 2, nY + nSize }, 2);
-aTriaglePolygon.SetPoint({ nX, nY + nSize / 2 }, 3);
+aTrianglePolygon.SetPoint({ nX, nY + nSize / 2 }, 0);
+aTrianglePolygon.SetPoint({ nX + nSize, nY + nSize / 2 }, 1);
+aTrianglePolygon.SetPoint({ nX + nSize / 2, nY + nSize }, 2);
+aTrianglePolygon.SetPoint({ nX, nY + nSize / 2 }, 3);
 }
 
 rRenderContext.SetLineColor();
 rRenderContext.SetFillColor(rColor);
-rRenderContext.DrawPolygon(aTriaglePolygon);
+rRenderContext.DrawPolygon(aTrianglePolygon);
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 include/xmloff/formlayerimport.hxx  |4 ++--
 xmloff/source/forms/formlayerimport.cxx |4 ++--
 xmloff/source/forms/layerimport.cxx |6 +++---
 xmloff/source/forms/layerimport.hxx |2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 0edc370ac57860513a80992157f70aeea7a3b229
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 16:03:19 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 15:28:58 2020 +0200

Fix typo in code

It passed "make check" on Linux

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

diff --git a/include/xmloff/formlayerimport.hxx 
b/include/xmloff/formlayerimport.hxx
index 5d3b25948ae6..4834f85d19d9 100644
--- a/include/xmloff/formlayerimport.hxx
+++ b/include/xmloff/formlayerimport.hxx
@@ -109,12 +109,12 @@ namespace xmloff
 /** sets the given number style on the given control
 @param _rxControlModel
 the control model which's style is to be set
-@param _rControlNumerStyleName
+@param _rControlNumberStyleName
 the style name for the control's number style
 */
 void applyControlNumberStyle(
 const css::uno::Reference< css::beans::XPropertySet >& 
_rxControlModel,
-const OUString& _rControlNumerStyleName
+const OUString& _rControlNumberStyleName
 );
 
 /** to be called when the document has been completely imported
diff --git a/xmloff/source/forms/formlayerimport.cxx 
b/xmloff/source/forms/formlayerimport.cxx
index a8d8848a1df8..848b815f6703 100644
--- a/xmloff/source/forms/formlayerimport.cxx
+++ b/xmloff/source/forms/formlayerimport.cxx
@@ -73,9 +73,9 @@ namespace xmloff
 return m_pImpl->createContext(_nPrefix, _rLocalName, _rxAttribs);
 }
 
-void OFormLayerXMLImport::applyControlNumberStyle(const Reference< 
XPropertySet >& _rxControlModel, const OUString& _rControlNumerStyleName)
+void OFormLayerXMLImport::applyControlNumberStyle(const Reference< 
XPropertySet >& _rxControlModel, const OUString& _rControlNumberStyleName)
 {
-m_pImpl->applyControlNumberStyle(_rxControlModel, 
_rControlNumerStyleName);
+m_pImpl->applyControlNumberStyle(_rxControlModel, 
_rControlNumberStyleName);
 }
 
 void OFormLayerXMLImport::documentDone( )
diff --git a/xmloff/source/forms/layerimport.cxx 
b/xmloff/source/forms/layerimport.cxx
index 90b9c018e11a..39b862c9bb92 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -222,9 +222,9 @@ void 
OFormLayerXMLImport_Impl::setAutoStyleContext(SvXMLStylesContext* _pNewCont
 m_xAutoStyles.set(_pNewContext);
 }
 
-void OFormLayerXMLImport_Impl::applyControlNumberStyle(const Reference< 
XPropertySet >& _rxControlModel, const OUString& _rControlNumerStyleName)
+void OFormLayerXMLImport_Impl::applyControlNumberStyle(const Reference< 
XPropertySet >& _rxControlModel, const OUString& _rControlNumberStyleName)
 {
-OSL_ENSURE(_rxControlModel.is() && (!_rControlNumerStyleName.isEmpty()),
+OSL_ENSURE(_rxControlModel.is() && (!_rControlNumberStyleName.isEmpty()),
 "OFormLayerXMLImport_Impl::applyControlNumberStyle: invalid arguments 
(this will crash)!");
 
 OSL_ENSURE(m_xAutoStyles.is(), 
"OFormLayerXMLImport_Impl::applyControlNumberStyle: have no auto style 
context!");
@@ -236,7 +236,7 @@ void 
OFormLayerXMLImport_Impl::applyControlNumberStyle(const Reference< XPropert
 if (!m_xAutoStyles.is())
 return;
 
-const SvXMLStyleContext* pStyle = 
m_xAutoStyles->FindStyleChildContext(XmlStyleFamily::DATA_STYLE, 
_rControlNumerStyleName);
+const SvXMLStyleContext* pStyle = 
m_xAutoStyles->FindStyleChildContext(XmlStyleFamily::DATA_STYLE, 
_rControlNumberStyleName);
 if (pStyle)
 {
 const SvXMLNumFormatContext* pDataStyle = static_cast(pStyle);
diff --git a/xmloff/source/forms/layerimport.hxx 
b/xmloff/source/forms/layerimport.hxx
index 6913803384af..c21523054d1c 100644
--- a/xmloff/source/forms/layerimport.hxx
+++ b/xmloff/source/forms/layerimport.hxx
@@ -99,7 +99,7 @@ namespace xmloff
 voidleaveEventContext();
 voidapplyControlNumberStyle(
 const css::uno::Reference< css::beans::XPropertySet >& 
_rxControlModel,
-const OUString& _rControlNumerStyleName
+const OUString& _rControlNumberStyleName
 );
 voidregisterCellValueBinding(
 const css::uno::Reference< css::beans::XPropertySet >& 
_rxControlModel,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 winaccessibility/source/UAccCOM/AccHypertext.cxx |6 +++---
 winaccessibility/source/UAccCOM/AccText.cxx  |6 +++---
 winaccessibility/source/UAccCOM/AccTextBase.cxx  |6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit eb971cc83499e260c9e433c310d682c6f32076e2
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 16:01:43 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 15:29:38 2020 +0200

Fix typo

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

diff --git a/winaccessibility/source/UAccCOM/AccHypertext.cxx 
b/winaccessibility/source/UAccCOM/AccHypertext.cxx
index 28d7525e2f8e..aa1e297df7c0 100644
--- a/winaccessibility/source/UAccCOM/AccHypertext.cxx
+++ b/winaccessibility/source/UAccCOM/AccHypertext.cxx
@@ -193,7 +193,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
CAccHypertext::get_textAtOffset(long offset, I
 /**
* Remove selection.
* @param selectionIndex Special selection index
-   * @param success Variant to accept the memthod called result.
+   * @param success Variant to accept the method called result.
* @return Result.
 */
 COM_DECLSPEC_NOTHROW STDMETHODIMP CAccHypertext::removeSelection(long 
selectionIndex)
@@ -205,7 +205,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
CAccHypertext::removeSelection(long selectionI
 /**
* Set caret position.
* @param offset Special position.
-   * @param success Variant to accept the memthod called result.
+   * @param success Variant to accept the method called result.
* @return Result.
 */
 COM_DECLSPEC_NOTHROW STDMETHODIMP CAccHypertext::setCaretOffset(long offset)
@@ -219,7 +219,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
CAccHypertext::setCaretOffset(long offset)
* @param selectionIndex Special selection index.
* @param startOffset start position.
* @param endOffset end position.
-   * @param success Variant to accept the memthod called result.
+   * @param success Variant to accept the method called result.
* @return Result.
 */
 COM_DECLSPEC_NOTHROW STDMETHODIMP CAccHypertext::setSelection(long 
selectionIndex, long startOffset, long endOffset)
diff --git a/winaccessibility/source/UAccCOM/AccText.cxx 
b/winaccessibility/source/UAccCOM/AccText.cxx
index 7c646cdfc285..fc6c39285a80 100644
--- a/winaccessibility/source/UAccCOM/AccText.cxx
+++ b/winaccessibility/source/UAccCOM/AccText.cxx
@@ -188,7 +188,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
CAccText::get_textAtOffset(long offset, IA2Tex
 /**
* Remove selection.
* @param selectionIndex Special selection index
-   * @param success Variant to accept the memthod called result.
+   * @param success Variant to accept the method called result.
* @return Result.
 */
 COM_DECLSPEC_NOTHROW STDMETHODIMP CAccText::removeSelection(long 
selectionIndex)//, unsigned char * success)
@@ -200,7 +200,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
CAccText::removeSelection(long selectionIndex)
 /**
* Set caret position.
* @param offset Special position.
-   * @param success Variant to accept the memthod called result.
+   * @param success Variant to accept the method called result.
* @return Result.
 */
 COM_DECLSPEC_NOTHROW STDMETHODIMP CAccText::setCaretOffset(long offset)
@@ -214,7 +214,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
CAccText::setCaretOffset(long offset)
* @param selectionIndex Special selection index.
* @param startOffset start position.
* @param endOffset end position.
-   * @param success Variant to accept the memthod called result.
+   * @param success Variant to accept the method called result.
* @return Result.
 */
 
diff --git a/winaccessibility/source/UAccCOM/AccTextBase.cxx 
b/winaccessibility/source/UAccCOM/AccTextBase.cxx
index caf3af18b38b..12401e56dc0a 100644
--- a/winaccessibility/source/UAccCOM/AccTextBase.cxx
+++ b/winaccessibility/source/UAccCOM/AccTextBase.cxx
@@ -764,7 +764,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
CAccTextBase::get_textAtOffset(long offset, IA
 /**
* Remove selection.
* @param selectionIndex Special selection index
-   * @param success Variant to accept the memthod called result.
+   * @param success Variant to accept the method called result.
* @return Result.
 */
 COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTextBase::removeSelection(long 
selectionIndex)
@@ -800,7 +800,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
CAccTextBase::removeSelection(long selectionIn
 /**
* Set caret position.
* @param offset Special position.
-   * @param success Variant to accept the memthod called result.
+   * @param success Variant to accept the method called result.
* @return Result.
 */
 COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTextBase::setCaretOffset(long offset)
@@ -825,7 +825,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
CAccTextBase::setCaretOffset(long offset)
* @param selectionIndex Special selection index.
* @param startOffset start positi

[Libreoffice-commits] core.git: dbaccess/source sd/source starmath/source svgio/source svx/source sw/source ucb/source xmlsecurity/source

[Andrea Gelmini (via logerrit)]

 dbaccess/source/filter/xml/xmlfilter.cxx |2 +-
 sd/source/core/CustomAnimationPreset.cxx |2 +-
 sd/source/filter/xml/sdxmlwrp.cxx|2 +-
 starmath/source/mathmlimport.cxx |2 +-
 svgio/source/svguno/xsvgparser.cxx   |2 +-
 svx/source/xml/xmlexport.cxx |2 +-
 sw/source/core/swg/SwXMLTextBlocks1.cxx  |2 +-
 sw/source/filter/xml/swxml.cxx   |2 +-
 ucb/source/ucp/webdav/webdavresponseparser.cxx   |2 +-
 xmlsecurity/source/helper/xmlsignaturehelper.cxx |2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 4c20bb789c7536f63a6844a4cb4489a18cee53c7
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 14:52:48 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 15:28:16 2020 +0200

Fix typo

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

diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx 
b/dbaccess/source/filter/xml/xmlfilter.cxx
index 8dd509f66b2d..942ef787c171 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -85,7 +85,7 @@ static ErrCode ReadThroughComponent(
 OSL_ENSURE(xModelComponent.is(), "document missing");
 OSL_ENSURE(rxContext.is(), "factory missing");
 
-// prepare ParserInputSrouce
+// prepare ParserInputSource
 InputSource aParserInput;
 aParserInput.aInputStream = xInputStream;
 
diff --git a/sd/source/core/CustomAnimationPreset.cxx 
b/sd/source/core/CustomAnimationPreset.cxx
index cf15dc490622..b40b271d9910 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -227,7 +227,7 @@ Reference< XAnimationNode > implImportEffects( const 
Reference< XMultiServiceFac
 std::unique_ptr pIStm = 
::utl::UcbStreamHelper::CreateStream( rPath, StreamMode::READ );
 Reference xInputStream( new utl::OInputStreamWrapper( 
std::move(pIStm) ) );
 
-// prepare ParserInputSrouce
+// prepare ParserInputSource
 xml::sax::InputSource aParserInput;
 aParserInput.sSystemId = rPath;
 aParserInput.aInputStream = xInputStream;
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx 
b/sd/source/filter/xml/sdxmlwrp.cxx
index 3980efc1cd52..7186ef911c24 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -184,7 +184,7 @@ ErrCode ReadThroughComponent(
 
 SAL_INFO( "sd.filter", "ReadThroughComponent" );
 
-// prepare ParserInputSrouce
+// prepare ParserInputSource
 xml::sax::InputSource aParserInput;
 aParserInput.sSystemId = rName;
 aParserInput.aInputStream = xInputStream;
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index fffc9d61e169..b367b9943374 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -259,7 +259,7 @@ ErrCode SmXMLImportWrapper::ReadThroughComponent(
 OSL_ENSURE(rxContext.is(), "factory missing");
 OSL_ENSURE(nullptr != pFilterName,"I need a service name for the 
component!");
 
-// prepare ParserInputSrouce
+// prepare ParserInputSource
 xml::sax::InputSource aParserInput;
 aParserInput.aInputStream = xInputStream;
 
diff --git a/svgio/source/svguno/xsvgparser.cxx 
b/svgio/source/svguno/xsvgparser.cxx
index 5abaea5e099d..511640e6f6d7 100644
--- a/svgio/source/svguno/xsvgparser.cxx
+++ b/svgio/source/svguno/xsvgparser.cxx
@@ -80,7 +80,7 @@ namespace svgio::svgreader
 {
 try
 {
-// prepare ParserInputSrouce
+// prepare ParserInputSource
 xml::sax::InputSource myInputSource;
 myInputSource.aInputStream = xSVGStream;
 
diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx
index 6e63ef08700a..5f179873b0ca 100644
--- a/svx/source/xml/xmlexport.cxx
+++ b/svx/source/xml/xmlexport.cxx
@@ -181,7 +181,7 @@ bool SvxDrawingLayerImport( SdrModel* pModel, const 
uno::Reference xInputStream = 
xDocStream->getInputStream();
 
-// prepare ParserInputSrouce
+// prepare ParserInputSource
 xml::sax::InputSource aParserInput;
 aParserInput.sSystemId = m_aName;
 aParserInput.aInputStream = xInputStream;
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 09ff0e2ddeed..24c8e8c7c749 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -145,7 +145,7 @@ ErrCode ReadThroughComponent(
 OSL_ENSURE(rxContext.is(), "factory missing");
 OSL_ENSURE(nullptr != pFilterName,"I need a service name for the 
component!");
 
-// prepare ParserInputSrouce
+// prepare ParserInputSource
 xml::sax::InputSource aParserInput;
 aParserInput.sSystemId = rName;
 aParserInput.aInputStream = xI

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css

[Pedro Silva (via logerrit)]

 loleaflet/css/toolbar.css |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit b5b7c4147c34c7a411492c62ca3d5c534547d143
Author: Pedro Silva 
AuthorDate: Tue Sep 1 13:46:12 2020 +0200
Commit: Pedro Silva 
CommitDate: Tue Sep 1 13:56:26 2020 +0200

Remove merge conflicts introduced in

4fe32b6d640d7ff0f7cb9e198c13eb8a741f7dc3

Change-Id: Ibda1f155fbcbe7088ac1e403dcc27a0315ad0b51
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101687
Tested-by: Pedro Silva 
Reviewed-by: Pedro Silva 

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index d1f9c3637..b6619f968 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -177,12 +177,9 @@ w2ui-toolbar {
box-shadow: 0 0 0.1px 1px #ebebeb, 0 0 2px 1px #f0f0f0;
padding-right: 24px;
max-width: 100%;
-<<< HEAD   (dcbaeb loleaflet: Slides preview section improvements.)
-===
overflow: hidden;
text-overflow:ellipsis;
height: 18px;
->>> CHANGE (c1730c Desktop: Document name input and pencil: remove unused 
style)
 }
 
 #document-name-input.editable:focus {
___
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' - vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/control/edit.cxx |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 3cc9def811f4bac32342175f3fda9f10dcde80bb
Author: Caolán McNamara 
AuthorDate: Mon Aug 31 20:33:35 2020 +0100
Commit: Miklos Vajna 
CommitDate: Tue Sep 1 13:42:03 2020 +0200

check if Edit was disposed while insert special character was still open

seen when testing renaming tabs in basic IDE

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

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 000b660ca04a..c259853edb88 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2015,11 +2015,14 @@ void Edit::Command( const CommandEvent& rCEvt )
 else if (sCommand == "specialchar" && pImplFncGetSpecialChars)
 {
 OUString aChars = pImplFncGetSpecialChars(GetFrameWeld(), 
GetFont());
-SetSelection( aSaveSel );
-if (!aChars.isEmpty())
+if (!IsDisposed()) // destroyed while the insert special character 
dialog was still open
 {
-ImplInsertText( aChars );
-ImplModified();
+SetSelection( aSaveSel );
+if (!aChars.isEmpty())
+{
+ImplInsertText( aChars );
+ImplModified();
+}
 }
 }
 pPopup.clear();
___
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

[Caolán McNamara (via logerrit)]

 sw/source/uibase/shells/tabsh.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit af002a22eea1a3a94649ab5154db55b266696787
Author: Caolán McNamara 
AuthorDate: Mon Aug 31 15:23:58 2020 +0100
Commit: Miklos Vajna 
CommitDate: Tue Sep 1 13:41:09 2020 +0200

tdf#135636 the selection at dialog-launch time is lost by dialog-apply time

since...

commit c3a085d22742f88e91ff92f319a26d6e8d1d9a98
Date:   Tue Jan 23 18:13:01 2018 +0100

lokdialog: Convert the Table -> Properties... to async exec.

so save it at launch and temp apply it during ok handler. This is somewhat
similar to tdf#134439

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

diff --git a/sw/source/uibase/shells/tabsh.cxx 
b/sw/source/uibase/shells/tabsh.cxx
index 0348f461f0e0..04dfbda01131 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -596,9 +596,13 @@ void SwTableShell::Execute(SfxRequest &rReq)
 auto pRequest = std::make_shared(rReq);
 rReq.Ignore(); // the 'old' request is not relevant any more
 
-pDlg->StartExecuteAsync([pDlg, pRequest, pTableRep, 
&rBindings, &rSh](sal_Int32 nResult){
+auto xPaM(std::make_shared(*rSh.GetCursor(), nullptr)); 
// tdf#135636 make a copy to use at later apply
+pDlg->StartExecuteAsync([pDlg, pRequest, pTableRep, 
&rBindings, &rSh, xPaM](sal_Int32 nResult){
 if (RET_OK == nResult)
 {
+rSh.Push();  // save current cursor on 
stack
+rSh.SetSelection(*xPaM); // tdf#135636 set the table 
selected at dialog launch as current selection
+
 const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
 
 //to record FN_INSERT_TABLE correctly
@@ -606,6 +610,8 @@ void SwTableShell::Execute(SfxRequest &rReq)
 pRequest->Done(*pOutSet);
 
 ItemSetToTableParam(*pOutSet, rSh);
+
+rSh.Pop(SwCursorShell::PopMode::DeleteCurrent); // 
restore cursor from stack
 }
 
 rBindings.Update(SID_RULER_BORDERS);
___
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' - cui/source include/svx sc/source svx/source sw/source

[Caolán McNamara (via logerrit)]

 cui/source/options/optaboutconfig.cxx  |4 +++-
 include/svx/ctredlin.hxx   |1 +
 sc/source/ui/dialogs/searchresults.cxx |4 +++-
 svx/source/dialog/ctredlin.cxx |4 +++-
 sw/source/ui/misc/bookmark.cxx |4 +++-
 sw/source/uibase/misc/redlndlg.cxx |4 
 6 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit c52ac477beefc46802148033adbca9edb9970ac1
Author: Caolán McNamara 
AuthorDate: Mon Aug 31 11:47:49 2020 +0100
Commit: Miklos Vajna 
CommitDate: Tue Sep 1 13:40:24 2020 +0200

Resolves: tdf#136189 don't try and sort until treeview is filled

Change-Id: Ic5ac71d88bab7627e14220912f4b9c935f2f1f26

and...

Related: tdf#136189 don't assert on unsetting non-existing previous sort 
column

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

diff --git a/cui/source/options/optaboutconfig.cxx 
b/cui/source/options/optaboutconfig.cxx
index 44bacb1e1195..79a75bda69d3 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -181,7 +181,9 @@ IMPL_LINK(CuiAboutConfigTabPage, HeaderBarClick, int, 
nColumn, void)
 }
 else
 {
-m_xPrefBox->set_sort_indicator(TRISTATE_INDET, 
m_xPrefBox->get_sort_column());
+int nOldSortColumn = m_xPrefBox->get_sort_column();
+if (nOldSortColumn != -1)
+m_xPrefBox->set_sort_indicator(TRISTATE_INDET, nOldSortColumn);
 m_xPrefBox->set_sort_column(nColumn);
 }
 
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index 55462c9dce28..08538bf18b02 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -104,6 +104,7 @@ public:
 void set_size_request(int nWidth, int nHeight);
 
 weld::TreeView& GetWidget() { return *pTreeView; }
+bool IsSorted() const { return bSorted; }
 
 ~SvxRedlinTable();
 
diff --git a/sc/source/ui/dialogs/searchresults.cxx 
b/sc/source/ui/dialogs/searchresults.cxx
index 950726a18c4e..0f94c64f32e7 100644
--- a/sc/source/ui/dialogs/searchresults.cxx
+++ b/sc/source/ui/dialogs/searchresults.cxx
@@ -196,7 +196,9 @@ IMPL_LINK(SearchResultsDlg, HeaderBarClick, int, nColumn, 
void)
 }
 else
 {
-mxList->set_sort_indicator(TRISTATE_INDET, mxList->get_sort_column());
+int nOldSortColumn = mxList->get_sort_column();
+if (nOldSortColumn != -1)
+mxList->set_sort_indicator(TRISTATE_INDET, nOldSortColumn);
 mxList->set_sort_column(nColumn);
 }
 
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 3374efde51b5..3116ec7ec5a5 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -110,7 +110,9 @@ IMPL_LINK(SvxRedlinTable, HeaderBarClick, int, nColumn, 
void)
 }
 else
 {
-pTreeView->set_sort_indicator(TRISTATE_INDET, 
pTreeView->get_sort_column());
+int nOldSortColumn = pTreeView->get_sort_column();
+if (nOldSortColumn != -1)
+pTreeView->set_sort_indicator(TRISTATE_INDET, nOldSortColumn);
 pTreeView->set_sort_column(nColumn);
 }
 
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 29f090f94ff6..be22962fcf8d 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -367,7 +367,9 @@ IMPL_LINK(SwInsertBookmarkDlg, HeaderBarClick, int, 
nColumn, void)
 }
 else
 {
-m_xBookmarksBox->set_sort_indicator(TRISTATE_INDET, 
m_xBookmarksBox->get_sort_column());
+int nOldSortColumn = m_xBookmarksBox->get_sort_column();
+if (nOldSortColumn != -1)
+m_xBookmarksBox->set_sort_indicator(TRISTATE_INDET, 
nOldSortColumn);
 m_xBookmarksBox->set_sort_column(nColumn);
 }
 
diff --git a/sw/source/uibase/misc/redlndlg.cxx 
b/sw/source/uibase/misc/redlndlg.cxx
index 9d510e5fa45c..a185064977c2 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -712,6 +712,8 @@ void 
SwRedlineAcceptDlg::InsertParents(SwRedlineTable::size_type nStart, SwRedli
 pCurrRedline = nullptr;
 
 rTreeView.freeze();
+if (m_pTable->IsSorted())
+rTreeView.make_unsorted();
 for (SwRedlineTable::size_type i = nStart; i <= nEnd; i++)
 {
 const SwRangeRedline& rRedln = pSh->GetRedline(i);
@@ -758,6 +760,8 @@ void 
SwRedlineAcceptDlg::InsertParents(SwRedlineTable::size_type nStart, SwRedli
 InsertChildren(pRedlineParent, rRedln, bHasRedlineAutoFormat);
 }
 rTreeView.thaw();
+if (m_pTable->IsSorted())
+rTreeView.make_sorted();
 }
 
 void SwRedlineAcceptDlg::CallAcceptReject( bool bSelect, bool bAccept )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-

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

[Caolán McNamara (via logerrit)]

 sc/source/ui/view/tabview3.cxx |   17 +++--
 1 file changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 9ee0dbd54a60b07ff692a842e49942e56f762f92
Author: Caolán McNamara 
AuthorDate: Mon Aug 31 11:03:35 2020 +0100
Commit: Miklos Vajna 
CommitDate: Tue Sep 1 13:39:35 2020 +0200

tdf#136242 disable changing selection while formula wizard is open

similar to tdf#124975

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

diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index cfff46935dad..cc955f408503 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -444,11 +444,16 @@ void ScTabView::SetCursor( SCCOL nPosX, SCROW nPosY, bool 
bNew )
 }
 }
 
-static bool lcl_IsScSimpleRefDlgOpen(SfxViewFrame* pViewFrm)
+static bool lcl_IsRefDlgOpen(SfxViewFrame* pViewFrm)
 {
-if (pViewFrm->HasChildWindow(WID_SIMPLE_REF))
+ScModule* pScMod = SC_MOD();
+if (!pScMod->IsRefDialogOpen())
+   return false;
+
+auto nDlgId = pScMod->GetCurRefDlgId();
+if (pViewFrm->HasChildWindow(nDlgId))
 {
-SfxChildWindow* pChild = pViewFrm->GetChildWindow(WID_SIMPLE_REF);
+SfxChildWindow* pChild = pViewFrm->GetChildWindow(nDlgId);
 if (pChild)
 {
 auto xDlgController = pChild->GetController();
@@ -476,10 +481,10 @@ void ScTabView::CheckSelectionTransfer()
 
 pScMod->SetSelectionTransfer( pNew.get() );
 
-// tdf#124975 changing the calc selection can trigger removal of 
the
-// selection of an open ScSimpleRefDlg dialog, so don't inform the
+// tdf#124975/tdf#136242 changing the calc selection can trigger 
removal of the
+// selection of an open RefDlg dialog, so don't inform the
 // desktop clipboard of the changed selection if that dialog is 
open
-if 
(!lcl_IsScSimpleRefDlgOpen(aViewData.GetViewShell()->GetViewFrame()))
+if (!lcl_IsRefDlgOpen(aViewData.GetViewShell()->GetViewFrame()))
 pNew->CopyToSelection( GetActiveWin() );// 
may delete pOld
 
 // Log the selection change
___
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' - cui/source

[Mike Kaganski (via logerrit)]

 cui/source/dialogs/about.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c6ccf624dad2095aff50d2b939fd3b0b7743ca68
Author: Mike Kaganski 
AuthorDate: Mon Aug 31 15:37:33 2020 +0200
Commit: Caolán McNamara 
CommitDate: Tue Sep 1 13:36:35 2020 +0200

Fix warning condition

Missed that I needed to reverse the condition when replacing OSL_ENSURE
with SAL_WARN_IF in 37f452bc2beeae9b4648013a3bf4f2e8b56c0c85.

Thanks Julien for noticing!

Change-Id: Id24216e11ca970b05aac40a09ed02cdbb4cf9865
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101678
Reviewed-by: Julien Nabet 
Reviewed-by: Mike Kaganski 
Tested-by: Jenkins
(cherry picked from commit ca7caf212a90b6e4290782159cbdbb36e4538f19)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101684
Reviewed-by: Caolán McNamara 

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 917e5f4bd30d..99245b94b3ed 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -157,7 +157,7 @@ OUString AboutDialog::GetVersionString() {
 OUString AboutDialog::GetBuildString()
 {
   OUString sBuildId(utl::Bootstrap::getBuildIdData(""));
-  SAL_WARN_IF(!sBuildId.isEmpty(), "cui.dialogs", "No BUILDID in bootstrap 
file");
+  SAL_WARN_IF(sBuildId.isEmpty(), "cui.dialogs", "No BUILDID in bootstrap 
file");
 
   return sBuildId;
 }
___
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/qa sw/source

[Justin Luth (via logerrit)]

 sw/qa/extras/ww8export/ww8export2.cxx |1 +
 sw/source/filter/ww8/ww8par6.cxx  |6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 1e4bb55c1dba650077ef68953e7cd6514a43d781
Author: Justin Luth 
AuthorDate: Mon Aug 31 14:40:55 2020 +0300
Commit: Caolán McNamara 
CommitDate: Tue Sep 1 13:35:29 2020 +0200

tdf#136282 ww8import: track para bidi, not char bidi for style

This fixes a LO 7.0 regression from tdf#99197.

Apparently I was watching the wrong SPRM for bidi change in styles.
It looks like it should be sprmPFBiDi: A Bool8 value that
specifies whether the paragraph uses right-to-left layout.
By default, a paragraph does not use right-to-left layout.

Instead, I had been using sprmCFBiDi: A ToggleOperand value that
specifies whether the text is formatted with right-to-left layout.
By default, text is displayed from right to left
if the language for the text is a right-to-left language.
[So this one looks like a character run property.]

I no longer remember why I used CfBiDi. Perhaps just because
it sets m_bBiDi which sounds good?
However, there are no existing unit tests that have a CFBiDi
in a style, but there are examples with CFBiDi.

I'm really surprised that QA didn't have any documents
that picked up on this regression. I was counting on that...

Change-Id: If5a115db5962e7e26ca1b280cd9f31d493cee69c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101726
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 
(cherry picked from commit fb8334aa79e811bb6780e072e24d2580932f1031)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101686
Reviewed-by: Caolán McNamara 

diff --git a/sw/qa/extras/ww8export/ww8export2.cxx 
b/sw/qa/extras/ww8export/ww8export2.cxx
index 46cae102045d..8c29d0446b26 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -346,6 +346,7 @@ DECLARE_WW8EXPORT_TEST(testTdf112074_RTLtableJustification, 
"tdf112074_RTLtableJ
 DECLARE_WW8EXPORT_TEST(testTdf98620_rtlJustify, "tdf98620_rtlJustify.doc")
 {
 CPPUNIT_ASSERT_EQUAL( style::ParagraphAdjust_RIGHT, 
static_cast(getProperty(getParagraph(1), 
"ParaAdjust")) );
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Right To Left style", 
text::WritingMode2::RL_TB, getProperty(getParagraph(1), 
"WritingMode"));
 }
 
 DECLARE_WW8EXPORT_TEST(testTdf121110_absJustify, "tdf121110_absJustify.doc")
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index f070a50976ca..99d9c22ce2ee 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -403,6 +403,9 @@ void SwWW8ImplReader::Read_ParaBiDi(sal_uInt16, const 
sal_uInt8* pData, short nL
 }
 
 NewAttr(SvxFrameDirectionItem(eDir, RES_FRAMEDIR));
+
+if ( m_pCurrentColl && m_xStyles )// in style definition
+m_xStyles->mbBidiChanged = true;
 }
 }
 
@@ -3071,9 +3074,6 @@ void SwWW8ImplReader::Read_Bidi(sal_uInt16, const 
sal_uInt8* pData, short nLen)
 m_bBidi = true;
 sal_uInt8 nBidi = *pData;
 NewAttr( SfxInt16Item( RES_CHRATR_BIDIRTL, (nBidi!=0)? 1 : 0 ) );
-
-if( m_pCurrentColl && m_xStyles )// in style definition
-m_xStyles->mbBidiChanged = true;
 }
 }
 
___
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' - xmlsecurity/source

[Miklos Vajna (via logerrit)]

 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 03de892703595794401cae9d5e908188d49fc0cf
Author: Miklos Vajna 
AuthorDate: Mon Aug 31 13:34:17 2020 +0200
Commit: Caolán McNamara 
CommitDate: Tue Sep 1 13:36:02 2020 +0200

xmlsecurity: fix infobar vs signature dialog inconsistency

The infobar mentioned if a signature is partial, but the dialog just has
a bool UI for signatures. Then present "good, but partial" as "bad".

(cherry picked from commit 3ba1144cb96c710e665ffb3ada26fb6a48a03472)

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

diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx 
b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index d90bd33f9cfa..ff5161fb2754 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -605,8 +605,17 @@ void DigitalSignaturesDialog::ImplFillSignaturesBox()
 
 if ( bSigValid )
 {
-bSigValid = DocumentSignatureHelper::checkIfAllFilesAreSigned(
-  aElementsToBeVerified, rInfo, mode);
+if (maSignatureManager.getStore().is())
+{
+// XML based.
+bSigValid = 
DocumentSignatureHelper::checkIfAllFilesAreSigned(
+  aElementsToBeVerified, rInfo, mode);
+}
+else
+{
+// Assume PDF.
+bSigValid = !rInfo.bPartialDocumentSignature;
+}
 
 if( bSigValid )
 nValidSigs++;
___
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' - chart2/qa oox/source

[Daniel Arato (NISZ) (via logerrit)]

 chart2/qa/extras/chart2export.cxx   |   14 ++
 chart2/qa/extras/data/odp/tdf121189.odp |binary
 oox/source/export/shapes.cxx|1 +
 3 files changed, 15 insertions(+)

New commits:
commit f366b87d71d774c3a6983224903933bb32b43ff0
Author: Daniel Arato (NISZ) 
AuthorDate: Mon Aug 24 17:29:08 2020 +0200
Commit: Xisco Fauli 
CommitDate: Tue Sep 1 13:26:40 2020 +0200

tdf#121189 PPTX export: fix missing chart

Based on Regina Henschel's technical analysis and code pointer.

Change-Id: Ifdea48c09d23dce495fa6bc90a9e1648dbb5ccb3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101283
Tested-by: László Németh 
Reviewed-by: László Németh 
(cherry picked from commit 0c5ac9d1cb39eac838a612092a8934a6ca12326f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101674
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 81b79439a9ff..2459a2b3089b 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -155,6 +155,7 @@ public:
 void testTdf119029();
 void testTdf108022();
 void testTdf121744();
+void testTdf121189();
 void testTdf122031();
 void testTdf115012();
 void testTdf123206_customLabelText();
@@ -289,6 +290,7 @@ public:
 CPPUNIT_TEST(testTdf119029);
 CPPUNIT_TEST(testTdf108022);
 CPPUNIT_TEST(testTdf121744);
+CPPUNIT_TEST(testTdf121189);
 CPPUNIT_TEST(testTdf122031);
 CPPUNIT_TEST(testTdf115012);
 CPPUNIT_TEST(testTdf123206_customLabelText);
@@ -2540,6 +2542,18 @@ void Chart2ExportTest::testTdf121744()
 assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:axId[2]", "val", YValueId );
 }
 
+void Chart2ExportTest::testTdf121189()
+{
+load("/chart2/qa/extras/data/odp/", "tdf121189.odp");
+reload("Impress Office Open XML");
+
+uno::Reference xDoc(mxComponent, 
uno::UNO_QUERY_THROW);
+uno::Reference 
xPage(xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xPage->getCount());
+uno::Reference xShape(xPage->getByIndex(0), 
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.OLE2Shape"), 
xShape->getShapeType());
+}
+
 void Chart2ExportTest::testTdf122031()
 {
 //Checks pie chart data label format.
diff --git a/chart2/qa/extras/data/odp/tdf121189.odp 
b/chart2/qa/extras/data/odp/tdf121189.odp
new file mode 100644
index ..6f99e0054936
Binary files /dev/null and b/chart2/qa/extras/data/odp/tdf121189.odp differ
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 9a6a72b08b0f..1b17f888c493 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -1519,6 +1519,7 @@ static const NameToConvertMapType& lcl_GetConverters()
 
 { "com.sun.star.presentation.GraphicObjectShape"   , 
&ShapeExport::WriteGraphicObjectShape },
 { "com.sun.star.presentation.MediaShape"   , 
&ShapeExport::WriteGraphicObjectShape },
+{ "com.sun.star.presentation.ChartShape"   , 
&ShapeExport::WriteOLE2Shape },
 { "com.sun.star.presentation.OLE2Shape", 
&ShapeExport::WriteOLE2Shape },
 { "com.sun.star.presentation.TableShape"   , 
&ShapeExport::WriteTableShape },
 { "com.sun.star.presentation.TextShape", 
&ShapeExport::WriteTextShape },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

3 new defect(s) introduced to LibreOffice found with Coverity Scan.


New defect(s) Reported-by: Coverity Scan
Showing 3 of 3 defect(s)


** CID 1466575:  Null pointer dereferences  (NULL_RETURNS)



*** CID 1466575:  Null pointer dereferences  (NULL_RETURNS)
/sw/source/core/text/txtfld.cxx: 482 in 
checkApplyParagraphMarkFormatToNumbering(SwFont *, SwTextFormatInfo &, const 
IDocumentSettingAccess *, const SwAttrSet *)()
476 && !pCleanedSet->HasItem(nWhich)
477 && !(pFormat && pFormat->HasItem(nWhich)) )
478 {
479 // Copy from parent sets only allowed items which will 
not overwrite
480 // values explicitly defined in current set 
(pCleanedSet) or in pFormat
481 const SfxPoolItem* pItem = rStyleAttrs.GetItem(nWhich, 
true);
>>> CID 1466575:  Null pointer dereferences  (NULL_RETURNS)
>>> Dereferencing a pointer that might be "nullptr" "pItem" when calling 
>>> "Put".
482 pCleanedSet->Put(*pItem);
483 }
484 nWhich = aIter.NextWhich();
485 }
486 
487 // It is not required here anymore, all referenced items are 
inserted

** CID 1466574:  Uninitialized members  (UNINIT_CTOR)
/xmloff/source/draw/XMLNumberStyles.cxx: 599 in 
SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext(SdXMLImport &, 
int, SvXMLNumImpData *, SvXMLStylesTokens, const 
com::sun::star::uno::Reference &, 
SvXMLStylesContext &)()



*** CID 1466574:  Uninitialized members  (UNINIT_CTOR)
/xmloff/source/draw/XMLNumberStyles.cxx: 599 in 
SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext(SdXMLImport &, 
int, SvXMLNumImpData *, SvXMLStylesTokens, const 
com::sun::star::uno::Reference &, 
SvXMLStylesContext &)()
593 OUString sValue = aIter.toString();
594 if( aIter.getToken() == XML_ELEMENT(NUMBER, 
XML_AUTOMATIC_ORDER) )
595 mbAutomatic = IsXMLToken( sValue, XML_TRUE );
596 else
597 SAL_WARN("xmloff", "unknown attribute " << 
SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" << 
aIter.toString());
598 }
>>> CID 1466574:  Uninitialized members  (UNINIT_CTOR)
>>> Non-static class member "mnElements" is not initialized in this 
>>> constructor nor in any functions that it calls.
599 }
600 
601 SdXMLNumberFormatImportContext::~SdXMLNumberFormatImportContext()
602 {
603 }
604 

** CID 1466573:  Null pointer dereferences  (FORWARD_NULL)
/i18npool/source/textconversion/textconversion_zh.cxx: 228 in 
i18npool::TextConversion_zh::getWordConversion(const rtl::OUString &, int, int, 
bool, int, com::sun::star::uno::Sequence &)()



*** CID 1466573:  Null pointer dereferences  (FORWARD_NULL)
/i18npool/source/textconversion/textconversion_zh.cxx: 228 in 
i18npool::TextConversion_zh::getWordConversion(const rtl::OUString &, int, int, 
bool, int, com::sun::star::uno::Sequence &)()
222 if (result < 0)
223 top = current - 1;
224 else if (result > 0)
225 bottom = current + 1;
226 else {
227 if (toSChinese)   // Traditionary/Simplified 
conversion,
>>> CID 1466573:  Null pointer dereferences  (FORWARD_NULL)
>>> Dereferencing null pointer "wordData".
228 for (current = entry[current]-1; current > 
0 && wordData[current-1]; current--) ;
229 else  // Simplified/Traditionary conversion, 
forwards search for next word
230 current = entry[current] + word.getLength() 
+ 1;
231 sal_Int32 start=current;
232 if (offset.hasElements()) {
233 if (word.getLength() != 
OUString(&wordData[current]).getLength())



To view the defects in Coverity Scan visit, 
https://u15810271.ct.sendgrid.net/ls/click?upn=HRESupC-2F2Czv4BOaCWWCy7my0P0qcxCbhZ31OYv50ypSs1kiFPuCn2xFdlMIFBirii0zZ9j2-2F9F2XPBcBm2BNgi9duPy3v-2FzgFDd2LJ-2BDKI-3D5GMp_OTq2XUZbbipYjyLSo6GRo-2FpVxQ9OzkDINu9UTS-2FQhSdO0F0jQniitrGlNxDIzPJiGVeRp6G7YmBGTqa9yZi0l3CmubIs-2B6Dqe84bBdC02FnsTv2nj8mSRil18NHCakTJcv09Pm2GuGubj1jTqjAgcto-2BQcGOQfyhqR2w9S1ABDN5YuwwV2tVSjsyj-2Bv15mifNt7-2F2aVaCuQy-2BkltxCDfmySLjWQhKDEP2VaH652SXI-2FJsaXbPTscipE3Lp

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

[Xisco Fauli (via logerrit)]

 sw/qa/extras/uiwriter/data3/tdf135412.docx |binary
 sw/qa/extras/uiwriter/uiwriter3.cxx|   29 +
 2 files changed, 29 insertions(+)

New commits:
commit 0fc96ac585520884e3509d574d162ffdae7698c9
Author: Xisco Fauli 
AuthorDate: Mon Aug 31 16:57:13 2020 +0200
Commit: Xisco Fauli 
CommitDate: Tue Sep 1 13:16:09 2020 +0200

tdf#135412: sw_uiwriter: Add unittest

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

diff --git a/sw/qa/extras/uiwriter/data3/tdf135412.docx 
b/sw/qa/extras/uiwriter/data3/tdf135412.docx
new file mode 100644
index ..b420fa5ce2d1
Binary files /dev/null and b/sw/qa/extras/uiwriter/data3/tdf135412.docx differ
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx 
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index cd8c7ac359bc..b8972d19f7e2 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -64,6 +64,35 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf129382)
 CPPUNIT_ASSERT_EQUAL(8, getShapes());
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf135412)
+{
+load(DATA_DIRECTORY, "tdf135412.docx");
+
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+CPPUNIT_ASSERT_EQUAL(4, getShapes());
+uno::Reference xShape(getShape(1), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("X"), xShape->getString());
+dispatchCommand(mxComponent, ".uno:SelectAll", {});
+dispatchCommand(mxComponent, ".uno:Cut", {});
+CPPUNIT_ASSERT_EQUAL(0, getShapes());
+dispatchCommand(mxComponent, ".uno:Paste", {});
+CPPUNIT_ASSERT_EQUAL(4, getShapes());
+
+// Without the fix in place, the text in the shape wouldn't be pasted
+xShape.set(getShape(1), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("X"), xShape->getString());
+
+//Without the fix in place, it would have crashed here
+dispatchCommand(mxComponent, ".uno:Undo", {});
+CPPUNIT_ASSERT_EQUAL(0, getShapes());
+dispatchCommand(mxComponent, ".uno:Undo", {});
+CPPUNIT_ASSERT_EQUAL(4, getShapes());
+xShape.set(getShape(1), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("X"), xShape->getString());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132911)
 {
 load(DATA_DIRECTORY, "tdf132911.odt");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Pedro Pinto Silva (via logerrit)]

 loleaflet/css/notebookbar.css |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 424b914cec0b4279766b2f3054e8fa124d64bdf9
Author: Pedro Pinto Silva 
AuthorDate: Tue Sep 1 11:59:12 2020 +0200
Commit: Pedro Silva 
CommitDate: Tue Sep 1 12:48:13 2020 +0200

Notebookbar: shortcutsbar: hamburger menu + dialog

When a dialog is rendered the hamburger menu appears to have
a different color and thus, it stands out in the background.

Change-Id: I35766d083fc342f1d7bcbdca1ad9723057b70cd3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101833
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Pedro Silva 

diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index eef4ebe1a..233742b6c 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -103,10 +103,15 @@
background: var(rgb(--green0-txt-primary-color));
 }
 
+.hasnotebookbar .notebookbar-shortcuts-bar #Menubar,
+.hasnotebookbar .notebookbar-shortcuts-bar #Menubar li,
+.hasnotebookbar .notebookbar-shortcuts-bar #Menubar a {
+   background-color: transparent;
+}
+
 .hasnotebookbar .notebookbar-shortcuts-bar #Menubar > li > a {
-cursor: pointer;
-border: none;
-   background: var(--gray-bg-color);
+   cursor: pointer;
+   border: none;
height: 20px;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jean-Pierre Ledure (via logerrit)]

 wizards/source/access2base/acConstants.xba |2 +-
 wizards/source/access2base/access2base.py  |4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 2bb8636ea51e552a20a4253a6c5c97898129d523
Author: Jean-Pierre Ledure 
AuthorDate: Tue Sep 1 12:20:42 2020 +0200
Commit: Jean-Pierre Ledure 
CommitDate: Tue Sep 1 12:20:42 2020 +0200

Access2Base - Upgrade version number

Change-Id: I64b83fb50284fcd3455136158000114d992c3370

diff --git a/wizards/source/access2base/acConstants.xba 
b/wizards/source/access2base/acConstants.xba
index d0a24ef5da2c..85098c7f4b07 100644
--- a/wizards/source/access2base/acConstants.xba
+++ b/wizards/source/access2base/acConstants.xba
@@ -9,7 +9,7 @@ REM 

 Option Explicit
 
 REM Access2Base -
-Global Const Access2Base_Version = "7.0.0"   '  
Alignment on LibreOffice versions
+Global Const Access2Base_Version = "7.1.0"   '  
Alignment on LibreOffice versions
 
 REM AcCloseSave
 REM -
diff --git a/wizards/source/access2base/access2base.py 
b/wizards/source/access2base/access2base.py
index e84b95983820..77878e0053bc 100644
--- a/wizards/source/access2base/access2base.py
+++ b/wizards/source/access2base/access2base.py
@@ -36,6 +36,8 @@ Specific documentation about Access2Base and Python:
 
http://www.access2base.com/access2base.html#%5B%5BAccess2Base%20and%20Python%5D%5D
 """
 
+from __future__ import unicode_literals
+
 import uno
 XSCRIPTCONTEXT = uno
 
@@ -43,7 +45,7 @@ from platform import system as _opsys
 import datetime, os, sys, traceback
 
 _LIBRARY = ''   # Should be 'Access2Base' or 'Access2BaseDev'
-_VERSION = '6.4'# Actual version number
+_VERSION = '7.1'# Actual version number
 _WRAPPERMODULE = 'Python'   # Module name in the Access2Base library 
containing Python interfaces
 
 # CallByName types
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 desktop/source/lib/init.cxx
 |4 
 
reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStylesReadHandler.java
 |6 -
 sw/source/core/access/acctable.cxx 
 |   42 +-
 3 files changed, 26 insertions(+), 26 deletions(-)

New commits:
commit c26acd15a68fe89ef7d28f90783d1a88d3e70355
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 21:06:02 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 12:12:12 2020 +0200

Fix typo in code

It passed "make check" on Linux

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

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 7d66c0fcdfc6..f3ba0d498b98 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -1387,7 +1387,7 @@ void CallbackFlushHandler::callback(const int type, const 
char* payload, void* d
 
 void CallbackFlushHandler::queue(const int type, const char* data)
 {
-comphelper::ProfileZone aZone("CallbackFlushHander::queue");
+comphelper::ProfileZone aZone("CallbackFlushHandler::queue");
 
 CallbackData aCallbackData(type, (data ? data : "(nil)"));
 const std::string& payload = aCallbackData.PayloadString;
@@ -1945,7 +1945,7 @@ bool 
CallbackFlushHandler::processWindowEvent(CallbackData& aCallbackData)
 
 void CallbackFlushHandler::Invoke()
 {
-comphelper::ProfileZone aZone("CallbackFlushHander::Invoke");
+comphelper::ProfileZone aZone("CallbackFlushHandler::Invoke");
 
 if (!m_pCallback)
 return;
diff --git 
a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStylesReadHandler.java
 
b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStylesReadHandler.java
index 6bff691ae801..4afd86768bd4 100644
--- 
a/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStylesReadHandler.java
+++ 
b/reportbuilder/java/org/libreoffice/report/pentaho/parser/style/OfficeStylesReadHandler.java
@@ -87,9 +87,9 @@ public class OfficeStylesReadHandler extends 
ElementReadHandler
 return xrh;
 }
 
-final SectionReadHandler genericReadHander = new SectionReadHandler();
-otherStyleChildren.add(genericReadHander);
-return genericReadHander;
+final SectionReadHandler genericReadHandler = new SectionReadHandler();
+otherStyleChildren.add(genericReadHandler);
+return genericReadHandler;
 }
 
 /**
diff --git a/sw/source/core/access/acctable.cxx 
b/sw/source/core/access/acctable.cxx
index ccdf75eb8989..9e164c7c5696 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -61,13 +61,13 @@ const unsigned int SELECTION_WITH_NUM = 10;
 
 namespace {
 
-class SwAccTableSelHander_Impl
+class SwAccTableSelHandler_Impl
 {
 public:
 virtual void Unselect( sal_Int32 nRowOrCol, sal_Int32 nExt ) = 0;
 
 protected:
-~SwAccTableSelHander_Impl() {}
+~SwAccTableSelHandler_Impl() {}
 };
 
 }
@@ -89,7 +89,7 @@ class SwAccessibleTableData_Impl
 
 void GetSelection( const Point& rTabPos, const SwRect& rArea,
const SwSelBoxes& rSelBoxes, const SwFrame *pFrame,
-   SwAccTableSelHander_Impl& rSelHdl,
+   SwAccTableSelHandler_Impl& rSelHdl,
bool bColumns ) const;
 
 // #i77106#
@@ -121,7 +121,7 @@ public:
 
 void GetSelection( sal_Int32 nStart, sal_Int32 nEnd,
const SwSelBoxes& rSelBoxes,
-  SwAccTableSelHander_Impl& rSelHdl,
+  SwAccTableSelHandler_Impl& rSelHdl,
bool bColumns ) const;
 
 /// @throws lang::IndexOutOfBoundsException
@@ -220,7 +220,7 @@ void SwAccessibleTableData_Impl::GetSelection(
 const SwRect& rArea,
 const SwSelBoxes& rSelBoxes,
 const SwFrame *pFrame,
-SwAccTableSelHander_Impl& rSelHdl,
+SwAccTableSelHandler_Impl& rSelHdl,
 bool bColumns ) const
 {
 const SwAccessibleChildSList aList( *pFrame, mrAccMap );
@@ -296,7 +296,7 @@ const SwFrame *SwAccessibleTableData_Impl::GetCell(
 void SwAccessibleTableData_Impl::GetSelection(
sal_Int32 nStart, sal_Int32 nEnd,
const SwSelBoxes& rSelBoxes,
-  SwAccTableSelHander_Impl& rSelHdl,
+  SwAccTableSelHandler_Impl& rSelHdl,
bool bColumns ) const
 {
 SwRect aArea( mpTabFrame->getFrameArea() );
@@ -410,15 +410,15 @@ void SwAccessibleTableData_Impl::CheckRowAndCol(
 
 namespace {
 
-class SwAccSingleTableSelHander_Impl : public SwAccTableSelHander_Impl
+class SwAccSingleTableSelHandler_Impl : public SwAccTableSelHand

[Libreoffice-commits] core.git: chart2/source oovbaapi/ooo

[Andrea Gelmini (via logerrit)]

 chart2/source/view/charttypes/VSeriesPlotter.cxx |   20 ++--
 chart2/source/view/inc/VSeriesPlotter.hxx|8 
 oovbaapi/ooo/vba/access/AcCommand.idl|2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 7c0009fa74842fbc1365eda5c55f96ab827dd10a
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 17:03:45 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 12:11:02 2020 +0200

Fix typo in code

It passed "make check" on Linux

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

diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx 
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 232e86369f1d..04bd30f3bdcc 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -1675,13 +1675,13 @@ long VSeriesPlotter::calculateTimeResolutionOnXAxis()
 double VSeriesPlotter::getMinimumX()
 {
 double fMinimum, fMaximum;
-getMinimumAndMaximiumX( fMinimum, fMaximum );
+getMinimumAndMaximumX( fMinimum, fMaximum );
 return fMinimum;
 }
 double VSeriesPlotter::getMaximumX()
 {
 double fMinimum, fMaximum;
-getMinimumAndMaximiumX( fMinimum, fMaximum );
+getMinimumAndMaximumX( fMinimum, fMaximum );
 return fMaximum;
 }
 
@@ -1690,7 +1690,7 @@ double VSeriesPlotter::getMinimumYInRange( double 
fMinimumX, double fMaximumX, s
 if( !m_bCategoryXAxis || ( m_pExplicitCategoriesProvider && 
m_pExplicitCategoriesProvider->isDateAxis() ) )
 {
 double fMinY, fMaxY;
-getMinimumAndMaximiumYInContinuousXRange( fMinY, fMaxY, fMinimumX, 
fMaximumX, nAxisIndex );
+getMinimumAndMaximumYInContinuousXRange( fMinY, fMaxY, fMinimumX, 
fMaximumX, nAxisIndex );
 return fMinY;
 }
 
@@ -1723,7 +1723,7 @@ double VSeriesPlotter::getMaximumYInRange( double 
fMinimumX, double fMaximumX, s
 if( !m_bCategoryXAxis || ( m_pExplicitCategoriesProvider && 
m_pExplicitCategoriesProvider->isDateAxis() ) )
 {
 double fMinY, fMaxY;
-getMinimumAndMaximiumYInContinuousXRange( fMinY, fMaxY, fMinimumX, 
fMaximumX, nAxisIndex );
+getMinimumAndMaximumYInContinuousXRange( fMinY, fMaxY, fMinimumX, 
fMaximumX, nAxisIndex );
 return fMaxY;
 }
 
@@ -1803,7 +1803,7 @@ bool VSeriesPlotter::isSeparateStackingForDifferentSigns( 
sal_Int32 nDimensionIn
 return nDimensionIndex == 1;
 }
 
-void VSeriesPlotter::getMinimumAndMaximiumX( double& rfMinimum, double& 
rfMaximum ) const
+void VSeriesPlotter::getMinimumAndMaximumX( double& rfMinimum, double& 
rfMaximum ) const
 {
 ::rtl::math::setInf(&rfMinimum, false);
 ::rtl::math::setInf(&rfMaximum, true);
@@ -1813,7 +1813,7 @@ void VSeriesPlotter::getMinimumAndMaximiumX( double& 
rfMinimum, double& rfMaximu
 for (auto const& XSlot : ZSlot)
 {
 double fLocalMinimum, fLocalMaximum;
-XSlot.getMinimumAndMaximiumX( fLocalMinimum, fLocalMaximum );
+XSlot.getMinimumAndMaximumX( fLocalMinimum, fLocalMaximum );
 if( !std::isnan(fLocalMinimum) && fLocalMinimum< rfMinimum )
 rfMinimum = fLocalMinimum;
 if( !std::isnan(fLocalMaximum) && fLocalMaximum> rfMaximum )
@@ -1826,7 +1826,7 @@ void VSeriesPlotter::getMinimumAndMaximiumX( double& 
rfMinimum, double& rfMaximu
 ::rtl::math::setNan(&rfMaximum);
 }
 
-void VSeriesPlotter::getMinimumAndMaximiumYInContinuousXRange( double& rfMinY, 
double& rfMaxY, double fMinX, double fMaxX, sal_Int32 nAxisIndex ) const
+void VSeriesPlotter::getMinimumAndMaximumYInContinuousXRange( double& rfMinY, 
double& rfMaxY, double fMinX, double fMaxX, sal_Int32 nAxisIndex ) const
 {
 ::rtl::math::setInf(&rfMinY, false);
 ::rtl::math::setInf(&rfMaxY, true);
@@ -1836,7 +1836,7 @@ void 
VSeriesPlotter::getMinimumAndMaximiumYInContinuousXRange( double& rfMinY, d
 for (auto const& XSlot : ZSlot)
 {
 double fLocalMinimum, fLocalMaximum;
-XSlot.getMinimumAndMaximiumYInContinuousXRange( fLocalMinimum, 
fLocalMaximum, fMinX, fMaxX, nAxisIndex );
+XSlot.getMinimumAndMaximumYInContinuousXRange( fLocalMinimum, 
fLocalMaximum, fMinX, fMaxX, nAxisIndex );
 if( !std::isnan(fLocalMinimum) && fLocalMinimum< rfMinY )
 rfMinY = fLocalMinimum;
 if( !std::isnan(fLocalMaximum) && fLocalMaximum> rfMaxY )
@@ -1911,7 +1911,7 @@ sal_Int32 
VDataSeriesGroup::getAttachedAxisIndexForFirstSeries() const
 return nRet;
 }
 
-void VDataSeriesGroup::getMinimumAndMaximiumX( double& rfMinimum, double& 
rfMaximum ) const
+void VDataSeriesGroup::getMinimumAndMaximumX( double& rfMinimum, double& 
rfMaximum ) const
 {
 
 ::rtl::math::setInf(&rfMinimum, false);
@@ -2070,7 +2070,7 @@ private:
 
 }
 
-void VDataSeriesGroup::getMinimumAndMaximiumYI

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

[Jean-Pierre Ledure (via logerrit)]

 wizards/source/access2base/Database.xba |9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 54f0ae24173a69d145e2ffc3aaa2f6bd29e39611
Author: Jean-Pierre Ledure 
AuthorDate: Tue Sep 1 12:06:28 2020 +0200
Commit: Jean-Pierre Ledure 
CommitDate: Tue Sep 1 12:06:28 2020 +0200

Access2Base - Remove workaround on Firebird product name

Bug 118809 has been fixed. Workaround may be removed
without regression

Change-Id: I8716fa75a6d98b7e15752692e5275dbcb81e7efb

diff --git a/wizards/source/access2base/Database.xba 
b/wizards/source/access2base/Database.xba
index 7b35585bfee7..c654d1d0a7e9 100644
--- a/wizards/source/access2base/Database.xba
+++ b/wizards/source/access2base/Database.xba
@@ -992,7 +992,7 @@ Dim i As Integer, bFound As Boolean, oTables As Object
Set oObject = RecordsetsColl.Item(pvIndex)
Case Else   '  pvIndex is numeric
If pvIndex < 0 Or pvIndex >= RecordsetsColl.Count 
Then Goto Trace_IndexError
-   Set oObject = RecordsetsColl.Item(pvIndex + 1)  
'  Collection members are numbered 1 ... Count
+   Set oObject = RecordsetsColl.Item(pvIndex + 1)  
'  Collection members are numERRSQLSTATEMENTbered 1 ... Count
End Select
 
 Exit_Function:
@@ -1161,12 +1161,7 @@ Dim sProductName As String
If pvOrderClause <> "" Then sOrderBy = " ORDER BY 
" & pvOrderClause Else sOrderBy = ""
sLimit = ""
 
-' Workaround for 
https://bugs.documentfoundation.org/show_bug.cgi?id=118767
-' awaiting solution for 
https://bugs.documentfoundation.org/show_bug.cgi?id=118809
sProductName = UCase(MetaData.getDatabaseProductName())
-   If sProductName = "" Then
-   If MetaData.URL = "sdbc:embedded:firebird" Or 
Left(MetaData.URL, 13) = "sdbc:firebird" Then sProductName = 
"FIREBIRD"
-   End If
 
Select Case sProductName
Case "MYSQL", "SQLITE"
@@ -1177,7 +1172,7 @@ Dim sProductName As String
sTarget = UCase(psFunction) & "(" 
& psExpr & ")"
End If
sSql = "SELECT " & sTarget & " 
AS " & sTempField & " FROM " & psDomain &  
sWhere & sOrderBy & sLimit
-   Case "FIREBIRD"
+   Case "FIREBIRD (ENGINE12)"
If psFunction = "" Then sTarget = "FIRST 
1 " & psExpr Else sTarget = UCase(psFunction) & "(" 
& psExpr & ")"
sSql = "SELECT " & sTarget & " 
AS " & sTempField & " FROM " & psDomain & sWhere 
& sOrderBy
Case Else   '  Standard syntax - Includes 
HSQLDB
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 svtools/source/dialogs/addresstemplate.cxx |   46 ++---
 1 file changed, 23 insertions(+), 23 deletions(-)

New commits:
commit 3bec693493043ab9491793fb994358b188f55771
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 21:04:27 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 12:09:02 2020 +0200

Fix typo in code

It passed "make check" on Linux

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

diff --git a/svtools/source/dialogs/addresstemplate.cxx 
b/svtools/source/dialogs/addresstemplate.cxx
index 3a1d079b785c..9b3c4e606c4e 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -85,12 +85,12 @@ namespace svt
 return selectedDataSource;
 }
 
-// = IAssigmentData
+// = IAssignmentData
 
-class IAssigmentData
+class IAssignmentData
 {
 public:
-virtual ~IAssigmentData();
+virtual ~IAssignmentData();
 
 /// the data source to use for the address book
 virtual OUString getDatasourceName() const = 0;
@@ -112,16 +112,16 @@ namespace svt
 
 }
 
-IAssigmentData::~IAssigmentData()
+IAssignmentData::~IAssignmentData()
 {
 }
 
 
-// = AssigmentTransientData
+// = AssignmentTransientData
 
 namespace {
 
-class AssigmentTransientData : public IAssigmentData
+class AssignmentTransientData : public IAssignmentData
 {
 protected:
 OUString m_sDSName;
@@ -129,13 +129,13 @@ namespace svt
 MapString2String m_aAliases;
 
 public:
-AssigmentTransientData(
+AssignmentTransientData(
 const OUString& _rDataSourceName,
 const OUString& _rTableName,
 const Sequence< AliasProgrammaticPair >& _rFields
 );
 
-// IAssigmentData overridables
+// IAssignmentData overridables
 virtual OUString getDatasourceName() const override;
 virtual OUString getCommand() const override;
 
@@ -149,7 +149,7 @@ namespace svt
 
 }
 
-AssigmentTransientData::AssigmentTransientData(
+AssignmentTransientData::AssignmentTransientData(
 const OUString& _rDataSourceName, const OUString& _rTableName,
 const Sequence< AliasProgrammaticPair >& _rFields )
 :m_sDSName( _rDataSourceName )
@@ -177,26 +177,26 @@ namespace svt
 }
 else
 {
-SAL_WARN( "svtools", 
"AssigmentTransientData::AssigmentTransientData: unknown programmatic name: "
+SAL_WARN( "svtools", 
"AssignmentTransientData::AssignmentTransientData: unknown programmatic name: "
   << rField.ProgrammaticName );
 }
 }
 }
 
 
-OUString AssigmentTransientData::getDatasourceName() const
+OUString AssignmentTransientData::getDatasourceName() const
 {
 return m_sDSName;
 }
 
 
-OUString AssigmentTransientData::getCommand() const
+OUString AssignmentTransientData::getCommand() const
 {
 return m_sTableName;
 }
 
 
-bool AssigmentTransientData::hasFieldAssignment(const OUString& 
_rLogicalName)
+bool AssignmentTransientData::hasFieldAssignment(const OUString& 
_rLogicalName)
 {
 MapString2String::const_iterator aPos = m_aAliases.find( _rLogicalName 
);
 return  ( m_aAliases.end() != aPos )
@@ -204,7 +204,7 @@ namespace svt
 }
 
 
-OUString AssigmentTransientData::getFieldAssignment(const OUString& 
_rLogicalName)
+OUString AssignmentTransientData::getFieldAssignment(const OUString& 
_rLogicalName)
 {
 OUString sReturn;
 MapString2String::const_iterator aPos = m_aAliases.find( _rLogicalName 
);
@@ -215,21 +215,21 @@ namespace svt
 }
 
 
-void AssigmentTransientData::setFieldAssignment(const OUString& 
_rLogicalName, const OUString& _rAssignment)
+void AssignmentTransientData::setFieldAssignment(const OUString& 
_rLogicalName, const OUString& _rAssignment)
 {
 m_aAliases[ _rLogicalName ] = _rAssignment;
 }
 
 
-void AssigmentTransientData::setDatasourceName(const OUString&)
+void AssignmentTransientData::setDatasourceName(const OUString&)
 {
-OSL_FAIL( "AssigmentTransientData::setDatasourceName: cannot be 
implemented for transient data!" );
+OSL_FAIL( "AssignmentTransientData::setDatasourceName: cannot be 
implemented for transient data!" );
 }
 
 
-void AssigmentTransientData::setCommand(const OUString&)
+void AssignmentTransientData::setCommand(const OUString&)
 {
-OSL_FAIL( "AssigmentTransientData::setCommand: cannot be implemented 
for transient data!" );
+OSL_FAIL( "AssignmentTransientData::setCommand: cannot be implemented 
for transient data!" );
 }
 
 
@@ -239,7 +239,7 @@ namespa

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

[Szymon Kłos (via logerrit)]

 loleaflet/css/loleaflet.css|4 ++--
 loleaflet/src/control/Control.LokDialog.js |   14 ++
 loleaflet/src/control/Toolbar.js   |   10 +++---
 3 files changed, 19 insertions(+), 9 deletions(-)

New commits:
commit 19363ce72702977817527582c2de040684ee6aa0
Author: Szymon Kłos 
AuthorDate: Wed Aug 12 15:49:43 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Sep 1 11:55:08 2020 +0200

Make dialogs modal, block sidebar actions when opened

This change prevents user from creating multiple instances
of dialogs eg. by using sidebar. Dialogs are modal now.
Child dialogs still can be created from existing dialog and used.

Change-Id: I388006d8857d0196d2884598e150f7bf5948ed47
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100598
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101821
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index 0d594414d..c1abe867f 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -144,6 +144,14 @@ L.Control.LokDialog = L.Control.extend({
return Object.keys(this._dialogs).length > nonDialogEntries;
},
 
+   // method used to warn user about dialog modality
+   blinkOpenDialog: function() {
+   $('.lokdialog_container').addClass('lokblink');
+   setTimeout(function () {
+   $('.lokdialog_container').removeClass('lokblink');
+   }, 600);
+   },
+
_docLoaded: function(e) {
if (!e.status) {
$('.lokdialog_container').remove();
@@ -1164,6 +1172,12 @@ L.Control.LokDialog = L.Control.extend({
 
L.DomEvent.on(canvas, 'mousedown mouseup', function(e) {
L.DomEvent.stop(e);
+
+   if ((this._isSidebar(id) || this.isCalcInputBar(id)) && 
this.hasOpenedDialog()) {
+   this.blinkOpenDialog();
+   return;
+   }
+
if (this._isSelectionHandleDragged() && e.type === 
'mouseup') {
this._onSelectionHandleDrag(e);
return;
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index c62704634..0f476d57f 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -178,13 +178,9 @@ L.Map.include({
}
}
 
-   var hasOpenedDialog = this.dialog.hasOpenedDialog();
-   if (hasOpenedDialog) {
-   $('.lokdialog_container').addClass('lokblink');
-   setTimeout(function () {
-   
$('.lokdialog_container').removeClass('lokblink');
-   }, 600);
-   } else if (this.isPermissionEdit() || isAllowedInReadOnly) {
+   if (this.dialog.hasOpenedDialog())
+   this.dialog.blinkOpenDialog();
+   else if (this.isPermissionEdit() || isAllowedInReadOnly) {
if (!this.messageNeedsToBeRedirected(command))
this._socket.sendMessage('uno ' + command + 
(json ? ' ' + JSON.stringify(json) : ''));
}
commit ab53fcbca16efb5764f23356c611280119b17573
Author: Szymon Kłos 
AuthorDate: Mon Aug 31 14:35:26 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Sep 1 11:55:04 2020 +0200

Fix blinking cursor

Change-Id: I723dcfc06e07d3d5a83e64eee812d3084dc8378c
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101728
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101822
Tested-by: Jenkins

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 887ba4f18..a85f43a6b 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -578,10 +578,10 @@ body {
 }
 
 .lokblink {
-animation: blink 150ms infinite alternate;
+animation: lokblink 150ms infinite alternate;
 }
 
-@keyframes blink {
+@keyframes lokblink {
 from { opacity:1; }
 to { opacity:0; }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos (via logerrit)]

 loleaflet/css/loleaflet.css|9 +
 loleaflet/src/control/Control.LokDialog.js |   10 ++
 loleaflet/src/control/Toolbar.js   |8 +++-
 loleaflet/src/layer/tile/CalcTileLayer.js  |3 +++
 4 files changed, 29 insertions(+), 1 deletion(-)

New commits:
commit d4bec9e6e151a0b6812f2505fb3f287491e60527
Author: Szymon Kłos 
AuthorDate: Wed Aug 12 10:16:54 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Sep 1 11:54:40 2020 +0200

Show avatar for newly inserted comments in calc

Change-Id: If602901982e8084856ca5361ab256a93e1045e45
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100581
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101819
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/src/layer/tile/CalcTileLayer.js 
b/loleaflet/src/layer/tile/CalcTileLayer.js
index 534c307ab..a178a59da 100644
--- a/loleaflet/src/layer/tile/CalcTileLayer.js
+++ b/loleaflet/src/layer/tile/CalcTileLayer.js
@@ -327,6 +327,9 @@ L.CalcTileLayer = (L.Browser.mobile ? L.TileLayer : 
L.CanvasTileLayer).extend({
var obj = 
JSON.parse(textMsg.substring('comment:'.length + 1));
obj.comment.tab = parseInt(obj.comment.tab);
if (obj.comment.action === 'Add') {
+   if (obj.comment.author in 
this._map._viewInfoByUserName) {
+   obj.comment.avatar = 
this._map._viewInfoByUserName[obj.comment.author].userextrainfo.avatar;
+   }
var cellPos = 
L.LOUtil.stringToBounds(obj.comment.cellPos);
obj.comment.cellPos = 
this._convertToTileTwipsSheetArea(cellPos);
obj.comment.cellPos = 
L.latLngBounds(this._twipsToLatLng(obj.comment.cellPos.getBottomLeft()),
commit bb015fe41e662f7613338cc8bed0d5394c4783a3
Author: Szymon Kłos 
AuthorDate: Tue Aug 11 07:56:26 2020 +0200
Commit: Szymon Kłos 
CommitDate: Tue Sep 1 11:54:25 2020 +0200

Don't allow to open multiple dialogs

and blink active dialog to inform user that he needs
to close dialog first...

Change-Id: I6c9ee662ae2ab935f03ee8fdd0cf7327703e2170
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100457
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101820
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 28161c6c4..887ba4f18 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -577,6 +577,15 @@ body {
-o-user-select: none;
 }
 
+.lokblink {
+animation: blink 150ms infinite alternate;
+}
+
+@keyframes blink {
+from { opacity:1; }
+to { opacity:0; }
+}
+
 .form-field-frame {
border: 1px solid;
position: absolute;
diff --git a/loleaflet/src/control/Control.LokDialog.js 
b/loleaflet/src/control/Control.LokDialog.js
index 337acfa5d..0d594414d 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -134,6 +134,16 @@ L.Control.LokDialog = L.Control.extend({
_currentDeck: null, // The sidebar.
_calcInputBar: null, // The Formula-Bar.
 
+   hasOpenedDialog: function() {
+   var nonDialogEntries = 0;
+   for (var index in this._dialogs) {
+   if (this._dialogs[index].isSidebar || 
this._dialogs[index].isCalcInputBar)
+   nonDialogEntries++;
+   }
+
+   return Object.keys(this._dialogs).length > nonDialogEntries;
+   },
+
_docLoaded: function(e) {
if (!e.status) {
$('.lokdialog_container').remove();
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 2af30b3ed..c62704634 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -178,7 +178,13 @@ L.Map.include({
}
}
 
-   if (this.isPermissionEdit() || isAllowedInReadOnly) {
+   var hasOpenedDialog = this.dialog.hasOpenedDialog();
+   if (hasOpenedDialog) {
+   $('.lokdialog_container').addClass('lokblink');
+   setTimeout(function () {
+   
$('.lokdialog_container').removeClass('lokblink');
+   }, 600);
+   } else if (this.isPermissionEdit() || isAllowedInReadOnly) {
if (!this.messageNeedsToBeRedirected(command))
this._socket.sendMessage('uno ' + command + 
(json ? ' ' + JSON.stringify(json) : ''));
}
__

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

[Andrea Gelmini (via logerrit)]

 dbaccess/source/ui/inc/QueryDesignView.hxx|2 +-
 dbaccess/source/ui/inc/QueryViewSwitch.hxx|2 +-
 dbaccess/source/ui/inc/querycontainerwindow.hxx   |2 +-
 dbaccess/source/ui/querydesign/QueryDesignView.cxx|6 +++---
 dbaccess/source/ui/querydesign/QueryViewSwitch.cxx|4 ++--
 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |2 +-
 dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx |2 +-
 dbaccess/source/ui/querydesign/querycontroller.cxx|2 +-
 reportdesign/source/ui/report/ReportController.cxx|6 +++---
 9 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 578dc3477011e4bdcaf703533c1def9d55000de4
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 16:58:58 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 10:34:18 2020 +0200

Fix typo in code

It passed "make check" on Linux

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

diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx 
b/dbaccess/source/ui/inc/QueryDesignView.hxx
index 4f057178669c..abdaed8912f4 100644
--- a/dbaccess/source/ui/inc/QueryDesignView.hxx
+++ b/dbaccess/source/ui/inc/QueryDesignView.hxx
@@ -100,7 +100,7 @@ namespace dbaui
 
 bool isSlotEnabled(sal_Int32 _nSlotId);
 void setSlotEnabled(sal_Int32 _nSlotId, bool _bEnable);
-void setNoneVisbleRow(sal_Int32 _nRows);
+void setNoneVisibleRow(sal_Int32 _nRows);
 
 const css::lang::Locale&  getLocale() const   { return 
m_aLocale;}
 const OUString&   getDecimalSeparator() const { return 
m_sDecimalSep;}
diff --git a/dbaccess/source/ui/inc/QueryViewSwitch.hxx 
b/dbaccess/source/ui/inc/QueryViewSwitch.hxx
index 879c29b01d42..70ff371a8a64 100644
--- a/dbaccess/source/ui/inc/QueryViewSwitch.hxx
+++ b/dbaccess/source/ui/inc/QueryViewSwitch.hxx
@@ -72,7 +72,7 @@ namespace dbaui
 void forceInitialView();
 bool isSlotEnabled(sal_Int32 _nSlotId);
 void setSlotEnabled(sal_Int32 _nSlotId, bool _bEnable);
-void setNoneVisbleRow(sal_Int32 _nRows);
+void setNoneVisibleRow(sal_Int32 _nRows);
 void SaveUIConfig();
 void reset();
 void GrabFocus();
diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx 
b/dbaccess/source/ui/inc/querycontainerwindow.hxx
index 607a38c82920..cb44f025bba2 100644
--- a/dbaccess/source/ui/inc/querycontainerwindow.hxx
+++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx
@@ -76,7 +76,7 @@ namespace dbaui
 void clear(){ 
m_pViewSwitch->clear(); }
 bool isSlotEnabled( sal_Int32 _nSlotId ){ 
return m_pViewSwitch->isSlotEnabled( _nSlotId ); }
 void setSlotEnabled( sal_Int32 _nSlotId, bool _bEnable ){ 
m_pViewSwitch->setSlotEnabled( _nSlotId, _bEnable ); }
-void setNoneVisbleRow(sal_Int32 _nRows) { 
m_pViewSwitch->setNoneVisbleRow( _nRows); }
+void setNoneVisibleRow(sal_Int32 _nRows) { 
m_pViewSwitch->setNoneVisibleRow( _nRows); }
 
 bool checkStatement()   { 
return m_pViewSwitch->checkStatement( ); }
 OUString getStatement()  { return 
m_pViewSwitch->getStatement( ); }
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx 
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index f605e8fb58d4..487d6bce42ce 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2427,7 +2427,7 @@ OQueryDesignView::OQueryDesignView( 
OQueryContainerWindow* _pParent,
 
 m_pSelectionBox = VclPtr::Create(this);
 
-
setNoneVisbleRow(static_cast(getController()).getVisibleRows());
+
setNoneVisibleRow(static_cast(getController()).getVisibleRows());
 m_pSelectionBox->Show();
 // setup Splitter
 m_aSplitter->SetSplitHdl(LINK(this, OQueryDesignView,SplitHdl));
@@ -3009,9 +3009,9 @@ void OQueryDesignView::reset()
 m_pTableView->ReSync();
 }
 
-void OQueryDesignView::setNoneVisbleRow(sal_Int32 _nRows)
+void OQueryDesignView::setNoneVisibleRow(sal_Int32 _nRows)
 {
-m_pSelectionBox->SetNoneVisbleRow(_nRows);
+m_pSelectionBox->SetNoneVisibleRow(_nRows);
 }
 
 void OQueryDesignView::initByFieldDescriptions( const Sequence< PropertyValue 
>& i_rFieldDescriptions )
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx 
b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index 626a1f346e44..fec372e29038 100644
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@@ -284,10 +284,10 @@ void OQueryViewSwitch::reset()
 switchView( nullptr );
 }

[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/css

[Pedro Pinto Silva (via logerrit)]

 loleaflet/css/toolbar.css |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 4fe32b6d640d7ff0f7cb9e198c13eb8a741f7dc3
Author: Pedro Pinto Silva 
AuthorDate: Tue Jul 14 11:47:17 2020 +0200
Commit: Pedro Silva 
CommitDate: Tue Sep 1 10:21:32 2020 +0200

Desktop: Document name input and pencil: remove unused styles

and make sure that no default browser properties gets in the way

Change-Id: I2f536c47f4e7db73e4cf77bec03d42b8ad73bd07
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98715
Tested-by: Jenkins
Reviewed-by: Pedro Silva 
(cherry picked from commit c1730cf7c1d3f84141f33e7ee516ab7a8cad05f6)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101685
Tested-by: Jenkins CollaboraOffice 
Tested-by: Pedro Silva 

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index aed7e7e2b..d1f9c3637 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -156,6 +156,10 @@ w2ui-toolbar {
position: absolute;
right: 10px;
background: url('images/baseline-edit.svg') right center no-repeat, 
radial-gradient(circle, #fff 20%, #fff0 100%);
+   top: 5px;
+   padding: 1px 0px;
+   margin: 0px;
+   border: none;
 }
 
 #document-title-pencil:not(.editable){
@@ -171,10 +175,14 @@ w2ui-toolbar {
 #document-name-input.editable {
border: none;
box-shadow: 0 0 0.1px 1px #ebebeb, 0 0 2px 1px #f0f0f0;
-   background-position: right;
-   background-repeat: no-repeat;
padding-right: 24px;
max-width: 100%;
+<<< HEAD   (dcbaeb loleaflet: Slides preview section improvements.)
+===
+   overflow: hidden;
+   text-overflow:ellipsis;
+   height: 18px;
+>>> CHANGE (c1730c Desktop: Document name input and pencil: remove unused 
style)
 }
 
 #document-name-input.editable:focus {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: javaunohelper/test lotuswordpro/inc lotuswordpro/source ridljar/com sd/source winaccessibility/inc

[Andrea Gelmini (via logerrit)]

 javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java |
4 ++--
 lotuswordpro/inc/lwpfoundry.hxx   |
2 +-
 lotuswordpro/source/filter/lwpcharacterstyle.cxx  |
2 +-
 lotuswordpro/source/filter/lwpfrib.cxx|
6 +++---
 lotuswordpro/source/filter/lwpparastyle.cxx   |
2 +-
 lotuswordpro/source/filter/lwpsilverbullet.cxx|
2 +-
 ridljar/com/sun/star/comp/loader/JavaLoader.java  |
2 +-
 sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx   |
2 +-
 winaccessibility/inc/AccObjectManagerAgent.hxx|
2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 262ab496955582341e1f383c6eff9a0bb37dd9d7
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 16:22:12 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 10:02:05 2020 +0200

Fix typo in code

It passed "make check" on Linux

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

diff --git 
a/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java 
b/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
index b9c67e68be74..03daa113aaad 100644
--- a/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
+++ b/javaunohelper/test/com/sun/star/comp/helper/SharedLibraryLoader_Test.java
@@ -85,12 +85,12 @@ public class SharedLibraryLoader_Test {
 if ( sharedLibraryLoader == null && ! 
test_instantiateSharedLibraryLoader() )
 return false;
 
-System.err.println("- get the native ServiceManger factory");
+System.err.println("- get the native ServiceManager factory");
 XSingleServiceFactory aSMgrFac =
 UnoRuntime.queryInterface( XSingleServiceFactory.class,
 
sharedLibraryLoader.activate(NATIVE_SERVICE_MANAGER_IMP_NAME, null, 
NATIVE_SERVICE_MANAGER_LIB_NAME, null));
 
-System.err.println("- instantiate the native ServiceManger");
+System.err.println("- instantiate the native ServiceManager");
 nativeServiceManager = UnoRuntime.queryInterface( 
XMultiServiceFactory.class, aSMgrFac.createInstance() );
 
 System.out.print("Test - ");
diff --git a/lotuswordpro/inc/lwpfoundry.hxx b/lotuswordpro/inc/lwpfoundry.hxx
index 36919dd9da4e..fc9989107639 100644
--- a/lotuswordpro/inc/lwpfoundry.hxx
+++ b/lotuswordpro/inc/lwpfoundry.hxx
@@ -248,7 +248,7 @@ private:
 public:
 LwpContentManager& GetContentManager() { return m_ContentMgr; }
 LwpObjectID& GetGraphicListHead() { return 
m_ContentMgr.GetGraphicListHead(); }
-LwpFontManager& GetFontManger() { return m_FontMgr;}
+LwpFontManager& GetFontManager() { return m_FontMgr;}
 LwpObjectID& GetTextStyleHead()  { return m_TextStyle;}
 LwpObjectID& GetLayout() {return m_Layout;}
 LwpObjectID& GetBulletManagerID() { return m_BulMgr.GetHeadID();}
diff --git a/lotuswordpro/source/filter/lwpcharacterstyle.cxx 
b/lotuswordpro/source/filter/lwpcharacterstyle.cxx
index 07034de5381b..eb94bb0c1840 100644
--- a/lotuswordpro/source/filter/lwpcharacterstyle.cxx
+++ b/lotuswordpro/source/filter/lwpcharacterstyle.cxx
@@ -151,7 +151,7 @@ void LwpTextStyle::RegisterStyle()
 pStyle->SetStyleName(styleName);
 
 //Create font
-LwpFontManager& rFontMgr = m_pFoundry->GetFontManger();
+LwpFontManager& rFontMgr = m_pFoundry->GetFontManager();
 rtl::Reference pFont = rFontMgr.CreateFont(m_nFinalFontID);
 pStyle->SetFont(pFont);
 
diff --git a/lotuswordpro/source/filter/lwpfrib.cxx 
b/lotuswordpro/source/filter/lwpfrib.cxx
index bc9450fd17bc..95875aaedaa1 100644
--- a/lotuswordpro/source/filter/lwpfrib.cxx
+++ b/lotuswordpro/source/filter/lwpfrib.cxx
@@ -259,7 +259,7 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry)
 *pNewStyle = *pNamedStyle;
 
 pNewStyle->SetStyleName("");
-pFont = 
pFoundry->GetFontManger().CreateOverrideFont(pCharStyle->GetFinalFontID(),m_pModifiers->FontID);
+pFont = 
pFoundry->GetFontManager().CreateOverrideFont(pCharStyle->GetFinalFontID(),m_pModifiers->FontID);
 pNewStyle->SetFont(pFont);
 IXFStyleRet aNewStyle = 
pXFStyleManager->AddStyle(std::move(pNewStyle));
 m_StyleName = aNewStyle.m_pStyle->GetStyleName();
@@ -275,7 +275,7 @@ void LwpFrib::RegisterStyle(LwpFoundry* pFoundry)
 if (m_pModifiers->FontID && pFoundry)
 {
 std::unique_ptr pNewStyle(new XFTextStyle());
-pFont = pFoundry->GetFontManger().CreateFont(m_pModifiers->FontID);
+pFont = 
pFoundry->GetFontManager().CreateFont(m_pModifiers->FontID);
 pNewStyle->SetFont(pFont);
   

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

[Michael Stahl (via logerrit)]

 sw/source/core/draw/dcontact.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit ab7e70f986938a195ef22a836f451124628d47d9
Author: Michael Stahl 
AuthorDate: Mon Aug 31 15:24:48 2020 +0200
Commit: Caolán McNamara 
CommitDate: Tue Sep 1 09:54:10 2020 +0200

tdf#135661 sw: fix Undo of text deletion of SdrObject

This creates a non-working SwXShape without m_pFormat initialised:

0  
SwXShape::SwXShape(com::sun::star::uno::Reference&,
 SwDoc const*) (this=0x278de80, xShape=uno::Reference to (SvxCustomShape *) 
0x73ec840, pDoc=0x0) at sw/source/core/unocore/unodraw.cxx:889
1  SwFmDrawPage::CreateShape(SdrObject*) const (this=0x637a980, 
pObj=0x6409410) at sw/source/core/unocore/unodraw.cxx:372
2  SdrObject::getUnoShape() (this=0x6409410) at 
svx/source/svdraw/svdobj.cxx:2836
3  GetXShapeForSdrObject(SdrObject*) (pObj=0x6409410) at 
svx/source/unodraw/unoshape.cxx:3928
4  SdrObjCustomShape::GetCustomShapeEngine() const (this=0x6409410) at 
svx/source/svdraw/svdoashp.cxx:381
5  SdrObjCustomShape::GetTextBounds(tools::Rectangle&) const 
(this=0x6409410, rTextBound=...) at svx/source/svdraw/svdoashp.cxx:534
6  SdrObjCustomShape::AdaptTextMinSize() (this=0x6409410) at 
svx/source/svdraw/svdoashp.cxx:1397
7  SdrObjCustomShape::NbcSetSnapRect(tools::Rectangle const&) 
(this=0x6409410, rRect=...) at svx/source/svdraw/svdoashp.cxx:1421
8  SdrObjCustomShape::handlePageChange(SdrPage*, SdrPage*) (this=0x6409410, 
pOldPage=0x0, pNewPage=0x627fc80) at svx/source/svdraw/svdoashp.cxx:2855
9  SdrObject::setParentOfSdrObject(SdrObjList*) (this=0x6409410, 
pNewObjList=0x627fc80) at svx/source/svdraw/svdobj.cxx:294
10 SetParentAtSdrObjectFromSdrObjList(SdrObject&, SdrObjList*) 
(rSdrObject=..., pNew=0x627fc80) at svx/source/svdraw/svdpage.cxx:65
11 SdrObjList::NbcInsertObject(SdrObject*, unsigned long) (this=0x627fc80, 
pObj=0x6409410, nPos=0) at svx/source/svdraw/svdpage.cxx:305
12 SdrObjList::InsertObject(SdrObject*, unsigned long) (this=0x627fc80, 
pObj=0x6409410, nPos=0) at svx/source/svdraw/svdpage.cxx:358
13 FmFormPage::InsertObject(SdrObject*, unsigned long) (this=0x627fc80, 
pObj=0x6409410, nPos=0) at svx/source/form/fmpage.cxx:79
14 SwDrawContact::InsertMasterIntoDrawPage() (this=0x640d6b0) at 
sw/source/core/draw/dcontact.cxx:1909
15 SwDrawContact::SwClientNotify(SwModify const&, SfxHint const&) 
(this=0x640d6b0, rMod=..., rHint=...) at sw/source/core/draw/dcontact.cxx:1457
16 SwModify::CallSwClientNotify(SfxHint const&) const (this=0x640d090, 
rHint=...) at sw/source/core/attr/calbck.cxx:373
17 sw::BroadcastingModify::CallSwClientNotify(SfxHint const&) const 
(this=0x640d090, rHint=...) at sw/source/core/attr/calbck.cxx:378
18 SwUndoFlyBase::InsFly(sw::UndoRedoContext&, bool) (this=0x78cdfd0, 
rContext=..., bShowSelFrame=false) at sw/source/core/undo/undobj1.cxx:97
19 SwUndoDelLayFormat::UndoImpl(sw::UndoRedoContext&) (this=0x78cdfd0, 
rContext=...) at sw/source/core/undo/undobj1.cxx:440
20 SwHistoryTextFlyCnt::SetInDoc(SwDoc*, bool) (this=0x60d14c0, 
pDoc=0x625aa30) at sw/source/core/undo/rolbck.cxx:581

Whereas if the shape is selected and deleted that way, a completely
different Undo is created, which doesn't have this problem:

0  SwXShape::SetFrameFormat(SwFrameFormat*) (this=0x2497d50, 
pFormat=0x564b470) at sw/inc/unodraw.hxx:206
1  SwXShape::AddExistingShapeToFormat(SdrObject const&) (_rObj=...) at 
sw/source/core/unocore/unodraw.cxx:945
2  SwDrawContact::SwDrawContact(SwFrameFormat*, SdrObject*) 
(this=0x6bad330, pToRegisterIn=0x564b470, pObj=0x5647880) at 
sw/source/core/draw/dcontact.cxx:709
3  SwUndoDrawDelete::UndoImpl(sw::UndoRedoContext&) (this=0x56ebcd0, 
rContext=...) at sw/source/core/undo/undraw.cxx:501

In SwUndoDelLayFormat, the SdrObject is apparently removed from SdrPage
and the SwDrawContact remains, whereas in SwUndoDrawDelete, the
SdrObject remains on SdrPage but is moved to invisible layer, and
SwDrawContact is destroyed (presumably).

Include obligatory rant why sw has 2 undos doing the same thing here.

(reportedly regression from 2d89b9929e85bede4c72684a12e7508751875f0e
 but probably this can be triggered before, at least since
 91b2325808a75174f284c48c8b8afc118fad74e4)

Change-Id: I4fbb3620bfe1ac07f47e4441625797db7a87cecd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101740
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit a609bc9cc03a0a23c8f20fee808cc6cc2887170d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101681
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 5ffe5728fd49..9d057bcabc7d 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1456,6 +1456,9 @@ void SwDrawContact::SwClientNotify(const SwModify& rMod, 
c

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

[Michael Stahl (via logerrit)]

 sw/inc/node.hxx   |2 +-
 sw/source/core/docnode/ndsect.cxx |3 ++-
 sw/source/core/docnode/nodes.cxx  |7 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit dfa0a910aa6ec26956d713d8265cac53b1904462
Author: Michael Stahl 
AuthorDate: Mon Aug 31 17:57:26 2020 +0200
Commit: Caolán McNamara 
CommitDate: Tue Sep 1 09:53:05 2020 +0200

tdf#135056 sw_redlinehide: when moving sections to undo nodes-array,

... delete frames with utmost prejudice - the code that was checking
for empty frames or cells was going into infinite loop because
first the *outer* section is moved to the undo nodes array, then when
the *inner* (index header) section is moved, its section node's
m_pStartOfSection points to the section node that is already in
undo nodes array and so SwNodes::GoPrevSection() goes very wrong
and CheckNodesRange() is called with positions in 2 different arrays.

(regression from a60dd9ef1361c5925803acaa5292e99277d1faf3)

Change-Id: I5682ebc2081ffc7dc49a9c43e613f72c26e93673
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101755
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 1d6e919046ed353a9d9d86bb9f0332da2e9dea4d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101682
Reviewed-by: Caolán McNamara 

diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index af48d95d5ec2..6f1fa1bae68f 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -551,7 +551,7 @@ public:
 
 /** Method deletes all views of document for the node. The
  content frames are removed from the respective layout. */
-void DelFrames(SwRootFrame const* pLayout = nullptr);
+void DelFrames(SwRootFrame const* pLayout = nullptr, bool bForce = false);
 
 /** Method creates all views of document for the previous node.
The content frames created are put into the respective layout. */
diff --git a/sw/source/core/docnode/ndsect.cxx 
b/sw/source/core/docnode/ndsect.cxx
index 67dea3850311..eeac5d109f8c 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -1159,7 +1159,7 @@ void SwSectionNode::MakeOwnFrames(SwNodeIndex* 
pIdxBehind, SwNodeIndex* pEndIdx)
 }
 }
 
-void SwSectionNode::DelFrames(SwRootFrame const*const /*FIXME TODO*/)
+void SwSectionNode::DelFrames(SwRootFrame const*const /*FIXME TODO*/, bool 
const bForce)
 {
 sal_uLong nStt = GetIndex()+1, nEnd = EndOfSectionIndex();
 if( nStt >= nEnd )
@@ -1176,6 +1176,7 @@ void SwSectionNode::DelFrames(SwRootFrame const*const 
/*FIXME TODO*/)
 // If the Area is within a Fly or TableBox, we can only hide it if
 // there is more Content which has Frames.
 // Or else the Fly/TableBox Frame does not have a Lower!
+if (!bForce)
 {
 SwNodeIndex aIdx( *this );
 if( !SwNodes::GoPrevSection( &aIdx, true, false ) ||
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 0a7207545381..01febcc78d40 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -634,7 +634,12 @@ bool SwNodes::MoveNodes( const SwNodeRange& aRange, 
SwNodes & rNodes,
 
 SwSectionNode* pSctNd = pSttNd->GetSectionNode();
 if( bNewFrames && pSctNd )
-pSctNd->DelFrames();
+{   // tdf#135056 skip over code in DelFrames() that moves
+// SwNodeIndex around because in case of nested
+// sections, m_pStartOfSection will point between
+// undo nodes-array and doc nodes-array
+pSctNd->DelFrames(nullptr, true);
+}
 
 RemoveNode( aRg.aEnd.GetIndex(), 1, false ); // delete 
EndNode
 sal_uLong nSttPos = pSttNd->GetIndex();
___
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

[Michael Stahl (via logerrit)]

 sw/source/core/draw/dcontact.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 921021b5d208fef12854bcf878489b1c05cde136
Author: Michael Stahl 
AuthorDate: Mon Aug 31 15:24:48 2020 +0200
Commit: Caolán McNamara 
CommitDate: Tue Sep 1 09:52:38 2020 +0200

tdf#135661 sw: fix Undo of text deletion of SdrObject

This creates a non-working SwXShape without m_pFormat initialised:

0  
SwXShape::SwXShape(com::sun::star::uno::Reference&,
 SwDoc const*) (this=0x278de80, xShape=uno::Reference to (SvxCustomShape *) 
0x73ec840, pDoc=0x0) at sw/source/core/unocore/unodraw.cxx:889
1  SwFmDrawPage::CreateShape(SdrObject*) const (this=0x637a980, 
pObj=0x6409410) at sw/source/core/unocore/unodraw.cxx:372
2  SdrObject::getUnoShape() (this=0x6409410) at 
svx/source/svdraw/svdobj.cxx:2836
3  GetXShapeForSdrObject(SdrObject*) (pObj=0x6409410) at 
svx/source/unodraw/unoshape.cxx:3928
4  SdrObjCustomShape::GetCustomShapeEngine() const (this=0x6409410) at 
svx/source/svdraw/svdoashp.cxx:381
5  SdrObjCustomShape::GetTextBounds(tools::Rectangle&) const 
(this=0x6409410, rTextBound=...) at svx/source/svdraw/svdoashp.cxx:534
6  SdrObjCustomShape::AdaptTextMinSize() (this=0x6409410) at 
svx/source/svdraw/svdoashp.cxx:1397
7  SdrObjCustomShape::NbcSetSnapRect(tools::Rectangle const&) 
(this=0x6409410, rRect=...) at svx/source/svdraw/svdoashp.cxx:1421
8  SdrObjCustomShape::handlePageChange(SdrPage*, SdrPage*) (this=0x6409410, 
pOldPage=0x0, pNewPage=0x627fc80) at svx/source/svdraw/svdoashp.cxx:2855
9  SdrObject::setParentOfSdrObject(SdrObjList*) (this=0x6409410, 
pNewObjList=0x627fc80) at svx/source/svdraw/svdobj.cxx:294
10 SetParentAtSdrObjectFromSdrObjList(SdrObject&, SdrObjList*) 
(rSdrObject=..., pNew=0x627fc80) at svx/source/svdraw/svdpage.cxx:65
11 SdrObjList::NbcInsertObject(SdrObject*, unsigned long) (this=0x627fc80, 
pObj=0x6409410, nPos=0) at svx/source/svdraw/svdpage.cxx:305
12 SdrObjList::InsertObject(SdrObject*, unsigned long) (this=0x627fc80, 
pObj=0x6409410, nPos=0) at svx/source/svdraw/svdpage.cxx:358
13 FmFormPage::InsertObject(SdrObject*, unsigned long) (this=0x627fc80, 
pObj=0x6409410, nPos=0) at svx/source/form/fmpage.cxx:79
14 SwDrawContact::InsertMasterIntoDrawPage() (this=0x640d6b0) at 
sw/source/core/draw/dcontact.cxx:1909
15 SwDrawContact::SwClientNotify(SwModify const&, SfxHint const&) 
(this=0x640d6b0, rMod=..., rHint=...) at sw/source/core/draw/dcontact.cxx:1457
16 SwModify::CallSwClientNotify(SfxHint const&) const (this=0x640d090, 
rHint=...) at sw/source/core/attr/calbck.cxx:373
17 sw::BroadcastingModify::CallSwClientNotify(SfxHint const&) const 
(this=0x640d090, rHint=...) at sw/source/core/attr/calbck.cxx:378
18 SwUndoFlyBase::InsFly(sw::UndoRedoContext&, bool) (this=0x78cdfd0, 
rContext=..., bShowSelFrame=false) at sw/source/core/undo/undobj1.cxx:97
19 SwUndoDelLayFormat::UndoImpl(sw::UndoRedoContext&) (this=0x78cdfd0, 
rContext=...) at sw/source/core/undo/undobj1.cxx:440
20 SwHistoryTextFlyCnt::SetInDoc(SwDoc*, bool) (this=0x60d14c0, 
pDoc=0x625aa30) at sw/source/core/undo/rolbck.cxx:581

Whereas if the shape is selected and deleted that way, a completely
different Undo is created, which doesn't have this problem:

0  SwXShape::SetFrameFormat(SwFrameFormat*) (this=0x2497d50, 
pFormat=0x564b470) at sw/inc/unodraw.hxx:206
1  SwXShape::AddExistingShapeToFormat(SdrObject const&) (_rObj=...) at 
sw/source/core/unocore/unodraw.cxx:945
2  SwDrawContact::SwDrawContact(SwFrameFormat*, SdrObject*) 
(this=0x6bad330, pToRegisterIn=0x564b470, pObj=0x5647880) at 
sw/source/core/draw/dcontact.cxx:709
3  SwUndoDrawDelete::UndoImpl(sw::UndoRedoContext&) (this=0x56ebcd0, 
rContext=...) at sw/source/core/undo/undraw.cxx:501

In SwUndoDelLayFormat, the SdrObject is apparently removed from SdrPage
and the SwDrawContact remains, whereas in SwUndoDrawDelete, the
SdrObject remains on SdrPage but is moved to invisible layer, and
SwDrawContact is destroyed (presumably).

Include obligatory rant why sw has 2 undos doing the same thing here.

(reportedly regression from 2d89b9929e85bede4c72684a12e7508751875f0e
 but probably this can be triggered before, at least since
 91b2325808a75174f284c48c8b8afc118fad74e4)

Change-Id: I4fbb3620bfe1ac07f47e4441625797db7a87cecd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101740
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit a609bc9cc03a0a23c8f20fee808cc6cc2887170d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101680
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 4d077fe401b4..ad672260a834 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1457,6 +1457,9 @@ void SwDrawContact::SwClientNotify(const SwModify& rMod, 
c

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

[Andrea Gelmini (via logerrit)]

 dbaccess/source/core/dataaccess/documentdefinition.cxx |4 ++--
 desktop/source/app/check_ext_deps.cxx  |6 +++---
 extensions/source/update/check/updatecheck.cxx |6 +++---
 framework/source/dispatch/oxt_handler.cxx  |6 +++---
 framework/source/dispatch/servicehandler.cxx   |6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 765d57f7550a33380d71a09472419611066076b1
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 16:17:15 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 09:52:12 2020 +0200

Fix typo in code

It passed "make check" on Linux

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

diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx 
b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 40fddc4dec36..2bfee3800b3b 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -2015,9 +2015,9 @@ void ODocumentDefinition::fillReportData( const 
Reference< XComponentContext >&
 }));
 try
 {
-Reference< XJobExecutor > xExecuteable(
+Reference< XJobExecutor > xExecutable(
 
_rContext->getServiceManager()->createInstanceWithArgumentsAndContext("com.sun.star.wizards.report.CallReportWizard",
 aArgs, _rContext), UNO_QUERY_THROW );
-xExecuteable->trigger( "fill" );
+xExecutable->trigger( "fill" );
 }
 catch( const Exception& )
 {
diff --git a/desktop/source/app/check_ext_deps.cxx 
b/desktop/source/app/check_ext_deps.cxx
index 297f6dfc8444..8af149f1f93b 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -220,9 +220,9 @@ static sal_Int16 impl_showExtensionDialog( uno::Reference< 
uno::XComponentContex
 "impl_showExtensionDialog(): unable to obtain service manager from 
component context", uno::Reference< uno::XInterface > () );
 
 xService = xServiceManager->createInstanceWithContext( 
"com.sun.star.deployment.ui.UpdateRequiredDialog", xContext );
-uno::Reference< ui::dialogs::XExecutableDialog > xExecuteable( xService, 
uno::UNO_QUERY );
-if ( xExecuteable.is() )
-nRet = xExecuteable->execute();
+uno::Reference< ui::dialogs::XExecutableDialog > xExecutable( xService, 
uno::UNO_QUERY );
+if ( xExecutable.is() )
+nRet = xExecutable->execute();
 
 return nRet;
 }
diff --git a/extensions/source/update/check/updatecheck.cxx 
b/extensions/source/update/check/updatecheck.cxx
index 71a7b1239f63..e7309e4a4725 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -1476,9 +1476,9 @@ void UpdateCheck::showExtensionDialog()
 "UpdateCheck::showExtensionDialog(): unable to obtain service 
manager from component context", uno::Reference< uno::XInterface > () );
 
 xService = xServiceManager->createInstanceWithContext( 
"com.sun.star.deployment.ui.PackageManagerDialog", m_xContext );
-uno::Reference< task::XJobExecutor > xExecuteable( xService, 
uno::UNO_QUERY );
-if ( xExecuteable.is() )
-xExecuteable->trigger( "SHOW_UPDATE_DIALOG" );
+uno::Reference< task::XJobExecutor > xExecutable( xService, uno::UNO_QUERY 
);
+if ( xExecutable.is() )
+xExecutable->trigger( "SHOW_UPDATE_DIALOG" );
 }
 
 
diff --git a/framework/source/dispatch/oxt_handler.cxx 
b/framework/source/dispatch/oxt_handler.cxx
index ede5c031e89c..50d402d610d3 100644
--- a/framework/source/dispatch/oxt_handler.cxx
+++ b/framework/source/dispatch/oxt_handler.cxx
@@ -97,9 +97,9 @@ void SAL_CALL Oxt_Handler::dispatchWithNotification( const 
css::util::URL& aURL,
 lParams[0] <<= aURL.Main;
 
 css::uno::Reference< css::uno::XInterface > xService = 
m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( 
"com.sun.star.deployment.ui.PackageManagerDialog", lParams, m_xContext );
-css::uno::Reference< css::task::XJobExecutor > xExecuteable( xService, 
css::uno::UNO_QUERY );
-if ( xExecuteable.is() )
-xExecuteable->trigger( OUString() );
+css::uno::Reference< css::task::XJobExecutor > xExecutable( xService, 
css::uno::UNO_QUERY );
+if ( xExecutable.is() )
+xExecutable->trigger( OUString() );
 
 if ( xListener.is() )
 {
diff --git a/framework/source/dispatch/servicehandler.cxx 
b/framework/source/dispatch/servicehandler.cxx
index 3ce8be684048..cf99c16c27a0 100644
--- a/framework/source/dispatch/servicehandler.cxx
+++ b/framework/source/dispatch/servicehandler.cxx
@@ -207,9 +207,9 @@ css::uno::Reference< css::uno::XInterface > 
ServiceHandler::implts_dispatch( con
 // => a) a service starts running inside his own ctor and we create it 
only
 xService = 
m_xContext->getServiceManager()->cre

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

[Julien Nabet (via logerrit)]

 vcl/source/gdi/vectorgraphicdata.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d2fb499310414cb2b8f635b9b7798177b60ab347
Author: Julien Nabet 
AuthorDate: Wed Aug 26 11:23:34 2020 +0200
Commit: Caolán McNamara 
CommitDate: Tue Sep 1 09:51:47 2020 +0200

tdf#136127: crash when adding protected PDF file on Photo Album

See https://bugs.documentfoundation.org/attachment.cgi?id=164704

Change-Id: I1c5713446f2af0a08873f0ea57afbfb34f9623be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101393
Tested-by: Jenkins
commit f115a7e047e5f1b6067667adc50d60499cc3e27e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101675
Reviewed-by: Caolán McNamara 

diff --git a/vcl/source/gdi/vectorgraphicdata.cxx 
b/vcl/source/gdi/vectorgraphicdata.cxx
index 99e51f65cc71..7ef8c922f64d 100644
--- a/vcl/source/gdi/vectorgraphicdata.cxx
+++ b/vcl/source/gdi/vectorgraphicdata.cxx
@@ -151,7 +151,8 @@ void VectorGraphicData::ensurePdfReplacement()
 if (mnPageIndex >= 0)
 nUsePageIndex = mnPageIndex;
 vcl::RenderPDFBitmaps(maVectorGraphicDataArray.getConstArray(), 
maVectorGraphicDataArray.getLength(), aBitmaps, nUsePageIndex, 1/*, 
fResolutionDPI*/);
-maReplacement = aBitmaps[0];
+if (!aBitmaps.empty())
+maReplacement = aBitmaps[0];
 }
 
 void VectorGraphicData::ensureReplacement()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 sd/inc/stlsheet.hxx|4 ++--
 sd/source/core/stlsheet.cxx|   12 ++--
 sd/source/ui/annotations/annotationmanager.cxx |   10 +-
 sd/source/ui/annotations/annotationmanagerimpl.hxx |4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 9742be3aff5436d242d78f71e2b6ec416692f337
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 16:19:22 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 09:48:56 2020 +0200

Fix typo in code

It passed "make check" on Linux

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

diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index 83bce2472c58..42f6a4e4bde4 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -39,7 +39,7 @@
 
 #include "prlayout.hxx"
 
-class ModifyListenerForewarder;
+class ModifyListenerForwarder;
 struct SfxItemPropertySimpleEntry;
 
 typedef cppu::ImplInheritanceHelper< SfxUnoStyleSheet,
@@ -145,7 +145,7 @@ private:
 /** broadcast helper for events */
 ::cppu::OBroadcastHelper mrBHelper;
 
-std::unique_ptr< ModifyListenerForewarder > mpModifyListenerForewarder;
+std::unique_ptr< ModifyListenerForwarder > mpModifyListenerForwarder;
 
 SdStyleSheet( const SdStyleSheet& ) = delete;
 SdStyleSheet& operator=( const SdStyleSheet& ) = delete;
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 4c4703e188aa..616da711d329 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -106,10 +106,10 @@ static SvxItemPropertySet& GetStylePropertySet()
 return aPropSet;
 }
 
-class ModifyListenerForewarder : public SfxListener
+class ModifyListenerForwarder : public SfxListener
 {
 public:
-explicit ModifyListenerForewarder( SdStyleSheet* pStyleSheet );
+explicit ModifyListenerForwarder( SdStyleSheet* pStyleSheet );
 
 virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
 
@@ -117,7 +117,7 @@ private:
 SdStyleSheet* mpStyleSheet;
 };
 
-ModifyListenerForewarder::ModifyListenerForewarder( SdStyleSheet* pStyleSheet )
+ModifyListenerForwarder::ModifyListenerForwarder( SdStyleSheet* pStyleSheet )
 : mpStyleSheet( pStyleSheet )
 {
 if( pStyleSheet )
@@ -127,7 +127,7 @@ ModifyListenerForewarder::ModifyListenerForewarder( 
SdStyleSheet* pStyleSheet )
 }
 }
 
-void ModifyListenerForewarder::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& 
/*rHint*/)
+void ModifyListenerForwarder::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& 
/*rHint*/)
 {
 if( mpStyleSheet )
 mpStyleSheet->notifyModifyListener();
@@ -800,8 +800,8 @@ void SAL_CALL SdStyleSheet::addModifyListener( const 
Reference< XModifyListener
 }
 else
 {
-if (!mpModifyListenerForewarder)
-mpModifyListenerForewarder.reset( new ModifyListenerForewarder( 
this ) );
+if (!mpModifyListenerForwarder)
+mpModifyListenerForwarder.reset( new ModifyListenerForwarder( this 
) );
 mrBHelper.addListener( cppu::UnoType::get(), 
xListener );
 }
 }
diff --git a/sd/source/ui/annotations/annotationmanager.cxx 
b/sd/source/ui/annotations/annotationmanager.cxx
index 2f2f668a5f3e..80f6fba904c4 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -746,7 +746,7 @@ void AnnotationManagerImpl::GetAnnotationState(SfxItemSet& 
rSet)
 }
 }
 
-void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward)
+void AnnotationManagerImpl::SelectNextAnnotation(bool bForward)
 {
 ShowAnnotations( true );
 
@@ -758,7 +758,7 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool 
bForeward)
 
 AnnotationVector aAnnotations( pPage->getAnnotations() );
 
-if( bForeward )
+if( bForward )
 {
 if( xCurrent.is() )
 {
@@ -804,7 +804,7 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool 
bForeward)
 {
 do
 {
-pPage = GetNextPage( pPage, bForeward );
+pPage = GetNextPage( pPage, bForward );
 
 if( pPage && !pPage->getAnnotations().empty() )
 {
@@ -817,7 +817,7 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool 
bForeward)
 
 SfxDispatcher* pDispatcher = getDispatcher( mrBase );
 if( pDispatcher )
-pDispatcher->Execute( bForeward ? SID_NEXT_POSTIT : 
SID_PREVIOUS_POSTIT );
+pDispatcher->Execute( bForward ? SID_NEXT_POSTIT : 
SID_PREVIOUS_POSTIT );
 
 return;
 }
@@ -828,7 +828,7 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool 
bForeward)
 // The question text depends on the search direction.
 bool bImpress = mpDoc->GetDocumentType() == DocumentType::Impress;
 const char* pStringId;
- 

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

[Stephan Bergmann (via logerrit)]

 include/rtl/ustring.hxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 464ad36998ee3ec9fc579c5a99134e7b1eb52edc
Author: Stephan Bergmann 
AuthorDate: Mon Aug 31 22:15:05 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 1 09:41:43 2020 +0200

Adapt documentation comment

...to 33ecd0d5c4fff9511a8436513936a3f7044a775a "Change OUStringLiteral from
char[] to char16_t[]"

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

diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index 6c6e92207242..8e7a61f79005 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -343,8 +343,7 @@ public:
 #ifdef LIBO_INTERNAL_ONLY // "RTL_FAST_STRING"
 /// @cond INTERNAL
 /**
-  New string from an 8-Bit string literal that is expected to contain only
-  characters in the ASCII set (i.e. first 128 characters).
+  New string from a string literal.
 
   This constructor is similar to the "direct template" one, but can be
   useful in cases where the latter does not work, like in
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/sanitizers

[Caolán McNamara (via logerrit)]

 solenv/sanitizers/ui/modules/scalc.suppr |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 6074fc5d32c85c7f80d167036fa812b8d48bbe39
Author: Caolán McNamara 
AuthorDate: Mon Aug 31 17:07:19 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Sep 1 09:39:35 2020 +0200

unused suppression

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

diff --git a/solenv/sanitizers/ui/modules/scalc.suppr 
b/solenv/sanitizers/ui/modules/scalc.suppr
index 77596e415c8d..ab929a9ee22a 100644
--- a/solenv/sanitizers/ui/modules/scalc.suppr
+++ b/solenv/sanitizers/ui/modules/scalc.suppr
@@ -52,7 +52,6 @@ 
sc/uiconfig/scalc/ui/dataproviderentry.ui://GtkEntry[@id='ed_id'] no-labelled-by
 sc/uiconfig/scalc/ui/dataproviderentry.ui:GtkGrid[@id='grid']/GtkLabel 
orphan-label
 sc/uiconfig/scalc/ui/dataproviderentry.ui:GtkGrid[@id='grid']/GtkLabel 
orphan-label
 sc/uiconfig/scalc/ui/dataproviderentry.ui:GtkGrid[@id='grid']/GtkLabel 
orphan-label
-sc/uiconfig/scalc/ui/definedatabaserangedialog.ui://GtkEntry[@id='assign'] 
no-labelled-by
 sc/uiconfig/scalc/ui/definedatabaserangedialog.ui://GtkLabel[@id='Source'] 
orphan-label
 sc/uiconfig/scalc/ui/definedatabaserangedialog.ui://GtkLabel[@id='Operations'] 
orphan-label
 sc/uiconfig/scalc/ui/definedatabaserangedialog.ui://GtkLabel[@id='invalid'] 
orphan-label
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 include/svx/ctredlin.hxx   |1 +
 sw/source/uibase/misc/redlndlg.cxx |4 
 2 files changed, 5 insertions(+)

New commits:
commit dd8313d2c65f0cea68b1ab2aeefb1426b1d3b76c
Author: Caolán McNamara 
AuthorDate: Mon Aug 31 11:47:49 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Sep 1 09:39:08 2020 +0200

Resolves: tdf#136189 don't try and sort until treeview is filled

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

diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index b7d0f80ada23..1b4dac85319b 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -104,6 +104,7 @@ public:
 void set_size_request(int nWidth, int nHeight);
 
 weld::TreeView& GetWidget() { return *pTreeView; }
+bool IsSorted() const { return bSorted; }
 
 ~SvxRedlinTable();
 
diff --git a/sw/source/uibase/misc/redlndlg.cxx 
b/sw/source/uibase/misc/redlndlg.cxx
index 4f242e273af6..0d21ad65554c 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -717,6 +717,8 @@ void 
SwRedlineAcceptDlg::InsertParents(SwRedlineTable::size_type nStart, SwRedli
 pCurrRedline = nullptr;
 
 rTreeView.freeze();
+if (m_pTable->IsSorted())
+rTreeView.make_unsorted();
 for (SwRedlineTable::size_type i = nStart; i <= nEnd; i++)
 {
 const SwRangeRedline& rRedln = pSh->GetRedline(i);
@@ -763,6 +765,8 @@ void 
SwRedlineAcceptDlg::InsertParents(SwRedlineTable::size_type nStart, SwRedli
 InsertChildren(pRedlineParent, rRedln, bHasRedlineAutoFormat);
 }
 rTreeView.thaw();
+if (m_pTable->IsSorted())
+rTreeView.make_sorted();
 }
 
 void SwRedlineAcceptDlg::CallAcceptReject( bool bSelect, bool bAccept )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Aditya (via logerrit)]

 include/svx/gallerybinaryengine.hxx |1 +
 svx/source/gallery2/gallerybinaryengine.cxx |9 +
 svx/source/gallery2/galtheme.cxx|6 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 20369e9b4bc1b1b312113f04b0420d2ae1c7fc03
Author: Aditya 
AuthorDate: Sat Aug 1 20:38:24 2020 +0530
Commit: Tomaž Vajngerl 
CommitDate: Tue Sep 1 09:29:19 2020 +0200

svx:GalleryTheme Refactoring -implement removeObject() in 
GalleryBinaryEngine

Change-Id: I90d380efecbd5ed88e16b5f20603ff0183144302
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99945
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/svx/gallerybinaryengine.hxx 
b/include/svx/gallerybinaryengine.hxx
index e8353d11af5a..bf13cecc9471 100644
--- a/include/svx/gallerybinaryengine.hxx
+++ b/include/svx/gallerybinaryengine.hxx
@@ -71,6 +71,7 @@ public:
 SAL_DLLPRIVATE bool implWrite(const GalleryTheme& rTheme, const 
GalleryThemeEntry* pThm);
 
 void insertObject(const SgaObject& rObj, GalleryObject* pFoundEntry, 
sal_uInt32& rInsertPos);
+void removeObject(std::unique_ptr& pEntry);
 
 std::unique_ptr implReadSgaObject(GalleryObject const* pEntry);
 bool implWriteSgaObject(const SgaObject& rObj, sal_uInt32 nPos, 
GalleryObject* pExistentEntry);
diff --git a/svx/source/gallery2/gallerybinaryengine.cxx 
b/svx/source/gallery2/gallerybinaryengine.cxx
index 6831608d9506..64e23a480781 100644
--- a/svx/source/gallery2/gallerybinaryengine.cxx
+++ b/svx/source/gallery2/gallerybinaryengine.cxx
@@ -154,6 +154,15 @@ void GalleryBinaryEngine::insertObject(const SgaObject& 
rObj, GalleryObject* pFo
 implWriteSgaObject(rObj, rInsertPos, nullptr);
 }
 
+void GalleryBinaryEngine::removeObject(std::unique_ptr& pEntry)
+{
+if (mrGalleryObjectCollection.getObjectList().empty())
+KillFile(GetSdgURL());
+
+if (SgaObjKind::SvDraw == pEntry->eObjKind)
+
GetSvDrawStorage()->Remove(pEntry->aURL.GetMainURL(INetURLObject::DecodeMechanism::NONE));
+}
+
 std::unique_ptr 
GalleryBinaryEngine::implReadSgaObject(GalleryObject const* pEntry)
 {
 std::unique_ptr pSgaObj;
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 1de5ff849b8e..c10041ee8471 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -187,11 +187,7 @@ void GalleryTheme::RemoveObject(sal_uInt32 nPos)
 std::unique_ptr pEntry = std::move(*it);
 maGalleryObjectCollection.getObjectList().erase( it );
 
-if( maGalleryObjectCollection.getObjectList().empty() )
-KillFile( GetSdgURL() );
-
-if( SgaObjKind::SvDraw == pEntry->eObjKind )
-mpGalleryBinaryEngine->GetSvDrawStorage()->Remove( 
pEntry->aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
+mpGalleryBinaryEngine->removeObject(pEntry);
 
 Broadcast( GalleryHint( GalleryHintType::CLOSE_OBJECT, GetName(), 
pEntry.get() ) );
 pEntry.reset();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andreas Heinisch (via logerrit)]

 basic/qa/basic_coverage/test_option_base.vb|   60 
 basic/qa/basic_coverage/test_option_base_compatible.vb |   61 +
 basic/source/runtime/methods.cxx   |2 
 basic/source/runtime/methods1.cxx  |4 -
 basic/source/sbx/sbxstr.cxx|2 
 5 files changed, 124 insertions(+), 5 deletions(-)

New commits:
commit 40031dd453991b3397f02726bd83cc857bef1044
Author: Andreas Heinisch 
AuthorDate: Mon Aug 24 11:15:59 2020 +0200
Commit: Mike Kaganski 
CommitDate: Tue Sep 1 09:28:46 2020 +0200

tdf#54912 - with option base arrays should start at index 1

Using option base, every array should start at index 1. Previously, it
needed option VBASupport too. Without option compatible, the upper bound
of an array is increased as well in order to preserve the specified
size.

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

diff --git a/basic/qa/basic_coverage/test_option_base.vb 
b/basic/qa/basic_coverage/test_option_base.vb
new file mode 100644
index ..fff5858a4ee6
--- /dev/null
+++ b/basic/qa/basic_coverage/test_option_base.vb
@@ -0,0 +1,60 @@
+Option Base 1
+
+Dim passCount As Integer
+Dim failCount As Integer
+Dim result As String
+
+Function doUnitTest() As String
+result = verify_optionBase()
+If failCount <> 0 Or passCount = 0 Then
+doUnitTest = 0
+Else
+doUnitTest = 1
+End If
+End Function
+
+Function verify_optionBase() As String
+passCount = 0
+failCount = 0
+
+result = "Test Results" & Chr$(10) & "" & Chr$(10)
+
+' tdf#54912 - with option base arrays should start at index 1.
+' Without option compatible the upper bound is changed as well (#109275).
+Dim strArray(2) As String
+TestLog_ASSERT LBound(strArray), 1, "Lower bound of a string array (before 
assignment): " & LBound(strArray)
+TestLog_ASSERT UBound(strArray), 3, "Upper bound of a string array (before 
assignment): " & UBound(strArray)
+strArray = Array("a", "b")
+TestLog_ASSERT LBound(strArray), 1, "Lower bound of a string array (after 
assignment): " & LBound(strArray)
+TestLog_ASSERT UBound(strArray), 2, "Upper bound of a string array (after 
assignment): " & UBound(strArray)
+
+Dim intArray(2) As Integer
+TestLog_ASSERT LBound(intArray), 1, "Lower bound of an integer array 
(before assignment): " & LBound(intArray)
+TestLog_ASSERT UBound(intArray), 3, "Upper bound of an integer array 
(before assignment): " & UBound(intArray)
+intArray = Array(1, 2)
+TestLog_ASSERT LBound(intArray), 1, "Lower bound of an integer array 
(after assignment): " & LBound(intArray)
+TestLog_ASSERT UBound(intArray), 2, "Upper bound of an integer array 
(after assignment): " & UBound(intArray)
+
+Dim byteArray(2) As Byte
+TestLog_ASSERT LBound(byteArray), 1, "Lower bound of a byte array (before 
assignment): " & LBound(byteArray)
+TestLog_ASSERT UBound(byteArray), 3, "Upper bound of a byte array (before 
assignment): " & UBound(byteArray)
+byteArray = StrConv("ab", 128)
+TestLog_ASSERT LBound(byteArray), 1, "Lower bound of a byte array 
(StrConv): " & LBound(byteArray)
+TestLog_ASSERT UBound(byteArray), 2, "Upper bound of a byte array 
(StrConv): " & UBound(byteArray)
+
+ReDim byteArray(3)
+TestLog_ASSERT LBound(byteArray), 1, "Lower bound of a byte array (ReDim): 
" & LBound(byteArray)
+TestLog_ASSERT UBound(byteArray), 4, "Upper bound of a byte array (ReDim): 
" & UBound(byteArray)
+
+result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) & 
"Tests failed: " & failCount & Chr$(10)
+verify_optionBase = result
+End Function
+
+Sub TestLog_ASSERT(actual As Variant, expected As Variant, testName As String)
+If expected = actual Then
+passCount = passCount + 1
+Else
+result = result & Chr$(10) & "Failed: " & testName & " returned " & 
actual & ", expected " & expected
+failCount = failCount + 1
+End If
+End Sub
diff --git a/basic/qa/basic_coverage/test_option_base_compatible.vb 
b/basic/qa/basic_coverage/test_option_base_compatible.vb
new file mode 100644
index ..37644e59faa4
--- /dev/null
+++ b/basic/qa/basic_coverage/test_option_base_compatible.vb
@@ -0,0 +1,61 @@
+Option Base 1
+Option Compatible
+
+Dim passCount As Integer
+Dim failCount As Integer
+Dim result As String
+
+Function doUnitTest() As String
+result = verify_optionBase()
+If failCount <> 0 Or passCount = 0 Then
+doUnitTest = 0
+Else
+doUnitTest = 1
+End If
+End Function
+
+Function verify_optionBase() As String
+passCount = 0
+failCount = 0
+
+result = "Test Results" & Chr$(10) & "" & Chr$(10)
+
+' tdf#54912 - with option base arrays should start at index

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

[Justin Luth (via logerrit)]

 sw/qa/extras/ww8export/ww8export2.cxx |1 +
 sw/source/filter/ww8/ww8par6.cxx  |6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit fb8334aa79e811bb6780e072e24d2580932f1031
Author: Justin Luth 
AuthorDate: Mon Aug 31 14:40:55 2020 +0300
Commit: Miklos Vajna 
CommitDate: Tue Sep 1 09:27:34 2020 +0200

tdf#136282 ww8import: track para bidi, not char bidi for style

This fixes a LO 7.0 regression from tdf#99197.

Apparently I was watching the wrong SPRM for bidi change in styles.
It looks like it should be sprmPFBiDi: A Bool8 value that
specifies whether the paragraph uses right-to-left layout.
By default, a paragraph does not use right-to-left layout.

Instead, I had been using sprmCFBiDi: A ToggleOperand value that
specifies whether the text is formatted with right-to-left layout.
By default, text is displayed from right to left
if the language for the text is a right-to-left language.
[So this one looks like a character run property.]

I no longer remember why I used CfBiDi. Perhaps just because
it sets m_bBiDi which sounds good?
However, there are no existing unit tests that have a CFBiDi
in a style, but there are examples with CFBiDi.

I'm really surprised that QA didn't have any documents
that picked up on this regression. I was counting on that...

Change-Id: If5a115db5962e7e26ca1b280cd9f31d493cee69c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101726
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/ww8export/ww8export2.cxx 
b/sw/qa/extras/ww8export/ww8export2.cxx
index 48391d594236..f811fc5200e1 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -351,6 +351,7 @@ DECLARE_WW8EXPORT_TEST(testTdf112074_RTLtableJustification, 
"tdf112074_RTLtableJ
 DECLARE_WW8EXPORT_TEST(testTdf98620_rtlJustify, "tdf98620_rtlJustify.doc")
 {
 CPPUNIT_ASSERT_EQUAL( style::ParagraphAdjust_RIGHT, 
static_cast(getProperty(getParagraph(1), 
"ParaAdjust")) );
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Right To Left style", 
text::WritingMode2::RL_TB, getProperty(getParagraph(1), 
"WritingMode"));
 }
 
 DECLARE_WW8EXPORT_TEST(testTdf121110_absJustify, "tdf121110_absJustify.doc")
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 711b3e2a..ebb21ecd5199 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -403,6 +403,9 @@ void SwWW8ImplReader::Read_ParaBiDi(sal_uInt16, const 
sal_uInt8* pData, short nL
 }
 
 NewAttr(SvxFrameDirectionItem(eDir, RES_FRAMEDIR));
+
+if ( m_pCurrentColl && m_xStyles )// in style definition
+m_xStyles->mbBidiChanged = true;
 }
 }
 
@@ -3071,9 +3074,6 @@ void SwWW8ImplReader::Read_Bidi(sal_uInt16, const 
sal_uInt8* pData, short nLen)
 m_bBidi = true;
 sal_uInt8 nBidi = *pData;
 NewAttr( SfxInt16Item( RES_CHRATR_BIDIRTL, (nBidi!=0)? 1 : 0 ) );
-
-if( m_pCurrentColl && m_xStyles )// in style definition
-m_xStyles->mbBidiChanged = true;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl (via logerrit)]

 sd/qa/unit/tiledrendering/LOKitSearchTest.cxx  |  115 +
 sd/qa/unit/tiledrendering/data/ReplaceTest.odp |binary
 2 files changed, 115 insertions(+)

New commits:
commit 72bcda84e2f7d11cd35fa8979dab6f461d13fcf7
Author: Tomaž Vajngerl 
AuthorDate: Sun Aug 23 13:41:58 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Tue Sep 1 09:25:54 2020 +0200

sd: test Replace and ReplaceAll using LOKit

Change-Id: I68a612d3fb277970870818d290096b2824f31057
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101635
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit ac11b1f0311289c43f9a2c68e311de02cd0b53cf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101694
Tested-by: Jenkins CollaboraOffice 
(cherry picked from commit dedbf2dd6209658b7d47b5d8bb0b4f37aa9a5277)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101763

diff --git a/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx 
b/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx
index ea5ff5a0104f..089391d107a0 100644
--- a/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx
+++ b/sd/qa/unit/tiledrendering/LOKitSearchTest.cxx
@@ -63,6 +63,9 @@ public:
 void testSearchInPDFInMultiplePagesBackwards();
 void testSearchIn2MixedObjects();
 void testSearchIn6MixedObjects();
+void testReplace();
+void testReplaceAll();
+void testReplaceCombined();
 
 CPPUNIT_TEST_SUITE(LOKitSearchTest);
 CPPUNIT_TEST(testSearch);
@@ -77,6 +80,9 @@ public:
 CPPUNIT_TEST(testSearchInPDFInMultiplePagesBackwards);
 CPPUNIT_TEST(testSearchIn2MixedObjects);
 CPPUNIT_TEST(testSearchIn6MixedObjects);
+CPPUNIT_TEST(testReplace);
+CPPUNIT_TEST(testReplaceAll);
+CPPUNIT_TEST(testReplaceCombined);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -144,6 +150,22 @@ void lcl_search(const OUString& rKey, bool bFindAll = 
false, bool bBackwards = f
 Scheduler::ProcessEventsToIdle();
 }
 
+void lcl_replace(const OUString& rKey, const OUString& rReplace, bool bAll = 
false)
+{
+Scheduler::ProcessEventsToIdle();
+
+SvxSearchCmd eSearch = bAll ? SvxSearchCmd::REPLACE_ALL : 
SvxSearchCmd::REPLACE;
+
+uno::Sequence 
aPropertyValues(comphelper::InitPropertySequence({
+{ "SearchItem.SearchString", uno::makeAny(rKey) },
+{ "SearchItem.ReplaceString", uno::makeAny(rReplace) },
+{ "SearchItem.Command", uno::makeAny(sal_uInt16(eSearch)) },
+}));
+
+comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
+Scheduler::ProcessEventsToIdle();
+}
+
 #if HAVE_FEATURE_PDFIUM
 SdrObject* lclGetSelectedObject(sd::ViewShell* pViewShell)
 {
@@ -789,6 +811,99 @@ void LOKitSearchTest::testSearchIn6MixedObjects()
 CPPUNIT_ASSERT_EQUAL(pPage->GetObj(0), lclGetSelectedObject(pViewShell));
 #endif
 }
+namespace
+{
+OUString getShapeText(SdXImpressDocument* pXImpressDocument, sal_uInt32 nPage, 
sal_uInt32 nShape)
+{
+uno::Reference xDrawPage;
+xDrawPage.set(pXImpressDocument->getDrawPages()->getByIndex(nPage), 
uno::UNO_QUERY);
+
+uno::Reference xShape(xDrawPage->getByIndex(nShape), 
uno::UNO_QUERY);
+return xShape->getString();
+}
+}
+
+void LOKitSearchTest::testReplace()
+{
+SdXImpressDocument* pXImpressDocument = createDoc("ReplaceTest.odp");
+sd::ViewShell* pViewShell = 
pXImpressDocument->GetDocShell()->GetViewShell();
+mpCallbackRecorder->registerCallbacksFor(pViewShell->GetViewShellBase());
+
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), getShapeText(pXImpressDocument, 0, 
0));
+CPPUNIT_ASSERT_EQUAL(OUString("Bbb bbb bbb bbb"), 
getShapeText(pXImpressDocument, 1, 0));
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), getShapeText(pXImpressDocument, 2, 
0));
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), getShapeText(pXImpressDocument, 3, 
0));
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), getShapeText(pXImpressDocument, 4, 
0));
+
+lcl_replace("bbb", "aaa", false); // select
+
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), getShapeText(pXImpressDocument, 0, 
0));
+CPPUNIT_ASSERT_EQUAL(OUString("Bbb bbb bbb bbb"), 
getShapeText(pXImpressDocument, 1, 0));
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), getShapeText(pXImpressDocument, 2, 
0));
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), getShapeText(pXImpressDocument, 3, 
0));
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), getShapeText(pXImpressDocument, 4, 
0));
+
+lcl_replace("bbb", "aaa", false); // replace
+
+CPPUNIT_ASSERT_EQUAL(OUString("aaa"), getShapeText(pXImpressDocument, 0, 
0));
+CPPUNIT_ASSERT_EQUAL(OUString("Bbb bbb bbb bbb"), 
getShapeText(pXImpressDocument, 1, 0));
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), getShapeText(pXImpressDocument, 2, 
0));
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), getShapeText(pXImpressDocument, 3, 
0));
+CPPUNIT_ASSERT_EQUAL(OUString("bbb"), getShapeText(pXImpressDocument, 4, 
0));
+}
+
+void LOKitSearchTest::testReplaceAll()
+{
+SdXImpressDocument* pXImpressDocument = createDoc("ReplaceTest.odp");
+

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

[Andrea Gelmini (via logerrit)]

 wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e22408d15f74f3aa4be324fa00978f7041882673
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 14:50:09 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 09:25:39 2020 +0200

Fix typo in code

It passed "make check" on Linux

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

diff --git a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java 
b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
index 6bd2ae6e8e92..289f76dd36d4 100644
--- a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
+++ b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
@@ -52,14 +52,14 @@ public class PrimaryKeyHandler implements 
XFieldSelectionListener
 private final FieldSelection curPrimaryKeySelection;
 private String[] fieldnames;
 private final TableDescriptor curTableDescriptor;
-private final boolean bAutoPrimaryKeysupportsAutoIncrmentation;
+private final boolean bAutoPrimaryKeysupportsAutoIncrementation;
 private static final String SAUTOMATICKEYFIELDNAME = "ID";
 
 public PrimaryKeyHandler(TableWizard _CurUnoDialog, TableDescriptor 
_curTableDescriptor)
 {
 this.CurUnoDialog = _CurUnoDialog;
 curTableDescriptor = _curTableDescriptor;
-bAutoPrimaryKeysupportsAutoIncrmentation = 
curTableDescriptor.oTypeInspector.isAutoIncrementationSupported();
+bAutoPrimaryKeysupportsAutoIncrementation = 
curTableDescriptor.oTypeInspector.isAutoIncrementationSupported();
 short curtabindex = (short) ((TableWizard.SOPRIMARYKEYPAGE * 100) - 
20);
 Integer IPRIMEKEYSTEP = Integer.valueOf(TableWizard.SOPRIMARYKEYPAGE);
 final String sExplanations = 
CurUnoDialog.m_oResource.getResText("RID_TABLE_26");
@@ -274,7 +274,7 @@ public class PrimaryKeyHandler implements 
XFieldSelectionListener
 {
 boolean bdoEnable = (this.chkcreatePrimaryKey.getState() == 1);
 Helper.setUnoPropertyValue(UnoDialog.getModel(optAddAutomatically), 
PropertyNames.PROPERTY_ENABLED, Boolean.valueOf(bdoEnable));
-
Helper.setUnoPropertyValue(UnoDialog.getModel(chkApplyAutoValueAutomatic), 
PropertyNames.PROPERTY_ENABLED, 
Boolean.valueOf(bAutoPrimaryKeysupportsAutoIncrmentation && bdoEnable));
+
Helper.setUnoPropertyValue(UnoDialog.getModel(chkApplyAutoValueAutomatic), 
PropertyNames.PROPERTY_ENABLED, 
Boolean.valueOf(bAutoPrimaryKeysupportsAutoIncrementation && bdoEnable));
 Helper.setUnoPropertyValue(UnoDialog.getModel(optUseExisting), 
PropertyNames.PROPERTY_ENABLED, Boolean.valueOf(bdoEnable));
 Helper.setUnoPropertyValue(UnoDialog.getModel(optUseSeveral), 
PropertyNames.PROPERTY_ENABLED, Boolean.valueOf(bdoEnable));
 //toggle subcontrols of the radiobuttons...
@@ -386,7 +386,7 @@ public class PrimaryKeyHandler implements 
XFieldSelectionListener
 try
 {
 boolean bisAutomaticMode = 
AnyConverter.toBoolean(Helper.getUnoPropertyValue(UnoDialog.getModel(optAddAutomatically),
 PropertyNames.PROPERTY_ENABLED));
-boolean bdoenable = bAutoPrimaryKeysupportsAutoIncrmentation && 
optAddAutomatically.getState() && bisAutomaticMode;
+boolean bdoenable = bAutoPrimaryKeysupportsAutoIncrementation && 
optAddAutomatically.getState() && bisAutomaticMode;
 
Helper.setUnoPropertyValue(UnoDialog.getModel(chkApplyAutoValueAutomatic), 
PropertyNames.PROPERTY_ENABLED, Boolean.valueOf(bdoenable));
 }
 catch (IllegalArgumentException e)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sd/source

[Tomaž Vajngerl (via logerrit)]

 sd/source/ui/docshell/docshel3.cxx |   82 +
 sd/source/ui/docshell/docshell.cxx |   19 ++-
 sd/source/ui/func/fusearch.cxx |9 ++-
 sd/source/ui/inc/DrawDocShell.hxx  |3 -
 sd/source/ui/inc/View.hxx  |   32 ++--
 sd/source/ui/inc/fusearch.hxx  |2 
 sd/source/ui/unoidl/DrawController.cxx |6 +-
 sd/source/ui/view/Outliner.cxx |   12 +++-
 8 files changed, 108 insertions(+), 57 deletions(-)

New commits:
commit 2b026da90155b07c23becaacd493e1fcbab4a2d1
Author: Tomaž Vajngerl 
AuthorDate: Sat Aug 22 21:45:44 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Tue Sep 1 09:25:35 2020 +0200

sd: Make search bound to a view - to allow independent searching

Before if two windows are open, the search is not independent
because Outline class is not independent for a view (because of
FuSearch which remembers the view from when the it was created
and then an instance is stored in the DocShell).
This creates a SearchContext class stored on a View, which stores
the actual View bound FuSearch instance, fix us the calls.

Also move the VectorGraphicSearchContext back into Outline::Impl,
because it doesn't need to be bound to the view anymore.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101224
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 2ebc26aeefefe33ee6180862509e4971ff2dfc6f)

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101693
Tested-by: Tomaž Vajngerl 
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 714767b3d521eefc46dd8158ee67610347863f9f)

Change-Id: I6a5ce71efafa378845eee4ac9574e2e4301138d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101762
Tested-by: Tomaž Vajngerl 
Reviewed-by: Tomaž Vajngerl 

diff --git a/sd/source/ui/docshell/docshel3.cxx 
b/sd/source/ui/docshell/docshel3.cxx
index 3d51bf023858..16dbcd36a5c3 100644
--- a/sd/source/ui/docshell/docshel3.cxx
+++ b/sd/source/ui/docshell/docshel3.cxx
@@ -175,30 +175,37 @@ void DrawDocShell::Execute( SfxRequest& rReq )
 
 case FID_SEARCH_OFF:
 {
-if( dynamic_cast< FuSearch* >(mxDocShellFunction.get()) )
+if (mpViewShell)
 {
-// End Search&Replace in all docshells
-SfxObjectShell* pFirstShell = SfxObjectShell::GetFirst();
-SfxObjectShell* pShell = pFirstShell;
-
-while (pShell)
+sd::View* pView = mpViewShell->GetView();
+if (pView)
 {
-if( dynamic_cast< const DrawDocShell *>( pShell ) !=  
nullptr)
+auto& rFunctionContext = pView->getSearchContext();
+rtl::Reference& 
xFuSearch(rFunctionContext.getFunctionSearch());
+
+if (xFuSearch.is())
 {
-static_cast(pShell)->CancelSearching();
-}
+// End Search&Replace in all docshells
+SfxObjectShell* pFirstShell = 
SfxObjectShell::GetFirst();
+SfxObjectShell* pShell = pFirstShell;
 
-pShell = SfxObjectShell::GetNext(*pShell);
+while (pShell)
+{
+auto pDrawDocShell = 
dynamic_cast(pShell);
+if (pDrawDocShell)
+pDrawDocShell->CancelSearching();
 
-if (pShell == pFirstShell)
-{
-pShell = nullptr;
+pShell = SfxObjectShell::GetNext(*pShell);
+
+if (pShell == pFirstShell)
+pShell = nullptr;
+}
+
+rFunctionContext.resetSearchFunction();
+Invalidate();
+rReq.Done();
 }
 }
-
-SetDocShellFunction(nullptr);
-Invalidate();
-rReq.Done();
 }
 }
 break;
@@ -207,23 +214,30 @@ void DrawDocShell::Execute( SfxRequest& rReq )
 {
 const SfxItemSet* pReqArgs = rReq.GetArgs();
 
-if ( pReqArgs )
+if (pReqArgs && mpViewShell)
 {
-rtl::Reference< FuSearch > xFuSearch( dynamic_cast< FuSearch* 
>( GetDocShellFunction().get() ) );
-
-if( !xFuSearch.is() && mpViewShell )
+sd::View* pView = mpViewShell->GetView();
+if (pView)
 {
-::sd::View* pView = mpViewShell->GetView();
-SetDocShellFunction( FuSearch::Create( mpViewShell, 
mpViewShell->GetActiveWindow(), pView, mpDoc, rReq ) );
-xFuSearch.set( dynamic_cast< 

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

[Tomaž Vajngerl (via logerrit)]

 sd/inc/VectorGraphicSearchContext.hxx |   35 
 sd/source/ui/inc/View.hxx |6 +++
 sd/source/ui/view/Outliner.cxx|   58 ++
 3 files changed, 66 insertions(+), 33 deletions(-)

New commits:
commit 5f1a61e685f4abc94a311fa3f01a2fa96c65677e
Author: Tomaž Vajngerl 
AuthorDate: Sun Aug 16 12:06:30 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Tue Sep 1 09:24:48 2020 +0200

move vector graphic search to View, so it works in multiple views

VectorGraphicSearch was instantiated for the Outline, which is
the same for every view. The problem with this is that when we
have multiple views, the search would interfere with each other,
which is especially distracting in online when multiple users
connect to the same document and try searching.
This adds VectorGraphicSearchContext class, that is added to the
View, which makes the search view dependent and multiple instances
of VectorGraphicSearch are created, each one for its own view.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100837
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 74e2f2178fd8a0ad29c5dbcefb22a9778a75ae82)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100884
Tested-by: Jenkins CollaboraOffice 
(cherry picked from commit b34e80b3a8d0b9032556d82bc2619e450802dc8c)

Change-Id: Ia0f34647b30b35f4ddb84d33353990d635756905
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101761
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tomaž Vajngerl 

diff --git a/sd/inc/VectorGraphicSearchContext.hxx 
b/sd/inc/VectorGraphicSearchContext.hxx
new file mode 100644
index ..e6f978ca273c
--- /dev/null
+++ b/sd/inc/VectorGraphicSearchContext.hxx
@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#pragma once
+
+#include 
+
+namespace sd
+{
+struct VectorGraphicSearchContext
+{
+bool mbCurrentIsVectorGraphic;
+std::unique_ptr mpVectorGraphicSearch;
+
+VectorGraphicSearchContext()
+: mbCurrentIsVectorGraphic(false)
+{
+}
+
+void reset()
+{
+mbCurrentIsVectorGraphic = false;
+mpVectorGraphicSearch.reset();
+}
+};
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index e88424122877..dc85e22d2b26 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "smarttag.hxx"
 
@@ -220,6 +221,8 @@ public:
 void SetAuthor(const OUString& rAuthor) { m_sAuthor = rAuthor; }
 const OUString& GetAuthor() { return m_sAuthor; }
 
+VectorGraphicSearchContext& getVectorGraphicSearchContext() { return 
aVectorGraphicSearchContext; }
+
 protected:
 DECL_LINK( OnParagraphInsertedHdl, ::Outliner::ParagraphHdlParam, void );
 DECL_LINK( OnParagraphRemovingHdl, ::Outliner::ParagraphHdlParam, void );
@@ -253,6 +256,9 @@ protected:
 private:
 ::std::unique_ptr mpClipboard;
 OutlinerMasterViewFilter maMasterViewFilter;
+
+VectorGraphicSearchContext aVectorGraphicSearchContext;
+
 OUString m_sAuthor;
 };
 
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 34f709ce9fb5..984e939b0634 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -76,6 +76,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -114,11 +115,6 @@ public:
 */
 void ReleaseOutlinerView();
 
-/** Search in vector graphic
- */
-bool mbCurrentIsVectorGraphic;
-std::unique_ptr mpVectorGraphicSearch;
-
 private:
 /** Flag that specifies whether we own the outline view pointed to by
 mpOutlineView and thus have to
@@ -757,9 +753,10 @@ void 
SdOutliner::sendLOKSearchResultCallback(std::shared_ptr & pV
  std::vector* 
pSelections)
 {
 std::vector<::tools::Rectangle> aLogicRects;
-if (mpImpl->mbCurrentIsVectorGraphic)
+auto& rVectorGraphicSearchContext = 
pViewShell->GetView()->getVectorGraphicSearchContext();
+if (rVectorGraphicSearchContext.mbCurrentIsVectorGraphic)
 {
-basegfx::B2DRectangle aSelectionHMM = 
getPDFSelection(mpImpl->mpVectorGraphicSearch, mpObj);
+basegfx::B2DRectangle aSelectionHMM = 
getPDFSelection(rVectorGraphicSearchContext.mpVectorGraphicSearch, mpObj);
 
 tools::Rectangle aSelection(Point(aSelectionHMM.getMinX(), 
aSelectionHMM.getMinY()),
 

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

[Tomaž Vajngerl (via logerrit)]

 include/vcl/vectorgraphicdata.hxx |5 +
 vcl/inc/impgraph.hxx  |1 +
 vcl/source/gdi/impgraph.cxx   |   20 +++-
 3 files changed, 25 insertions(+), 1 deletion(-)

New commits:
commit a492113452c64194d93c0e12b6a02558fac860dd
Author: Tomaž Vajngerl 
AuthorDate: Wed Jul 29 20:57:40 2020 +0200
Commit: Tomaž Vajngerl 
CommitDate: Tue Sep 1 09:24:32 2020 +0200

vcl: save and load the page number when swapping the graphic

PDF vector graphic includes a page number, of the page that the
graphic is rendering. This however isn't remembered when swapping
out and back in the graphic, because the serialization format
doesn't include it.

This adds a version 2 of the serialization format, with an
additional page number (page index) attribute.

Also changes the GraphicTest to account for an additional 4 bytes
written and the change of the checksum.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100836
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 28beaffba6a0ecaf351c84bed41443a6721d85b6)

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100883
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit d6b4a0a9a3fed1ba07125d7e9517f0a663fc4018)

Change-Id: Ic0fbfc4ad983f7880e06956da3b4664bd4b610d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101760
Tested-by: Tomaž Vajngerl 
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/vcl/vectorgraphicdata.hxx 
b/include/vcl/vectorgraphicdata.hxx
index 75688d2b00a7..d37f313e941a 100644
--- a/include/vcl/vectorgraphicdata.hxx
+++ b/include/vcl/vectorgraphicdata.hxx
@@ -112,6 +112,11 @@ public:
 
 sal_Int32 getPageIndex() const { return std::max(sal_Int32(0), 
mnPageIndex); }
 
+void setPageIndex(sal_Int32 nPageIndex)
+{
+mnPageIndex = nPageIndex;
+}
+
 bool isPrimitiveSequenceCreated() const { return mbSequenceCreated; }
 };
 
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index 4b13463c949f..5ab71a1faaf4 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -35,6 +35,7 @@ struct ImpSwapInfo
 bool mbIsAlpha;
 
 sal_uInt32 mnAnimationLoopCount;
+sal_Int32 mnPageIndex;
 };
 
 class OutputDevice;
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 065bf3db4385..58985bc61d4e 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -449,6 +449,7 @@ void ImpGraphic::ImplCreateSwapInfo()
 maSwapInfo.mbIsTransparent = ImplIsTransparent();
 maSwapInfo.mbIsAlpha = ImplIsAlpha();
 maSwapInfo.mnAnimationLoopCount = ImplGetAnimationLoopCount();
+maSwapInfo.mnPageIndex = getPageNumber();
 }
 }
 
@@ -526,6 +527,9 @@ void ImpGraphic::ImplSetPrepared(bool bAnimated, Size* 
pSizeHint)
 maSwapInfo.mbIsTransparent = false;
 maSwapInfo.mbIsAlpha = false;
 maSwapInfo.mbIsAnimated = bAnimated;
+
+if (maVectorGraphicData)
+maSwapInfo.mnPageIndex = maVectorGraphicData->getPageIndex();
 }
 
 void ImpGraphic::ImplClear()
@@ -1201,6 +1205,7 @@ bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm )
 SizeaSize;
 sal_uInt32  nId;
 sal_Int32   nType;
+sal_Int32   nPageIndex = -1;
 const SvStreamEndian nOldFormat = rIStm.GetEndian();
 boolbRet = false;
 
@@ -1218,6 +1223,11 @@ bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm )
 rIStm.ReadInt32( nLen );
 ReadPair( rIStm, aSize );
 ReadMapMode( rIStm, aMapMode );
+
+if (pCompat->GetVersion() >= 2)
+{
+rIStm.ReadInt32(nPageIndex);
+}
 }
 else
 {
@@ -1316,6 +1326,8 @@ bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm )
 {
 ImplSetPrefMapMode( aMapMode );
 ImplSetPrefSize( aSize );
+if (maVectorGraphicData)
+maVectorGraphicData->setPageIndex(nPageIndex);
 }
 }
 else
@@ -1348,7 +1360,7 @@ bool ImpGraphic::ImplWriteEmbedded( SvStream& rOStm )
 rOStm.WriteUInt32( GRAPHIC_FORMAT_50 );
 
 // write new style header
-std::unique_ptr pCompat( new VersionCompat( rOStm, 
StreamMode::WRITE, 1 ) );
+std::unique_ptr pCompat( new VersionCompat( rOStm, 
StreamMode::WRITE, 2 ) );
 
 rOStm.WriteInt32( static_cast(meType) );
 
@@ -1358,6 +1370,9 @@ bool ImpGraphic::ImplWriteEmbedded( SvStream& rOStm )
 
 WritePair( rOStm, aSize );
 WriteMapMode( rOStm, aMapMode );
+
+// Version 2
+rOStm.WriteInt32(getPageNumber());
 }
 else
 {
@@ -1701,6 +1716,9 @@ bool ImpGraphic::ImplExportNative( SvStream& rOStm ) const
 
 sal_Int32 ImpGraphic::getPageNumber() const
 {
+if (ImplIsSwapOut())
+return maSwapInfo.mnPageIndex;
+
 if (maVectorGraphicData)

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

[Andrea Gelmini (via logerrit)]

 reportdesign/source/filter/xml/xmlExport.cxx|6 +++---
 reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx |6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 34aaf2a45e11fef533e0885ccf39731a79a99b91
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 14:31:17 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 09:24:19 2020 +0200

Fix typo in code

It passed "make check" on Linux

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

diff --git a/reportdesign/source/filter/xml/xmlExport.cxx 
b/reportdesign/source/filter/xml/xmlExport.cxx
index 6bae91a3c289..e692bf76724f 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -1242,9 +1242,9 @@ void ORptExport::exportReportAttributes(const 
Reference& _xRe
 if ( SvXMLUnitConverter::convertEnum( sValue, _xReport->getCommandType(), 
aXML_CommandTypeEnumMap ) )
 AddAttribute(XML_NAMESPACE_REPORT, 
XML_COMMAND_TYPE,sValue.makeStringAndClear());
 
-OUString sComamnd = _xReport->getCommand();
-if ( !sComamnd.isEmpty() )
-AddAttribute(XML_NAMESPACE_REPORT, XML_COMMAND, sComamnd);
+OUString sCommand = _xReport->getCommand();
+if ( !sCommand.isEmpty() )
+AddAttribute(XML_NAMESPACE_REPORT, XML_COMMAND, sCommand);
 
 OUString sFilter( _xReport->getFilter() );
 if ( !sFilter.isEmpty() )
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx 
b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
index 0edf26d7cb78..416e3e1e0974 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
@@ -135,9 +135,9 @@ void SAL_CALL ExportDocumentHandler::startElement(const 
OUString & _sName, const
 {
 
pList->AddAttribute(lcl_createAttribute(XML_NP_RPT,XML_COMMAND_TYPE),sValue.makeStringAndClear());
 }
-const OUString sComamnd = m_xDatabaseDataProvider->getCommand();
-if ( !sComamnd.isEmpty() )
-
pList->AddAttribute(lcl_createAttribute(XML_NP_RPT,XML_COMMAND),sComamnd);
+const OUString sCommand = m_xDatabaseDataProvider->getCommand();
+if ( !sCommand.isEmpty() )
+
pList->AddAttribute(lcl_createAttribute(XML_NP_RPT,XML_COMMAND),sCommand);
 
 const OUString sFilter( m_xDatabaseDataProvider->getFilter() );
 if ( !sFilter.isEmpty() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 reportdesign/source/filter/xml/xmlExport.cxx|4 ++--
 reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 053ed44d0ddd071fa6894d6c05667bf796ad653f
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 14:30:03 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 09:23:49 2020 +0200

Fix typo in code

It passed "make check" on Linux

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

diff --git a/reportdesign/source/filter/xml/xmlExport.cxx 
b/reportdesign/source/filter/xml/xmlExport.cxx
index 47b2dc6e3f29..6bae91a3c289 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -1238,8 +1238,8 @@ void ORptExport::exportReportAttributes(const 
Reference& _xRe
 return;
 
 OUStringBuffer sValue;
-const SvXMLEnumMapEntry* aXML_CommnadTypeEnumMap = 
OXMLHelper::GetCommandTypeOptions();
-if ( SvXMLUnitConverter::convertEnum( sValue, _xReport->getCommandType(), 
aXML_CommnadTypeEnumMap ) )
+const SvXMLEnumMapEntry* aXML_CommandTypeEnumMap = 
OXMLHelper::GetCommandTypeOptions();
+if ( SvXMLUnitConverter::convertEnum( sValue, _xReport->getCommandType(), 
aXML_CommandTypeEnumMap ) )
 AddAttribute(XML_NAMESPACE_REPORT, 
XML_COMMAND_TYPE,sValue.makeStringAndClear());
 
 OUString sComamnd = _xReport->getCommand();
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx 
b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
index 5e02ded4d7b9..0edf26d7cb78 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
@@ -125,13 +125,13 @@ void SAL_CALL ExportDocumentHandler::startElement(const 
OUString & _sName, const
 SvXMLAttributeList* pList = new SvXMLAttributeList();
 uno::Reference< xml::sax::XAttributeList > xNewAttribs = pList;
 OUStringBuffer sValue;
-static const SvXMLEnumMapEntry aXML_CommnadTypeEnumMap[] =
+static const SvXMLEnumMapEntry aXML_CommandTypeEnumMap[] =
 {
 { XML_TABLE, sdb::CommandType::TABLE },
 { XML_QUERY, sdb::CommandType::QUERY },
 { XML_TOKEN_INVALID, 0 }
 };
-if ( SvXMLUnitConverter::convertEnum( sValue, 
static_cast(m_xDatabaseDataProvider->getCommandType()),aXML_CommnadTypeEnumMap
 ) )
+if ( SvXMLUnitConverter::convertEnum( sValue, 
static_cast(m_xDatabaseDataProvider->getCommandType()),aXML_CommandTypeEnumMap
 ) )
 {
 
pList->AddAttribute(lcl_createAttribute(XML_NP_RPT,XML_COMMAND_TYPE),sValue.makeStringAndClear());
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini (via logerrit)]

 filter/qa/complex/filter/misc/FinalizedMandatoryTest.java |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit c9f5878a24fbf812b513fda5dbd2468763a4a6c3
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 14:37:45 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 09:23:18 2020 +0200

Fix typo in code

It passed "make check" on Linux

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

diff --git a/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java 
b/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java
index d9fb68e6e0b8..28a71aaab30b 100644
--- a/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java
+++ b/filter/qa/complex/filter/misc/FinalizedMandatoryTest.java
@@ -133,8 +133,8 @@ public class FinalizedMandatoryTest
 oObj = getTestObject(serviceName);
 System.out.println("ImplName: " + util.utils.getImplName(oObj));
 
-boolean mandantoryTrue = false;
-boolean mandantoryFalse = false;
+boolean mandatoryTrue = false;
+boolean mandatoryFalse = false;
 boolean finalizedTrue = false;
 boolean finalizedFalse = false;
 
@@ -174,8 +174,8 @@ public class FinalizedMandatoryTest
 boolean isFinalized = ((Boolean) getPropertyValueValue(props, 
"Finalized")).booleanValue();
 
 // memory if every state is available
-mandantoryTrue |= isMandatory;
-mandantoryFalse |= !isMandatory;
+mandatoryTrue |= isMandatory;
+mandatoryFalse |= !isMandatory;
 
 finalizedTrue |= isFinalized;
 finalizedFalse |= !isFinalized;
@@ -222,8 +222,8 @@ public class FinalizedMandatoryTest
 }
 String preMsg = "Could not find filter with state ";
 String postMsg = " Please check if such filter is installed!";
-assertTrue(preMsg + "'Mandatory=true'" + postMsg, mandantoryTrue);
-assertTrue(preMsg + "'Mandatory=false'" + postMsg, mandantoryFalse);
+assertTrue(preMsg + "'Mandatory=true'" + postMsg, mandatoryTrue);
+assertTrue(preMsg + "'Mandatory=false'" + postMsg, mandatoryFalse);
 assertTrue(preMsg + "'Finalized=true'" + postMsg, finalizedTrue);
 assertTrue(preMsg + "'Finalized=false'" + postMsg, finalizedFalse);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - dbaccess/source include/svx svx/Library_svxcore.mk svx/source

[Aditya (via logerrit)]

 dbaccess/source/ui/querydesign/QueryDesignView.cxx |   12 -
 include/svx/gallerybinaryengine.hxx|3 +-
 include/svx/galleryfilestorage.hxx |   28 +
 svx/Library_svxcore.mk |1 
 svx/source/gallery2/galleryfilestorage.cxx |   24 ++
 5 files changed, 61 insertions(+), 7 deletions(-)

New commits:
commit 5694dc279e5f0f78b1bb669b22070881ab012f1a
Author: Aditya 
AuthorDate: Mon Aug 3 22:50:53 2020 +0530
Commit: Tomaž Vajngerl 
CommitDate: Tue Sep 1 09:22:56 2020 +0200

svx: Introduce GalleryFileStorage

Abstract class for GalleryBinaryEngine and upcoming GalleryXMLEngine. This
 interface will be used by GalleryTheme.

Change-Id: I2193e3ea9860c41a1580d5ca59da68bf41b70a3d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100025
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/svx/gallerybinaryengine.hxx 
b/include/svx/gallerybinaryengine.hxx
index eb9e0b291de1..e8353d11af5a 100644
--- a/include/svx/gallerybinaryengine.hxx
+++ b/include/svx/gallerybinaryengine.hxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -40,7 +41,7 @@ class FmFormModel;
 class GalleryTheme;
 class GalleryThemeEntry;
 
-class SVXCORE_DLLPUBLIC GalleryBinaryEngine
+class SVXCORE_DLLPUBLIC GalleryBinaryEngine : public GalleryFileStorage
 {
 private:
 tools::SvRef m_aSvDrawStorageRef;
diff --git a/include/svx/galleryfilestorage.hxx 
b/include/svx/galleryfilestorage.hxx
new file mode 100644
index ..fee632e9b397
--- /dev/null
+++ b/include/svx/galleryfilestorage.hxx
@@ -0,0 +1,28 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+class GalleryFileStorage
+{
+public:
+virtual ~GalleryFileStorage() = 0;
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 4898c073764d..208effe3bef2 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -156,6 +156,7 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
 svx/source/gallery2/gallerybinaryengineentry \
 svx/source/gallery2/gallerystoragelocations \
 svx/source/gallery2/galleryobjectcollection \
+svx/source/gallery2/galleryfilestorage \
 svx/source/items/chrtitem \
 svx/source/items/clipfmtitem \
 svx/source/items/customshapeitem \
diff --git a/svx/source/gallery2/galleryfilestorage.cxx 
b/svx/source/gallery2/galleryfilestorage.cxx
new file mode 100644
index ..dd8e74cd3af4
--- /dev/null
+++ b/svx/source/gallery2/galleryfilestorage.cxx
@@ -0,0 +1,24 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include 
+
+GalleryFileStorage::~GalleryFileStorage(){};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 13c1d05570854219bc94149bff646cba831d4cbd
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 14:39:43 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 09:22:45 2020 +0200

FIx typo in code

It passed "make check" on Linux

Change-Id: I055db4ca15e2e8c4c66d5970404c292255c15628
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101778
Tested-by: Jenkins
Re

[Libreoffice-commits] core.git: ios/LibreOfficeLight

[Andrea Gelmini (via logerrit)]

 ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9b44940ec94f3fc2f4591ba2aca09c6a029c7799
Author: Andrea Gelmini 
AuthorDate: Mon Aug 31 14:32:46 2020 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 1 09:22:09 2020 +0200

Fix typo in code

It passed "make check" on Linux

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

diff --git a/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift 
b/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
index 5743a1f4e7c9..d06ccac4e728 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
+++ b/ios/LibreOfficeLight/LibreOfficeLight/DocumentController.swift
@@ -395,9 +395,9 @@ class DocumentController: UIViewController, MenuDelegate, 
UIDocumentBrowserViewC
 // TODO - cleanup
 self.document = nil
 }
-if let exisitingView = self.documentView
+if let existingView = self.documentView
 {
-exisitingView.removeFromSuperview()
+existingView.removeFromSuperview()
 self.documentView = nil // forces the close of the view and it's 
held documents before we setup the new one
 }
 // also remove current overlays and start fresh
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits