[Libreoffice-commits] core.git: RepositoryExternal.mk

[Stephan Bergmann]

 RepositoryExternal.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b4429d5b8d7f871ede5ca1608f73d7ecda8ec1f2
Author: Stephan Bergmann 
Date:   Thu Mar 8 08:48:08 2018 +0100

Probably better to comment on these dependencies

...added with f23651ff10da2d4bbbc47d0152b5cc321c29f0d1 "Missing 
dependencies"

Change-Id: I4cd02fc8b242b3a3737305546bf3155425614d65

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index eb91d14c3152..0fa3524a582a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3927,6 +3927,9 @@ $(call gb_Executable_add_runtime_dependencies,saxparser,\
 )
 endef
 
+# Executable_svidl links against Library_tl, which links against 
Library_comphelper, which links
+# against libraries from ExternalProject_gpgmepp, which links against 
libraries from
+# ExternalProject_libassuan and ExternalProject_libgpg-error:
 define gb_Executable__register_svidl
 $(call gb_Executable_add_runtime_dependencies,svidl, \
 $(call gb_Helper_optional,GPGMEPP, \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/inc/ring.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit be77dba772e87ab2cc160430928af4aee73eec37
Author: Miklos Vajna 
Date:   Wed Mar 7 21:46:20 2018 +0100

sw::Ring: simplify '*&x' to just 'x'

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

diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index 191ff3ef7801..fc17a76e0403 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.hxx
@@ -186,8 +186,8 @@ namespace sw
 // actually un-merge in this case!
 assert(m_pStart->m_pPrev != aDestRing.m_pStart);
 assert(m_pStart != aDestRing.m_pStart->m_pPrev);
-std::swap(*(&m_pStart->m_pPrev->m_pNext), 
*(&aDestRing.m_pStart->m_pPrev->m_pNext));
-std::swap(*(&m_pStart->m_pPrev), 
*(&aDestRing.m_pStart->m_pPrev));
+std::swap(m_pStart->m_pPrev->m_pNext, 
aDestRing.m_pStart->m_pPrev->m_pNext);
+std::swap(m_pStart->m_pPrev, aDestRing.m_pStart->m_pPrev);
 }
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: comphelper/source compilerplugins/clang connectivity/source dbaccess/source editeng/source include/comphelper include/editeng include/oox include/sfx2 include/svl inclu

[Noel Grandin]

 comphelper/source/misc/graphicmimetype.cxx |   13 
 compilerplugins/clang/unusedmethods.results|  366 +++--
 compilerplugins/clang/unusedmethods.unused-returns.results |  488 +
 connectivity/source/drivers/firebird/Driver.cxx|   36 
 connectivity/source/drivers/firebird/SubComponent.hxx  |5 
 dbaccess/source/filter/hsqldb/columndef.hxx|5 
 editeng/source/outliner/outliner.cxx   |5 
 include/comphelper/graphicmimetype.hxx |1 
 include/editeng/outliner.hxx   |1 
 include/oox/export/drawingml.hxx   |1 
 include/oox/helper/graphichelper.hxx   |8 
 include/sfx2/msgpool.hxx   |1 
 include/svl/itemprop.hxx   |   21 
 include/tools/gen.hxx  |4 
 include/vcl/btndlg.hxx |7 
 include/vcl/builder.hxx|3 
 include/xmloff/xmlexp.hxx  |5 
 include/xmloff/xmlimp.hxx  |8 
 linguistic/source/spelldsp.cxx |8 
 linguistic/source/spelldsp.hxx |2 
 lotuswordpro/Library_lwpft.mk  |1 
 lotuswordpro/source/filter/lwpdllist.cxx   |   93 --
 lotuswordpro/source/filter/lwpdllist.hxx   |   96 --
 lotuswordpro/source/filter/lwpparaproperty.hxx |1 
 oox/source/export/drawingml.cxx|8 
 oox/source/helper/graphichelper.cxx|   11 
 sfx2/source/control/msgpool.cxx|9 
 sw/inc/htmltbl.hxx |5 
 sw/source/core/inc/noteurl.hxx |3 
 sw/source/core/text/noteurl.cxx|   11 
 vcl/source/window/btndlg.cxx   |   32 
 xmloff/source/core/xmlexp.cxx  |   43 -
 32 files changed, 354 insertions(+), 947 deletions(-)

New commits:
commit bb7ade140df807b6a0f12766a1365b8f8d0fd342
Author: Noel Grandin 
Date:   Wed Mar 7 13:42:58 2018 +0200

loplugin:unusedmethods

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

diff --git a/comphelper/source/misc/graphicmimetype.cxx 
b/comphelper/source/misc/graphicmimetype.cxx
index 559c3087a2da..2f8ba2efbae4 100644
--- a/comphelper/source/misc/graphicmimetype.cxx
+++ b/comphelper/source/misc/graphicmimetype.cxx
@@ -76,19 +76,6 @@ OUString 
GraphicMimeTypeHelper::GetMimeTypeForXGraphic(Reference xGrap
 return OUString("");
 }
 
-OUString GraphicMimeTypeHelper::GetMimeTypeForImageUrl(const OUString& 
rImageUrl)
-{
-// Create the graphic to retrieve the mimetype from it
-Reference xProvider
-= 
css::graphic::GraphicProvider::create(comphelper::getProcessComponentContext());
-Sequence aMediaProperties(1);
-aMediaProperties[0].Name = "URL";
-aMediaProperties[0].Value <<= rImageUrl;
-Reference xGraphic(xProvider->queryGraphic(aMediaProperties));
-
-return GetMimeTypeForXGraphic(xGraphic);
-}
-
 OUString 
GraphicMimeTypeHelper::GetMimeTypeForImageStream(Reference 
xInputStream)
 {
 // Create the graphic to retrieve the mimetype from it
diff --git a/compilerplugins/clang/unusedmethods.results 
b/compilerplugins/clang/unusedmethods.results
index 1605c2785cc4..747cb3037f08 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -10,6 +10,8 @@ connectivity/source/drivers/evoab2/NResultSetMetaData.hxx:51
 class com::sun::star::uno::Reference 
connectivity::evoab::OEvoabResultSetMetaData::operator Reference()
 connectivity/source/drivers/firebird/Driver.hxx:65
 const class com::sun::star::uno::Reference & 
connectivity::firebird::FirebirdDriver::getContext() const
+connectivity/source/drivers/firebird/SubComponent.hxx:53
+void release(int &,struct cppu::OBroadcastHelperVar 
&,class com::sun::star::uno::Reference 
&,class com::sun::star::lang::XComponent *)
 connectivity/source/drivers/firebird/Util.hxx:61
  connectivity::firebird::ColumnTypeInfo::ColumnTypeInfo(short,const class 
rtl::OUString &)
 connectivity/source/drivers/firebird/Util.hxx:66
@@ -24,7 +26,7 @@ connectivity/source/drivers/mork/mork_helper.cxx:36
 int main(int,char **)
 connectivity/source/inc/dbase/dindexnode.hxx:70
 _Bool connectivity::dbase::ONDXKey::operator<(const class 
connectivity::dbase::ONDXKey &) const
-connectivity/source/inc/java/sql/Connection.hxx:66
+connectivity/source/inc/java/sql/Connection.hxx:63
 class rtl::OUString 
connectivity::java_sql_Connection

[Libreoffice-commits] core.git: chart2/source compilerplugins/clang connectivity/source svx/source vcl/inc vcl/source

[Noel Grandin]

 chart2/source/model/template/AreaChartType.cxx|8 
 chart2/source/model/template/AreaChartType.hxx|2 
 chart2/source/model/template/BarChartType.cxx |8 
 chart2/source/model/template/BarChartType.hxx |2 
 chart2/source/model/template/BubbleChartType.cxx  |8 
 chart2/source/model/template/BubbleChartType.hxx  |3 
 chart2/source/model/template/CandleStickChartType.cxx |8 
 chart2/source/model/template/CandleStickChartType.hxx |3 
 chart2/source/model/template/ChartType.cxx|5 
 chart2/source/model/template/ChartType.hxx|5 
 chart2/source/model/template/ColumnChartType.cxx  |8 
 chart2/source/model/template/ColumnChartType.hxx  |2 
 chart2/source/model/template/FilledNetChartType.cxx   |8 
 chart2/source/model/template/FilledNetChartType.hxx   |2 
 chart2/source/model/template/GL3DBarChartType.cxx |7 
 chart2/source/model/template/GL3DBarChartType.hxx |2 
 chart2/source/model/template/GL3DBarChartTypeTemplate.cxx |3 
 chart2/source/model/template/LineChartType.cxx|8 
 chart2/source/model/template/LineChartType.hxx|2 
 chart2/source/model/template/NetChartType.cxx |   12 -
 chart2/source/model/template/NetChartType.hxx |4 
 chart2/source/model/template/PieChartType.cxx |8 
 chart2/source/model/template/PieChartType.hxx |3 
 chart2/source/model/template/ScatterChartType.cxx |8 
 chart2/source/model/template/ScatterChartType.hxx |1 
 compilerplugins/clang/unusedfields.readonly.results   |  142 ++
 compilerplugins/clang/unusedfields.untouched.results  |   66 --
 compilerplugins/clang/unusedfields.writeonly.results  |   66 ++
 connectivity/source/drivers/firebird/Connection.cxx   |4 
 connectivity/source/drivers/firebird/Connection.hxx   |4 
 connectivity/source/drivers/firebird/Driver.cxx   |2 
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx   |3 
 svx/source/sidebar/possize/PosSizePropertyPanel.hxx   |1 
 vcl/inc/sallayout.hxx |2 
 vcl/source/edit/vclmedit.cxx  |5 
 vcl/source/gdi/sallayout.cxx  |8 
 36 files changed, 190 insertions(+), 243 deletions(-)

New commits:
commit 44d5188b2fd8afc82aa8fda1ad4b374734129aea
Author: Noel Grandin 
Date:   Wed Mar 7 17:35:53 2018 +0200

loplugin:unusedfields

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

diff --git a/chart2/source/model/template/AreaChartType.cxx 
b/chart2/source/model/template/AreaChartType.cxx
index b10d6110ae3b..3427a131fd5d 100644
--- a/chart2/source/model/template/AreaChartType.cxx
+++ b/chart2/source/model/template/AreaChartType.cxx
@@ -26,9 +26,7 @@ using namespace ::com::sun::star;
 namespace chart
 {
 
-AreaChartType::AreaChartType(
-const uno::Reference< uno::XComponentContext > & xContext ) :
-ChartType( xContext )
+AreaChartType::AreaChartType()
 {}
 
 AreaChartType::AreaChartType( const AreaChartType & rOther ) :
@@ -70,10 +68,10 @@ css::uno::Sequence< OUString > SAL_CALL 
AreaChartType::getSupportedServiceNames(
 } //  namespace chart
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
-com_sun_star_comp_chart_AreaChartType_get_implementation(css::uno::XComponentContext
 *context,
+com_sun_star_comp_chart_AreaChartType_get_implementation(css::uno::XComponentContext
 * /*context*/,
 css::uno::Sequence const &)
 {
-return cppu::acquire(new ::chart::AreaChartType(context));
+return cppu::acquire(new ::chart::AreaChartType);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/AreaChartType.hxx 
b/chart2/source/model/template/AreaChartType.hxx
index 8f3b67a2d6b6..acb76ef106cb 100644
--- a/chart2/source/model/template/AreaChartType.hxx
+++ b/chart2/source/model/template/AreaChartType.hxx
@@ -27,7 +27,7 @@ namespace chart
 class AreaChartType final : public ChartType
 {
 public:
-explicit AreaChartType( css::uno::Reference< css::uno::XComponentContext > 
const & xContext );
+explicit AreaChartType();
 virtual ~AreaChartType() override;
 
 virtual OUString SAL_CALL
diff --git a/chart2/source/model/template/BarChartType.cxx 
b/chart2/source/model/template/BarChartType.cxx
index bfdf6ec47249..ab71366b4fec 100644
--- a/chart2/source/model/template/BarChartType.cxx
+++ b/chart2/source/model/template/BarChartType.cxx
@@ -26,9 +26,7 @@ using namespace ::com::sun::star;
 namespace chart
 {
 
-BarChartType::BarChartType(
-const uno::Reference< uno::XComponentContext > & xContext ) :
-ChartType( xContext )
+BarChartType::Bar

Re: GSoC Proposal

[Ekansh Jha]

Hi,

I have gone through the links as suggested by mentors, and I would like to
confirm that bug 37932
(it's mentioned
about developing an smartart feature but not clearing which
charts/diagrams/shapes should be included in the period of GSoC) and bug
92902 (Auto-Layout
for flowcharts and automatic flowcharts) are the deliverables for "SmartArt
editing in impress". As well as apart from bug 72771
 (Automation
feature to automate the flowcharting process saving time and increasing
productivity) is there any other deliverable for "Block diagram" also.

Moreover If I could know whether Implementation of Smartart should be from
scratch or it is already present( I couldn't see smartart feature in lo,
Not talking about the extension). If there's any information that I should
know, please let me know.

Thanking you,
Ekansh Jha



‌

On 6 March 2018 at 00:37, Ekansh Jha  wrote:

> Hi Jan, Thorsten and Community,
>
> I looked into the project "Smart Art Editing in Impress" as suggested and
> I found it interesting and an essential feature for the libreoffice.
> Hence I would like to contribute to that project to make that feature
> better.
>
> It would be great if I can get to know what are the important blogs, code
> pointers or other requirements should i go through. As It's a hard project,
> It would be helpful to get Mentors valuable advice about this project(as
> smart art feature is big, so what exactly should be introduced). So that I
> can look and understand the implementation of the code.
>
> Thanking you,
> Ekansh Jha
> ‌
>
> On 5 March 2018 at 02:49, Thorsten Behrens  wrote:
>
>> Ekansh Jha wrote:
>> > I think I might be considering other project named "Block diagrams".
>> > It would be great if I can get to know which part of code should i look
>> for
>> > better understanding and implementation of Block diagrams or any blogs
>> > related to it.
>> >
>> Hi Ekansh Jha,
>>
>> glad to hear you're interested in the Block diagram task - which is
>> conceptually not too different from the SmartArt editing one, so you
>> might want to checkout that one as well, as Kendy suggested.
>>
>> Here's a bit more background for starters (though I'd strongly advise
>> to focus on EasyHacks for the moment):
>>  - https://pad.documentfoundation.org/p/UX-GSoC_Ideas
>>  - https://bugs.documentfoundation.org/show_bug.cgi?id=37932
>>  - https://bugs.documentfoundation.org/show_bug.cgi?id=92902
>>
>> Cheers,
>>
>> -- Thorsten
>>
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara]

 sw/source/ui/chrdlg/break.cxx  |7 ++-
 sw/source/uibase/inc/break.hxx |4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 5eba05a0582cbb836c3715089e5d3bfe1ee19ded
Author: Caolán McNamara 
Date:   Wed Mar 7 20:49:40 2018 +

fix mismerge

thanks to noel

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

diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index 5611fafbe0c5..68f2e3241474 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -52,7 +52,12 @@ short SwBreakDlg::run()
 const int nPos = m_xPageCollBox->get_active();
 if (nPos != 0 && nPos != -1)
 {
-oPgNum = static_cast(m_xPageNumEdit->get_value());
+m_aTemplate = m_xPageCollBox->get_active_text();
+oPgNum = boost::none;
+if (m_xPageNumBox->get_active())
+{
+oPgNum = 
static_cast(m_xPageNumEdit->get_value());
+}
 }
 }
 }
diff --git a/sw/source/uibase/inc/break.hxx b/sw/source/uibase/inc/break.hxx
index 58b5faecfe43..4f39f55674b1 100644
--- a/sw/source/uibase/inc/break.hxx
+++ b/sw/source/uibase/inc/break.hxx
@@ -43,7 +43,7 @@ class SwBreakDlg
 std::unique_ptr m_xPageNumEdit;
 std::unique_ptr m_xOkBtn;
 
-OUStringaTemplate;
+OUStringm_aTemplate;
 sal_uInt16  nKind;
 ::boost::optional  oPgNum;
 
@@ -60,7 +60,7 @@ class SwBreakDlg
 public:
 SwBreakDlg(weld::Window *pParent, SwWrtShell &rSh);
 short run();
-const OUString& GetTemplateName() const { return aTemplate; }
+const OUString& GetTemplateName() const { return m_aTemplate; }
 sal_uInt16 GetKind() const { return nKind; }
 const ::boost::optional&  GetPageNumber() const { return 
oPgNum; }
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: CppunitTest_xmlsecurity_signing Unit Test Failure on 32-bit Linux

[Luke Benes]

Sorry, copy/paste error. Here is the correct URL:

https://gist.githubusercontent.com/slacka/412bea7ad1012cb60dac6af583712736/raw/3b8309b7a5dd568c35eb6758edbb15e771e290d2/strace2.txt
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: CppunitTest_xmlsecurity_signing Unit Test Failure on 32-bit Linux

[Luke Benes]

Here is the updated strace log:

https://gist.githubusercontent.com/slacka/412bea7ad1012cb60dac6af583712736/raw/3b8309b7a5dd568c35eb6758edbb15e771e290d2/strace2.

Made with $ make CppunitTest_xmlsecurity_signing CPPUNITTRACE="strace -f -s 77" 
2>&1 | tee trace.log


Let me know if there's anything else I can do to help.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

GSOC 2018

[koneru nikhil]

Hi Everyone,

 Myself K.Nikhil from sathyabama university, Chennai.I am working
on Python, R, Android and web applications from past 3 years.Very
interestingly waiting for contributing to LibreOffice in GSOC 2018

*Thank You*
*K.Nikhil*
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Khaled Hosny]

 editeng/source/editeng/impedit2.cxx |   17 +++--
 1 file changed, 3 insertions(+), 14 deletions(-)

New commits:
commit 7a683c31e090e5a81debadcef025df9cd61c75f0
Author: Khaled Hosny 
Date:   Wed Mar 7 23:29:15 2018 +0200

tdf#116157: Always apply Unicode Bidi in editeng

Similar to commit 270d6db63d933b7350dc8543b9b9ebc2133a116e which fixed
the same issue in Writer. Surely having two text engines duplicating the
same bugs sounded like a brilliant idea to someone.

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

diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index a79595251755..227ceba90dba 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -1909,19 +1909,7 @@ void ImpEditEngine::InitWritingDirections( sal_Int32 
nPara )
 WritingDirectionInfos& rInfos = pParaPortion->aWritingDirectionInfos;
 rInfos.clear();
 
-bool bCTL = false;
-ScriptTypePosInfos& rTypes = pParaPortion->aScriptInfos;
-for (ScriptTypePosInfo & rType : rTypes)
-{
-if ( rType.nScriptType == i18n::ScriptType::COMPLEX )
-   {
-bCTL = true;
-break;
-}
-}
-
-const UBiDiLevel nBidiLevel = IsRightToLeft( nPara ) ? 1 /*RTL*/ : 0 
/*LTR*/;
-if ( ( bCTL || ( nBidiLevel == 1 /*RTL*/ ) ) && 
pParaPortion->GetNode()->Len() )
+if (pParaPortion->GetNode()->Len())
 {
 const OUString aText = pParaPortion->GetNode()->GetString();
 
@@ -1931,6 +1919,7 @@ void ImpEditEngine::InitWritingDirections( sal_Int32 
nPara )
 UBiDi* pBidi = ubidi_openSized( aText.getLength(), 0, &nError );
 nError = U_ZERO_ERROR;
 
+const UBiDiLevel nBidiLevel = IsRightToLeft(nPara) ? 1 /*RTL*/ : 0 
/*LTR*/;
 ubidi_setPara( pBidi, reinterpret_cast(aText.getStr()), 
aText.getLength(), nBidiLevel, nullptr, &nError );
 nError = U_ZERO_ERROR;
 
@@ -1954,7 +1943,7 @@ void ImpEditEngine::InitWritingDirections( sal_Int32 
nPara )
 ubidi_close( pBidi );
 }
 
-// No infos mean no CTL and default dir is L2R...
+// No infos mean ubidi error, default to LTR
 if ( rInfos.empty() )
 rInfos.emplace_back( 0, 0, pParaPortion->GetNode()->Len() );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet]

 dbaccess/source/core/api/CacheSet.cxx   |   18 ++---
 dbaccess/source/core/api/FilteredContainer.cxx  |   42 +---
 dbaccess/source/core/api/HelperCollections.cxx  |7 --
 dbaccess/source/core/api/KeySet.cxx |   24 +++
 dbaccess/source/core/api/RowSet.cxx |5 -
 dbaccess/source/core/api/RowSetBase.cxx |6 -
 dbaccess/source/core/api/SingleSelectQueryComposer.cxx  |   54 +---
 dbaccess/source/core/api/querycontainer.cxx |8 --
 dbaccess/source/core/dataaccess/ComponentDefinition.cxx |6 -
 dbaccess/source/core/dataaccess/ModelImpl.cxx   |   46 +
 10 files changed, 86 insertions(+), 130 deletions(-)

New commits:
commit d6b33e49a5e9c51827eda9c5ba16d8daeb27e8af
Author: Julien Nabet 
Date:   Tue Mar 6 23:30:30 2018 +0100

Use for-range loops in dbaccess (part 3)

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

diff --git a/dbaccess/source/core/api/CacheSet.cxx 
b/dbaccess/source/core/api/CacheSet.cxx
index 46eb35cefce4..9a7303cf52a1 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -248,11 +248,9 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow
 _rOrgValues.push_back(nCheckCount);
 
 }
