[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

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

New commits:
commit b2111e0060b2ed58d2e2d0ec0d22ba049259f89d
Author: Seth Chaiklin 
AuthorDate: Tue Feb 23 08:59:08 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Tue Feb 23 08:59:08 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 06cbf65b61d9a0fc1eb946c9fff4108c25819f27
  - tdf#139667 update numbering style in header/footer, caption help

  ( swriter/guide/captions_numbers.xhp )
* "numbering style" -> "numbering scheme" and  in
   that paragraph
* update to 

  ( swriter/guide/footer_nextpage.xhp )
* "numbering style" -> "numbering scheme" and 
* update to ,

  ( swriter/guide/header_with_chapter.xhp )
 * "numbering style" -> "numbering scheme"
 * update to ,,, some 

  ( swriter/guide/header_footer.xhp )
* update to ,

Change-Id: I9eb33c3355b80afc5244500342149d632f83259a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/83
Reviewed-by: Seth Chaiklin 
Tested-by: Jenkins

diff --git a/helpcontent2 b/helpcontent2
index 5fccd7a6566e..06cbf65b61d9 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5fccd7a6566e728a82c64a47d34c0ee07a137cff
+Subproject commit 06cbf65b61d9a0fc1eb946c9fff4108c25819f27
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Seth Chaiklin (via logerrit)]

 source/text/swriter/guide/captions_numbers.xhp|   12 +---
 source/text/swriter/guide/footer_nextpage.xhp |9 -
 source/text/swriter/guide/header_footer.xhp   |5 ++---
 source/text/swriter/guide/header_with_chapter.xhp |   14 +++---
 4 files changed, 18 insertions(+), 22 deletions(-)

New commits:
commit 06cbf65b61d9a0fc1eb946c9fff4108c25819f27
Author: Seth Chaiklin 
AuthorDate: Sat Feb 20 11:54:41 2021 +0100
Commit: Seth Chaiklin 
CommitDate: Tue Feb 23 08:59:08 2021 +0100

tdf#139667 update numbering style in header/footer, caption help

  ( swriter/guide/captions_numbers.xhp )
* "numbering style" -> "numbering scheme" and  in
   that paragraph
* update to 

  ( swriter/guide/footer_nextpage.xhp )
* "numbering style" -> "numbering scheme" and 
* update to ,

  ( swriter/guide/header_with_chapter.xhp )
 * "numbering style" -> "numbering scheme"
 * update to ,,, some 

  ( swriter/guide/header_footer.xhp )
* update to ,

Change-Id: I9eb33c3355b80afc5244500342149d632f83259a
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/83
Reviewed-by: Seth Chaiklin 
Tested-by: Jenkins

diff --git a/source/text/swriter/guide/captions_numbers.xhp 
b/source/text/swriter/guide/captions_numbers.xhp
index c36ef9efd..b39002211 100644
--- a/source/text/swriter/guide/captions_numbers.xhp
+++ b/source/text/swriter/guide/captions_numbers.xhp
@@ -1,6 +1,5 @@
 
 
-   
 
- 
-   
+
 
   
  Adding Chapter Numbers to 
Captions
@@ -33,9 +31,9 @@
   automatic numbering;of objects
   chapter numbers in captions
   inserting;chapter numbers in captions
-MW changed "adding;" to "inserting;"
-Adding Chapter Numbers to Captions 
-
+
+Adding Chapter Numbers to Captions
+
   You can 
include chapter numbers in captions.
   Ensure 
that the text in your document is organized by chapters, and that the chapter 
titles and, if you want, the section titles, use one of the predefined heading 
paragraph styles. You must also assign a numbering option to the heading 
paragraph styles.
   
@@ -46,7 +44,7 @@
 Choose Insert - Caption.
  
  
-Select a caption title from the Category box, and select a numbering style in the Numbering box. You also can enter a caption text in 
this dialog. If you want, enter text in the Caption box.
+Select a caption title from the Category 
box, and select a numbering scheme in the Numbering box. 
You also can enter a caption text in this dialog. If you want, enter text 
in the Caption box.
  
  
 Click Options.
diff --git a/source/text/swriter/guide/footer_nextpage.xhp 
b/source/text/swriter/guide/footer_nextpage.xhp
index 30e107dd8..31cfd6c25 100644
--- a/source/text/swriter/guide/footer_nextpage.xhp
+++ b/source/text/swriter/guide/footer_nextpage.xhp
@@ -34,8 +34,7 @@
   page numbers; continuation pages
 
 
-
-Inserting Page Numbers of Continuation 
Pages
+Inserting Page Numbers of Continuation 
Pages
 You can easily 
insert the page number of the next page in a footer by using a 
field.
 The page 
number is only displayed if the following page exists.
 
@@ -53,15 +52,15 @@
 Click 
'Page' in the Type list and 'Next page' in the Select 
list.
   
   
-Click a 
numbering style in the Format list.
+Click a 
numbering scheme in the Format list.
 If you 
select 'Text' in the Format list, only the text that you enter in 
the Value box is displayed in the field.
   
   
 Click 
Insert to insert the field with the page number.
   
 
-
+
 
+
 
-
 
\ No newline at end of file
diff --git a/source/text/swriter/guide/header_footer.xhp 
b/source/text/swriter/guide/header_footer.xhp
index 037bc2c19..ef1b4791b 100644
--- a/source/text/swriter/guide/header_footer.xhp
+++ b/source/text/swriter/guide/header_footer.xhp
@@ -33,8 +33,7 @@
   HTML documents; headers and footers
 
 
-
-About Headers and Footers
+About Headers and Footers
 Headers and 
footers are areas in the top and the bottom page margins, where you can add 
text or graphics. Headers and footers are added to the current page style. Any 
page that uses the same style automatically receives the header or footer that 
you add. You can insert Fields, such as page numbers and chapter headings, in 
headers and footers in a text document.
 The page style for 
the current page is displayed in the Status Bar.
 
@@ -56,7 +55,7 @@
 To use 
different headers or footers in your document, you must add them to different 
Page 
Styles, and then apply the styles to the pages where you want the 
headers or footer to appear.
   
 
-Headers 
and Footers in HTML Documents
+Headers and Footers in HTML 
Documents
 Some of the 
header and footer options are also available for HTML documents. Headers and 
footers are not supported by HTML and instead are exported with special tags,

[Libreoffice-commits] core.git: helpcontent2

[Seth Chaiklin (via logerrit)]

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

New commits:
commit 9d4fe73852642f2951cda899bbae4a63bce6729c
Author: Seth Chaiklin 
AuthorDate: Tue Feb 23 08:58:17 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Tue Feb 23 08:58:17 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 5fccd7a6566e728a82c64a47d34c0ee07a137cff
  - tdf#139667 change embed in Bullets and Numbering dialog

 Numbering / Numbering Style tab was changed to Ordered
 for both Bullets and Numbering and List Style dialogs
 so do not need a separate heading any more.  Can embed
 the heading from the help page for the Numbering tab.

Change-Id: If1324a57795a5878d3e200854a4a16429ab603db
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/84
Reviewed-by: Seth Chaiklin 
Tested-by: Jenkins

diff --git a/helpcontent2 b/helpcontent2
index c2fa9223ea62..5fccd7a6566e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c2fa9223ea62e33237a98bdcca5eaab2bbc5bb41
+Subproject commit 5fccd7a6566e728a82c64a47d34c0ee07a137cff
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Seth Chaiklin (via logerrit)]

 source/text/shared/01/0605.xhp |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 5fccd7a6566e728a82c64a47d34c0ee07a137cff
Author: Seth Chaiklin 
AuthorDate: Sat Feb 20 16:08:50 2021 +0100
Commit: Seth Chaiklin 
CommitDate: Tue Feb 23 08:58:17 2021 +0100

tdf#139667 change embed in Bullets and Numbering dialog

 Numbering / Numbering Style tab was changed to Ordered
 for both Bullets and Numbering and List Style dialogs
 so do not need a separate heading any more.  Can embed
 the heading from the help page for the Numbering tab.

Change-Id: If1324a57795a5878d3e200854a4a16429ab603db
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/84
Reviewed-by: Seth Chaiklin 
Tested-by: Jenkins

diff --git a/source/text/shared/01/0605.xhp 
b/source/text/shared/01/0605.xhp
index 1bae2fb2f..08910dd29 100644
--- a/source/text/shared/01/0605.xhp
+++ b/source/text/shared/01/0605.xhp
@@ -40,8 +40,7 @@
 
 The 
Bullets and Numbering dialog has the following tabs:
 
-Numbering
-
+
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Seth Chaiklin (via logerrit)]

 sw/uiconfig/swriter/ui/numparapage.ui |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 161b4195bea8029ca7ac1bde6f7e984e04d8be29
Author: Seth Chaiklin 
AuthorDate: Sat Feb 6 00:44:01 2021 +0100
Commit: Seth Chaiklin 
CommitDate: Tue Feb 23 08:57:49 2021 +0100

tdf#139667  "List" -> "Apply List Style" in Paragraph and PS Dialog

   * change heading label for List Style
   + add tooltips for the two combo boxes
   * small corrections in recently-added tooltips

Change-Id: Ie2a478e7db7cafdd3b27f1acfe024f7c72cf221a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110448
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
Reviewed-by: Seth Chaiklin 

diff --git a/sw/uiconfig/swriter/ui/numparapage.ui 
b/sw/uiconfig/swriter/ui/numparapage.ui
index 485ba7330fce..ff1c1a817062 100644
--- a/sw/uiconfig/swriter/ui/numparapage.ui
+++ b/sw/uiconfig/swriter/ui/numparapage.ui
@@ -41,7 +41,7 @@
 True
 comboLB_OUTLINE_LEVEL
 0
-Select or change the 
Outline Level applied to the selected paragraphs or Paragraph Style.
+Select or change the Outline Level 
applied to the selected paragraphs or Paragraph Style.
   
   
 False
@@ -53,6 +53,7 @@
   
 True
 False
+Assigned Outline Level
 
   Text Body
   Level 1
@@ -121,7 +122,7 @@
 True
 False
 _List style:
-Select the List Style 
to apply to the paragraph.
+Select a List Style to apply to the 
paragraph.
 True
 comboLB_NUMBER_STYLE
 0
@@ -141,6 +142,7 @@
   
 True
 False
+Assigned List Style
 
   None
 
@@ -193,7 +195,7 @@
 R_estart numbering at this 
paragraph
 True
 False
-For Numbered Lists and 
List Styles with numbering
+For ordered lists and List Styles with 
numbering
 True
 True
 none
@@ -285,7 +287,7 @@
   
 True
 False
-List
+Apply List Style
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 comphelper/source/misc/docpasswordhelper.cxx |5 +---
 comphelper/source/xml/attributelist.cxx  |3 --
 comphelper/source/xml/ofopxmlhelper.cxx  |   31 +++
 3 files changed, 16 insertions(+), 23 deletions(-)

New commits:
commit d678a580419dda0b2b3d9ef13b027c769ac7b71b
Author: Noel 
AuthorDate: Mon Feb 22 19:45:09 2021 +0200
Commit: Noel Grandin 
CommitDate: Tue Feb 23 08:39:44 2021 +0100

loplugin:refcounting in comphelper

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

diff --git a/comphelper/source/misc/docpasswordhelper.cxx 
b/comphelper/source/misc/docpasswordhelper.cxx
index bd8ce5d7de7f..cd7090944dc0 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/source/misc/docpasswordhelper.cxx
@@ -494,9 +494,8 @@ OUString DocPasswordHelper::GetOoxHashAsBase64(
 PasswordRequestMode eRequestMode = PasswordRequestMode_PASSWORD_ENTER;
 while( eResult == DocPasswordVerifierResult::WrongPassword )
 {
-DocPasswordRequest* pRequest = new DocPasswordRequest( 
eRequestType, eRequestMode, rDocumentUrl );
-Reference< XInteractionRequest > xRequest( pRequest );
-rxInteractHandler->handle( xRequest );
+rtl::Reference pRequest = new 
DocPasswordRequest( eRequestType, eRequestMode, rDocumentUrl );
+rxInteractHandler->handle( pRequest );
 if( pRequest->isPassword() )
 {
 if( !pRequest->getPassword().isEmpty() )
diff --git a/comphelper/source/xml/attributelist.cxx 
b/comphelper/source/xml/attributelist.cxx
index d99139c852ea..a02c82f69465 100644
--- a/comphelper/source/xml/attributelist.cxx
+++ b/comphelper/source/xml/attributelist.cxx
@@ -65,8 +65,7 @@ AttributeList::~AttributeList()
 
 css::uno::Reference< css::util::XCloneable > AttributeList::createClone()
 {
-AttributeList *p = new AttributeList( *this );
-return css::uno::Reference< css::util::XCloneable > ( 
static_cast(p) );
+return new AttributeList( *this );
 }
 
 } // namespace comphelper
diff --git a/comphelper/source/xml/ofopxmlhelper.cxx 
b/comphelper/source/xml/ofopxmlhelper.cxx
index 2da35bdd0a3a..10840368d976 100644
--- a/comphelper/source/xml/ofopxmlhelper.cxx
+++ b/comphelper/source/xml/ofopxmlhelper.cxx
@@ -22,6 +22,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 #include 
@@ -145,20 +146,18 @@ void WriteRelationsInfoSequence(
 OUString aWhiteSpace( " " );
 
 // write the namespace
-AttributeList* pRootAttrList = new AttributeList;
-uno::Reference< css::xml::sax::XAttributeList > xRootAttrList( 
pRootAttrList );
+rtl::Reference pRootAttrList = new AttributeList;
 pRootAttrList->AddAttribute(
 "xmlns",
 aCDATAString,
 "http://schemas.openxmlformats.org/package/2006/relationships"; );
 
 xWriter->startDocument();
-xWriter->startElement( aRelListElement, xRootAttrList );
+xWriter->startElement( aRelListElement, pRootAttrList );
 
 for ( const auto & i : aSequence )
 {
-AttributeList *pAttrList = new AttributeList;
-uno::Reference< css::xml::sax::XAttributeList > xAttrList( pAttrList );
+rtl::Reference pAttrList = new AttributeList;
 for( const beans::StringPair & pair : i )
 {
 if ( !(pair.First == "Id"
@@ -172,7 +171,7 @@ void WriteRelationsInfoSequence(
 pAttrList->AddAttribute( pair.First, aCDATAString, pair.Second );
 }
 
-xWriter->startElement( aRelElement, xAttrList );
+xWriter->startElement( aRelElement, pAttrList );
 xWriter->ignorableWhitespace( aWhiteSpace );
 xWriter->endElement( aRelElement );
 }
@@ -204,36 +203,33 @@ void WriteContentSequence(
 static constexpr OUStringLiteral aWhiteSpace(u" ");
 
 // write the namespace
-AttributeList* pRootAttrList = new AttributeList;
-uno::Reference< css::xml::sax::XAttributeList > xRootAttrList( 
pRootAttrList );
+rtl::Reference pRootAttrList = new AttributeList;
 pRootAttrList->AddAttribute(
 "xmlns",
 aCDATAString,
 "http://schemas.openxmlformats.org/package/2006/content-types"; );
 
 xWriter->startDocument();
-xWriter->startElement( aTypesElement, xRootAttrList );
+xWriter->startElement( aTypesElement, pRootAttrList );
 
 for ( const beans::StringPair & pair : aDefaultsSequence )
 {
-AttributeList *pAttrList = new AttributeList;
-uno::Reference< css::xml::sax::XAttributeList > xAttrList( pAttrList );
+rtl::Reference pAttrList = new AttributeList;
 pAttrList->AddAttribute( "Extension", aCDATAString, pair.First );
 pAttrList->AddAttribute( aContentTypeAttr, aCDATAString, pair.Second );
 
-xWriter->startElement( aDefaultElement, xAttrList );
+xWriter->startElement( aDefau

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

[Noel (via logerrit)]

 cui/source/dialogs/AdditionsDialog.cxx |6 ++
 cui/source/options/webconninfo.cxx |5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit c2a0896183f33fab5f643400b171b031af5e468e
Author: Noel 
AuthorDate: Tue Feb 23 08:36:20 2021 +0200
Commit: Noel Grandin 
CommitDate: Tue Feb 23 08:35:19 2021 +0100

loplugin:refcounting in cui

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

diff --git a/cui/source/dialogs/AdditionsDialog.cxx 
b/cui/source/dialogs/AdditionsDialog.cxx
index a6f21fe6bdda..4ea381e385db 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -755,14 +755,12 @@ IMPL_LINK_NOARG(AdditionsItem, InstallHdl, weld::Button&, 
void)
 return;
 }
 
-TmpRepositoryCommandEnv* pCmdEnv = new TmpRepositoryCommandEnv();
-uno::Reference 
xCmdEnv(static_cast(pCmdEnv),
- uno::UNO_QUERY);
+rtl::Reference pCmdEnv = new 
TmpRepositoryCommandEnv();
 uno::Reference xAbortChannel;
 try
 {
 m_pParentDialog->m_xExtensionManager->addExtension(
-aExtensionFile, uno::Sequence(), "user", 
xAbortChannel, xCmdEnv);
+aExtensionFile, uno::Sequence(), "user", 
xAbortChannel, pCmdEnv);
 
m_xButtonInstall->set_label(CuiResId(RID_SVXSTR_ADDITIONS_INSTALLEDBUTTON));
 }
 catch (const ucb::CommandFailedException)
diff --git a/cui/source/options/webconninfo.cxx 
b/cui/source/options/webconninfo.cxx
index 1d3abe82f860..b8ae35dba1e3 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -178,13 +178,12 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, 
ChangePasswordHdl, weld::Button&, void)
 OUString aURL = m_xPasswordsLB->get_text(nEntry, 0);
 OUString aUserName = m_xPasswordsLB->get_text(nEntry, 1);
 
-::comphelper::SimplePasswordRequest* pPasswordRequest
+rtl::Reference<::comphelper::SimplePasswordRequest> 
pPasswordRequest
   = new ::comphelper::SimplePasswordRequest;
-uno::Reference< task::XInteractionRequest > rRequest( 
pPasswordRequest );
 
 uno::Reference< task::XInteractionHandler > xInteractionHandler =
 
task::InteractionHandler::createWithParent(comphelper::getProcessComponentContext(),
 m_xDialog->GetXWindow());
-xInteractionHandler->handle( rRequest );
+xInteractionHandler->handle( pPasswordRequest );
 
 if ( pPasswordRequest->isPassword() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Integer overflow in Calc lcl_getSingleCellAddressFromXMLString nColumn computation

[Stephan Bergmann]

Ever since 
 
"tdf#107097: sc: Add UItest" added that test, UBSan builds like 
 keep failing 
UITest_chart UITEST_TEST_NAME=tdf107097.tdf107097.test_tdf107097 with



/chart2/source/tools/XMLRangeHelper.cxx:136:52: runtime error: signed integer 
overflow: 15 * 308915776 cannot be represented in type 'int'
#0 0x2ad74a554918 in (anonymous 
namespace)::lcl_getSingleCellAddressFromXMLString(rtl::OUString const&, int, int, 
chart::XMLRangeHelper::Cell&) /chart2/source/tools/XMLRangeHelper.cxx:136:52
#1 0x2ad74a553482 in (anonymous 
namespace)::lcl_getCellAddressFromXMLString(rtl::OUString const&, int, int, 
chart::XMLRangeHelper::Cell&, rtl::OUString&) 
/chart2/source/tools/XMLRangeHelper.cxx:217:13
#2 0x2ad74a5505da in (anonymous 
namespace)::lcl_getCellRangeAddressFromXMLString(rtl::OUString const&, int, int, 
chart::XMLRangeHelper::CellRange&) /chart2/source/tools/XMLRangeHelper.cxx:253:19
#3 0x2ad74a54fde1 in 
chart::XMLRangeHelper::getCellRangeFromXMLString(rtl::OUString const&) 
/chart2/source/tools/XMLRangeHelper.cxx:328:15
#4 0x2ad74a2aed4d in 
chart::InternalDataProvider::convertRangeFromXML(rtl::OUString const&) 
/chart2/source/tools/InternalDataProvider.cxx:1227:39
#5 0x2ad74a2b0164 in non-virtual thunk to 
chart::InternalDataProvider::convertRangeFromXML(rtl::OUString const&) 
/chart2/source/tools/InternalDataProvider.cxx
#6 0x2ad6c4784257 in (anonymous namespace)::lcl_ConvertRange(rtl::OUString const&, 
com::sun::star::uno::Reference const&) 
/xmloff/source/chart/SchXMLPlotAreaContext.cxx:76:32
#7 0x2ad6c4779a67 in SchXMLPlotAreaContext::startFastElement(int, 
com::sun::star::uno::Reference 
const&) /xmloff/source/chart/SchXMLPlotAreaContext.cxx:233:34
#8 0x2ad6c4c6328a in SvXMLImport::startFastElement(int, 
com::sun::star::uno::Reference 
const&) /xmloff/source/core/xmlimp.cxx:797:15
#9 0x2ad704988b78 in (anonymous namespace)::Entity::startElement((anonymous 
namespace)::Event const*) /sax/source/fastparser/fastparser.cxx:468:27
#10 0x2ad70496f681 in sax_fastparser::FastSaxParserImpl::consume((anonymous 
namespace)::EventList&) /sax/source/fastparser/fastparser.cxx:1026:25
#11 0x2ad70496c65f in 
sax_fastparser::FastSaxParserImpl::parseStream(com::sun::star::xml::sax::InputSource
 const&) /sax/source/fastparser/fastparser.cxx:870:22
#12 0x2ad7049905d1 in 
sax_fastparser::FastSaxParser::parseStream(com::sun::star::xml::sax::InputSource 
const&) /sax/source/fastparser/fastparser.cxx:1482:13
#13 0x2ad6c4c52b80 in 
SvXMLImport::parseStream(com::sun::star::xml::sax::InputSource const&) 
/xmloff/source/core/xmlimp.cxx:504:15
#14 0x2ad749aafe1e in chart::XMLFilter::impl_ImportStream(rtl::OUString const&, rtl::OUString const&, 
com::sun::star::uno::Reference const&, 
com::sun::star::uno::Reference const&, 
com::sun::star::uno::Reference const&, 
com::sun::star::uno::Reference const&) 
/chart2/source/model/filter/XMLFilter.cxx:473:34
#15 0x2ad749aa9f01 in 
chart::XMLFilter::impl_Import(com::sun::star::uno::Reference
 const&, com::sun::star::uno::Sequence const&) 
/chart2/source/model/filter/XMLFilter.cxx:375:35
#16 0x2ad749aa0988 in 
chart::XMLFilter::filter(com::sun::star::uno::Sequence
 const&) /chart2/source/model/filter/XMLFilter.cxx:221:13
#17 0x2ad749c2c76e in 
chart::ChartModel::impl_load(com::sun::star::uno::Sequence
 const&, com::sun::star::uno::Reference const&) 
/chart2/source/model/main/ChartModel_Persistence.cxx:567:18
#18 0x2ad749c30eea in 
chart::ChartModel::loadFromStorage(com::sun::star::uno::Reference
 const&, com::sun::star::uno::Sequence const&) 
/chart2/source/model/main/ChartModel_Persistence.cxx:759:5
#19 0x2ad74244b977 in OCommonEmbeddedObject::LoadDocumentFromStorage_Impl() 
/embeddedobj/source/commonembedding/persistence.cxx:535:19
#20 0x2ad7423d7bde in OCommonEmbeddedObject::SwitchStateTo_Impl(int) 
/embeddedobj/source/commonembedding/embedobj.cxx:185:49
#21 0x2ad7423e32ff in OCommonEmbeddedObject::changeState(int) 
/embeddedobj/source/commonembedding/embedobj.cxx:453:13
#22 0x2ad7424b7057 in 
OCommonEmbeddedObject::getPreferredVisualRepresentation(long) 
/embeddedobj/source/commonembedding/visobj.cxx:168:9
#23 0x2ad67e08fdb6 in 
comphelper::EmbeddedObjectContainer::GetGraphicReplacementStream(long, 
com::sun::star::uno::Reference const&, 
rtl::OUString*) /comphelper/source/container/embeddedobjectcontainer.cxx:1425:54
#24 0x2ad6a447182c in svt::EmbeddedObjectRef::GetGraphicReplacementStream(long, 
com::sun::star::uno::Reference const&, 
rtl::OUString*) /svtools/source/misc/embedhlp.cxx:809:12
#25 0x2ad6a446c7d4 in svt::EmbeddedObjectRef::GetGraphicStream(bool) const 
/svtools/source/misc/embedhlp.cxx:616:23
#26 0x2ad6a4469e58 in svt::EmbeddedObjectRef::GetReplacement(bool) 
/svtools/source/misc/embedhlp.cxx:424:46
#27 0x2ad6a446d4ea in svt::Em

[Libreoffice-commits] core.git: vcl/inc vcl/osx vcl/qa vcl/quartz

[Thorsten Wagner (via logerrit)]

 vcl/inc/quartz/salgdi.h  |3 -
 vcl/osx/salgdiutils.cxx  |   50 +++
 vcl/osx/salmacos.cxx |4 -
 vcl/qa/cppunit/BackendTest.cxx   |6 ++
 vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx |4 +
 vcl/qa/cppunit/outdev.cxx|4 +
 vcl/quartz/salgdi.cxx|8 ---
 7 files changed, 41 insertions(+), 38 deletions(-)

New commits:
commit 0c36f364b14aacd0eeb53087ae2fce54402dc741
Author: Thorsten Wagner 
AuthorDate: Sun Feb 21 01:34:54 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Tue Feb 23 08:22:05 2021 +0100

tdf#138122 Detect window scaling for multi display configurations on macOS

(1) Activate window scaling when at least one retina display is connected

(2) Remove environment variable VCL_MACOS_FORCE_WINDOW_SCALING

(3) Disable related unit tests unless bitmap scaling has been implemented

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

diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 69b735787bdc..ce68b75b0b06 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -174,7 +174,6 @@ class AquaSalGraphics : public SalGraphics
 #ifdef MACOSX
 /// is this a window graphics
 boolmbWindow;
-boolmbWindowScaling;
 
 #else // IOS
 
@@ -196,7 +195,7 @@ public:
 voidcopyResolution( AquaSalGraphics& );
 voidupdateResolution();
 
-float   GetWindowScaling();
+static floatGetWindowScaling();
 voidSetWindowGraphics( AquaSalFrame* pFrame );
 boolIsWindowGraphics()  const   { return mbWindow; 
}
 voidSetPrinterGraphics(CGContextRef, sal_Int32 
nRealDPIX, sal_Int32 nRealDPIY);
diff --git a/vcl/osx/salgdiutils.cxx b/vcl/osx/salgdiutils.cxx
index 01626d348999..f3ddd946f699 100644
--- a/vcl/osx/salgdiutils.cxx
+++ b/vcl/osx/salgdiutils.cxx
@@ -35,37 +35,35 @@
 #include 
 #include 
 
-float AquaSalGraphics::GetWindowScaling()
-{
-float fScale = 1.0f;
-
-#ifdef MACOSX
-
-// Window scaling independent from main display may be forced by setting 
VCL_MACOS_FORCE_WINDOW_SCALING environment variable
-// whose setting is stored in mbWindowScaling. After implementation of 
full support of scaled displays window scaling will be
-// set to 2.0f for macOS as default. This will allow moving of windows 
between non retina and retina displays without blurry
-// text and graphics.
+// TODO: Scale will be set to 2.0f as default after implementation of full 
scaled display support . This will allow moving of
+// windows between non retina and retina displays without blurry text and 
graphics. Static variables have to be removed thereafter.
 
-// TODO: After implementation of full support of scaled displays code has 
to be modified to set a scaling of 2.0f as default.
-
-if (mbWindowScaling)
-{
-fScale = 2.0f;
-return fScale;
-}
+// Currently scaled display support is not implemented for bitmaps. This will 
cause a slight performance degradation on displays
+// with single precision. To preserve performance for now, window scaling is 
only activated if at least one display with double
+// precision is present. Moving windows between displays is then possible 
without blurry text and graphics too. Adapting window
+// scaling when displays are added while application is running is not 
supported.
 
-#endif
+static bool  bWindowScaling = false;
+static float fWindowScale = 1.0f;
 
-AquaSalFrame *pSalFrame = mpFrame;
-if (!pSalFrame)
-pSalFrame = static_cast(GetSalData()->mpInstance->anyFrame());
-if (pSalFrame)
+float AquaSalGraphics::GetWindowScaling()
+{
+if (!bWindowScaling)
 {
-NSWindow *pNSWindow = pSalFrame->getNSWindow();
-if (pNSWindow)
-fScale = [pNSWindow backingScaleFactor];
+NSArray *aScreens = [NSScreen screens];
+if (aScreens != nullptr)
+{
+int nScreens = [aScreens count];
+for (int i = 0; i < nScreens; i++)
+{
+float fScale = [[aScreens objectAtIndex:i] backingScaleFactor];
+if (fScale > fWindowScale)
+  fWindowScale = fScale;
+}
+bWindowScaling = true;
+}
 }
-return fScale;
+return fWindowScale;
 }
 
 void AquaSalGraphics::SetWindowGraphics( AquaSalFrame* pFrame )
diff --git a/vcl/osx/salmacos.cxx b/vcl/osx/salmacos.cxx
index 0f41dd9e8c4a..f6403dea2725 100644
--- a/vcl/osx/salmacos.cxx
+++ b/vcl/osx/salmacos.cxx
@@ -19,7 +19,7 @@
 
 // This file contains the 

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

[Seth Chaiklin (via logerrit)]

 sw/uiconfig/sglobal/popupmenu/table.xml |3 +--
 sw/uiconfig/sglobal/popupmenu/text.xml  |3 +--
 sw/uiconfig/sweb/popupmenu/table.xml|3 +--
 sw/uiconfig/sweb/popupmenu/text.xml |3 +--
 sw/uiconfig/swform/popupmenu/table.xml  |3 +--
 sw/uiconfig/swform/popupmenu/text.xml   |3 +--
 sw/uiconfig/swriter/popupmenu/table.xml |3 +--
 sw/uiconfig/swriter/popupmenu/text.xml  |3 +--
 sw/uiconfig/swxform/popupmenu/table.xml |3 +--
 sw/uiconfig/swxform/popupmenu/text.xml  |3 +--
 10 files changed, 10 insertions(+), 20 deletions(-)

New commits:
commit 0ee761853fd93dd66805d53636fe55c8879063da
Author: Seth Chaiklin 
AuthorDate: Fri Feb 19 13:12:00 2021 +0100
Commit: Seth Chaiklin 
CommitDate: Tue Feb 23 08:19:28 2021 +0100

tdf#140058 move "No List" position in context menu; add radio button

   for both text and table in Writer, Writer/Web, and forms

Change-Id: I696dbcf3e027a2595e2eed7e9fb9585c352da184
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/76
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/sw/uiconfig/sglobal/popupmenu/table.xml 
b/sw/uiconfig/sglobal/popupmenu/table.xml
index 179790220325..a4ef83e715d1 100644
--- a/sw/uiconfig/sglobal/popupmenu/table.xml
+++ b/sw/uiconfig/sglobal/popupmenu/table.xml
@@ -105,6 +105,7 @@
 
   
   
+  
   
   
   
@@ -117,8 +118,6 @@
   
   
   
-  
-  
 
   
   
diff --git a/sw/uiconfig/sglobal/popupmenu/text.xml 
b/sw/uiconfig/sglobal/popupmenu/text.xml
index 332a2caa26f0..f89bd0fa2cce 100644
--- a/sw/uiconfig/sglobal/popupmenu/text.xml
+++ b/sw/uiconfig/sglobal/popupmenu/text.xml
@@ -58,6 +58,7 @@
 
   
   
+  
   
   
   
@@ -70,8 +71,6 @@
   
   
   
-  
-  
 
   
   
diff --git a/sw/uiconfig/sweb/popupmenu/table.xml 
b/sw/uiconfig/sweb/popupmenu/table.xml
index 179790220325..a4ef83e715d1 100644
--- a/sw/uiconfig/sweb/popupmenu/table.xml
+++ b/sw/uiconfig/sweb/popupmenu/table.xml
@@ -105,6 +105,7 @@
 
   
   
+  
   
   
   
@@ -117,8 +118,6 @@
   
   
   
-  
-  
 
   
   
diff --git a/sw/uiconfig/sweb/popupmenu/text.xml 
b/sw/uiconfig/sweb/popupmenu/text.xml
index 332a2caa26f0..f89bd0fa2cce 100644
--- a/sw/uiconfig/sweb/popupmenu/text.xml
+++ b/sw/uiconfig/sweb/popupmenu/text.xml
@@ -58,6 +58,7 @@
 
   
   
+  
   
   
   
@@ -70,8 +71,6 @@
   
   
   
-  
-  
 
   
   
diff --git a/sw/uiconfig/swform/popupmenu/table.xml 
b/sw/uiconfig/swform/popupmenu/table.xml
index 179790220325..a4ef83e715d1 100644
--- a/sw/uiconfig/swform/popupmenu/table.xml
+++ b/sw/uiconfig/swform/popupmenu/table.xml
@@ -105,6 +105,7 @@
 
   
   
+  
   
   
   
@@ -117,8 +118,6 @@
   
   
   
-  
-  
 
   
   
diff --git a/sw/uiconfig/swform/popupmenu/text.xml 
b/sw/uiconfig/swform/popupmenu/text.xml
index 332a2caa26f0..f89bd0fa2cce 100644
--- a/sw/uiconfig/swform/popupmenu/text.xml
+++ b/sw/uiconfig/swform/popupmenu/text.xml
@@ -58,6 +58,7 @@
 
   
   
+  
   
   
   
@@ -70,8 +71,6 @@
   
   
   
-  
-  
 
   
   
diff --git a/sw/uiconfig/swriter/popupmenu/table.xml 
b/sw/uiconfig/swriter/popupmenu/table.xml
index 0e0ff18fecb4..c89636848757 100644
--- a/sw/uiconfig/swriter/popupmenu/table.xml
+++ b/sw/uiconfig/swriter/popupmenu/table.xml
@@ -108,6 +108,7 @@
 
   
   
+  
   
   
   
@@ -120,8 +121,6 @@
   
   
   
-  
-  
 
   
   
diff --git a/sw/uiconfig/swriter/popupmenu/text.xml 
b/sw/uiconfig/swriter/popupmenu/text.xml
index 332a2caa26f0..f89bd0fa2cce 100644
--- a/sw/uiconfig/swriter/popupmenu/text.xml
+++ b/sw/uiconfig/swriter/popupmenu/text.xml
@@ -58,6 +58,7 @@
 
   
   
+  
   
   
   
@@ -70,8 +71,6 @@
   
   
   
-  
-  
 
   
   
diff --git a/sw/uiconfig/swxform/popupmenu/table.xml 
b/sw/uiconfig/swxform/popupmenu/table.xml
index 179790220325..a4ef83e715d1 100644
--- a/sw/uiconfig/swxform/popupmenu/table.xml
+++ b/sw/uiconfig/swxform/popupmenu/table.xml
@@ -105,6 +105,7 @@
 
   
   
+  
   
   
   
@@ -117,8 +118,6 @@
   
   
   
-  
-  
 
   
   
diff --git a/sw/uiconfig/swxform/popupmenu/text.xml 
b/sw/uiconfig/swxform/popupmenu/text.xml
index 999fd1259507..f1fd0850def2 100644
--- a/sw/uiconfig/swxform/popupmenu/text.xml
+++ b/sw/uiconfig/swxform/popupmenu/text.xml
@@ -58,6 +58,7 @@
 
   
   
+  
   
   
   
@@ -70,8 +71,6 @@
   
   
   
-  
-  
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 basctl/source/accessibility/accessibledialogcontrolshape.cxx |   11 ---
 basctl/source/accessibility/accessibledialogwindow.cxx   |   11 ---
 basctl/source/dlged/dlged.cxx|2 +-
 3 files changed, 9 insertions(+), 15 deletions(-)

New commits:
commit 73cfa4945d1d429688a104240cf3268d3ce06029
Author: Noel 
AuthorDate: Mon Feb 22 19:43:49 2021 +0200
Commit: Noel Grandin 
CommitDate: Tue Feb 23 07:31:06 2021 +0100

loplugin:refcounting in basctl

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

diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx 
b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
index 949c8fa86c69..f885ff4bda1b 100644
--- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx
+++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx
@@ -393,9 +393,7 @@ Reference< XAccessibleRelationSet > 
AccessibleDialogControlShape::getAccessibleR
 {
 OExternalLockGuard aGuard( this );
 
-utl::AccessibleRelationSetHelper* pRelationSetHelper = new 
utl::AccessibleRelationSetHelper;
-Reference< XAccessibleRelationSet > xSet = pRelationSetHelper;
-return xSet;
+return new utl::AccessibleRelationSetHelper;
 }
 
 
@@ -403,8 +401,7 @@ Reference< XAccessibleStateSet > 
AccessibleDialogControlShape::getAccessibleStat
 {
 OExternalLockGuard aGuard( this );
 
-utl::AccessibleStateSetHelper* pStateSetHelper = new 
utl::AccessibleStateSetHelper;
-Reference< XAccessibleStateSet > xSet = pStateSetHelper;
+rtl::Reference pStateSetHelper = new 
utl::AccessibleStateSetHelper;
 
 if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
 {
@@ -415,7 +412,7 @@ Reference< XAccessibleStateSet > 
AccessibleDialogControlShape::getAccessibleStat
 pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
 }
 
-return xSet;
+return pStateSetHelper;
 }
 
 
@@ -506,7 +503,7 @@ Reference< awt::XFont > 
AccessibleDialogControlShape::getFont(  )
 aFont = pWindow->GetControlFont();
 else
 aFont = pWindow->GetFont();
-VCLXFont* pVCLXFont = new VCLXFont;
+rtl::Reference pVCLXFont = new VCLXFont;
 pVCLXFont->Init( *xDev, aFont );
 xFont = pVCLXFont;
 }
diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx 
b/basctl/source/accessibility/accessibledialogwindow.cxx
index eeb43b4f0c8b..0b641c8aca5e 100644
--- a/basctl/source/accessibility/accessibledialogwindow.cxx
+++ b/basctl/source/accessibility/accessibledialogwindow.cxx
@@ -668,9 +668,7 @@ Reference< XAccessibleRelationSet > 
AccessibleDialogWindow::getAccessibleRelatio
 {
 OExternalLockGuard aGuard( this );
 
-utl::AccessibleRelationSetHelper* pRelationSetHelper = new 
utl::AccessibleRelationSetHelper;
-Reference< XAccessibleRelationSet > xSet = pRelationSetHelper;
-return xSet;
+return new utl::AccessibleRelationSetHelper;
 }
 
 
@@ -678,8 +676,7 @@ Reference< XAccessibleStateSet > 
AccessibleDialogWindow::getAccessibleStateSet(
 {
 OExternalLockGuard aGuard( this );
 
-utl::AccessibleStateSetHelper* pStateSetHelper = new 
utl::AccessibleStateSetHelper;
-Reference< XAccessibleStateSet > xSet = pStateSetHelper;
+rtl::Reference pStateSetHelper = new 
utl::AccessibleStateSetHelper;
 
 if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
 {
@@ -690,7 +687,7 @@ Reference< XAccessibleStateSet > 
AccessibleDialogWindow::getAccessibleStateSet(
 pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
 }
 
-return xSet;
+return pStateSetHelper;
 }
 
 
@@ -801,7 +798,7 @@ Reference< awt::XFont > AccessibleDialogWindow::getFont(  )
 aFont = m_pDialogWindow->GetControlFont();
 else
 aFont = m_pDialogWindow->GetFont();
-VCLXFont* pVCLXFont = new VCLXFont;
+rtl::Reference pVCLXFont = new VCLXFont;
 pVCLXFont->Init( *xDev, aFont );
 xFont = pVCLXFont;
 }
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index f99dab40d4c3..d74d375357ce 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -748,7 +748,7 @@ void DlgEditor::Copy()
 {}
 }
 
-DlgEdTransferableImpl* pTrans = nullptr;
+rtl::Reference pTrans;
 if( xStringResourcePersistence.is() )
 {
 // With resource, support old and new format
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 avmedia/source/gstreamer/gstmanager.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 239d3a850dd3bef82c050fd727f4dbd5cf8ae0af
Author: Noel 
AuthorDate: Mon Feb 22 19:43:35 2021 +0200
Commit: Noel Grandin 
CommitDate: Tue Feb 23 07:30:42 2021 +0100

loplugin:refcounting in avmedia

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

diff --git a/avmedia/source/gstreamer/gstmanager.cxx 
b/avmedia/source/gstreamer/gstmanager.cxx
index bc7c917dc99d..1803b5880bc1 100644
--- a/avmedia/source/gstreamer/gstmanager.cxx
+++ b/avmedia/source/gstreamer/gstmanager.cxx
@@ -23,6 +23,7 @@
 #include "gstplayer.hxx"
 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 
@@ -38,14 +39,13 @@ Manager::~Manager()
 
 uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const 
OUString& rURL )
 {
-Player* pPlayer( new Player );
-uno::Reference< media::XPlayer >xRet( pPlayer );
+rtl::Reference pPlayer( new Player );
 const INetURLObject aURL( rURL );
 
 if( !pPlayer->create( aURL.GetMainURL( 
INetURLObject::DecodeMechanism::Unambiguous ) )  )
-xRet.clear();
+pPlayer.clear();
 
-return xRet;
+return pPlayer;
 }
 
 OUString SAL_CALL Manager::getImplementationName(  )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 chart2/source/controller/accessibility/AccessibleBase.cxx  |2 
 chart2/source/controller/main/ChartController.cxx  |   10 ++--
 chart2/source/controller/main/CommandDispatchContainer.cxx |5 +-
 chart2/source/model/main/Axis.cxx  |7 +--
 chart2/source/model/main/DataSeries.cxx|7 +--
 chart2/source/tools/CachedDataSequence.cxx |4 -
 chart2/source/tools/UncachedDataSequence.cxx   |3 -
 chart2/source/view/main/ChartView.cxx  |   28 -
 8 files changed, 26 insertions(+), 40 deletions(-)

New commits:
commit 9861aaad25f3e9bf5d78c56143c3f3b727c73007
Author: Noel 
AuthorDate: Mon Feb 22 19:44:07 2021 +0200
Commit: Noel Grandin 
CommitDate: Tue Feb 23 07:30:22 2021 +0100

loplugin:refcounting in chart2

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

diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx 
b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 7d9e244bfa1b..9e05f896b422 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -427,7 +427,7 @@ void SAL_CALL AccessibleBase::disposing()
 m_aAccInfo.m_pParent = nullptr;
 
 // attach new empty state set helper to member reference
-::utl::AccessibleStateSetHelper * pHelper = new 
::utl::AccessibleStateSetHelper();
+rtl::Reference<::utl::AccessibleStateSetHelper> pHelper = new 
::utl::AccessibleStateSetHelper();
 pHelper->AddState(AccessibleStateType::DEFUNC);
 // release old helper and attach new one
 m_xStateSetHelper = pHelper;
diff --git a/chart2/source/controller/main/ChartController.cxx 
b/chart2/source/controller/main/ChartController.cxx
index d19f3b97ef32..3d310d8d8bea 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -588,7 +588,7 @@ sal_Bool SAL_CALL ChartController::attachModel( const 
uno::Reference< frame::XMo
 aGuard.reset(); // lock for m_aDispatchContainer access
 // set new model at dispatchers
 m_aDispatchContainer.setModel( aNewModelRef->getModel());
-ControllerCommandDispatch * pDispatch = new ControllerCommandDispatch( 
m_xCC, this, &m_aDispatchContainer );
+rtl::Reference pDispatch = new 
ControllerCommandDispatch( m_xCC, this, &m_aDispatchContainer );
 pDispatch->initialize();
 
 // the dispatch container will return "this" for all commands returned by
@@ -596,13 +596,13 @@ sal_Bool SAL_CALL ChartController::attachModel( const 
uno::Reference< frame::XMo
 // is called here at the ChartController.
 m_aDispatchContainer.setChartDispatch( pDispatch, 
impl_getAvailableCommands() );
 
-DrawCommandDispatch* pDrawDispatch = new DrawCommandDispatch( m_xCC, this 
);
+rtl::Reference pDrawDispatch = new 
DrawCommandDispatch( m_xCC, this );
 pDrawDispatch->initialize();
-m_aDispatchContainer.setDrawCommandDispatch( pDrawDispatch );
+m_aDispatchContainer.setDrawCommandDispatch( pDrawDispatch.get() );
 
-ShapeController* pShapeController = new ShapeController( m_xCC, this );
+rtl::Reference pShapeController = new ShapeController( 
m_xCC, this );
 pShapeController->initialize();
-m_aDispatchContainer.setShapeController( pShapeController );
+m_aDispatchContainer.setShapeController( pShapeController.get() );
 aGuard.clear();
 
 #ifdef TEST_ENABLE_MODIFY_LISTENER
diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx 
b/chart2/source/controller/main/CommandDispatchContainer.cxx
index b007ebe5c652..dee4c961358e 100644
--- a/chart2/source/controller/main/CommandDispatchContainer.cxx
+++ b/chart2/source/controller/main/CommandDispatchContainer.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -87,7 +88,7 @@ Reference< frame::XDispatch > 
CommandDispatchContainer::getDispatchForURL(
 if( xModel.is() && ( rURL.Path == "Undo" || rURL.Path == "Redo" ||
  rURL.Path == "GetUndoStrings" || rURL.Path == 
"GetRedoStrings" ) )
 {
-CommandDispatch * pDispatch = new UndoCommandDispatch( m_xContext, 
xModel );
+rtl::Reference pDispatch = new 
UndoCommandDispatch( m_xContext, xModel );
 xResult.set( pDispatch );
 pDispatch->initialize();
 m_aCachedDispatches[ ".uno:Undo" ].set( xResult );
@@ -99,7 +100,7 @@ Reference< frame::XDispatch > 
CommandDispatchContainer::getDispatchForURL(
 else if( xModel.is() && ( rURL.Path == "Context" || rURL.Path == 
"ModifiedStatus" ) )
 {
 Reference< view::XSelectionSupplier > xSelSupp( 
xModel->getCurrentController(), uno::UNO_QUERY );
-CommandDispatch * pDis

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

[Noel (via logerrit)]

 fpicker/source/office/RemoteFilesDialog.cxx  |   10 --
 fpicker/source/office/iodlg.cxx  |5 ++---
 include/ucbhelper/interceptedinteraction.hxx |5 -
 3 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 9a61e9a3356874a23a697ace57a53e3ada505d87
Author: Noel 
AuthorDate: Sun Feb 21 20:02:21 2021 +0200
Commit: Noel Grandin 
CommitDate: Tue Feb 23 07:30:05 2021 +0100

loplugin:refcounting in fpicker

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

diff --git a/fpicker/source/office/RemoteFilesDialog.cxx 
b/fpicker/source/office/RemoteFilesDialog.cxx
index 30115abd93e8..1282d47115a3 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -683,11 +683,10 @@ IMPL_LINK ( RemoteFilesDialog, EditServiceMenuHdl, const 
OString&, rIdent, void
 {
 OUString sUserName = aURLEntries.UserList[0].UserName;
 
-::comphelper::SimplePasswordRequest* pPasswordRequest
+rtl::Reference<::comphelper::SimplePasswordRequest> 
pPasswordRequest
 = new ::comphelper::SimplePasswordRequest;
-Reference< XInteractionRequest > rRequest( 
pPasswordRequest );
 
-xInteractionHandler->handle( rRequest );
+xInteractionHandler->handle( pPasswordRequest );
 
 if ( pPasswordRequest->isPassword() )
 {
@@ -1180,10 +1179,9 @@ bool RemoteFilesDialog::ContentIsDocument( const 
OUString& rURL )
 // It's a webdav URL, so use the same open sequence as in normal 
open process.
 // Let's use a comphelper::StillReadWriteInteraction to trap 
errors here without showing the user.
 // This sequence will result in an exception if the target URL 
resource is not present
-comphelper::StillReadWriteInteraction* pInteraction = new 
comphelper::StillReadWriteInteraction(xInteractionHandler,xInteractionHandler);
-css::uno::Reference< css::task::XInteractionHandler > 
xInteraction(static_cast< css::task::XInteractionHandler* >(pInteraction), 
css::uno::UNO_QUERY);
+rtl::Reference pInteraction 
= new 
comphelper::StillReadWriteInteraction(xInteractionHandler,xInteractionHandler);
 
-Reference< XCommandEnvironment > xEnv = new 
::ucbhelper::CommandEnvironment( xInteraction, Reference< XProgressHandler >() 
);
+Reference< XCommandEnvironment > xEnv = new 
::ucbhelper::CommandEnvironment( pInteraction, Reference< XProgressHandler >() 
);
 ::ucbhelper::Content aContent( rURL, xEnv, m_xContext );
 
 aContent.openStream();
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index cbb354ecf585..fe199ae5a530 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -1401,14 +1401,13 @@ void SvtFileDialog::displayIOException( const OUString& 
_rURL, IOErrorCode _eCod
 aException.Classification = InteractionClassification_ERROR;
 
 // let and interaction handler handle this exception
-::comphelper::OInteractionRequest* pRequest = nullptr;
-Reference< css::task::XInteractionRequest > xRequest = pRequest =
+rtl::Reference<::comphelper::OInteractionRequest> pRequest =
 new ::comphelper::OInteractionRequest( makeAny( aException ) );
 pRequest->addContinuation( new ::comphelper::OInteractionAbort( ) );
 
 Reference< XInteractionHandler2 > xHandler(
 InteractionHandler::createWithParent( 
::comphelper::getProcessComponentContext(), nullptr ) );
-xHandler->handle( xRequest );
+xHandler->handle( pRequest );
 }
 catch( const Exception& )
 {
diff --git a/include/ucbhelper/interceptedinteraction.hxx 
b/include/ucbhelper/interceptedinteraction.hxx
index b6a410ca3dba..85699c1d534b 100644
--- a/include/ucbhelper/interceptedinteraction.hxx
+++ b/include/ucbhelper/interceptedinteraction.hxx
@@ -41,7 +41,10 @@ namespace ucbhelper{
   only
 - or as base class if interactions must be modified.
  */
-class UCBHELPER_DLLPUBLIC InterceptedInteraction : public 
::cppu::WeakImplHelper< css::task::XInteractionHandler >
+// extra struct to work around MSVC linking issue
+struct InterceptedInteraction_Base : public ::cppu::WeakImplHelper< 
css::task::XInteractionHandler > {};
+
+class UCBHELPER_DLLPUBLIC InterceptedInteraction : public 
InterceptedInteraction_Base
 {
 
 // types
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth (via logerrit)]

 sw/inc/ndtxt.hxx  |2 
 sw/qa/extras/tiledrendering/data/tdf114799_highlight.docx |binary
 sw/qa/extras/tiledrendering/tiledrendering.cxx|   29 +-
 sw/source/core/text/txtfld.cxx|   16 +--
 sw/source/core/txtnode/thints.cxx |   10 +++-
 5 files changed, 48 insertions(+), 9 deletions(-)

New commits:
commit 873df086db969cadc66087a5abdb1ff33f2c99f1
Author: Justin Luth 
AuthorDate: Fri Feb 19 08:37:44 2021 +0200
Commit: Justin Luth 
CommitDate: Tue Feb 23 06:14:03 2021 +0100

tdf#135774, tdf#114799 Char highlight: apply to numbering

This is a partial revert of LO 7.0's
commit 315d56582f8a56d8f2d3ea6cda63ea4832249608

The character background is exported as either w:highlight
or w:shd, based on a user setting. w:shd does not affect
numbering in MS Word, only the 16 color w:highlight does.
(tools - options - Load/Save - Microsoft Office -
 Character highlighting export as: Highlight or Shading)

I replaced tdf114799.docx with a version that uses w:highlight
instead of w:shd. The test was doing it backwards - MS Word
was NOT highlighting the numbering in the original unit test.

I added another test using the original unit test to ensure
that the numbering was not affected by the paragraph's
char shading.

There are many other "Char highlight:" patches in 7.2
that are not going to be backported.
See http://wiki.documentfoundation.org/Documentation/CharHighlight
for more details about this topic.

Change-Id: I38b6f700895e29f634f07430f6c7a13722ffa4f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111201
Tested-by: Justin Luth 
Reviewed-by: Justin Luth 

diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index f83bab3cebba..cc071f28b70e 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -804,7 +804,7 @@ public:
 virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr 
getSdrAllFillAttributesHelper() const override;
 
 /// In MS Word, the font underline setting of the paragraph end position 
won't affect the formatting of numbering, so we ignore it
-static bool IsIgnoredCharFormatForNumbering(const sal_uInt16 nWhich);
+static bool IsIgnoredCharFormatForNumbering(const sal_uInt16 nWhich, bool 
bIsCharStyle = false);
 void FormatDropNotify(const SwFormatDrop& rDrop) override
 { TriggerNodeUpdate(sw::LegacyModifyHint(&rDrop, &rDrop)); };
 };
diff --git a/sw/qa/extras/tiledrendering/data/tdf114799_highlight.docx 
b/sw/qa/extras/tiledrendering/data/tdf114799_highlight.docx
new file mode 100644
index ..3a64d71d7cfd
Binary files /dev/null and 
b/sw/qa/extras/tiledrendering/data/tdf114799_highlight.docx differ
diff --git a/sw/qa/extras/tiledrendering/data/tdf114799.docx 
b/sw/qa/extras/tiledrendering/data/tdf114799_shd.docx
similarity index 100%
rename from sw/qa/extras/tiledrendering/data/tdf114799.docx
rename to sw/qa/extras/tiledrendering/data/tdf114799_shd.docx
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 41249cd9f3ac..54dd09b7d191 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -135,6 +135,7 @@ public:
 void testDeselectCustomShape();
 void testSemiTransparent();
 void testHighlightNumbering();
+void testHighlightNumbering_shd();
 void testPilcrowRedlining();
 void testClipText();
 void testAnchorTypes();
@@ -212,6 +213,7 @@ public:
 CPPUNIT_TEST(testDeselectCustomShape);
 CPPUNIT_TEST(testSemiTransparent);
 CPPUNIT_TEST(testHighlightNumbering);
+CPPUNIT_TEST(testHighlightNumbering_shd);
 CPPUNIT_TEST(testPilcrowRedlining);
 CPPUNIT_TEST(testClipText);
 CPPUNIT_TEST(testAnchorTypes);
@@ -2441,7 +2443,7 @@ void SwTiledRenderingTest::testSemiTransparent()
 void SwTiledRenderingTest::testHighlightNumbering()
 {
 // Load a document where the top left tile contains a semi-transparent 
rectangle shape.
-SwXTextDocument* pXTextDocument = createDoc("tdf114799.docx");
+SwXTextDocument* pXTextDocument = createDoc("tdf114799_highlight.docx");
 
 // Render a larger area, and then get the color of the bottom right corner 
of our tile.
 size_t nCanvasWidth = 1024;
@@ -2463,6 +2465,31 @@ void SwTiledRenderingTest::testHighlightNumbering()
 CPPUNIT_ASSERT_EQUAL(COL_YELLOW, aColor);
 }
 
+void SwTiledRenderingTest::testHighlightNumbering_shd()
+{
+// Load a document where the top left tile contains a semi-transparent 
rectangle shape.
+SwXTextDocument* pXTextDocument = createDoc("tdf114799_shd.docx");
+
+// Render a larger area, and then get the color of the bottom right corner 
of our tile.
+size_t nCanvasWidth = 1024;
+size_t nCanvasHeight = 512;
+size_t nTileSize = 256;
+std::vector aPixmap(

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - icon-themes/sukapura icon-themes/sukapura_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/sukapura/links.txt |  145 +
 1 file changed, 63 insertions(+), 82 deletions(-)

New commits:
commit eb0eb724ca59e1172b039a621f044ee1fc7bb3bc
Author: Rizal Muttaqin 
AuthorDate: Mon Feb 22 16:34:13 2021 +0700
Commit: Rizal Muttaqin 
CommitDate: Mon Feb 22 23:16:42 2021 +0100

Sukapura: tdf#133038 change some formatting icons for Catalan

Change-Id: I348f0f7b706befd7cb6dc00175875ef4256cba78
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111343
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 
(cherry picked from commit bed8fb89abd980d08c5612f5f100bfad4ef0bca8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111317

diff --git a/icon-themes/sukapura/cmd/32/ca/bold.png 
b/icon-themes/sukapura/cmd/32/es/bold.png
similarity index 100%
rename from icon-themes/sukapura/cmd/32/ca/bold.png
rename to icon-themes/sukapura/cmd/32/es/bold.png
diff --git a/icon-themes/sukapura/cmd/32/ca/underline.png 
b/icon-themes/sukapura/cmd/32/es/underline.png
similarity index 100%
rename from icon-themes/sukapura/cmd/32/ca/underline.png
rename to icon-themes/sukapura/cmd/32/es/underline.png
diff --git a/icon-themes/sukapura/cmd/32/ca/underlinedouble.png 
b/icon-themes/sukapura/cmd/32/es/underlinedouble.png
similarity index 100%
rename from icon-themes/sukapura/cmd/32/ca/underlinedouble.png
rename to icon-themes/sukapura/cmd/32/es/underlinedouble.png
diff --git a/icon-themes/sukapura/cmd/32/ca/italic.png 
b/icon-themes/sukapura/cmd/32/it/italic.png
similarity index 100%
rename from icon-themes/sukapura/cmd/32/ca/italic.png
rename to icon-themes/sukapura/cmd/32/it/italic.png
diff --git a/icon-themes/sukapura/cmd/ca/lc_bold.png 
b/icon-themes/sukapura/cmd/es/lc_bold.png
similarity index 100%
rename from icon-themes/sukapura/cmd/ca/lc_bold.png
rename to icon-themes/sukapura/cmd/es/lc_bold.png
diff --git a/icon-themes/sukapura/cmd/ca/lc_underline.png 
b/icon-themes/sukapura/cmd/es/lc_underline.png
similarity index 100%
rename from icon-themes/sukapura/cmd/ca/lc_underline.png
rename to icon-themes/sukapura/cmd/es/lc_underline.png
diff --git a/icon-themes/sukapura/cmd/ca/lc_underlinedouble.png 
b/icon-themes/sukapura/cmd/es/lc_underlinedouble.png
similarity index 100%
rename from icon-themes/sukapura/cmd/ca/lc_underlinedouble.png
rename to icon-themes/sukapura/cmd/es/lc_underlinedouble.png
diff --git a/icon-themes/sukapura/cmd/ca/sc_bold.png 
b/icon-themes/sukapura/cmd/es/sc_bold.png
similarity index 100%
rename from icon-themes/sukapura/cmd/ca/sc_bold.png
rename to icon-themes/sukapura/cmd/es/sc_bold.png
diff --git a/icon-themes/sukapura/cmd/ca/sc_underline.png 
b/icon-themes/sukapura/cmd/es/sc_underline.png
similarity index 100%
rename from icon-themes/sukapura/cmd/ca/sc_underline.png
rename to icon-themes/sukapura/cmd/es/sc_underline.png
diff --git a/icon-themes/sukapura/cmd/ca/sc_underlinedouble.png 
b/icon-themes/sukapura/cmd/es/sc_underlinedouble.png
similarity index 100%
rename from icon-themes/sukapura/cmd/ca/sc_underlinedouble.png
rename to icon-themes/sukapura/cmd/es/sc_underlinedouble.png
diff --git a/icon-themes/sukapura/cmd/ca/lc_italic.png 
b/icon-themes/sukapura/cmd/it/lc_italic.png
similarity index 100%
rename from icon-themes/sukapura/cmd/ca/lc_italic.png
rename to icon-themes/sukapura/cmd/it/lc_italic.png
diff --git a/icon-themes/sukapura/cmd/ca/sc_italic.png 
b/icon-themes/sukapura/cmd/it/sc_italic.png
similarity index 100%
rename from icon-themes/sukapura/cmd/ca/sc_italic.png
rename to icon-themes/sukapura/cmd/it/sc_italic.png
diff --git a/icon-themes/sukapura/links.txt b/icon-themes/sukapura/links.txt
index 371368985ba8..342e8f54b9a3 100644
--- a/icon-themes/sukapura/links.txt
+++ b/icon-themes/sukapura/links.txt
@@ -402,18 +402,13 @@ cmd/32/bg/underline.png cmd/32/hu/underline.png
 cmd/32/bg/underlinedouble.png cmd/32/hu/underlinedouble.png
 cmd/32/bg/underlinesimple.png cmd/32/hu/underline.png
 cmd/32/bg/underlinesingle.png cmd/32/hu/underline.png
-cmd/32/ca/underlinesimple.png cmd/32/ca/underline.png
-cmd/32/ca/underlinesingle.png cmd/32/ca/underline.png
-cmd/32/es/bold.png cmd/32/ca/bold.png
 cmd/32/es/italic.png cmd/32/de/italic.png
 cmd/32/es/numberformatdecdecimals.png cmd/32/de/numberformatdecdecimals.png
 cmd/32/es/numberformatdecimal.png cmd/32/de/numberformatdecimal.png
 cmd/32/es/numberformatincdecimals.png cmd/32/de/numberformatincdecimals.png
 cmd/32/es/numberformatthousands.png cmd/32/de/numberformatthousands.png
-cmd/32/es/underline.png cmd/32/ca/underline.png
-cmd/32/es/underlinedouble.png cmd/32/ca/underlinedouble.png
-cmd/32/es/underlinesimple.png cmd/32/ca/underline.png
-cmd/32/es/underlinesingle.png cmd/32/ca/underline.png
+cmd/32/es/underlinesimple.png cmd/32/es/underline.png
+cmd/32/es/underlinesingle.png cmd/32/es/underline.png
 cmd/32/fa/absoluterecord.png cmd/32/ar/absoluterecord.png
 cmd/32/fa/alphaliststyle.png cmd/32/ar/alphaliststyle.png
 cmd/32/fa/alphalowliststyle.png cmd/32/ar/alphalowl

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - icon-themes/karasa_jaga icon-themes/karasa_jaga_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/karasa_jaga/links.txt |  146 --
 1 file changed, 64 insertions(+), 82 deletions(-)

New commits:
commit ba6b682790667482538da6ea0aa26e4c9dd9d040
Author: Rizal Muttaqin 
AuthorDate: Mon Feb 22 16:34:13 2021 +0700
Commit: Rizal Muttaqin 
CommitDate: Mon Feb 22 23:16:06 2021 +0100

Karasa Jaga: tdf#133038 change some formatting icons for Catalan

Change-Id: I4146e0afbc7bd1aa95d2029a0618e02b168b33ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111312
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/karasa_jaga/cmd/32/ca/bold.png 
b/icon-themes/karasa_jaga/cmd/32/es/bold.png
similarity index 100%
rename from icon-themes/karasa_jaga/cmd/32/ca/bold.png
rename to icon-themes/karasa_jaga/cmd/32/es/bold.png
diff --git a/icon-themes/karasa_jaga/cmd/32/ca/underline.png 
b/icon-themes/karasa_jaga/cmd/32/es/underline.png
similarity index 100%
rename from icon-themes/karasa_jaga/cmd/32/ca/underline.png
rename to icon-themes/karasa_jaga/cmd/32/es/underline.png
diff --git a/icon-themes/karasa_jaga/cmd/32/ca/underlinedouble.png 
b/icon-themes/karasa_jaga/cmd/32/es/underlinedouble.png
similarity index 100%
rename from icon-themes/karasa_jaga/cmd/32/ca/underlinedouble.png
rename to icon-themes/karasa_jaga/cmd/32/es/underlinedouble.png
diff --git a/icon-themes/karasa_jaga/cmd/32/ca/italic.png 
b/icon-themes/karasa_jaga/cmd/32/it/italic.png
similarity index 100%
rename from icon-themes/karasa_jaga/cmd/32/ca/italic.png
rename to icon-themes/karasa_jaga/cmd/32/it/italic.png
diff --git a/icon-themes/karasa_jaga/cmd/ca/lc_bold.png 
b/icon-themes/karasa_jaga/cmd/es/lc_bold.png
similarity index 100%
rename from icon-themes/karasa_jaga/cmd/ca/lc_bold.png
rename to icon-themes/karasa_jaga/cmd/es/lc_bold.png
diff --git a/icon-themes/karasa_jaga/cmd/ca/lc_underline.png 
b/icon-themes/karasa_jaga/cmd/es/lc_underline.png
similarity index 100%
rename from icon-themes/karasa_jaga/cmd/ca/lc_underline.png
rename to icon-themes/karasa_jaga/cmd/es/lc_underline.png
diff --git a/icon-themes/karasa_jaga/cmd/ca/lc_underlinedouble.png 
b/icon-themes/karasa_jaga/cmd/es/lc_underlinedouble.png
similarity index 100%
rename from icon-themes/karasa_jaga/cmd/ca/lc_underlinedouble.png
rename to icon-themes/karasa_jaga/cmd/es/lc_underlinedouble.png
diff --git a/icon-themes/karasa_jaga/cmd/ca/sc_bold.png 
b/icon-themes/karasa_jaga/cmd/es/sc_bold.png
similarity index 100%
rename from icon-themes/karasa_jaga/cmd/ca/sc_bold.png
rename to icon-themes/karasa_jaga/cmd/es/sc_bold.png
diff --git a/icon-themes/karasa_jaga/cmd/ca/sc_underline.png 
b/icon-themes/karasa_jaga/cmd/es/sc_underline.png
similarity index 100%
rename from icon-themes/karasa_jaga/cmd/ca/sc_underline.png
rename to icon-themes/karasa_jaga/cmd/es/sc_underline.png
diff --git a/icon-themes/karasa_jaga/cmd/ca/sc_underlinedouble.png 
b/icon-themes/karasa_jaga/cmd/es/sc_underlinedouble.png
similarity index 100%
rename from icon-themes/karasa_jaga/cmd/ca/sc_underlinedouble.png
rename to icon-themes/karasa_jaga/cmd/es/sc_underlinedouble.png
diff --git a/icon-themes/karasa_jaga/cmd/ca/lc_italic.png 
b/icon-themes/karasa_jaga/cmd/it/lc_italic.png
similarity index 100%
rename from icon-themes/karasa_jaga/cmd/ca/lc_italic.png
rename to icon-themes/karasa_jaga/cmd/it/lc_italic.png
diff --git a/icon-themes/karasa_jaga/cmd/ca/sc_italic.png 
b/icon-themes/karasa_jaga/cmd/it/sc_italic.png
similarity index 100%
rename from icon-themes/karasa_jaga/cmd/ca/sc_italic.png
rename to icon-themes/karasa_jaga/cmd/it/sc_italic.png
diff --git a/icon-themes/karasa_jaga/links.txt 
b/icon-themes/karasa_jaga/links.txt
index f9b4ecd74488..edcb44140ad0 100644
--- a/icon-themes/karasa_jaga/links.txt
+++ b/icon-themes/karasa_jaga/links.txt
@@ -46,7 +46,7 @@ cmd/32/basicshapes.png cmd/32/basicshapes.diamond.png
 cmd/32/bg/autoformatmenu.png cmd/32/bg/autocorrectdlg.png
 cmd/32/bg/spelldialog.png cmd/32/bg/spelling.png
 cmd/32/bg/spellingandgrammardialog.png cmd/32/bg/spelling.png
-cmd/32/bg/underline.png cmd/32/ca/underline.png
+cmd/32/bg/underline.png cmd/32/es/underline.png
 cmd/32/bg/underlinedouble.png cmd/32/hu/underlinedouble.png
 cmd/32/bg/underlinesimple.png cmd/32/hu/underline.png
 cmd/32/bg/underlinesingle.png cmd/32/hu/underline.png
@@ -54,8 +54,6 @@ cmd/32/break.png cmd/32/polygon_unfilled.png
 cmd/32/browsebackward.png cmd/32/navigateback.png
 cmd/32/browseforward.png cmd/32/navigateforward.png
 cmd/32/bulletliststyle.png cmd/32/defaultbullet.png
-cmd/32/ca/underlinesimple.png cmd/32/ca/underline.png
-cmd/32/ca/underlinesingle.png cmd/32/ca/underline.png
 cmd/32/calloutshapes.png cmd/32/calloutshapes.round-rectangular-callout.png
 cmd/32/cellcontentsmenu.png cmd/32/calculate.png
 cmd/32/cellprotection.png cmd/32/protect.png
@@ -120,16 +118,13 @@ cmd/32/editselectmenu.png cmd/32/selecttables.png
 cmd/32/editshapehyperlink.png cmd/32/inserthyperlink.png
 cmd/32/ellipse.png cmd/32/basicshapes.ellipse.png
 cmd/32/e

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_dark_svg icon-themes/sifr_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/sifr/links.txt  |  144 +---
 icon-themes/sifr_dark/links.txt |  144 +---
 2 files changed, 126 insertions(+), 162 deletions(-)

New commits:
commit 07e30b5913d4e77f775803a322c7de9a4e41f0ad
Author: Rizal Muttaqin 
AuthorDate: Mon Feb 22 20:35:54 2021 +0700
Commit: Rizal Muttaqin 
CommitDate: Mon Feb 22 23:15:25 2021 +0100

Sifr: tdf#133038 change some formatting icons for Catalan

Change-Id: Ia0023372e70ff3a608f397804466c0ea2b807f0b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111313
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/sifr/cmd/32/ca/bold.png 
b/icon-themes/sifr/cmd/32/es/bold.png
similarity index 100%
rename from icon-themes/sifr/cmd/32/ca/bold.png
rename to icon-themes/sifr/cmd/32/es/bold.png
diff --git a/icon-themes/sifr/cmd/32/ca/underline.png 
b/icon-themes/sifr/cmd/32/es/underline.png
similarity index 100%
rename from icon-themes/sifr/cmd/32/ca/underline.png
rename to icon-themes/sifr/cmd/32/es/underline.png
diff --git a/icon-themes/sifr/cmd/32/ca/underlinedouble.png 
b/icon-themes/sifr/cmd/32/es/underlinedouble.png
similarity index 100%
rename from icon-themes/sifr/cmd/32/ca/underlinedouble.png
rename to icon-themes/sifr/cmd/32/es/underlinedouble.png
diff --git a/icon-themes/sifr/cmd/32/ca/italic.png 
b/icon-themes/sifr/cmd/32/it/italic.png
similarity index 100%
rename from icon-themes/sifr/cmd/32/ca/italic.png
rename to icon-themes/sifr/cmd/32/it/italic.png
diff --git a/icon-themes/sifr/cmd/ca/lc_bold.png 
b/icon-themes/sifr/cmd/es/lc_bold.png
similarity index 100%
rename from icon-themes/sifr/cmd/ca/lc_bold.png
rename to icon-themes/sifr/cmd/es/lc_bold.png
diff --git a/icon-themes/sifr/cmd/ca/lc_underline.png 
b/icon-themes/sifr/cmd/es/lc_underline.png
similarity index 100%
rename from icon-themes/sifr/cmd/ca/lc_underline.png
rename to icon-themes/sifr/cmd/es/lc_underline.png
diff --git a/icon-themes/sifr/cmd/ca/lc_underlinedouble.png 
b/icon-themes/sifr/cmd/es/lc_underlinedouble.png
similarity index 100%
rename from icon-themes/sifr/cmd/ca/lc_underlinedouble.png
rename to icon-themes/sifr/cmd/es/lc_underlinedouble.png
diff --git a/icon-themes/sifr/cmd/ca/sc_bold.png 
b/icon-themes/sifr/cmd/es/sc_bold.png
similarity index 100%
rename from icon-themes/sifr/cmd/ca/sc_bold.png
rename to icon-themes/sifr/cmd/es/sc_bold.png
diff --git a/icon-themes/sifr/cmd/ca/sc_underline.png 
b/icon-themes/sifr/cmd/es/sc_underline.png
similarity index 100%
rename from icon-themes/sifr/cmd/ca/sc_underline.png
rename to icon-themes/sifr/cmd/es/sc_underline.png
diff --git a/icon-themes/sifr/cmd/ca/sc_underlinedouble.png 
b/icon-themes/sifr/cmd/es/sc_underlinedouble.png
similarity index 100%
rename from icon-themes/sifr/cmd/ca/sc_underlinedouble.png
rename to icon-themes/sifr/cmd/es/sc_underlinedouble.png
diff --git a/icon-themes/sifr/cmd/ca/lc_italic.png 
b/icon-themes/sifr/cmd/it/lc_italic.png
similarity index 100%
rename from icon-themes/sifr/cmd/ca/lc_italic.png
rename to icon-themes/sifr/cmd/it/lc_italic.png
diff --git a/icon-themes/sifr/cmd/ca/sc_italic.png 
b/icon-themes/sifr/cmd/it/sc_italic.png
similarity index 100%
rename from icon-themes/sifr/cmd/ca/sc_italic.png
rename to icon-themes/sifr/cmd/it/sc_italic.png
diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index b4e84ee26828..390994508281 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -421,18 +421,13 @@ cmd/32/bg/underline.png cmd/32/hu/underline.png
 cmd/32/bg/underlinedouble.png cmd/32/hu/underlinedouble.png
 cmd/32/bg/underlinesimple.png cmd/32/hu/underline.png
 cmd/32/bg/underlinesingle.png cmd/32/hu/underline.png
-cmd/32/ca/underlinesimple.png cmd/32/ca/underline.png
-cmd/32/ca/underlinesingle.png cmd/32/ca/underline.png
-cmd/32/es/bold.png cmd/32/ca/bold.png
 cmd/32/es/italic.png cmd/32/de/italic.png
 cmd/32/es/numberformatdecdecimals.png cmd/32/de/numberformatdecdecimals.png
 cmd/32/es/numberformatdecimal.png cmd/32/de/numberformatdecimal.png
 cmd/32/es/numberformatincdecimals.png cmd/32/de/numberformatincdecimals.png
 cmd/32/es/numberformatthousands.png cmd/32/de/numberformatthousands.png
-cmd/32/es/underline.png cmd/32/ca/underline.png
-cmd/32/es/underlinedouble.png cmd/32/ca/underlinedouble.png
-cmd/32/es/underlinesimple.png cmd/32/ca/underline.png
-cmd/32/es/underlinesingle.png cmd/32/ca/underline.png
+cmd/32/es/underlinesimple.png cmd/32/es/underline.png
+cmd/32/es/underlinesingle.png cmd/32/es/underline.png
 cmd/32/fa/absoluterecord.png cmd/32/ar/absoluterecord.png
 cmd/32/fa/alphaliststyle.png cmd/32/ar/alphaliststyle.png
 cmd/32/fa/alphalowliststyle.png cmd/32/ar/alphalowliststyle.png
@@ -468,10 +463,10 @@ cmd/32/fr/numberformatdecdecimals.png 
cmd/32/de/numberformatdecdecimals.png
 cmd/32/fr/numberformatdecimal.png cmd/32/de/numberformatdecimal.png
 cmd/32/fr/numberformatincdecimals.png cmd/32/de/numberformatincdecimals.png
 cmd/32

[Libreoffice-commits] core.git: icon-themes/karasa_jaga icon-themes/karasa_jaga_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/karasa_jaga/links.txt |  146 --
 1 file changed, 64 insertions(+), 82 deletions(-)

New commits:
commit 576c6054d8d445cc977fc3789c572cfc2a3ccd83
Author: Rizal Muttaqin 
AuthorDate: Mon Feb 22 16:34:13 2021 +0700
Commit: Rizal Muttaqin 
CommitDate: Mon Feb 22 23:14:44 2021 +0100

Karasa Jaga: tdf#133038 change some formatting icons for Catalan

Change-Id: I4146e0afbc7bd1aa95d2029a0618e02b168b33ab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111304
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/karasa_jaga/cmd/32/ca/bold.png 
b/icon-themes/karasa_jaga/cmd/32/es/bold.png
similarity index 100%
rename from icon-themes/karasa_jaga/cmd/32/ca/bold.png
rename to icon-themes/karasa_jaga/cmd/32/es/bold.png
diff --git a/icon-themes/karasa_jaga/cmd/32/ca/underline.png 
b/icon-themes/karasa_jaga/cmd/32/es/underline.png
similarity index 100%
rename from icon-themes/karasa_jaga/cmd/32/ca/underline.png
rename to icon-themes/karasa_jaga/cmd/32/es/underline.png
diff --git a/icon-themes/karasa_jaga/cmd/32/ca/underlinedouble.png 
b/icon-themes/karasa_jaga/cmd/32/es/underlinedouble.png
similarity index 100%
rename from icon-themes/karasa_jaga/cmd/32/ca/underlinedouble.png
rename to icon-themes/karasa_jaga/cmd/32/es/underlinedouble.png
diff --git a/icon-themes/karasa_jaga/cmd/32/ca/italic.png 
b/icon-themes/karasa_jaga/cmd/32/it/italic.png
similarity index 100%
rename from icon-themes/karasa_jaga/cmd/32/ca/italic.png
rename to icon-themes/karasa_jaga/cmd/32/it/italic.png
diff --git a/icon-themes/karasa_jaga/cmd/ca/lc_bold.png 
b/icon-themes/karasa_jaga/cmd/es/lc_bold.png
similarity index 100%
rename from icon-themes/karasa_jaga/cmd/ca/lc_bold.png
rename to icon-themes/karasa_jaga/cmd/es/lc_bold.png
diff --git a/icon-themes/karasa_jaga/cmd/ca/lc_underline.png 
b/icon-themes/karasa_jaga/cmd/es/lc_underline.png
similarity index 100%
rename from icon-themes/karasa_jaga/cmd/ca/lc_underline.png
rename to icon-themes/karasa_jaga/cmd/es/lc_underline.png
diff --git a/icon-themes/karasa_jaga/cmd/ca/lc_underlinedouble.png 
b/icon-themes/karasa_jaga/cmd/es/lc_underlinedouble.png
similarity index 100%
rename from icon-themes/karasa_jaga/cmd/ca/lc_underlinedouble.png
rename to icon-themes/karasa_jaga/cmd/es/lc_underlinedouble.png
diff --git a/icon-themes/karasa_jaga/cmd/ca/sc_bold.png 
b/icon-themes/karasa_jaga/cmd/es/sc_bold.png
similarity index 100%
rename from icon-themes/karasa_jaga/cmd/ca/sc_bold.png
rename to icon-themes/karasa_jaga/cmd/es/sc_bold.png
diff --git a/icon-themes/karasa_jaga/cmd/ca/sc_underline.png 
b/icon-themes/karasa_jaga/cmd/es/sc_underline.png
similarity index 100%
rename from icon-themes/karasa_jaga/cmd/ca/sc_underline.png
rename to icon-themes/karasa_jaga/cmd/es/sc_underline.png
diff --git a/icon-themes/karasa_jaga/cmd/ca/sc_underlinedouble.png 
b/icon-themes/karasa_jaga/cmd/es/sc_underlinedouble.png
similarity index 100%
rename from icon-themes/karasa_jaga/cmd/ca/sc_underlinedouble.png
rename to icon-themes/karasa_jaga/cmd/es/sc_underlinedouble.png
diff --git a/icon-themes/karasa_jaga/cmd/ca/lc_italic.png 
b/icon-themes/karasa_jaga/cmd/it/lc_italic.png
similarity index 100%
rename from icon-themes/karasa_jaga/cmd/ca/lc_italic.png
rename to icon-themes/karasa_jaga/cmd/it/lc_italic.png
diff --git a/icon-themes/karasa_jaga/cmd/ca/sc_italic.png 
b/icon-themes/karasa_jaga/cmd/it/sc_italic.png
similarity index 100%
rename from icon-themes/karasa_jaga/cmd/ca/sc_italic.png
rename to icon-themes/karasa_jaga/cmd/it/sc_italic.png
diff --git a/icon-themes/karasa_jaga/links.txt 
b/icon-themes/karasa_jaga/links.txt
index aea37d5694bc..445ae3740cb3 100644
--- a/icon-themes/karasa_jaga/links.txt
+++ b/icon-themes/karasa_jaga/links.txt
@@ -46,7 +46,7 @@ cmd/32/basicshapes.png cmd/32/basicshapes.diamond.png
 cmd/32/bg/autoformatmenu.png cmd/32/bg/autocorrectdlg.png
 cmd/32/bg/spelldialog.png cmd/32/bg/spelling.png
 cmd/32/bg/spellingandgrammardialog.png cmd/32/bg/spelling.png
-cmd/32/bg/underline.png cmd/32/ca/underline.png
+cmd/32/bg/underline.png cmd/32/es/underline.png
 cmd/32/bg/underlinedouble.png cmd/32/hu/underlinedouble.png
 cmd/32/bg/underlinesimple.png cmd/32/hu/underline.png
 cmd/32/bg/underlinesingle.png cmd/32/hu/underline.png
@@ -54,8 +54,6 @@ cmd/32/break.png cmd/32/polygon_unfilled.png
 cmd/32/browsebackward.png cmd/32/navigateback.png
 cmd/32/browseforward.png cmd/32/navigateforward.png
 cmd/32/bulletliststyle.png cmd/32/defaultbullet.png
-cmd/32/ca/underlinesimple.png cmd/32/ca/underline.png
-cmd/32/ca/underlinesingle.png cmd/32/ca/underline.png
 cmd/32/calloutshapes.png cmd/32/calloutshapes.round-rectangular-callout.png
 cmd/32/cellcontentsmenu.png cmd/32/calculate.png
 cmd/32/cellprotection.png cmd/32/protect.png
@@ -120,16 +118,13 @@ cmd/32/editselectmenu.png cmd/32/selecttables.png
 cmd/32/editshapehyperlink.png cmd/32/inserthyperlink.png
 cmd/32/ellipse.png cmd/32/basicshapes.ellipse.png
 cmd/32/e

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

[Stephan Bergmann (via logerrit)]

 vcl/source/outdev/map.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a1d987cf3d0e1ae4d87f7d06ae93e71a0cc59f0c
Author: Stephan Bergmann 
AuthorDate: Mon Feb 22 16:24:43 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Feb 22 21:44:11 2021 +0100

Fix computation of aF fraction in OutputDevice::SetRelativeMapMode

...where cfff893b9c82843a90aac4ecdb3a3936721b74a0 "Move unit conversion 
code to
o3tl, and unify on that in more places" had apparently switched the 
numerator
and denominator arguments passed into the Fraction constructor.  (And give 
the
two values returned by o3tl::getConversionMulDiv less misleading names.)

This had caused e.g. UITest_conditional_format
UITEST_TEST_NAME=tdf100793.tdf100793.test_tdf100793 to fail in a
(--without-system-cairo) UBSan build with

> cairo-slope-private.h:50:22: runtime error: signed integer overflow: 
-2126627072 - 135139840 cannot be represented in type 'int'
>  #0 in _cairo_slope_init at 
workdir/UnpackedTarball/cairo/src/./cairo-slope-private.h:50:22
>  #1 in _cairo_path_fixed_line_to at 
workdir/UnpackedTarball/cairo/src/cairo-path-fixed.c:517:6
>  #2 in _cairo_default_context_line_to at 
workdir/UnpackedTarball/cairo/src/cairo-default-context.c:715:12
>  #3 in cairo_line_to at workdir/UnpackedTarball/cairo/src/cairo.c:1743:14
>  #4 in AddPolygonToPath(_cairo*, basegfx::B2DPolygon const&, 
basegfx::B2DHomMatrix const&, bool, bool) at vcl/headless/svpgdi.cxx:1291:13
>  #5 in (anonymous namespace)::add_polygon_path(_cairo*, 
basegfx::B2DPolyPolygon const&, basegfx::B2DHomMatrix const&, bool) at 
vcl/headless/svpgdi.cxx:1821:33
>  #6 in SvpSalGraphics::drawPolyPolygon(basegfx::B2DHomMatrix const&, 
basegfx::B2DPolyPolygon const&, double) at vcl/headless/svpgdi.cxx:1879:9
>  #7 in SvpSalGraphics::drawRect(long, long, long, long) at 
vcl/headless/svpgdi.cxx:1059:9
>  #8 in SalGraphics::DrawRect(long, long, long, long, OutputDevice const&) 
at vcl/source/gdi/salgdilayout.cxx:373:5
>  #9 in OutputDevice::DrawRect(tools::Rectangle const&) at 
vcl/source/outdev/rect.cxx:83:17
>  #10 in (anonymous namespace)::drawCells(OutputDevice&, 
std::optional const&, SvxBrushItem const*, std::optional&, 
SvxBrushItem const*&, tools::Rectangle&, long, long, long, long, ScDataBarInfo 
const*, ScDataBarInfo const*&, ScIconSetInfo const*, ScIconSetInfo const*&, 
std::__debug::map, 
std::allocator > >&) at 
sc/source/ui/view/output.cxx:947:32
>  #11 in ScOutputData::DrawBackground(OutputDevice&) at 
sc/source/ui/view/output.cxx:1116:21
>  #12 in ScPrintFunc::DrawToDev(ScDocument&, OutputDevice*, double, 
tools::Rectangle const&, ScViewData*, bool) at 
sc/source/ui/view/printfun.cxx:594:17
>  #13 in ScDocShell::Draw(OutputDevice*, JobSetup const&, unsigned short) 
at sc/source/ui/docshell/docsh4.cxx:2146:9
>  #14 in SfxObjectShell::DoDraw_Impl(OutputDevice*, Point const&, Fraction 
const&, Fraction const&, JobSetup const&, unsigned short) at 
sfx2/source/doc/objembed.cxx:194:5
>  #15 in SfxObjectShell::DoDraw(OutputDevice*, Point const&, Size const&, 
JobSetup const&, unsigned short) at sfx2/source/doc/objembed.cxx:141:9
>  #16 in SfxObjectShell::CreatePreview_Impl(bool, VirtualDevice*, 
GDIMetaFile*) const at sfx2/source/doc/objcont.cxx:199:40
>  #17 in SfxObjectShell::GetPreviewBitmap() const at 
sfx2/source/doc/objcont.cxx:110:9
>  #18 in SfxPickListImpl::AddDocumentToPickList(SfxObjectShell const*) at 
sfx2/source/appl/sfxpicklist.cxx:120:46
>  #19 in SfxPickListImpl::Notify(SfxBroadcaster&, SfxHint const&) at 
sfx2/source/appl/sfxpicklist.cxx:208:13
>  #20 in SfxBroadcaster::Broadcast(SfxHint const&) at 
svl/source/notify/SfxBroadcaster.cxx:39:24
>  #21 in (anonymous namespace)::SfxEventAsyncer_Impl::IdleHdl(Timer*) at 
sfx2/source/appl/appcfg.cxx:105:19
>  #22 in (anonymous 
namespace)::SfxEventAsyncer_Impl::LinkStubIdleHdl(void*, Timer*) at 
sfx2/source/appl/appcfg.cxx:100:1
>  #23 in Link::Call(Timer*) const at 
include/tools/link.hxx:111:45
>  #24 in Timer::Invoke() at vcl/source/app/timer.cxx:75:21
>  #25 in Scheduler::ProcessTaskScheduling() at 
vcl/source/app/scheduler.cxx:476:20
>  #26 in Scheduler::CallbackTaskScheduling() at 
vcl/source/app/scheduler.cxx:266:5
>  #27 in SalTimer::CallCallback() at vcl/inc/saltimer.hxx:54:13
>  #28 in SvpSalInstance::CheckTimeout(bool) at 
vcl/headless/svpinst.cxx:210:53
>  #29 in SvpSalInstance::DoYield(bool, bool) at 
vcl/headless/svpinst.cxx:463:21
>  #30 in ImplYield(bool, bool) at vcl/source/app/svapp.cxx:463:48
>  #31 in Application::Yield() at vcl/source/app/svapp.cxx:530:5
>  #32 in Application::Execute() at vcl/source/app/svapp.cxx:442:9
>  #33 in desktop::Desktop::Main() at desktop/source/app/app.cxx:1586:13
>  #34 in ImplSVMain() at vcl/source/app/svmain.cxx:196:35
>  #35 in SVMain() at vcl/

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

[Caolán McNamara (via logerrit)]

 include/svx/ruler.hxx  |2 -
 svx/source/dialog/svxruler.cxx |   50 +
 2 files changed, 27 insertions(+), 25 deletions(-)

New commits:
commit ca2498a0de77065e8e1b42c827cf6bf74e135725
Author: Caolán McNamara 
AuthorDate: Mon Feb 22 17:14:59 2021 +
Commit: Caolán McNamara 
CommitDate: Mon Feb 22 20:26:34 2021 +0100

convert other svxruler menu

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

diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx
index 4c6735490b8c..374209a73f69 100644
--- a/include/svx/ruler.hxx
+++ b/include/svx/ruler.hxx
@@ -217,7 +217,7 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public 
SfxListener
 tools::Long GetLeftMin() const;
 tools::Long GetRightMax() const;
 
-DECL_LINK( TabMenuSelect, Menu *, bool );
+void TabMenuSelect(const OString& rIdent);
 void MenuSelect(std::string_view ident);
 void PrepareProportional_Impl(RulerType);
 
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index fbb08d35fd45..4b5f42e1eb10 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -24,7 +24,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -3261,13 +3260,16 @@ void SvxRuler::MenuSelect(std::string_view ident)
 SetUnit(vcl::StringToMetric(OUString::fromUtf8(ident)));
 }
 
-IMPL_LINK( SvxRuler, TabMenuSelect, Menu *, pMenu, bool )
+void SvxRuler::TabMenuSelect(const OString& rIdent)
 {
+if (rIdent.isEmpty())
+return;
+sal_Int32 nId = rIdent.toInt32();
 /* Handler of the tab menu for setting the type */
-if(mxTabStopItem && mxTabStopItem->Count() > mxRulerImpl->nIdx)
+if (mxTabStopItem && mxTabStopItem->Count() > mxRulerImpl->nIdx)
 {
 SvxTabStop aTabStop = mxTabStopItem->At(mxRulerImpl->nIdx);
-aTabStop.GetAdjustment() = ToAttrTab_Impl(pMenu->GetCurItemId() - 1);
+aTabStop.GetAdjustment() = ToAttrTab_Impl(nId - 1);
 mxTabStopItem->Remove(mxRulerImpl->nIdx);
 mxTabStopItem->Insert(aTabStop);
 sal_uInt16 nTabStopId = bHorz ? SID_ATTR_TABSTOP : 
SID_ATTR_TABSTOP_VERTICAL;
@@ -3276,7 +3278,6 @@ IMPL_LINK( SvxRuler, TabMenuSelect, Menu *, pMenu, bool )
 UpdateTabs();
 mxRulerImpl->nIdx = 0;
 }
-return false;
 }
 
 static const char* RID_SVXSTR_RULER_TAB[] =
@@ -3293,42 +3294,43 @@ void SvxRuler::Command( const CommandEvent& 
rCommandEvent )
 if ( CommandEventId::ContextMenu == rCommandEvent.GetCommand() )
 {
 CancelDrag();
+
+tools::Rectangle aRect(rCommandEvent.GetMousePosPixel(), Size(1, 1));
+weld::Window* pPopupParent = weld::GetPopupParent(*this, aRect);
+std::unique_ptr 
xBuilder(Application::CreateBuilder(pPopupParent, "svx/ui/rulermenu.ui"));
+std::unique_ptr xMenu(xBuilder->weld_menu("menu"));
+
 bool bRTL = mxRulerImpl->pTextRTLItem && 
mxRulerImpl->pTextRTLItem->GetValue();
 if ( !mpTabs.empty() &&
  RulerType::Tab ==
  GetRulerType( rCommandEvent.GetMousePosPixel(), 
&mxRulerImpl->nIdx ) &&
  mpTabs[mxRulerImpl->nIdx + TAB_GAP].nStyle < RULER_TAB_DEFAULT )
 {
-ScopedVclPtrInstance aMenu;
-aMenu->SetSelectHdl(LINK(this, SvxRuler, TabMenuSelect));
-ScopedVclPtrInstance< VirtualDevice > pDev;
+xMenu->clear();
+
 const Size aSz(ruler_tab_svx.width + 2, ruler_tab_svx.height + 2);
-pDev->SetOutputSize(aSz);
-pDev->SetBackground(Wallpaper(COL_WHITE));
-Color 
aFillColor(pDev->GetSettings().GetStyleSettings().GetShadowColor());
 const Point aPt(aSz.Width() / 2, aSz.Height() / 2);
 
 for ( sal_uInt16 i = RULER_TAB_LEFT; i < RULER_TAB_DEFAULT; ++i )
 {
+ScopedVclPtr 
xDev(pPopupParent->create_virtual_device());
+xDev->SetOutputSize(aSz);
+
 sal_uInt16 nStyle = bRTL ? i|RULER_TAB_RTL : i;
 nStyle |= static_cast(bHorz ? WB_HORZ : WB_VERT);
-DrawTab(*pDev, aFillColor, aPt, nStyle);
-BitmapEx aItemBitmapEx(pDev->GetBitmapEx(Point(), aSz));
-aItemBitmapEx.Replace(COL_WHITE, COL_TRANSPARENT);
-aMenu->InsertItem(i + 1,
- SvxResId(RID_SVXSTR_RULER_TAB[i]),
- Image(aItemBitmapEx));
-aMenu->CheckItem(i + 1, i == mpTabs[mxRulerImpl->nIdx + 
TAB_GAP].nStyle);
-pDev->SetOutputSize(aSz); // delete device
+
+Color 
aFillColor(xDev->GetSettings().GetStyleSettings().GetShadowColor());
+DrawTab(*xDev, aFillColor, aPt, nStyle);
+
+OString sId(OString::number(i + 1));
+xMenu->i

[Libreoffice-commits] core.git: accessibility/source include/vcl reportdesign/source svx/source toolkit/source vcl/inc vcl/source

[Caolán McNamara (via logerrit)]

 accessibility/source/standard/accessiblemenubasecomponent.cxx |1 +
 include/vcl/menu.hxx  |4 +++-
 include/vcl/toolkit/edit.hxx  |2 +-
 include/vcl/toolkit/treelistbox.hxx   |1 -
 reportdesign/source/ui/inc/ReportControllerObserver.hxx   |3 ++-
 svx/source/fmcomp/fmgridcl.cxx|1 -
 toolkit/source/controls/tree/treecontrolpeer.cxx  |3 ++-
 vcl/inc/jsdialog/jsdialogbuilder.hxx  |1 +
 vcl/source/control/combobox.cxx   |1 +
 vcl/source/control/roadmap.cxx|1 +
 vcl/source/edit/vclmedit.cxx  |2 ++
 vcl/source/uitest/uiobject.cxx|1 +
 vcl/source/window/builder.cxx |1 +
 13 files changed, 16 insertions(+), 6 deletions(-)

New commits:
commit c02696d7f9e4f56954e1c37452949762872f1f8e
Author: Caolán McNamara 
AuthorDate: Mon Feb 22 16:35:25 2021 +
Commit: Caolán McNamara 
CommitDate: Mon Feb 22 20:26:08 2021 +0100

forward declare some things and avoid includes

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

diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx 
b/accessibility/source/standard/accessiblemenubasecomponent.cxx
index 7d5d2eebdd3e..e873322f9c56 100644
--- a/accessibility/source/standard/accessiblemenubasecomponent.cxx
+++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 01bf9bc1f80b..55b4ca10ed71 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -28,8 +28,8 @@
 #include 
 #include 
 #include 
+#include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -49,8 +49,10 @@ class CommandEvent;
 class MenuFloatingWindow;
 class SalMenu;
 class MenuBarWindow;
+class VclMenuEvent;
 struct SystemMenuData;
 enum class FloatWinPopupFlags;
+enum class VclEventId;
 
 namespace com::sun::star::awt { class XPopupMenu; }
 namespace com::sun::star::accessibility { class XAccessible;  }
diff --git a/include/vcl/toolkit/edit.hxx b/include/vcl/toolkit/edit.hxx
index 6cad804c208e..b622c4bc2e65 100644
--- a/include/vcl/toolkit/edit.hxx
+++ b/include/vcl/toolkit/edit.hxx
@@ -31,7 +31,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -44,6 +43,7 @@ namespace weld {
 class Widget;
 }
 
+class PopupMenu;
 class VclBuilder;
 struct DDInfo;
 struct Impl_IMEInfos;
diff --git a/include/vcl/toolkit/treelistbox.hxx 
b/include/vcl/toolkit/treelistbox.hxx
index 895c6c15d860..3cd50dddee65 100644
--- a/include/vcl/toolkit/treelistbox.hxx
+++ b/include/vcl/toolkit/treelistbox.hxx
@@ -36,7 +36,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 class SvTreeListBox;
diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx 
b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
index ec6be058bf9b..d77fb3f2ef78 100644
--- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx
+++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx
@@ -25,12 +25,13 @@
 
 #include 
 
-#include 
 #include 
 
 #include "FormattedFieldBeautifier.hxx"
 #include "FixedTextColor.hxx"
 
+class VclSimpleEvent;
+
 namespace rptui
 {
 class OReportController;
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 817d642a19a9..10e5e980a74f 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -60,7 +60,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/toolkit/source/controls/tree/treecontrolpeer.cxx 
b/toolkit/source/controls/tree/treecontrolpeer.cxx
index 1b302d551db9..1f7a22a5217e 100644
--- a/toolkit/source/controls/tree/treecontrolpeer.cxx
+++ b/toolkit/source/controls/tree/treecontrolpeer.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include 
 #include 
 #include 
 #include 
@@ -41,6 +40,8 @@
 #include 
 
 #include 
+#include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace css::uno;
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx 
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index a06d8850496e..8c9e2789fedf 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -25,6 +25,7 @@
 #include 
 
 #include 
+#include 
 
 class ToolBox;
 class ComboBox;
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index f9c96478c9b8..acf3a0c26d36 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
diff --gi

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

[Caolán McNamara (via logerrit)]

 dbaccess/inc/helpids.h |3 
 dbaccess/source/ui/browser/sbagrid.cxx |   54 ++---
 dbaccess/source/ui/inc/sbagrid.hxx |6 
 include/svx/fmgridcl.hxx   |9 
 include/svx/strings.hrc|   25 +-
 svx/source/fmcomp/fmgridcl.cxx |  314 ++---
 svx/uiconfig/ui/colsmenu.ui|  182 ---
 7 files changed, 225 insertions(+), 368 deletions(-)

New commits:
commit 216d7c42a8ccc5fa1379e84cb6b32d21857f774d
Author: Caolán McNamara 
AuthorDate: Mon Feb 22 14:40:54 2021 +
Commit: Caolán McNamara 
CommitDate: Mon Feb 22 20:25:38 2021 +0100

weld colsmenu

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

diff --git a/dbaccess/inc/helpids.h b/dbaccess/inc/helpids.h
index 459cc26bef6d..c2720688f9b3 100644
--- a/dbaccess/inc/helpids.h
+++ b/dbaccess/inc/helpids.h
@@ -27,9 +27,6 @@
 
 #define HID_DSADMIN_BROWSECONN
"DBACCESS_HID_DSADMIN_BROWSECONN"
 
-#define HID_BROWSER_COLUMNFORMAT  
"DBACCESS_HID_BROWSER_COLUMNFORMAT"
-#define HID_BROWSER_COLUMNWIDTH   
"DBACCESS_HID_BROWSER_COLUMNWIDTH"
-
 #define HID_CTL_QRYSQLEDIT
"DBACCESS_HID_CTL_QRYSQLEDIT"
 
 #define HID_CTL_QRYDGNTAB 
"DBACCESS_HID_CTL_QRYDGNTAB"
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx 
b/dbaccess/source/ui/browser/sbagrid.cxx
index 2251be4d629d..e293a481b07b 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -39,7 +39,6 @@
 #include 
 #include 
 
-#include 
 #include 
 
 #include 
@@ -544,26 +543,21 @@ void SbaGridHeader::ImplStartColumnDrag(sal_Int8 
_nAction, const Point& _rMouseP
 );
 }
 
-void SbaGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& 
rMenu)
+void SbaGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, weld::Menu& 
rMenu,
+weld::Menu& rInsertMenu, 
weld::Menu& rChangeMenu,
+weld::Menu& rShowMenu)
 {
-FmGridHeader::PreExecuteColumnContextMenu(nColId, rMenu);
+FmGridHeader::PreExecuteColumnContextMenu(nColId, rMenu, rInsertMenu, 
rChangeMenu, rShowMenu);
 
 // some items are valid only if the db isn't readonly
 bool bDBIsReadOnly = 
static_cast(GetParent())->IsReadOnlyDB();
 
 if (bDBIsReadOnly)
 {
-rMenu.EnableItem(rMenu.GetItemId("hide"), false);
-PopupMenu* pShowColsMenu = rMenu.GetPopupMenu(rMenu.GetItemId("show"));
-if (pShowColsMenu)
-{
-// at most 16 items which mean "show column "
-for (sal_uInt16 i=1; i<16; ++i)
-pShowColsMenu->EnableItem(i, false);
-// "show cols/more..." and "show cols/all"
-pShowColsMenu->EnableItem(pShowColsMenu->GetItemId("more"), false);
-pShowColsMenu->EnableItem(pShowColsMenu->GetItemId("all"), false);
-}
+rMenu.set_visible("hide", false);
+rMenu.set_sensitive("hide", false);
+rMenu.set_visible("show", false);
+rMenu.set_sensitive("show", false);
 }
 
 // prepend some new items
@@ -589,31 +583,25 @@ void 
SbaGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rM
 case DataType::REF:
 break;
 default:
-rMenu.InsertItem(ID_BROWSER_COLATTRSET, 
DBA_RES(RID_STR_COLUMN_FORMAT), MenuItemBits::NONE, OString(), nPos++);
-rMenu.SetHelpId(ID_BROWSER_COLATTRSET, HID_BROWSER_COLUMNFORMAT);
-rMenu.InsertSeparator(OString(), nPos++);
+rMenu.insert(nPos++, "colattrset", DBA_RES(RID_STR_COLUMN_FORMAT),
+ nullptr, nullptr, nullptr, TRISTATE_INDET);
+rMenu.insert_separator(nPos++, "seperator1");
 }
 }
 
-rMenu.InsertItem(ID_BROWSER_COLWIDTH, DBA_RES(RID_STR_COLUMN_WIDTH), 
MenuItemBits::NONE, OString(), nPos++);
-rMenu.SetHelpId(ID_BROWSER_COLWIDTH, HID_BROWSER_COLUMNWIDTH);
-rMenu.InsertSeparator(OString(), nPos++);
+rMenu.insert(nPos++, "colwidth", DBA_RES(RID_STR_COLUMN_WIDTH),
+ nullptr, nullptr, nullptr, TRISTATE_INDET);
+rMenu.insert_separator(nPos++, "seperator2");
 }
 
-void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const 
PopupMenu& rMenu, sal_uInt16 nExecutionResult)
+void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const 
weld::Menu& rMenu, const OString& rExecutionResult)
 {
-switch (nExecutionResult)
-{
-case ID_BROWSER_COLWIDTH:
-static_cast(GetParent())->SetColWidth(nColId);
-break;
-
-case ID_BROWSER_COLATTRSET:
-static_cast(GetParent())->SetColAttrs(nColId);
-break;
-
-  

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

[Marco Cecchetti (via logerrit)]

 filter/source/svg/presentation_engine.js|  129 ++--
 filter/source/svg/svgexport.cxx |  192 +++-
 filter/source/svg/svgfilter.hxx |   13 +
 filter/source/svg/svgwriter.cxx |   30 +++
 filter/source/svg/svgwriter.hxx |1 
 sd/qa/unit/SVGExportTests.cxx   |  190 ++-
 sd/qa/unit/data/odp/slide-bitmap-background.odp |binary
 sd/qa/unit/data/odp/slide-tile-background.odp   |binary
 8 files changed, 493 insertions(+), 62 deletions(-)

New commits:
commit 5ad541462aec381bb6a9d86db5ed20ecb6ddb496
Author: Marco Cecchetti 
AuthorDate: Fri Feb 19 16:04:07 2021 +0100
Commit: Andras Timar 
CommitDate: Mon Feb 22 20:04:48 2021 +0100

filter: svg: js engine: misplaced text: improving text field handling

Change-Id: I8b5f9a39b3cd3fcfdae0d088eae0a875cf9404ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111065
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/filter/source/svg/presentation_engine.js 
b/filter/source/svg/presentation_engine.js
index 0d4fc767c4ad..24fd4f53d2a7 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -5575,68 +5575,99 @@ PlaceholderShape.prototype.isValid = function()
  */
 PlaceholderShape.prototype.init = function()
 {
-
 var aTextFieldElement = getElementByClassName( 
this.masterPage.backgroundObjects, this.className );
 if( aTextFieldElement )
 {
-var aPlaceholderElement = getElementByClassName( aTextFieldElement, 
'PlaceholderText' );
-if( aPlaceholderElement )
+var aTextElem = getElementByClassName( aTextFieldElement, 
'SVGTextShape' );
+if( aTextElem )
 {
-// Each text field element has an invisible rectangle that can be
-// regarded as the text field bounding box.
-// We exploit such a feature and the exported text adjust attribute
-// value in order to set up correctly the position and text
-// adjustment for the placeholder element.
-var aSVGRectElem = getElementByClassName( aTextFieldElement, 
'BoundingBox' );
-if( aSVGRectElem )
+var aPlaceholderElement = getElementByClassName(aTextElem, 
'PlaceholderText');
+if( aPlaceholderElement )
 {
-var aRect = new Rectangle( aSVGRectElem );
-var sTextAdjust = getOOOAttribute( aTextFieldElement, 
aOOOAttrTextAdjust ) || 'left';
-var sTextAnchor, sX;
-if( sTextAdjust == 'left' )
-{
-sTextAnchor = 'start';
-sX = String( aRect.left );
-}
-else if( sTextAdjust == 'right' )
-{
-sTextAnchor = 'end';
-sX = String( aRect.right );
-}
-else if( sTextAdjust == 'center' )
+// SVG 1.1 does not support text wrapping wrt a rectangle.
+// When a text shape contains a placeholder, setting up the 
position
+// of each text line doesn't work since the position is 
computed
+// before replacing the placeholder text.
+// Anyway each text shape has an invisible rectangle that can 
be
+// regarded as the text shape bounding box.
+// We exploit such a feature and the exported text adjust 
attribute
+// value in order to set up correctly the position and text
+// adjustment for the text shape content.
+// We assume that once the real value has been substituted to
+// the placeholder the resulting content is no more than a 
single line.
+// So we remove from  elements used for setting up the
+// position of text lines (class TextPosition) the 'x' and 'y' 
attribute.
+// In the general case we would need to implement a function
+// which is able to compute at which words the text shape 
content has
+// to be wrapped.
+var aSVGRectElem = getElementByClassName( aTextFieldElement, 
'BoundingBox' );
+if( aSVGRectElem )
 {
-sTextAnchor = 'middle';
-var nMiddle = ( aRect.left + aRect.right ) / 2;
-sX = String( parseInt( String( nMiddle ) ) );
+var aRect = new Rectangle( aSVGRectElem );
+var sTextAdjust = getOOOAttribute( aTextFieldElement, 
aOOOAttrTextAdjust );
+// the bbox of the text shape is indeed a bit larger, 
there is a bit of internal padding
+var nMargin = 250; // 1000th mm
+var sTextAnchor, sX;
+if( sTextAdjust == 'left' )
+

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

[Mike Kaganski (via logerrit)]

 sc/source/ui/miscdlgs/autofmt.cxx |3 -
 sc/source/ui/view/drawutil.cxx|9 ++-
 sc/source/ui/view/gridwin.cxx |3 -
 sc/source/ui/view/gridwin4.cxx|   42 ++--
 sc/source/ui/view/output3.cxx |   15 +++---
 sc/source/ui/view/preview.cxx |   95 --
 sc/source/ui/view/prevloc.cxx |   30 ++--
 sc/source/ui/view/prevwsh.cxx |5 +-
 sc/source/ui/view/tabview.cxx |9 ++-
 sc/source/ui/view/viewdata.cxx|   19 ---
 sc/source/ui/view/viewfun5.cxx|4 +
 sc/source/ui/view/viewfunc.cxx|4 +
 12 files changed, 137 insertions(+), 101 deletions(-)

New commits:
commit e651dcd9820b2472e66f512ad2669e21d23ef465
Author: Mike Kaganski 
AuthorDate: Sun Feb 21 17:16:37 2021 +0300
Commit: Mike Kaganski 
CommitDate: Mon Feb 22 19:25:39 2021 +0100

Some more unit conversion unification

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

diff --git a/sc/source/ui/miscdlgs/autofmt.cxx 
b/sc/source/ui/miscdlgs/autofmt.cxx
index 72bd0ad7f0e4..34e22845fa3f 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -445,7 +446,7 @@ void ScAutoFmtPreview::CalcCellArray( bool bFitWidthP )
 
 static void lclSetStyleFromBorder( svx::frame::Style& rStyle, const 
::editeng::SvxBorderLine* pBorder )
 {
-rStyle.Set( pBorder, 1.0 / TWIPS_PER_POINT, 5 );
+rStyle.Set(pBorder, o3tl::convert(1.0, o3tl::Length::twip, 
o3tl::Length::pt), 5);
 }
 
 void ScAutoFmtPreview::CalcLineMap()
diff --git a/sc/source/ui/view/drawutil.cxx b/sc/source/ui/view/drawutil.cxx
index 3a6f14561372..cfc60ff23505 100644
--- a/sc/source/ui/view/drawutil.cxx
+++ b/sc/source/ui/view/drawutil.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
+#include 
 #include 
 
 #include 
@@ -65,8 +68,7 @@ void ScDrawUtil::CalcScale( const ScDocument& rDoc, SCTAB 
nTab,
 if ( aPixelLog.X() && nTwipsX )
 rScaleX = Fraction( static_cast(aPixelLog.X()) *
 static_cast(rZoomX.GetNumerator()) /
-static_cast(nTwipsX) /
-HMM_PER_TWIPS /
+o3tl::convert(nTwipsX, o3tl::Length::twip, 
o3tl::Length::mm100) /
 static_cast(rZoomX.GetDenominator()) );
 else
 rScaleX = Fraction( 1, 1 );
@@ -74,8 +76,7 @@ void ScDrawUtil::CalcScale( const ScDocument& rDoc, SCTAB 
nTab,
 if ( aPixelLog.Y() && nTwipsY )
 rScaleY = Fraction( static_cast(aPixelLog.Y()) *
 static_cast(rZoomY.GetNumerator()) /
-static_cast(nTwipsY) /
-HMM_PER_TWIPS /
+o3tl::convert(nTwipsY, o3tl::Length::twip, 
o3tl::Length::mm100) /
 static_cast(rZoomY.GetDenominator()) );
 else
 rScaleY = Fraction( 1, 1 );
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 1e5c0f6df86e..0fe1c7d357b5 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -947,7 +948,7 @@ void ScGridWindow::ShowFilterMenu(const tools::Rectangle& 
rCellRect, bool bLayou
 // minimum width in pixel
 if (comphelper::LibreOfficeKit::isActive())
 {
-const tools::Long nMinLOKWinWidth = static_cast(1.3 * 
STD_COL_WIDTH / TWIPS_PER_PIXEL);
+const tools::Long nMinLOKWinWidth = o3tl::convert(STD_COL_WIDTH * 13 / 
10, o3tl::Length::twip, o3tl::Length::px);
 if (nSizeX < nMinLOKWinWidth)
 nSizeX = nMinLOKWinWidth;
 }
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index c95bc00f701a..0dd3c0b30b59 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -874,8 +875,8 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const 
ScTableInfo& rTableI
 // Tiled offset nScrX, nScrY
 MapMode aMap( MapUnit::MapPixel );
 Point aOrigin = aOriginalMode.GetOrigin();
-aOrigin.setX(aOrigin.getX() / TWIPS_PER_PIXEL + nScrX);
-aOrigin.setY(aOrigin.getY() / TWIPS_PER_PIXEL + nScrY);
+aOrigin.setX(o3tl::convert(aOrigin.getX(), o3tl::Length::twip, 
o3tl::Length::px) + nScrX);
+aOrigin.setY(o3tl::convert(aOrigin.getY(), o3tl::Length::twip, 
o3tl::Length::px) + nScrY);
 aMap.SetOrigin(aOrigin);
 pContentDev->SetMapMode(aMap);
 }
@@ -922,7 +923,8 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const 
ScTableInfo& rTabl

[Libreoffice-commits] core.git: Branch 'feature/cib_contract3753' - include/oox oox/source sw/qa sw/source

[Michael Stahl (via logerrit)]

 include/oox/export/vmlexport.hxx |6 
 oox/source/export/vmlexport.cxx  |8 
 sw/qa/extras/ooxmlexport/data/shape-atpage-in-table.fodt |  185 +++
 sw/qa/extras/ooxmlexport/ooxmlexport15.cxx   |   13 +
 sw/source/filter/ww8/docxattributeoutput.cxx |3 
 sw/source/filter/ww8/docxsdrexport.cxx   |6 
 6 files changed, 216 insertions(+), 5 deletions(-)

New commits:
commit 20ce7306d2761652d36ec16e971e30b5a937121f
Author: Michael Stahl 
AuthorDate: Mon Feb 22 14:11:05 2021 +0100
Commit: Michael Stahl 
CommitDate: Mon Feb 22 19:12:05 2021 +0100

oox: VML export: write o:allowincell attribute on shapes

Apparently the default is "t", which causes a fly that is anchored
at-page with the first content on the page being a table to be wrongly
positioned.

Change-Id: Iba1b961c6e884b2a55928952937187732ef73a5a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111336
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 60b61fdaf85cecea0f972fc435530ee5d7492c98)

diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx
index 3736420756a6..f64f0cd04c65 100644
--- a/include/oox/export/vmlexport.hxx
+++ b/include/oox/export/vmlexport.hxx
@@ -84,6 +84,7 @@ class OOX_DLLPUBLIC VMLExport : public EscherEx
 sal_Int16 m_eHOri, m_eVOri, m_eHRel, m_eVRel;
 std::unique_ptr m_pWrapAttrList;
 bool m_bInline; // css::text::TextContentAnchorType_AS_CHARACTER
+bool m_IsFollowingTextFlow = false;
 
 /// The object we're exporting.
 const SdrObject* m_pSdrObject;
@@ -138,8 +139,9 @@ public:
 /// Export the sdr object as VML.
 ///
 /// Call this when you need to export the object as VML.
-OString const & AddSdrObject( const SdrObject& rObj, sal_Int16 eHOri = -1,
-sal_Int16 eVOri = -1, sal_Int16 eHRel = -1,
+OString const & AddSdrObject( const SdrObject& rObj,
+bool const bIsFollowingTextFlow = false,
+sal_Int16 eHOri = -1, sal_Int16 eVOri = -1, sal_Int16 eHRel = -1,
 sal_Int16 eVRel = -1,
 std::unique_ptr m_pWrapAttrList 
= nullptr,
 const bool bOOxmlExport = false );
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index deea12e04330..99a591add354 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -1392,6 +1392,8 @@ sal_Int32 VMLExport::StartShape()
 break;
 }
 
+m_pShapeAttrList->addNS(XML_o, XML_allowincell, m_IsFollowingTextFlow ? 
"t" : "f");
+
 // add style
 m_pShapeAttrList->add( XML_style, m_ShapeStyle.makeStringAndClear() );
 
@@ -1492,7 +1494,9 @@ void VMLExport::EndShape( sal_Int32 nShapeElement )
 }
 }
 
-OString const & VMLExport::AddSdrObject( const SdrObject& rObj, sal_Int16 
eHOri, sal_Int16 eVOri, sal_Int16 eHRel, sal_Int16 eVRel,
+OString const & VMLExport::AddSdrObject( const SdrObject& rObj,
+bool const bIsFollowingTextFlow,
+sal_Int16 eHOri, sal_Int16 eVOri, sal_Int16 eHRel, sal_Int16 eVRel,
 std::unique_ptr pWrapAttrList,
 const bool bOOxmlExport )
 {
@@ -1503,6 +1507,7 @@ OString const & VMLExport::AddSdrObject( const SdrObject& 
rObj, sal_Int16 eHOri,
 m_eVRel = eVRel;
 m_pWrapAttrList = std::move(pWrapAttrList);
 m_bInline = false;
+m_IsFollowingTextFlow = bIsFollowingTextFlow;
 EscherEx::AddSdrObject(rObj, bOOxmlExport);
 return m_sShapeId;
 }
@@ -1516,6 +1521,7 @@ OString const & VMLExport::AddInlineSdrObject( const 
SdrObject& rObj, const bool
 m_eVRel = -1;
 m_pWrapAttrList.reset();
 m_bInline = true;
+m_IsFollowingTextFlow = true;
 EscherEx::AddSdrObject(rObj, bOOxmlExport);
 return m_sShapeId;
 }
diff --git a/sw/qa/extras/ooxmlexport/data/shape-atpage-in-table.fodt 
b/sw/qa/extras/ooxmlexport/data/shape-atpage-in-table.fodt
new file mode 100644
index ..42c9c7790509
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/shape-atpage-in-table.fodt
@@ -0,0 +1,185 @@
+
+
+http://openoffice.org/2004/office"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:ooow="http://openoffice.

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

[Michael Stahl (via logerrit)]

 xmloff/source/text/XMLTextMarkImportContext.cxx |   11 ++-
 xmloff/source/text/txtimp.cxx   |1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit d62c93a831080ef332e416dc78f5600c2c5b9850
Author: Michael Stahl 
AuthorDate: Mon Feb 22 16:10:47 2021 +0100
Commit: Michael Stahl 
CommitDate: Mon Feb 22 19:10:02 2021 +0100

tdf#140437 ODF import: fix for broken documents with field code as type

Not sure how old the bug that caused this and which filter it was
originally but currently the Word import filters don't do that any more.

This causes an exception since commit
dd24e21bb4f183048a738314934fc3f02ec093f1 so try to fix it up.

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

diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx 
b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 65fcd19d9625..2017d8f21a3d 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -197,7 +197,16 @@ static auto InsertFieldmark(SvXMLImport & rImport,
 // setup fieldmark...
 Reference const xFormField(xContent, UNO_QUERY);
 assert(xFormField.is());
-xFormField->setFieldType(fieldmarkTypeName);
+try {
+xFormField->setFieldType(fieldmarkTypeName);
+} catch (uno::RuntimeException const&) {
+// tdf#140437 somehow old documents had the field code in the type
+// attribute instead of field:param
+SAL_INFO("xmloff.text", "invalid fieldmark type, converting to param");
+// add without checking: FieldParamImporter::Import() catches 
ElementExistException
+rHelper.addFieldParam(ODF_CODE_PARAM, fieldmarkTypeName);
+xFormField->setFieldType(ODF_UNHANDLED);
+}
 rHelper.setCurrentFieldParamsTo(xFormField);
 // move cursor after setFieldType as that may delete/re-insert
 rHelper.GetCursor()->gotoRange(xContent->getAnchor()->getEnd(), false);
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index dc6612b113b1..e88d5ed8b2e8 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -390,6 +390,7 @@ namespace
 }
 catch(const ElementExistException&)
 {
+SAL_INFO("xmloff.text", "duplicate fieldmark param");
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl (via logerrit)]

 include/oox/export/vmlexport.hxx |6 
 oox/source/export/vmlexport.cxx  |8 
 sw/qa/extras/ooxmlexport/data/shape-atpage-in-table.fodt |  185 +++
 sw/qa/extras/ooxmlexport/ooxmlexport15.cxx   |   11 
 sw/source/filter/ww8/docxattributeoutput.cxx |3 
 sw/source/filter/ww8/docxsdrexport.cxx   |6 
 6 files changed, 214 insertions(+), 5 deletions(-)

New commits:
commit 60b61fdaf85cecea0f972fc435530ee5d7492c98
Author: Michael Stahl 
AuthorDate: Mon Feb 22 14:11:05 2021 +0100
Commit: Michael Stahl 
CommitDate: Mon Feb 22 19:09:36 2021 +0100

oox: VML export: write o:allowincell attribute on shapes

Apparently the default is "t", which causes a fly that is anchored
at-page with the first content on the page being a table to be wrongly
positioned.

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

diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx
index 4ee885fba6bd..dd5edc57c208 100644
--- a/include/oox/export/vmlexport.hxx
+++ b/include/oox/export/vmlexport.hxx
@@ -86,6 +86,7 @@ class OOX_DLLPUBLIC VMLExport : public EscherEx
 sal_Int16 m_eHOri, m_eVOri, m_eHRel, m_eVRel;
 rtl::Reference m_pWrapAttrList;
 bool m_bInline; // css::text::TextContentAnchorType_AS_CHARACTER
+bool m_IsFollowingTextFlow = false;
 
 /// The object we're exporting.
 const SdrObject* m_pSdrObject;
@@ -140,8 +141,9 @@ public:
 /// Export the sdr object as VML.
 ///
 /// Call this when you need to export the object as VML.
-OString const & AddSdrObject( const SdrObject& rObj, sal_Int16 eHOri = -1,
-sal_Int16 eVOri = -1, sal_Int16 eHRel = -1,
+OString const & AddSdrObject( const SdrObject& rObj,
+bool const bIsFollowingTextFlow = false,
+sal_Int16 eHOri = -1, sal_Int16 eVOri = -1, sal_Int16 eHRel = -1,
 sal_Int16 eVRel = -1,
 sax_fastparser::FastAttributeList* pWrapAttrList = nullptr,
 const bool bOOxmlExport = false );
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 07157edc3f85..9c6b89ef7dd7 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -1400,6 +1400,8 @@ sal_Int32 VMLExport::StartShape()
 break;
 }
 
+m_pShapeAttrList->addNS(XML_o, XML_allowincell, m_IsFollowingTextFlow ? 
"t" : "f");
+
 // add style
 m_pShapeAttrList->add( XML_style, m_ShapeStyle.makeStringAndClear() );
 
@@ -1530,7 +1532,9 @@ void VMLExport::EndShape( sal_Int32 nShapeElement )
 m_pSerializer->endElementNS( XML_v, nShapeElement );
 }
 
-OString const & VMLExport::AddSdrObject( const SdrObject& rObj, sal_Int16 
eHOri, sal_Int16 eVOri, sal_Int16 eHRel, sal_Int16 eVRel,
+OString const & VMLExport::AddSdrObject( const SdrObject& rObj,
+bool const bIsFollowingTextFlow,
+sal_Int16 eHOri, sal_Int16 eVOri, sal_Int16 eHRel, sal_Int16 eVRel,
 FastAttributeList* pWrapAttrList,
 const bool bOOxmlExport )
 {
@@ -1541,6 +1545,7 @@ OString const & VMLExport::AddSdrObject( const SdrObject& 
rObj, sal_Int16 eHOri,
 m_eVRel = eVRel;
 m_pWrapAttrList = pWrapAttrList;
 m_bInline = false;
+m_IsFollowingTextFlow = bIsFollowingTextFlow;
 EscherEx::AddSdrObject(rObj, bOOxmlExport);
 return m_sShapeId;
 }
@@ -1554,6 +1559,7 @@ OString const & VMLExport::AddInlineSdrObject( const 
SdrObject& rObj, const bool
 m_eVRel = -1;
 m_pWrapAttrList.clear();
 m_bInline = true;
+m_IsFollowingTextFlow = true;
 EscherEx::AddSdrObject(rObj, bOOxmlExport);
 return m_sShapeId;
 }
diff --git a/sw/qa/extras/ooxmlexport/data/shape-atpage-in-table.fodt 
b/sw/qa/extras/ooxmlexport/data/shape-atpage-in-table.fodt
new file mode 100644
index ..42c9c7790509
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/shape-atpage-in-table.fodt
@@ -0,0 +1,185 @@
+
+
+http://openoffice.org/2004/office"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:ooow="http://openoffice.org/200
 4/write

[Libreoffice-commits] core.git: icon-themes/sukapura icon-themes/sukapura_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/sukapura/links.txt |  144 +
 1 file changed, 63 insertions(+), 81 deletions(-)

New commits:
commit bed8fb89abd980d08c5612f5f100bfad4ef0bca8
Author: Rizal Muttaqin 
AuthorDate: Mon Feb 22 16:34:13 2021 +0700
Commit: Rizal Muttaqin 
CommitDate: Mon Feb 22 19:08:26 2021 +0100

Sukapura: tdf#133038 change some formatting icons for Catalan

Change-Id: I348f0f7b706befd7cb6dc00175875ef4256cba78
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111343
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/sukapura/cmd/32/ca/bold.png 
b/icon-themes/sukapura/cmd/32/es/bold.png
similarity index 100%
rename from icon-themes/sukapura/cmd/32/ca/bold.png
rename to icon-themes/sukapura/cmd/32/es/bold.png
diff --git a/icon-themes/sukapura/cmd/32/ca/underline.png 
b/icon-themes/sukapura/cmd/32/es/underline.png
similarity index 100%
rename from icon-themes/sukapura/cmd/32/ca/underline.png
rename to icon-themes/sukapura/cmd/32/es/underline.png
diff --git a/icon-themes/sukapura/cmd/32/ca/underlinedouble.png 
b/icon-themes/sukapura/cmd/32/es/underlinedouble.png
similarity index 100%
rename from icon-themes/sukapura/cmd/32/ca/underlinedouble.png
rename to icon-themes/sukapura/cmd/32/es/underlinedouble.png
diff --git a/icon-themes/sukapura/cmd/32/ca/italic.png 
b/icon-themes/sukapura/cmd/32/it/italic.png
similarity index 100%
rename from icon-themes/sukapura/cmd/32/ca/italic.png
rename to icon-themes/sukapura/cmd/32/it/italic.png
diff --git a/icon-themes/sukapura/cmd/ca/lc_bold.png 
b/icon-themes/sukapura/cmd/es/lc_bold.png
similarity index 100%
rename from icon-themes/sukapura/cmd/ca/lc_bold.png
rename to icon-themes/sukapura/cmd/es/lc_bold.png
diff --git a/icon-themes/sukapura/cmd/ca/lc_underline.png 
b/icon-themes/sukapura/cmd/es/lc_underline.png
similarity index 100%
rename from icon-themes/sukapura/cmd/ca/lc_underline.png
rename to icon-themes/sukapura/cmd/es/lc_underline.png
diff --git a/icon-themes/sukapura/cmd/ca/lc_underlinedouble.png 
b/icon-themes/sukapura/cmd/es/lc_underlinedouble.png
similarity index 100%
rename from icon-themes/sukapura/cmd/ca/lc_underlinedouble.png
rename to icon-themes/sukapura/cmd/es/lc_underlinedouble.png
diff --git a/icon-themes/sukapura/cmd/ca/sc_bold.png 
b/icon-themes/sukapura/cmd/es/sc_bold.png
similarity index 100%
rename from icon-themes/sukapura/cmd/ca/sc_bold.png
rename to icon-themes/sukapura/cmd/es/sc_bold.png
diff --git a/icon-themes/sukapura/cmd/ca/sc_underline.png 
b/icon-themes/sukapura/cmd/es/sc_underline.png
similarity index 100%
rename from icon-themes/sukapura/cmd/ca/sc_underline.png
rename to icon-themes/sukapura/cmd/es/sc_underline.png
diff --git a/icon-themes/sukapura/cmd/ca/sc_underlinedouble.png 
b/icon-themes/sukapura/cmd/es/sc_underlinedouble.png
similarity index 100%
rename from icon-themes/sukapura/cmd/ca/sc_underlinedouble.png
rename to icon-themes/sukapura/cmd/es/sc_underlinedouble.png
diff --git a/icon-themes/sukapura/cmd/ca/lc_italic.png 
b/icon-themes/sukapura/cmd/it/lc_italic.png
similarity index 100%
rename from icon-themes/sukapura/cmd/ca/lc_italic.png
rename to icon-themes/sukapura/cmd/it/lc_italic.png
diff --git a/icon-themes/sukapura/cmd/ca/sc_italic.png 
b/icon-themes/sukapura/cmd/it/sc_italic.png
similarity index 100%
rename from icon-themes/sukapura/cmd/ca/sc_italic.png
rename to icon-themes/sukapura/cmd/it/sc_italic.png
diff --git a/icon-themes/sukapura/links.txt b/icon-themes/sukapura/links.txt
index 9a16d6feb5aa..18432d663b5c 100644
--- a/icon-themes/sukapura/links.txt
+++ b/icon-themes/sukapura/links.txt
@@ -402,18 +402,13 @@ cmd/32/bg/underline.png cmd/32/hu/underline.png
 cmd/32/bg/underlinedouble.png cmd/32/hu/underlinedouble.png
 cmd/32/bg/underlinesimple.png cmd/32/hu/underline.png
 cmd/32/bg/underlinesingle.png cmd/32/hu/underline.png
-cmd/32/ca/underlinesimple.png cmd/32/ca/underline.png
-cmd/32/ca/underlinesingle.png cmd/32/ca/underline.png
-cmd/32/es/bold.png cmd/32/ca/bold.png
 cmd/32/es/italic.png cmd/32/de/italic.png
 cmd/32/es/numberformatdecdecimals.png cmd/32/de/numberformatdecdecimals.png
 cmd/32/es/numberformatdecimal.png cmd/32/de/numberformatdecimal.png
 cmd/32/es/numberformatincdecimals.png cmd/32/de/numberformatincdecimals.png
 cmd/32/es/numberformatthousands.png cmd/32/de/numberformatthousands.png
-cmd/32/es/underline.png cmd/32/ca/underline.png
-cmd/32/es/underlinedouble.png cmd/32/ca/underlinedouble.png
-cmd/32/es/underlinesimple.png cmd/32/ca/underline.png
-cmd/32/es/underlinesingle.png cmd/32/ca/underline.png
+cmd/32/es/underlinesimple.png cmd/32/es/underline.png
+cmd/32/es/underlinesingle.png cmd/32/es/underline.png
 cmd/32/fa/absoluterecord.png cmd/32/ar/absoluterecord.png
 cmd/32/fa/alphaliststyle.png cmd/32/ar/alphaliststyle.png
 cmd/32/fa/alphalowliststyle.png cmd/32/ar/alphalowliststyle.png
@@ -442,10 +437,10 @@ cmd/32/fr/numberformatdecdecimals.png 
cmd/32/de/numberformatdecdecimals.png
 cmd/32/fr/numberformatde

[Libreoffice-commits] core.git: translations

[Christian Lohmaier (via logerrit)]

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

New commits:
commit 4b47327233d122bf8775ea5d73a047fbea16f5c8
Author: Christian Lohmaier 
AuthorDate: Mon Feb 22 18:52:48 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Feb 22 18:52:48 2021 +0100

Update git submodules

* Update translations from branch 'master'
  to ff06bb650ac32a415815345a1fd4184a8fc311d4
  - update translations for master

and force-fix errors using pocheck

Change-Id: Ic293be102c0ddce522e0c4a919cb40368b7d9a7b

diff --git a/translations b/translations
index 71f0c6a4724f..ff06bb650ac3 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 71f0c6a4724fa28a2a2d72b0547aa0370c287fcf
+Subproject commit ff06bb650ac32a415815345a1fd4184a8fc311d4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_dark_svg icon-themes/sifr_svg

[Rizal Muttaqin (via logerrit)]

 icon-themes/sifr/links.txt  |  144 +---
 icon-themes/sifr_dark/links.txt |  144 +---
 2 files changed, 126 insertions(+), 162 deletions(-)

New commits:
commit ea0f4ea38407c461340b0401b49ed280d3d5dd5e
Author: Rizal Muttaqin 
AuthorDate: Mon Feb 22 20:35:54 2021 +0700
Commit: Rizal Muttaqin 
CommitDate: Mon Feb 22 18:34:34 2021 +0100

Sifr: tdf#133038 change some formatting icons for Catalan

Change-Id: Ia0023372e70ff3a608f397804466c0ea2b807f0b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111337
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin 

diff --git a/icon-themes/sifr/cmd/32/ca/bold.png 
b/icon-themes/sifr/cmd/32/es/bold.png
similarity index 100%
rename from icon-themes/sifr/cmd/32/ca/bold.png
rename to icon-themes/sifr/cmd/32/es/bold.png
diff --git a/icon-themes/sifr/cmd/32/ca/underline.png 
b/icon-themes/sifr/cmd/32/es/underline.png
similarity index 100%
rename from icon-themes/sifr/cmd/32/ca/underline.png
rename to icon-themes/sifr/cmd/32/es/underline.png
diff --git a/icon-themes/sifr/cmd/32/ca/underlinedouble.png 
b/icon-themes/sifr/cmd/32/es/underlinedouble.png
similarity index 100%
rename from icon-themes/sifr/cmd/32/ca/underlinedouble.png
rename to icon-themes/sifr/cmd/32/es/underlinedouble.png
diff --git a/icon-themes/sifr/cmd/32/ca/italic.png 
b/icon-themes/sifr/cmd/32/it/italic.png
similarity index 100%
rename from icon-themes/sifr/cmd/32/ca/italic.png
rename to icon-themes/sifr/cmd/32/it/italic.png
diff --git a/icon-themes/sifr/cmd/ca/lc_bold.png 
b/icon-themes/sifr/cmd/es/lc_bold.png
similarity index 100%
rename from icon-themes/sifr/cmd/ca/lc_bold.png
rename to icon-themes/sifr/cmd/es/lc_bold.png
diff --git a/icon-themes/sifr/cmd/ca/lc_underline.png 
b/icon-themes/sifr/cmd/es/lc_underline.png
similarity index 100%
rename from icon-themes/sifr/cmd/ca/lc_underline.png
rename to icon-themes/sifr/cmd/es/lc_underline.png
diff --git a/icon-themes/sifr/cmd/ca/lc_underlinedouble.png 
b/icon-themes/sifr/cmd/es/lc_underlinedouble.png
similarity index 100%
rename from icon-themes/sifr/cmd/ca/lc_underlinedouble.png
rename to icon-themes/sifr/cmd/es/lc_underlinedouble.png
diff --git a/icon-themes/sifr/cmd/ca/sc_bold.png 
b/icon-themes/sifr/cmd/es/sc_bold.png
similarity index 100%
rename from icon-themes/sifr/cmd/ca/sc_bold.png
rename to icon-themes/sifr/cmd/es/sc_bold.png
diff --git a/icon-themes/sifr/cmd/ca/sc_underline.png 
b/icon-themes/sifr/cmd/es/sc_underline.png
similarity index 100%
rename from icon-themes/sifr/cmd/ca/sc_underline.png
rename to icon-themes/sifr/cmd/es/sc_underline.png
diff --git a/icon-themes/sifr/cmd/ca/sc_underlinedouble.png 
b/icon-themes/sifr/cmd/es/sc_underlinedouble.png
similarity index 100%
rename from icon-themes/sifr/cmd/ca/sc_underlinedouble.png
rename to icon-themes/sifr/cmd/es/sc_underlinedouble.png
diff --git a/icon-themes/sifr/cmd/ca/lc_italic.png 
b/icon-themes/sifr/cmd/it/lc_italic.png
similarity index 100%
rename from icon-themes/sifr/cmd/ca/lc_italic.png
rename to icon-themes/sifr/cmd/it/lc_italic.png
diff --git a/icon-themes/sifr/cmd/ca/sc_italic.png 
b/icon-themes/sifr/cmd/it/sc_italic.png
similarity index 100%
rename from icon-themes/sifr/cmd/ca/sc_italic.png
rename to icon-themes/sifr/cmd/it/sc_italic.png
diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index 6d439e8bd5d4..d68f9a5a3c9d 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -421,18 +421,13 @@ cmd/32/bg/underline.png cmd/32/hu/underline.png
 cmd/32/bg/underlinedouble.png cmd/32/hu/underlinedouble.png
 cmd/32/bg/underlinesimple.png cmd/32/hu/underline.png
 cmd/32/bg/underlinesingle.png cmd/32/hu/underline.png
-cmd/32/ca/underlinesimple.png cmd/32/ca/underline.png
-cmd/32/ca/underlinesingle.png cmd/32/ca/underline.png
-cmd/32/es/bold.png cmd/32/ca/bold.png
 cmd/32/es/italic.png cmd/32/de/italic.png
 cmd/32/es/numberformatdecdecimals.png cmd/32/de/numberformatdecdecimals.png
 cmd/32/es/numberformatdecimal.png cmd/32/de/numberformatdecimal.png
 cmd/32/es/numberformatincdecimals.png cmd/32/de/numberformatincdecimals.png
 cmd/32/es/numberformatthousands.png cmd/32/de/numberformatthousands.png
-cmd/32/es/underline.png cmd/32/ca/underline.png
-cmd/32/es/underlinedouble.png cmd/32/ca/underlinedouble.png
-cmd/32/es/underlinesimple.png cmd/32/ca/underline.png
-cmd/32/es/underlinesingle.png cmd/32/ca/underline.png
+cmd/32/es/underlinesimple.png cmd/32/es/underline.png
+cmd/32/es/underlinesingle.png cmd/32/es/underline.png
 cmd/32/fa/absoluterecord.png cmd/32/ar/absoluterecord.png
 cmd/32/fa/alphaliststyle.png cmd/32/ar/alphaliststyle.png
 cmd/32/fa/alphalowliststyle.png cmd/32/ar/alphalowliststyle.png
@@ -468,10 +463,10 @@ cmd/32/fr/numberformatdecdecimals.png 
cmd/32/de/numberformatdecdecimals.png
 cmd/32/fr/numberformatdecimal.png cmd/32/de/numberformatdecimal.png
 cmd/32/fr/numberformatincdecimals.png cmd/32/de/numberformatincdecimals.png
 cmd/32

[Libreoffice-commits] core.git: helpcontent2

[Rafael Lima (via logerrit)]

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

New commits:
commit daffe9c44caaf6b42a46f0b4050c6325f1d19a9a
Author: Rafael Lima 
AuthorDate: Mon Feb 22 18:12:27 2021 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Feb 22 18:12:27 2021 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to c2fa9223ea62e33237a98bdcca5eaab2bbc5bb41
  - Create SF TextStream Help page

Other minor changes:
- sf_filesystem: remove blank spaces before colons; x-ref with 
sf_textstream
- sf_calc: fix extra ")" at end of line; silence two strings for 
translation
- lib_ScriptForge: changes the layout of the table of contents; silence 
a string for translation;

Change-Id: I669e70ccd8c6b9462b5bd203bfb671c23dd8bc4f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/111046
Tested-by: Jenkins
Reviewed-by: Alain Romedenne 

diff --git a/helpcontent2 b/helpcontent2
index 9b39373c0559..c2fa9223ea62 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9b39373c0559094e6b8b47cd740a7d5ddeb6a107
+Subproject commit c2fa9223ea62e33237a98bdcca5eaab2bbc5bb41
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Rafael Lima (via logerrit)]

 AllLangHelp_sbasic.mk|1 
 source/text/sbasic/shared/03/lib_ScriptForge.xhp |  126 +---
 source/text/sbasic/shared/03/sf_calc.xhp |6 
 source/text/sbasic/shared/03/sf_filesystem.xhp   |   88 +++---
 source/text/sbasic/shared/03/sf_textstream.xhp   |  337 +++
 5 files changed, 469 insertions(+), 89 deletions(-)

New commits:
commit c2fa9223ea62e33237a98bdcca5eaab2bbc5bb41
Author: Rafael Lima 
AuthorDate: Wed Feb 17 23:56:07 2021 +0100
Commit: Alain Romedenne 
CommitDate: Mon Feb 22 18:12:27 2021 +0100

Create SF TextStream Help page

Other minor changes:
- sf_filesystem: remove blank spaces before colons; x-ref with sf_textstream
- sf_calc: fix extra ")" at end of line; silence two strings for translation
- lib_ScriptForge: changes the layout of the table of contents; silence a 
string for translation;

Change-Id: I669e70ccd8c6b9462b5bd203bfb671c23dd8bc4f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/111046
Tested-by: Jenkins
Reviewed-by: Alain Romedenne 

diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk
index 53af112a0..cc0b7f383 100644
--- a/AllLangHelp_sbasic.mk
+++ b/AllLangHelp_sbasic.mk
@@ -88,6 +88,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\
 helpcontent2/source/text/sbasic/shared/03/sf_session \
 helpcontent2/source/text/sbasic/shared/03/sf_services \
 helpcontent2/source/text/sbasic/shared/03/sf_string \
+helpcontent2/source/text/sbasic/shared/03/sf_textstream \
 helpcontent2/source/text/sbasic/shared/03/sf_timer \
 helpcontent2/source/text/sbasic/shared/03/sf_ui \
 helpcontent2/source/text/sbasic/shared/03/lib_schedule \
diff --git a/source/text/sbasic/shared/03/lib_ScriptForge.xhp 
b/source/text/sbasic/shared/03/lib_ScriptForge.xhp
index 7ef2387b3..82e11d5c6 100644
--- a/source/text/sbasic/shared/03/lib_ScriptForge.xhp
+++ b/source/text/sbasic/shared/03/lib_ScriptForge.xhp
@@ -22,7 +22,7 @@
 
 
 
-
+
 GlobalScope.BasicLibraries.LoadLibrary("ScriptForge")
 The described 
modules and classes are invoked from user scripts as "Services". A generic 
constructor of those services has been designed for that purpose:
 
@@ -30,46 +30,88 @@
 
 Services from 
external libraries can be registered with the 
RegisterScriptServices(...) method in order to extend the 
set of available services.
 The ScriptForge Basic 
library is available from %PRODUCTNAME 7.1 onwards.
-
-  
-Services provided by the ScriptForge 
library
-  
-  
-
-  
-  Array
-  Calc
-  Database
-  Dialog
-  DialogControl
-  
-
-
-  
-  Dictionary
-  Document
-  Exception
-  FileSystem
-  
-
-
-  
-  Localization (L10N)
-  Platform
-  Services
-  Session
-  
-
-
-  
-  String
-  TextStream
-  Timer
-  UI
-  
-
-  
-
+
+  Services provided by the ScriptForge 
library
+  
+
+   
+ Category
+   
+   
+ Services
+   
+   
+ 
+   
+
+
+   
+ LibreOffice 
Basic
+   
+   
+ 
+   Array
+   Dictionary
+   Exception
+ 
+   
+   
+ 
+   FileSystem
+   String
+   TextStream
+ 
+   
+
+
+  
+ Document 
Content
+   
+   
+ 
+   Calc
+   Database
+   Document
+ 
+   
+   
+ 
+   
+
+
+  
+ User 
Interface
+   
+   
+ 
+   Dialog
+   DialogControl
+   UI
+ 
+   
+   
+ 
+   
+
+
+  
+ Utilities
+   
+   
+ 
+   Localization
+   Platform
+   Services
+ 
+   
+   
+ 
+   Session
+   Timer
+ 
+   
+
+  
 
 
   
@@ -114,7 +156,7 @@
   
 
 
-  TextStream class Service
+  
 
 
   
diff --git a/source/text/sbasic/shared/03/sf_calc.xhp 
b/source/text/sbasic/shared/03/sf_calc.xhp
index 156ef6a8e..a2b782bfb 100644
--- a/source/text/sbasic/shared/03/sf_calc.xhp
+++ b/source/text/sbasic/shared/03/sf_calc.xhp
@@ -67,7 +67,7 @@
   The use of the prefix 
"SFDocuments." while calling the service is optional.
 
   Definitions
-Many methods require a "Sheet" or a 
"Range" as argument. Single cells are considered a special case of 
a Range).
+Many methods require a "Sheet" or a 
"Range" as argument. Single cells are considered a special case of 
a Range.
 Both may be expressed either as a s

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

[Miklos Vajna (via logerrit)]

 include/svx/svdopath.hxx   |7 +++
 svx/qa/unit/svdraw.cxx |   82 +
 svx/source/svdraw/svdopath.cxx |7 ++-
 svx/source/unodraw/unoshape.cxx|   15 ++
 xmloff/source/draw/shapeimport.cxx |6 ++
 5 files changed, 116 insertions(+), 1 deletion(-)

New commits:
commit 3870198c0d0bf354cddc33da88b4ddd02de40c94
Author: Miklos Vajna 
AuthorDate: Mon Feb 22 14:53:05 2021 +0100
Commit: Miklos Vajna 
CommitDate: Mon Feb 22 18:00:04 2021 +0100

svx: fix unexpected large bezier shapes when created via the UNO API

Regression from commit bc886f523872d4f9845c188c7d525d72a1a60946
(tdf#98584 Correct import draw:transform values skewY and matrix,
2020-01-02), then problem is was that now we handle the transform matrix
for path objects the way ODF likes it, but this breaks UNO API clients
with existing code.

In an attempt to make everyone happy, revert the default to ignore
scaling from the transform matrix, but add a way so that xmloff/ can opt
in to handle it. This way the ODF import result doesn't regression and
UNO API compatibility is not broken, either.

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

diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx
index b934d74d3e46..be345a850b7d 100644
--- a/include/svx/svdopath.hxx
+++ b/include/svx/svdopath.hxx
@@ -49,6 +49,7 @@ private:
 
 basegfx::B2DPolyPolygon maPathPolygon;
 SdrObjKind  meKind;
+bool mbHandleScale = false;
 
 // for isolation of old Drag/Create code
 std::unique_ptr mpDAC;
@@ -163,6 +164,12 @@ public:
 // If it's an SdrPathObj it will use the provided geometry information. 
The Polygon has
 // to use (0,0) as upper left and will be scaled to the given size in the 
matrix.
 virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const 
basegfx::B2DPolyPolygon& rPolyPolygon) override;
+
+/**
+ * Scaling is ignored from the transform matrix by default, to not break 
compatibility. One can
+ * opt in to handle scaling if matching ODF behavior is more important.
+ */
+void SetHandleScale(bool bHandleScale);
 };
 
 #endif // INCLUDED_SVX_SVDOPATH_HXX
diff --git a/svx/qa/unit/svdraw.cxx b/svx/qa/unit/svdraw.cxx
index c96ccbb7aa97..15c220d53e07 100644
--- a/svx/qa/unit/svdraw.cxx
+++ b/svx/qa/unit/svdraw.cxx
@@ -16,6 +16,10 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -105,6 +109,84 @@ CPPUNIT_TEST_FIXTURE(SvdrawTest, testSemiTransparentText)
 CPPUNIT_ASSERT_EQUAL(nTransparence,
  static_cast(basegfx::fround(fTransparence 
* 100)));
 }
+
+CPPUNIT_TEST_FIXTURE(SvdrawTest, testHandlePathObjScale)
+{
+// Given a path object:
+getComponent() = loadFromDesktop("private:factory/sdraw");
+uno::Reference xFactory(getComponent(), 
uno::UNO_QUERY);
+uno::Reference xShape(
+xFactory->createInstance("com.sun.star.drawing.ClosedBezierShape"), 
uno::UNO_QUERY);
+
+// When setting its scale by both using setSize() and scaling in a 
transform matrix:
+// Set size and basic properties.
+xShape->setPosition(awt::Point(2512, 6062));
+xShape->setSize(awt::Size(112, 112));
+uno::Reference xShapeProps(xShape, uno::UNO_QUERY);
+xShapeProps->setPropertyValue("FillStyle", 
uno::makeAny(drawing::FillStyle_SOLID));
+xShapeProps->setPropertyValue("LineStyle", 
uno::makeAny(drawing::LineStyle_SOLID));
+xShapeProps->setPropertyValue("FillColor", 
uno::makeAny(static_cast(0)));
+// Add it to the draw page.
+uno::Reference 
xDrawPagesSupplier(getComponent(), uno::UNO_QUERY);
+uno::Reference 
xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0),
+ uno::UNO_QUERY);
+xDrawPage->add(xShape);
+// Set polygon coordinates.
+drawing::PolyPolygonBezierCoords aPolyPolygonBezierCoords;
+aPolyPolygonBezierCoords.Coordinates = {
+{
+awt::Point(2624, 6118),
+awt::Point(2624, 6087),
+awt::Point(2599, 6062),
+awt::Point(2568, 6062),
+awt::Point(2537, 6062),
+awt::Point(2512, 6087),
+awt::Point(2512, 6118),
+awt::Point(2512, 6149),
+awt::Point(2537, 6175),
+awt::Point(2568, 6174),
+awt::Point(2599, 6174),
+awt::Point(2625, 6149),
+awt::Point(2624, 6118),
+},
+};
+aPolyPolygonBezierCoords.Flags = {
+{
+drawing::PolygonFlags_NORMAL,
+drawing::PolygonFlags_CONTROL,
+drawing::PolygonFlags_CONTROL,
+drawing::PolygonFlags_NORMAL,
+drawing::PolygonFlags_CONTROL,
+drawing::PolygonFlags_

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

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/browser/sbagrid.cxx |   14 --
 dbaccess/source/ui/inc/browserids.hxx  |1 -
 2 files changed, 15 deletions(-)

New commits:
commit 110e3b63a7287e625570adead9f0bab12383dd3f
Author: Caolán McNamara 
AuthorDate: Mon Feb 22 14:41:39 2021 +
Commit: Caolán McNamara 
CommitDate: Mon Feb 22 17:53:33 2021 +0100

there is no way to activate ID_BROWSER_COLUMNINFO so its dead-code

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

diff --git a/dbaccess/source/ui/browser/sbagrid.cxx 
b/dbaccess/source/ui/browser/sbagrid.cxx
index 9e379b3e5b49..2251be4d629d 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -611,20 +611,6 @@ void 
SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupM
 case ID_BROWSER_COLATTRSET:
 static_cast(GetParent())->SetColAttrs(nColId);
 break;
-case ID_BROWSER_COLUMNINFO:
-{
-sal_uInt16 nModelPos = 
static_cast(GetParent())->GetModelColumnPos(nColId);
-Reference< XPropertySet >  xField = 
static_cast(GetParent())->getField(nModelPos);
-
-if(!xField.is())
-break;
-std::vector< std::shared_ptr > vClipboardList;
-// send it to the clipboard
-vClipboardList.push_back(std::make_shared(xField));
-rtl::Reference pData = new 
OTableRowExchange(vClipboardList);
-pData->CopyToClipboard(GetParent());
-}
-break;
 
 default: FmGridHeader::PostExecuteColumnContextMenu(nColId, rMenu, 
nExecutionResult);
 }
diff --git a/dbaccess/source/ui/inc/browserids.hxx 
b/dbaccess/source/ui/inc/browserids.hxx
index c31ab9f20608..0c510497dea1 100644
--- a/dbaccess/source/ui/inc/browserids.hxx
+++ b/dbaccess/source/ui/inc/browserids.hxx
@@ -50,7 +50,6 @@
 #define ID_BROWSER_COLWIDTH 10021  // column width
 #define ID_BROWSER_TABLEATTR10022  // table format attributes
 #define ID_BROWSER_ROWHEIGHT10023  // row height
-#define ID_BROWSER_COLUMNINFO   10024  // copies the column 
description to insert it into the table design
 #define ID_BROWSER_ADDTABLE SID_FM_ADDTABLE
 #define ID_BROWSER_EXPLORER SID_DSBROWSER_EXPLORER
 #define ID_BROWSER_DOCUMENT_DATASOURCE  SID_DOCUMENT_DATA_SOURCE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/win

[Noel Grandin (via logerrit)]

 vcl/win/app/salinst.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit c8e38ba0a22caa52f9478060b459feaaa47214c0
Author: Noel Grandin 
AuthorDate: Thu Feb 4 08:44:45 2021 +0200
Commit: Christian Lohmaier 
CommitDate: Mon Feb 22 17:44:46 2021 +0100

fix sporadic crash in sd_misc_tests on windows

we end up trying to process a timer message, but from inside
the vcl de-init function, which means the timer stuff has already
been de-initialised.

Change-Id: I94703219754f1ccabd3065fc5ea437f39264197b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110397
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 14eff34dd10c047de222813eb16198b295b31d54)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111314
Reviewed-by: Christian Lohmaier 

diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index 476b6350147a..c5a0c6fec04b 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -573,6 +573,12 @@ LRESULT CALLBACK SalComWndProc( HWND, UINT nMsg, WPARAM 
wParam, LPARAM lParam, b
 SAL_INFO("vcl.gdi.wndproc", "SalComWndProc(nMsg=" << nMsg << ", wParam=" 
<< wParam
 << ", lParam=" << lParam << "); inSendMsg: " 
<< bIsOtherThreadMessage);
 
+if (ImplGetSVData()->mbDeInit)
+{
+SAL_WARN("vcl.gdi.wndproc", "ignoring timer event because we are 
shutting down");
+return 0;
+}
+
 switch ( nMsg )
 {
 case SAL_MSG_THREADYIELD:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - basic/source editeng/source include/editeng

[Noel (via logerrit)]

 basic/source/basmgr/basicmanagerrepository.cxx  |8 ++
 basic/source/classes/sbunoobj.cxx   |9 +++
 basic/source/inc/dlgcont.hxx|4 +--
 basic/source/inc/namecont.hxx   |4 +--
 basic/source/inc/scriptcont.hxx |4 +--
 basic/source/uno/dlgcont.cxx|   10 +++-
 basic/source/uno/namecont.cxx   |   12 -
 basic/source/uno/scriptcont.cxx |   15 
 editeng/source/accessibility/AccessibleContextBase.cxx  |   10 
 editeng/source/accessibility/AccessibleEditableTextPara.cxx |4 +--
 editeng/source/accessibility/AccessibleHyperlink.cxx|2 -
 editeng/source/accessibility/AccessibleImageBullet.cxx  |2 -
 editeng/source/editeng/impedit.cxx  |3 --
 editeng/source/editeng/impedit2.cxx |5 +---
 editeng/source/misc/unolingu.cxx|2 -
 editeng/source/uno/unotext.cxx  |   13 --
 editeng/source/uno/unotext2.cxx |4 +--
 editeng/source/xml/xmltxtexp.cxx|2 -
 editeng/source/xml/xmltxtimp.cxx|5 +---
 include/editeng/unolingu.hxx|3 +-
 20 files changed, 55 insertions(+), 66 deletions(-)

New commits:
commit 1571fd8bfdb1deb07b4d6a4abde4919d24550cea
Author: Noel 
AuthorDate: Mon Feb 22 12:12:37 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon Feb 22 17:32:28 2021 +0100

loplugin:refcounting in basic

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

diff --git a/basic/source/basmgr/basicmanagerrepository.cxx 
b/basic/source/basmgr/basicmanagerrepository.cxx
index 01ca8759e145..a70c49eb1149 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -292,15 +292,13 @@ namespace basic
 pBasicManager->SetStorageName( aAppBasic.PathToFileName() );
 
 // Basic container
-SfxScriptLibraryContainer* pBasicCont = new SfxScriptLibraryContainer( 
Reference< XStorage >() );
-Reference< XPersistentLibraryContainer > xBasicCont( pBasicCont );
+rtl::Reference pBasicCont = new 
SfxScriptLibraryContainer( Reference< XStorage >() );
 pBasicCont->setBasicManager( pBasicManager );
 
 // Dialog container
-SfxDialogLibraryContainer* pDialogCont = new 
SfxDialogLibraryContainer( Reference< XStorage >() );
-Reference< XPersistentLibraryContainer > xDialogCont( pDialogCont );
+rtl::Reference pDialogCont = new 
SfxDialogLibraryContainer( Reference< XStorage >() );
 
-LibraryContainerInfo aInfo( xBasicCont, xDialogCont, static_cast< 
OldBasicPassword* >( pBasicCont ) );
+LibraryContainerInfo aInfo( pBasicCont, pDialogCont, static_cast< 
OldBasicPassword* >( pBasicCont.get() ) );
 pBasicManager->SetLibraryContainerInfo( aInfo );
 
 // global constants
diff --git a/basic/source/classes/sbunoobj.cxx 
b/basic/source/classes/sbunoobj.cxx
index 2afc7ed52604..259cd5ae88f4 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -4048,8 +4048,7 @@ void SbRtl_CreateUnoListener(StarBASIC * pBasic, SbxArray 
& rPar, bool)
 Reference< XInvocationAdapterFactory2 > xInvocationAdapterFactory =
  InvocationAdapterFactory::create( xContext );
 
-BasicAllListener_Impl * p;
-Reference< XAllListener > xAllLst = p = new BasicAllListener_Impl( 
aPrefixName );
+rtl::Reference xAllLst = new BasicAllListener_Impl( 
aPrefixName );
 Any aTmp;
 Reference< XInterface > xLst = createAllListenerAdapter( 
xInvocationAdapterFactory, xClass, xAllLst, aTmp );
 if( !xLst.is() )
@@ -4062,8 +4061,8 @@ void SbRtl_CreateUnoListener(StarBASIC * pBasic, SbxArray 
& rPar, bool)
 return;
 
 SbUnoObject* pUnoObj = new SbUnoObject( aListenerClassName, aTmp );
-p->xSbxObj = pUnoObj;
-p->xSbxObj->SetParent( pBasic );
+xAllLst->xSbxObj = pUnoObj;
+xAllLst->xSbxObj->SetParent( pBasic );
 
 // #100326 Register listener object to set Parent NULL in Dtor
 SbxArrayRef xBasicUnoListeners = pBasic->getUnoListeners();
@@ -4071,7 +4070,7 @@ void SbRtl_CreateUnoListener(StarBASIC * pBasic, SbxArray 
& rPar, bool)
 
 // return the object
 SbxVariableRef refVar = rPar.Get32(0);
-refVar->PutObject( p->xSbxObj.get() );
+refVar->PutObject( xAllLst->xSbxObj.get() );
 }
 
 
diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx
index f9dbe2745c25..1152dd82b2b3 100644
--- a/basic/source/inc/dlgcont.hxx
+++ b/basic/source/inc/dlgcont.hxx
@@ -34,8 +

[Libreoffice-commits] core.git: sax/README.vars

[Miklos Vajna (via logerrit)]

 sax/README.vars |5 +
 1 file changed, 5 insertions(+)

New commits:
commit b8a38885093fc447792e6025b339f51e0874a66b
Author: Miklos Vajna 
AuthorDate: Mon Feb 22 16:10:46 2021 +0100
Commit: Miklos Vajna 
CommitDate: Mon Feb 22 17:02:38 2021 +0100

sax: document SAX_DISABLE_THREADS

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

diff --git a/sax/README.vars b/sax/README.vars
new file mode 100644
index ..35d0bccd034d
--- /dev/null
+++ b/sax/README.vars
@@ -0,0 +1,5 @@
+Environment variables in sax:
+
+- fastparser:
+
+  - SAX_DISABLE_THREADS - don't thread sax parsing
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/refcounting.cxx  |3 +++
 compilerplugins/clang/test/refcounting.cxx |   15 +++
 2 files changed, 18 insertions(+)

New commits:
commit b0f1672a5db0379b0e5f424038fc38f5d699eceb
Author: Stephan Bergmann 
AuthorDate: Mon Feb 22 14:35:31 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Feb 22 16:43:46 2021 +0100

Avoid loplugin:refounting in uninstantiated template code

...causing e.g. false positive

> In file included from 
shell/source/win32/spsupp/COMOpenDocuments_x64.cxx:11:
> In file included from shell/source/win32/spsupp/COMOpenDocuments.cxx:16:
> In file included from shell/inc/spsupp\COMOpenDocuments.hpp:21:
> shell/inc/spsupp/COMRefCounted.hpp(35,13): error: cppu::OWeakObject 
subclass 'COMRefCounted' being deleted via delete, should be 
managed via rtl::Reference [loplugin:refcounting]
> delete this;
> ^~~

with clang-cl on Windows.  (Ideally, this would be made up for with setting 
this
plugins' shouldVisitTemplateInstantiations() to true, see the TODO added in
compilerplugins/clang/test/refcounting.cxx, but that would cause lots of 
other
findings, so is left out for now.)

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

diff --git a/compilerplugins/clang/refcounting.cxx 
b/compilerplugins/clang/refcounting.cxx
index fa026877680b..f15e423aebd2 100644
--- a/compilerplugins/clang/refcounting.cxx
+++ b/compilerplugins/clang/refcounting.cxx
@@ -211,6 +211,9 @@ bool containsOWeakObjectSubclass(const QualType& qType) {
 bool containsOWeakObjectSubclass(const clang::Type* pType0) {
 if (!pType0)
 return false;
+if (pType0->isDependentType()) {
+ return false;
+}
 const clang::Type* pType = pType0->getUnqualifiedDesugaredType();
 if (!pType)
 return false;
diff --git a/compilerplugins/clang/test/refcounting.cxx 
b/compilerplugins/clang/test/refcounting.cxx
index 69825e6fc47b..8a1f277829cc 100644
--- a/compilerplugins/clang/test/refcounting.cxx
+++ b/compilerplugins/clang/test/refcounting.cxx
@@ -57,4 +57,19 @@ void test2(UnoObject* pUnoObject)
 delete pUnoObject;
 }
 
+template  struct Dependent : T
+{
+void f() { delete this; }
+//TODO: missing expected error@+1 {{cppu::OWeakObject subclass 
'Dependent' being deleted via delete, should be managed via 
rtl::Reference [loplugin:refcounting]}}
+void g() { delete this; }
+};
+struct Dummy
+{
+};
+void dummy(Dependent* p1, Dependent* p2)
+{
+p1->f();
+p2->g();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro (via logerrit)]

 desktop/source/lib/init.cxx  |6 ++
 include/vcl/svapp.hxx|1 +
 vcl/source/window/dialog.cxx |4 
 3 files changed, 11 insertions(+)

New commits:
commit 5f3fbb019bd79bd57eed94e01bd2202efd9a0c06
Author: Henry Castro 
AuthorDate: Wed Feb 17 16:47:27 2021 -0400
Commit: Jan Holesovsky 
CommitDate: Mon Feb 22 16:01:51 2021 +0100

lok: add batch mode option to load the document

When the LibreOffice Kit is active by default is
set to headless mode, with the flag "DialogCancelMode::Silent",
according to the documentation it should close the dialog,
but it was changed for dialog tunneling.

However the dialog tunneling is being deprecated, and
in order to not produce any regression, it will be used
temporary a new state "DialogCancelMode::LOKSilent", to disable
any dialog interactivity.

Change-Id: I3b6cce38c37f75dc1b24dda352f6caec19438ff1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111087
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index e72f17e8c45a..621e2f3455f8 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2249,6 +2249,12 @@ static LibreOfficeKitDocument* 
lo_documentLoadWithOptions(LibreOfficeKit* pThis,
 const OUString aDeviceFormFactor = extractParameter(aOptions, 
"DeviceFormFactor");
 SfxLokHelper::setDeviceFormFactor(aDeviceFormFactor);
 
+const OUString aBatch = extractParameter(aOptions, "Batch");
+if (!aBatch.isEmpty())
+{
+ Application::SetDialogCancelMode(DialogCancelMode::LOKSilent);
+}
+
 uno::Sequence aFilterOptions(3);
 aFilterOptions[0] = css::beans::PropertyValue( "FilterOptions",
0,
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index d0c1e7f0bb6e..a0a5b53144c2 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -220,6 +220,7 @@ private:
 enum class DialogCancelMode {
 Off,  ///< do not automatically cancel dialogs
 Silent,   ///< silently cancel any dialogs
+LOKSilent, ///< silently cancel any dialogs (LOK case)
 Fatal ///< cancel any dialogs by std::abort
 };
 
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index d4437116b725..83fa562023ce 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -947,6 +947,10 @@ bool Dialog::ImplStartExecute()
 "Dialog \"" << ImplGetDialogText(this)
 << "\"cancelled in silent mode");
 return false;
+
+case DialogCancelMode::LOKSilent:
+return false;
+
 default: // default cannot happen
 case DialogCancelMode::Fatal:
 std::abort();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sw/qa/uitest/data/tdf104795.odt |binary
 sw/qa/uitest/writer_tests7/tdf104795.py |   32 
 2 files changed, 32 insertions(+)

New commits:
commit 68a323c97ad817faf95d2569b0965c4654044f60
Author: Xisco Fauli 
AuthorDate: Mon Feb 22 12:58:42 2021 +0100
Commit: Xisco Fauli 
CommitDate: Mon Feb 22 15:52:54 2021 +0100

tdf#104795: sw: Add UItest

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

diff --git a/sw/qa/uitest/data/tdf104795.odt b/sw/qa/uitest/data/tdf104795.odt
new file mode 100644
index ..4b359cdf554d
Binary files /dev/null and b/sw/qa/uitest/data/tdf104795.odt differ
diff --git a/sw/qa/uitest/writer_tests7/tdf104795.py 
b/sw/qa/uitest/writer_tests7/tdf104795.py
new file mode 100644
index ..650f0ca23136
--- /dev/null
+++ b/sw/qa/uitest/writer_tests7/tdf104795.py
@@ -0,0 +1,32 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-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/.
+#
+
+from uitest.framework import UITestCase
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file
+
+class tdf104795(UITestCase):
+
+   def test_tdf104795(self):
+writer_doc = 
self.ui_test.load_file(get_url_for_data_file("tdf104795.odt"))
+
self.ui_test.execute_dialog_through_command(".uno:SetDocumentProperties")
+xDialog = self.xUITest.getTopFocusWindow()
+
+sShowSignedText = 
get_state_as_dict(xDialog.getChild('showsigned'))['Text']
+
+xOkBtn = xDialog.getChild("ok")
+xOkBtn.executeAction("CLICK", tuple())
+
+# Without the fix in place, this test would have failed with
+# AssertionError: '12/19/2016, 23:06:31, timur.davletshin' != 
'12/19/2016, 00:00:00, !!br0ken!!'
+self.assertEqual("12/19/2016, 23:06:31, timur.davletshin", 
sShowSignedText.split('@')[0])
+
+self.ui_test.close_doc()
+
+# 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: Changes to 'refs/tags/cp-6.4-24'

[Andras Timar (via logerrit)]

Tag 'cp-6.4-24' created by Andras Timar  at 
2021-02-22 14:41 +

cp-6.4-24

Changes since cp-6.4-23-22:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.4-24'

[Andras Timar (via logerrit)]

Tag 'cp-6.4-24' created by Andras Timar  at 
2021-02-22 14:41 +

cp-6.4-24

Changes since cp-6.4-23:
Andras Timar (1):
  Translation update

---
 source/ar/cui/messages.po  |  130 
 source/ar/dictionaries/da_DK.po|   24 
 source/ar/officecfg/registry/data/org/openoffice/Office/UI.po  |   24 
 source/ar/svtools/messages.po  |   44 
 source/ar/svx/messages.po  |  502 -
 source/ar/sw/messages.po   |  405 
 source/as/cui/messages.po  |  106 
 source/as/dictionaries/da_DK.po|   18 
 source/as/officecfg/registry/data/org/openoffice/Office/UI.po  |   12 
 source/as/svtools/messages.po  |   42 
 source/as/svx/messages.po  |  472 
 source/as/sw/messages.po   |  385 
 source/ast/cui/messages.po |  108 
 source/ast/dictionaries/da_DK.po   |   18 
 source/ast/officecfg/registry/data/org/openoffice/Office/UI.po |   18 
 source/ast/svtools/messages.po |   42 
 source/ast/svx/messages.po |  485 -
 source/ast/sw/messages.po  |  387 
 source/bg/cui/messages.po  |  106 
 source/bg/dictionaries/da_DK.po|   24 
 source/bg/officecfg/registry/data/org/openoffice/Office/UI.po  |   20 
 source/bg/svtools/messages.po  |   42 
 source/bg/svx/messages.po  |  465 
 source/bg/sw/messages.po   |  385 
 source/bn-IN/cui/messages.po   |  106 
 source/bn-IN/dictionaries/da_DK.po |   18 
 source/bn-IN/officecfg/registry/data/org/openoffice/Office/UI.po   |   12 
 source/bn-IN/svtools/messages.po   |   42 
 source/bn-IN/svx/messages.po   |  482 
 source/bn-IN/sw/messages.po|  386 
 source/br/cui/messages.po  |  106 
 source/br/dictionaries/da_DK.po|   18 
 source/br/officecfg/registry/data/org/openoffice/Office/UI.po  |   12 
 source/br/svtools/messages.po  |   42 
 source/br/svx/messages.po  |  487 -
 source/br/sw/messages.po   |  385 
 source/ca-valencia/cui/messages.po |  106 
 source/ca-valencia/dictionaries/da_DK.po   |   18 
 source/ca-valencia/officecfg/registry/data/org/openoffice/Office/UI.po |   12 
 source/ca-valencia/svtools/messages.po |   42 
 source/ca-valencia/svx/messages.po |  471 
 source/ca-valencia/sw/messages.po  |  385 
 source/ca/cui/messages.po  |  106 
 source/ca/dictionaries/da_DK.po|   24 
 source/ca/officecfg/registry/data/org/openoffice/Office/UI.po  |   20 
 source/ca/svtools/messages.po  |   42 
 source/ca/svx/messages.po  |  471 
 source/ca/sw/messages.po   |  385 
 source/cs/cui/messages.po  |  106 
 source/cs/dictionaries/da_DK.po|   24 
 source/cs/officecfg/registry/data/org/openoffice/Office/UI.po  |   20 
 source/cs/svtools/messages.po  |   42 
 source/cs/svx/messages.po  |  465 
 source/cs/sw/messages.po   |  385 
 source/cy/cui/messages.po  |  106 
 source/cy/dictionaries/da_DK.po|   24 
 source/cy/officecfg/registry/data/org/openoffice/Office/UI.po  |   20 
 source/cy/svtools/messages.po  |   42 
 source/cy/svx/messages.po  |  467 
 source/cy/sw/messages.po   |  385 
 source/da/cui/messages.po 

[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-6.4-24'

[Andras Timar (via logerrit)]

Tag 'cp-6.4-24' created by Andras Timar  at 
2021-02-22 14:41 +

cp-6.4-24

Changes since cp-6.4-branch-point-11:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-6.4-24'

[Andras Timar (via logerrit)]

Tag 'cp-6.4-24' created by Andras Timar  at 
2021-02-22 14:41 +

cp-6.4-24

Changes since co-6.4-20:
Andras Timar (1):
  update Danish dictionary

---
 da_DK/README_da_DK.txt |4 
 da_DK/da_DK.aff| 3401 
 da_DK/da_DK.dic|288016 
+++--
 da_DK/description.xml  |9 
 4 files changed, 139245 insertions(+), 152185 deletions(-)
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - configure.ac

[Andras Timar (via logerrit)]

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

New commits:
commit 649ef79784ed4287c8627ba45df6b435f52996c4
Author: Andras Timar 
AuthorDate: Mon Feb 22 15:39:40 2021 +0100
Commit: Andras Timar 
CommitDate: Mon Feb 22 15:39:40 2021 +0100

Bump version to 6.4-24

Change-Id: If4c58cd09eb58927e7a25b16dc8f47f4f6bb24c0

diff --git a/configure.ac b/configure.ac
index 89b40951374c..a9eba87ec17a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[6.4.10.23],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.4.10.24],[],[],[https://collaboraoffice.com/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 svx/uiconfig/ui/colsmenu.ui |  128 ++--
 1 file changed, 64 insertions(+), 64 deletions(-)

New commits:
commit 3cdecf3e653864d9818b13de99a38228539baacb
Author: Caolán McNamara 
AuthorDate: Mon Feb 22 12:43:47 2021 +
Commit: Caolán McNamara 
CommitDate: Mon Feb 22 15:14:24 2021 +0100

add two missing use-underline to colsmenu

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

diff --git a/svx/uiconfig/ui/colsmenu.ui b/svx/uiconfig/ui/colsmenu.ui
index e44abef70857..0823594bc2ed 100644
--- a/svx/uiconfig/ui/colsmenu.ui
+++ b/svx/uiconfig/ui/colsmenu.ui
@@ -1,105 +1,104 @@
 
-
+
 
   
   
 True
-False
+False
 
   
 True
-False
+False
 Insert _Column
-True
+True
 
   
 True
-False
+False
 
   
 True
-False
+False
 Text Box
-True
+True
   
 
 
   
 True
-False
+False
 Check Box
-True
+True
   
 
 
   
 True
-False
+False
 Combo Box
-True
+True
   
 
 
   
 True
-False
+False
 List Box
-True
+True
   
 
 
   
 True
-False
+False
 Date Field
-True
+True
   
 
 
   
 True
-False
+False
 Time Field
   
 
 
   
 True
-False
+False
 Numeric Field
   
 
 
   
 True
-False
+False
 Currency Field
-True
+True
   
 
 
   
 True
-False
+False
 Pattern Field
-True
+True
   
 
 
   
 True
-False
+False
 Formatted Field
-True
+True
   
 
 
   
 False
-False
+False
 Date and Time Field
-False
-True
+True
   
 
   
@@ -109,100 +108,99 @@
 
   
 True
-False
+False
 _Replace with
-True
+True
 
   
 True
-False
+False
 
   
 True
-False
+False
 Text Box
-True
+True
   
 
 
   
 True
-False
+False
 Check Box
-True
+True
   
 
 
   
 True
-False
+False
 Combo Box
-True
+True
   
 
 
   
 True
-False
+False
 List Box
-True
+True
   
 
 
   
 True
-False
+False
 Date Field
-True
+True
   
 
 
   
 True
-False
+False
 Time Field
-True
+True
   
 
 
   
 True
-False
+False
 Numeric Field
-True
+True
   
 
 
   
 True
-False
+False
 Currency Field
-True
+True
   
 
 

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

[Caolán McNamara (via logerrit)]

 basctl/source/basicide/baside2b.cxx |4 ++--
 basctl/source/basicide/bastypes.cxx |   30 +-
 basctl/source/inc/bastypes.hxx  |3 +--
 include/sfx2/dockwin.hxx|3 +--
 include/vcl/dockwin.hxx |   12 
 sfx2/source/appl/newhelp.cxx|   12 
 sfx2/source/appl/newhelp.hxx|3 +--
 sfx2/source/dialog/dockwin.cxx  |   33 ++---
 vcl/source/window/dockwin.cxx   |   24 +++-
 vcl/uiconfig/ui/dockingwindow.ui|   21 +
 10 files changed, 84 insertions(+), 61 deletions(-)

New commits:
commit 20997b4598f559d3274916dc1c343c69e8feeceb
Author: Caolán McNamara 
AuthorDate: Mon Feb 22 11:33:52 2021 +
Commit: Caolán McNamara 
CommitDate: Mon Feb 22 15:14:04 2021 +0100

factor out as a ResizableDockingWindow

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

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index b5d65507fb50..a420949e4584 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1704,7 +1704,7 @@ void WatchWindow::Resize()
 if ( aBoxSz.Height() < 4 )
 aBoxSz.setHeight( 0 );
 
-m_xVclContentArea->SetPosSizePixel(Point(DWBORDER, DWBORDER), aBoxSz);
+m_xBox->SetPosSizePixel(Point(DWBORDER, DWBORDER), aBoxSz);
 
 Invalidate();
 }
@@ -1863,7 +1863,7 @@ void StackWindow::Resize()
 if ( aBoxSz.Height() < 4 )
 aBoxSz.setHeight( 0 );
 
-m_xVclContentArea->SetPosSizePixel(Point(DWBORDER, DWBORDER), aBoxSz);
+m_xBox->SetPosSizePixel(Point(DWBORDER, DWBORDER), aBoxSz);
 
 Invalidate();
 }
diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index a9a927a27878..cc58ffa6c846 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -42,7 +42,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -260,21 +259,19 @@ WinBits const DockingWindow::StyleBits =
 WB_BORDER | WB_3DLOOK | WB_CLIPCHILDREN |
 WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_DOCKABLE;
 
-DockingWindow::DockingWindow(vcl::Window* pParent, const OUString& 
rUIXMLDescription, const OString& rID) :
-::DockingWindow(pParent, "DockingWindow", "vcl/ui/dockingwindow.ui"),
-pLayout(nullptr),
-nShowCount(0)
+DockingWindow::DockingWindow(vcl::Window* pParent, const OUString& 
rUIXMLDescription, const OString& rID)
+: ResizableDockingWindow(pParent)
+, pLayout(nullptr)
+, nShowCount(0)
 {
-m_xVclContentArea = VclPtr::Create(this);
-m_xVclContentArea->Show();
-m_xBuilder.reset(Application::CreateInterimBuilder(m_xVclContentArea, 
rUIXMLDescription, true));
+m_xBuilder.reset(Application::CreateInterimBuilder(m_xBox.get(), 
rUIXMLDescription, true));
 m_xContainer = m_xBuilder->weld_container(rID);
 }
 
-DockingWindow::DockingWindow (Layout* pParent) :
-::DockingWindow(pParent, StyleBits),
-pLayout(pParent),
-nShowCount(0)
+DockingWindow::DockingWindow (Layout* pParent)
+: ResizableDockingWindow(pParent, StyleBits)
+, pLayout(pParent)
+, nShowCount(0)
 { }
 
 DockingWindow::~DockingWindow()
@@ -286,9 +283,8 @@ void DockingWindow::dispose()
 {
 m_xContainer.reset();
 m_xBuilder.reset();
-m_xVclContentArea.disposeAndClear();
 pLayout.clear();
-::DockingWindow::dispose();
+ResizableDockingWindow::dispose();
 }
 
 // Sets the position and the size of the docking window. This property is saved
@@ -327,12 +323,12 @@ void DockingWindow::Show (bool bShow) // = true
 if (bShow)
 {
 if (++nShowCount == 1)
-::DockingWindow::Show();
+ResizableDockingWindow::Show();
 }
 else
 {
 if (--nShowCount == 0)
-::DockingWindow::Hide();
+ResizableDockingWindow::Hide();
 }
 }
 
@@ -361,7 +357,7 @@ bool DockingWindow::Docking( const Point& rPos, 
tools::Rectangle& rRect )
 void DockingWindow::EndDocking( const tools::Rectangle& rRect, bool bFloatMode 
)
 {
 if ( bFloatMode )
-::DockingWindow::EndDocking( rRect, bFloatMode );
+ResizableDockingWindow::EndDocking( rRect, bFloatMode );
 else
 {
 SetFloatingMode(false);
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index fecebced52ee..e6e306a73b5a 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -78,7 +78,7 @@ struct BasicStatus
 // basctl::DockingWindow -- special docking window for the Basic IDE
 // Not to be confused with ::DockingWindow from vcl.
 
-class DockingWindow : public ::DockingWindow
+class DockingWindow : public ResizableDockingWindow
 {
 public:
 DockingWindow(vcl::Window* pParent, const OUString& r

[Libreoffice-commits] core.git: basctl/source sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk vcl/uiconfig vcl/UIConfig_vcl.mk

[Caolán McNamara (via logerrit)]

 basctl/source/basicide/bastypes.cxx |2 +-
 sfx2/UIConfig_sfx.mk|1 -
 sfx2/source/appl/newhelp.cxx|2 +-
 sfx2/source/dialog/dockwin.cxx  |2 +-
 vcl/UIConfig_vcl.mk |1 +
 vcl/uiconfig/ui/dockingwindow.ui|2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 40f81f1f9eb4266a897c6c5185544908d91c714e
Author: Caolán McNamara 
AuthorDate: Mon Feb 22 11:19:41 2021 +
Commit: Caolán McNamara 
CommitDate: Mon Feb 22 15:13:41 2021 +0100

move dockingwindow.ui to vcl

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

diff --git a/basctl/source/basicide/bastypes.cxx 
b/basctl/source/basicide/bastypes.cxx
index 0a4f2efc62cf..a9a927a27878 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -261,7 +261,7 @@ WinBits const DockingWindow::StyleBits =
 WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_DOCKABLE;
 
 DockingWindow::DockingWindow(vcl::Window* pParent, const OUString& 
rUIXMLDescription, const OString& rID) :
-::DockingWindow(pParent, "DockingWindow", "sfx/ui/dockingwindow.ui"),
+::DockingWindow(pParent, "DockingWindow", "vcl/ui/dockingwindow.ui"),
 pLayout(nullptr),
 nShowCount(0)
 {
diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index 7878e618db45..ac2a3f8c9010 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_UIConfig_add_uifiles,sfx,\
sfx2/uiconfig/ui/decktitlebar \
sfx2/uiconfig/ui/descriptioninfopage \
sfx2/uiconfig/ui/developmenttool \
-   sfx2/uiconfig/ui/dockingwindow \
sfx2/uiconfig/ui/documentfontspage \
sfx2/uiconfig/ui/documentinfopage \
sfx2/uiconfig/ui/documentpropertiesdialog \
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 61e15c22abfd..8d936e0dc28b 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2422,7 +2422,7 @@ SfxHelpWindow_Impl::SfxHelpWindow_Impl(
 const css::uno::Reference < css::frame::XFrame2 >& rFrame,
 vcl::Window* pParent ) :
 
-DockingWindow(pParent, "DockingWindow", "sfx/ui/dockingwindow.ui"),
+DockingWindow(pParent, "DockingWindow", "vcl/ui/dockingwindow.ui"),
 
 xFrame  ( rFrame ),
 pTextWin( nullptr ),
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 24e9b527385d..00d83db274d1 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -767,7 +767,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, 
SfxChildWindow *pCW,
 */
 SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
 vcl::Window* pParent, const OString& rID, const OUString& 
rUIXMLDescription)
-: DockingWindow(pParent, "DockingWindow", "sfx/ui/dockingwindow.ui")
+: DockingWindow(pParent, "DockingWindow", "vcl/ui/dockingwindow.ui")
 , pBindings(pBindinx)
 , pMgr(pCW)
 {
diff --git a/vcl/UIConfig_vcl.mk b/vcl/UIConfig_vcl.mk
index 8047f56e7dba..72b7e08d2700 100644
--- a/vcl/UIConfig_vcl.mk
+++ b/vcl/UIConfig_vcl.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_UIConfig_add_uifiles,vcl,\
vcl/uiconfig/ui/aboutbox \
vcl/uiconfig/ui/combobox \
vcl/uiconfig/ui/cupspassworddialog \
+   vcl/uiconfig/ui/dockingwindow \
vcl/uiconfig/ui/editmenu \
vcl/uiconfig/ui/errornocontentdialog \
vcl/uiconfig/ui/errornoprinterdialog \
diff --git a/sfx2/uiconfig/ui/dockingwindow.ui 
b/vcl/uiconfig/ui/dockingwindow.ui
similarity index 95%
rename from sfx2/uiconfig/ui/dockingwindow.ui
rename to vcl/uiconfig/ui/dockingwindow.ui
index cafd817de877..e98da3fd004c 100644
--- a/sfx2/uiconfig/ui/dockingwindow.ui
+++ b/vcl/uiconfig/ui/dockingwindow.ui
@@ -1,6 +1,6 @@
 
 
-
+
   
   
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 include/svtools/toolbarmenu.hxx|2 +-
 include/vcl/dockwin.hxx|6 +++---
 sc/source/ui/cctrl/checklistmenu.cxx   |8 
 sc/source/ui/inc/checklistmenu.hxx |2 +-
 svtools/source/control/toolbarmenu.cxx |6 +++---
 vcl/source/control/calendar.cxx|8 
 vcl/source/window/dockwin.cxx  |6 +++---
 7 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 8f4da40cc69979ba4982d44c49035138d13726d8
Author: Caolán McNamara 
AuthorDate: Mon Feb 22 11:15:58 2021 +
Commit: Caolán McNamara 
CommitDate: Mon Feb 22 15:13:19 2021 +0100

rename to DropdownDockingWindow

these are used as non-resizable dropdown menu-alike things

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

diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx
index e68043b34ed5..5a47d18625f3 100644
--- a/include/svtools/toolbarmenu.hxx
+++ b/include/svtools/toolbarmenu.hxx
@@ -82,7 +82,7 @@ public:
 void unsetPopover();
 };
 
-class SVT_DLLPUBLIC InterimToolbarPopup final : public InterimDockingWindow
+class SVT_DLLPUBLIC InterimToolbarPopup final : public DropdownDockingWindow
 {
 private:
 css::uno::Reference m_xFrame;
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index 390c96267f0b..f02866f0a9e5 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -378,15 +378,15 @@ inline void DockingWindow::SetIdleDebugName( const char 
*pDebugName )
 maLayoutIdle.SetDebugName( pDebugName );
 }
 
-class VCL_DLLPUBLIC InterimDockingWindow : public DockingWindow
+class VCL_DLLPUBLIC DropdownDockingWindow : public DockingWindow
 {
 protected:
 VclPtr m_xBox;
 public:
-InterimDockingWindow(vcl::Window* pParent,
+DropdownDockingWindow(vcl::Window* pParent,
 const css::uno::Reference &rFrame = 
css::uno::Reference(),
 bool bTearable = false);
-virtual ~InterimDockingWindow() override;
+virtual ~DropdownDockingWindow() override;
 virtual void dispose() override;
 };
 
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index b2da89bb7717..19c098a8d96e 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -567,7 +567,7 @@ ScCheckListMenuControl::~ScCheckListMenuControl()
 ScCheckListMenuWindow::ScCheckListMenuWindow(vcl::Window* pParent, ScDocument* 
pDoc, bool bCanHaveSubMenu,
  bool bTreeMode, int nWidth, 
ScCheckListMenuWindow* pParentMenu,
  vcl::ILibreOfficeKitNotifier* 
pNotifier)
-: InterimDockingWindow(pParent)
+: DropdownDockingWindow(pParent)
 , mxParentMenu(pParentMenu)
 {
 if (pNotifier)
@@ -586,7 +586,7 @@ bool ScCheckListMenuWindow::EventNotify(NotifyEvent& rNEvt)
 rMenuControl.queueCloseSubMenu();
 rMenuControl.clearSelectedMenuItem();
 }
-return InterimDockingWindow::EventNotify(rNEvt);
+return DropdownDockingWindow::EventNotify(rNEvt);
 }
 
 ScCheckListMenuWindow::~ScCheckListMenuWindow()
@@ -598,12 +598,12 @@ void ScCheckListMenuWindow::dispose()
 {
 mxControl.reset();
 mxParentMenu.clear();
-InterimDockingWindow::dispose();
+DropdownDockingWindow::dispose();
 }
 
 void ScCheckListMenuWindow::GetFocus()
 {
-InterimDockingWindow::GetFocus();
+DropdownDockingWindow::GetFocus();
 if (!mxControl)
 return;
 mxControl->GrabFocus();
diff --git a/sc/source/ui/inc/checklistmenu.hxx 
b/sc/source/ui/inc/checklistmenu.hxx
index a00e1447557c..6f1a7377fdbd 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -297,7 +297,7 @@ private:
  * This class implements a popup window for field button, for quick access
  * of hide-item list, and possibly more stuff related to field options.
  */
-class ScCheckListMenuWindow : public InterimDockingWindow
+class ScCheckListMenuWindow : public DropdownDockingWindow
 {
 public:
 explicit ScCheckListMenuWindow(vcl::Window* pParent, ScDocument* pDoc,
diff --git a/svtools/source/control/toolbarmenu.cxx 
b/svtools/source/control/toolbarmenu.cxx
index d7336caddb67..4149afa4b7a7 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -171,7 +171,7 @@ IMPL_LINK_NOARG(ToolbarPopupContainer, FocusHdl, 
weld::Widget&, void)
 
 InterimToolbarPopup::InterimToolbarPopup(const 
css::uno::Reference& rFrame, vcl::Window* pParent,
  std::unique_ptr 
xPopup, bool bTearable)
-: InterimDockingWindow(pParent, rFrame, bTearable)
+: DropdownDockingWindow(pParent, rFrame, bTearable)
 , m_xFrame(rFrame)
 , m_xBuilder(Application::CreateInterimBuilder(m_xBox.get(), 
"svt/ui/interimparent.ui", false))
 

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

[Xisco Fauli (via logerrit)]

 sw/qa/uitest/writer_tests5/tdf118540.py |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 09acea893429b6bdfe61da23e463cfbc29947b72
Author: Xisco Fauli 
AuthorDate: Fri Feb 19 11:14:06 2021 +0100
Commit: Xisco Fauli 
CommitDate: Mon Feb 22 14:37:19 2021 +0100

uitest: sw: re-enable test to see if it still fails

it doesn't fail for me, let's see for others.
Anyway, I might have an idea how to fix it if it still fails

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

diff --git a/sw/qa/uitest/writer_tests5/tdf118540.py 
b/sw/qa/uitest/writer_tests5/tdf118540.py
index 1ae4a30c2055..6bf46a14396a 100644
--- a/sw/qa/uitest/writer_tests5/tdf118540.py
+++ b/sw/qa/uitest/writer_tests5/tdf118540.py
@@ -15,8 +15,6 @@ from uitest.uihelper.common import get_state_as_dict, 
get_url_for_data_file
 
 class tdf118540(UITestCase):
def test_tdf118540_preview_document_properties(self):
-# FIXME flaky test, usually passes, but breaks regularly.
-return
 writer_doc = 
self.ui_test.load_file(get_url_for_data_file("tdf118540.docx"))
 document = self.ui_test.get_component()
 self.xUITest.executeCommand(".uno:PrintPreview")  #open print preview
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli (via logerrit)]

 sw/qa/uitest/writer_tests7/tdf115853.py |   44 
 1 file changed, 44 insertions(+)

New commits:
commit 016e34707417840528532109a8b416f883991c24
Author: Xisco Fauli 
AuthorDate: Mon Feb 22 12:29:54 2021 +0100
Commit: Xisco Fauli 
CommitDate: Mon Feb 22 13:47:34 2021 +0100

tdf#115853: sw: Add UItest

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

diff --git a/sw/qa/uitest/writer_tests7/tdf115853.py 
b/sw/qa/uitest/writer_tests7/tdf115853.py
new file mode 100644
index ..42cddb2b388b
--- /dev/null
+++ b/sw/qa/uitest/writer_tests7/tdf115853.py
@@ -0,0 +1,44 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-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/.
+#
+
+from uitest.framework import UITestCase
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict
+from uitest.uihelper.common import select_pos
+
+class tdf115853(UITestCase):
+
+def test_tdf115853(self):
+self.ui_test.create_doc_in_start_center("writer")
+
self.ui_test.execute_dialog_through_command(".uno:SetDocumentProperties")
+xDialog = self.xUITest.getTopFocusWindow()
+
+xTabs = xDialog.getChild("tabcontrol")
+
+select_pos(xTabs, "2")
+
+xAddBtn = xDialog.getChild("add")
+xAddBtn.executeAction("CLICK", tuple())
+
+xNameBox1 = xDialog.getChild("namebox1")
+xNameBox1.executeAction("TYPE", mkPropertyValues({"TEXT":"Text"}))
+
+xAddBtn = xDialog.getChild("add")
+xAddBtn.executeAction("CLICK", tuple())
+
+# Without the fix in place, this test would have failed with
+# AssertionError: 'Text' != ''
+self.assertEqual("Text", get_state_as_dict(xNameBox1)['Text'])
+
+xOkBtn = xDialog.getChild("ok")
+xOkBtn.executeAction("CLICK", tuple())
+
+self.ui_test.close_doc()
+
+# 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: vcl/source

[Caolán McNamara (via logerrit)]

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

New commits:
commit 61c5c0170d1b36b71b4facb2c8bbbc3f8ca5a6ba
Author: Caolán McNamara 
AuthorDate: Mon Feb 22 10:56:07 2021 +
Commit: Caolán McNamara 
CommitDate: Mon Feb 22 13:41:43 2021 +0100

an iconview target is also possible

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

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 25a507d39e82..b644343dc0a0 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -592,7 +592,7 @@ VclBuilder::VclBuilder(vcl::Window* pParent, const 
OUString& sUIDir, const OUStr
 SvTabListBox *pTreeBoxTarget = dynamic_cast(pTarget);
 // pStore may be empty
 const ListStore *pStore = get_model_by_name(elem.m_sValue.toUtf8());
-SAL_WARN_IF(!pListBoxTarget && !pComboBoxTarget && !pTreeBoxTarget, 
"vcl", "missing elements of combobox");
+SAL_WARN_IF(!pListBoxTarget && !pComboBoxTarget && !pTreeBoxTarget && 
!dynamic_cast(pTarget), "vcl", "missing elements of combobox");
 if (pListBoxTarget && pStore)
 mungeModel(*pListBoxTarget, *pStore, elem.m_nActiveId);
 else if (pComboBoxTarget && pStore)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel (via logerrit)]

 canvas/source/cairo/cairo_canvas.cxx   |4 ++--
 canvas/source/cairo/cairo_spritecanvas.cxx |4 ++--
 canvas/source/opengl/ogl_spritecanvas.cxx  |6 +++---
 canvas/source/vcl/canvas.cxx   |6 +++---
 canvas/source/vcl/spritecanvas.cxx |6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 919e47ee210dc40ae8f235e6904b217b26788f26
Author: Noel 
AuthorDate: Mon Feb 22 12:12:47 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon Feb 22 13:40:12 2021 +0100

loplugin:refcounting in canvas

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

diff --git a/canvas/source/cairo/cairo_canvas.cxx 
b/canvas/source/cairo/cairo_canvas.cxx
index f8266cffe446..10edc0681843 100644
--- a/canvas/source/cairo/cairo_canvas.cxx
+++ b/canvas/source/cairo/cairo_canvas.cxx
@@ -176,7 +176,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 com_sun_star_comp_rendering_Canvas_Cairo_get_implementation(
 css::uno::XComponentContext* context, css::uno::Sequence 
const& args)
 {
-auto p = new cairocanvas::Canvas(args, context);
+rtl::Reference p = new cairocanvas::Canvas(args, 
context);
 p->acquire();
 try {
 p->initialize();
@@ -185,7 +185,7 @@ com_sun_star_comp_rendering_Canvas_Cairo_get_implementation(
 p->release();
 throw;
 }
-return static_cast(p);
+return static_cast(p.get());
 }
 
 
diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx 
b/canvas/source/cairo/cairo_spritecanvas.cxx
index ddb4491afdf2..91ac7c376b4d 100644
--- a/canvas/source/cairo/cairo_spritecanvas.cxx
+++ b/canvas/source/cairo/cairo_spritecanvas.cxx
@@ -224,10 +224,10 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 com_sun_star_comp_rendering_SpriteCanvas_Cairo_get_implementation(
 css::uno::XComponentContext* context, css::uno::Sequence 
const& args)
 {
-auto p = new cairocanvas::SpriteCanvas(args, context);
+rtl::Reference p = new 
cairocanvas::SpriteCanvas(args, context);
 p->acquire();
 p->initialize();
-return static_cast(p);
+return static_cast(p.get());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx 
b/canvas/source/opengl/ogl_spritecanvas.cxx
index d55625b47668..babeafa19af9 100644
--- a/canvas/source/opengl/ogl_spritecanvas.cxx
+++ b/canvas/source/opengl/ogl_spritecanvas.cxx
@@ -157,10 +157,10 @@ 
com_sun_star_comp_rendering_SpriteCanvas_OGL_get_implementation(
 {
 if( !OpenGLHelper::supportsOpenGL())
 return nullptr;
-auto p = new oglcanvas::SpriteCanvas(args, context);
-cppu::acquire(p);
+rtl::Reference p = new 
oglcanvas::SpriteCanvas(args, context);
+cppu::acquire(p.get());
 p->initialize();
-return static_cast(p);
+return static_cast(p.get());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx
index e8f6ffe0c62a..467da51f37ed 100644
--- a/canvas/source/vcl/canvas.cxx
+++ b/canvas/source/vcl/canvas.cxx
@@ -134,10 +134,10 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 com_sun_star_comp_rendering_Canvas_VCL_get_implementation(
 css::uno::XComponentContext* context, css::uno::Sequence 
const& args)
 {
-auto p = new vclcanvas::Canvas(args, context);
-cppu::acquire(p);
+rtl::Reference p = new vclcanvas::Canvas(args, context);
+cppu::acquire(p.get());
 p->initialize();
-return static_cast(p);
+return static_cast(p.get());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/spritecanvas.cxx 
b/canvas/source/vcl/spritecanvas.cxx
index bc3b2d9f290a..2238a79127f0 100644
--- a/canvas/source/vcl/spritecanvas.cxx
+++ b/canvas/source/vcl/spritecanvas.cxx
@@ -163,10 +163,10 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 com_sun_star_comp_rendering_SpriteCanvas_VCL_get_implementation(
 css::uno::XComponentContext* context, css::uno::Sequence 
const& args)
 {
-auto p = new vclcanvas::SpriteCanvas(args, context);
-cppu::acquire(p);
+rtl::Reference p = new 
vclcanvas::SpriteCanvas(args, context);
+cppu::acquire(p.get());
 p->initialize();
-return static_cast(p);
+return static_cast(p.get());
 }
 
 /* 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: accessibility/inc accessibility/source

[Noel (via logerrit)]

 accessibility/inc/extended/AccessibleBrowseBoxBase.hxx|2 
 accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx|2 
 accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx  |2 
 accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx   |2 
 accessibility/inc/extended/AccessibleGridControlBase.hxx  |3 -
 accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx|2 
 accessibility/inc/extended/AccessibleGridControlTable.hxx |7 --
 accessibility/inc/extended/AccessibleGridControlTableCell.hxx |2 
 accessibility/source/extended/AccessibleBrowseBox.cxx |2 
 accessibility/source/extended/AccessibleBrowseBoxBase.cxx |4 -
 accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx |4 -
 accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx   |4 -
 accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx|4 -
 accessibility/source/extended/AccessibleGridControl.cxx   |   12 
 accessibility/source/extended/AccessibleGridControlBase.cxx   |4 -
 accessibility/source/extended/AccessibleGridControlHeader.cxx |8 +-
 accessibility/source/extended/AccessibleGridControlHeaderCell.cxx |4 -
 accessibility/source/extended/AccessibleGridControlTable.cxx  |   28 
--
 accessibility/source/extended/AccessibleGridControlTableCell.cxx  |4 -
 accessibility/source/extended/accessibleiconchoicectrlentry.cxx   |5 -
 accessibility/source/extended/accessiblelistbox.cxx   |4 -
 accessibility/source/extended/accessiblelistboxentry.cxx  |7 +-
 accessibility/source/extended/accessibletabbar.cxx|   11 +--
 accessibility/source/extended/accessibletabbarpage.cxx|9 +--
 accessibility/source/extended/accessibletabbarpagelist.cxx|9 +--
 accessibility/source/extended/textwindowaccessibility.cxx |5 -
 accessibility/source/helper/acc_factory.cxx   |2 
 accessibility/source/standard/accessiblemenubasecomponent.cxx |7 +-
 accessibility/source/standard/accessiblemenucomponent.cxx |6 --
 accessibility/source/standard/accessiblemenuitemcomponent.cxx |4 -
 accessibility/source/standard/vclxaccessiblebox.cxx   |2 
 accessibility/source/standard/vclxaccessiblebutton.cxx|5 -
 accessibility/source/standard/vclxaccessiblecheckbox.cxx  |5 -
 accessibility/source/standard/vclxaccessibleheaderbaritem.cxx |9 +--
 accessibility/source/standard/vclxaccessiblelistitem.cxx  |   11 +--
 accessibility/source/standard/vclxaccessiblemenuitem.cxx  |7 +-
 accessibility/source/standard/vclxaccessibleradiobutton.cxx   |5 -
 accessibility/source/standard/vclxaccessiblestatusbaritem.cxx |   11 +--
 accessibility/source/standard/vclxaccessibletabpage.cxx   |   11 +--
 accessibility/source/standard/vclxaccessibletextcomponent.cxx |2 
 accessibility/source/standard/vclxaccessibletoolbox.cxx   |2 
 accessibility/source/standard/vclxaccessibletoolboxitem.cxx   |   11 +--
 42 files changed, 99 insertions(+), 151 deletions(-)

New commits:
commit 18aafdd0f936ab6bb4225447a328f5471d143b0d
Author: Noel 
AuthorDate: Mon Feb 22 10:46:47 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon Feb 22 13:39:58 2021 +0100

loplugin:refcounting in accessibility

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

diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx 
b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
index ea2a011723f3..7f7788fe3d35 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx
@@ -254,7 +254,7 @@ protected:
 may overwrite this method and add more states.
 @attention  This method requires locked mutex's.
 @return  A filled AccessibleStateSetHelper. */
-virtual ::utl::AccessibleStateSetHelper* implCreateStateSetHelper();
+virtual rtl::Reference<::utl::AccessibleStateSetHelper> 
implCreateStateSetHelper();
 
 // internal helper methods
 
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx 
b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
index 0ad34ba18ede..a550eed5e220 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
@@ -39,7 +39,7 @@ namespace accessibility
 
 virtual ~AccessibleCheckBoxCell() override {}
 
-virtual ::utl::AccessibleStateSetHelper* implCreateStateSetHelper() 
override;
+virtual rtl::Reference<::utl::AccessibleStateSetHelper> 
implCreateStateSetHelper() override;
 
 publi

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

[Noel (via logerrit)]

 connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx |   38 
 connectivity/source/commontools/TColumnsHelper.cxx |2 
 connectivity/source/commontools/TDatabaseMetaDataBase.cxx  |5 -
 connectivity/source/commontools/TIndexColumns.cxx  |   21 ++--
 connectivity/source/commontools/TIndexes.cxx   |3 
 connectivity/source/commontools/TKeyColumns.cxx|   25 ++---
 connectivity/source/commontools/TKeys.cxx  |6 -
 connectivity/source/commontools/dbtools.cxx|9 --
 connectivity/source/commontools/dbtools2.cxx   |3 
 connectivity/source/commontools/parameters.cxx |9 --
 connectivity/source/commontools/predicateinput.cxx |2 
 connectivity/source/cpool/ZPoolCollection.cxx  |6 -
 connectivity/source/drivers/calc/CConnection.cxx   |6 -
 connectivity/source/drivers/calc/CDatabaseMetaData.cxx |7 -
 connectivity/source/drivers/calc/CDriver.cxx   |5 -
 connectivity/source/drivers/calc/CTable.cxx|5 -
 connectivity/source/drivers/calc/CTables.cxx   |5 -
 connectivity/source/drivers/component/CDatabaseMetaData.cxx|   10 --
 connectivity/source/drivers/dbase/DConnection.cxx  |7 -
 connectivity/source/drivers/dbase/DDatabaseMetaData.cxx|   15 +--
 connectivity/source/drivers/dbase/DDriver.cxx  |5 -
 connectivity/source/drivers/dbase/DIndexes.cxx |2 
 connectivity/source/drivers/dbase/DTable.cxx   |4 
 connectivity/source/drivers/dbase/DTables.cxx  |5 -
 connectivity/source/drivers/file/FColumns.cxx  |3 
 connectivity/source/drivers/file/FConnection.cxx   |3 
 connectivity/source/drivers/file/FDatabaseMetaData.cxx |   19 +---
 connectivity/source/drivers/file/FDriver.cxx   |5 -
 connectivity/source/drivers/firebird/DatabaseMetaData.cxx  |   45 
--
 connectivity/source/drivers/firebird/Driver.cxx|5 -
 connectivity/source/drivers/flat/EConnection.cxx   |   16 +--
 connectivity/source/drivers/flat/EDatabaseMetaData.cxx |   10 --
 connectivity/source/drivers/flat/EDriver.cxx   |5 -
 connectivity/source/drivers/flat/ETable.cxx|5 -
 connectivity/source/drivers/flat/ETables.cxx   |5 -
 connectivity/source/drivers/hsqldb/HDriver.cxx |2 
 connectivity/source/drivers/hsqldb/HTable.cxx  |9 --
 connectivity/source/drivers/hsqldb/HTables.cxx |3 
 connectivity/source/drivers/hsqldb/HUsers.cxx  |3 
 connectivity/source/drivers/hsqldb/HViews.cxx  |3 
 connectivity/source/drivers/jdbc/DatabaseMetaData.cxx  |2 
 connectivity/source/drivers/jdbc/JConnection.cxx   |6 -
 connectivity/source/drivers/jdbc/JDriver.cxx   |2 
 connectivity/source/drivers/mysql_jdbc/YTable.cxx  |   11 +-
 connectivity/source/drivers/mysql_jdbc/YTables.cxx |7 -
 connectivity/source/drivers/mysql_jdbc/YUsers.cxx  |6 -
 connectivity/source/drivers/mysql_jdbc/YViews.cxx  |2 
 connectivity/source/drivers/mysqlc/mysqlc_driver.cxx   |5 -
 connectivity/source/drivers/odbc/ODatabaseMetaData.cxx |   37 
 connectivity/source/drivers/odbc/ODriver.cxx   |5 -
 connectivity/source/drivers/odbc/OPreparedStatement.cxx|4 
 connectivity/source/drivers/odbc/OStatement.cxx|4 
 connectivity/source/drivers/writer/WConnection.cxx |7 -
 connectivity/source/drivers/writer/WDatabaseMetaData.cxx   |8 -
 connectivity/source/drivers/writer/WDriver.cxx |5 -
 connectivity/source/drivers/writer/WTable.cxx  |5 -
 connectivity/source/drivers/writer/WTables.cxx |   12 +-
 connectivity/source/inc/odbc/OPreparedStatement.hxx|2 
 connectivity/source/inc/odbc/OStatement.hxx|2 
 connectivity/source/parse/PColumn.cxx  |6 -
 connectivity/source/parse/sqliterator.cxx  |   41 -
 connectivity/source/sdbcx/VColumn.cxx  |3 
 connectivity/source/sdbcx/VTable.cxx   |2 
 include/connectivity/PColumn.hxx   |2 
 64 files changed, 227 insertions(+), 305 deletions(-)

New commits:
commit dffe94959ada5297c7c719497395f5dfe66c4d2f
Author: Noel 
AuthorDate: Mon Feb 22 10:48:51 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon Feb 22 13:37:53 2021 +0100

loplugin:refcounting in connectivity

  

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

[Caolán McNamara (via logerrit)]

 svx/source/tbxctrls/colrctrl.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 2a8e84448ce2a5603f9134ee830c389dbc4fd6b6
Author: Caolán McNamara 
AuthorDate: Mon Feb 22 10:59:12 2021 +
Commit: Caolán McNamara 
CommitDate: Mon Feb 22 13:33:26 2021 +0100

drop stray printf

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

diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 68d7a36c59c7..d6817c94402b 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -227,8 +227,6 @@ SvxColorDockingWindow::SvxColorDockingWindow(SfxBindings* 
_pBindings, SfxChildWi
 aItemSize.setHeight( aItemSize.Height() + 
SvxColorValueSet::getEntryEdgeLength() );
 aItemSize.setHeight( aItemSize.Height() / 2 );
 
-fprintf(stderr, "size is %" SAL_PRIdINT64 " %" SAL_PRIdINT64 "\n", 
sal_Int64(aItemSize.Width()), sal_Int64(aItemSize.Height()));
-
 if (_pBindings != nullptr)
 StartListening(*_pBindings, DuplicateHandling::Prevent);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

 vcl/qa/cppunit/BitmapTest.cxx |   65 +
 vcl/source/bitmap/bitmappaint.cxx |  140 +-
 2 files changed, 173 insertions(+), 32 deletions(-)

New commits:
commit e74c9a340ffa34d8d0a7c5bd728148462254a243
Author: Luboš Luňák 
AuthorDate: Fri Feb 19 13:21:52 2021 +0100
Commit: Luboš Luňák 
CommitDate: Mon Feb 22 13:00:03 2021 +0100

optimize Bitmap::Mirror()

For the usual bitmap pixel formats it's much faster to just move
around pixel data rather than call the pixel-set/get functions.

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

diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx
index 0c96977a880a..e6c95d27b954 100644
--- a/vcl/qa/cppunit/BitmapTest.cxx
+++ b/vcl/qa/cppunit/BitmapTest.cxx
@@ -45,6 +45,7 @@ class BitmapTest : public CppUnit::TestFixture
 void testOctree();
 void testEmptyAccess();
 void testDitherSize();
+void testMirror();
 
 CPPUNIT_TEST_SUITE(BitmapTest);
 CPPUNIT_TEST(testCreation);
@@ -61,6 +62,7 @@ class BitmapTest : public CppUnit::TestFixture
 CPPUNIT_TEST(testOctree);
 CPPUNIT_TEST(testEmptyAccess);
 CPPUNIT_TEST(testDitherSize);
+CPPUNIT_TEST(testMirror);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -682,6 +684,69 @@ void BitmapTest::testDitherSize()
 }
 }
 
+void BitmapTest::testMirror()
+{
+for (int bpp : { 4, 8, 24, 32 })
+{
+Bitmap bitmap(Size(11, 11), bpp);
+{
+bitmap.Erase(COL_MAGENTA);
+BitmapWriteAccess write(bitmap);
+if (write.HasPalette())
+{
+// Note that SetPixel() and GetColor() take arguments as Y,X.
+write.SetPixel(0, 0, 
BitmapColor(write.GetBestPaletteIndex(COL_BLACK)));
+write.SetPixel(10, 0, 
BitmapColor(write.GetBestPaletteIndex(COL_WHITE)));
+write.SetPixel(0, 10, 
BitmapColor(write.GetBestPaletteIndex(COL_RED)));
+write.SetPixel(10, 10, 
BitmapColor(write.GetBestPaletteIndex(COL_BLUE)));
+write.SetPixel(5, 0, 
BitmapColor(write.GetBestPaletteIndex(COL_GREEN)));
+write.SetPixel(0, 5, 
BitmapColor(write.GetBestPaletteIndex(COL_YELLOW)));
+}
+else
+{
+write.SetPixel(0, 0, COL_BLACK);
+write.SetPixel(10, 0, COL_WHITE);
+write.SetPixel(0, 10, COL_RED);
+write.SetPixel(10, 10, COL_BLUE);
+write.SetPixel(5, 0, COL_GREEN);
+write.SetPixel(0, 5, COL_YELLOW);
+}
+}
+bitmap.Mirror(BmpMirrorFlags::Horizontal);
+{
+BitmapReadAccess read(bitmap);
+CPPUNIT_ASSERT_EQUAL(BitmapColor(COL_BLACK), read.GetColor(0, 10));
+CPPUNIT_ASSERT_EQUAL(BitmapColor(COL_WHITE), read.GetColor(10, 
10));
+CPPUNIT_ASSERT_EQUAL(BitmapColor(COL_RED), read.GetColor(0, 0));
+CPPUNIT_ASSERT_EQUAL(BitmapColor(COL_BLUE), read.GetColor(10, 0));
+CPPUNIT_ASSERT_EQUAL(BitmapColor(COL_GREEN), read.GetColor(5, 10));
+CPPUNIT_ASSERT_EQUAL(BitmapColor(COL_YELLOW), read.GetColor(0, 5));
+}
+bitmap.Mirror(BmpMirrorFlags::Vertical);
+{
+BitmapReadAccess read(bitmap);
+// Now is effectively mirrored in both directions.
+CPPUNIT_ASSERT_EQUAL(BitmapColor(COL_BLACK), read.GetColor(10, 
10));
+CPPUNIT_ASSERT_EQUAL(BitmapColor(COL_WHITE), read.GetColor(0, 10));
+CPPUNIT_ASSERT_EQUAL(BitmapColor(COL_RED), read.GetColor(10, 0));
+CPPUNIT_ASSERT_EQUAL(BitmapColor(COL_BLUE), read.GetColor(0, 0));
+CPPUNIT_ASSERT_EQUAL(BitmapColor(COL_GREEN), read.GetColor(5, 10));
+CPPUNIT_ASSERT_EQUAL(BitmapColor(COL_YELLOW), read.GetColor(10, 
5));
+}
+bitmap.Mirror(BmpMirrorFlags::Vertical | BmpMirrorFlags::Horizontal);
+{
+BitmapReadAccess read(bitmap);
+// Now is back the original.
+CPPUNIT_ASSERT_EQUAL(BitmapColor(COL_BLACK), read.GetColor(0, 0));
+CPPUNIT_ASSERT_EQUAL(BitmapColor(COL_WHITE), read.GetColor(10, 0));
+CPPUNIT_ASSERT_EQUAL(BitmapColor(COL_RED), read.GetColor(0, 10));
+CPPUNIT_ASSERT_EQUAL(BitmapColor(COL_BLUE), read.GetColor(10, 10));
+CPPUNIT_ASSERT_EQUAL(BitmapColor(COL_GREEN), read.GetColor(5, 0));
+CPPUNIT_ASSERT_EQUAL(BitmapColor(COL_YELLOW), read.GetColor(0, 5));
+}
+}
+}
+
 } // namespace
 
 CPPUNIT_TEST_SUITE_REGISTRATION(BitmapTest);
diff --git a/vcl/source/bitmap/bitmappaint.cxx 
b/vcl/source/bitmap/bitmappaint.cxx
index b69972788746..ad20832022d5 100644
--- a/vcl/source/bitmap/bitmappaint.cxx
+++ b/vcl/source/bitmap/bitmappaint.cxx
@@ -105,6 +105,28 @@ bool Bitmap

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

[Marco Cecchetti (via logerrit)]

 filter/source/svg/presentation_engine.js |  125 +++
 filter/source/svg/svgexport.cxx  |6 +
 2 files changed, 83 insertions(+), 48 deletions(-)

New commits:
commit 7019b492fa3057155528ac7aa6ef3f6fc9de4aff
Author: Marco Cecchetti 
AuthorDate: Fri Feb 19 16:04:07 2021 +0100
Commit: Andras Timar 
CommitDate: Mon Feb 22 12:20:42 2021 +0100

filter: svg: js engine: misplaced text: improving text field handling

Change-Id: I8b5f9a39b3cd3fcfdae0d088eae0a875cf9404ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111065
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/filter/source/svg/presentation_engine.js 
b/filter/source/svg/presentation_engine.js
index 76bd4d41b12d..7f3cb48bcfbf 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -5589,68 +5589,99 @@ PlaceholderShape.prototype.isValid = function()
  */
 PlaceholderShape.prototype.init = function()
 {
-
 var aTextFieldElement = getElementByClassName( 
this.masterPage.backgroundObjects, this.className );
 if( aTextFieldElement )
 {
-var aPlaceholderElement = getElementByClassName( aTextFieldElement, 
'PlaceholderText' );
-if( aPlaceholderElement )
+var aTextElem = getElementByClassName( aTextFieldElement, 
'SVGTextShape' );
+if( aTextElem )
 {
-// Each text field element has an invisible rectangle that can be
-// regarded as the text field bounding box.
-// We exploit such a feature and the exported text adjust attribute
-// value in order to set up correctly the position and text
-// adjustment for the placeholder element.
-var aSVGRectElem = getElementByClassName( aTextFieldElement, 
'BoundingBox' );
-if( aSVGRectElem )
+var aPlaceholderElement = getElementByClassName(aTextElem, 
'PlaceholderText');
+if( aPlaceholderElement )
 {
-var aRect = new Rectangle( aSVGRectElem );
-var sTextAdjust = getOOOAttribute( aTextFieldElement, 
aOOOAttrTextAdjust ) || 'left';
-var sTextAnchor, sX;
-if( sTextAdjust == 'left' )
-{
-sTextAnchor = 'start';
-sX = String( aRect.left );
-}
-else if( sTextAdjust == 'right' )
-{
-sTextAnchor = 'end';
-sX = String( aRect.right );
-}
-else if( sTextAdjust == 'center' )
+// SVG 1.1 does not support text wrapping wrt a rectangle.
+// When a text shape contains a placeholder, setting up the 
position
+// of each text line doesn't work since the position is 
computed
+// before replacing the placeholder text.
+// Anyway each text shape has an invisible rectangle that can 
be
+// regarded as the text shape bounding box.
+// We exploit such a feature and the exported text adjust 
attribute
+// value in order to set up correctly the position and text
+// adjustment for the text shape content.
+// We assume that once the real value has been substituted to
+// the placeholder the resulting content is no more than a 
single line.
+// So we remove from  elements used for setting up the
+// position of text lines (class TextPosition) the 'x' and 'y' 
attribute.
+// In the general case we would need to implement a function
+// which is able to compute at which words the text shape 
content has
+// to be wrapped.
+var aSVGRectElem = getElementByClassName( aTextFieldElement, 
'BoundingBox' );
+if( aSVGRectElem )
 {
-sTextAnchor = 'middle';
-var nMiddle = ( aRect.left + aRect.right ) / 2;
-sX = String( parseInt( String( nMiddle ) ) );
+var aRect = new Rectangle( aSVGRectElem );
+var sTextAdjust = getOOOAttribute( aTextFieldElement, 
aOOOAttrTextAdjust );
+// the bbox of the text shape is indeed a bit larger, 
there is a bit of internal padding
+var nMargin = 250; // 1000th mm
+var sTextAnchor, sX;
+if( sTextAdjust == 'left' )
+{
+sTextAnchor = 'start';
+sX = String( Math.trunc( aRect.left + nMargin ) );
+}
+else if( sTextAdjust == 'right' )
+{
+sTextAnchor = 'end';
+sX = String( Math.trunc( aRect.right - nMargin ) );
+}
+  

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

[Marco Cecchetti (via logerrit)]

 filter/source/svg/presentation_engine.js |4 ++--
 filter/source/svg/svgexport.cxx  |2 ++
 filter/source/svg/svgwriter.cxx  |2 +-
 sd/qa/unit/SVGExportTests.cxx|   12 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

New commits:
commit 14d6f3ec3b0a3d39b491068ca9c32751c07e5428
Author: Marco Cecchetti 
AuthorDate: Wed Feb 17 13:21:07 2021 +0100
Commit: Andras Timar 
CommitDate: Mon Feb 22 12:18:40 2021 +0100

filter: svg: export: renaming class attributes related to TextShape

TextShape => SVGTextShape
com.sun.star.drawing.TextShape => TextShape

Change-Id: I4bbb465e0f65aa328527ac3022c0b68546fb5db6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111224
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/filter/source/svg/presentation_engine.js 
b/filter/source/svg/presentation_engine.js
index 1ab4e5eac01b..76bd4d41b12d 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -5371,7 +5371,7 @@ function getTextFieldType ( elem )
 {
 var sFieldType = null;
 var sClass = elem.getAttribute('class');
-if( sClass.endsWith( 'TextShape' ) )
+if( sClass == 'TextShape' )
 {
 var aPlaceholderElement = getElementByClassName( elem, 
'PlaceholderText' );
 if (aPlaceholderElement)
@@ -14725,7 +14725,7 @@ function AnimatedTextElement( aElement, 
aEventMultiplexer )
 }
 var aTextShapeElement = aElement.parentNode;
 sTextType = aTextShapeElement.getAttribute( 'class' );
-if( sTextType !== 'TextShape' )
+if( sTextType !== 'SVGTextShape' )
 {
 log( 'AnimatedTextElement: element parent is not a text shape.' );
 return;
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 50d328371eaf..ef13ab4884d9 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -2583,6 +2583,8 @@ OUString SVGFilter::implGetClassFromShape( const 
Reference< css::drawing::XShape
 aRet = "Graphic";
 else if( aShapeType.lastIndexOf( "drawing.OLE2Shape" ) != -1 )
 aRet = "OLE2";
+else if( aShapeType.lastIndexOf( "drawing.TextShape" ) != -1 )
+aRet = "TextShape";
 else if( aShapeType.lastIndexOf( "presentation.HeaderShape" ) != -1 )
 aRet = "Header";
 else if( aShapeType.lastIndexOf( "presentation.FooterShape" ) != -1 )
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 39bd446a31b0..95980ce9b932 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1250,7 +1250,7 @@ void SVGTextWriter::startTextShape()
 {
 mbIsTextShapeStarted = true;
 maParentFont = vcl::Font();
-mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "TextShape" );
+mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "SVGTextShape" );
 
 // if text is rotated, set transform matrix at text element
 const vcl::Font& rFont = mpVDev->GetFont();
diff --git a/sd/qa/unit/SVGExportTests.cxx b/sd/qa/unit/SVGExportTests.cxx
index 0b4cc8f52e6a..bf54df519a6a 100644
--- a/sd/qa/unit/SVGExportTests.cxx
+++ b/sd/qa/unit/SVGExportTests.cxx
@@ -165,11 +165,11 @@ public:
 assertXPath(svgDoc, MAKE_PATH_STRING( /SVG_SVG/SVG_G[2] ), "class", 
"SlideGroup");
 assertXPath(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G ), "class", "Slide");
 assertXPath(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[1] ), "class", "TitleText");
-assertXPath(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[1]/SVG_G/SVG_TEXT ), "class", 
"TextShape");
+assertXPath(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[1]/SVG_G/SVG_TEXT ), "class", 
"SVGTextShape");
 assertXPath(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[1]/SVG_G/SVG_TEXT/SVG_TSPAN ), 
"class", "TextParagraph");
 assertXPath(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[1]/SVG_G/SVG_TEXT/SVG_TSPAN ), 
"text-decoration", "underline");
 
-assertXPath(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[2]/SVG_G/SVG_TEXT ), "class", 
"TextShape");
+assertXPath(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[2]/SVG_G/SVG_TEXT ), "class", 
"SVGTextShape");
 assertXPath(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[2]/SVG_G/SVG_TEXT/SVG_TSPAN ), 
"class", "TextParagraph");
 assertXPath(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[2]/SVG_G/SVG_TEXT/SVG_TSPAN ), 
"text-decoration", "line-through");
 }
@@ -208,19 +208,19 @@ public:
 assertXPath(svgDoc, MAKE_PATH_STRING( /SVG_SVG/SVG_DEFS[9]/SVG_G[2] ), 
"class", "Master_Slide");
 assertXPath(svgDo

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

[Marco Cecchetti (via logerrit)]

 sd/qa/unit/SVGExportTests.cxx |   58 ++
 1 file changed, 58 insertions(+)

New commits:
commit 185f3117e8090f796dd437899bcf02c024e6af72
Author: Marco Cecchetti 
AuthorDate: Wed Feb 17 23:46:23 2021 +0100
Commit: Andras Timar 
CommitDate: Mon Feb 22 12:15:53 2021 +0100

filter: svg: unit test for placeholder locale

We set the language to it-IT and check that the exported placeholder
text is still  instead of 

Change-Id: I7ec7e25e53075da38cb87d81e9f8268b37121bfe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/15
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/sd/qa/unit/SVGExportTests.cxx b/sd/qa/unit/SVGExportTests.cxx
index 8401d85591a8..0b4cc8f52e6a 100644
--- a/sd/qa/unit/SVGExportTests.cxx
+++ b/sd/qa/unit/SVGExportTests.cxx
@@ -15,6 +15,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 #include 
 
@@ -66,6 +69,29 @@ static bool isValidTiledBackgroundId(const OUString& sId)
 
 class SdSVGFilterTest : public test::BootstrapFixture, public 
unotest::MacrosTest, public XmlTestTools
 {
+class Resetter
+{
+private:
+std::function m_Func;
+
+public:
+Resetter(std::function const& rFunc)
+: m_Func(rFunc)
+{
+}
+~Resetter()
+{
+try
+{
+m_Func();
+}
+catch (...) // has to be reliable
+{
+CPPUNIT_FAIL("resetter failed with exception");
+}
+}
+};
+
 uno::Reference mxComponent;
 utl::TempFile maTempFile;
 
@@ -279,6 +305,37 @@ public:
 CPPUNIT_ASSERT_EQUAL_MESSAGE("The href attribute for  does not 
match the tiled background id attribute: ", sBackgroundId, sRef);
 }
 
+void testSVGPlaceholderLocale()
+{
+static const OUString aLangISO("it-IT");
+SvtSysLocaleOptions aSysLocaleOptions;
+aSysLocaleOptions.SetLocaleConfigString(aLangISO);
+aSysLocaleOptions.SetUILocaleConfigString(aLangISO);
+
+auto aSavedSettings = Application::GetSettings();
+Resetter aResetter([&]() { Application::SetSettings(aSavedSettings); 
});
+AllSettings aSettings(aSavedSettings);
+aSettings.SetLanguageTag(aLangISO, true);
+Application::SetSettings(aSettings);
+
+executeExport("text-fields.odp");
+
+xmlDocPtr svgDoc = parseXml(maTempFile);
+CPPUNIT_ASSERT(svgDoc);
+
+assertXPath(svgDoc, MAKE_PATH_STRING( /SVG_SVG/SVG_DEFS[9]/SVG_G[2] ), 
"class", "Master_Slide");
+assertXPath(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2] ), "class", "BackgroundObjects");
+
+// Slide Name Field
+assertXPath(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[6] ), "class", "TextShape");
+assertXPath(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[6]/SVG_G/SVG_TEXT/SVG_TSPAN/SVG_TSPAN/SVG_TSPAN
 ), "class", "PlaceholderText");
+assertXPathContent(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[6]/SVG_G/SVG_TEXT/SVG_TSPAN/SVG_TSPAN/SVG_TSPAN
 ), "");
+// Slide Number Field
+assertXPath(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[7] ), "class", "TextShape");
+assertXPath(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[7]/SVG_G/SVG_TEXT/SVG_TSPAN/SVG_TSPAN/SVG_TSPAN
 ), "class", "PlaceholderText");
+assertXPathContent(svgDoc, MAKE_PATH_STRING( 
/SVG_SVG/SVG_DEFS[9]/SVG_G[2]/SVG_G[2]/SVG_G[7]/SVG_G/SVG_TEXT/SVG_TSPAN/SVG_TSPAN/SVG_TSPAN
 ), "");
+}
+
 CPPUNIT_TEST_SUITE(SdSVGFilterTest);
 CPPUNIT_TEST(testSVGExportTextDecorations);
 CPPUNIT_TEST(testSVGExportJavascriptURL);
@@ -286,6 +343,7 @@ public:
 CPPUNIT_TEST(testSVGExportTextFieldsInMasterPage);
 CPPUNIT_TEST(testSVGExportSlideBitmapBackground);
 CPPUNIT_TEST(testSVGExportSlideTileBitmapBackground);
+CPPUNIT_TEST(testSVGPlaceholderLocale);
 CPPUNIT_TEST_SUITE_END();
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 extensions/source/bibliography/general.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dec32864a61104001cb6ff63c218ea5fb2a7ab1e
Author: Caolán McNamara 
AuthorDate: Mon Feb 22 09:26:15 2021 +
Commit: Caolán McNamara 
CommitDate: Mon Feb 22 11:51:33 2021 +0100

cid#1473244 silence Unchecked return value

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

diff --git a/extensions/source/bibliography/general.cxx 
b/extensions/source/bibliography/general.cxx
index 5cadd05bc3a2..1b712259f80a 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -344,7 +344,7 @@ IMPL_LINK(BibGeneralPage, LastElementKeyInputHdl, const 
KeyEvent&, rKeyEvent, bo
 xUpdateCursor->moveToInsertRow();
 }
 else
-xRowSet->next();
+(void)xRowSet->next();
 }
 xIdentifierED->grab_focus();
 xIdentifierED->select_region(0, -1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann (via logerrit)]

 toolkit/source/awt/vclxtoolkit.cxx |   19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 0e9af8b2a6f8b740f5680201f35c128732ed357c
Author: Stephan Bergmann 
AuthorDate: Mon Feb 22 10:41:23 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Feb 22 11:34:40 2021 +0100

Adapt to changed CreateWindow signature

...in 197bcde5c4d771ace11962213c11c9763be11039 "loplugin:refcounting in
svtools", see UBSan

> toolkit/source/awt/vclxtoolkit.cxx:1912:22: runtime error: call to 
function CreateWindow through pointer to incorrect function type 'vcl::Window 
*(*)(VCLXWindow **, const com::sun::star::awt::WindowDescriptor *, vcl::Window 
*, long)'
> svtools/source/uno/unoiface.cxx:29: note: CreateWindow defined here
>  #0 in (anonymous 
namespace)::VCLXToolkit::ImplCreateWindow(com::sun::star::awt::WindowDescriptor 
const&, MessBoxStyle) at toolkit/source/awt/vclxtoolkit.cxx:1912:22

during CppunitTest_toolkit

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

diff --git a/toolkit/source/awt/vclxtoolkit.cxx 
b/toolkit/source/awt/vclxtoolkit.cxx
index 31991a09fa17..11f04d9dc0cd 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -55,6 +55,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -397,7 +398,7 @@ Size MessBox::GetOptimalSize() const
 namespace {
 
 extern "C" typedef vcl::Window* (*FN_SvtCreateWindow)(
-VCLXWindow** ppNewComp,
+rtl::Reference* ppNewComp,
 const css::awt::WindowDescriptor* pDescriptor,
 vcl::Window* pParent,
 WinBits nWinBits );
@@ -468,7 +469,7 @@ protected:
 
 virtual void SAL_CALL disposing() override;
 
-static vcl::Window* ImplCreateWindow( VCLXWindow** ppNewComp, const 
css::awt::WindowDescriptor& rDescriptor, vcl::Window* pParent,
+static vcl::Window* ImplCreateWindow( rtl::Reference* 
ppNewComp, const css::awt::WindowDescriptor& rDescriptor, vcl::Window* pParent,
  WinBits nWinBits, MessBoxStyle nMessBoxStyle );
 css::uno::Reference< css::awt::XWindowPeer > ImplCreateWindow( const 
css::awt::WindowDescriptor& Descriptor,
  MessBoxStyle nForceMessBoxStyle );
@@ -1393,7 +1394,7 @@ void SVTXRoadmap::ImplGetPropertyIds( std::vector< 
sal_uInt16 > &rIds )
 VCLXGraphicControl::ImplGetPropertyIds( rIds );
 }
 
-vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
+vcl::Window* VCLXToolkit::ImplCreateWindow( rtl::Reference* 
ppNewComp,
 const css::awt::WindowDescriptor& rDescriptor,
 vcl::Window* pParent, WinBits nWinBits, MessBoxStyle nMessBoxStyle )
 {
@@ -1463,7 +1464,7 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** 
ppNewComp,
 pNewWindow = VclPtr::Create( pParent, nWinBits 
);
 
static_cast(pNewWindow.get())->EnableEmptyFieldValue( true );
 *ppNewComp = new VCLXNumericField;
-
static_cast(*ppNewComp)->SetFormatter( 
static_cast(static_cast(pNewWindow.get())) );
+
static_cast((*ppNewComp).get())->SetFormatter( 
static_cast(static_cast(pNewWindow.get())) );
 break;
 case WindowType::DATEBOX:
 pNewWindow = VclPtr::Create( pParent, nWinBits );
@@ -1546,7 +1547,7 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** 
ppNewComp,
 case WindowType::METRICFIELD:
 pNewWindow = VclPtr::Create( pParent, nWinBits );
 *ppNewComp = new VCLXMetricField;
-
static_cast(*ppNewComp)->SetFormatter( 
static_cast(static_cast(pNewWindow.get())) );
+
static_cast((*ppNewComp).get())->SetFormatter( 
static_cast(static_cast(pNewWindow.get())) );
 break;
 case WindowType::DIALOG:
 case WindowType::MODELESSDIALOG:
@@ -1587,7 +1588,7 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** 
ppNewComp,
 case WindowType::PATTERNFIELD:
 pNewWindow = VclPtr::Create( pParent, nWinBits );
 *ppNewComp = new VCLXPatternField;
-
static_cast(*ppNewComp)->SetFormatter( 
static_cast(static_cast(pNewWindow.get())) );
+
static_cast((*ppNewComp).get())->SetFormatter( 
static_cast(static_cast(pNewWindow.get())) );
 break;
 case WindowType::PUSHBUTTON:
 pNewWindow = VclPtr::Create( pParent, nWinBits );
@@ -1660,7 +1661,7 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** 
ppNewComp,
 pNewWindow = VclPtr::Create( pParent, nWinBits );
 
static_cast(pNewWindow.get())->EnableEmptyFieldValue( true );
 *ppNewComp = new VCLXTimeField;
-
static_cast(

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

[Noel (via logerrit)]

 desktop/source/deployment/manager/dp_extensionmanager.cxx   |5 ++---
 desktop/source/deployment/manager/dp_manager.cxx|5 ++---
 desktop/source/deployment/registry/dp_registry.cxx  |7 +++
 desktop/source/deployment/registry/sfwk/dp_sfwk.cxx |6 ++
 desktop/source/migration/services/oo3extensionmigration.cxx |7 +++
 5 files changed, 12 insertions(+), 18 deletions(-)

New commits:
commit f0c0796cb9a1dba9e03f6ce863ac96e596b04981
Author: Noel 
AuthorDate: Mon Feb 22 10:47:59 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon Feb 22 11:08:55 2021 +0100

loplugin:refcounting in desktop

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

diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx 
b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 2a17e2d6860c..63882cefdfd3 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -696,12 +696,11 @@ Reference 
ExtensionManager::addExtension(
 //check again dependencies but prevent user interaction,
 //We can disregard the license, because the user must have 
already
 //accepted it, when we called checkPrerequisites the first time
-SilentCheckPrerequisitesCommandEnv * pSilentCommandEnv =
+rtl::Reference 
pSilentCommandEnv =
 new SilentCheckPrerequisitesCommandEnv();
-Reference 
silentCommandEnv(pSilentCommandEnv);
 
 sal_Int32 failedPrereq = xTmpExtension->checkPrerequisites(
-xAbortChannel, silentCommandEnv, true);
+xAbortChannel, pSilentCommandEnv, true);
 if (failedPrereq == 0)
 {
 xNewExtension = xPackageManager->addPackage(
diff --git a/desktop/source/deployment/manager/dp_manager.cxx 
b/desktop/source/deployment/manager/dp_manager.cxx
index 5ff55abe6b33..bd68c26a9512 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -340,9 +340,8 @@ Reference 
PackageManagerImpl::create(
 Reference const & xComponentContext,
 OUString const & context )
 {
-PackageManagerImpl * that = new PackageManagerImpl(
+rtl::Reference that = new PackageManagerImpl(
 xComponentContext, context );
-Reference xPackageManager( that );
 
 OUString logFile, stamp;
 if ( context == "user" ) {
@@ -433,7 +432,7 @@ Reference 
PackageManagerImpl::create(
 that->initRegistryBackends();
 that->initActivationLayer( xCmdEnv );
 
-return xPackageManager;
+return that;
 
 }
 catch (const RuntimeException &) {
diff --git a/desktop/source/deployment/registry/dp_registry.cxx 
b/desktop/source/deployment/registry/dp_registry.cxx
index 90248158056a..a061aa4382dc 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -273,8 +273,7 @@ Reference 
PackageRegistryImpl::create(
 OUString const & cachePath,
 Reference const & xComponentContext )
 {
-PackageRegistryImpl * that = new PackageRegistryImpl;
-Reference xRet(that);
+rtl::Reference that = new PackageRegistryImpl;
 
 // auto-detect all registered package registries:
 Reference xEnum(
@@ -325,7 +324,7 @@ Reference 
PackageRegistryImpl::create(
 "cannot instantiate PackageRegistryBackend service: "
 + Reference(
 element, UNO_QUERY_THROW )->getImplementationName(),
-static_cast(that) );
+static_cast(that.get()) );
 }
 
 that->insertBackend( xBackend );
@@ -407,7 +406,7 @@ Reference 
PackageRegistryImpl::create(
 }
 #endif
 
-return xRet;
+return that;
 }
 
 // XUpdatable: broadcast to backends
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx 
b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index 916a5882c519..758bdf264a18 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -244,17 +244,15 @@ Reference BackendImpl::bindPackage_(
 if (create_ucb_content( &ucb_content, sParcelDescURL,
 xCmdEnv, false /* no throw */ ))
 {
-ParcelDescDocHandler* pHandler =
+rtl::Reference pHandler =
 new ParcelDescDocHandler();
-Reference< xml::sax::XDocumentHandler >
-xDocHandler = pHandler;
 
 Reference
 xContext( getComponentContext() );
 
 Reference< xml::sax::XPars

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

[Miklos Vajna (via logerrit)]

 sw/source/core/text/porfly.hxx  |8 
 sw/source/core/text/porglue.cxx |8 
 sw/source/core/text/porglue.hxx |   18 +-
 sw/source/core/text/portab.hxx  |   10 +-
 sw/source/core/text/txttab.cxx  |   16 
 5 files changed, 30 insertions(+), 30 deletions(-)

New commits:
commit 905f8e51280cc42a81960c9dc6e6102bcbbaa1ca
Author: Miklos Vajna 
AuthorDate: Mon Feb 22 09:05:04 2021 +0100
Commit: Miklos Vajna 
CommitDate: Mon Feb 22 10:20:05 2021 +0100

sw: prefix members of SwFixPortion, SwFlyPortion, SwGluePortion and ...

... SwTabPortion

See tdf#94879 for motivation.

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

diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index 7227c76b95da..480492f7a829 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.hxx
@@ -30,12 +30,12 @@ struct SwCursorMoveState;
 
 class SwFlyPortion : public SwFixPortion
 {
-sal_uInt16 nBlankWidth;
+sal_uInt16 m_nBlankWidth;
 public:
 explicit SwFlyPortion( const SwRect &rFlyRect )
-: SwFixPortion(rFlyRect), nBlankWidth( 0 ) { SetWhichPor( 
PortionType::Fly ); }
-sal_uInt16 GetBlankWidth( ) const { return nBlankWidth; }
-void SetBlankWidth( const sal_uInt16 nNew ) { nBlankWidth = nNew; }
+: SwFixPortion(rFlyRect), m_nBlankWidth( 0 ) { SetWhichPor( 
PortionType::Fly ); }
+sal_uInt16 GetBlankWidth( ) const { return m_nBlankWidth; }
+void SetBlankWidth( const sal_uInt16 nNew ) { m_nBlankWidth = nNew; }
 virtual void Paint( const SwTextPaintInfo &rInf ) const override;
 virtual bool Format( SwTextFormatInfo &rInf ) override;
 };
diff --git a/sw/source/core/text/porglue.cxx b/sw/source/core/text/porglue.cxx
index 84688c69f3f5..7c09ded23a2f 100644
--- a/sw/source/core/text/porglue.cxx
+++ b/sw/source/core/text/porglue.cxx
@@ -26,9 +26,9 @@
 #include 
 
 SwGluePortion::SwGluePortion( const sal_uInt16 nInitFixWidth )
-: nFixWidth( nInitFixWidth )
+: m_nFixWidth( nInitFixWidth )
 {
-PrtWidth( nFixWidth );
+PrtWidth( m_nFixWidth );
 SetWhichPor( PortionType::Glue );
 }
 
@@ -132,14 +132,14 @@ void SwGluePortion::Join( SwGluePortion *pVictim )
  * We're expecting a frame-local SwRect!
  */
 SwFixPortion::SwFixPortion( const SwRect &rRect )
-   :SwGluePortion( sal_uInt16(rRect.Width()) ), nFix( 
sal_uInt16(rRect.Left()) )
+   :SwGluePortion( sal_uInt16(rRect.Width()) ), m_nFix( 
sal_uInt16(rRect.Left()) )
 {
 Height( sal_uInt16(rRect.Height()) );
 SetWhichPor( PortionType::Fix );
 }
 
 SwFixPortion::SwFixPortion()
-   : SwGluePortion(0), nFix(0)
+   : SwGluePortion(0), m_nFix(0)
 {
 SetWhichPor( PortionType::Fix );
 }
diff --git a/sw/source/core/text/porglue.hxx b/sw/source/core/text/porglue.hxx
index c022caddcb36..05f72beb9fb3 100644
--- a/sw/source/core/text/porglue.hxx
+++ b/sw/source/core/text/porglue.hxx
@@ -27,15 +27,15 @@ class SwLineLayout;
 class SwGluePortion : public SwLinePortion
 {
 private:
-sal_uInt16 nFixWidth;
+sal_uInt16 m_nFixWidth;
 public:
 explicit SwGluePortion( const sal_uInt16 nInitFixWidth );
 
 void Join( SwGluePortion *pVictim );
 
 inline tools::Long GetPrtGlue() const;
-sal_uInt16 GetFixWidth() const { return nFixWidth; }
-void SetFixWidth( const sal_uInt16 nNew ) { nFixWidth = nNew; }
+sal_uInt16 GetFixWidth() const { return m_nFixWidth; }
+void SetFixWidth( const sal_uInt16 nNew ) { m_nFixWidth = nNew; }
 void MoveGlue( SwGluePortion *pTarget, const tools::Long nPrtGlue );
 inline void MoveAllGlue( SwGluePortion *pTarget );
 inline void MoveHalfGlue( SwGluePortion *pTarget );
@@ -48,12 +48,12 @@ public:
 
 class SwFixPortion : public SwGluePortion
 {
-sal_uInt16 nFix;// The width offset in the line
+sal_uInt16 m_nFix;// The width offset in the line
 public:
 explicit SwFixPortion( const SwRect &rFlyRect );
 SwFixPortion();
-void   SetFix( const sal_uInt16 nNewFix ) { nFix = nNewFix; }
-sal_uInt16 GetFix() const { return nFix; }
+void   SetFix( const sal_uInt16 nNewFix ) { m_nFix = nNewFix; }
+sal_uInt16 GetFix() const { return m_nFix; }
 };
 
 class SwMarginPortion : public SwGluePortion
@@ -64,13 +64,13 @@ public:
 };
 
 inline tools::Long SwGluePortion::GetPrtGlue() const
-{ return Width() - nFixWidth; }
+{ return Width() - m_nFixWidth; }
 
 // The FixWidth MUST NEVER be larger than the accumulated width!
 inline void SwGluePortion::AdjFixWidth()
 {
-if( nFixWidth > PrtWidth() )
-nFixWidth = PrtWidth();
+if( m_nFixWidth > PrtWidth() )
+m_nFixWidth = PrtWidth();
 }
 
 inline void SwGluePortion::MoveAllGlue( SwGluePortion *pTarget )
diff --git a/sw/source/core/text/portab.hxx b/sw/source/core/text/portab.hxx
index 3c6e7a5df137..d10cd4cd1a

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

[Noel (via logerrit)]

 extensions/source/bibliography/toolbar.cxx   |4 +--
 extensions/source/propctrlr/formcomponenthandler.cxx |   10 -
 extensions/source/propctrlr/propcontroller.cxx   |   20 +--
 extensions/source/scanner/scanunx.cxx|5 +---
 4 files changed, 19 insertions(+), 20 deletions(-)

New commits:
commit 7be139f114f5f14588e06f8224b0b978db833de2
Author: Noel 
AuthorDate: Sun Feb 21 20:02:40 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon Feb 22 10:16:08 2021 +0100

loplugin:refcounting in extensions

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

diff --git a/extensions/source/bibliography/toolbar.cxx 
b/extensions/source/bibliography/toolbar.cxx
index ae054801d8db..ea8ae0eeaee8 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -295,8 +295,8 @@ void BibToolBar::InitListener()
 util::URL aQueryURL;
 aQueryURL.Complete = ".uno:Bib/MenuFilter";
 xTrans->parseStrict( aQueryURL);
-BibToolBarListener* pQuery=new BibTBQueryMenuListener(this, 
aQueryURL.Complete, nTBC_BT_AUTOFILTER);
-xDisp->addStatusListener(uno::Reference< frame::XStatusListener > 
(pQuery),aQueryURL);
+rtl::Reference pQuery=new BibTBQueryMenuListener(this, 
aQueryURL.Complete, nTBC_BT_AUTOFILTER);
+xDisp->addStatusListener(pQuery, aQueryURL);
 
 for(ToolBox::ImplToolItems::size_type nPos=0;nPos 
xBuilder(PropertyHandlerHelper::makeBuilder("modules/spropctrlr/ui/urlcontrol.ui",
 m_xContext));
 auto pURLBox = 
std::make_unique(xBuilder->weld_combo_box("urlcontrol"));
-auto pControl = new OFileUrlControl(std::move(pURLBox), 
std::move(xBuilder), false);
+rtl::Reference pControl = new 
OFileUrlControl(std::move(pURLBox), std::move(xBuilder), false);
 pControl->SetModifyHandler();
 aDescriptor.Control = pControl;
 
@@ -1095,7 +1095,7 @@ namespace pcr
 {
 std::unique_ptr 
xBuilder(PropertyHandlerHelper::makeBuilder("modules/spropctrlr/ui/formattedsample.ui",
 m_xContext));
 auto pContainer = 
xBuilder->weld_container("formattedsample");
-auto pControl = new 
OFormatSampleControl(std::move(pContainer), std::move(xBuilder), false);
+rtl::Reference pControl = new 
OFormatSampleControl(std::move(pContainer), std::move(xBuilder), false);
 pControl->SetModifyHandler();
 
 pControl->SetFormatSupplier(pSupplier);
@@ -1110,7 +1110,7 @@ namespace pcr
 auto pSpinButton = 
xBuilder->weld_formatted_spin_button("formattedcontrol");
 // for ui-testing try and distinguish different 
instances of this formatted control
 
pSpinButton->set_buildable_name(pSpinButton->get_buildable_name() + "-" + 
aDescriptor.DisplayName.toUtf8());
-auto pControl = new 
OFormattedNumericControl(std::move(pSpinButton), std::move(xBuilder), false);
+rtl::Reference pControl = 
new OFormattedNumericControl(std::move(pSpinButton), std::move(xBuilder), 
false);
 pControl->SetModifyHandler();
 
 FormatDescription aDesc;
@@ -1151,7 +1151,7 @@ namespace pcr
 auto pSpinButton = 
xBuilder->weld_formatted_spin_button("formattedcontrol");
 // for ui-testing try and distinguish different instances of this 
formatted control
 pSpinButton->set_buildable_name(pSpinButton->get_buildable_name() 
+ "-" + aDescriptor.DisplayName.toUtf8());
-auto pControl = new 
OFormattedNumericControl(std::move(pSpinButton), std::move(xBuilder), false);
+rtl::Reference pControl = new 
OFormattedNumericControl(std::move(pSpinButton), std::move(xBuilder), false);
 pControl->SetModifyHandler();
 aDescriptor.Control = pControl;
 
@@ -1285,7 +1285,7 @@ namespace pcr
 {
 std::unique_ptr 
xBuilder(PropertyHandlerHelper::makeBuilder("modules/spropctrlr/ui/numericfield.ui",
 m_xContext));
 auto pSpinButton = 
xBuilder->weld_metric_spin_button("numericfield", FieldUnit::MILLISECOND);
-auto pControl = new ONumericControl(std::move(pSpinButton), 
std::move(xBuilder), bReadOnly);
+rtl::Reference pControl = new 
ONumericControl(std::move(pSpinButton), std::move(xBuilder), bReadOnly);
 pControl->SetModifyHandler();
 pControl->setMinValue( Optional< double >( true, 0 ) );
 pControl->setMaxValue( Optional< double >( true, 
std::numeric_limits< double >::max() ) );
diff --git a/extensions/source/propctrlr/propcontroller.cxx 
b/extensions/source/propctrlr/propcontroller.cxx

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

[Samuel Mehrbrodt (via logerrit)]

 chart2/source/controller/dialogs/res_Trendline.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 26d23c96d449c201e50df04023d9cbfd59d3d133
Author: Samuel Mehrbrodt 
AuthorDate: Thu Feb 18 10:40:07 2021 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Feb 22 10:01:31 2021 +0100

Trendline dlg: Enable widgets only when matching type is selected

Change-Id: Ia232683aafdfe8d2b32be985476cb20702fc807c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/04
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx 
b/chart2/source/controller/dialogs/res_Trendline.cxx
index 6d994e13bc6d..e1ccd666414c 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -363,6 +363,7 @@ void TrendlineResources::UpdateControlStates()
 m_xNF_Period->set_max(m_nNbPoints - 1);
 }
 bool bMovingAverage = ( m_eTrendLineType == SvxChartRegress::MovingAverage 
);
+bool bPolynomial = ( m_eTrendLineType == SvxChartRegress::Polynomial );
 bool bInterceptAvailable = ( m_eTrendLineType == SvxChartRegress::Linear )
 || ( m_eTrendLineType == 
SvxChartRegress::Polynomial )
 || ( m_eTrendLineType == SvxChartRegress::Exp );
@@ -378,6 +379,8 @@ void TrendlineResources::UpdateControlStates()
 m_xCB_ShowEquation->set_sensitive( !bMovingAverage );
 m_xCB_ShowCorrelationCoeff->set_sensitive( !bMovingAverage );
 m_xCB_RegressionMovingType->set_sensitive(bMovingAverage);
+m_xNF_Period->set_sensitive(bMovingAverage);
+m_xNF_Degree->set_sensitive(bPolynomial);
 m_xEE_XName->set_sensitive( !bMovingAverage && 
m_xCB_ShowEquation->get_active() );
 m_xEE_YName->set_sensitive( !bMovingAverage && 
m_xCB_ShowEquation->get_active() );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Armin Le Grand (Allotropia) (via logerrit)]

 emfio/source/reader/mtftools.cxx |   20 +-
 include/vcl/font.hxx |3 ++
 vcl/inc/impfont.hxx  |   21 ++-
 vcl/source/filter/wmf/emfwr.cxx  |   27 ++--
 vcl/source/font/font.cxx |   43 +--
 5 files changed, 108 insertions(+), 6 deletions(-)

New commits:
commit 0ce79d8efd63a9fb64bae73dde2f5af266c2f9f9
Author: Armin Le Grand (Allotropia) 
AuthorDate: Tue Feb 16 18:20:32 2021 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Feb 22 09:32:36 2021 +0100

tdf#127471 correct EMF/WMF im/export for scaled font

If FontScaling is used, system-dependent data is held at
vcl::Font Width(). Already if not scaled, we have three
definitions: Width is zero, Width is equal to Height (unx)
or - on Windows - Width equals avgFontWidth.
If used it is W!=H where on unx Width equals Height multiplied
with the scale factor. On Windows, this is Width multiplied
with the only there existing avgFontWidth.
Unfortunately that is ex/imported (since ever) undetected
to EMF/WMF thus making EMF/WMF files containing FontScaling
system-dependent - on which system was LO running when
creating the file? The error can be seen when loading such
a EMF/WMF on the vice-versa system, the FontScale is very
ugly and wrong.
Since EMF/WMF *are* Windows-specific formats the Windows-like
definition is the correct one. This change makes all other
systems export that now, and adapt on import to their system-
specific definition (assuming coming from Windows).
As can be seen, the difficulty is that these adaptions are
necessary on non-Windows plattforms, but these do not have
that avgFontWidth available. Thus I made a deep-dive
investigation and multiple experiments to create a as
similar as possible value to apply the needed calculations.
For details and discussion refer to the bug description.

Change-Id: I983fb6d882e2e8fccf9c8460f01509201d8157f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111000
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 
(cherry picked from commit 9d161857f1d4afcb772b477455797a2da0e47a9b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/47
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
index 89ca286a9501..b307a18ca1f7 100644
--- a/emfio/source/reader/mtftools.cxx
+++ b/emfio/source/reader/mtftools.cxx
@@ -295,8 +295,26 @@ namespace emfio
 
 // Convert height to positive
 aFontSize.setHeight( std::abs(aFontSize.Height()) );
-
 aFont.SetFontSize(aFontSize);
+
+// tdf#127471 adapt nFontWidth from Windows-like notation to
+// NormedFontScaling if used for text scaling
+#ifndef _WIN32
+const bool bFontScaledHorizontally(aFontSize.Width() != 0 && 
aFontSize.Width() != aFontSize.Height());
+
+if(bFontScaledHorizontally)
+{
+// tdf#127471 nFontWidth is the Windows FontScaling, need to 
convert to
+// Non-Windowslike notation relative to FontHeight.
+const long 
nAverageFontWidth(aFont.GetOrCalculateAverageFontWidth());
+
+if(nAverageFontWidth > 0)
+{
+const double 
fScaleFactor(static_cast(aFontSize.Height()) / 
static_cast(nAverageFontWidth));
+
aFont.SetAverageFontWidth(static_cast(static_cast(aFontSize.Width())
 * fScaleFactor));
+}
+}
+#endif
 };
 
 Color MtfTools::ReadColor()
diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx
index 2dc0a5b326cd..abc41584f40a 100644
--- a/include/vcl/font.hxx
+++ b/include/vcl/font.hxx
@@ -111,6 +111,9 @@ public:
 voidSetAverageFontWidth( long nWidth );
 longGetAverageFontWidth() const;
 
+// tdf#127471 for corrections on EMF/WMF we need the AvgFontWidth in 
Windows-specific notation
+longGetOrCalculateAverageFontWidth() const;
+
 // Prefer LanguageTag over LanguageType
 voidSetLanguageTag( const LanguageTag & );
 const LanguageTag&  GetLanguageTag() const;
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index d2933b63a5f0..af9e462a513b 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -60,7 +60,18 @@ public:
 voidSetWidthType( const FontWidth eWidthType )  { 
meWidthType = eWidthType; }
 voidSetAlignment( const TextAlign eAlignment )  { 
meAlign = eAlignment; }
 voidSetCharSet( const rtl_TextEncoding eCharSet )   { 
meCharSet = eCharSet; }
-voidSetFontSize( const Size& rSize ) { 
maAverageFontSize = rSize; }
+voidSetFontSize( const Size& rSize )
+{
+#ifndef _WIN32
+if(rSize.Height() != maAverageFontSize.Height()

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - emfio/source include/vcl vcl/inc vcl/source

[Armin Le Grand (Allotropia) (via logerrit)]

 emfio/source/reader/mtftools.cxx |   20 +-
 include/vcl/font.hxx |3 ++
 vcl/inc/impfont.hxx  |   21 ++-
 vcl/source/filter/wmf/emfwr.cxx  |   27 ++--
 vcl/source/font/font.cxx |   43 +--
 5 files changed, 108 insertions(+), 6 deletions(-)

New commits:
commit 75d5db29f2ad2ff4f7944d47efc4ee001be7a1e7
Author: Armin Le Grand (Allotropia) 
AuthorDate: Tue Feb 16 18:20:32 2021 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Feb 22 09:32:00 2021 +0100

tdf#127471 correct EMF/WMF im/export for scaled font

If FontScaling is used, system-dependent data is held at
vcl::Font Width(). Already if not scaled, we have three
definitions: Width is zero, Width is equal to Height (unx)
or - on Windows - Width equals avgFontWidth.
If used it is W!=H where on unx Width equals Height multiplied
with the scale factor. On Windows, this is Width multiplied
with the only there existing avgFontWidth.
Unfortunately that is ex/imported (since ever) undetected
to EMF/WMF thus making EMF/WMF files containing FontScaling
system-dependent - on which system was LO running when
creating the file? The error can be seen when loading such
a EMF/WMF on the vice-versa system, the FontScale is very
ugly and wrong.
Since EMF/WMF *are* Windows-specific formats the Windows-like
definition is the correct one. This change makes all other
systems export that now, and adapt on import to their system-
specific definition (assuming coming from Windows).
As can be seen, the difficulty is that these adaptions are
necessary on non-Windows plattforms, but these do not have
that avgFontWidth available. Thus I made a deep-dive
investigation and multiple experiments to create a as
similar as possible value to apply the needed calculations.
For details and discussion refer to the bug description.

Change-Id: I983fb6d882e2e8fccf9c8460f01509201d8157f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111000
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 
(cherry picked from commit 9d161857f1d4afcb772b477455797a2da0e47a9b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/48
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
index 4de2dd4c1fe2..3053d3878e13 100644
--- a/emfio/source/reader/mtftools.cxx
+++ b/emfio/source/reader/mtftools.cxx
@@ -296,8 +296,26 @@ namespace emfio
 
 // Convert height to positive
 aFontSize.setHeight( std::abs(aFontSize.Height()) );
-
 aFont.SetFontSize(aFontSize);
+
+// tdf#127471 adapt nFontWidth from Windows-like notation to
+// NormedFontScaling if used for text scaling
+#ifndef _WIN32
+const bool bFontScaledHorizontally(aFontSize.Width() != 0 && 
aFontSize.Width() != aFontSize.Height());
+
+if(bFontScaledHorizontally)
+{
+// tdf#127471 nFontWidth is the Windows FontScaling, need to 
convert to
+// Non-Windowslike notation relative to FontHeight.
+const long 
nAverageFontWidth(aFont.GetOrCalculateAverageFontWidth());
+
+if(nAverageFontWidth > 0)
+{
+const double 
fScaleFactor(static_cast(aFontSize.Height()) / 
static_cast(nAverageFontWidth));
+
aFont.SetAverageFontWidth(static_cast(static_cast(aFontSize.Width())
 * fScaleFactor));
+}
+}
+#endif
 };
 
 Color MtfTools::ReadColor()
diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx
index ac8c6d4c2153..53630b30e1dc 100644
--- a/include/vcl/font.hxx
+++ b/include/vcl/font.hxx
@@ -111,6 +111,9 @@ public:
 voidSetAverageFontWidth( long nWidth );
 longGetAverageFontWidth() const;
 
+// tdf#127471 for corrections on EMF/WMF we need the AvgFontWidth in 
Windows-specific notation
+longGetOrCalculateAverageFontWidth() const;
+
 // Prefer LanguageTag over LanguageType
 voidSetLanguageTag( const LanguageTag & );
 const LanguageTag&  GetLanguageTag() const;
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index 5e7e75a69246..624707839f40 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -62,7 +62,18 @@ public:
 voidSetWidthType( const FontWidth eWidthType )  { 
meWidthType = eWidthType; }
 voidSetAlignment( const TextAlign eAlignment )  { 
meAlign = eAlignment; }
 voidSetCharSet( const rtl_TextEncoding eCharSet )   { 
meCharSet = eCharSet; }
-voidSetFontSize( const Size& rSize ) { 
maAverageFontSize = rSize; }
+voidSetFontSize( const Size& rSize )
+{
+#ifndef _WIN32
+if(rSize.Height() != maAverageFontSize.Height()

LE GARREC Vincent (bansan) license statement

[libreoff...@le-garrec.fr]

With this new mailbox,

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

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

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

[dante (via logerrit)]

 officecfg/registry/schema/org/openoffice/Office/Math.xcs |  204 ---
 1 file changed, 204 deletions(-)

New commits:
commit 7862b5949c524522bddb5ab023d2a59ac41778d1
Author: dante 
AuthorDate: Fri Feb 19 17:57:48 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Feb 22 09:12:39 2021 +0100

Starmath expert settings cleanup of deprecated stuff

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

diff --git a/officecfg/registry/schema/org/openoffice/Office/Math.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
index 4d04bd3a0cca..ec19a94ec591 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Math.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
@@ -223,42 +223,26 @@
 Contains settings for printing.
   
   
-
-
-
 
   Specifies if the title (filename) is printed.
-  Title row
 
 false
   
   
-
-
-
 
   Specifies if the formula text is printed.
-  Formula text
 
 false
   
   
-
-
-
 
   Specifies if a border is drawn around the formula when 
printed.
-  Border
 
 false
   
   
-
-
-
 
   Defines the size used when printing the formula.
-  Print Size
 
 
   
@@ -280,12 +264,8 @@
 0
   
   
-
-
-
 
   Specifies the zoom factor for printing formulas. This is only 
valid when the print size is defined by the zoom factor. [UNIT=%]
-  Zoom factor
 
 
   
@@ -307,10 +287,8 @@
 Contains settings related to load and save operations.
   
   
-
 
   When set only symbols used in the current formula will be 
saved. Otherwise all user defined symbols will be saved in each formula.
-  Save only used symbols.
 
 true
   
@@ -320,22 +298,14 @@
 Contains miscellaneous settings.
   
   
-
-
-
 
   Ignores spacing symbols at the end of a line.
-  Ignore ~ and ' at the end of the line
 
 true
   
   
-
-
-
 
   Auto close brackets, parentheses and braces when editing a 
formula.
-  Auto close brackets, parentheses and braces when editing a 
formula
 
 true
   
@@ -363,32 +333,20 @@
 Contains view settings.
   
   
-
-
-
 
   Toggles the visibility of the ToolBox (Selection Box).
-  Show Tool Box
 
 true
   
   
-
-
-
 
   Automatically updates the display of the formula after the 
text has changed.
-  Update display automatically
 
 true
   
   
-
-
-
 
   Toggles the visibility of the FormulaCursor.
-  Show Formula Cursor
 
 true
   
@@ -403,20 +361,14 @@
 Defines the default format settings for formulas.
   
   
-
-
-
 
   Displays some expressions in a compact form.
-  Textmode
 
 false
   
   
-
 
   Specifies the default layout for symbols from the 'Greek' 
symbol set.
-  Greek character style
 
 
   
@@ -433,22 +385,14 @@
 2
   
   
-
-
-
 
   Attempts to scale non-scalable brackets to fit the size of the 
arguments.
-  Scale normal brackets
 
 false
   
   
-
-
-
 
   Specifies the default horizontal alignment for the 
formula.
-  Horizontal alignment
 
 
   
@@ -470,12 +414,8 @@
 1
   
   
-
-
-
 
   Specifies the reference base size. [UNIT=Pts]
-  Base size
 
 
   
@@ -492,12 +432,8 @@
 12
   
   
-
-
-
 
   Specifies the text size relative to the base size. 
[UNIT=%]
-  Text size
 
 
   
@@ -514,12 +450,8 @@
 100
   
   
-
-
-
 
   Specifies the size of the indices relative to the base size. 
[UNIT=%]
-  Index size
 
 
   
@@ -536,12 +468,8 @@
 60
   
   
-
-
-
 
   Specifies the size of the functions relative to the base size. 
[UNIT=%]
-  Function size
 
 

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

[dante (via logerrit)]

 officecfg/registry/schema/org/openoffice/Office/Math.xcs |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 927b4e74c4f841336575d20036e77bde10cd335a
Author: dante 
AuthorDate: Fri Feb 19 17:46:57 2021 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Feb 22 09:10:24 2021 +0100

Correct description error of config field

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

diff --git a/officecfg/registry/schema/org/openoffice/Office/Math.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
index 7de3d7e0e84f..4d04bd3a0cca 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Math.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Math.xcs
@@ -341,7 +341,7 @@
   
   
 
-  Specifies which SmParser to use [UNIT=%]
+  Specifies which SmParser to use
 
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits