date:20211110

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

2021-11-10 Thread Julien Nabet (via logerrit)

 dbaccess/source/core/api/CRowSetColumn.cxx |   42 -
 dbaccess/source/core/api/CRowSetDataColumn.cxx |   42 -
 dbaccess/source/core/api/definitioncolumn.cxx  |   28 
 dbaccess/source/core/api/resultcolumn.cxx  |   42 -
 dbaccess/source/core/api/resultset.cxx |   12 +++
 dbaccess/source/core/api/statement.cxx |   20 +--
 dbaccess/source/core/dataaccess/datasource.cxx |   22 ++---
 dbaccess/source/inc/apitools.hxx   |   15 
 8 files changed, 104 insertions(+), 119 deletions(-)

New commits:
commit c9c9b8ec542d3c491159f23d0deb5358d4142486
Author: Julien Nabet 
AuthorDate: Wed Nov 10 23:10:01 2021 +0100
Commit: Julien Nabet 
CommitDate: Thu Nov 11 08:33:45 2021 +0100

Replace some macros in dbaccess part 4

Remove DECL_PROP0_BOOL + DECL_PROP1_BOOL + DECL_PROP0/1/2

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

diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx 
b/dbaccess/source/core/api/CRowSetColumn.cxx
index cef90a8e8521..d8e2d18c0ff6 100644
--- a/dbaccess/source/core/api/CRowSetColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetColumn.cxx
@@ -44,27 +44,27 @@ ORowSetColumn::ORowSetColumn( const Reference < 
XResultSetMetaData >& _xMetaData
 {
 BEGIN_PROPERTY_SEQUENCE(21)
 
-DECL_PROP1( CATALOGNAME,OUString,READONLY );
-DECL_PROP1( DISPLAYSIZE,sal_Int32,  READONLY );
-DECL_PROP1_BOOL( ISAUTOINCREMENT,   READONLY );
-DECL_PROP1_BOOL( ISCASESENSITIVE,   READONLY );
-DECL_PROP1_BOOL( ISCURRENCY,READONLY );
-DECL_PROP1_BOOL( ISDEFINITELYWRITABLE,  READONLY );
-DECL_PROP1( ISNULLABLE, sal_Int32,  READONLY );
-DECL_PROP1_BOOL( ISREADONLY,BOUND );
-DECL_PROP1_BOOL( ISROWVERSION,  READONLY );
-DECL_PROP1_BOOL( ISSEARCHABLE,  READONLY );
-DECL_PROP1_BOOL( ISSIGNED,  READONLY );
-DECL_PROP1_BOOL( ISWRITABLE,READONLY );
-DECL_PROP1( LABEL,  OUString,READONLY );
-DECL_PROP1( PRECISION,  sal_Int32,  READONLY );
-DECL_PROP1( SCALE,  sal_Int32,  READONLY );
-DECL_PROP1( SCHEMANAME, OUString,READONLY );
-DECL_PROP1( SERVICENAME,OUString,READONLY );
-DECL_PROP1( TABLENAME,  OUString,READONLY );
-DECL_PROP1( TYPE,   sal_Int32,  READONLY );
-DECL_PROP1( TYPENAME,   OUString,READONLY );
-DECL_PROP2( VALUE,  Any,READONLY, 
BOUND );
+DECL_PROP_IMPL(CATALOGNAME, cppu::UnoType::get()) 
css::beans::PropertyAttribute::READONLY );
+DECL_PROP_IMPL(DISPLAYSIZE, cppu::UnoType::get()) 
css::beans::PropertyAttribute::READONLY );
+DECL_PROP_IMPL(ISAUTOINCREMENT, cppu::UnoType::get()) 
css::beans::PropertyAttribute::READONLY );
+DECL_PROP_IMPL(ISCASESENSITIVE, cppu::UnoType::get()) 
css::beans::PropertyAttribute::READONLY );
+DECL_PROP_IMPL(ISCURRENCY, cppu::UnoType::get()) 
css::beans::PropertyAttribute::READONLY );
+DECL_PROP_IMPL(ISDEFINITELYWRITABLE, cppu::UnoType::get()) 
css::beans::PropertyAttribute::READONLY );
+DECL_PROP_IMPL(ISNULLABLE, cppu::UnoType::get()) 
css::beans::PropertyAttribute::READONLY );
+DECL_PROP_IMPL(ISREADONLY, cppu::UnoType::get()) 
css::beans::PropertyAttribute::BOUND );
+DECL_PROP_IMPL(ISROWVERSION, cppu::UnoType::get()) 
css::beans::PropertyAttribute::READONLY );
+DECL_PROP_IMPL(ISSEARCHABLE, cppu::UnoType::get()) 
css::beans::PropertyAttribute::READONLY );
+DECL_PROP_IMPL(ISSIGNED, cppu::UnoType::get()) 
css::beans::PropertyAttribute::READONLY );
+DECL_PROP_IMPL(ISWRITABLE, cppu::UnoType::get()) 
css::beans::PropertyAttribute::READONLY );
+DECL_PROP_IMPL(LABEL, cppu::UnoType::get()) 
css::beans::PropertyAttribute::READONLY );
+DECL_PROP_IMPL(PRECISION, cppu::UnoType::get()) 
css::beans::PropertyAttribute::READONLY );
+DECL_PROP_IMPL(SCALE, cppu::UnoType::get()) 
css::beans::PropertyAttribute::READONLY );
+DECL_PROP_IMPL(SCHEMANAME, cppu::UnoType::get()) 
css::beans::PropertyAttribute::READONLY );
+DECL_PROP_IMPL(SERVICENAME, cppu::UnoType::get()) 
css::beans::PropertyAttribute::READONLY );
+DECL_PROP_IMPL(TABLENAME, cppu::UnoType::get()) 
css::beans::PropertyAttribute::READONLY );
+DECL_PROP_IMPL(TYPE, cppu::UnoType::get()) 
css::beans::PropertyAttribute::READONLY );
+DECL_PROP_IMPL(TYPENAME, cppu::UnoType::get(

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

2021-11-10 Thread Michael Weghorn (via logerrit)

 vcl/qt5/QtFrame.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit f029fb6262b9a001e6cbfd60565b01a7b99ea627
Author: Michael Weghorn 
AuthorDate: Wed Nov 10 16:19:26 2021 +0100
Commit: Michael Weghorn 
CommitDate: Thu Nov 11 08:27:28 2021 +0100

qt (>=5.14): Don't create native window for QWidget in QtFrame::screen

For Qt >= 5.14, directly use 'QWidget::screen' (added in Qt 5.14)
to retrieve the screen that the widget is on, rather than first
retrieving a window handle, which forces a platform-native
window to be created.

Due to QTBUG-75766 [1], forcing the creation of
native windows also leads to mouseMoveEvents
not being reliably emitted by Qt, s.

commit 0e3c3b842e14b9646d3697cf1266be21359e0f13
Author: Michael Weghorn 
Date:   Sat May 11 21:31:33 2019 +0200

tdf#122293 qt5: Use "alien widgets" by default on Wayland

for more details.

The behaviour described in tdf#122293 started showing
up again after

commit b00a68a8e19370e106cd76258a3c1825f43613ee
Date:   Sun Oct 31 02:33:46 2021 +0200

tdf#145363 Qt reparent modal dialogs on show

but that just seems to have been a side-effect of
'QWidget::screen' now being called in different ways
than previously.

[1] https://bugreports.qt.io/browse/QTBUG-75766

Change-Id: Ic11923cef5e704c09494f96b19157372a869ae40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124997
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx
index 591e084edf38..db91e48a256c 100644
--- a/vcl/qt5/QtFrame.cxx
+++ b/vcl/qt5/QtFrame.cxx
@@ -363,8 +363,15 @@ QWindow* QtFrame::windowHandle() const
 
 QScreen* QtFrame::screen() const
 {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+return asChild()->screen();
+#else
+// QWidget::screen only available from Qt 5.14 on, call windowHandle(),
+// with the indirect result that mouse move events on Wayland will not be
+// emitted reliably, s. QTBUG-75766
 QWindow* const pWindow = windowHandle();
 return pWindow ? pWindow->screen() : nullptr;
+#endif
 }
 
 bool QtFrame::isMinimized() const { return asChild()->isMinimized(); }

[Libreoffice-commits] core.git: download.lst

2021-11-10 Thread Miklos Vajna (via logerrit)

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 84991e145c9e735240114e6ec4b94993060fb6c4
Author: Miklos Vajna 
AuthorDate: Wed Nov 10 20:26:23 2021 +0100
Commit: Miklos Vajna 
CommitDate: Thu Nov 11 08:14:06 2021 +0100

external: update libxmlsec to 1.2.33

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

diff --git a/download.lst b/download.lst
index f0d5bfcdc2b9..0d48e0691625 100644
--- a/download.lst
+++ b/download.lst
@@ -164,8 +164,8 @@ export LIBNUMBERTEXT_SHA256SUM := 
17b8249cb89ae11ae15a85612d2665626c0e0e3e56b356
 export LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.7.tar.xz
 export LIBTOMMATH_SHA256SUM := 
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
 export LIBTOMMATH_TARBALL := ltm-1.0.zip
-export XMLSEC_SHA256SUM := 
e383702853236004e5b08e424b8afe9b53fe9f31aaa7a5382f39d9533eb7c043
-export XMLSEC_TARBALL := xmlsec1-1.2.32.tar.gz
+export XMLSEC_SHA256SUM := 
26041d35a20a245ed5a2fb9ee075f10825664d274220cb5190340fa87a4d0931
+export XMLSEC_TARBALL := xmlsec1-1.2.33.tar.gz
 export LIBXML_SHA256SUM := 
c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92
 export LIBXML_VERSION_MICRO := 12
 export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz

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

2021-11-10 Thread Jim Raykowski (via logerrit)

 sw/source/uibase/utlui/content.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit cf636b3f5b033d1f1bf511958df96391d81b04df
Author: Jim Raykowski 
AuthorDate: Wed Nov 10 17:50:48 2021 -0900
Commit: Jim Raykowski 
CommitDate: Thu Nov 11 07:00:25 2021 +0100

SwNavigator: account for footnotes separator line in initial count

The separator line needs to be accounted for in the initial footnotes
members count to be shown without delay on first footnote insert and on
first display of the content tree when there are only footnotes, no
endnotes, in the document and also for the last endnote to be shown
without delay on first display of the content tree.

Change-Id: I09a5ad8a0cb4463518a91d680741b49b572cadc9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125019
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index f877617e13a5..f938d8e2617a 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -417,12 +417,14 @@ void SwContentType::Init(bool* pbInvalidateWindow)
 break;
 case ContentTypeId::FOOTNOTE:
 {
-m_nMemberCount = 0;
 m_sTypeToken.clear();
 m_bEdit = true;
 m_bDelete = false;
 const SwFootnoteIdxs& rFootnoteIdxs = 
m_pWrtShell->GetDoc()->GetFootnoteIdxs();
 m_nMemberCount = rFootnoteIdxs.size();
+// account for the separator line
+if (m_nMemberCount > 0)
+m_nMemberCount++;
 }
 break;
 case ContentTypeId::BOOKMARK:

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

2021-11-10 Thread Jim Raykowski (via logerrit)

 sw/qa/uitest/navigator/tdf114724.py |5 +
 sw/source/uibase/utlui/navipi.cxx   |   25 +
 2 files changed, 18 insertions(+), 12 deletions(-)

New commits:
commit 11d3ff1b64424d4f2c660539872f981ab3ed80c8
Author: Jim Raykowski 
AuthorDate: Wed Oct 27 21:43:10 2021 -0800
Commit: Jim Raykowski 
CommitDate: Thu Nov 11 06:59:56 2021 +0100

SwNavigator: use stored root-type setting for both Navigator types

Currently the RootType setting stored in Navigator configuration is
used only by the floating Navigator to restore the root type setting on
program start to the setting at the end of the previous session. This
patch makes the sidebar Navigator use this stored setting.

Change-Id: I654f4eb4890351196e64796e4a48031424259a5f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124456
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/sw/qa/uitest/navigator/tdf114724.py 
b/sw/qa/uitest/navigator/tdf114724.py
index ebb354bf37b2..ee1f572d38ed 100644
--- a/sw/qa/uitest/navigator/tdf114724.py
+++ b/sw/qa/uitest/navigator/tdf114724.py
@@ -45,6 +45,11 @@ class tdf114724(UITestCase):
 
self.assertEqual(get_state_as_dict(xContentTree)["SelectEntryText"], "HEADING 
1")
 
self.assertEqual(get_state_as_dict(xContentTree)["SelectionCount"], "1")
 
+# tdf#124456 makes the sidebar navigator consistent with the 
floating navigator's use
+# of the stored root mode setting. This requires the root mode 
button to be clicked
+# here to change the content navigation view back to all 
categories view for subsequent
+# tests that expect the navigator tree to not be in root mode.
+xToolBar.executeAction("CLICK", mkPropertyValues({"POS": "0"})) # 
'root' button
 self.xUITest.executeCommand(".uno:Sidebar")
 
 # vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sw/source/uibase/utlui/navipi.cxx 
b/sw/source/uibase/utlui/navipi.cxx
index feee92814c34..f964a86957c8 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -538,6 +538,19 @@ SwNavigationPI::SwNavigationPI(weld::Widget* pParent,
 m_xContentTree->SetFieldTracking(m_pConfig->IsFieldTracking());
 m_xContentTree->SetFootnoteTracking(m_pConfig->IsFootnoteTracking());
 
+if (const ContentTypeId nRootType = m_pConfig->GetRootType();
+nRootType != ContentTypeId::UNKNOWN)
+{
+m_xContentTree->SetRootType(nRootType);
+m_xContent5ToolBox->set_item_active("root", true);
+if (nRootType == ContentTypeId::OUTLINE || nRootType == 
ContentTypeId::DRAWOBJECT)
+m_xContentTree->set_selection_mode(SelectionMode::Multiple);
+else
+m_xContentTree->set_selection_mode(SelectionMode::Single);
+}
+else
+m_xContentTree->set_selection_mode(SelectionMode::Single);
+
 UpdateInitShow();
 
 GetCreateView();
@@ -592,7 +605,6 @@ SwNavigationPI::SwNavigationPI(weld::Widget* pParent,
 
 SetRegionDropMode(m_pConfig->GetRegionMode());
 
-m_xContentTree->set_selection_mode(SelectionMode::Single);
 m_xContentTree->ShowTree();
 m_xContent6ToolBox->set_item_active("listbox", true);
 m_xContent6ToolBox->set_item_sensitive("listbox", bFloatingNavigator);
@@ -1137,17 +1149,6 @@ SwNavigatorWin::SwNavigatorWin(SfxBindings* _pBindings, 
SfxChildWindow* _pMgr,
 
 SwNavigationConfig* pNaviConfig = SW_MOD()->GetNavigationConfig();
 
-const ContentTypeId nRootType = pNaviConfig->GetRootType();
-if( nRootType != ContentTypeId::UNKNOWN )
-{
-m_xNavi->m_xContentTree->SetRootType(nRootType);
-m_xNavi->m_xContent5ToolBox->set_item_active("root", true);
-if (nRootType == ContentTypeId::OUTLINE || nRootType == 
ContentTypeId::DRAWOBJECT)
-{
-
m_xNavi->m_xContentTree->set_selection_mode(SelectionMode::Multiple);
-}
-}
-
 SetMinOutputSizePixel(GetOptimalSize());
 if (pNaviConfig->IsSmall())
 m_xNavi->ZoomIn();

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

2021-11-10 Thread Jim Raykowski (via logerrit)

 sw/source/uibase/utlui/content.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 40fa74fc468ba18c75e8547faff41710ae6fbbef
Author: Jim Raykowski 
AuthorDate: Mon Nov 8 15:21:29 2021 -0900
Commit: Jim Raykowski 
CommitDate: Thu Nov 11 06:59:21 2021 +0100

SwNavigator: Don't include Postit fields in Fields member count

To determine if the Navigator content tree needs refreshed, content
type members arrays are filled with current document content and
compared with content in the Navigator content tree. If the member
count between the members in the content type array and the members in
the content type in the tree differs, the tree is updated and
redisplayed.

This patch fixes a bug that the Fields content members array count
includes Postit fields but Postit fields are not included in the tree
members for the Fields content type. This causes the count in the
Fields content type members array to always be different than the
number of members in the Fields content type in the tree when there are
Postit fields in the document.

Change-Id: I399619f78ee1fc91729a47d403ae403cda9f95cc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124894
Tested-by: Jenkins
Reviewed-by: Jim Raykowski 

diff --git a/sw/source/uibase/utlui/content.cxx 
b/sw/source/uibase/utlui/content.cxx
index 313c123bd932..f877617e13a5 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -396,7 +396,6 @@ void SwContentType::Init(bool* pbInvalidateWindow)
 break;
 case ContentTypeId::TEXTFIELD:
 {
-m_nMemberCount = 0;
 m_sTypeToken.clear();
 m_bEdit = true;
 m_bDelete = true;
@@ -409,7 +408,8 @@ void SwContentType::Init(bool* pbInvalidateWindow)
 pFieldType->GatherFields(vFields);
 for (SwFormatField* pFormatField: vFields)
 {
-if (pFormatField->GetTextField())
+SwField* pField = pFormatField->GetField();
+if (pField && pField->GetTypeId() != 
SwFieldTypesEnum::Postit)
 m_nMemberCount++;
 }
 }
@@ -793,7 +793,9 @@ void SwContentType::FillMemberList(bool* 
pbLevelOrVisibilityChanged)
 pFieldType->GatherFields(vFields);
 for (SwFormatField* pFormatField: vFields)
 {
-if (SwTextField* pTextField = pFormatField->GetTextField())
+SwTextField* pTextField = pFormatField->GetTextField();
+SwField* pField = pFormatField->GetField();
+if (pTextField && pField && pField->GetTypeId() != 
SwFieldTypesEnum::Postit)
 {
 const SwTextNode& rTextNode = 
pTextField->GetTextNode();
 std::unique_ptr
@@ -807,8 +809,6 @@ void SwContentType::FillMemberList(bool* 
pbLevelOrVisibilityChanged)
 const SwTextField* pTextField = aSrtLst[i]->GetTextField();
 const SwFormatField& rFormatField = 
pTextField->GetFormatField();
 const SwField* pField = rFormatField.GetField();
-if (pField->GetTypeId() == SwFieldTypesEnum::Postit)
-continue;
 OUString sExpandedField(pField->ExpandField(true, 
m_pWrtShell->GetLayout()));
 if (!sExpandedField.isEmpty())
 sExpandedField = u" - " + sExpandedField;

Deadline for ESC budget voting proposals: 28th of November (2.5 weeks from now)

2021-11-10 Thread Thorsten Behrens

Hi *,

Miklos Vajna wrote:
> * Budget 2022 (Xisco)
> + https://wiki.documentfoundation.org/Development/Budget2022
> + ideas are welcome till the end of the year
> + earlier deadline? (Thorsten)
>   + take list if ideas with estimates by end Nov?
> AI: give a heads-up on the dev list about this (Thorsten)
>   + and give a heads-up when the deadline is approaching
>   + and have 2 weeks for the vote
> 
As discussed last week, lets finish the proposal period by the end of
the month. I suggest the following timeline:

* Sunday, 28th of November: end of proposal period
  (see wiki page above. valid proposals must include estimation by a
   certified developer, and reviewers available to the board)
* Thursday, 2nd of December: ESC voting starts
  (I'll prepare the usual budget voting spreadsheet. Eligible voters
   are the formal ESC members:
   
https://www.documentfoundation.org/governance/engineering-steering-committee/)
* Wednesday, 15th of December: ESC voting ends, ESC meeting on the
  16th signs-off on the list & passes on to TDF board

Cheers,

-- Thorsten


signature.asc
Description: PGP signature

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

2021-11-10 Thread Eike Rathke (via logerrit)

 basic/qa/vba_tests/collection.vb   |   10 ++
 i18nutil/source/utility/casefolding_data.h |   10 ++
 2 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 07a2afa4904ac51c9c61aaf41a9d6c7d41126531
Author: Eike Rathke 
AuthorDate: Wed Nov 10 16:00:42 2021 +0100
Commit: Eike Rathke 
CommitDate: Thu Nov 11 01:27:47 2021 +0100

Resolves: tdf#110003 tdf#143128 handle lowercase ß vs uppercase ẞ folding

Change lowercase ß U+00DF LATIN SMALL LETTER SHARP S from
LowerToUpper, ToUpper: SS
ToTitle: Ss
FullFolding: ss
to
LowerToUpper, ToUpper: ẞ  U+1E9E
ToTitle: ẞ  U+1E9E
FullFolding: ss

Add uppercase ẞ U+1E9E LATIN CAPITAL LETTER SHARP S
UpperToLower, ToLower: ß  U+00DF
FullFolding: ss

Adjust BASIC Collection test to new reality.

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

diff --git a/basic/qa/vba_tests/collection.vb b/basic/qa/vba_tests/collection.vb
index 0f0c47a262d9..774f3c4c7904 100644
--- a/basic/qa/vba_tests/collection.vb
+++ b/basic/qa/vba_tests/collection.vb
@@ -56,16 +56,18 @@ Sub verify_testCollection()
 ' tdf#144245 - German Eszett is uppercased to a two-character 'SS'.
 ' This test should fail after tdf#110003 has been fixed since the 
lowercase and the uppercase
 ' German Eszett should be matched to the same index.
-TestUtil.AssertEqual(b.Count, 3, "b.Count")
+' Before the fix of tdf#110003
+'TestUtil.AssertEqual(b.Count, 3, "b.Count")
 ' After the fix of tdf#110003
-' TestUtil.AssertEqual(b.Count, 2, "b.Count")
+TestUtil.AssertEqual(b.Count, 2, "b.Count")
 
 TestUtil.AssertEqual(b.Item("SS"), 1, "b.Item(""SS"")")
 TestUtil.AssertEqual(b.Item("ss"), 1, "b.Item(""ss"")")
 TestUtil.AssertEqual(b.Item("ẞ"), 3, "b.Item(""ẞ"")")
-TestUtil.AssertEqual(b.Item("ß"), 4, "b.Item(""ß"")")
+' Before the fix of tdf#110003
+'TestUtil.AssertEqual(b.Item("ß"), 4, "b.Item(""ß"")")
 ' After the fix of tdf#110003
-' TestUtil.AssertEqual(b.Item("ß"), 3, "b.Item(""ß"")")
+TestUtil.AssertEqual(b.Item("ß"), 3, "b.Item(""ß"")")
 
 Exit Sub
 errorHandler:
diff --git a/i18nutil/source/utility/casefolding_data.h 
b/i18nutil/source/utility/casefolding_data.h
index debacdf8c40d..3ea677e83405 100644
--- a/i18nutil/source/utility/casefolding_data.h
+++ b/i18nutil/source/utility/casefolding_data.h
@@ -307,7 +307,7 @@ const Value CaseMappingValue[] = {
 {0x6a, 0x1E81}, {0x15, 0x1E80}, {0x6a, 0x1E83}, {0x15, 0x1E82}, {0x6a, 
0x1E85}, {0x15, 0x1E84}, {0x6a, 0x1E87}, {0x15, 0x1E86}, // 1e80 - 1e87
 {0x6a, 0x1E89}, {0x15, 0x1E88}, {0x6a, 0x1E8B}, {0x15, 0x1E8A}, {0x6a, 
0x1E8D}, {0x15, 0x1E8C}, {0x6a, 0x1E8F}, {0x15, 0x1E8E}, // 1e88 - 1e8f
 {0x6a, 0x1E91}, {0x15, 0x1E90}, {0x6a, 0x1E93}, {0x15, 0x1E92}, {0x6a, 
0x1E95}, {0x15, 0x1E94}, {0xd5, 0x004F}, {0xd5, 0x0051}, // 1e90 - 1e97
-{0xd5, 0x0053}, {0xd5, 0x0055}, {0xd5, 0x0057}, {0xf5, 0x0059}, {0x00, 
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 1e98 - 1e9f
+{0xd5, 0x0053}, {0xd5, 0x0055}, {0xd5, 0x0057}, {0xf5, 0x0059}, {0x00, 
0x}, {0x00, 0x}, {0xea, 0x015E}, {0x00, 0x}, // 1e98 - 1e9f
 {0x6a, 0x1EA1}, {0x15, 0x1EA0}, {0x6a, 0x1EA3}, {0x15, 0x1EA2}, {0x6a, 
0x1EA5}, {0x15, 0x1EA4}, {0x6a, 0x1EA7}, {0x15, 0x1EA6}, // 1ea0 - 1ea7
 {0x6a, 0x1EA9}, {0x15, 0x1EA8}, {0x6a, 0x1EAB}, {0x15, 0x1EAA}, {0x6a, 
0x1EAD}, {0x15, 0x1EAC}, {0x6a, 0x1EAF}, {0x15, 0x1EAE}, // 1ea8 - 1eaf
 {0x6a, 0x1EB1}, {0x15, 0x1EB0}, {0x6a, 0x1EB3}, {0x15, 0x1EB2}, {0x6a, 
0x1EB5}, {0x15, 0x1EB4}, {0x6a, 0x1EB7}, {0x15, 0x1EB6}, // 1eb0 - 1eb7
@@ -700,9 +700,9 @@ Mapping const CaseMappingExtra[] = {
 {0x8a, 0, {0x, 0x, 0x}}, // 0x00cc (8   0x0008)
 {0x60, 1, {0x00ED, 0x, 0x}}, // 0x00cd (9   0x0009)
 {0x8a, 0, {0x, 0x, 0x}}, // 0x00cd (10  0x000A)
-{0x05, 2, {0x0053, 0x0053, 0x}}, // 0x00df (11  0x000B)
-{0x10, 2, {0x0053, 0x0073, 0x}}, // 0x00df (12  0x000C)
-{0x40, 2, {0x0073, 0x0073, 0x}}, // 0x00df (13  0x000D)
+{0x15, 1, {0x1E9E, 0x, 0x}}, // 0x00df (11  0x000B)
+{0x40, 2, {0x0073, 0x0073, 0x}}, // 0x00df (12  0x000C)
+{0x20, 1, {0x00DF, 0x, 0x}}, // 0x00df (13  0x000D) not hit, 
CaseMappingValue.type is 0xd5=0x80+0x55 not 0xf5=0x80+0x75, but keep slot
 {0x60, 1, {0x0129, 0x, 0x}}, // 0x0128 (14  0x000E)
 {0x8a, 0, {0x, 0x, 0x}}, // 0x0128 (15  0x000F)
 {0x60, 1, {0x012F, 0x, 0x}}, // 0x012e (16  0x0010)
@@ -1039,6 +1039,8 @@ Mapping const CaseMappingExtra[] = {
 {0x05, 2, {0x0544, 0x053D, 0x}}, // 0xfb17 (347 0x015B)
 {0x10, 2, {0x0544, 0x056D, 0x}}, // 0xfb17 (348 0x015C)
 {0x40, 2, {0x0574, 0x056D, 0x}}, // 0xfb17 (349 0x015D)
+{0x2a, 1, {0x00DF, 0x, 0x}},

Contributing in your organization

2021-11-10 Thread ukdwiwedi1796

Respected Sir/madam,I am Ujjwal Kumar currently in my second year of Engineering , Computer Science. I am new to open source contributions but I would like to contribute to your organization. I have knowledge in c++, python and java which was some of your tech stack and I have done few projects related to it before as well. If you could guide me a bit on how to start contributing that would be helpful. Hoping to hear from you soon Regards Ujjwal Kumar Sent from Mail for Windows

Re: Tests for improvement in rendering

2021-11-10 Thread Regina Henschel


Hi Tomaž,

I have put my tests to gerrit https://gerrit.libreoffice.org/c/core/+/125013

The test, where the light number is missing is testSurfaceMattePPT.

BTW, I have not yet changed your example 'testFontWorks'. I have read 
your answer too late.


Kind regards,
Regina


Tomaž Vajngerl schrieb am 10.11.2021 um 22:14:

Hi Regina,

On Tue, Nov 9, 2021 at 11:28 PM Regina Henschel > wrote:


Hi Tomaž,

your dump works in principle. I can read the xml-file and build the
assertXPath.

For example, I am able to write a test about the material properties
'specular' and 'specularIntensity' of an object. Such is needed to
verify correct values in case of material 'Metal'.

But while creating a test about material 'Matte', I have seen this
problem:
The method createNewSdrLightingAttribute() in
/core/svx/source/sdr/primitive2d/sdrattributecreator.cxx collects the
lights. But it does not record, which light it is. So in my case the
dump writes e.g.


       
       
       


I cannot see which lights they are.
The old wrong solution has used light 1, light 2 and light 3.
The new working solution uses light 2, light 3 and light 4.

I would need to test, that light 1 (which is always a spot light) is
not
used. Using light 1 had produced the error, that the appearance was not
'Matte'.

I could test, that the third color has the correct value, but that
would
only test indirectly, what the fix does. Shall I do it nevertheless?


Can you describe in the test what is missing and can't be tested and 
once you push it to gerrit I'll look how this can be solved.


Kind regards,
Regina

Regards, Tomaž

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - svl/source svtools/source

2021-11-10 Thread Eike Rathke (via logerrit)

 svl/source/config/languageoptions.cxx |2 +-
 svtools/source/misc/langtab.cxx   |   13 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 6cc10c4492f59c6ab56c31a80712f604608d7f0d
Author: Eike Rathke 
AuthorDate: Sun Nov 7 19:00:41 2021 +0100
Commit: Andras Timar 
CommitDate: Wed Nov 10 23:23:35 2021 +0100

Resolves: tdf#145386 Use "Default" for LANGUAGE_PROCESS_OR_USER_DEFAULT

There's no, specifically not in Writer, handling of the LCID
0x0400 LANGUAGE_PROCESS_OR_USER_DEFAULT language/locale concept
other than the number formatter mapping it to LANGUAGE_SYSTEM.

Use the LANGUAGE_SYSTEM "Default" string in UI (status bar, status
menu, language list) but keep the LCID, and don't append the
resolved locale string as it is also displayed both in the Font
Western and CJK listboxes.

This ends up as two list entries, like
* Default - English (UK)first entry
* Default   last entry
of which the second would be selected.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124449
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 0f3c19ee61ec371aa32d9f51c3555d3ea8ae9eeb)

 Conflicts:
svtools/source/misc/langtab.cxx

Change-Id: I8d9e4171bee6bbe9d1c9dcfb7a5fa8fc92ea1a2c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124204
Tested-by: Jenkins
Tested-by: Michael Meeks 
Reviewed-by: Michael Meeks 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124450
Reviewed-by: Eike Rathke 
Reviewed-by: Andras Timar 
Tested-by: Jenkins CollaboraOffice 

diff --git a/svl/source/config/languageoptions.cxx 
b/svl/source/config/languageoptions.cxx
index f00812b30b8d..3b490c6ac1fe 100644
--- a/svl/source/config/languageoptions.cxx
+++ b/svl/source/config/languageoptions.cxx
@@ -142,7 +142,7 @@ SvtScriptType SvtLanguageOptions::GetScriptTypeOfLanguage( 
LanguageType nLang )
 {
 if( LANGUAGE_DONTKNOW == nLang )
 nLang = LANGUAGE_ENGLISH_US;
-else if( LANGUAGE_SYSTEM == nLang  )
+else if (LANGUAGE_SYSTEM == nLang || LANGUAGE_PROCESS_OR_USER_DEFAULT == 
nLang)
 nLang = SvtSysLocale().GetLanguageTag().getLanguageType();
 
 sal_Int16 nScriptType = MsLangId::getScriptType( nLang );
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index c5df133b1daf..efd993805ca1 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -209,23 +209,24 @@ bool SvtLanguageTable::HasLanguageType( const 
LanguageType eType )
 
 OUString SvtLanguageTableImpl::GetString( const LanguageType eType ) const
 {
-LanguageType eLang = MsLangId::getReplacementForObsoleteLanguage( eType );
-sal_uInt32 nPos = FindIndex(eLang);
+const LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( 
eType);
+const sal_uInt32 nPos = (eType == LANGUAGE_PROCESS_OR_USER_DEFAULT ?
+FindIndex(LANGUAGE_SYSTEM) : FindIndex( nLang));
 
 if ( RESARRAY_INDEX_NOTFOUND != nPos && nPos < GetEntryCount() )
 return m_aStrings[nPos].first;
 
 //Rather than return a fairly useless "Unknown" name, return a geeky but 
usable-in-a-pinch lang-tag
-OUString sLangTag( lcl_getDescription( 
LanguageTag::convertToBcp47(eType)));
+OUString sLangTag( lcl_getDescription( 
LanguageTag::convertToBcp47(nLang)));
 SAL_WARN("svtools.misc", "Language: 0x"
-<< std::hex << eType
+<< std::hex << nLang
 << " with unknown name, so returning lang-tag of: "
 << sLangTag);
 
 // And add it to the table if it is an on-the-fly-id, which it usually is,
 // so it is available in all subsequent language boxes.
-if (LanguageTag::isOnTheFlyID( eType))
-const_cast(this)->AddItem( sLangTag, eType);
+if (LanguageTag::isOnTheFlyID( nLang))
+const_cast(this)->AddItem( sLangTag, nLang);
 
 return sLangTag;
 }

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - config_host.mk.in configure.ac solenv/gbuild

2021-11-10 Thread Stephan Bergmann (via logerrit)

 config_host.mk.in  |1 
 configure.ac   |   49 +
 solenv/gbuild/platform/com_GCC_defs.mk |7 ++--
 3 files changed, 54 insertions(+), 3 deletions(-)

New commits:
commit dc2a8c509507dffa28e4c356418207e9b9bb0ca5
Author: Stephan Bergmann 
AuthorDate: Wed Feb 17 08:21:50 2021 +0100
Commit: Andras Timar 
CommitDate: Wed Nov 10 22:17:03 2021 +0100

More targeted suppression of bogus GCC -Werror=stringop-overflow=

...given that 
"[8/9/10/11 Regression] -Wstringop-overflow false positive due to using 
MEM_REF
type of &MEM" is declared fixed now on GCC 11 trunk.

(Moving -Wno-stringop-overflow from gb_CFLAGS_WERROR to gb_CXXFLAGS_COMMON 
is
done for no other reason than to harmonize this with the code for the 
similar
HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED.)

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

diff --git a/config_host.mk.in b/config_host.mk.in
index d6edba704b21..f0bf804474f7 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -261,6 +261,7 @@ export GTK3_LIBS=$(gb_SPACE)@GTK3_LIBS@
 export USING_X11=@USING_X11@
 export HAMCREST_JAR=@HAMCREST_JAR@
 export 
HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED=@HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED@
+export HAVE_BROKEN_GCC_WSTRINGOP_OVERFLOW=@HAVE_BROKEN_GCC_WSTRINGOP_OVERFLOW@
 export 
HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR=@HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR@
 export HAVE_LO_CLANG_DLLEXPORTINLINES=@HAVE_LO_CLANG_DLLEXPORTINLINES@
 export HAVE_GCC_AVX=@HAVE_GCC_AVX@
diff --git a/configure.ac b/configure.ac
index 38953def3252..d96bc28576be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7379,6 +7379,55 @@ if test "$GCC" = yes && test "$COM_IS_CLANG" != TRUE; 
then
 fi
 AC_SUBST([HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED])
 
+dnl Check for  
"[8/9/10/11 Regression]
+dnl -Wstringop-overflow false positive due to using MEM_REF type of &MEM" 
(fixed in GCC 11), which
+dnl hits us e.g. with GCC 10 and --enable-optimized at
+dnl
+dnl   In file included from include/rtl/string.hxx:49,
+dnlfrom include/rtl/ustring.hxx:43,
+dnlfrom include/osl/file.hxx:35,
+dnlfrom include/codemaker/global.hxx:28,
+dnlfrom include/codemaker/options.hxx:23,
+dnlfrom codemaker/source/commoncpp/commoncpp.cxx:24:
+dnl   In function ‘char* rtl::addDataHelper(char*, const char*, std::size_t)’,
+dnl   inlined from ‘static char* rtl::ToStringHelper::addData(char*, const char*) [with long unsigned int N = 3]’ at 
include/rtl/stringconcat.hxx:147:85,
+dnl   inlined from ‘char* rtl::OStringConcat::addData(char*) const 
[with T1 = const char [3]; T2 = rtl::OString]’ at 
include/rtl/stringconcat.hxx:226:103,
+dnl   inlined from ‘rtl::OStringBuffer& 
rtl::OStringBuffer::append(rtl::OStringConcat&&) [with T1 = const char 
[3]; T2 = rtl::OString]’ at include/rtl/strbuf.hxx:599:30,
+dnl   inlined from ‘rtl::OString codemaker::cpp::scopedCppName(const 
rtl::OString&, bool)’ at codemaker/source/commoncpp/commoncpp.cxx:53:55:
+dnl   include/rtl/stringconcat.hxx:78:15: error: writing 2 bytes into a region 
of size 1 [-Werror=stringop-overflow=]
+dnl  78 | memcpy( buffer, data, length );
+dnl | ~~^~~~
+HAVE_BROKEN_GCC_WSTRINGOP_OVERFLOW=
+if test "$GCC" = yes && test "$COM_IS_CLANG" != TRUE; then
+AC_MSG_CHECKING([whether $CXX_BASE might report false 
-Werror=stringop-overflow=])
+AC_LANG_PUSH([C++])
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11 -Werror -Wstringop-overflow"
+if test "$ENABLE_OPTIMIZED" = TRUE; then
+CXXFLAGS="$CXXFLAGS -O2"
+else
+CXXFLAGS="$CXXFLAGS -O0"
+fi
+dnl Test code taken from 
:
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+void fill(char const * begin, char const * end, char c);
+struct q {
+char ids[4];
+char username[6];
+};
+void test(q & c) {
+fill(c.ids, c.ids + sizeof(c.ids), '\0');
+__builtin_strncpy(c.username, "root", sizeof(c.username));
+}
+]])], [AC_MSG_RESULT([no])], [
+HAVE_BROKEN_GCC_WSTRINGOP_OVERFLOW=TRUE
+AC_MSG_RESULT([yes])
+])
+CXXFLAGS=$save_CXXFLAGS
+AC_LANG_POP([C++])
+fi
+AC_SUBST([HAVE_BROKEN_GCC_WSTRINGOP_OVERFLOW])
+
 dnl ===
 dnl CPU Intrinsics support - SSE, AVX
 dnl ===
diff --git a/solenv/gbuild/platform/com_GCC_def

Re: Tests for improvement in rendering

2021-11-10 Thread Tomaž Vajngerl

Hi Regina,

On Tue, Nov 9, 2021 at 11:28 PM Regina Henschel 
wrote:

> Hi Tomaž,
>
> your dump works in principle. I can read the xml-file and build the
> assertXPath.
>
> For example, I am able to write a test about the material properties
> 'specular' and 'specularIntensity' of an object. Such is needed to
> verify correct values in case of material 'Metal'.
>
> But while creating a test about material 'Matte', I have seen this problem:
> The method createNewSdrLightingAttribute() in
> /core/svx/source/sdr/primitive2d/sdrattributecreator.cxx collects the
> lights. But it does not record, which light it is. So in my case the
> dump writes e.g.
>
> 
>specular="1"/>
>specular="0"/>
>specular="0"/>
> 
>
> I cannot see which lights they are.
> The old wrong solution has used light 1, light 2 and light 3.
> The new working solution uses light 2, light 3 and light 4.
>
> I would need to test, that light 1 (which is always a spot light) is not
> used. Using light 1 had produced the error, that the appearance was not
> 'Matte'.
>
> I could test, that the third color has the correct value, but that would
> only test indirectly, what the fix does. Shall I do it nevertheless?
>

Can you describe in the test what is missing and can't be tested and once
you push it to gerrit I'll look how this can be solved.

Kind regards,
> Regina
>
> Regards, Tomaž

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

2021-11-10 Thread Julien Nabet (via logerrit)

 dbaccess/source/core/api/SingleSelectQueryComposer.cxx |   24 +++-
 dbaccess/source/core/api/TableDeco.cxx |8 ++
 dbaccess/source/core/api/querycontainer.cxx|7 ++
 dbaccess/source/core/api/table.cxx |8 ++
 dbaccess/source/core/api/tablecontainer.cxx|8 ++
 dbaccess/source/core/api/viewcontainer.cxx |8 ++
 dbaccess/source/core/dataaccess/ContentHelper.cxx  |8 ++
 dbaccess/source/core/dataaccess/commanddefinition.cxx  |   17 +
 dbaccess/source/core/dataaccess/datasource.cxx |4 -
 dbaccess/source/core/dataaccess/documentcontainer.cxx  |   17 +
 dbaccess/source/core/inc/SingleSelectQueryComposer.hxx |5 +
 dbaccess/source/inc/apitools.hxx   |   50 -
 dbaccess/source/ui/uno/ColumnModel.cxx |   17 +
 dbaccess/source/ui/uno/ColumnModel.hxx |5 +
 dbaccess/source/ui/uno/composerdialogs.cxx |   16 +
 dbaccess/source/ui/uno/composerdialogs.hxx |4 +
 dbaccess/source/ui/uno/textconnectionsettings_uno.cxx  |5 +
 dbaccess/source/ui/uno/unoDirectSql.cxx|   17 +
 dbaccess/source/ui/uno/unoDirectSql.hxx|4 +
 19 files changed, 162 insertions(+), 70 deletions(-)

New commits:
commit f47a91cc6f1678604c5694ca3987c2f848193b09
Author: Julien Nabet 
AuthorDate: Wed Nov 10 20:07:52 2021 +0100
Commit: Julien Nabet 
CommitDate: Wed Nov 10 22:02:52 2021 +0100

Replace some macros in dbaccess part 3

Remove IMPLEMENT_SERVICE_INFO1 + IMPLEMENT_SERVICE_INFO2
+ DECLARE_PROPERTYCONTAINER_DEFAULTS + DECLARE_PROPERTYCONTAINER_DEFAULTS
+ IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2
+ DECL_PROP3 (unused)
+ DECL_PROP2_IFACE

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

diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx 
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 94ddd8600a8a..04f233f893b4 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -278,7 +278,12 @@ void SAL_CALL OSingleSelectQueryComposer::disposing()
 }
 
 
IMPLEMENT_FORWARD_XINTERFACE3(OSingleSelectQueryComposer,OSubComponent,OSingleSelectQueryComposer_BASE,OPropertyContainer)
-IMPLEMENT_SERVICE_INFO1(OSingleSelectQueryComposer,"org.openoffice.comp.dba.OSingleSelectQueryComposer",SERVICE_NAME_SINGLESELECTQUERYCOMPOSER)
+IMPLEMENT_SERVICE_INFO_IMPLNAME(OSingleSelectQueryComposer, 
"org.openoffice.comp.dba.OSingleSelectQueryComposer")
+IMPLEMENT_SERVICE_INFO_SUPPORTS(OSingleSelectQueryComposer)
+css::uno::Sequence< OUString > SAL_CALL 
OSingleSelectQueryComposer::getSupportedServiceNames()
+{
+return { SERVICE_NAME_SINGLESELECTQUERYCOMPOSER };
+}
 
 css::uno::Sequence OSingleSelectQueryComposer::getImplementationId()
 {
@@ -294,7 +299,22 @@ css::uno::Sequence< css::uno::Type > 
OSingleSelectQueryComposer::getTypes()
 );
 }
 
-IMPLEMENT_PROPERTYCONTAINER_DEFAULTS(OSingleSelectQueryComposer)
+css::uno::Reference< css::beans::XPropertySetInfo >  SAL_CALL 
OSingleSelectQueryComposer::getPropertySetInfo()
+{
+Reference< XPropertySetInfo > xInfo( createPropertySetInfo( 
getInfoHelper() ) );
+return xInfo;
+}
+::cppu::IPropertyArrayHelper& OSingleSelectQueryComposer::getInfoHelper()
+{
+return *OSingleSelectQueryComposer::getArrayHelper();
+}
+::cppu::IPropertyArrayHelper* OSingleSelectQueryComposer::createArrayHelper( ) 
const
+{
+css::uno::Sequence< css::beans::Property > aProps;
+describeProperties(aProps);
+return new ::cppu::OPropertyArrayHelper(aProps);
+}
+
 
 // XSingleSelectQueryAnalyzer
 OUString SAL_CALL OSingleSelectQueryComposer::getQuery(  )
diff --git a/dbaccess/source/core/api/TableDeco.cxx 
b/dbaccess/source/core/api/TableDeco.cxx
index 1448c657abd4..df93f0ad4cc0 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -350,7 +350,13 @@ void ODBTableDecorator::construct()
 }
 
 // XServiceInfo
-IMPLEMENT_SERVICE_INFO1(ODBTableDecorator, 
"com.sun.star.sdb.dbaccess.ODBTableDecorator", SERVICE_SDBCX_TABLE)
+IMPLEMENT_SERVICE_INFO_IMPLNAME(ODBTableDecorator, 
"com.sun.star.sdb.dbaccess.ODBTableDecorator")
+IMPLEMENT_SERVICE_INFO_SUPPORTS(ODBTableDecorator)
+css::uno::Sequence< OUString > SAL_CALL 
ODBTableDecorator::getSupportedServiceNames()
+{
+return { SERVICE_SDBCX_TABLE };
+}
+
 
 Any SAL_CALL ODBTableDecorator::queryInterface( const Type & rType )
 {
diff --git a/dbaccess/source/core/api/querycontainer.cxx 
b/dbaccess/source/core/api/querycontainer.cxx
index cebb70cf1cb2..96c01cf120c8 100644
--- a/dbaccess/source/core/api/querycontainer.cxx
+++ b/dbaccess/source/core/api/querycontainer.cxx
@@ -131,7 +131,12 @@ void OQueryContainer::disposing()
 }

[Libreoffice-commits] dev-tools.git: help3/xhpeditor

2021-11-10 Thread Olivier Hallot (via logerrit)

 help3/xhpeditor/index.php |1 +
 help3/xhpeditor/menu.php  |8 +++-
 help3/xhpeditor/snippets.js   |   16 +++-
 help3/xhpeditor/xhpeditor.css |4 
 4 files changed, 19 insertions(+), 10 deletions(-)

New commits:
commit 5bc05ecf10babbe3216443206078be482d2f5246
Author: Olivier Hallot 
AuthorDate: Wed Nov 10 17:48:33 2021 -0300
Commit: Olivier Hallot 
CommitDate: Wed Nov 10 21:53:29 2021 +0100

Add images and objects to xhpeditor menu

Change-Id: I78c81c378e26a862446befa6f6a1f46ad13bf08d
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/125012
Tested-by: Olivier Hallot 
Reviewed-by: Olivier Hallot 

diff --git a/help3/xhpeditor/index.php b/help3/xhpeditor/index.php
index 2e08fac..05457a5 100644
--- a/help3/xhpeditor/index.php
+++ b/help3/xhpeditor/index.php
@@ -14,6 +14,7 @@ $xhp = $_POST["xhpdoc"];
 
 
 
+
 LibreOffice XHP Editor
 
 
diff --git a/help3/xhpeditor/menu.php b/help3/xhpeditor/menu.php
index d14f8af..f915384 100644
--- a/help3/xhpeditor/menu.php
+++ b/help3/xhpeditor/menu.php
@@ -58,7 +58,6 @@
 
 bascode-par
 pycode-par
-image-par
 
   
   
@@ -109,6 +108,13 @@
   
 
   
+  
+Images
+
+  
+

78 matches

Mail list logo