-std::vector< Reference >::const_iterator aIndexEnd = 
aAllIndexColumns.end();
-for( std::vector< Reference >::const_iterator aIndexIter 
= aAllIndexColumns.begin();
-aIndexIter != aIndexEnd;++aIndexIter)
+for (auto const& indexColumn : aAllIndexColumns)
 {
-if((*aIndexIter)->hasByName(aColumnName))
+if(indexColumn->hasByName(aColumnName))
 {
 _sCondition.append(::dbtools::quoteName( aQuote,aColumnName));
 if(aIter->isNull())
@@ -306,10 +304,10 @@ void OCacheSet::updateRow(const ORowSetRow& _rInsertRow 
,const ORowSetRow& _rOri
 ++i;
 }
 }
-auto aOrgValueEnd = aOrgValues.cend();
-for(auto aOrgValue = aOrgValues.cbegin(); aOrgValue != 
aOrgValueEnd;++aOrgValue,++i)
+for (auto const& orgValue : aOrgValues)
 {
-
setParameter(i,xParameter,(_rOriginalRow->get())[*aOrgValue],m_xSetMetaData->getColumnType(i),m_xSetMetaData->getScale(i));
+
setParameter(i,xParameter,(_rOriginalRow->get())[orgValue],m_xSetMetaData->getColumnType(i),m_xSetMetaData->getScale(i));
+++i;
 }
 
  m_bUpdated = xPrep->executeUpdate() > 0;
@@ -357,10 +355,10 @@ void OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow 
,const connectivity::OSQ
 Reference< XPreparedStatement > 
xPrep(m_xConnection->prepareStatement(aSql.makeStringAndClear()));
 Reference< XParameters > xParameter(xPrep,UNO_QUERY);
 sal_Int32 i = 1;
-auto aOrgValueEnd = aOrgValues.cend();
-for(auto j = aOrgValues.cbegin(); j != aOrgValueEnd; ++j,++i)
+for (auto const& orgValue : aOrgValues)
 {
-
setParameter(i,xParameter,(_rDeleteRow->get())[*j],m_xSetMetaData->getColumnType(i),m_xSetMetaData->getScale(i));
+
setParameter(i,xParameter,(_rDeleteRow->get())[orgValue],m_xSetMetaData->getColumnType(i),m_xSetMetaData->getScale(i));
+++i;
 }
 
 m_bDeleted = xPrep->executeUpdate() > 0;
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx 
b/dbaccess/source/core/api/FilteredContainer.cxx
index 09e5089ccaee..9f5fe4c824b8 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -85,11 +85,12 @@ sal_Int32 createWildCardVector(Sequence< OUString >& 
_rTableFilter, std::vector<
 // the table is allowed to "pass" if we had no filters at all or any 
of the non-wildcard filters matches
 if (!bFilterMatch && !_rWCSearch.empty())
 {   // or if one of the wildcard expression matches
-for (   std::vector< WildCard >::const_iterator aLoop = 
_rWCSearch.begin();
-aLoop != _rWCSearch.end() && !bFilterMatch;
-++aLoop
-)
-bFilterMatch = aLoop->Matches( _rName );
+for (auto const& elem : _rWCSearch)
+{
+bFilterMatch = elem.Matches( _rName );
+if (bFilterMatch)
+break;
+}
 }
 
 return bFilterMatch;
@@ -184,15 +185,12 @@ sal_Int32 createWildCardVector(Sequence< OUString >& 
_rTableFilter, std::vector<
 TableInfos aUnfilteredTables( _unfilteredTables );
 aUnfilteredTables.reserve( nTableFilterCount + ( 
aWildCardTableFilter.size() * 10 ) );
 
-for (   TableInfos::iterator table = aUnfilteredTables.begin();
-table != aUnfilteredTables.end();
-++table
-)
+

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sfx2/source

[Caolán McNamara]

 sfx2/source/dialog/dinfdlg.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 97b65102db4b1e8f95faf08521329da37cc3f2ec
Author: Caolán McNamara 
Date:   Wed Mar 7 12:02:28 2018 +

Resolves: tdf#116116 vertically center line in allocated height

Change-Id: Iee4cd859cdc52a2272f5b01c3e4a57336cc336a4
Reviewed-on: https://gerrit.libreoffice.org/50891
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index fd0dcd6fd4a2..145a9e4aebbc 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1748,6 +1748,7 @@ void CustomPropertiesWindow::CreateNewLine()
 pNewLine->m_aValueEdit->SetAccessibleName(m_pHeaderAccValue->GetText());
 
 sal_Int32 nPos = GetExistingLineCount() * GetLineHeight();
+nPos += LogicToPixel(Size(0, 2), MapMode(MapUnit::MapAppFont)).Height();
 m_aCustomPropertiesLines.push_back( pNewLine );
 
 SetWidgetWidths(pNewLine);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - slideshow/source

[Michael Stahl]

 slideshow/source/engine/shapes/drawshape.cxx |   23 ---
 1 file changed, 4 insertions(+), 19 deletions(-)

New commits:
commit c66530237998641411f30be8ee1bd0ef86106404
Author: Michael Stahl 
Date:   Wed Mar 7 12:35:23 2018 +0100

tdf#115142 Revert "slideshow: clip shapes in secondary screen window"

This reverts commit 99e373cd4c78084ded349f3e3de7b0504af2dd90.

This is bogus as it actually does scaling and not clipping, and the
actual clipping bug is in the VCL canvas, see following commit.

Also should fix tdf#115652 and tdf#116196.

Change-Id: Ief7be653a38626c9902ab5c7c453a133c2b9f882
(cherry picked from commit 0408a590311c837d5f0ab1abfb72a564a266ddac)
Reviewed-on: https://gerrit.libreoffice.org/50885
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/slideshow/source/engine/shapes/drawshape.cxx 
b/slideshow/source/engine/shapes/drawshape.cxx
index c023119ded06..00a8894f5ef0 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -133,26 +133,11 @@ namespace slideshow
 
 ViewShape::RenderArgs DrawShape::getViewRenderArgs() const
 {
-uno::Reference const xPropSet(mxPage,
-uno::UNO_QUERY_THROW);
-sal_Int32 nWidth = 0;
-sal_Int32 nHeight = 0;
-xPropSet->getPropertyValue("Width") >>= nWidth;
-xPropSet->getPropertyValue("Height") >>= nHeight;
-basegfx::B2DRectangle slideRect(0, 0, nWidth, nHeight);
-basegfx::B2DRectangle origBounds(maBounds);
-origBounds.intersect(slideRect);
-basegfx::B2DRectangle updateBounds(getUpdateArea());
-updateBounds.intersect(slideRect);
-basegfx::B2DRectangle bounds(getBounds());
-bounds.intersect(slideRect);
-basegfx::B2DRectangle unitBounds(getActualUnitShapeBounds());
-unitBounds.intersect(slideRect);
 return ViewShape::RenderArgs(
-origBounds,
-updateBounds,
-bounds,
-unitBounds,
+maBounds,
+getUpdateArea(),
+getBounds(),
+getActualUnitShapeBounds(),
 mpAttributeLayer,
 maSubsetting.getActiveSubsets(),
 mnPriority);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: MSVC being stupid (again)?

[Bjoern Michaelsen]

Hi,

On Wed, Mar 07, 2018 at 10:48:13AM +0200, Noel Grandin wrote:
> more than likely the same thing bug I encounter with std::unique_ptr where
> it is trying to instantiate something it should not be instantiating
> 
>   git grep 'MSVC2015 workaround'
> 
> you have to delete the copy constructor and assignment operator to make it 
> happy.

Thanks for the hint, I was really giddy to try this as I had deleted the copy
ctor but not yet operator= everywhere. Unfortunately no dice so far, MSVC keeps
resisting.

Ill try to pinpoint down MSVC stupidity some more then. :/

Best,

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - slideshow/source

[Michael Stahl]

 slideshow/source/engine/shapes/drawshape.cxx |   23 ---
 1 file changed, 4 insertions(+), 19 deletions(-)

New commits:
commit cbc114a8d86d94743562c2eec7a8eef23d2d2297
Author: Michael Stahl 
Date:   Wed Mar 7 12:35:23 2018 +0100

tdf#115142 Revert "slideshow: clip shapes in secondary screen window"

This reverts commit 99e373cd4c78084ded349f3e3de7b0504af2dd90.

This is bogus as it actually does scaling and not clipping, and the
actual clipping bug is in the VCL canvas, see following commit.

Also should fix tdf#115652 and tdf#116196.

Change-Id: Ief7be653a38626c9902ab5c7c453a133c2b9f882
(cherry picked from commit 0408a590311c837d5f0ab1abfb72a564a266ddac)
Reviewed-on: https://gerrit.libreoffice.org/50887
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/slideshow/source/engine/shapes/drawshape.cxx 
b/slideshow/source/engine/shapes/drawshape.cxx
index b1dc56b62741..98f1cae40ac7 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -134,26 +134,11 @@ namespace slideshow
 
 ViewShape::RenderArgs DrawShape::getViewRenderArgs() const
 {
-uno::Reference const xPropSet(mxPage,
-uno::UNO_QUERY_THROW);
-sal_Int32 nWidth = 0;
-sal_Int32 nHeight = 0;
-xPropSet->getPropertyValue("Width") >>= nWidth;
-xPropSet->getPropertyValue("Height") >>= nHeight;
-basegfx::B2DRectangle slideRect(0, 0, nWidth, nHeight);
-basegfx::B2DRectangle origBounds(maBounds);
-origBounds.intersect(slideRect);
-basegfx::B2DRectangle updateBounds(getUpdateArea());
-updateBounds.intersect(slideRect);
-basegfx::B2DRectangle bounds(getBounds());
-bounds.intersect(slideRect);
-basegfx::B2DRectangle unitBounds(getActualUnitShapeBounds());
-unitBounds.intersect(slideRect);
 return ViewShape::RenderArgs(
-origBounds,
-updateBounds,
-bounds,
-unitBounds,
+maBounds,
+getUpdateArea(),
+getBounds(),
+getActualUnitShapeBounds(),
 mpAttributeLayer,
 maSubsetting.getActiveSubsets(),
 mnPriority);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - canvas/source

[Michael Stahl]

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

New commits:
commit c59c43ecfb7b858557c82bb3733ba72f0f23d3df
Author: Michael Stahl 
Date:   Wed Mar 7 12:21:45 2018 +0100

VCL canvas: fix clipping of gradients (related: tdf#115142)

When using the presenter console, the secondary screen has
a small view of the current slide, which is called a "Pane" in sdext.

Clipping for this is done by sd::presenter::PresenterCanvas, which wraps
the full-screen VCL canvas and has a MergeViewState() to intersect
the clip region.

The VCL canvas has a bug in its gradientFill() implemenation where it
overrides the existing clip on the OutputDevice instead of intersecting
it.

This properly fixes the bug that was wrongly and badly attempted
to be fixed by commit 99e373cd4c78084ded349f3e3de7b0504af2dd90.

Change-Id: Id02678c2f134fe7b190866d6a6fff5b2e5e3aaff
(cherry picked from commit 5d710cf7dda27e78f237211fd92418be4dd1c551)
Reviewed-on: https://gerrit.libreoffice.org/50888
Tested-by: Michael Stahl 
Reviewed-by: Thorsten Behrens 

diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx 
b/canvas/source/vcl/canvashelper_texturefill.cxx
index 3250fc879746..4aed1746be5c 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -604,7 +604,7 @@ namespace vclcanvas
 const vcl::Region aPolyClipRegion( rPoly );
 
 rOutDev.Push( PushFlags::CLIPREGION );
-rOutDev.SetClipRegion( aPolyClipRegion );
+rOutDev.IntersectClipRegion( aPolyClipRegion );
 
 doGradientFill( rOutDev,
 rValues,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - canvas/source

[Michael Stahl]

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

New commits:
commit e89b8a1b5c2312b8d5f96dadb98bdab6b9e44528
Author: Michael Stahl 
Date:   Wed Mar 7 12:21:45 2018 +0100

VCL canvas: fix clipping of gradients (related: tdf#115142)

When using the presenter console, the secondary screen has
a small view of the current slide, which is called a "Pane" in sdext.

Clipping for this is done by sd::presenter::PresenterCanvas, which wraps
the full-screen VCL canvas and has a MergeViewState() to intersect
the clip region.

The VCL canvas has a bug in its gradientFill() implemenation where it
overrides the existing clip on the OutputDevice instead of intersecting
it.

This properly fixes the bug that was wrongly and badly attempted
to be fixed by commit 99e373cd4c78084ded349f3e3de7b0504af2dd90.

Change-Id: Id02678c2f134fe7b190866d6a6fff5b2e5e3aaff
(cherry picked from commit 5d710cf7dda27e78f237211fd92418be4dd1c551)
Reviewed-on: https://gerrit.libreoffice.org/50886
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx 
b/canvas/source/vcl/canvashelper_texturefill.cxx
index c2735a5ce46d..3a9c1a356c3a 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -602,7 +602,7 @@ namespace vclcanvas
 const vcl::Region aPolyClipRegion( rPoly );
 
 rOutDev.Push( PushFlags::CLIPREGION );
-rOutDev.SetClipRegion( aPolyClipRegion );
+rOutDev.IntersectClipRegion( aPolyClipRegion );
 
 doGradientFill( rOutDev,
 rValues,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[Stephan Bergmann]

 RepositoryExternal.mk |8 
 1 file changed, 8 insertions(+)

New commits:
commit f23651ff10da2d4bbbc47d0152b5cc321c29f0d1
Author: Stephan Bergmann 
Date:   Wed Mar 7 21:13:36 2018 +0100

Missing dependencies

Change-Id: Iabdc81c9df2cc50ec4f4713af42d2fb9c3cc1f43
Reviewed-on: https://gerrit.libreoffice.org/50915
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index aecbd71b8b43..eb91d14c3152 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3927,6 +3927,14 @@ $(call gb_Executable_add_runtime_dependencies,saxparser,\
 )
 endef
 
+define gb_Executable__register_svidl
+$(call gb_Executable_add_runtime_dependencies,svidl, \
+$(call gb_Helper_optional,GPGMEPP, \
+$(call gb_Helper_optional,LIBASSUAN,$(call 
gb_Package_get_target_for_build,libassuan)) \
+$(call gb_Helper_optional,LIBGPGERROR,$(call 
gb_Package_get_target_for_build,libgpg-error))) \
+)
+endef
+
 # NOTE: the dependencies on ure/services.rdb and udkapi.rdb are implicitly
 # required due to the settings for URE_SERVICES and URE_TYPES in
 # cppuhelper/source/unorc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Szymon Kłos]

 chart2/qa/extras/chart2import.cxx |   99 ++
 1 file changed, 99 insertions(+)

New commits:
commit dac81c4dc76e6061c9e41957b980206f2b6c730e
Author: Szymon Kłos 
Date:   Tue Mar 6 11:33:16 2018 +0100

tdf#116163 import test

Change-Id: Ie4fd1142ee4968941a639a265d169aaa6413
Reviewed-on: https://gerrit.libreoffice.org/50814
Tested-by: Jenkins 
Reviewed-by: Szymon Kłos 

diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index dee428264d69..04d66e259993 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -25,6 +25,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 #include 
 
@@ -106,6 +109,8 @@ public:
 void testTdf115107(); // import complex data point labels
 void testTdf115107_2(); // import complex data point labels in cobo charts 
with multiple data series
 
+void testTdf116163();
+
 CPPUNIT_TEST_SUITE(Chart2ImportTest);
 CPPUNIT_TEST(Fdo60083);
 CPPUNIT_TEST(testSteppedLines);
@@ -168,12 +173,39 @@ public:
 CPPUNIT_TEST(testTdf115107);
 CPPUNIT_TEST(testTdf115107_2);
 
+CPPUNIT_TEST(testTdf116163);
+
 CPPUNIT_TEST_SUITE_END();
 
 private:
 
 };
 
+uno::Reference getShapeByName(const 
uno::Reference& rShapes,
+const OUString& rName,
+std::function&)> pCondition = 
nullptr)
+{
+uno::Reference XIndexAccess(rShapes, 
uno::UNO_QUERY);
+for (sal_Int32 i = 0; i < XIndexAccess->getCount(); ++i)
+{
+uno::Reference xShapes(XIndexAccess->getByIndex(i), 
uno::UNO_QUERY);
+if (xShapes.is())
+{
+uno::Reference xRet = getShapeByName(xShapes, 
rName, pCondition);
+if (xRet.is())
+return xRet;
+}
+uno::Reference 
xNamedShape(XIndexAccess->getByIndex(i), uno::UNO_QUERY);
+if (xNamedShape->getName() == rName)
+{
+uno::Reference xShape(xNamedShape, 
uno::UNO_QUERY);
+if (pCondition == nullptr || pCondition(xShape))
+return xShape;
+}
+}
+return uno::Reference();
+}
+
 // error bar import
 // split method up into smaller chunks for more detailed tests
 void Chart2ImportTest::Fdo60083()
@@ -1471,6 +1503,73 @@ void Chart2ImportTest::testTdf115107_2()
 
 }
 
+void Chart2ImportTest::testTdf116163()
+{
+load("/chart2/qa/extras/data/pptx/", "tdf116163.pptx");
+
+Reference xChartDoc(getChartDocFromDrawImpress(0, 
0), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xChartDoc.is());
+
+Reference xHAxis = getAxisFromDoc(xChartDoc, 0, 0, 0);
+CPPUNIT_ASSERT(xHAxis.is());
+
+chart2::ScaleData aScaleData = xHAxis->getScaleData();
+CPPUNIT_ASSERT(aScaleData.Categories.is());
+
+Reference xLabeledDataSequence = 
aScaleData.Categories;
+CPPUNIT_ASSERT(xLabeledDataSequence.is());
+
+Reference xDataSequence = 
xLabeledDataSequence->getValues();
+CPPUNIT_ASSERT(xDataSequence.is());
+
+Reference 
xTextualDataSequence(xDataSequence, uno::UNO_QUERY);
+CPPUNIT_ASSERT(xTextualDataSequence.is());
+
+std::vector aCategories;
+Sequence aTextData(xTextualDataSequence->getTextualData());
+::std::copy(aTextData.begin(), aTextData.end(),
+::std::back_inserter(aCategories));
+
+CPPUNIT_ASSERT_EQUAL(OUString("Aaaa"), aCategories[0]);
+CPPUNIT_ASSERT_EQUAL(OUString("Bbb"), aCategories[1]);
+CPPUNIT_ASSERT_EQUAL(OUString("Ccc"), aCategories[2]);
+CPPUNIT_ASSERT_EQUAL(OUString("D"), aCategories[3]);
+
+// Check visible text
+
+uno::Reference xDrawPageSupplier(xChartDoc, 
uno::UNO_QUERY);
+uno::Reference xDrawPage = 
xDrawPageSupplier->getDrawPage();
+uno::Reference xShapes(xDrawPage->getByIndex(0), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xShapes.is());
+
+const OUString sXAxisName = "CID/D=0:CS=0:Axis=0,0";
+uno::Reference xXAxis = getShapeByName(xShapes, 
sXAxisName,
+// Axis occurs twice in chart xshape representation so need to get the 
one related to labels
+[](const uno::Reference& rXShape) -> bool
+{
+uno::Reference xAxisShapes(rXShape, uno::UNO_QUERY);
+CPPUNIT_ASSERT(xAxisShapes.is());
+uno::Reference 
xChildShape(xAxisShapes->getByIndex(0), uno::UNO_QUERY);
+uno::Reference< drawing::XShapeDescriptor > 
xShapeDescriptor(xChildShape, uno::UNO_QUERY_THROW);
+return (xShapeDescriptor->getShapeType() == 
"com.sun.star.drawing.TextShape");
+});
+CPPUNIT_ASSERT(xXAxis.is());
+
+uno::Reference xIndexAccess(xXAxis, 
UNO_QUERY_THROW);
+CPPUNIT_ASSERT(xIndexAccess.is());
+
+// Check text
+uno::Reference xLabel0(xIndexAccess->getByIndex(0), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("Aaaa"), xLabel0->getString());
+uno::Reference xLabel1(xIndexAccess->getByIndex(1), 
uno::UNO_QUERY);
+// If there is space for 3 chars only then don't show "..."
+CPPUNIT_ASSERT_EQUAL(OUString("Bbb"), xLa

[Libreoffice-commits] core.git: include/i18nutil offapi/com

[Eike Rathke]

 include/i18nutil/transliteration.hxx |2 ++
 offapi/com/sun/star/i18n/TransliterationModulesExtra.idl |   11 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 71bf07922b6ff45f9b31fb377d3ac24e172a5c65
Author: Eike Rathke 
Date:   Wed Mar 7 21:29:09 2018 +0100

Clarify that IGNORE_DIACRITICS_CTL is not only CTL, despite its name

Change-Id: I5954094131debb7cdf0fc44a9db3a3609b356baf

diff --git a/include/i18nutil/transliteration.hxx 
b/include/i18nutil/transliteration.hxx
index 6294c5eee1e5..f962929b2bdc 100644
--- a/include/i18nutil/transliteration.hxx
+++ b/include/i18nutil/transliteration.hxx
@@ -119,7 +119,9 @@ enum class TransliterationFlags {
 /// transliterate Japanese normal sized character to small sized character
 largeToSmall_ja_JP = 
int(css::i18n::TransliterationModules_largeToSmall_ja_JP),
 
+/// Transliterate decomposing and removing diacritics, not only CTL, 
despite its name.
 IGNORE_DIACRITICS_CTL  = 
int(css::i18n::TransliterationModulesExtra::IGNORE_DIACRITICS_CTL),
+/// Ignore Kashida mark.
 IGNORE_KASHIDA_CTL = 
int(css::i18n::TransliterationModulesExtra::IGNORE_KASHIDA_CTL)
 };
 namespace o3tl {
diff --git a/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl 
b/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl
index be82cf74821a..5a67714ba640 100644
--- a/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl
+++ b/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl
@@ -50,8 +50,17 @@ constants TransliterationModulesExtra
  */
 const short TOGGLE_CASE = 202;
 
-/// because we cannot extend TransliterationModule we used 
TranslationModuleExtra and it will act the same way
+/** Ignore diacritics. Despite the _CTL name suffix this is not only
+about CTL/Arabic diacritic characters, though these are handled
+as well, but the transliteration decomposes and removes any
+diacritic from characters.
+
+Because we cannot extend the TransliterationModules enum we use
+TranslationModuleExtra and it will act the same way.
+ */
 const long IGNORE_DIACRITICS_CTL   = 0x4000;
+
+/** Ignore Kashida mark. */
 const long IGNORE_KASHIDA_CTL  = 0x0800;
 
 const long END_OF_MODULE= 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - 2 commits - xmloff/source

[Noel Grandin]

 xmloff/source/style/XMLFootnoteSeparatorExport.cxx |6 +-
 xmloff/source/style/XMLFootnoteSeparatorImport.cxx |2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 95bf328d76352c4a2745ece21ccf99ac41693fb8
Author: Noel Grandin 
Date:   Wed Mar 7 17:32:40 2018 +0200

tdf#115432 footnote separator position wrong (3rd attempt)

My second attempt in

   commit dedf5e4f9000e271683dea9a0488e1b45b91176c
   "tdf#115432 footnote separator position wrong (2nd attempt)"

managed to lose part of the change because of incorrect rebasing.

Change-Id: I7b18f3e1602c617d1cb414ef0eb2ee456aeb58ee
Reviewed-on: https://gerrit.libreoffice.org/50901
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 
(cherry picked from commit dcd95c6fff548c7ac46688244e44b95464fb297d)
Reviewed-on: https://gerrit.libreoffice.org/50912

diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx 
b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
index 74ca184edcfc..a4ca43a68dd6 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
@@ -75,8 +75,12 @@ void XMLFootnoteSeparatorExport::exportXML(
 switch (rMapper->GetEntryContextId(rState.mnIndex))
 {
 case CTF_PM_FTN_LINE_ADJUST:
-rState.maValue >>= eLineAdjust;
+{
+sal_Int16 nTmp;
+if (rState.maValue >>= nTmp)
+eLineAdjust = static_cast(nTmp);
 break;
+}
 case CTF_PM_FTN_LINE_COLOR:
 rState.maValue >>= nLineColor;
 break;
commit 800b3eb336f8ad707848d44656e322ed87cb3570
Author: Noel Grandin 
Date:   Tue Mar 6 15:18:53 2018 +0200

tdf#115432 footnote separator position wrong (2nd attempt)

the first attempt (d4a8d91abd40dee7f7bd739a678a502a6e34cb59)
incorrectly changed the type of a UNO property defined in a
published IDL file.

Change-Id: I75bc75dead0954d1faa6dfb6adab9f4c42c67cfc
Reviewed-on: https://gerrit.libreoffice.org/50827
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 
(cherry picked from commit 1163bcd5da3063e7e988ebf49d9b60dfd6f6c703)
Reviewed-on: https://gerrit.libreoffice.org/50894
Reviewed-by: Michael Stahl 

diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx 
b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
index c9a7bfb2dd07..546e5bdec4e4 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx
@@ -159,7 +159,7 @@ void XMLFootnoteSeparatorImport::StartElement(
 sal_Int32 nIndex;
 
 nIndex = rMapper->FindEntryIndex(CTF_PM_FTN_LINE_ADJUST);
-XMLPropertyState aLineAdjust( nIndex, uno::Any(eLineAdjust));
+XMLPropertyState aLineAdjust( nIndex, uno::Any(sal_Int16(eLineAdjust)) );
 rProperties.push_back(aLineAdjust);
 
 nIndex = rMapper->FindEntryIndex(CTF_PM_FTN_LINE_COLOR);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/unx/gtk3/gtk3gtkinst.cxx |   24 +++-
 1 file changed, 23 insertions(+), 1 deletion(-)

New commits:
commit f2a8f440bf2e8ad9ad0d595d1ab0cecf08de4a5c
Author: Caolán McNamara 
Date:   Tue Mar 6 17:27:05 2018 +

workaround https://gitlab.gnome.org/GNOME/gtk/issues/70

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

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index ef8060662269..4a8912594e45 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -2545,10 +2545,32 @@ private:
 GtkExpander* m_pExpander;
 gulong m_nSignalId;
 
-static void signalExpanded(GtkExpander*, GParamSpec *, gpointer widget)
+static void signalExpanded(GtkExpander* pExpander, GParamSpec *, gpointer 
widget)
 {
 GtkInstanceExpander* pThis = static_cast(widget);
 pThis->signal_expanded();
+
+GtkWidget *pToplevel = gtk_widget_get_toplevel(GTK_WIDGET(pExpander));
+
+// https://gitlab.gnome.org/GNOME/gtk/issues/70
+// I imagine at some point a release with a fix will be available in 
which
+// case this can be avoided depending on version number
+if (pToplevel && GTK_IS_WINDOW(pToplevel) && 
gtk_widget_get_realized(pToplevel))
+{
+int nToplevelWidth, nToplevelHeight;
+int nChildHeight;
+
+GtkWidget* child = gtk_bin_get_child(GTK_BIN(pExpander));
+gtk_widget_get_preferred_height(child, &nChildHeight, nullptr);
+gtk_window_get_size(GTK_WINDOW(pToplevel), &nToplevelWidth, 
&nToplevelHeight);
+
+if (pThis->get_expanded())
+nToplevelHeight += nChildHeight;
+else
+nToplevelHeight -= nChildHeight;
+
+gtk_window_resize(GTK_WINDOW(pToplevel), nToplevelWidth, 
nToplevelHeight);
+}
 }
 
 public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 extras/source/glade/libreoffice-catalog.xml.in |3 
 include/sfx2/new.hxx   |   52 ++-
 include/vcl/weld.hxx   |   30 ++
 sd/source/ui/dlg/sdpreslt.cxx  |   11 
 sfx2/source/doc/new.cxx|  354 +
 sfx2/source/inc/preview.hxx|   26 -
 sfx2/uiconfig/ui/loadtemplatedialog.ui |  129 ++---
 sw/source/ui/dbui/mmdocselectpage.cxx  |6 
 sw/source/uibase/app/docsh2.cxx|   11 
 vcl/source/app/salvtables.cxx  |   58 +++-
 vcl/unx/gtk3/gtk3gtkinst.cxx   |   59 
 11 files changed, 417 insertions(+), 322 deletions(-)

New commits:
commit 82925b574209d3971c05b9bd98a317683dd583a5
Author: Caolán McNamara 
Date:   Tue Mar 6 12:25:35 2018 +

weld SfxNewFileDialog

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

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 3f7c5a71dc9c..c0a89747cb8a 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -247,9 +247,6 @@
 
-
 
diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx
index 200a15e186bb..91539cb7a048 100644
--- a/include/sfx2/new.hxx
+++ b/include/sfx2/new.hxx
@@ -22,18 +22,17 @@
 #include 
 #include 
 #include 
+#include 
 
-#include 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
 #include 
 
 
 class SfxObjectShellLock;
 class SfxObjectShell;
-
+class SfxPreviewWin_Impl;
 
 enum class SfxNewFileDialogMode {
 NONE, Preview, LoadTemplate
@@ -55,19 +54,42 @@ namespace o3tl
 
 #define RET_TEMPLATE_LOAD   100
 
-class SfxNewFileDialog_Impl;
-class SFX2_DLLPUBLIC SfxNewFileDialog : public SfxModalDialog
+class SFX2_DLLPUBLIC SfxNewFileDialog
 {
-friend class SfxNewFileDialog_Impl;
-
 private:
-std::unique_ptr< SfxNewFileDialog_Impl > pImpl;
+std::unique_ptr m_xBuilder;
+std::unique_ptr m_xDialog;
+std::unique_ptr m_xRegionLb;
+std::unique_ptr m_xTemplateLb;
+std::unique_ptr m_xTextStyleCB;
+std::unique_ptr m_xFrameStyleCB;
+std::unique_ptr m_xPageStyleCB;
+std::unique_ptr m_xNumStyleCB;
+std::unique_ptr m_xMergeStyleCB;
+std::unique_ptr m_xLoadFilePB;
+std::unique_ptr m_xMoreBt;
+std::unique_ptr m_xPreviewWin;
+std::unique_ptr m_xAltTitleFt;
+Idle m_aPrevIdle;
+OUString m_sLoadTemplate;
+
+SfxNewFileDialogMode m_nFlags;
+SfxDocumentTemplates m_aTemplates;
+SfxObjectShellLock m_xDocShell;
+
+DECL_LINK( Update, Timer *, void );
+
+DECL_LINK(RegionSelect, weld::TreeView&, void);
+DECL_LINK(TemplateSelect, weld::TreeView&, void);
+DECL_LINK(DoubleClick, weld::TreeView&, void);
+DECL_LINK(Expand, weld::Expander&, void);
+sal_uInt16  GetSelectedTemplatePos() const;
 
 public:
-
-SfxNewFileDialog(vcl::Window *pParent, SfxNewFileDialogMode nFlags);
-virtual ~SfxNewFileDialog() override;
-virtual void dispose() override;
+SfxNewFileDialog(weld::Window *pParent, SfxNewFileDialogMode nFlags);
+void set_title(const OUString& rTitle) { m_xDialog->set_title(rTitle); }
+short run() { return m_xDialog->run(); }
+~SfxNewFileDialog();
 
 // Returns false, when '- No -' is set as Template
 // Template names can only be obtained when IsTemplate() returns true.
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 9a46a191e7a0..b861b848e84c 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -99,10 +99,25 @@ protected:
 public:
 virtual void set_title(const OUString& rTitle) = 0;
 virtual OUString get_title() const = 0;
+virtual void set_busy_cursor(bool bBusy) = 0;
 
 void connect_help(const Link& rLink) { m_aHelpRequestHdl = 
rLink; }
 };
 
+class VCL_DLLPUBLIC WaitObject
+{
+private:
+weld::Window* m_pWindow;
+
+public:
+WaitObject(weld::Window* pWindow)
+: m_pWindow(pWindow)
+{
+m_pWindow->set_busy_cursor(true);
+}
+~WaitObject() { m_pWindow->set_busy_cursor(false); }
+};
+
 class VCL_DLLPUBLIC Dialog : virtual public Window
 {
 public:
@@ -455,6 +470,20 @@ public:
 virtual void set_selection(const Selection&) = 0;
 };
 
+class VCL_DLLPUBLIC Expander : virtual public Container
+{
+protected:
+Link m_aExpandedHdl;
+
+void signal_expanded() { m_aExpandedHdl.Call(*this); }
+
+public:
+virtual bool get_expanded() const = 0;
+virtual void set_expanded(bool bExpand) = 0;
+
+void connect_expanded(const Link& rLink) { m_aExpandedHdl 
= rLink; }
+};
+
 class VCL_DLLPUBLIC DrawingArea : virtual public Widget
 {
 protected:
@@ -500,6 +529,7 @@ public:
 virtual TreeView* weld_tree_view(const OString& id, bool bTakeOwnership = 

[Libreoffice-commits] core.git: basctl/uiconfig cui/uiconfig dbaccess/uiconfig desktop/uiconfig extensions/uiconfig filter/uiconfig sc/uiconfig sd/uiconfig sfx2/uiconfig svtools/uiconfig svx/uiconfig

[Caolán McNamara]

 basctl/uiconfig/basicide/ui/deletelangdialog.ui |1 +
 cui/uiconfig/ui/querychangelineenddialog.ui |1 +
 cui/uiconfig/ui/querydeletebitmapdialog.ui  |1 +
 cui/uiconfig/ui/querydeletechartcolordialog.ui  |1 +
 cui/uiconfig/ui/querydeletecolordialog.ui   |1 +
 cui/uiconfig/ui/querydeletedictionarydialog.ui  |1 +
 cui/uiconfig/ui/querydeletegradientdialog.ui|1 +
 cui/uiconfig/ui/querydeletehatchdialog.ui   |1 +
 cui/uiconfig/ui/querydeletelineenddialog.ui |1 +
 cui/uiconfig/ui/querydeletelinestyledialog.ui   |1 +
 cui/uiconfig/ui/queryduplicatedialog.ui |1 +
 cui/uiconfig/ui/querynoloadedfiledialog.ui  |1 +
 cui/uiconfig/ui/querynosavefiledialog.ui|1 +
 cui/uiconfig/ui/querysavelistdialog.ui  |1 +
 cui/uiconfig/ui/queryupdategalleryfilelistdialog.ui |1 +
 dbaccess/uiconfig/ui/deleteallrowsdialog.ui |1 +
 dbaccess/uiconfig/ui/designsavemodifieddialog.ui|1 +
 dbaccess/uiconfig/ui/saveindexdialog.ui |1 +
 dbaccess/uiconfig/ui/savemodifieddialog.ui  |1 +
 dbaccess/uiconfig/ui/tabledesignsavemodifieddialog.ui   |1 +
 desktop/uiconfig/ui/installforalldialog.ui  |1 +
 extensions/uiconfig/sbibliography/ui/querydialog.ui |2 ++
 filter/uiconfig/ui/warnpdfdialog.ui |1 +
 sc/uiconfig/scalc/ui/checkwarningdialog.ui  |2 ++
 sc/uiconfig/scalc/ui/queryrunstreamscriptdialog.ui  |1 +
 sc/uiconfig/scalc/ui/recalcquerydialog.ui   |2 ++
 sc/uiconfig/scalc/ui/sharedwarningdialog.ui |2 ++
 sd/uiconfig/sdraw/ui/queryunlinkimagedialog.ui  |1 +
 sfx2/uiconfig/ui/errorfindemaildialog.ui|1 +
 sfx2/uiconfig/ui/helpmanual.ui  |1 +
 sfx2/uiconfig/ui/querysavedialog.ui |1 +
 sfx2/uiconfig/ui/safemodequerydialog.ui |2 ++
 svtools/uiconfig/ui/javadisableddialog.ui   |1 +
 svtools/uiconfig/ui/querydeletedialog.ui|1 +
 svx/uiconfig/ui/deletefooterdialog.ui   |1 +
 svx/uiconfig/ui/deleteheaderdialog.ui   |1 +
 svx/uiconfig/ui/formlinkwarndialog.ui   |1 +
 svx/uiconfig/ui/querydeletecontourdialog.ui |1 +
 svx/uiconfig/ui/querydeleteobjectdialog.ui  |1 +
 svx/uiconfig/ui/querydeletethemedialog.ui   |1 +
 svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui |1 +
 svx/uiconfig/ui/querynewcontourdialog.ui|1 +
 svx/uiconfig/ui/querysavecontchangesdialog.ui   |1 +
 svx/uiconfig/ui/querysaveimagemapchangesdialog.ui   |1 +
 svx/uiconfig/ui/queryunlinkgraphicsdialog.ui|1 +
 svx/uiconfig/ui/savemodifieddialog.ui   |1 +
 sw/uiconfig/swriter/ui/asksearchdialog.ui   |1 +
 sw/uiconfig/swriter/ui/cannotsavelabeldialog.ui |1 +
 sw/uiconfig/swriter/ui/datasourcesunavailabledialog.ui  |1 +
 sw/uiconfig/swriter/ui/infonotfounddialog.ui|1 +
 sw/uiconfig/swriter/ui/printmergedialog.ui  |1 +
 sw/uiconfig/swriter/ui/querycontinuebegindialog.ui  |1 +
 sw/uiconfig/swriter/ui/querycontinueenddialog.ui|1 +
 sw/uiconfig/swriter/ui/querydefaultcompatdialog.ui  |1 +
 sw/uiconfig/swriter/ui/queryredlinedialog.ui|1 +
 sw/uiconfig/swriter/ui/queryrotateintostandarddialog.ui |1 +
 sw/uiconfig/swriter/ui/querysavelabeldialog.ui  |1 +
 sw/uiconfig/swriter/ui/queryshowchangesdialog.ui|1 +
 sw/uiconfig/swriter/ui/saveashtmldialog.ui  |1 +
 sw/uiconfig/swriter/ui/warndatasourcedialog.ui  |1 +
 sw/uiconfig/swriter/ui/warnemaildialog.ui   |1 +
 uui/uiconfig/ui/sslwarndialog.ui|1 +
 uui/uiconfig/ui/unknownauthdialog.ui|1 +
 vcl/uiconfig/ui/errornocontentdialog.ui |1 +
 vcl/uiconfig/ui/errornoprinterdialog.ui |1 +
 65 files changed, 70 insertions(+)

New commits:
commit 64117f700ba3bd8c4b42488f582fa5e5c53487e6
Author: Caolán McNamara 
Date:   Wed Mar 7 17:37:25 2018 +

make all the .ui message dialogs explicitly modal

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

diff --git a/basctl/uiconfig/basicide/ui/deletelangdialog.ui 
b/basctl/uiconfig/basicide/ui/deletelangdialog.ui
index a90d487206d9..417436553a4e 100644
--- a/basctl/uiconfig/basicide/ui/deletelangdialog.ui
+++ b/basctl/uiconfig/basicide/ui/deletelangdialog.ui
@@ -6,6 +6,7 @@
 

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

[Caolán McNamara]

 sw/uiconfig/swriter/ui/inforeadonlydialog.ui |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6cd588452b6fda615d03c0ff5439cfd15511081e
Author: Caolán McNamara 
Date:   Wed Mar 7 16:36:41 2018 +

make explicit ui modality for sample async dialog

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

diff --git a/sw/uiconfig/swriter/ui/inforeadonlydialog.ui 
b/sw/uiconfig/swriter/ui/inforeadonlydialog.ui
index a881a92cedfd..8ad5fb571bd1 100644
--- a/sw/uiconfig/swriter/ui/inforeadonlydialog.ui
+++ b/sw/uiconfig/swriter/ui/inforeadonlydialog.ui
@@ -6,6 +6,7 @@
 False
 Read-Only Content
 False
+True
 dialog
 True
 ok
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 sc/source/ui/cctrl/cbuttonw.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit d48840e5df14e8204668b06954f59d270c628684
Author: Jan Holesovsky 
Date:   Wed Mar 7 18:30:22 2018 +0100

sc lok: Let the tiled rendering draw the List Validation dropdowns.

Change-Id: I84530cdda296dc51ceb0fd695af19211631508df
Reviewed-on: https://gerrit.libreoffice.org/50909
Tested-by: Jenkins 
Reviewed-by: Marco Cecchetti 

diff --git a/sc/source/ui/cctrl/cbuttonw.cxx b/sc/source/ui/cctrl/cbuttonw.cxx
index c8e12e6fbeec..c4067be67f3a 100644
--- a/sc/source/ui/cctrl/cbuttonw.cxx
+++ b/sc/source/ui/cctrl/cbuttonw.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 #include 
 #include 
 #include 
@@ -62,7 +63,8 @@ void ScDDComboBoxButton::Draw( const Point& rAt,
 
 tools::Rectangle   aBtnRect( rAt, rSize );
 
-pOut->EnableMapMode( false );
+if (!comphelper::LibreOfficeKit::isActive())
+pOut->EnableMapMode(false);
 
 DecorationView aDecoView( pOut);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 svx/source/dialog/srchdlg.cxx |   31 +++
 1 file changed, 19 insertions(+), 12 deletions(-)

New commits:
commit d99ae18b68d3889c999b59485006f85f7faa201c
Author: Eike Rathke 
Date:   Wed Mar 7 20:02:26 2018 +0100

Resolves: tdf#116242 handle negated diacritics correctly and show checkbox

The "ignore diacritics" implementation is not only about CTL,
whatever its names suggest. It uses an ICU
"NFD; [:M:] Remove; NFC" transliteration that decomposes and
removes *any* diacritic.

Thus treat it as such and don't hide the checkbox if CTL is not
enabled, but more important preset the sensitive values, and
handle the UI vs implementation oddity correctly; UI "sensitive" /
code "include" means to *not* *ignore*, obtain the proper negated
value from the checkbox.

Unfortunately the setting is stored in the configuration, so an
update will still present the user with an unchecked
Diacritics-sensitive box s/he has to enable once.

The actual failure (diacritics always ignored) is a fallout from

commit d4064927a2e83c974d4ee9538081e8a4fcdb1e34
AuthorDate: Tue Oct 3 10:26:28 2017 -0800
CommitDate: Thu Oct 26 17:24:26 2017 +0200

tdf#111846 Find & Replace: Rename diacritics and kashida options

Change-Id: I65f2a23b66370fdfe2d170c17c7736a3b4177192

diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 3f822f5f84cb..0e46b65fc6a4 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -112,6 +112,10 @@ namespace
 {
 return pBox->IsEnabled() && pBox->IsChecked();
 }
+bool GetNegatedCheckBoxValue(const CheckBox *pBox)
+{
+return pBox->IsEnabled() && !pBox->IsChecked();
+}
 }
 
 struct SearchDlg_Impl
@@ -474,11 +478,15 @@ void SvxSearchDialog::Construct_Impl()
 m_pJapMatchFullHalfWidthCB->Hide();
 }
 SvtCTLOptions aCTLOptions;
+// Do not disable and hide the m_pIncludeDiacritics button.
+// Include Diacritics == Not Ignore Diacritics => A does not match 
A-Umlaut (Diaeresis).
+// Confusingly these have negated names (following the UI) but the actual
+// transliteration is to *ignore* diacritics if "included" (sensitive) is
+// _not_ checked.
 if(!aCTLOptions.IsCTLFontEnabled())
 {
-m_pIncludeDiacritics->Check( false );
-m_pIncludeDiacritics->Hide();
-m_pIncludeKashida->Check( false );
+m_pIncludeDiacritics->Check( true );
+m_pIncludeKashida->Check( true );
 m_pIncludeKashida->Hide();
 }
 //component extension - show component search buttons if the commands
@@ -720,7 +728,7 @@ void SvxSearchDialog::ShowOptionalControls_Impl()
 m_pSimilarityBox->Show();
 m_pSimilarityBtn->Show();
 m_pSelectionBtn->Show();
-m_pIncludeDiacritics->Show(aCTLOptions.IsCTLFontEnabled());
+m_pIncludeDiacritics->Show();
 m_pIncludeKashida->Show(aCTLOptions.IsCTLFontEnabled());
 m_pJapMatchFullHalfWidthCB->Show(aCJKOptions.IsCJKFontEnabled());
 m_pJapOptionsCB->Show(aCJKOptions.IsJapaneseFindEnabled());
@@ -800,8 +808,7 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
 m_pSimilarityBox->Check( pSearchItem->IsLevenshtein() );
 if( m_pJapOptionsCB->IsVisible() )
 m_pJapOptionsCB->Check( pSearchItem->IsUseAsianOptions() );
-if (m_pIncludeDiacritics->IsVisible())
-m_pIncludeDiacritics->Check( !aOpt.IsIgnoreDiacritics_CTL() );
+m_pIncludeDiacritics->Check( !aOpt.IsIgnoreDiacritics_CTL() );
 if (m_pIncludeKashida->IsVisible())
 m_pIncludeKashida->Check( !aOpt.IsIgnoreKashida_CTL() );
 ApplyTransliterationFlags_Impl( pSearchItem->GetTransliterationFlags() );
@@ -1330,9 +1337,9 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, 
pBtn, void )
 if( !pSearchItem->IsUseAsianOptions())
 nFlags &= (TransliterationFlags::IGNORE_CASE |
TransliterationFlags::IGNORE_WIDTH );
-if (!GetCheckBoxValue(m_pIncludeDiacritics))
+if (GetNegatedCheckBoxValue(m_pIncludeDiacritics))
 nFlags |= TransliterationFlags::IGNORE_DIACRITICS_CTL;
-if (!GetCheckBoxValue(m_pIncludeKashida))
+if (GetNegatedCheckBoxValue(m_pIncludeKashida))
 nFlags |= TransliterationFlags::IGNORE_KASHIDA_CTL;
 pSearchItem->SetTransliterationFlags( nFlags );
 
@@ -2287,17 +2294,17 @@ void SvxSearchDialog::SaveToModule_Impl()
 pSearchItem->SetUseAsianOptions(GetCheckBoxValue(m_pJapOptionsCB));
 
 SvtSearchOptions aOpt;
-aOpt.SetIgnoreDiacritics_CTL(!GetCheckBoxValue(m_pIncludeDiacritics));
-aOpt.SetIgnoreKashida_CTL(!GetCheckBoxValue(m_pIncludeKashida));
+
aOpt.SetIgnoreDiacritics_CTL(GetNegatedCheckBoxValue(m_pIncludeDiacritics));
+aOpt.SetIgnoreKashida_CTL(GetNegatedCheckBoxValue(m_pIncludeKashida));
 aOpt.Commit();
 
 TransliterationFlags nFlag

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

[Noel Grandin]

 xmloff/source/style/XMLFootnoteSeparatorExport.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit dcd95c6fff548c7ac46688244e44b95464fb297d
Author: Noel Grandin 
Date:   Wed Mar 7 17:32:40 2018 +0200

tdf#115432 footnote separator position wrong (3rd attempt)

My second attempt in

   commit dedf5e4f9000e271683dea9a0488e1b45b91176c
   "tdf#115432 footnote separator position wrong (2nd attempt)"

managed to lose part of the change because of incorrect rebasing.

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

diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx 
b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
index 5446398e5e72..de68e802b274 100644
--- a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
+++ b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx
@@ -75,8 +75,12 @@ void XMLFootnoteSeparatorExport::exportXML(
 switch (rMapper->GetEntryContextId(rState.mnIndex))
 {
 case CTF_PM_FTN_LINE_ADJUST:
-rState.maValue >>= eLineAdjust;
+{
+sal_Int16 nTmp;
+if (rState.maValue >>= nTmp)
+eLineAdjust = static_cast(nTmp);
 break;
+}
 case CTF_PM_FTN_LINE_COLOR:
 rState.maValue >>= nLineColor;
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Fwd: Request for GSoC project Integrate ui dialogs with translation tooling

[asannan822]

MIME-Version: 1.0
Content-Type: multipart/alternative; 
boundary="--_com.samsung.android.email_2395184194982740"

_com.samsung.android.email_2395184194982740
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: base64

CgoKClNlbnQgZnJvbSBteSBTYW1zdW5nIEdhbGF4eSBzbWFydHBob25lLgotLS0tLS0tLSBPcmln
aW5hbCBtZXNzYWdlIC0tLS0tLS0tRnJvbTogU0FOQU4gQU5TQVJJIDxhc2FubmFuODIyQGdtYWls
LmNvbT4gRGF0ZTogMDMvMDMvMjAxOCAgMTE6MzQgYS5tLiAgKEdNVCswNTozMCkgVG86IGxpYnJl
b2ZmaWNlQGxpc3RzLmZyZWVkZXNrdG9wLm9yZyBTdWJqZWN0OiBSZXF1ZXN0IGZvciBHU29DIHBy
b2plY3QgSW50ZWdyYXRlIHVpIGRpYWxvZ3Mgd2l0aCB0cmFuc2xhdGlvbiB0b29saW5nIApIaSAs
IEknbSBTYW5hbiBBbnNhcmkuIEkgYW0gcHVyc2luZyBteSBCLkUgaW4gY29tcHV0ZXIgRW5naW5l
ZXJpbmcgZnJvbSBNdW1iYWkgdW5pdmVyc2l0eSBJbmRpYS5JIGp1c3QgcmVhZCB0aGUgcHJvamVj
dCBpZGVhIG9mIEludGVncmF0ZWQgVUkuIEkgaGF2ZSBrbm93bGVkZ2UgYWJvdXQgUHl0aG9uLiBJ
IHdvdWxkIGxvdmUgdG8gd29yayBvbiB0aGUgcHJvamVjdC4gUGxlYXNlICwgSWYgeW91IGNhbiBn
aXZlIG1vcmUgZG9jdW1lbnRhdGlvbiBhYm91dCBwcm9qZWN0IGl0IHdpbGwgaGVscCBtZS7CoEJ5
IHRoZSB3YXkgdGhpcyBteSBmaXJzdCBHU29jIGFuZCBJ4oCZbSBuZXcgdG8gb3BlbiBzb3VyY2Ug
LCByZWFsIHdvcmxkIHByb2plY3QuwqBIb3BlIHlvdSB3aWxsIGhlbHAgbWUgYXMgSeKAmW0gYSBi
ZWdpbm5lci7CoFNlbnQgZnJvbSBNYWlsIGZvciBXaW5kb3dzIDEwwqA=

_com.samsung.android.email_2395184194982740
Content-Type: text/html; charset=utf-8
Content-Transfer-Encoding: base64

PGh0bWw+PGhlYWQ+PG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0
L2h0bWw7IGNoYXJzZXQ9VVRGLTgiPjwvaGVhZD48Ym9keT48ZGl2Pjxicj48L2Rpdj48ZGl2Pjxi
cj48L2Rpdj48ZGl2Pjxicj48L2Rpdj48ZGl2Pjxicj48L2Rpdj48ZGl2IGlkPSJjb21wb3Nlcl9z
aWduYXR1cmUiPjxkaXYgc3R5bGU9ImZvbnQtc2l6ZTo4NSU7Y29sb3I6IzU3NTc1NyIgZGlyPSJh
dXRvIj5TZW50IGZyb20gbXkgU2Ftc3VuZyBHYWxheHkgc21hcnRwaG9uZS48L2Rpdj48L2Rpdj48
ZGl2Pjxicj48L2Rpdj48ZGl2IHN0eWxlPSJmb250LXNpemU6MTAwJTtjb2xvcjojMDAwMDAwIj48
IS0tIG9yaWdpbmFsTWVzc2FnZSAtLT48ZGl2Pi0tLS0tLS0tIE9yaWdpbmFsIG1lc3NhZ2UgLS0t
LS0tLS08L2Rpdj48ZGl2PkZyb206IFNBTkFOIEFOU0FSSSAmbHQ7YXNhbm5hbjgyMkBnbWFpbC5j
b20mZ3Q7IDwvZGl2PjxkaXY+RGF0ZTogMDMvMDMvMjAxOCAgMTE6MzQgYS5tLiAgKEdNVCswNToz
MCkgPC9kaXY+PGRpdj5UbzogbGlicmVvZmZpY2VAbGlzdHMuZnJlZWRlc2t0b3Aub3JnIDwvZGl2
PjxkaXY+U3ViamVjdDogUmVxdWVzdCBmb3IgR1NvQyBwcm9qZWN0IEludGVncmF0ZSB1aSBkaWFs
b2dzIHdpdGggdHJhbnNsYXRpb24gdG9vbGluZyA8L2Rpdj48ZGl2Pjxicj48L2Rpdj48L2Rpdj48
ZGl2IGNsYXNzPSJXb3JkU2VjdGlvbjEiPjxwIGNsYXNzPSJNc29Ob3JtYWwiPkhpICwgSSdtIFNh
bmFuIEFuc2FyaS4gSSBhbSBwdXJzaW5nIG15IEIuRSBpbiBjb21wdXRlciBFbmdpbmVlcmluZyBm
cm9tIE11bWJhaSB1bml2ZXJzaXR5IEluZGlhLkkganVzdCByZWFkIHRoZSBwcm9qZWN0IGlkZWEg
b2YgPGZvbnQgc2l6ZT0iNCI+SW50ZWdyYXRlZCBVSTwvZm9udD48c3BhbiBjbGFzcz0ibXctaGVh
ZGxpbmUiPjxzcGFuIHN0eWxlPSJmb250LXNpemU6MTMuMHB0O2ZvbnQtZmFtaWx5OiZxdW90O0Fy
aWFsJnF1b3Q7LHNhbnMtc2VyaWY7Y29sb3I6YmxhY2siPi48L3NwYW4+PC9zcGFuPiBJIGhhdmUg
a25vd2xlZGdlIGFib3V0IFB5dGhvbi4gSSB3b3VsZCBsb3ZlIHRvIHdvcmsgb24gdGhlIHByb2pl
Y3QuIFBsZWFzZSAsIElmIHlvdSBjYW4gZ2l2ZSBtb3JlIGRvY3VtZW50YXRpb24gYWJvdXQgcHJv
amVjdCBpdCB3aWxsIGhlbHAgbWUuPC9wPjxwIGNsYXNzPSJNc29Ob3JtYWwiPjxvOnA+Jm5ic3A7
PC9vOnA+PC9wPjxwIGNsYXNzPSJNc29Ob3JtYWwiPkJ5IHRoZSB3YXkgdGhpcyBteSBmaXJzdCBH
U29jIGFuZCBJ4oCZbSBuZXcgdG8gb3BlbiBzb3VyY2UgLCByZWFsIHdvcmxkIHByb2plY3QuPC9w
PjxwIGNsYXNzPSJNc29Ob3JtYWwiPjxvOnA+Jm5ic3A7PC9vOnA+PC9wPjxwIGNsYXNzPSJNc29O
b3JtYWwiPkhvcGUgeW91IHdpbGwgaGVscCBtZSBhcyBJ4oCZbSBhIGJlZ2lubmVyLjwvcD48cCBj
bGFzcz0iTXNvTm9ybWFsIj48bzpwPiZuYnNwOzwvbzpwPjwvcD48cCBjbGFzcz0iTXNvTm9ybWFs
Ij5TZW50IGZyb20gPGEgaHJlZj0iaHR0cHM6Ly9nby5taWNyb3NvZnQuY29tL2Z3bGluay8/TGlu
a0lkPTU1MDk4NiI+TWFpbDwvYT4gZm9yIFdpbmRvd3MgMTA8L3A+PHAgY2xhc3M9Ik1zb05vcm1h
bCI+PG86cD4mbmJzcDs8L286cD48L3A+PC9kaXY+PC9ib2R5PjwvaHRtbD4=

_com.samsung.android.email_2395184194982740--

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

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

[Miklos Vajna]

 sw/qa/extras/htmlexport/htmlexport.cxx |4 ++--
 sw/source/filter/html/wrthtml.cxx  |2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit a1aa7cfe28c80296d160528a62da33cc031101b0
Author: Miklos Vajna 
Date:   Wed Mar 7 17:50:00 2018 +0100

sw XHTML export: let reqif-xhtml= imply XHTML

An XML namespace for non-XHTML makes little sense.

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

diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index f329c3d4a79f..968533eb1973 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -55,8 +55,8 @@ private:
 setImportFilterOptions("xhtmlns=reqif-xhtml");
 // Bypass filter detect.
 setImportFilterName("HTML (StarWriter)");
-// Export options.
-setFilterOptions("XHTML,xhtmlns=reqif-xhtml");
+// Export options (implies XHTML).
+setFilterOptions("xhtmlns=reqif-xhtml");
 }
 else
 setFilterOptions("");
diff --git a/sw/source/filter/html/wrthtml.cxx 
b/sw/source/filter/html/wrthtml.cxx
index ad6436de3912..385d41f58e01 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -196,6 +196,8 @@ void SwHTMLWriter::SetupFilterOptions(SfxMedium& rMedium)
 if (maNamespace == "reqif-xhtml")
 // XHTML is always just a fragment inside ReqIF.
 mbSkipHeaderFooter = true;
+// XHTML namespace implies XHTML.
+mbXHTML = true;
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSoC] Discussion on project idea "interface for external data source import into Calc"

[Manuj Vashist]

Hello everyone,

I am a sophomore student persuing B.E. In Birla Institute of Technology &
Science Pilani.

I am exploring the LO code base since January and have merged a couple of
easyHacks too :)

I would like to work on the project idea " Implement interface for external
data source import into Calc

" in this summers as GSoC student.

As the currently available dialog imports data from other csv files and
html web pages.as the project is about extending the existing data
providers and data transformation.
I can think of data providers like a sql table that can be included to
it,please give some more information on what kind of data transformation is
referred here.

Also there are two dialogs doing the same thing here link to external data
dialog and data provider dialog, what are the use case of having two diff
dialogs? can't both be merged together?
A bit more info on project will be helpful.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Jan Holesovsky]

 sc/source/ui/cctrl/cbuttonw.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit f11693d5f99bbb8c9ebcd407bc3b13f05bdbd075
Author: Jan Holesovsky 
Date:   Wed Mar 7 18:30:22 2018 +0100

sc lok: Let the tiled rendering draw the List Validation dropdowns.

Change-Id: I84530cdda296dc51ceb0fd695af19211631508df
Reviewed-on: https://gerrit.libreoffice.org/50906
Reviewed-by: Marco Cecchetti 
Tested-by: Marco Cecchetti 

diff --git a/sc/source/ui/cctrl/cbuttonw.cxx b/sc/source/ui/cctrl/cbuttonw.cxx
index f7d9729512d2..ce37dc0f3f0c 100644
--- a/sc/source/ui/cctrl/cbuttonw.cxx
+++ b/sc/source/ui/cctrl/cbuttonw.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 #include 
 #include 
 #include 
@@ -63,7 +64,8 @@ void ScDDComboBoxButton::Draw( const Point& rAt,
 
 Rectangle   aBtnRect( rAt, rSize );
 
-pOut->EnableMapMode( false );
+if (!comphelper::LibreOfficeKit::isActive())
+pOut->EnableMapMode(false);
 
 DecorationView aDecoView( pOut);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract935' - 3 commits - bin/symstore.sh include/sal sal/osl toolkit/source vcl/win

[Thorsten Behrens]

Rebased ref, commits from common ancestor:
commit 08be86ed504a19510a811309156da858d882b5d4
Author: Thorsten Behrens 
Date:   Wed Mar 7 18:15:29 2018 +0100

sal: fix build after ports

Change-Id: I080ba9934e3e2b57c0fca37690cf3a12b9216d85

diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index 566b4457c59f..1a48c3275705 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -20,8 +20,10 @@
 
 #include 
 #include 
+#include 
 
 #include "osl/thread.hxx"
+#include "osl/process.h"
 #include "rtl/string.h"
 #include "rtl/ustring.hxx"
 #include "sal/detail/log.h"
@@ -89,8 +91,8 @@ char const * getEnvironmentVariable() {
 
 #else
 
-char const * getEnvironmentVariable_() {
-char const * p1 = std::getenv("SAL_LOG");
+char const * getEnvironmentVariable(const char* env) {
+char const * p1 = std::getenv(env);
 if (p1 == nullptr) {
 return nullptr;
 }
@@ -101,86 +103,7 @@ char const * getEnvironmentVariable_() {
 return p2;
 }
 
-char const * getEnvironmentVariable() {
-static char const * env = getEnvironmentVariable_();
-return env;
-}
-
-void maybeOutputTimestamp(std::ostringstream &s) {
-char const * env = getEnvironmentVariable();
-if (env == nullptr)
-return;
-bool outputTimestamp = false;
-bool outputRelativeTimer = false;
-for (char const * p = env;;) {
-switch (*p++) {
-case '\0':
-if (outputTimestamp) {
-char ts[100];
-TimeValue systemTime;
-osl_getSystemTime(&systemTime);
-TimeValue localTime;
-osl_getLocalTimeFromSystemTime(&systemTime, &localTime);
-oslDateTime dateTime;
-osl_getDateTimeFromTimeValue(&localTime, &dateTime);
-struct tm tm;
-tm.tm_sec = dateTime.Seconds;
-tm.tm_min = dateTime.Minutes;
-tm.tm_hour = dateTime.Hours;
-tm.tm_mday = dateTime.Day;
-tm.tm_mon = dateTime.Month - 1;
-tm.tm_year = dateTime.Year - 1900;
-strftime(ts, sizeof(ts), "%Y-%m-%d:%H:%M:%S", &tm);
-char milliSecs[10];
-sprintf(milliSecs, "%03d", 
static_cast(dateTime.NanoSeconds/100));
-s << ts << '.' << milliSecs << ':';
-}
-if (outputRelativeTimer) {
-static bool beenHere = false;
-static TimeValue first;
-if (!beenHere) {
-osl_getSystemTime(&first);
-beenHere = true;
-}
-TimeValue now;
-osl_getSystemTime(&now);
-int seconds = now.Seconds - first.Seconds;
-int milliSeconds;
-if (now.Nanosec < first.Nanosec) {
-seconds--;
-milliSeconds = 1000-(first.Nanosec-now.Nanosec)/100;
-}
-else
-milliSeconds = (now.Nanosec-first.Nanosec)/100;
-char relativeTimestamp[100];
-sprintf(relativeTimestamp, "%d.%03d", seconds, milliSeconds);
-s << relativeTimestamp << ':';
-}
-return;
-case '+':
-{
-char const * p1 = p;
-while (*p1 != '.' && *p1 != '+' && *p1 != '-' && *p1 != '\0') {
-++p1;
-}
-if (equalStrings(p, p1 - p, 
RTL_CONSTASCII_STRINGPARAM("TIMESTAMP")))
-outputTimestamp = true;
-else if (equalStrings(p, p1 - p, 
RTL_CONSTASCII_STRINGPARAM("RELATIVETIMER")))
-outputRelativeTimer = true;
-char const * p2 = p1;
-while (*p2 != '+' && *p2 != '-' && *p2 != '\0') {
-++p2;
-}
-p = p2;
-}
-break;
-default:
-; // nothing
-}
-}
-return;
-}
-
+#ifdef WNT
 bool getValueFromLoggingIniFile(const char* key, char* value) {
 rtl::OUString programDirectoryURL;
 rtl::OUString programDirectoryPath;
@@ -208,33 +131,40 @@ bool getValueFromLoggingIniFile(const char* key, char* 
value) {
 return true;
 }
 }
-return;
+return false;
 }
+#endif
 
 char const * getLogLevel() {
 // First check the environment variable, then the setting in logging.ini
-static char const * env = getEnvironmentVariable_("SAL_LOG");
+static char const * env = getEnvironmentVariable("SAL_LOG");
 if (env != nullptr)
 return env;
 
+#ifdef WNT
 static char logLevel[1024];
 if (getValueFromLoggingIniFile("LogLevel", logLevel)) {
 return logLevel;
 }
+#endif
 
 return nullptr;
 }
 
 char const * getLogFilePath() {
 // First check the environment variable, then the setting in logging.ini
-static char const * logFile = getEn

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

[Miklos Vajna]

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

New commits:
commit a64fcdde597514820873817e23eb5cd906cc5b92
Author: Miklos Vajna 
Date:   Wed Mar 7 13:55:50 2018 +0100

sw doc model xml dump: dump SdrObject of frame formats

Gives e.g. title of OLE objects.

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

diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 767a4b25129b..237372b10d81 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -2845,6 +2845,9 @@ void SwFrameFormat::dumpAsXml(xmlTextWriterPtr pWriter) 
const
 
 GetAttrSet().dumpAsXml(pWriter);
 
+if (const SdrObject* pSdrObject = FindSdrObject())
+pSdrObject->dumpAsXml(pWriter);
+
 xmlTextWriterEndElement(pWriter);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/htmlimport/data/reqif-ole-img.xhtml |2 +-
 sw/qa/extras/htmlimport/htmlimport.cxx   |3 +++
 sw/source/filter/html/swhtml.cxx |   20 
 3 files changed, 24 insertions(+), 1 deletion(-)

New commits:
commit b9086ccff6325bdfaf0cf03715fd8be7e2628169
Author: Miklos Vajna 
Date:   Wed Mar 7 14:38:02 2018 +0100

sw XHTML import: handle alt text of OLE objects

That ended up in the body text instead previously, which is unexpected.

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

diff --git a/sw/qa/extras/htmlimport/data/reqif-ole-img.xhtml 
b/sw/qa/extras/htmlimport/data/reqif-ole-img.xhtml
index 05abc7721d24..b552783068ae 100644
--- a/sw/qa/extras/htmlimport/data/reqif-ole-img.xhtml
+++ b/sw/qa/extras/htmlimport/data/reqif-ole-img.xhtml
@@ -1,6 +1,6 @@
 
 
-
+OLE 
Object
 
 
 
diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx 
b/sw/qa/extras/htmlimport/htmlimport.cxx
index 23017e40a79b..079cc803b569 100644
--- a/sw/qa/extras/htmlimport/htmlimport.cxx
+++ b/sw/qa/extras/htmlimport/htmlimport.cxx
@@ -338,6 +338,9 @@ DECLARE_HTMLIMPORT_TEST(testReqIfOleImg, 
"reqif-ole-img.xhtml")
 = xStorage->openStreamElement(aStreamName, embed::ElementModes::READ);
 // This was empty.
 CPPUNIT_ASSERT_EQUAL(OUString("text/rtf"), getProperty(xStream, 
"MediaType"));
+
+// Check alternate text (it was empty).
+CPPUNIT_ASSERT_EQUAL(OUString("OLE Object"), 
getProperty(xObject, "Title").trim());
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index af3e3c65c003..d196c718921e 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -114,10 +114,13 @@
 #include 
 
 #include 
+#include 
 
 #include 
 #include 
 #include 
+#include 
+#include 
 #include "css1atr.hxx"
 
 #define FONTSIZE_MASK   7
@@ -1513,6 +1516,23 @@ void SwHTMLParser::NextToken( HtmlTokenId nToken )
 {
 if( !m_bDocInitalized )
 DocumentDetected();
+
+if (!m_aEmbeds.empty())
+{
+// The text token is inside an OLE object, which means
+// alternate text.
+SwOLENode* pOLENode = m_aEmbeds.top();
+if (SwFlyFrameFormat* pFormat
+= 
dynamic_cast(pOLENode->GetFlyFormat()))
+{
+if (SdrObject* pObject = 
SwXFrame::GetOrCreateSdrObject(*pFormat))
+{
+pObject->SetTitle(pObject->GetTitle() + aToken);
+break;
+}
+}
+}
+
 m_xDoc->getIDocumentContentOperations().InsertString( *m_pPam, 
aToken );
 
 // if there are temporary paragraph attributes and the
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sal/osl/unx/file_misc.cxx   |2 +-
 sal/osl/w32/file_dirvol.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c67d285a8b213816395948c2082faaf6bb6eab43
Author: Stephan Bergmann 
Date:   Wed Mar 7 13:59:19 2018 +0100

Intermediate dir may come into existence during osl_createDirectoryPath

...when some other entity creates it in parallel.  This used to stop 
creating
any subsequent sub-directories in the chain, and instead return a misleading
osl_File_E_EXIST.

I assume this is the underlying issue of the sporadic Jenkins "Daily 
Screenshot
Build on Windows" failures.  (After the previous attempt at getting at that,
d15ff312ad80e4d1f210636e3374a81c14c229a2 "Normalize computation of 
directory and
file-in-directory URLs",
 now
failed for a different file after all,
workdir/screenshots/modules/schart/ui/datarangedialog/DataRangeDialog.png 
during
CppunitTest_chart2_dialogs_test.)

Change-Id: I00ee67c1ef634c5390c677693e143c26266eeda7
Reviewed-on: https://gerrit.libreoffice.org/50892
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index 034ed56df5cb..7e3386cfa4e5 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -537,7 +537,7 @@ static oslFileError create_dir_recursively_(
 oslFileError osl_error = create_dir_recursively_(
 dir_path, aDirectoryCreationCallbackFunc, pData);
 
-if (osl_error != osl_File_E_None)
+if (osl_error != osl_File_E_None && osl_error != osl_File_E_EXIST)
 return osl_error;
 
dir_path[pos] = '/';
diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx
index 929916965777..c9a6c4dd16b6 100644
--- a/sal/osl/w32/file_dirvol.cxx
+++ b/sal/osl/w32/file_dirvol.cxx
@@ -639,7 +639,7 @@ static DWORD create_dir_recursively_(
 
 dir_path->buffer[pos] = BACKSLASH; // restore
 
-if (ERROR_SUCCESS != w32_error)
+if (ERROR_SUCCESS != w32_error && ERROR_ALREADY_EXISTS != w32_error)
 return w32_error;
 
 return create_dir_recursively_(dir_path, aDirectoryCreationCallbackFunc, 
pData);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-6' - connectivity/source offapi/com sc/source

[Stephan Bergmann]

 connectivity/source/drivers/file/FConnection.cxx  |   24 ++--
 offapi/com/sun/star/sdbc/FILEConnectionProperties.idl |4 ++
 sc/source/ui/docshell/docsh8.cxx  |   27 +++---
 3 files changed, 25 insertions(+), 30 deletions(-)

New commits:
commit 5598fa704df171544a913a8cfda62a183f1a1a66
Author: Stephan Bergmann 
Date:   Mon Mar 5 13:56:59 2018 +0100

tdf#116171: Tunnel arbitrary rtl_TextEncoding from sc to sdbc:dbase 
connection

...including those that have no corresponding textual IANA character set 
name
representation, like RTL_TEXTENCODING_MS_950 which is apparently used in 
some
DBase files.

In the past, if eCharSet was RTL_TEXTENCODING_DONTKNOW in 
lcl_getDBaseConnection
it was sent as an empty string CharSet property, which the receiving
OConnection::construct translated back to

  else
  m_nTextEncoding = RTL_TEXTENCODING_DONTKNOW;

so the net effect remains the same for that special case.

Reviewed-on: https://gerrit.libreoffice.org/50772
Reviewed-by: Lionel Elie Mamane 
Tested-by: Jenkins 
(cherry picked from commit 5ad62544bce42396faaae2bc79c7517af6ff085b)
Conflicts:
sc/source/ui/docshell/docsh8.cxx

Change-Id: I84eec8a93d000752b3c429976c58721ea9ea32a4
Reviewed-on: https://gerrit.libreoffice.org/50793
Reviewed-by: Eike Rathke 
Reviewed-by: Lionel Elie Mamane 
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/connectivity/source/drivers/file/FConnection.cxx 
b/connectivity/source/drivers/file/FConnection.cxx
index 27d2b2d9ee03..64017737140f 100644
--- a/connectivity/source/drivers/file/FConnection.cxx
+++ b/connectivity/source/drivers/file/FConnection.cxx
@@ -38,6 +38,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include "resource/file_res.hrc"
@@ -106,15 +107,22 @@ void OConnection::construct(const OUString& url,const 
Sequence< PropertyValue >&
 OSL_VERIFY( pIter->Value >>= aExt );
 else if( pIter->Name == "CharSet" )
 {
-OUString sIanaName;
-OSL_VERIFY( pIter->Value >>= sIanaName );
-
-::dbtools::OCharsetMap aLookupIanaName;
-::dbtools::OCharsetMap::const_iterator aLookup = 
aLookupIanaName.find(sIanaName, ::dbtools::OCharsetMap::IANA());
-if (aLookup != aLookupIanaName.end())
-m_nTextEncoding = (*aLookup).getEncoding();
+if (auto const numeric = o3tl::tryAccess(pIter->Value))
+{
+m_nTextEncoding = *numeric;
+}
 else
-m_nTextEncoding = RTL_TEXTENCODING_DONTKNOW;
+{
+OUString sIanaName;
+OSL_VERIFY( pIter->Value >>= sIanaName );
+
+::dbtools::OCharsetMap aLookupIanaName;
+::dbtools::OCharsetMap::const_iterator aLookup = 
aLookupIanaName.find(sIanaName, ::dbtools::OCharsetMap::IANA());
+if (aLookup != aLookupIanaName.end())
+m_nTextEncoding = (*aLookup).getEncoding();
+else
+m_nTextEncoding = RTL_TEXTENCODING_DONTKNOW;
+}
 }
 else if( pIter->Name == "ShowDeleted" )
 {
diff --git a/offapi/com/sun/star/sdbc/FILEConnectionProperties.idl 
b/offapi/com/sun/star/sdbc/FILEConnectionProperties.idl
index 1e1f36efc8e1..43c6d4c74740 100644
--- a/offapi/com/sun/star/sdbc/FILEConnectionProperties.idl
+++ b/offapi/com/sun/star/sdbc/FILEConnectionProperties.idl
@@ -45,6 +45,10 @@ service FILEConnectionProperties
 
 See the http://www.iana.org/assignments/character-sets";>IANA character set 
list
 for a list of valid values.
+
+For internal purposes (e.g., when using an encoding for which no 
IANA character set name
+exists), this may also be an UNSIGNED SHORT value representing one of 
the rtl_TextEncoding
+values in rtl/textenc.h.
 */
 [optional, property] string CharSet;
 };
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index a021745855d9..73f8bfffe2ac 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -29,10 +29,6 @@
 #include 
 #include 
 
-#if HAVE_FEATURE_DBCONNECTIVITY
-#include 
-#endif
-
 #include 
 #include 
 #include 
@@ -123,28 +119,15 @@ namespace
 OUString aConnUrl("sdbc:dbase:");
 aConnUrl += aPath;
 
-::std::vector< rtl_TextEncoding > aEncodings;
-svxform::charset_helper::getSupportedTextEncodings( aEncodings );
-::std::vector< rtl_TextEncoding >::iterator aIter = 
::std::find(aEncodings.begin(),aEncodings.end(), eCharSet);
-if ( aIter == aEncodings.end() )
-{
-OSL_FAIL( "DBaseImport: dbtools::OCharsetMap doesn't know text 
encoding" );
-return SCERR_IMPORT_CONNECT;
-} // if ( aIter == aMap.end() )
-OUSt

Re: Call for help in MSI/DEB/RPM packaging for new help

[Olivier Hallot]

HI Rene,

Em 07/03/2018 05:24, Rene Engelhard escreveu:
> On Tue, Mar 06, 2018 at 12:13:11PM -0300, Olivier Hallot wrote:
>> I really need advise and help to proceed and build the necessary
>> packages to replace the old help.
>>
>> It requires understanding of build process, makefiles and perl scripts
>> in scp2/ module.
>>
>> The task looks simple: once the new help is built (--with-help=html),
>> the help files are available in core/instdir/help/6.1 so it must take
>> the 6.1/ folder and make a package, which is as simple as zipping it. Of
>> course, replace '6.1' by %PRODUCTVERSION.
>>
>> https://bugs.documentfoundation.org/show_bug.cgi?id=116240
>> https://bugs.documentfoundation.org/show_bug.cgi?id=115312
>>
>> Any collaboration or help here is welcome. Question on the task here or
>> in #libreoffice-dev
> 
> Forgive my ignorance, maybe I am missing something - but if you did the scp2
> stuff correctly (and defined the gid_*s correctly) the packaging should just
> pick it up? I mean, there's already help packaging doing that packing up
> the old help.

I did not do scp2. gid_* is a wizardry I don't master. What I know is
the old help package is processed per modules (writer, calc...), per
language.

> 
> So it basically only boils down to scp2.

Correct.

> 
> How did the stuff end up in instdir anyway? With scp2? Or via some
> manual hackery?

Not scp2 so far. It is in

helpontent2/CustomTarget_*.mk

https://gerrit.libreoffice.org/gitweb?p=help.git;a=commitdiff;h=ba16363fee2832acf3a33c718fa60cfb5aa67fc8


> 
> That would also solve it automatically for distributions who use
> make disto-pack-install (which is basically a make install with writing
> the contents of the gid_*s to gid_* files on disk so one can use those
> for splitting the packages appropriately)
> 
> Regards,
> 
> Rene

Thanks for the comments.



-- 
Olivier Hallot
LibreOffice Documentation Coordinator
Comunidade LibreOffice
Rio de Janeiro - Brasil - Local Time: UTC-03:00
http://tdf.io/joinus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Miklos Vajna]

 configure.ac |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit c54790def5dc191c358ebcc463cc33e5b5813216
Author: Miklos Vajna 
Date:   Wed Mar 7 13:45:27 2018 +0100

configure: require nodejs 6

Build will fail for nodejs 4 anyway, so fail early in configure.

Change-Id: I0be746454cd21401195f8bf72a4eb107a3433fd7
Reviewed-on: https://gerrit.libreoffice.org/50889
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/configure.ac b/configure.ac
index fee51a265..6f101a259 100644
--- a/configure.ac
+++ b/configure.ac
@@ -425,6 +425,16 @@ else
 fi
 fi
 
+AC_PATH_PROG(NODE, node, no)
+if test "$NODE" = "no"; then
+AC_MSG_ERROR([node required to build loleaflet, but not installed])
+else
+NODE_VER=`node --version | sed 's/^v//' | awk -F. '{ print (($1 * 100) + 
$2) * 100 + $3;}'`
+if test "$NODE_VER" -lt 6; then
+AC_MSG_ERROR([This node version is old, upgrade to >= 6.0.0])
+fi
+fi
+
 test "$prefix" = NONE && prefix=$ac_default_prefix
 LOOLWSD_CACHEDIR=${localstatedir}/cache/${PACKAGE}
 while :; do
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - canvas/source

[Yuri Dario]

 canvas/source/cairo/cairo_os2_cairo.cxx  |6 +-
 canvas/source/cairo/cairo_textlayout.cxx |9 +++--
 2 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 8b8df380310b2ba0c92ddff97361b0c4989d659f
Author: Yuri Dario 
Date:   Wed Mar 7 14:46:14 2018 +

#i127723# Fix StarSymbol to OpenSymbol mapping when using cairo on OS/2.

diff --git a/canvas/source/cairo/cairo_os2_cairo.cxx 
b/canvas/source/cairo/cairo_os2_cairo.cxx
index 788b51e3897f..e9b4912be7a6 100644
--- a/canvas/source/cairo/cairo_os2_cairo.cxx
+++ b/canvas/source/cairo/cairo_os2_cairo.cxx
@@ -327,7 +327,11 @@ namespace cairo
 fontAttrs.usCodePage = 850;
 fontAttrs.fsType = FATTR_TYPE_MBCS;
 fontAttrs.fsFontUse = FATTR_FONTUSE_NOMIX;
-strcpy( fontAttrs.szFacename, font);
+// map StarSymbol to OpenSymbol
+if (strcmp( font, "StarSymbol") == 0)
+strcpy( fontAttrs.szFacename, "OpenSymbol");
+else
+strcpy( fontAttrs.szFacename, font);
 rc = Ft2CreateLogFont( hps, NULL, 1L, &fontAttrs);
 rc = Ft2SetCharSet( hps, 1L);
 
diff --git a/canvas/source/cairo/cairo_textlayout.cxx 
b/canvas/source/cairo/cairo_textlayout.cxx
index 4fb559ec8a0a..b8eff6393c16 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -546,8 +546,13 @@ namespace cairocanvas
 CAIRO_FONT_SLANT_NORMAL : 
CAIRO_FONT_SLANT_ITALIC);
 cairo_font_weight_t weight = (rOutDev.GetFont().GetWeight() == 
WEIGHT_NORMAL ?
   CAIRO_FONT_WEIGHT_NORMAL : 
CAIRO_FONT_WEIGHT_BOLD);
-cairo_select_font_face( pSCairo.get(), aFontName,
-slant, weight);
+// map StarSymbol to OpenSymbol
+if (aFontName.equals("StarSymbol"))
+cairo_select_font_face( pSCairo.get(), "OpenSymbol",
+slant, weight);
+else
+cairo_select_font_face( pSCairo.get(), aFontName,
+slant, weight);
 #endif
 
 if (font_face)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [GSoC] Getting started with Implementing Table Styles in Calc

[Eike Rathke]

Hi Abhishek,

On Saturday, 2018-03-03 23:49:28 +0530, Abhishek Shrivastava wrote:

> Thanks for your mails. I'd like to get involved in this project idea.

Great I didn't scare you away ;-)

> > First, alternating formatting for even and odd rows creates alternating
> > patterns, which can be a waste of memory for large table ranges and
> > slows down lookup of pattern ranges.
> 
> How does setting the style as a hard cell attribute bloat the document
> size ? Do the hard cell attributes get stored for each cell ?

Depends on.. they are stored in memory for row ranges within a column,
but the problem here are alternating row attributions. These lead to
different patterns for each row within a column, thus a pattern for each
cell.


> > Second, specifically the alternating rows formatting doesn't follow the
> > visual expectation if for example one row is hidden, which also just
> > hides the attribution of that row instead of dynamically adjusting the
> > display to the data table style.
> 
> Yes, similar thing happens in table styles in writer as well. Each
> time any  cell in the data range are changed we can recalculate the
> style for the whole table?

With the current mechanism that would have to be stored in the attribute
patterns, something that is to be avoided. For the new data table styles
the effective attribution for a specific cell should be calculated on
the fly when displaying or printing.


> > The data table style shall be implemented such that it takes *one*
> > attribute in the pattern (just which data table style is in use), so
> > a row range within a column can share one pattern (unless hard
> > attributes are present as well). Displaying a cell with the data table
> > style will have to evaluate how to actually display the cell in
> > question, depending on its position within the dynamic table.
> >
> > Possible might also be to not have the data table style attribute in the
> > cell attributes but hold another structure at the column, only present
> > if at least one data table style is applied, but that of course also
> > needs to handle insertion/deletion into/from ranges and move of ranges
> > and the like.
> 
> 
> A data table style can be stored as a enum or something like that,

Rather some ID than an enum, but yes, basically that's it.

> of
> which only the selected instance is present, and the affected cells
> can refer to it for setting the attributes.
> This might also help in saving up space, as cells would no longer need
> to store the attributes redundantly?
> 
> What I mean is, maybe we can have a shared struct which can hold the
> data table style values, and cells in data range can refer to it.

That's the idea behind it, yes.


> > One thing I forgot to mention is that within one data table style there
> > are hierarchical relations between some areas, such as the whole table
> > has one style, which is the parent of other styles if a feature of
> > a table style is activated, such as if banded rows are activated there
> > will be two row style alternating, of which each row style is a child of
> > the whole table style; or the header row style will be a child of the
> > whole table style, and the first header cell and last header cell will
> > each be a child of the header row style.
> 
> What is the need of hierarchy in a table style? Wouldn't each style be
> independent on its own?

No. Within one data table there can be several "features" activated, for
which each inherits a parent style and only overrides the attributes it
defines, all other attributes are taken from the parent. Let me line
this out:

* Data Table
  + Whole Table Style
direct or indirect parent of all other styles within a Data Table
  * Banded Columns feature
* number of columns in Column Stripe 1
* number of columns in Column Stripe 2
+ Column Stripe 1 Style
  child of Whole Table Style
+ Column Stripe 2 Style
  child of Whole Table Style
  * Banded Rows feature
* number of rows in Row Stripe 1
* number of rows in Row Stripe 2
+ Row Stripe 1 Style
  child of Whole Table Style
+ Row Stripe 2 Style
  child of Whole Table Style
  * First Column feature
+ First Column Style
  child of Whole Table Style
  * Last Column feature
+ Last Column Style
  child of Whole Table Style
  * Header Row feature
+ Header Row Style
  child of Whole Table Style, is parent of First Header Cell Style
  and Last Header Cell Style
  + First Header Cell Style (top left)
child of Header Row Style
  + Last Header Cell Style (top right)
child of Header Row Style
  * Total Row feature
+ Total Row Style
  child of Whole Table Style, is parent of First Total Cell Style
  and Last Total Cell Style
  + First Total Cell Style (bottom left)
child of Total Row Style
  + Last Total Cell Style (bottom right)
child of Total Row Style

I hope this clarifies.


> I also went through Heiko's mail.

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - fpicker/source

[Jan-Marek Glogowski]

 fpicker/source/win32/filepicker/asyncrequests.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0898760c20c44e18278c5cb7513d11d041820d42
Author: Jan-Marek Glogowski 
Date:   Mon Mar 5 20:43:53 2018 +0100

tdf#116147 guard triggerRequestThreadAware

It didn't help putting a SolarMutexGuard into
VCLXButton::ProcessWindowEvent, which was my first suspect in my
own backtrace, as VCLXWindowImpl::OnProcessCallbacks releases it
to process the callbacks.

Since the gtk backend also guards all calls into the file picker
code, I think it's save to do the same for the Windows picker.

I have no idea where it is actually released again...

Change-Id: I3ab3b47904dc3d0033739a82f7afd91e6e80403d
Reviewed-on: https://gerrit.libreoffice.org/50783
Tested-by: Jenkins 
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit 3e38b81a65ced47595e9760bdc622d9434b72cc0)
Reviewed-on: https://gerrit.libreoffice.org/50796
Reviewed-by: Michael Stahl 

diff --git a/fpicker/source/win32/filepicker/asyncrequests.cxx 
b/fpicker/source/win32/filepicker/asyncrequests.cxx
index e3e97a0e090b..766a2309d991 100644
--- a/fpicker/source/win32/filepicker/asyncrequests.cxx
+++ b/fpicker/source/win32/filepicker/asyncrequests.cxx
@@ -138,6 +138,7 @@ void AsyncRequests::triggerRequestThreadAware(const 
RequestRef& rRequest,
 {
 oslThreadIdentifier nOurThreadId= getIdentifier();
 oslThreadIdentifier nCallerThreadId = 
::osl::Thread::getCurrentIdentifier();
+SolarMutexGuard aGuard;
 if (nOurThreadId == nCallerThreadId)
 triggerRequestDirectly(rRequest);
 else if (nWait == BLOCKED)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini]

 sw/source/core/layout/sectfrm.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a9ac68b74646a174eabe50f0f29e61947a787cac
Author: Andrea Gelmini 
Date:   Wed Mar 7 12:51:49 2018 +0100

Fix typo

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

diff --git a/sw/source/core/layout/sectfrm.cxx 
b/sw/source/core/layout/sectfrm.cxx
index 502650c34e53..52391e106fb4 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -1758,7 +1758,7 @@ SwLayoutFrame *SwFrame::GetNextSctLeaf( MakePageType 
eMakePage )
 assert(!pTmp->IsPageFrame());
 assert(pTmp->GetType() == (*iter)->GetType());
 // for cell frames and table frames:
-// 1) there may be multliple follow frames of the old one
+// 1) there may be multiple follow frames of the old one
 // 2) the new frame may be identical to the old one
 //(not sure if this is allowed, but it happens now
 // for the outer table of a nested table)
___
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-5.3-42'

[Andras Timar]

Tag 'cp-5.3-42' created by Andras Timar  at 
2018-03-07 13:58 +

cp-5.3-42

Changes since cp-5.3-41-54:
---
 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-5.3-42'

[Andras Timar]

Tag 'cp-5.3-42' created by Andras Timar  at 
2018-03-07 13:58 +

cp-5.3-42

Changes since cp-5.3-36-8:
---
 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-5.3-42'

[Olivier R]

Tag 'cp-5.3-42' created by Andras Timar  at 
2018-03-07 13:58 +

cp-5.3-42

Changes since cp-5.3-10:
Olivier R (1):
  tdf#107558 French spelling dictionary (6.0.3) and thesaurus

---
 fr_FR/README_fr.txt   |4 
 fr_FR/description.xml |2 
 fr_FR/fr.aff  |17751 ++--
 fr_FR/fr.dic  |155369 
+-
 fr_FR/package-description.txt |2 
 fr_FR/thes_fr.dat |  206 
 6 files changed, 88495 insertions(+), 84839 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-5.3' - configure.ac

[Andras Timar]

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

New commits:
commit 3cf1b6fb0a3e1c610a3ec730b8df24c1968a
Author: Andras Timar 
Date:   Wed Mar 7 14:58:11 2018 +0100

Bump version to 5.3-42

Change-Id: I86c24d812cc6acdb7d39fba09ab7d443b43268d5

diff --git a/configure.ac b/configure.ac
index 2396a48aa5ce..7626dc82abd2 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],[5.3.10.41],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.3.10.42],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

Tag 'cp-5.3-42' created by Andras Timar  at 
2018-03-07 13:58 +

cp-5.3-42

Changes since libreoffice-5-3-branch-point-28:
---
 0 files changed
---
___
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-5.3' - comphelper/source include/comphelper oox/source package/source

[Ashod Nakashian]

 comphelper/source/xml/ofopxmlhelper.cxx  |   32 ++
 include/comphelper/ofopxmlhelper.hxx |   12 +
 oox/source/core/xmlfilterbase.cxx|   38 +--
 package/source/zippackage/ZipPackage.cxx |   12 ++---
 4 files changed, 78 insertions(+), 16 deletions(-)

New commits:
commit 98af842308727765050a6e03cdb0b25b5694bd27
Author: Ashod Nakashian 
Date:   Tue Mar 6 22:43:34 2018 -0500

oox: preserve the ContentType of custom files

Generic logic to preserve custom files with
their correct ContentType. Standard default
file extensions with respective ContentType
preserved in [Content_Types].xml.

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

diff --git a/comphelper/source/xml/ofopxmlhelper.cxx 
b/comphelper/source/xml/ofopxmlhelper.cxx
index 6946e0e3bbd6..9bd5cad0fe8f 100644
--- a/comphelper/source/xml/ofopxmlhelper.cxx
+++ b/comphelper/source/xml/ofopxmlhelper.cxx
@@ -112,6 +112,38 @@ uno::Sequence< uno::Sequence< beans::StringPair > > 
ReadContentTypeSequence(
 return ReadSequence_Impl( xInStream, aStringID, CONTENTTYPE_FORMAT, 
rContext );
 }
 
+OUString GetContentTypeByName(
+const 
css::uno::Sequence>& rContentTypes,
+const OUString& rFilename)
+{
+if (rContentTypes.getLength() < 2)
+{
+return OUString();
+}
+
+const uno::Sequence& rDefaults = rContentTypes[0];
+const uno::Sequence& rOverrides = rContentTypes[1];
+
+// Find the extension and use it to get the type.
+const sal_Int32 nDotOffset = rFilename.lastIndexOf('.');
+const OUString aExt = (nDotOffset >= 0 ? rFilename.copy(nDotOffset + 1) : 
rFilename); // Skip the dot.
+
+const std::vector aNames = { aExt, "/" + rFilename };
+for (const OUString& aName : aNames)
+{
+const auto it1 = std::find_if(rOverrides.begin(), rOverrides.end(), 
[&aName](const beans::StringPair& rPair)
+  
{ return rPair.First == aName; });
+if (it1 != rOverrides.end())
+return it1->Second;
+
+const auto it2 = std::find_if(rDefaults.begin(), rDefaults.end(), 
[&aName](const beans::StringPair& rPair)
+{ 
return rPair.First == aName; });
+if (it2 != rDefaults.end())
+return it2->Second;
+}
+
+return OUString();
+}
 
 void WriteRelationsInfoSequence(
 const uno::Reference< io::XOutputStream >& xOutStream,
diff --git a/include/comphelper/ofopxmlhelper.hxx 
b/include/comphelper/ofopxmlhelper.hxx
index 3f03a39c5301..0c8183115206 100644
--- a/include/comphelper/ofopxmlhelper.hxx
+++ b/include/comphelper/ofopxmlhelper.hxx
@@ -56,6 +56,18 @@ namespace OFOPXMLHelper {
 const css::uno::Reference< css::uno::XComponentContext >& rContext )
 throw( css::uno::Exception );
 
+// returns the ContentType for the given name, or empty when not found.
+// rContentTypes is a sequence containing two entries of type 
sequence
+// the first sequence describes "Default" elements, where each element is 
described
+// by StringPair object ( First - Extension, Second - ContentType )
+// the second sequence describes "Override" elements, where each element 
is described
+// by StringPair object ( First - PartName, Second - ContentType )
+// The "Override" sequence is searched first before falling back on 
"Default".
+COMPHELPER_DLLPUBLIC
+OUString
+GetContentTypeByName(const 
css::uno::Sequence>& rContentTypes,
+ const OUString& rFilename);
+
 // writes sequence of elements, where each element is described by 
sequence of tags,
 // where each tag is described by StringPair ( First - name, Second - 
value )
 // the first tag of each element sequence must be "Id"
diff --git a/oox/source/core/xmlfilterbase.cxx 
b/oox/source/core/xmlfilterbase.cxx
index 00d23a377564..491d83a5770c 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -61,6 +61,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -961,13 +962,6 @@ void 
XmlFilterBase::importCustomFragments(css::uno::Reference xRelations(xDocumentStorage, UNO_QUERY);
 if (xRelations.is())
 {
-// These are all the custom types we recognize and can preserve.
-static const std::set sCustomTypes = {
-
"http://schemas.dell.com/ddp/2016/relationships/xenFile";,
-
"http://schemas.dell.com/ddp/2016/relationships/hmacFile";,
-
"http://schemas.dell.com/ddp/2016/relationships/metadataFile";
-};
-
 uno::Sequence> aSeqs = 
xRelations->getAllRelationships();
 
 

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - include/unotools sc/qa sd/qa sw/qa unotools/source

[Ashod Nakashian]

 include/unotools/tempfile.hxx  |2 +-
 sc/qa/unit/data/xlsx/customxml.xlsx|binary
 sc/qa/unit/helper/xpath.cxx|7 ++-
 sc/qa/unit/helper/xpath.hxx|6 ++
 sc/qa/unit/subsequent_export-test.cxx  |   19 +++
 sd/qa/unit/data/pptx/customxml.pptx|binary
 sd/qa/unit/export-tests-ooxml1.cxx |   23 +++
 sd/qa/unit/sdmodeltestbase.hxx |   21 +
 sw/qa/extras/inc/swmodeltestbase.hxx   |   21 +++--
 unotools/source/ucbhelper/tempfile.cxx |2 +-
 10 files changed, 88 insertions(+), 13 deletions(-)

New commits:
commit a8f92371317d0056212063d473bb518cfbdbf874
Author: Ashod Nakashian 
Date:   Mon Feb 26 07:46:09 2018 -0500

oox: unit-tests for custom package preservation

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

diff --git a/include/unotools/tempfile.hxx b/include/unotools/tempfile.hxx
index edb9c9f39498..84db772647da 100644
--- a/include/unotools/tempfile.hxx
+++ b/include/unotools/tempfile.hxx
@@ -87,7 +87,7 @@ public:
 Returns the URL of the tempfile object.
 If you want to have the system path file name, use the 
GetFileName() method of this object
 */
-OUString const & GetURL();
+OUString const & GetURL() const;
 
 /**
 Returns the system path name of the tempfile in host 
notation
diff --git a/sc/qa/unit/data/xlsx/customxml.xlsx 
b/sc/qa/unit/data/xlsx/customxml.xlsx
new file mode 100644
index ..53619ae4af30
Binary files /dev/null and b/sc/qa/unit/data/xlsx/customxml.xlsx differ
diff --git a/sc/qa/unit/helper/xpath.cxx b/sc/qa/unit/helper/xpath.cxx
index 2d047b60bf61..562facc84f1e 100644
--- a/sc/qa/unit/helper/xpath.cxx
+++ b/sc/qa/unit/helper/xpath.cxx
@@ -25,14 +25,19 @@ xmlDocPtr XPathHelper::parseExport(ScDocShell& rShell, 
uno::Reference const & 
pTempFile, uno::Reference const & xSFactory, const 
OUString& rFile)
+std::shared_ptr 
XPathHelper::parseExportStream(std::shared_ptr const & 
pTempFile, uno::Reference const & xSFactory, const 
OUString& rFile)
 {
 // Read the XML stream we're interested in.
 uno::Reference xNameAccess = 
packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(xSFactory),
 pTempFile->GetURL());
 uno::Reference 
xInputStream(xNameAccess->getByName(rFile), uno::UNO_QUERY);
 CPPUNIT_ASSERT(xInputStream.is());
 std::shared_ptr 
pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true));
+return pStream;
+}
 
+xmlDocPtr XPathHelper::parseExport(std::shared_ptr const & 
pTempFile, uno::Reference const & xSFactory, const 
OUString& rFile)
+{
+std::shared_ptr pStream = parseExportStream(pTempFile, 
xSFactory, rFile);
 return XmlTestTools::parseXmlStream(pStream.get());
 }
 
diff --git a/sc/qa/unit/helper/xpath.hxx b/sc/qa/unit/helper/xpath.hxx
index 86d1d279576e..fed540fc8b93 100644
--- a/sc/qa/unit/helper/xpath.hxx
+++ b/sc/qa/unit/helper/xpath.hxx
@@ -48,6 +48,12 @@ namespace XPathHelper
 const OUString& rFile, sal_Int32 nFormat);
 
 /**
+ * Tries to parse the specified file in the temp file zip container as a 
binary file.
+ */
+SCQAHELPER_DLLPUBLIC std::shared_ptr 
parseExportStream(std::shared_ptr const & pTempFile,
+uno::Reference const & xSFactory, 
const OUString& rFile);
+
+/**
  * Tries to parse the specified file in the temp file zip container as an 
xml file.
  *
  * Should be used when the same exported file is used for testing 
different files in
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 092324658f3c..c013d836fb8b 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -155,6 +155,8 @@ public:
 void testCeilingFloorXLS();
 void testCeilingFloorODS();
 
+void testCustomXml();
+
 #if !defined _WIN32
 void testRelativePaths();
 #endif
@@ -275,6 +277,7 @@ public:
 CPPUNIT_TEST(testCeilingFloorXLSX);
 CPPUNIT_TEST(testCeilingFloorXLS);
 CPPUNIT_TEST(testCeilingFloorODS);
+CPPUNIT_TEST(testCustomXml);
 #if !defined(_WIN32)
 CPPUNIT_TEST(testRelativePaths);
 #endif
@@ -3015,6 +3018,22 @@ void ScExportTest::testCeilingFloorODS()
 testCeilingFloor(FORMAT_ODS);
 }
 
+void ScExportTest::testCustomXml()
+{
+// Load document and export it to a temporary file
+ScDocShellRef xShell = loadDoc("customxml.", FORMAT_XLSX);
+CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xShell.Is());
+
+std::shared_ptr pXPathFile = 
ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
+xmlDocPtr pXmlDoc = XPathHelper::parseExport(pXPathFile, m_xSFactory, 
"customXml/item1.xml");
+CPPUNIT_ASSERT(pXmlDoc);
+xmlDocPtr pRelsDoc = XPa

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

[Tomaž Vajngerl]

 oox/source/drawingml/misccontexts.cxx |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 1a508b2670a3db135d5937dcafec7eb62feb7033
Author: Tomaž Vajngerl 
Date:   Wed Mar 7 16:43:24 2018 +0900

oox: use GraphicLoader to load from external URL

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

diff --git a/oox/source/drawingml/misccontexts.cxx 
b/oox/source/drawingml/misccontexts.cxx
index a3ab1140a804..583c9d7c35d6 100644
--- a/oox/source/drawingml/misccontexts.cxx
+++ b/oox/source/drawingml/misccontexts.cxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -160,11 +161,8 @@ BlipContext::BlipContext( ContextHandler2Helper const & 
rParent,
 // code rework.
 OUString aRelId = rAttribs.getString( R_TOKEN( link ), OUString() );
 OUString aTargetLink = getFilter().getAbsoluteUrl( 
getRelations().getExternalTargetFromRelId( aRelId ) );
-SfxMedium aMed( aTargetLink, StreamMode::STD_READ );
-aMed.Download();
-Reference< io::XInputStream > xInStrm = aMed.GetInputStream();
-if ( xInStrm.is() )
-mrBlipProps.mxFillGraphic = 
getFilter().getGraphicHelper().importGraphic( xInStrm );
+Graphic aGraphic = vcl::graphic::loadFromURL(aTargetLink);
+mrBlipProps.mxFillGraphic = aGraphic.GetXGraphic();
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sfx2/source/doc/new.cxx|2 +-
 sw/source/uibase/app/docsh.cxx |2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 87dd08660836bfe38d4ec309363d897210f4afb8
Author: Caolán McNamara 
Date:   Wed Mar 7 10:56:39 2018 +

preview of empty page ends up with negative size

in load templates, i.e. SfxPreviewWin_Impl, with
an empty writer template selected.

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

diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 9c363b02e17b..67c6b73a31da 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -82,7 +82,7 @@ void SfxPreviewWin_Impl::ImpPaint(vcl::RenderContext& 
rRenderContext, GDIMetaFil
 if (nWidth <= 0 || nHeight <= 0)
 return;
 
-double dRatio = double(aTmpSize.Width()) / aTmpSize.Height();
+double dRatio = aTmpSize.Height() ? (double(aTmpSize.Width()) / 
aTmpSize.Height()) : 1;
 double dRatioPreV = double(nWidth) / nHeight;
 Size aSize;
 Point aPoint;
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 9291e0a2f763..be9438ceae71 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -890,6 +890,8 @@ tools::Rectangle SwDocShell::GetVisArea( sal_uInt16 nAspect 
) const
 SwContentNode* pNd = m_xDoc->GetNodes().GoNext( &aIdx );
 
 const SwRect aPageRect = pNd->FindPageFrameRect();
+if (aPageRect.IsEmpty())
+return tools::Rectangle();
 tools::Rectangle aRect(aPageRect.SVRect());
 
 // tdf#81219 sanitize - nobody is interested in a thumbnail where's
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sfx2/source/dialog/dinfdlg.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 29e89925093f2c143fab675310b2533ed720a9ae
Author: Caolán McNamara 
Date:   Wed Mar 7 12:02:28 2018 +

Resolves: tdf#116116 vertically center line in allocated height

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

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index a30de99a727b..d2e4bc8bf71a 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1750,6 +1750,7 @@ void CustomPropertiesWindow::CreateNewLine()
 pNewLine->m_aValueEdit->SetAccessibleName(m_pHeaderAccValue->GetText());
 
 sal_Int32 nPos = GetExistingLineCount() * GetLineHeight();
+nPos += LogicToPixel(Size(0, 2), MapMode(MapUnit::MapAppFont)).Height();
 m_aCustomPropertiesLines.push_back( pNewLine );
 
 SetWidgetWidths(pNewLine);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: test/Makefile.am

[Andras Timar]

 test/Makefile.am |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c3afdf32e45f3afbf74cfd5605201aa09a0f2219
Author: Andras Timar 
Date:   Wed Mar 7 13:48:56 2018 +0100

add png files for DeltaTests::testDeltaSequence to dist tarball

Change-Id: Ib8007ce17e71e7a343dc3572364788e6f2c3efa2

diff --git a/test/Makefile.am b/test/Makefile.am
index b417a8571..5b17f54a2 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -119,7 +119,7 @@ endif
 TEST_EXTENSIONS = .la
 LA_LOG_DRIVER = ${top_srcdir}/test/run_unit.sh
 
-EXTRA_DIST = data/hello.odt data/hello.txt $(test_SOURCES) $(unittest_SOURCES) 
run_unit.sh
+EXTRA_DIST = data/delta-text.png data/delta-text2.png data/hello.odt 
data/hello.txt $(test_SOURCES) $(unittest_SOURCES) run_unit.sh
 
 check_valgrind: all
@fc-cache "@LO_PATH@"/share/fonts/truetype
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/npm-shrinkwrap.json loleaflet/package.json

[Andras Timar]

 loleaflet/npm-shrinkwrap.json | 3293 --
 loleaflet/package.json|   11 
 2 files changed, 1914 insertions(+), 1390 deletions(-)

New commits:
commit 6f2d06c77983eac3da820fc8c062eeebc10cfefb
Author: Andras Timar 
Date:   Wed Mar 7 13:28:07 2018 +0100

Revert "Revert "NPM Shrinkwrap: Upgrade to new format (v5)""

This reverts commit c0a902ba816f9acc940531264a75e2ca54592603.

diff --git a/loleaflet/npm-shrinkwrap.json b/loleaflet/npm-shrinkwrap.json
index 8c8d46ae5..ffeb9e140 100644
--- a/loleaflet/npm-shrinkwrap.json
+++ b/loleaflet/npm-shrinkwrap.json
@@ -1,243 +1,363 @@
 {
   "name": "loleaflet",
   "version": "0.8.0-dev",
+  "lockfileVersion": 1,
+  "requires": true,
   "dependencies": {
 "autolinker": {
   "version": "1.4.3",
-  "from": "autolinker@latest",
-  "resolved": "./node_shrinkwrap/autolinker-1.4.3.tgz",
+  "resolved": 
"https://registry.npmjs.org/autolinker/-/autolinker-1.4.3.tgz";,
+  "integrity": "sha1-LmFQV8jjcTmabXeUmppq8k/kbfw=",
   "dev": true
 },
 "bootstrap": {
-  "version": "3.3.6",
-  "from": "node_shrinkwrap/bootstrap-3.3.6.tgz",
-  "resolved": "./node_shrinkwrap/bootstrap-3.3.6.tgz",
+  "version": "file:node_shrinkwrap/bootstrap-3.3.6.tgz",
+  "integrity": 
"sha512-XC+LTYJoVYHIalmjNcznwlZHY+YLhMJ9NPs8M2aEweugK7wMrto3h79POn7O5Vj/woDU/tjzmjyUbAd1HzSXIw==",
   "dev": true
 },
 "browserify": {
-  "version": "13.1.0",
-  "from": "node_shrinkwrap/browserify-13.1.0.tgz",
-  "resolved": "./node_shrinkwrap/browserify-13.1.0.tgz",
+  "version": "file:node_shrinkwrap/browserify-13.1.0.tgz",
+  "integrity": 
"sha512-i5iASp425UxqX6nhOfsxJVLmm+GKvPcapI8RsPixFSNQQbSbrZsYYLzPK1amobpeOuDF7nJDq/upZYkmw/C59w==",
   "dev": true,
+  "requires": {
+"JSONStream": "file:node_shrinkwrap/JSONStream-1.1.4.tgz",
+"assert": "file:node_shrinkwrap/assert-1.3.0.tgz",
+"browser-pack": "file:node_shrinkwrap/browser-pack-6.0.1.tgz",
+"browser-resolve": "file:node_shrinkwrap/browser-resolve-1.11.2.tgz",
+"browserify-zlib": "file:node_shrinkwrap/browserify-zlib-0.1.4.tgz",
+"buffer": "file:node_shrinkwrap/buffer-4.7.1.tgz",
+"concat-stream": "file:node_shrinkwrap/concat-stream-1.5.1.tgz",
+"console-browserify": 
"file:node_shrinkwrap/console-browserify-1.1.0.tgz",
+"constants-browserify": 
"file:node_shrinkwrap/constants-browserify-1.0.0.tgz",
+"crypto-browserify": 
"file:node_shrinkwrap/crypto-browserify-3.11.0.tgz",
+"defined": "file:node_shrinkwrap/defined-1.0.0.tgz",
+"deps-sort": "file:node_shrinkwrap/deps-sort-2.0.0.tgz",
+"domain-browser": "file:node_shrinkwrap/domain-browser-1.1.7.tgz",
+"duplexer2": "file:node_shrinkwrap/duplexer2-0.1.4.tgz",
+"events": "file:node_shrinkwrap/events-1.1.1.tgz",
+"glob": "file:node_shrinkwrap/glob-5.0.15.tgz",
+"has": "file:node_shrinkwrap/has-1.0.1.tgz",
+"htmlescape": "file:node_shrinkwrap/htmlescape-1.1.1.tgz",
+"https-browserify": "file:node_shrinkwrap/https-browserify-0.0.1.tgz",
+"inherits": "file:node_shrinkwrap/inherits-2.0.1.tgz",
+"insert-module-globals": 
"file:node_shrinkwrap/insert-module-globals-7.0.1.tgz",
+"labeled-stream-splicer": 
"file:node_shrinkwrap/labeled-stream-splicer-2.0.0.tgz",
+"module-deps": "file:node_shrinkwrap/module-deps-4.0.7.tgz",
+"os-browserify": "file:node_shrinkwrap/os-browserify-0.1.2.tgz",
+"parents": "file:node_shrinkwrap/parents-1.0.1.tgz",
+"path-browserify": "file:node_shrinkwrap/path-browserify-0.0.0.tgz",
+"process": "file:node_shrinkwrap/process-0.11.7.tgz",
+"punycode": "file:node_shrinkwrap/punycode-1.4.1.tgz",
+"querystring-es3": "file:node_shrinkwrap/querystring-es3-0.2.1.tgz",
+"read-only-stream": "file:node_shrinkwrap/read-only-stream-2.0.0.tgz",
+"readable-stream": "file:node_shrinkwrap/readable-stream-2.1.4.tgz",
+"resolve": "file:node_shrinkwrap/resolve-1.1.7.tgz",
+"shasum": "file:node_shrinkwrap/shasum-1.0.2.tgz",
+"shell-quote": "file:node_shrinkwrap/shell-quote-1.6.1.tgz",
+"stream-browserify": 
"file:node_shrinkwrap/stream-browserify-2.0.1.tgz",
+"stream-http": "file:node_shrinkwrap/stream-http-2.3.1.tgz",
+"string_decoder": "file:node_shrinkwrap/string_decoder-0.10.31.tgz",
+"subarg": "file:node_shrinkwrap/subarg-1.0.0.tgz",
+"syntax-error": "file:node_shrinkwrap/syntax-error-1.1.6.tgz",
+"through2": "file:node_shrinkwrap/through2-2.0.1.tgz",
+"timers-browserify": 
"file:node_shrinkwrap/timers-browserify-1.4.2.tgz",
+"tty-browserify": "file:node_shrinkwrap/tty-browserify-0.0.0.tgz",
+"url": "file:node_shrinkwrap/url-0.11.0.tgz",
+"util": "file:node_shrinkwrap/util-0.10.3.tgz",
+"vm-browserify": "file:node_shrin

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - download.lst external/libxml2

[Michael Stahl]

 download.lst |4 ++--
 external/libxml2/libxml2-icu.patch.0 |   13 +++--
 external/libxml2/libxml2-vc10.patch  |2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 4775511f57693ac0ff10a29f6706db52d133da91
Author: Michael Stahl 
Date:   Tue Mar 6 14:49:29 2018 +0100

libxml2: upgrade to release 2.9.8

Change-Id: Ic6802c16b740f6aee59ae2f74b7edcd37461f1f3
Reviewed-on: https://gerrit.libreoffice.org/50835
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 
(cherry picked from commit f775b5427bf085577feb5badb762156283d76ae5)
Reviewed-on: https://gerrit.libreoffice.org/50841
Reviewed-by: Miklos Vajna 

diff --git a/download.lst b/download.lst
index 89dd6b4fde62..e1020cb52a3d 100644
--- a/download.lst
+++ b/download.lst
@@ -152,8 +152,8 @@ export LIBTOMMATH_SHA256SUM := 
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304
 export LIBTOMMATH_TARBALL := ltm-1.0.zip
 export XMLSEC_SHA256SUM := 
967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2
 export XMLSEC_TARBALL := xmlsec1-1.2.25.tar.gz
-export LIBXML_SHA256SUM := 
f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c
-export LIBXML_VERSION_MICRO := 7
+export LIBXML_SHA256SUM := 
0b74e51595654f958148759cfef0993114ddbb6f31aee018f3558e8e2732
+export LIBXML_VERSION_MICRO := 8
 export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz
 export LIBXSLT_SHA256SUM := 
526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460
 export LIBXSLT_VERSION_MICRO := 32
diff --git a/external/libxml2/libxml2-icu.patch.0 
b/external/libxml2/libxml2-icu.patch.0
index 9aaad2de4915..b390b03d8787 100644
--- a/external/libxml2/libxml2-icu.patch.0
+++ b/external/libxml2/libxml2-icu.patch.0
@@ -1,3 +1,5 @@
+Find bundled ICU in workdir and use debug .libs when needed
+
 diff -up win32/Makefile.msvc.dt win32/Makefile.msvc
 --- win32/Makefile.msvc.dt 2014-07-18 19:00:23.372103963 +0200
 +++ win32/Makefile.msvc2014-07-18 19:01:39.347982929 +0200
@@ -18,15 +20,14 @@ diff -up win32/Makefile.msvc.dt win32/Makefile.msvc
  LIBS =
  !if "$(WITH_FTP)" == "1" || "$(WITH_HTTP)" == "1"
 @@ -78,7 +78,11 @@ LIBS = $(LIBS) wsock32.lib ws2_32.lib
- LIBS = $(LIBS) iconv.lib
- !endif 
- !if "$(WITH_ICU)" == "1"
--LIBS = $(LIBS) icu.lib
+ !if "$(STATIC)" == "1"
+ LIBS = $(LIBS) advapi32.lib sicuuc.lib sicuin.lib sicudt.lib
+ !else
 +!if "$(WITH_RUN_DEBUG)" == "1"
 +LIBS = $(LIBS) icuind.lib icuucd.lib icudtd.lib
 +!else
-+LIBS = $(LIBS) icuin.lib icuuc.lib icudt.lib
+ LIBS = $(LIBS) icuuc.lib icuin.lib icudt.lib
 +!endif
  !endif
+ !endif
  !if "$(WITH_ZLIB)" == "1"
- # could be named differently zdll or zlib
diff --git a/external/libxml2/libxml2-vc10.patch 
b/external/libxml2/libxml2-vc10.patch
index f3f2b511f3f2..3892b518d35d 100644
--- a/external/libxml2/libxml2-vc10.patch
+++ b/external/libxml2/libxml2-vc10.patch
@@ -3,7 +3,7 @@ Add SOLARINC, and disable SSE2 default for MSVC2012
 --- build/libxml2-2.7.6/win32/Makefile.msvc.old2010-09-20 
20:22:41.5 +0200
 +++ build/libxml2-2.7.6/win32/Makefile.msvc2010-09-20 20:23:00.25000 
+0200
 @@ -59,6 +59,7 @@
- CFLAGS = $(CFLAGS) /D "HAVE_LZMA_H"
+ CFLAGS = $(CFLAGS) /D "HAVE_PTHREAD_H"
  !endif
  CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
 +CFLAGS = $(CFLAGS) -arch:SSE $(SOLARINC)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen]

 sw/source/core/view/vprint.cxx |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 176356a3c802151967c26dc78f58244fcab9693a
Author: Gabor Kelemen 
Date:   Wed Feb 28 00:34:00 2018 +0100

tdf#91680 Reserve space in margin for comments only if there are comments

Change-Id: Ida08737cf537d85a94a72572e8cbc7e2bfad9333
Reviewed-on: https://gerrit.libreoffice.org/50505
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 
(cherry picked from commit c77e01d63b4bd4805c4a499e4e0cab917d0eb403)
Reviewed-on: https://gerrit.libreoffice.org/50803

diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index f88e26532356..dbd320ab718e 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -463,7 +463,12 @@ bool SwViewShell::PrintOrPDFExport(
 GDIMetaFile *pOrigRecorder(nullptr);
 GDIMetaFile *pMetaFile(nullptr);
 SwPostItMode nPostItMode = rPrintData.GetPrintPostIts();
-if (nPostItMode == SwPostItMode::InMargins)
+
+// tdf#91680 Reserve space in margin for comments only if there are 
comments
+const bool bHasPostItsToPrintInMargins = ( nPostItMode == 
SwPostItMode::InMargins ) &&
+sw_GetPostIts( 
&GetDoc()->getIDocumentFieldsAccess(), nullptr );
+
+if ( bHasPostItsToPrintInMargins )
 {
 //get and disable the existing recorder
 pOrigRecorder = pOutDev->GetConnectMetaFile();
@@ -534,8 +539,8 @@ bool SwViewShell::PrintOrPDFExport(
 
 SwPaintQueue::Repaint();
 
-SwPostItMgr *pPostItManager = (nPostItMode == SwPostItMode::InMargins) 
?
-pShell->GetPostItMgr() : nullptr;
+SwPostItMgr *pPostItManager = bHasPostItsToPrintInMargins ? 
pShell->GetPostItMgr() : nullptr;
+
 if (pPostItManager)
 {
 pPostItManager->CalcRects();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamas Bunth]

 vcl/source/window/status.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 4fc637930e5cc7b1cc3139b0f126e3f595be809b
Author: Tamas Bunth 
Date:   Thu Mar 1 15:32:18 2018 +0100

tdf#115353 Status bar: no cache in settext

Change-Id: I6c1312bbba553be738e23cee0c76d589c809dff8
Reviewed-on: https://gerrit.libreoffice.org/50584
Reviewed-by: Tamás Bunth 
Tested-by: Tamás Bunth 
Reviewed-on: https://gerrit.libreoffice.org/50743
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 11a2480323ff..aebec55ec630 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -1169,9 +1169,6 @@ void StatusBar::SetItemText( sal_uInt16 nItemId, const 
OUString& rText )
 std::unique_ptr pSalLayout = 
ImplLayout(pItem->maText,0,-1);
 long nWidth = GetTextWidth( 
pItem->maText,0,-1,nullptr,pSalLayout.get() ) + nFudge;
 
-// update cache
-pItem->mxLayoutCache = std::move(pSalLayout);
-
 if( (nWidth > pItem->mnWidth + STATUSBAR_OFFSET) ||
 ((nWidth < pItem->mnWidth) && (mnDX - STATUSBAR_OFFSET) < 
mnItemsWidth  ))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - chart2/source cui/source include/svx sc/source sd/source svx/source sw/source

[Caolán McNamara]

 chart2/source/controller/main/ChartController_TextEdit.cxx |2 -
 cui/source/dialogs/cuicharmap.cxx  |   15 +
 cui/source/factory/dlgfact.cxx |5 +---
 cui/source/factory/dlgfact.hxx |2 -
 include/svx/svxdlg.hxx |3 +-
 sc/source/ui/drawfunc/drawsh.cxx   |2 -
 sc/source/ui/view/cellsh1.cxx  |2 -
 sc/source/ui/view/viewutil.cxx |2 -
 sd/source/ui/func/fubullet.cxx |2 -
 svx/source/dialog/imapwnd.cxx  |2 -
 sw/source/ui/dialog/macassgn.cxx   |2 -
 sw/source/ui/misc/glossary.cxx |2 -
 sw/source/ui/misc/insfnote.cxx |2 -
 sw/source/ui/misc/srtdlg.cxx   |2 -
 sw/source/uibase/shells/annotsh.cxx|2 -
 sw/source/uibase/shells/drwtxtsh.cxx   |2 -
 sw/source/uibase/shells/textsh.cxx |2 -
 17 files changed, 33 insertions(+), 18 deletions(-)

New commits:
commit 80dafc57786b6e342468cea227e25fd17ac6dd10
Author: Caolán McNamara 
Date:   Mon Mar 5 17:13:12 2018 +

Resolves: tdf#113805 insert special character fails in insert footnote...

etc. dialogs

i.e. since

commit 710a39414569995bd5a8631a948c939dc73bcef9
Date:   Thu May 11 13:27:38 2017 +0530

GSoC: Glyph View and Recent Characters Control in Special Characters 
dialog

Change-Id: Ia55f3fefe7c14327cff2e996ab0038dc52f9b017

it inserts into the document, extend the fix of

commit 4020945651b4f3c636980e2103db440b5c55459c
Author: Daniel 
Date:   Sun Sep 24 17:55:19 2017 -0300

tdf#111739 fix Selecting a custom character as a bullet symbol insertion

to do the old thing that existing code depends on if this is not an
"insert" dialog, and bubble that setting around from the callers

Change-Id: Id8acf16955d0167beffae43e3b201e500ee7a929
Reviewed-on: https://gerrit.libreoffice.org/50781
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
Reviewed-on: https://gerrit.libreoffice.org/50799
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx 
b/chart2/source/controller/main/ChartController_TextEdit.cxx
index 9c129617fc6a..75bacdb8c316 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -167,7 +167,7 @@ void 
ChartController::executeDispatch_InsertSpecialCharacter()
 vcl::Font aCurFont = 
m_pDrawViewWrapper->getOutliner()->GetRefDevice()->GetFont();
 aSet.Put( SvxFontItem( aCurFont.GetFamilyType(), aCurFont.GetFamilyName(), 
aCurFont.GetStyleName(), aCurFont.GetPitch(), aCurFont.GetCharSet(), 
SID_ATTR_CHAR_FONT ) );
 
-ScopedVclPtr pDlg(pFact->CreateSfxDialog( 
GetChartWindow(), aSet, getFrame(), RID_SVXDLG_CHARMAP ));
+ScopedVclPtr pDlg(pFact->CreateSfxDialog( 
GetChartWindow(), aSet, getFrame(), RID_SVXDLG_CHARMAP, false ));
 OSL_ENSURE( pDlg, "Couldn't create SvxCharacterMap dialog" );
 if( pDlg->Execute() == RET_OK )
 {
diff --git a/cui/source/dialogs/cuicharmap.cxx 
b/cui/source/dialogs/cuicharmap.cxx
index 1058b70a795d..0bc4db911c28 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -43,6 +43,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -629,6 +630,20 @@ void SvxCharacterMap::insertCharToDoc(const OUString& 
sGlyph)
 aArgs[1].Name = "FontName";
 aArgs[1].Value <<= aFont.GetFamilyName();
 comphelper::dispatchCommand(".uno:InsertSymbol", aArgs);
+
+} else {
+SfxItemSet* pSet = GetOutputSetImpl();
+if ( pSet )
+{
+sal_Int32 tmp = 0;
+sal_UCS4 cChar = sGlyph.iterateCodePoints(&tmp);
+const SfxItemPool* pPool = pSet->GetPool();
+pSet->Put( SfxStringItem( pPool->GetWhich(SID_CHARMAP), sGlyph ) );
+pSet->Put( SvxFontItem( aFont.GetFamilyType(), 
aFont.GetFamilyName(),
+aFont.GetStyleName(), aFont.GetPitch(), aFont.GetCharSet(), 
pPool->GetWhich(SID_ATTR_CHAR_FONT) ) );
+pSet->Put( SfxStringItem( pPool->GetWhich(SID_FONT_NAME), 
aFont.GetFamilyName() ) );
+pSet->Put( SfxInt32Item( pPool->GetWhich(SID_ATTR_CHAR), cChar ) );
+}
 }
 
 updateRecentCharacterList(sGlyph, aFont.GetFamilyName());
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index ca9fb47b02b6..c903cc3b4d76 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1221,8 +1221,7 @@ VclPtr 
AbstractDialogFa

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

[Michael Stahl]

 sd/qa/unit/data/unknown-attribute.fodp |   26 ++
 sd/qa/unit/export-tests.cxx|   26 ++
 xmloff/source/core/xmlictxt.cxx|2 ++
 xmloff/source/core/xmlimp.cxx  |   22 +++---
 4 files changed, 73 insertions(+), 3 deletions(-)

New commits:
commit 316501e04218e86c1e97a0fa606727d0fa989eaa
Author: Michael Stahl 
Date:   Thu Mar 1 13:10:40 2018 +0100

tdf#115429 xmloff: ODF import: fix handling of unknown attributes

... in SvXMLLegacyToFastDocHandler::startElement(), so that it does not
create invalid "-1" tokens that end up stored as empty-string
attribute names in SvXMLAttrCollection and ultimately exported
as invalid XML.

One surprising aspect is that the maNamespaceURL in struct
UnknownAttribute stores the namespace prefix in the libreoffice-5-4
branch, as it lacks commit bb59a80ee6000d3922fa95262f67e291fd9d8ee2.

The attributes are read and converted again in
SvXMLImportContext::startUnknownElement().

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

diff --git a/sd/qa/unit/data/unknown-attribute.fodp 
b/sd/qa/unit/data/unknown-attribute.fodp
new file mode 100644
index ..3aa39b10
--- /dev/null
+++ b/sd/qa/unit/data/unknown-attribute.fodp
@@ -0,0 +1,26 @@
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle: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:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.presentation">
+  
+
+  
+  
+
+
+  http://example.com/"; foo:non-existent-att="bar"
+/>
+
+
+  
+  
+
+
+  
+
+  
+
+
+  
+
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 78c5d4d68753..8fccd93e127a 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -82,6 +82,7 @@ public:
 void testTdf97630();
 void testSwappedOutImageExport();
 void testOOoXMLAnimations();
+void testUnknownAttributes();
 void testTdf80020();
 void testLinkedGraphicRT();
 void testImageWithSpecialID();
@@ -102,6 +103,7 @@ public:
 CPPUNIT_TEST(testTdf97630);
 CPPUNIT_TEST(testSwappedOutImageExport);
 CPPUNIT_TEST(testOOoXMLAnimations);
+CPPUNIT_TEST(testUnknownAttributes);
 CPPUNIT_TEST(testTdf80020);
 CPPUNIT_TEST(testLinkedGraphicRT);
 CPPUNIT_TEST(testImageWithSpecialID);
@@ -133,6 +135,8 @@ public:
 { "text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0" },
 { "xlink", "http://www.w3c.org/1999/xlink"; },
 { "loext", 
"urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" },
+// user-defined
+{ "foo", "http://example.com/"; },
 };
 for (size_t i = 0; i < SAL_N_ELEMENTS(namespaces); ++i)
 {
@@ -436,6 +440,28 @@ void SdExportTest::testOOoXMLAnimations()
 assertXPath(pXmlDoc, "//anim:par", 223);
 }
 
+void SdExportTest::testUnknownAttributes()
+{
+::sd::DrawDocShellRef xDocShRef = 
loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/unknown-attribute.fodp"), 
FODP);
+
+uno::Reference xComponent(xDocShRef->GetModel(), 
uno::UNO_QUERY);
+uno::Reference xStorable(xCompone

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - officecfg/registry

[Caolán McNamara]

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 12a80d523abfd35601bd8a111fd8c2cacdfd8b9c
Author: Caolán McNamara 
Date:   Thu Mar 1 15:44:23 2018 +

Resolves: tdf#115746 alt+f used twice in the writer menubar

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

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index d9ba29817bb5..a90f5a7e94b8 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3516,7 +3516,7 @@
   
   
 
-  ~Form
+  Fo~rm
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 canvas/source/vcl/canvashelper_texturefill.cxx |2 +-
 slideshow/source/engine/shapes/drawshape.cxx   |   23 ---
 2 files changed, 5 insertions(+), 20 deletions(-)

New commits:
commit 5d710cf7dda27e78f237211fd92418be4dd1c551
Author: Michael Stahl 
Date:   Wed Mar 7 12:21:45 2018 +0100

VCL canvas: fix clipping of gradients (related: tdf#115142)

When using the presenter console, the secondary screen has
a small view of the current slide, which is called a "Pane" in sdext.

Clipping for this is done by sd::presenter::PresenterCanvas, which wraps
the full-screen VCL canvas and has a MergeViewState() to intersect
the clip region.

The VCL canvas has a bug in its gradientFill() implemenation where it
overrides the existing clip on the OutputDevice instead of intersecting
it.

This properly fixes the bug that was wrongly and badly attempted
to be fixed by commit 99e373cd4c78084ded349f3e3de7b0504af2dd90.

Change-Id: Id02678c2f134fe7b190866d6a6fff5b2e5e3aaff

diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx 
b/canvas/source/vcl/canvashelper_texturefill.cxx
index fcec72c0b475..d99bdb1ff77d 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -602,7 +602,7 @@ namespace vclcanvas
 const vcl::Region aPolyClipRegion( rPoly );
 
 rOutDev.Push( PushFlags::CLIPREGION );
-rOutDev.SetClipRegion( aPolyClipRegion );
+rOutDev.IntersectClipRegion( aPolyClipRegion );
 
 doGradientFill( rOutDev,
 rValues,
commit 0408a590311c837d5f0ab1abfb72a564a266ddac
Author: Michael Stahl 
Date:   Wed Mar 7 12:35:23 2018 +0100

tdf#115142 Revert "slideshow: clip shapes in secondary screen window"

This reverts commit 99e373cd4c78084ded349f3e3de7b0504af2dd90.

This is bogus as it actually does scaling and not clipping, and the
actual clipping bug is in the VCL canvas, see following commit.

Also should fix tdf#115652 and tdf#116196.

Change-Id: Ief7be653a38626c9902ab5c7c453a133c2b9f882

diff --git a/slideshow/source/engine/shapes/drawshape.cxx 
b/slideshow/source/engine/shapes/drawshape.cxx
index c023119ded06..00a8894f5ef0 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -133,26 +133,11 @@ namespace slideshow
 
 ViewShape::RenderArgs DrawShape::getViewRenderArgs() const
 {
-uno::Reference const xPropSet(mxPage,
-uno::UNO_QUERY_THROW);
-sal_Int32 nWidth = 0;
-sal_Int32 nHeight = 0;
-xPropSet->getPropertyValue("Width") >>= nWidth;
-xPropSet->getPropertyValue("Height") >>= nHeight;
-basegfx::B2DRectangle slideRect(0, 0, nWidth, nHeight);
-basegfx::B2DRectangle origBounds(maBounds);
-origBounds.intersect(slideRect);
-basegfx::B2DRectangle updateBounds(getUpdateArea());
-updateBounds.intersect(slideRect);
-basegfx::B2DRectangle bounds(getBounds());
-bounds.intersect(slideRect);
-basegfx::B2DRectangle unitBounds(getActualUnitShapeBounds());
-unitBounds.intersect(slideRect);
 return ViewShape::RenderArgs(
-origBounds,
-updateBounds,
-bounds,
-unitBounds,
+maBounds,
+getUpdateArea(),
+getBounds(),
+getActualUnitShapeBounds(),
 mpAttributeLayer,
 maSubsetting.getActiveSubsets(),
 mnPriority);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sdext/README

[Michael Stahl]

 sdext/README |5 +
 1 file changed, 5 insertions(+)

New commits:
commit df4bbaecec0b42e0e17c95c6b281fda174fccafa
Author: Michael Stahl 
Date:   Wed Mar 7 12:32:59 2018 +0100

sdext: document the secondary screen of Presenter Console

Change-Id: I539a698994b5fa20e3d371ae56d9aaf3001dba2b

diff --git a/sdext/README b/sdext/README
index a4f5cf654a11..63bfd6d0a793 100644
--- a/sdext/README
+++ b/sdext/README
@@ -23,3 +23,8 @@ source/presenter/ - Impress / Presenter Console.
 canvas (e.g. cairo canvas), while the entire secondary screen
 uses a VCL-canvas that is created in
 sd::framework::FullScreenPane::CreateCanvas().
+
+The secondary screen contains 3 "Panes" which each have
+2 XWindows for the border area & the actual content,
+and each content Pane is backed by a sd::presenter::PresenterCanvas
+that wraps the FullScreenPane's canvas and does clipping.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - 5 commits - fpicker/source include/sfx2 include/svtools include/svx include/vcl offapi/com officecfg/registry sc/Cppuni

[Samuel Mehrbrodt]

 fpicker/source/aqua/ControlHelper.hxx|1 
 fpicker/source/aqua/ControlHelper.mm |9 
 fpicker/source/aqua/SalAquaFilePicker.mm |3 
 fpicker/source/aqua/resourceprovider.mm  |1 
 fpicker/source/office/OfficeControlAccess.cxx|4 
 fpicker/source/office/OfficeFilePicker.cxx   |4 
 fpicker/source/office/OfficeFilePicker.src   |5 
 fpicker/source/office/fpdialogbase.hxx   |3 
 fpicker/source/office/iodlg.cxx  |   20 +
 fpicker/source/office/iodlgimp.cxx   |2 
 fpicker/source/office/iodlgimp.hxx   |3 
 fpicker/source/win32/filepicker/VistaFilePicker.cxx  |9 
 fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx  |   15 +
 fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx  |1 
 fpicker/source/win32/misc/resourceprovider.cxx   |1 
 include/sfx2/opengrf.hxx |6 
 include/svtools/helpid.hrc   |1 
 include/svx/svdobj.hxx   |3 
 include/svx/svdograf.hxx |2 
 include/svx/svdomedia.hxx|3 
 include/vcl/fpicker.hrc  |1 
 offapi/com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.idl  |3 
 offapi/com/sun/star/ui/dialogs/TemplateDescription.idl   |   11 
 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu|   17 +
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |5 
 sc/CppunitTest_sc_anchor_test.mk |  106 
+
 sc/Module_sc.mk  |1 
 sc/inc/drwlayer.hxx  |4 
 sc/inc/global.hxx|5 
 sc/inc/globstr.hrc   |1 
 sc/inc/sc.hrc|   10 
 sc/inc/userdat.hxx   |1 
 sc/qa/extras/anchor.cxx  |  115 
++
 sc/qa/extras/sccondformats.cxx   |2 
 sc/qa/unit/data/ods/3AnchorTypes.ods |binary
 sc/qa/unit/subsequent_export-test.cxx|7 
 sc/qa/unit/ucalc.cxx |   12 -
 sc/qa/unit/ucalc_sort.cxx|2 
 sc/sdi/drawsh.sdi|4 
 sc/sdi/scalc.sdi |   38 +++
 sc/source/core/data/drwlayer.cxx |   40 ++-
 sc/source/core/data/userdat.cxx  |3 
 sc/source/filter/excel/xiescher.cxx  |2 
 sc/source/filter/inc/drawingbase.hxx |3 
 sc/source/filter/oox/drawingbase.cxx |2 
 sc/source/filter/oox/drawingfragment.cxx |3 
 sc/source/filter/xcl97/xcl97rec.cxx  |   10 
 sc/source/filter/xml/XMLExportIterator.hxx   |1 
 sc/source/filter/xml/XMLTableShapeImportHelper.cxx   |3 
 sc/source/filter/xml/xmlexprt.cxx|6 
 sc/source/ui/drawfunc/drawsh2.cxx|   26 +-
 sc/source/ui/drawfunc/drawsh5.cxx|   21 +
 sc/source/ui/drawfunc/fuins1.cxx |   59 
-
 sc/source/ui/inc/drawview.hxx|3 
 sc/source/ui/src/globstr.src |4 
 sc/source/ui/src/scstring.src|   15 +
 sc/source/ui/view/drawvie3.cxx   |   18 +
 sc/source/ui/view/drawvie4.cxx   |   46 

 sc/source/ui/view/viewfun7.cxx   |5 
 sc/uiconfig/scalc/menubar/menubar.xml|1 
 sc/uiconfig/scalc/popupmenu/anchor.xml   |3 
 sc/uiconfig/scalc/popupmenu/chart.xml|1 
 sc/uiconfig/scalc/popupmenu/draw.xml |1 
 sc/uiconfig/scalc/popupmenu/form.xml 

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - fb/ff6744fa4f49e5a3389a1c1d174b2a9914a211

[Caolán McNamara]

 fb/ff6744fa4f49e5a3389a1c1d174b2a9914a211 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a664b293356bea99f74c37dd99830b6faa84dc59
Author: Caolán McNamara 
Date:   Wed Mar 7 11:35:41 2018 +

Notes added by 'git notes add'

diff --git a/fb/ff6744fa4f49e5a3389a1c1d174b2a9914a211 
b/fb/ff6744fa4f49e5a3389a1c1d174b2a9914a211
new file mode 100644
index ..6746598c671c
--- /dev/null
+++ b/fb/ff6744fa4f49e5a3389a1c1d174b2a9914a211
@@ -0,0 +1 @@
+prefer: a4312af08cbd8c69ba4bead9608f3bf549caf7a0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8f/22401f2952c4265824d3e0f48597b35aca2f7b

[Caolán McNamara]

 8f/22401f2952c4265824d3e0f48597b35aca2f7b |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 779dc914a7d06f1d0ae97bd55d5d88d71ac5a415
Author: Caolán McNamara 
Date:   Wed Mar 7 11:34:32 2018 +

Notes added by 'git notes add'

diff --git a/8f/22401f2952c4265824d3e0f48597b35aca2f7b 
b/8f/22401f2952c4265824d3e0f48597b35aca2f7b
new file mode 100644
index ..8ebbe55237b1
--- /dev/null
+++ b/8f/22401f2952c4265824d3e0f48597b35aca2f7b
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ef/2aacc05233f278a9f25c93f3ad4674aa1431da

[Caolán McNamara]

 ef/2aacc05233f278a9f25c93f3ad4674aa1431da |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 813ba3ffdd947d104d72121bb4dae31cf77cbcc2
Author: Caolán McNamara 
Date:   Wed Mar 7 11:34:04 2018 +

Notes added by 'git notes add'

diff --git a/ef/2aacc05233f278a9f25c93f3ad4674aa1431da 
b/ef/2aacc05233f278a9f25c93f3ad4674aa1431da
new file mode 100644
index ..8ebbe55237b1
--- /dev/null
+++ b/ef/2aacc05233f278a9f25c93f3ad4674aa1431da
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 33/37115c2d0769e12205f99943f2f3391791ef11

[Caolán McNamara]

 33/37115c2d0769e12205f99943f2f3391791ef11 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ff8ab3f1aa5ee180239b1687d5d0513ab8409484
Author: Caolán McNamara 
Date:   Wed Mar 7 11:32:04 2018 +

Notes added by 'git notes add'

diff --git a/33/37115c2d0769e12205f99943f2f3391791ef11 
b/33/37115c2d0769e12205f99943f2f3391791ef11
new file mode 100644
index ..8ebbe55237b1
--- /dev/null
+++ b/33/37115c2d0769e12205f99943f2f3391791ef11
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 51/1cb39c6ebc7951681d70d300eff1540b1c55ca

[Caolán McNamara]

 51/1cb39c6ebc7951681d70d300eff1540b1c55ca |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f1dec65fb2b103290afdf561dac466081b24baea
Author: Caolán McNamara 
Date:   Wed Mar 7 11:31:45 2018 +

Notes added by 'git notes add'

diff --git a/51/1cb39c6ebc7951681d70d300eff1540b1c55ca 
b/51/1cb39c6ebc7951681d70d300eff1540b1c55ca
new file mode 100644
index ..cb6b23dc4a49
--- /dev/null
+++ b/51/1cb39c6ebc7951681d70d300eff1540b1c55ca
@@ -0,0 +1 @@
+reject: we seem to manage
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6c/23838c651a392004274ac27db335eb5b0221a9

[Caolán McNamara]

 6c/23838c651a392004274ac27db335eb5b0221a9 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit dd8dd232e936ae797742b1b7425d5abe183764c7
Author: Caolán McNamara 
Date:   Wed Mar 7 11:30:58 2018 +

Notes added by 'git notes add'

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - dd/d858ea859bab6078d1add02ecb57578385f3b7

[Caolán McNamara]

 dd/d858ea859bab6078d1add02ecb57578385f3b7 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7d610e04df5326e7870120e9a6f15a4b29203945
Author: Caolán McNamara 
Date:   Wed Mar 7 11:30:01 2018 +

Notes added by 'git notes add'

diff --git a/dd/d858ea859bab6078d1add02ecb57578385f3b7 
b/dd/d858ea859bab6078d1add02ecb57578385f3b7
new file mode 100644
index ..5dd898ec3e80
--- /dev/null
+++ b/dd/d858ea859bab6078d1add02ecb57578385f3b7
@@ -0,0 +1 @@
+prefer: 3aaa820446f1ad3d3b0ddc557238b6fb3496dd54
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 7a/13aeb63e3246f31c653d4c7dc9e5f7d5404339

[Caolán McNamara]

 7a/13aeb63e3246f31c653d4c7dc9e5f7d5404339 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d7c644b720bf7ac47b6607769b773eaa5194c0e3
Author: Caolán McNamara 
Date:   Wed Mar 7 11:29:09 2018 +

Notes added by 'git notes add'

diff --git a/7a/13aeb63e3246f31c653d4c7dc9e5f7d5404339 
b/7a/13aeb63e3246f31c653d4c7dc9e5f7d5404339
new file mode 100644
index ..5dd898ec3e80
--- /dev/null
+++ b/7a/13aeb63e3246f31c653d4c7dc9e5f7d5404339
@@ -0,0 +1 @@
+prefer: 3aaa820446f1ad3d3b0ddc557238b6fb3496dd54
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 9e/642822f4394464c52af6f2268511154f5bc744

[Caolán McNamara]

 9e/642822f4394464c52af6f2268511154f5bc744 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit af1545b5e7f177592fcbcffe02a321b851fabd94
Author: Caolán McNamara 
Date:   Wed Mar 7 11:29:30 2018 +

Notes added by 'git notes add'

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - dc/344511236f5698afd1c002be1ef050ab37c877

[Caolán McNamara]

 dc/344511236f5698afd1c002be1ef050ab37c877 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b2853dcfccad6f7001b1098253bb7fb6c7707e9b
Author: Caolán McNamara 
Date:   Wed Mar 7 11:28:16 2018 +

Notes added by 'git notes add'

diff --git a/dc/344511236f5698afd1c002be1ef050ab37c877 
b/dc/344511236f5698afd1c002be1ef050ab37c877
new file mode 100644
index ..26bb3ad122be
--- /dev/null
+++ b/dc/344511236f5698afd1c002be1ef050ab37c877
@@ -0,0 +1 @@
+prefer: 7e86fc3fe72f67b0d9240b4afad28c66dc482c80
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/htmlimport/htmlimport.cxx |   15 ++-
 sw/source/filter/html/htmlplug.cxx |   10 +-
 2 files changed, 23 insertions(+), 2 deletions(-)

New commits:
commit 16605d0cdc2c15ab4ae175531ba52824bf52bc70
Author: Miklos Vajna 
Date:   Wed Mar 7 11:35:12 2018 +0100

sw XHTML import: handle media type of OLE object data

For both the native data and the replacement image.

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

diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx 
b/sw/qa/extras/htmlimport/htmlimport.cxx
index 7cdf5f45dc1e..23017e40a79b 100644
--- a/sw/qa/extras/htmlimport/htmlimport.cxx
+++ b/sw/qa/extras/htmlimport/htmlimport.cxx
@@ -14,6 +14,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -315,7 +316,8 @@ DECLARE_HTMLIMPORT_TEST(testReqIfOleImg, 
"reqif-ole-img.xhtml")
 uno::Reference 
xObject(xObjects->getByIndex(0),
uno::UNO_QUERY);
 // This failed, OLE object had no replacement image.
-CPPUNIT_ASSERT(xObject->getReplacementGraphic().is());
+uno::Reference xGraphic = 
xObject->getReplacementGraphic();
+CPPUNIT_ASSERT(xGraphic.is());
 
 uno::Reference xShape(xObject, uno::UNO_QUERY);
 OutputDevice* pDevice = Application::GetDefaultDevice();
@@ -325,6 +327,17 @@ DECLARE_HTMLIMPORT_TEST(testReqIfOleImg, 
"reqif-ole-img.xhtml")
 awt::Size aSize = xShape->getSize();
 // This was only 1247, size was not set explicitly.
 CPPUNIT_ASSERT_EQUAL(static_cast(aLogic.getWidth()), 
aSize.Width);
+
+// Check mime/media types.
+CPPUNIT_ASSERT_EQUAL(OUString("image/png"), 
getProperty(xGraphic, "MimeType"));
+
+uno::Reference 
xStorageProvider(mxComponent, uno::UNO_QUERY);
+uno::Reference xStorage = 
xStorageProvider->getDocumentStorage();
+auto aStreamName = getProperty(xObject, "StreamName");
+uno::Reference xStream
+= xStorage->openStreamElement(aStreamName, embed::ElementModes::READ);
+// This was empty.
+CPPUNIT_ASSERT_EQUAL(OUString("text/rtf"), getProperty(xStream, 
"MediaType"));
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/html/htmlplug.cxx 
b/sw/source/filter/html/htmlplug.cxx
index ca7219baa8d8..83d04d3bfa1c 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -433,7 +433,7 @@ void SwHTMLParser::InsertEmbed()
 if (GraphicFilter::GetGraphicFilter().ImportGraphic(aGraphic, aURLObj) 
!= ERRCODE_NONE)
 return;
 
-rObj.SetGraphic(aGraphic, OUString());
+rObj.SetGraphic(aGraphic, aType);
 
 // Set the size of the OLE frame to the size of the graphic.
 OutputDevice* pDevice = Application::GetDefaultDevice();
@@ -496,6 +496,14 @@ void SwHTMLParser::InsertEmbed()
 uno::Reference xOutStream
 = xStorage->openStreamElement(aObjName, 
embed::ElementModes::READWRITE);
 comphelper::OStorageHelper::CopyInputToOutput(xInStream, 
xOutStream->getOutputStream());
+
+if (!aType.isEmpty())
+{
+// Set media type of the native data.
+uno::Reference 
xOutStreamProps(xOutStream, uno::UNO_QUERY);
+if (xOutStreamProps.is())
+xOutStreamProps->setPropertyValue("MediaType", 
uno::makeAny(aType));
+}
 }
 xObj = aCnt.GetEmbeddedObject(aObjName);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 4f/d38c7a96b91bdce3804a490e6f4b643000c212

[Caolán McNamara]

 4f/d38c7a96b91bdce3804a490e6f4b643000c212 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit cb730a4bb6846d5645815d6188f6dbdafa409d7b
Author: Caolán McNamara 
Date:   Wed Mar 7 11:25:54 2018 +

Notes added by 'git notes add'

diff --git a/4f/d38c7a96b91bdce3804a490e6f4b643000c212 
b/4f/d38c7a96b91bdce3804a490e6f4b643000c212
new file mode 100644
index ..be065ca2e131
--- /dev/null
+++ b/4f/d38c7a96b91bdce3804a490e6f4b643000c212
@@ -0,0 +1 @@
+prefer: 086abe9eddd55573d8c04728649b574338176410
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 75/6f141b6bfa64854d61230201ca9fc9d52a6b78

[Caolán McNamara]

 75/6f141b6bfa64854d61230201ca9fc9d52a6b78 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 436f83340bf33ee072a3d6d88244d2c353109528
Author: Caolán McNamara 
Date:   Wed Mar 7 11:25:10 2018 +

Notes added by 'git notes add'

diff --git a/75/6f141b6bfa64854d61230201ca9fc9d52a6b78 
b/75/6f141b6bfa64854d61230201ca9fc9d52a6b78
new file mode 100644
index ..fc4d616d4f80
--- /dev/null
+++ b/75/6f141b6bfa64854d61230201ca9fc9d52a6b78
@@ -0,0 +1 @@
+prefer: a6f361b06f86d49edaad47486ae3eaa16fb2fac7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - db/da740d5e12fb77f3452c3e5515bdad233b91d8

[Caolán McNamara]

 db/da740d5e12fb77f3452c3e5515bdad233b91d8 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a0b1839261b188f6263124c4ec6f0262a9ec1ca1
Author: Caolán McNamara 
Date:   Wed Mar 7 11:24:25 2018 +

Notes added by 'git notes add'

diff --git a/db/da740d5e12fb77f3452c3e5515bdad233b91d8 
b/db/da740d5e12fb77f3452c3e5515bdad233b91d8
new file mode 100644
index ..07016a06c204
--- /dev/null
+++ b/db/da740d5e12fb77f3452c3e5515bdad233b91d8
@@ -0,0 +1 @@
+prefer: 38f259e79cb2784834f1f5d4ea196f46826c5164
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d9/da41596ac929c64e10337ef08f54dbcf4fca80

[Caolán McNamara]

 d9/da41596ac929c64e10337ef08f54dbcf4fca80 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 16e781bb77d5ea7d96de07753bd79313cdb0213a
Author: Caolán McNamara 
Date:   Wed Mar 7 11:22:38 2018 +

Notes added by 'git notes add'

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 5b/228e142213723cea318a5cdcc51258347366af

[Caolán McNamara]

 5b/228e142213723cea318a5cdcc51258347366af |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 67db9a66619ca385f2e162be5196400528ed85ac
Author: Caolán McNamara 
Date:   Wed Mar 7 11:22:17 2018 +

Notes added by 'git notes add'

diff --git a/5b/228e142213723cea318a5cdcc51258347366af 
b/5b/228e142213723cea318a5cdcc51258347366af
new file mode 100644
index ..8ebbe55237b1
--- /dev/null
+++ b/5b/228e142213723cea318a5cdcc51258347366af
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 9a/b0a116fec8762da6ff31f2e103d5a2a7dae8ae

[Caolán McNamara]

 9a/b0a116fec8762da6ff31f2e103d5a2a7dae8ae |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1aaa2665f47145f9371eed8b240b9da82cd54b49
Author: Caolán McNamara 
Date:   Wed Mar 7 11:21:42 2018 +

Notes added by 'git notes add'

diff --git a/9a/b0a116fec8762da6ff31f2e103d5a2a7dae8ae 
b/9a/b0a116fec8762da6ff31f2e103d5a2a7dae8ae
new file mode 100644
index ..26bb3ad122be
--- /dev/null
+++ b/9a/b0a116fec8762da6ff31f2e103d5a2a7dae8ae
@@ -0,0 +1 @@
+prefer: 7e86fc3fe72f67b0d9240b4afad28c66dc482c80
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Makefile.am

[Andras Timar]

 Makefile.am |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2c95332d662a28583d7dd37f7a0b580512c96c39
Author: Andras Timar 
Date:   Wed Mar 7 12:18:57 2018 +0100

add JsonUtil.hpp to dist tarball

Change-Id: I41d1e56ff817142670caafb4a260b76f8f0003f9

diff --git a/Makefile.am b/Makefile.am
index db9ee34bd..1e581e057 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -155,6 +155,7 @@ wsd_headers = wsd/Admin.hpp \
 
 shared_headers = common/Common.hpp \
  common/Crypto.hpp \
+ common/JsonUtil.hpp \
  common/IoUtil.hpp \
  common/FileUtil.hpp \
  common/Log.hpp \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loleaflet/npm-shrinkwrap.json loleaflet/package.json loleaflet/README

[Andras Timar]

 loleaflet/README  |2 
 loleaflet/npm-shrinkwrap.json | 3293 +-
 loleaflet/package.json|   11 
 3 files changed, 1391 insertions(+), 1915 deletions(-)

New commits:
commit 7a199b9703c237ed4650993649ffdfba9d717e10
Author: Andras Timar 
Date:   Wed Mar 7 12:08:55 2018 +0100

typo: tets -> tests

Change-Id: I8cd938c99c9087ebf2db85e361fecfa916d3adbe

diff --git a/loleaflet/README b/loleaflet/README
index 4694417a2..0b71b24c7 100644
--- a/loleaflet/README
+++ b/loleaflet/README
@@ -121,7 +121,7 @@ Testing
 + run: make load-test
 
 The structure of the unit tests:
-Loleaflet unit tets are located under spec/loleaflet. Following Leaflet's 
testing style, each test's path
+Loleaflet unit tests are located under spec/loleaflet. Following Leaflet's 
testing style, each test's path
 should mirror the source's path, so spec/loleaflet/control/ToolbarSpec.js 
tests the features from
 src/control/Toolbar.js . Any new test file needs also to be added in 
spec/leaflet.html
 
commit c0a902ba816f9acc940531264a75e2ca54592603
Author: Andras Timar 
Date:   Mon Mar 5 17:44:17 2018 +0100

Revert "NPM Shrinkwrap: Upgrade to new format (v5)"

This reverts commit 37e7e953043e8aecf7941a54d530d319dbefc119.

diff --git a/loleaflet/npm-shrinkwrap.json b/loleaflet/npm-shrinkwrap.json
index ffeb9e140..8c8d46ae5 100644
--- a/loleaflet/npm-shrinkwrap.json
+++ b/loleaflet/npm-shrinkwrap.json
@@ -1,363 +1,243 @@
 {
   "name": "loleaflet",
   "version": "0.8.0-dev",
-  "lockfileVersion": 1,
-  "requires": true,
   "dependencies": {
 "autolinker": {
   "version": "1.4.3",
-  "resolved": 
"https://registry.npmjs.org/autolinker/-/autolinker-1.4.3.tgz";,
-  "integrity": "sha1-LmFQV8jjcTmabXeUmppq8k/kbfw=",
+  "from": "autolinker@latest",
+  "resolved": "./node_shrinkwrap/autolinker-1.4.3.tgz",
   "dev": true
 },
 "bootstrap": {
-  "version": "file:node_shrinkwrap/bootstrap-3.3.6.tgz",
-  "integrity": 
"sha512-XC+LTYJoVYHIalmjNcznwlZHY+YLhMJ9NPs8M2aEweugK7wMrto3h79POn7O5Vj/woDU/tjzmjyUbAd1HzSXIw==",
+  "version": "3.3.6",
+  "from": "node_shrinkwrap/bootstrap-3.3.6.tgz",
+  "resolved": "./node_shrinkwrap/bootstrap-3.3.6.tgz",
   "dev": true
 },
 "browserify": {
-  "version": "file:node_shrinkwrap/browserify-13.1.0.tgz",
-  "integrity": 
"sha512-i5iASp425UxqX6nhOfsxJVLmm+GKvPcapI8RsPixFSNQQbSbrZsYYLzPK1amobpeOuDF7nJDq/upZYkmw/C59w==",
+  "version": "13.1.0",
+  "from": "node_shrinkwrap/browserify-13.1.0.tgz",
+  "resolved": "./node_shrinkwrap/browserify-13.1.0.tgz",
   "dev": true,
-  "requires": {
-"JSONStream": "file:node_shrinkwrap/JSONStream-1.1.4.tgz",
-"assert": "file:node_shrinkwrap/assert-1.3.0.tgz",
-"browser-pack": "file:node_shrinkwrap/browser-pack-6.0.1.tgz",
-"browser-resolve": "file:node_shrinkwrap/browser-resolve-1.11.2.tgz",
-"browserify-zlib": "file:node_shrinkwrap/browserify-zlib-0.1.4.tgz",
-"buffer": "file:node_shrinkwrap/buffer-4.7.1.tgz",
-"concat-stream": "file:node_shrinkwrap/concat-stream-1.5.1.tgz",
-"console-browserify": 
"file:node_shrinkwrap/console-browserify-1.1.0.tgz",
-"constants-browserify": 
"file:node_shrinkwrap/constants-browserify-1.0.0.tgz",
-"crypto-browserify": 
"file:node_shrinkwrap/crypto-browserify-3.11.0.tgz",
-"defined": "file:node_shrinkwrap/defined-1.0.0.tgz",
-"deps-sort": "file:node_shrinkwrap/deps-sort-2.0.0.tgz",
-"domain-browser": "file:node_shrinkwrap/domain-browser-1.1.7.tgz",
-"duplexer2": "file:node_shrinkwrap/duplexer2-0.1.4.tgz",
-"events": "file:node_shrinkwrap/events-1.1.1.tgz",
-"glob": "file:node_shrinkwrap/glob-5.0.15.tgz",
-"has": "file:node_shrinkwrap/has-1.0.1.tgz",
-"htmlescape": "file:node_shrinkwrap/htmlescape-1.1.1.tgz",
-"https-browserify": "file:node_shrinkwrap/https-browserify-0.0.1.tgz",
-"inherits": "file:node_shrinkwrap/inherits-2.0.1.tgz",
-"insert-module-globals": 
"file:node_shrinkwrap/insert-module-globals-7.0.1.tgz",
-"labeled-stream-splicer": 
"file:node_shrinkwrap/labeled-stream-splicer-2.0.0.tgz",
-"module-deps": "file:node_shrinkwrap/module-deps-4.0.7.tgz",
-"os-browserify": "file:node_shrinkwrap/os-browserify-0.1.2.tgz",
-"parents": "file:node_shrinkwrap/parents-1.0.1.tgz",
-"path-browserify": "file:node_shrinkwrap/path-browserify-0.0.0.tgz",
-"process": "file:node_shrinkwrap/process-0.11.7.tgz",
-"punycode": "file:node_shrinkwrap/punycode-1.4.1.tgz",
-"querystring-es3": "file:node_shrinkwrap/querystring-es3-0.2.1.tgz",
-"read-only-stream": "file:node_shrinkwrap/read-only-stream-2.0.0.tgz",
-"readable-stream": "file:node_shrinkwrap/readable-stream-2.1.4.tgz",
-"resolve": "file:node_shrinkwrap/resolve-1.1.7.tgz",
-"sh

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

[Noel Grandin]

 desktop/source/migration/migration.cxx |   20 +++-
 1 file changed, 3 insertions(+), 17 deletions(-)

New commits:
commit b75632f3086b2f7af0606ef17d6535c514528644
Author: Noel Grandin 
Date:   Wed Mar 7 10:43:34 2018 +0200

use comphelper::containerToSequence

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

diff --git a/desktop/source/migration/migration.cxx 
b/desktop/source/migration/migration.cxx
index 7f5b52a74b02..a42602bc7204 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -681,21 +681,6 @@ bool getComponent(OUString const & path, OUString * 
component)
 return true;
 }
 
-uno::Sequence< OUString > setToSeq(std::set< OUString > const & set)
-{
-std::set< OUString >::size_type n = set.size();
-if (n > SAL_MAX_INT32) {
-throw std::bad_alloc();
-}
-uno::Sequence< OUString > seq(static_cast< sal_Int32 >(n));
-sal_Int32 i = 0;
-for (auto const& elem : set)
-{
-seq[i++] = elem;
-}
-return seq;
-}
-
 }
 
 void MigrationImpl::copyConfig()
@@ -756,8 +741,9 @@ void MigrationImpl::copyConfig()
 configuration::Update::get(
 comphelper::getProcessComponentContext())->
 insertModificationXcuFile(
-regFilePath, setToSeq(comp.second.includedPaths),
-setToSeq(comp.second.excludedPaths));
+regFilePath,
+comphelper::containerToSequence(comp.second.includedPaths),
+comphelper::containerToSequence(comp.second.excludedPaths));
 } else {
 SAL_INFO( "desktop.migration", "configuration migration component 
" << comp.first << " ignored (only excludes, no includes)" );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mark Hung]

 sw/source/core/layout/paintfrm.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5b910af084924e11b9a74002fd53843e88005db4
Author: Mark Hung 
Date:   Sat Mar 3 19:14:25 2018 +0800

tdf#84522 fix reversed text of column break mark in a RTL page.

Set RTL falg for the font when the frame is right-to-left.

Change-Id: I834620ed44b01b9577ca6c7c42191f2400dd8219
Reviewed-on: https://gerrit.libreoffice.org/50673
Tested-by: Jenkins 
Reviewed-by: Mark Hung 

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 61fcc2cd72f2..d9c727202df4 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3598,7 +3598,7 @@ void SwColumnFrame::PaintBreak( ) const
 aFont.SetFontHeight( 8 * 20 );
 pOut->SetFont( aFont );
 drawinglayer::attribute::FontAttribute aFontAttr = 
drawinglayer::primitive2d::getFontAttributeFromVclFont(
-aFontSize, aFont, false, false );
+aFontSize, aFont, IsRightToLeft(), false );
 
 tools::Rectangle aTextRect;
 pOut->GetTextBoundRect( aTextRect, aBreakText );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Question About Google Summer of Code 2018

[杨靖]

Dear mentors,

I'm a senior student from Guangdong University of Foreign Studies, and
really want to participate into the Google Summer of Code 2018 this year. I
used LibreOffice for a long time, and I want to do some contribution.

Could you please tell me some of the information about the program?

Sincerely!

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

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

[Tamas Bunth]

 dbaccess/source/filter/hsqldb/createparser.cxx   |   12 +
 dbaccess/source/filter/hsqldb/hsqlimport.cxx |   29 ++-
 dbaccess/source/filter/hsqldb/rowinputbinary.cxx |2 -
 3 files changed, 41 insertions(+), 2 deletions(-)

New commits:
commit ed031c6ceab99bf3e6b0ea320423d9fa9a734ad5
Author: Tamas Bunth 
Date:   Tue Mar 6 21:39:37 2018 +0100

dbahsql: add BINARY and VARBINARY import

Change-Id: Ibb4d5f8dda16dc7779b7a7b818a8bd2c49cbf283
Reviewed-on: https://gerrit.libreoffice.org/50844
Tested-by: Jenkins 
Reviewed-by: Tamás Bunth 

diff --git a/dbaccess/source/filter/hsqldb/createparser.cxx 
b/dbaccess/source/filter/hsqldb/createparser.cxx
index 4df5a097bc64..8e7f12391e0f 100644
--- a/dbaccess/source/filter/hsqldb/createparser.cxx
+++ b/dbaccess/source/filter/hsqldb/createparser.cxx
@@ -157,8 +157,16 @@ sal_Int32 lcl_getDataTypeFromHsql(const OUString& 
sTypeName)
 assert(false);
 return -1;
 }
+
+void lcl_addDefaultParameters(std::vector& aParams, sal_Int32 eType)
+{
+if (eType == DataType::CHAR || eType == DataType::BINARY || eType == 
DataType::VARBINARY
+|| eType == DataType::VARCHAR)
+aParams.push_back(8000); // from SQL standard
 }
 
+} // unnamed namespace
+
 namespace dbahsql
 {
 CreateStmtParser::CreateStmtParser() {}
@@ -195,6 +203,10 @@ void CreateStmtParser::parseColumnPart(const OUString& 
sColumnPart)
 aParams.push_back(sParam.toInt32());
 }
 }
+else
+{
+lcl_addDefaultParameters(aParams, 
lcl_getDataTypeFromHsql(sTypeName));
+}
 
 ColumnDefinition aColDef(words[0], lcl_getDataTypeFromHsql(sTypeName), 
aParams,
  lcl_isPrimaryKey(sColumn), 
lcl_getAutoIncrementDefault(sColumn),
diff --git a/dbaccess/source/filter/hsqldb/hsqlimport.cxx 
b/dbaccess/source/filter/hsqldb/hsqlimport.cxx
index c1f4cddd113c..03d25f79ed03 100644
--- a/dbaccess/source/filter/hsqldb/hsqlimport.cxx
+++ b/dbaccess/source/filter/hsqldb/hsqlimport.cxx
@@ -122,28 +122,55 @@ void lcl_setParams(const RowVector& row, 
Reference& xParam,
 }
 break;
 case DataType::BIGINT:
-break;
+{
+sal_Int64 nVal;
+if (row.at(i) >>= nVal)
+{
+xParam->setLong(i + 1, nVal);
+}
+}
+break;
 case DataType::REAL:
 case DataType::FLOAT:
 case DataType::DOUBLE:
+{
+double nVal;
+if (row.at(i) >>= nVal)
+{
+xParam->setDouble(i + 1, nVal);
+}
 break;
+}
 case DataType::NUMERIC:
 case DataType::DECIMAL:
+// TODO
 break;
 case DataType::DATE:
+// TODO
 break;
 case DataType::TIME:
+// TODO
 break;
 case DataType::TIMESTAMP:
+// TODO
 break;
 case DataType::BOOLEAN:
+// TODO
 break;
 case DataType::OTHER:
+// TODO
 break;
 case DataType::BINARY:
 case DataType::VARBINARY:
 case DataType::LONGVARBINARY:
+{
+Sequence nVal;
+if (row.at(i) >>= nVal)
+{
+xParam->setBytes(i + 1, nVal);
+}
 break;
+}
 default:
 throw WrongFormatException();
 }
diff --git a/dbaccess/source/filter/hsqldb/rowinputbinary.cxx 
b/dbaccess/source/filter/hsqldb/rowinputbinary.cxx
index 37cfa918fef5..a0f52b0601a1 100644
--- a/dbaccess/source/filter/hsqldb/rowinputbinary.cxx
+++ b/dbaccess/source/filter/hsqldb/rowinputbinary.cxx
@@ -227,7 +227,7 @@ std::vector HsqlRowInputStream::readOneRow(const 
ColumnTypeVector& nColType
 sal_Int32 nSize = 0;
 m_pStream->ReadInt32(nSize);
 
-Sequence aBytes(nSize);
+Sequence aBytes(nSize);
 m_pStream->ReadBytes(aBytes.getArray(), nSize);
 aData.push_back(makeAny(aBytes));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamas Bunth]

 connectivity/source/drivers/firebird/PreparedStatement.cxx |   91 -
 1 file changed, 62 insertions(+), 29 deletions(-)

New commits:
commit c25b884d5493422e126a7f4e52008cebb073ec7a
Author: Tamas Bunth 
Date:   Sun Mar 4 17:30:13 2018 +0100

Firebird: allow setting BINARY fix and VARBINARY

Allow setting BINARY (fix) and VARBINARY types in method setBytes.

Change-Id: I6c8cfc5aff6e1240eadd6b061d629586a25b71c3
Reviewed-on: https://gerrit.libreoffice.org/50735
Tested-by: Jenkins 
Reviewed-by: Tamás Bunth 

diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx 
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 9d9a6853e1fa..2f48c63c746e 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -787,45 +787,78 @@ void SAL_CALL OPreparedStatement::setBytes(sal_Int32 
nParameterIndex,
 checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
 checkParameterIndex(nParameterIndex);
 
+XSQLVAR* pVar = m_pInSqlda->sqlvar + (nParameterIndex - 1);
+int dType = (pVar->sqltype & ~1); // drop flag bit for now
+
+if( dType == SQL_BLOB )
+{
 #if SAL_TYPES_SIZEOFPOINTER == 8
-isc_blob_handle aBlobHandle = 0;
+isc_blob_handle aBlobHandle = 0;
 #else
-isc_blob_handle aBlobHandle = nullptr;
+isc_blob_handle aBlobHandle = nullptr;
 #endif
-ISC_QUAD aBlobId;
+ISC_QUAD aBlobId;
 
-openBlobForWriting(aBlobHandle, aBlobId);
+openBlobForWriting(aBlobHandle, aBlobId);
 
-// Max segment size is 2^16 == SAL_MAX_UINT16
-sal_uInt64 nDataWritten = 0;
-ISC_STATUS aErr = 0;
-while (xBytes.getLength() - nDataWritten > 0)
-{
-sal_uInt64 nDataRemaining = xBytes.getLength() - nDataWritten;
-sal_uInt16 nWriteSize = std::min(nDataRemaining, 
SAL_MAX_UINT16);
-aErr = isc_put_segment(m_statusVector,
-   &aBlobHandle,
-   nWriteSize,
-   reinterpret_cast(xBytes.getConstArray()) + nDataWritten);
-nDataWritten += nWriteSize;
+// Max segment size is 2^16 == SAL_MAX_UINT16
+sal_uInt64 nDataWritten = 0;
+ISC_STATUS aErr = 0;
+while (xBytes.getLength() - nDataWritten > 0)
+{
+sal_uInt64 nDataRemaining = xBytes.getLength() - nDataWritten;
+sal_uInt16 nWriteSize = std::min(nDataRemaining, 
SAL_MAX_UINT16);
+aErr = isc_put_segment(m_statusVector,
+   &aBlobHandle,
+   nWriteSize,
+   reinterpret_cast(xBytes.getConstArray()) + nDataWritten);
+nDataWritten += nWriteSize;
+
+if (aErr)
+break;
+}
 
-if (aErr)
-break;
-}
+// We need to make sure we close the Blob even if their are errors, 
hence evaluate
+// errors after closing.
+closeBlobAfterWriting(aBlobHandle);
 
-// We need to make sure we close the Blob even if their are errors, hence 
evaluate
-// errors after closing.
-closeBlobAfterWriting(aBlobHandle);
+if (aErr)
+{
+evaluateStatusVector(m_statusVector,
+ "isc_put_segment failed",
+ *this);
+assert(false);
+}
 
-if (aErr)
+setValue< ISC_QUAD >(nParameterIndex, aBlobId, SQL_BLOB);
+}
+else if( dType == SQL_VARYING )
 {
-evaluateStatusVector(m_statusVector,
- "isc_put_segment failed",
- *this);
-assert(false);
+const sal_Int32 nMaxSize = 0x;
+Sequence xBytesCopy(xBytes);
+// First 2 bytes indicate string size
+if (xBytesCopy.getLength() > nMaxSize)
+{
+xBytesCopy.realloc( nMaxSize );
+}
+const short nSize = xBytesCopy.getLength();
+memcpy(pVar->sqldata, &nSize, 2);
+// Actual data
+memcpy(pVar->sqldata + 2, xBytesCopy.getConstArray(), nSize);
+}
+else if( dType == SQL_TEXT )
+{
+memcpy(pVar->sqldata, xBytes.getConstArray(), xBytes.getLength() );
+// Fill remainder with spaces
+memset(pVar->sqldata + xBytes.getLength(), 0, pVar->sqllen - 
xBytes.getLength());
+}
+else
+{
+::dbtools::throwSQLException(
+"Incorrect type for setBytes",
+::dbtools::StandardSQLState::INVALID_SQL_DATA_TYPE,
+*this);
 }
-
-setValue< ISC_QUAD >(nParameterIndex, aBlobId, SQL_BLOB);
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 oox/source/drawingml/fillproperties.cxx |   46 
 1 file changed, 18 insertions(+), 28 deletions(-)

New commits:
commit 70306e5a3e7f9f999b06d5c7c3f9118dbb51ae54
Author: Tomaž Vajngerl 
Date:   Wed Mar 7 16:40:48 2018 +0900

oox: adapt graphic transformer, cleanup, remove try catch

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

diff --git a/oox/source/drawingml/fillproperties.cxx 
b/oox/source/drawingml/fillproperties.cxx
index e7b16553c622..9351b473068f 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -59,56 +59,46 @@ namespace drawingml {
 
 namespace {
 
-Reference< XGraphic > lclCheckAndApplyDuotoneTransform( const 
BlipFillProperties& aBlipProps, Reference< XGraphic > const & xGraphic,
-const GraphicHelper& 
rGraphicHelper, const ::Color nPhClr )
+Reference< XGraphic > lclCheckAndApplyDuotoneTransform(const 
BlipFillProperties& aBlipProps, uno::Reference const & 
xGraphic,
+   const GraphicHelper& 
rGraphicHelper, const ::Color nPhClr)
 {
-if( aBlipProps.maDuotoneColors[0].isUsed() && 
aBlipProps.maDuotoneColors[1].isUsed() )
+if (aBlipProps.maDuotoneColors[0].isUsed() && 
aBlipProps.maDuotoneColors[1].isUsed())
 {
 ::Color nColor1 = aBlipProps.maDuotoneColors[0].getColor( 
rGraphicHelper, nPhClr );
 ::Color nColor2 = aBlipProps.maDuotoneColors[1].getColor( 
rGraphicHelper, nPhClr );
-try
-{
-Reference< XGraphicTransformer > xTransformer( 
aBlipProps.mxFillGraphic, UNO_QUERY_THROW );
-return xTransformer->applyDuotone( xGraphic, sal_Int32(nColor1), 
sal_Int32(nColor2) );
-}
-catch( Exception& )
-{
-}
+
+uno::Reference 
xTransformer(aBlipProps.mxFillGraphic, uno::UNO_QUERY);
+if (xTransformer.is())
+return xTransformer->applyDuotone(xGraphic, sal_Int32(nColor1), 
sal_Int32(nColor2));
 }
 return xGraphic;
 }
 
-Reference< XGraphic > lclCheckAndApplyChangeColorTransform( const 
BlipFillProperties &aBlipProps, Reference< XGraphic >  const & xGraphic,
-const 
GraphicHelper& rGraphicHelper, const ::Color nPhClr )
+Reference< XGraphic > lclCheckAndApplyChangeColorTransform(const 
BlipFillProperties &aBlipProps, uno::Reference const & 
xGraphic,
+   const 
GraphicHelper& rGraphicHelper, const ::Color nPhClr)
 {
 if( aBlipProps.maColorChangeFrom.isUsed() && 
aBlipProps.maColorChangeTo.isUsed() )
 {
 ::Color nFromColor = aBlipProps.maColorChangeFrom.getColor( 
rGraphicHelper, nPhClr );
 ::Color nToColor = aBlipProps.maColorChangeTo.getColor( 
rGraphicHelper, nPhClr );
-if ( (nFromColor != nToColor) || 
aBlipProps.maColorChangeTo.hasTransparency() ) try
+if ( (nFromColor != nToColor) || 
aBlipProps.maColorChangeTo.hasTransparency() )
 {
 sal_Int16 nToTransparence = 
aBlipProps.maColorChangeTo.getTransparency();
 sal_Int8 nToAlpha = static_cast< sal_Int8 >( (100 - 
nToTransparence) * 2.55 );
-Reference< XGraphicTransformer > xTransformer( 
aBlipProps.mxFillGraphic, UNO_QUERY_THROW );
-return xTransformer->colorChange( xGraphic, sal_Int32(nFromColor), 
9, sal_Int32(nToColor), nToAlpha );
-}
-catch( Exception& )
-{
+
+uno::Reference 
xTransformer(aBlipProps.mxFillGraphic, uno::UNO_QUERY);
+if (xTransformer.is())
+return xTransformer->colorChange(xGraphic, 
sal_Int32(nFromColor), 9, sal_Int32(nToColor), nToAlpha);
 }
 }
 return xGraphic;
 }
 
-Reference< XGraphic > applyBrightnessContrast( Reference< XGraphic > const & 
xGraphic, sal_Int32 brightness, sal_Int32 contrast )
+uno::Reference 
applyBrightnessContrast(uno::Reference const & xGraphic, 
sal_Int32 brightness, sal_Int32 contrast)
 {
-try
-{
-Reference< XGraphicTransformer > xTransformer( xGraphic, 
UNO_QUERY_THROW );
-return xTransformer->applyBrightnessContrast( xGraphic, 
brightness, contrast, true );
-}
-catch( Exception& )
-{
-}
+uno::Reference xTransformer(xGraphic, 
uno::UNO_QUERY);
+if (xTransformer.is())
+return xTransformer->applyBrightnessContrast(xGraphic, brightness, 
contrast, true);
 return xGraphic;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 svtools/source/graphic/transformer.cxx |   55 -
 1 file changed, 27 insertions(+), 28 deletions(-)

New commits:
commit 19b6b8f8946a6fb720806a3f51a06760047d2ffc
Author: Tomaž Vajngerl 
Date:   Wed Mar 7 16:31:16 2018 +0900

transformer: clean-up and pass originURL to transfored graphic

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

diff --git a/svtools/source/graphic/transformer.cxx 
b/svtools/source/graphic/transformer.cxx
index 12bc40f3babc..9c4121a5de31 100644
--- a/svtools/source/graphic/transformer.cxx
+++ b/svtools/source/graphic/transformer.cxx
@@ -50,8 +50,8 @@ GraphicTransformer::~GraphicTransformer()
 uno::Reference< graphic::XGraphic > SAL_CALL GraphicTransformer::colorChange(
 const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 
nColorFrom, sal_Int8 nTolerance, sal_Int32 nColorTo, sal_Int8 nAlphaTo )
 {
-const uno::Reference< uno::XInterface > xIFace(rxGraphic, uno::UNO_QUERY);
-::Graphic aGraphic(*::unographic::Graphic::getImplementation(xIFace));
+::Graphic aGraphic(rxGraphic);
+::Graphic aReturnGraphic;
 
 BitmapColor aBmpColorFrom(static_cast< sal_uInt8 >(nColorFrom), 
static_cast< sal_uInt8 >(nColorFrom >> 8), static_cast< sal_uInt8 >(nColorFrom 
>> 16));
 BitmapColor aBmpColorTo( static_cast< sal_uInt8 >(nColorTo), static_cast< 
sal_uInt8 >(nColorTo >> 8), static_cast< sal_uInt8 >(nColorTo  >> 16));
@@ -61,7 +61,8 @@ uno::Reference< graphic::XGraphic > SAL_CALL 
GraphicTransformer::colorChange(
 
 const sal_uInt8 cIndexFrom = aBmpColorFrom.GetBlueOrIndex();
 
-if (aGraphic.GetType() == GraphicType::Bitmap || aGraphic.GetType() == 
GraphicType::GdiMetafile)
+if (aGraphic.GetType() == GraphicType::Bitmap ||
+aGraphic.GetType() == GraphicType::GdiMetafile)
 {
 BitmapEx aBitmapEx(aGraphic.GetBitmapEx());
 Bitmap aBitmap(aBitmapEx.GetBitmap());
@@ -70,7 +71,7 @@ uno::Reference< graphic::XGraphic > SAL_CALL 
GraphicTransformer::colorChange(
 {
 aBitmapEx.setAlphaFrom( cIndexFrom, nAlphaTo );
 aBitmapEx.Replace(aColorFrom, aColorTo, nTolerance);
-aGraphic = ::Graphic(aBitmapEx);
+aReturnGraphic = ::Graphic(aBitmapEx);
 }
 else if (aBitmapEx.IsTransparent())
 {
@@ -80,13 +81,13 @@ uno::Reference< graphic::XGraphic > SAL_CALL 
GraphicTransformer::colorChange(
 Bitmap aMask2(aBitmap.CreateMask(aColorFrom, nTolerance));
 aMask.CombineSimple(aMask2, BmpCombine::Or);
 aBitmap.Replace(aColorFrom, aColorTo, nTolerance);
-aGraphic = ::Graphic(BitmapEx(aBitmap, aMask));
+aReturnGraphic = ::Graphic(BitmapEx(aBitmap, aMask));
 }
 else
 {
 aBitmapEx.setAlphaFrom(cIndexFrom, 0xff - nAlphaTo);
 aBitmapEx.Replace(aColorFrom, aColorTo, nTolerance);
-aGraphic = ::Graphic(aBitmapEx);
+aReturnGraphic = ::Graphic(aBitmapEx);
 }
 }
 else
@@ -95,57 +96,55 @@ uno::Reference< graphic::XGraphic > SAL_CALL 
GraphicTransformer::colorChange(
 {
 Bitmap aMask(aBitmap.CreateMask(aColorFrom, nTolerance));
 aBitmap.Replace(aColorFrom, aColorTo, nTolerance);
-aGraphic = ::Graphic(BitmapEx(aBitmap, aMask));
+aReturnGraphic = ::Graphic(BitmapEx(aBitmap, aMask));
 }
 else
 {
 aBitmapEx.setAlphaFrom(cIndexFrom, nAlphaTo);
 aBitmapEx.Replace(aColorFrom, aColorTo, nTolerance);
-aGraphic = ::Graphic(aBitmapEx);
+aReturnGraphic = ::Graphic(aBitmapEx);
 }
 }
 }
 
-::unographic::Graphic* pUnoGraphic = new ::unographic::Graphic();
-pUnoGraphic->init(aGraphic);
-uno::Reference< graphic::XGraphic > xRet(pUnoGraphic);
+aReturnGraphic.setOriginURL(aGraphic.getOriginURL());
 
-return xRet;
+unographic::Graphic* pUnoGraphic = new unographic::Graphic();
+pUnoGraphic->init(aReturnGraphic);
+return uno::Reference(pUnoGraphic);
 }
 
 uno::Reference< graphic::XGraphic > SAL_CALL GraphicTransformer::applyDuotone(
 const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 nColorOne, 
sal_Int32 nColorTwo )
 {
-const uno::Reference< uno::XInterface > xIFace( rxGraphic, uno::UNO_QUERY 
);
-::Graphic aGraphic( *::unographic::Graphic::getImplementation( xIFace ) );
+::Graphic aGraphic(rxGraphic);
+::Graphic aReturnGraphic;
 
 BitmapExaBitmapEx( aGraphic.GetBitmapEx() );
 AlphaMask   aMask( aBitmapEx.GetAlpha() );
 Bitmap  aBitmap( aBitmapEx.GetBitmap() );
 BmpFilterParam aFilter( static_cast(nColorOne), 
static_cast(nColorTwo) );
 aBitmap.Filter( BmpFilte

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

[Tomaž Vajngerl]

 oox/inc/drawingml/fillproperties.hxx|3 --
 oox/source/drawingml/fillproperties.cxx |   19 +++-
 oox/source/drawingml/misccontexts.cxx   |6 ++---
 oox/source/drawingml/textparagraphpropertiescontext.cxx |4 +--
 oox/source/vml/vmlformatting.cxx|4 +--
 5 files changed, 17 insertions(+), 19 deletions(-)

New commits:
commit 584454cedc57efc98a386dffa2ebae30c0625b8a
Author: Tomaž Vajngerl 
Date:   Wed Mar 7 16:37:26 2018 +0900

oox: BlipFillProperties rename mxGraphic to mxFillGraphic

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

diff --git a/oox/inc/drawingml/fillproperties.hxx 
b/oox/inc/drawingml/fillproperties.hxx
index 7fe1a3f6033d..45f5c4b40272 100644
--- a/oox/inc/drawingml/fillproperties.hxx
+++ b/oox/inc/drawingml/fillproperties.hxx
@@ -98,8 +98,7 @@ struct ArtisticEffectProperties
 
 struct BlipFillProperties
 {
-css::uno::Reference< css::graphic::XGraphic >
-  mxGraphic;  /// The fill graphic.
+css::uno::Reference mxFillGraphic; /// The fill 
graphic.
 OptValue< sal_Int32 > moBitmapMode; /// Bitmap tile or stretch.
 OptValue< css::geometry::IntegerRectangle2D >
   moFillRect; /// Stretch fill offsets.
diff --git a/oox/source/drawingml/fillproperties.cxx 
b/oox/source/drawingml/fillproperties.cxx
index 9ba7e46ac215..e7b16553c622 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -68,7 +68,7 @@ Reference< XGraphic > lclCheckAndApplyDuotoneTransform( const 
BlipFillProperties
 ::Color nColor2 = aBlipProps.maDuotoneColors[1].getColor( 
rGraphicHelper, nPhClr );
 try
 {
-Reference< XGraphicTransformer > xTransformer( 
aBlipProps.mxGraphic, UNO_QUERY_THROW );
+Reference< XGraphicTransformer > xTransformer( 
aBlipProps.mxFillGraphic, UNO_QUERY_THROW );
 return xTransformer->applyDuotone( xGraphic, sal_Int32(nColor1), 
sal_Int32(nColor2) );
 }
 catch( Exception& )
@@ -89,7 +89,7 @@ Reference< XGraphic > lclCheckAndApplyChangeColorTransform( 
const BlipFillProper
 {
 sal_Int16 nToTransparence = 
aBlipProps.maColorChangeTo.getTransparency();
 sal_Int8 nToAlpha = static_cast< sal_Int8 >( (100 - 
nToTransparence) * 2.55 );
-Reference< XGraphicTransformer > xTransformer( 
aBlipProps.mxGraphic, UNO_QUERY_THROW );
+Reference< XGraphicTransformer > xTransformer( 
aBlipProps.mxFillGraphic, UNO_QUERY_THROW );
 return xTransformer->colorChange( xGraphic, sal_Int32(nFromColor), 
9, sal_Int32(nToColor), nToAlpha );
 }
 catch( Exception& )
@@ -187,8 +187,8 @@ void PatternFillProperties::assignUsed( const 
PatternFillProperties& rSourceProp
 
 void BlipFillProperties::assignUsed( const BlipFillProperties& rSourceProps )
 {
-if( rSourceProps.mxGraphic.is() )
-mxGraphic = rSourceProps.mxGraphic;
+if(rSourceProps.mxFillGraphic.is())
+mxFillGraphic = rSourceProps.mxFillGraphic;
 moBitmapMode.assignIfUsed( rSourceProps.moBitmapMode );
 moFillRect.assignIfUsed( rSourceProps.moFillRect );
 moTileOffsetX.assignIfUsed( rSourceProps.moTileOffsetX );
@@ -598,10 +598,9 @@ void FillProperties::pushToPropMap( ShapePropertyMap& 
rPropMap,
 
 case XML_blipFill:
 // do not start complex graphic transformation if property is 
not supported...
-if (maBlipProps.mxGraphic.is() && 
rPropMap.supportsProperty(ShapeProperty::FillBitmap))
+if (maBlipProps.mxFillGraphic.is() && 
rPropMap.supportsProperty(ShapeProperty::FillBitmap))
 {
-Reference< XGraphic > xGraphic = 
lclCheckAndApplyDuotoneTransform( maBlipProps, maBlipProps.mxGraphic, 
rGraphicHelper, nPhClr );
-uno::Reference xBitmap(xGraphic, 
uno::UNO_QUERY);
+uno::Reference xGraphic = 
lclCheckAndApplyDuotoneTransform(maBlipProps, maBlipProps.mxFillGraphic, 
rGraphicHelper, nPhClr);
 // TODO: "rotate with shape" is not possible with our 
current core
 
 if (xGraphic.is())
@@ -631,7 +630,7 @@ void FillProperties::pushToPropMap( ShapePropertyMap& 
rPropMap,
 RectanglePoint eRectPoint = lclGetRectanglePoint( 
maBlipProps.moTileAlign.get( XML_tl ) );
 rPropMap.setProperty( 
ShapeProperty::FillBitmapRectanglePoint, eRectPoint );
 
-awt::Size aOriginalSize = lclGetOriginalSize( 
rGraphicHelper, maBlipProps.mxGraphic );
+awt::Size aOriginalSize = 
lclGetOriginalSize(rGraphicHelper, maBlipProps.mxFillGraphic);
 if( (aOrigi

Re: CppunitTest_xmlsecurity_signing Unit Test Failure on 32-bit Linux

[Michael Stahl]

On 07.03.2018 01:10, Luke Benes wrote:
> Here is the strace log:
> 
> https://gist.githubusercontent.com/slacka/a07fac3b1ab0396df066968e2e216c8d/raw/6e1b1414b9db9da04a306a00dd27e1446f9e1377/strace.txt
> 
> Let me know if there's anything else I can do to help.

gpg fails with:

[pid 19515] write(2, "gpg: can't connect to the agent:"..., 51) = 51
[pid 19515] write(2, "\n", 1)   = 1
[pid 19515] write(2, "gpg: ", 5)= 5
[pid 19515] write(2, "error: GnuPG agent unusable. Ple"..., 77) = 77
[pid 19515] write(2, "gpg: ", 5)= 5
[pid 19515] write(2, "migration aborted\n", 18) = 18

the first message might give a reason after the colon but strace
truncates to 32 byte by default; try again with "-s 77" or so added to
get un-truncated messages.

the gpg-agent is [pid 19517] in the trace

[pid 19517] exit_group(2)   = ?
[pid 19517] +++ exited with 2 +++

there appears to be no documentation of gpg-status exit codes.

it's not obvious to me what causes it to fail; there are various ENOENT
returned but at some point strace stops printing strings and just prints
pointers for this process, which doesn't help debugging as it's a
mystery what files are being opened; not sure why it would do that.

[and sorry but i hit the wrong button before and forgot to send the
previous mail to the list]

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

[Libreoffice-commits] core.git: sal/osl soltools/mkdepend

[Mike Kaganski]

 sal/osl/unx/file_volume.cxx |2 --
 soltools/mkdepend/def.h |1 -
 2 files changed, 3 deletions(-)

New commits:
commit 2eeac1b51b85f7b2ab3d61c4aae76428f1309909
Author: Mike Kaganski 
Date:   Wed Mar 7 06:59:53 2018 +0100

Deduplicate includes

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

diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx
index d6c7f76442e9..7125580f7fe9 100644
--- a/sal/osl/unx/file_volume.cxx
+++ b/sal/osl/unx/file_volume.cxx
@@ -141,8 +141,6 @@ oslFileError osl_getVolumeInformation( rtl_uString* 
ustrDirectoryURL, oslVolumeI
 
 #if defined(NETBSD)
 
-#include 
-
 #   define OSL_detail_STATFS_STRUCT  struct statvfs
 #   define OSL_detail_STATFS(dir, sfs)   statvfs((dir), (sfs))
 #   define OSL_detail_STATFS_ISREMOTE(a) (((a).f_flag & ST_LOCAL) == 0)
diff --git a/soltools/mkdepend/def.h b/soltools/mkdepend/def.h
index 587cd1580c2c..009d32772d27 100644
--- a/soltools/mkdepend/def.h
+++ b/soltools/mkdepend/def.h
@@ -142,7 +142,6 @@ struct filepointer {
 };
 
 #ifndef X_NOT_STDC_ENV
-#include 
 #if defined(macII) && !defined(__STDC__)  /* stdlib.h fails to define these */
 char *malloc(), *realloc();
 #endif /* macII */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 chart2/source/controller/accessibility/AccessibleBase.cxx|8 -
 chart2/source/controller/dialogs/DataBrowser.cxx |4 
 chart2/source/controller/dialogs/ObjectNameProvider.cxx  |2 
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx |   28 +++---
 chart2/source/controller/inc/AccessibleBase.hxx  |2 
 chart2/source/controller/inc/DataPointItemConverter.hxx  |3 
 chart2/source/controller/inc/TabPageNotifiable.hxx   |2 
 chart2/source/controller/sidebar/ChartColorWrapper.cxx   |2 
 chart2/source/inc/NumberFormatterWrapper.hxx |4 
 chart2/source/tools/ExplicitCategoriesProvider.cxx   |2 
 chart2/source/tools/NumberFormatterWrapper.cxx   |6 -
 chart2/source/tools/RangeHighlighter.cxx |2 
 chart2/source/view/axes/VCartesianAxis.cxx   |   10 +-
 chart2/source/view/axes/VPolarAngleAxis.cxx  |4 
 chart2/source/view/charttypes/GL3DBarChart.cxx   |   14 +--
 chart2/source/view/charttypes/VSeriesPlotter.cxx |4 
 chart2/source/view/inc/3DChartObjects.hxx|2 
 chart2/source/view/inc/GL3DBarChart.hxx  |4 
 chart2/source/view/inc/GL3DRenderer.hxx  |   10 +-
 chart2/source/view/main/3DChartObjects.cxx   |   12 +-
 chart2/source/view/main/ChartView.cxx|6 -
 chart2/source/view/main/DummyXShape.cxx  |4 
 chart2/source/view/main/GL3DRenderer.cxx |   47 +--
 chart2/source/view/main/VButton.cxx  |2 
 chart2/source/view/main/VButton.hxx  |9 +-
 chart2/source/view/main/VDataSeries.cxx  |2 
 chart2/source/view/main/VLegend.cxx  |4 
 27 files changed, 100 insertions(+), 99 deletions(-)

New commits:
commit 36c88900c56cb7c34da83e7b2d8fe88f3c8ee345
Author: Noel Grandin 
Date:   Wed Mar 7 08:48:11 2018 +0200

use more Color in chart2

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

diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx 
b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 8c26f4629229..3f910e5914ef 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -716,17 +716,17 @@ void SAL_CALL AccessibleBase::grabFocus()
 
 sal_Int32 SAL_CALL AccessibleBase::getForeground()
 {
-return getColor( ACC_BASE_FOREGROUND );
+return sal_Int32(getColor( ACC_BASE_FOREGROUND ));
 }
 
 sal_Int32 SAL_CALL AccessibleBase::getBackground()
 {
-return getColor( ACC_BASE_BACKGROUND );
+return sal_Int32(getColor( ACC_BASE_BACKGROUND ));
 }
 
-sal_Int32 AccessibleBase::getColor( eColorType eColType )
+Color AccessibleBase::getColor( eColorType eColType )
 {
-sal_Int32 nResult = static_cast< sal_Int32 >(COL_TRANSPARENT);
+Color nResult = COL_TRANSPARENT;
 if( m_bAlwaysTransparent )
 return nResult;
 
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx 
b/chart2/source/controller/dialogs/DataBrowser.cxx
index 547b453d3b94..9f82483f5e66 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -657,7 +657,7 @@ OUString DataBrowser::GetCellText( long nRow, sal_uInt16 
nColumnId ) const
 if( m_apDataBrowserModel->getCellType( nColIndex ) == 
DataBrowserModel::NUMBER )
 {
 double fData( m_apDataBrowserModel->getCellNumber( nColIndex, nRow 
));
-sal_Int32 nLabelColor;
+Color nLabelColor;
 
 if( ! ::rtl::math::isNan( fData ) &&
 m_spNumberFormatterWrapper.get() )
@@ -685,7 +685,7 @@ OUString DataBrowser::GetCellText( long nRow, sal_uInt16 
nColumnId ) const
 // guess work.
 sal_Int32 nNumberFormat = 
DiagramHelper::getDateTimeInputNumberFormat(
 Reference< util::XNumberFormatsSupplier >( 
m_xChartDoc, uno::UNO_QUERY), fDouble );
-sal_Int32 nLabelColor;
+Color nLabelColor;
 bool bColorChanged = false;
 aResult = m_spNumberFormatterWrapper->getFormattedString(
 nNumberFormat, fDouble, nLabelColor, bColorChanged );
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx 
b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 5eb4b6bb8f76..072db4f18d45 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -105,7 +105,7 @@ OUString lcl_getDataPointValueText( const Reference< 
XDataSeries >& 

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

[Katarina Behrens]

 cui/uiconfig/ui/optuserpage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 74a027f927289911b3b712c1ea0f350cf631b0ae
Author: Katarina Behrens 
Date:   Tue Mar 6 18:05:40 2018 +0100

tdf#115084: fix sloppy mnemonic ID

Change-Id: I8f9df0baa2862eefada8fafeb384e0129df3f7e9
Reviewed-on: https://gerrit.libreoffice.org/50839
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/cui/uiconfig/ui/optuserpage.ui b/cui/uiconfig/ui/optuserpage.ui
index 15dcb68f331f..46ae48c60a56 100644
--- a/cui/uiconfig/ui/optuserpage.ui
+++ b/cui/uiconfig/ui/optuserpage.ui
@@ -860,7 +860,7 @@
 end
 OpenPGP signing key:
 True
-encryptionkey
+signingkey
   
   
 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: lotuswordpro/inc

[Andrea Gelmini]

 lotuswordpro/inc/xfilter/xfbgimage.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 973c8d3b6200eea388b6e2217647110a10e1c391
Author: Andrea Gelmini 
Date:   Tue Mar 6 23:20:54 2018 +0100

Fix typo

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

diff --git a/lotuswordpro/inc/xfilter/xfbgimage.hxx 
b/lotuswordpro/inc/xfilter/xfbgimage.hxx
index 8940cfe41ea3..ea14229f4cc3 100644
--- a/lotuswordpro/inc/xfilter/xfbgimage.hxx
+++ b/lotuswordpro/inc/xfilter/xfbgimage.hxx
@@ -83,7 +83,7 @@ public:
 voidSetImageData(sal_uInt8 const *buf, int len);
 
 /**
- * @descr   Set the iamge position type.
+ * @descr   Set the image position type.
  */
 voidSetPosition(enumXFAlignType horiAlign = enumXFAlignCenter, 
enumXFAlignType vertAlign = enumXFAlignCenter);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 reportdesign/source/ui/dlg/Condition.cxx  |4 ++--
 reportdesign/source/ui/inc/FixedTextColor.hxx |3 ++-
 reportdesign/source/ui/inspection/GeometryHandler.cxx |2 +-
 reportdesign/source/ui/misc/UITools.cxx   |   10 +-
 reportdesign/source/ui/report/FixedTextColor.cxx  |   10 +-
 reportdesign/source/ui/report/ReportController.cxx|4 ++--
 reportdesign/source/ui/report/ReportSection.cxx   |4 ++--
 7 files changed, 19 insertions(+), 18 deletions(-)

New commits:
commit 82bea50f1ba18a32b175b495b61701a4c148c753
Author: Noel Grandin 
Date:   Wed Mar 7 08:29:24 2018 +0200

use more Color in reportdesign

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

diff --git a/reportdesign/source/ui/dlg/Condition.cxx 
b/reportdesign/source/ui/dlg/Condition.cxx
index 1110e9aef21a..4f147933d6e3 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -402,9 +402,9 @@ void Condition::updateToolbar(const uno::Reference< 
report::XReportControlFormat
 aFont.SetFontHeight(OutputDevice::LogicToLogic(Size(0, 
aFont.GetFontHeight()), MapMode(MapUnit::MapPoint), 
MapMode(MapUnit::MapTwip)).Height());
 aFont.SetEmphasisMark( static_cast< FontEmphasisMark >( 
_xReportControlFormat->getControlTextEmphasis() ) );
 aFont.SetRelief( static_cast< FontRelief >( 
_xReportControlFormat->getCharRelief() ) );
-aFont.SetColor( _xReportControlFormat->getCharColor() );
+aFont.SetColor( Color(_xReportControlFormat->getCharColor()) );
 m_pPreview->SetFont( aFont, aFont, aFont );
-m_pPreview->SetBackColor( 
_xReportControlFormat->getControlBackground() );
+m_pPreview->SetBackColor( 
Color(_xReportControlFormat->getControlBackground()) );
 m_pPreview->SetTextLineColor( Color( 
_xReportControlFormat->getCharUnderlineColor() ) );
 }
 catch( const Exception& )
diff --git a/reportdesign/source/ui/inc/FixedTextColor.hxx 
b/reportdesign/source/ui/inc/FixedTextColor.hxx
index 31e317df3be5..6c0f1d88cc7b 100644
--- a/reportdesign/source/ui/inc/FixedTextColor.hxx
+++ b/reportdesign/source/ui/inc/FixedTextColor.hxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "IReportControllerObserver.hxx"
 #include 
@@ -43,7 +44,7 @@ namespace rptui
 /// @throws css::uno::RuntimeException
 css::uno::Reference< css::awt::XControl > getXControl(const 
css::uno::Reference< css::report::XFixedText >& _xFixedText);
 
-static void setPropertyTextColor(const css::uno::Reference< 
css::awt::XVclWindowPeer >& _xVclWindowPeer, sal_Int32 _nFormatKey);
+static void setPropertyTextColor(const css::uno::Reference< 
css::awt::XVclWindowPeer >& _xVclWindowPeer, Color _nFormatKey);
 
 public:
 FixedTextColor(const OReportController & _aObserver);
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx 
b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 7643320646fb..012a35b8520a 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -972,7 +972,7 @@ uno::Any SAL_CALL 
GeometryHandler::convertToPropertyValue(const OUString & Prope
 case PROPERTY_ID_CONTROLBACKGROUND:
 if ( !_rControlValue.hasValue() )
 {
-aPropertyValue <<= static_cast(COL_TRANSPARENT);
+aPropertyValue <<= COL_TRANSPARENT;
 break;
 }
 SAL_FALLTHROUGH;
diff --git a/reportdesign/source/ui/misc/UITools.cxx 
b/reportdesign/source/ui/misc/UITools.cxx
index 309edb5f3b7d..55eb29e1109d 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -339,7 +339,7 @@ namespace
 
_rItemSet.Put(SvxCharHiddenItem(_rxReportControlFormat->getCharHidden(),ITEMID_CHARHIDDEN));
 
_rItemSet.Put(SvxTwoLinesItem(_rxReportControlFormat->getCharCombineIsOn(),_rxReportControlFormat->getCharCombinePrefix().toChar(),_rxReportControlFormat->getCharCombineSuffix().toChar(),ITEMID_TWOLINES));
 SvxUnderlineItem aUnderLineItem(aFont.GetUnderline(),ITEMID_UNDERLINE);
-
aUnderLineItem.SetColor(_rxReportControlFormat->getCharUnderlineColor());
+
aUnderLineItem.SetColor(Color(_rxReportControlFormat->getCharUnderlineColor()));
 _rItemSet.Put(aUnderLineItem);
 
_rItemSet.Put(SvxKerningItem(_rxReportControlFormat->getCharKerning(),ITEMID_KERNING));
 
_rItemSet.Put(SvxEmphasisMarkItem(static_cast(_rxReportControlFormat->getCharEmphasis()),ITEMID_EMPHASISMARK));
@@ -430,7 +430,7 @@ namespace
 if ( SfxItemState::SET == _rItemSet.GetItemState( 
ITEMID_COLOR,true,&pItem) && dynamic_cast< const SvxColorItem *>( pItem ) !=  
nu

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

[Noel Grandin]

 UnoControls/source/controls/progressbar.cxx   |   12 +++
 UnoControls/source/inc/progressbar.hxx|4 +-
 accessibility/source/extended/AccessibleBrowseBoxBase.cxx |   16 +-
 accessibility/source/extended/AccessibleGridControlBase.cxx   |   16 +-
 accessibility/source/extended/accessibletabbar.cxx|   16 +-
 accessibility/source/standard/accessiblemenucomponent.cxx |4 +-
 accessibility/source/standard/vclxaccessibleedit.cxx  |2 -
 accessibility/source/standard/vclxaccessiblemenubar.cxx   |2 -
 accessibility/source/standard/vclxaccessiblepopupmenu.cxx |2 -
 accessibility/source/standard/vclxaccessibletextcomponent.cxx |6 +--
 accessibility/source/standard/vclxaccessibletoolboxitem.cxx   |   12 +++
 canvas/source/tools/canvastools.cxx   |2 -
 12 files changed, 47 insertions(+), 47 deletions(-)

New commits:
commit dbcf5b28aacba55d5f48e58a07fa4d6fc06931b9
Author: Noel Grandin 
Date:   Wed Mar 7 09:10:26 2018 +0200

use more Color in UnoControls..canvas

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

diff --git a/UnoControls/source/controls/progressbar.cxx 
b/UnoControls/source/controls/progressbar.cxx
index ebffd5a44069..898c4032ebaf 100644
--- a/UnoControls/source/controls/progressbar.cxx
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -144,7 +144,7 @@ void SAL_CALL ProgressBar::setForegroundColor( sal_Int32 
nColor )
 MutexGuard  aGuard (m_aMutex);
 
 // Safe color for later use.
-m_nForegroundColor = nColor;
+m_nForegroundColor = Color(nColor);
 
 // Repaint control
 impl_paint ( 0, 0, impl_getGraphicsPeer() );
@@ -158,7 +158,7 @@ void SAL_CALL ProgressBar::setBackgroundColor ( sal_Int32 
nColor )
 MutexGuard  aGuard (m_aMutex);
 
 // Safe color for later use.
-m_nBackgroundColor = nColor;
+m_nBackgroundColor = Color(nColor);
 
 // Repaint control
 impl_paint ( 0, 0, impl_getGraphicsPeer() );
@@ -316,13 +316,13 @@ void ProgressBar::impl_paint ( sal_Int32 nX, sal_Int32 
nY, const Reference< XGra
 
 // Clear background
 // (same color for line and fill)
-rGraphics->setFillColor ( m_nBackgroundColor);
-rGraphics->setLineColor ( m_nBackgroundColor);
+rGraphics->setFillColor ( sal_Int32(m_nBackgroundColor) );
+rGraphics->setLineColor ( sal_Int32(m_nBackgroundColor) );
 rGraphics->drawRect ( nX, nY, impl_getWidth(), impl_getHeight() );
 
 // same color for line and fill for blocks
-rGraphics->setFillColor ( m_nForegroundColor );
-rGraphics->setLineColor ( m_nForegroundColor );
+rGraphics->setFillColor ( sal_Int32(m_nForegroundColor) );
+rGraphics->setLineColor ( sal_Int32(m_nForegroundColor) );
 
 sal_Int32   nBlockStart =   0;   // = left site of new block
 sal_Int32   nBlockCount =   m_nBlockValue!=0.00 ? 
static_cast((m_nValue-m_nMinRange)/m_nBlockValue) : 0;   // = number 
of next block
diff --git a/UnoControls/source/inc/progressbar.hxx 
b/UnoControls/source/inc/progressbar.hxx
index a31208ca0c5a..f162f423a58c 100644
--- a/UnoControls/source/inc/progressbar.hxx
+++ b/UnoControls/source/inc/progressbar.hxx
@@ -138,8 +138,8 @@ private:
 
 boolm_bHorizontal;   // orientation for steps
[true=horizontal/false=vertical]
 css::awt::Size  m_aBlockSize;   // width and height of a block  [>=0,0]
-sal_Int32   m_nForegroundColor;   //  
(alpha,r,g,b)
-sal_Int32   m_nBackgroundColor;   //  
(alpha,r,g,b)
+Color   m_nForegroundColor;   //  
(alpha,r,g,b)
+Color   m_nBackgroundColor;   //  
(alpha,r,g,b)
 sal_Int32   m_nMinRange;   // lowest value  =   0% [long, 
<_nMaxRange]
 sal_Int32   m_nMaxRange;   // highest value = 100% [long, 
>_nMinRange]
 double  m_nBlockValue;   // value for one block  
[long, >0]
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx 
b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index 904e0846d8e2..f9ade6d25fa7 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -478,12 +478,12 @@ sal_Int32 SAL_CALL 
AccessibleBrowseBoxBase::getForeground(  )
 SolarMethodGuard aGuard(getMutex());
 ensureIsAlive();
 
-sal_Int32 nColor = 0;
+Color nColor;
 vcl::Window* pInst = mpBrowseBox->GetWindowInstance();
 if ( pInst )
 {
 if ( pInst->IsControlForeground() )
-nColor = pInst->GetCont

Re: MSVC being stupid (again)?

[Noel Grandin]

On 2018/03/07 9:39 AM, Bjoern Michaelsen wrote:

Im going slightly mad over:

  https://gerrit.libreoffice.org/#/c/49565/



more than likely the same thing bug I encounter with std::unique_ptr where it is trying to instantiate something it 
should not be instantiating


  git grep 'MSVC2015 workaround'

you have to delete the copy constructor and assignment operator to make it 
happy.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Noel Grandin]

 editeng/source/editeng/impedit3.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 39a13fa68c87cc7e141cd75affe228b86dd817e3
Author: Noel Grandin 
Date:   Wed Mar 7 10:30:10 2018 +0200

fixup "use more Color in editeng..forms"

some of the code changes hidden inside debug ifdefs were broken

Change-Id: I6ceb18950c0cda0592da1da83d7b45240dd60070

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 5209c5b908dc..cbb8c2b3d3d9 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -3157,17 +3157,17 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, 
tools::Rectangle aClipRect, Po
 #if OSL_DEBUG_LEVEL > 2
 if ( rTextPortion.GetKind() == 
PORTIONKIND_HYPHENATOR )
 {
-aTmpFont.SetFillCOL_LIGHTGRAY );
+aTmpFont.SetFillColor( COL_LIGHTGRAY );
 aTmpFont.SetTransparent( sal_False );
 }
 if ( rTextPortion.GetRightToLeft()  )
 {
-aTmpFont.SetFillCOL_LIGHTGRAY );
+aTmpFont.SetFillColor( COL_LIGHTGRAY );
 aTmpFont.SetTransparent( sal_False );
 }
 else if ( GetI18NScriptType( EditPaM( 
pPortion->GetNode(), nIndex+1 ) ) == i18n::ScriptType::COMPLEX )
 {
-aTmpFont.SetFillCOL_LIGHTCYAN );
+aTmpFont.SetFillColor( COL_LIGHTCYAN );
 aTmpFont.SetTransparent( sal_False );
 }
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits