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

[Miklos Vajna]

 solenv/clang-format/README |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit acd16c7e29c1619986d4d8b3b520da089ba34660
Author: Miklos Vajna 
Date:   Mon Feb 12 09:09:05 2018 +0100

solenv: document how to build static clang-format

Change-Id: Ibadb8966f1c3ba7e241b9eb5d36c9067f0246c86

diff --git a/solenv/clang-format/README b/solenv/clang-format/README
index 602dfc6eb254..7d6407a35626 100644
--- a/solenv/clang-format/README
+++ b/solenv/clang-format/README
@@ -7,8 +7,8 @@ Style enforcing code.
   - Built from source on openSUSE Leap 42.3
   - get 
   - get   and extract 
this as tools/clang/ in the LLVM source code
-  - mkdir workdir; cd workdir; cmake -G 'Unix Makefiles' 
-DCMAKE_INSTALL_PREFIX=$PWD/../instdir -DCMAKE_BUILD_TYPE=Release ..; make -j8 
clang-format
-  - this produces a binary that is dynamically linked, but all LLVM/clang libs 
are linked in statically
+  - mkdir workdir; cd workdir; cmake -G 'Unix Makefiles' 
-DCMAKE_INSTALL_PREFIX=$PWD/../instdir -DCMAKE_BUILD_TYPE=Release 
-DLLVM_BUILD_STATIC=true ..; make -j8 clang-format
+  - this produces a binary that is statically linked
 
 - macOS:
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: PDFium, beware

[Miklos Vajna]

Hi,

Do I understand correctly the source of the problem is their custom
allocator? If so, I guess talking to the pdfium devs and ask them to
provide a way to avoid their custom allocator (a compile-time option)
would help our situation, or did I miss something? (I can at least try
to talk to them, they merged various "don't use bundled XYZ" patches
before from me.)

Before we throw something out of the window, just for one detail. :-)

Regards,

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Noel Grandin]

 compilerplugins/clang/changetoolsgen.cxx |  103 ---
 compilerplugins/clang/plugin.cxx |   40 +---
 compilerplugins/clang/pluginhandler.cxx  |9 ++
 compilerplugins/clang/pluginhandler.hxx  |2 
 4 files changed, 109 insertions(+), 45 deletions(-)

New commits:
commit 288447449d7c43857f0bee7c3b9325c87e950143
Author: Noel Grandin 
Date:   Mon Feb 12 10:28:14 2018 +0200

rename loplugin changerectanglegetref to changetoolsgen

Change-Id: I378f64ac0879d4c6ea574b1674e96ffb9cc89732

diff --git a/compilerplugins/clang/changerectanglegetref.cxx 
b/compilerplugins/clang/changetoolsgen.cxx
similarity index 84%
rename from compilerplugins/clang/changerectanglegetref.cxx
rename to compilerplugins/clang/changetoolsgen.cxx
index f687693ee8cb..93856ca311f6 100644
--- a/compilerplugins/clang/changerectanglegetref.cxx
+++ b/compilerplugins/clang/changetoolsgen.cxx
@@ -14,21 +14,20 @@
 #include 
 
 /**
- * Changes calls to tools::Rectangle methods that return a ref to instead call 
the setter methods.
+ * Changes calls to tools::Rectangle/Point/Size methods that return a ref to 
instead call the setter methods.
  *
  * run as:
- *   make COMPILER_PLUGIN_TOOL=changerectanglegetref UPDATE_FILES=all 
FORCE_COMPILE_ALL=1
+ *   make COMPILER_PLUGIN_TOOL=changetoolsgen UPDATE_FILES=all 
FORCE_COMPILE_ALL=1
  * or
- *   make  COMPILER_PLUGIN_TOOL=changerectanglegetref 
FORCE_COMPILE_ALL=1
+ *   make  COMPILER_PLUGIN_TOOL=changetoolsgen FORCE_COMPILE_ALL=1
  */
 
 namespace
 {
-class ChangeRectangleGetRef : public 
RecursiveASTVisitor,
-  public loplugin::RewritePlugin
+class ChangeToolsGen : public RecursiveASTVisitor, public 
loplugin::RewritePlugin
 {
 public:
-explicit ChangeRectangleGetRef(loplugin::InstantiationData const& data)
+explicit ChangeToolsGen(loplugin::InstantiationData const& data)
 : RewritePlugin(data)
 {
 }
@@ -45,12 +44,9 @@ private:
 std::string extractCode(SourceLocation startLoc, SourceLocation endLoc);
 };
 
-void ChangeRectangleGetRef::run()
-{
-TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
-}
+void ChangeToolsGen::run() { 
TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
 
-bool ChangeRectangleGetRef::VisitCXXMemberCallExpr(CXXMemberCallExpr const* 
call)
+bool ChangeToolsGen::VisitCXXMemberCallExpr(CXXMemberCallExpr const* call)
 {
 if (ignoreLocation(call))
 return true;
@@ -140,8 +136,8 @@ bool 
ChangeRectangleGetRef::VisitCXXMemberCallExpr(CXXMemberCallExpr const* call
 return true;
 }
 
-bool ChangeRectangleGetRef::ChangeAssignment(Stmt const* parent, std::string 
const& methodName,
- std::string const& setPrefix)
+bool ChangeToolsGen::ChangeAssignment(Stmt const* parent, std::string const& 
methodName,
+  std::string const& setPrefix)
 {
 // Look for expressions like
 //aRect.Left() = ...;
@@ -167,10 +163,10 @@ bool ChangeRectangleGetRef::ChangeAssignment(Stmt const* 
parent, std::string con
 return replaceText(startLoc, originalLength, newText);
 }
 
-bool ChangeRectangleGetRef::ChangeBinaryOperator(BinaryOperator const* 
binaryOp,
- CXXMemberCallExpr const* call,
- std::string const& methodName,
- std::string const& setPrefix)
+bool ChangeToolsGen::ChangeBinaryOperator(BinaryOperator const* binaryOp,
+  CXXMemberCallExpr const* call,
+  std::string const& methodName,
+  std::string const& setPrefix)
 {
 // Look for expressions like
 //aRect.Left() += ...;
@@ -231,10 +227,10 @@ bool 
ChangeRectangleGetRef::ChangeBinaryOperator(BinaryOperator const* binaryOp,
 return replaceText(startLoc, originalLength, newText);
 }
 
-bool ChangeRectangleGetRef::ChangeUnaryOperator(UnaryOperator const* unaryOp,
-CXXMemberCallExpr const* call,
-std::string const& methodName,
-std::string const& setPrefix)
+bool ChangeToolsGen::ChangeUnaryOperator(UnaryOperator const* unaryOp,
+ CXXMemberCallExpr const* call,
+ std::string const& methodName,
+ std::string const& setPrefix)
 {
 // Look for expressions like
 //aRect.Left()++;
@@ -289,7 +285,7 @@ bool 
ChangeRectangleGetRef::ChangeUnaryOperator(UnaryOperator const* unaryOp,
 }
 }
 
-std::string ChangeRectangleGetRef::extractCode(SourceLocation startLoc, 
SourceLocation endLoc)
+std::string ChangeToolsGen::extractCode(SourceLocation startLoc, 
SourceLoc

Re: PDFium, beware

[Stephan Bergmann]

On 12.02.2018 09:29, Miklos Vajna wrote:

Do I understand correctly the source of the problem is their custom
allocator?


Yes.  See below for the backtrace of failing CppunitTest_svtools_graphic 
on Linux aarch64 with 64K page size.



If so, I guess talking to the pdfium devs and ask them to
provide a way to avoid their custom allocator (a compile-time option)
would help our situation, or did I miss something? (I can at least try
to talk to them, they merged various "don't use bundled XYZ" patches
before from me.)


If that could indeed be disabled, that should solve it.  So if you want 
to ask upstream, please go ahead.




#1  0x7fd61da4 in abort () at /lib/libc.so.6
#2  0x7b9341e4 in pdfium::base::SetSystemPagesInaccessible(void*, 
unsigned long) (address=address@entry=0x1029e02000, length=length@entry=8192) 
at 
/run/build/libreoffice/workdir/UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/page_allocator.cpp:198
#3  0x7b93518c in 
pdfium::base::PartitionAllocSlowPath(pdfium::base::PartitionRootBase*, int, unsigned 
long, pdfium::base::PartitionBucket*) (num_partition_pages=, 
flags=0, root=0x7fe82c80) at 
/run/build/libreoffice/workdir/UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/partition_alloc.cpp:403
#4  0x7b93518c in 
pdfium::base::PartitionAllocSlowPath(pdfium::base::PartitionRootBase*, int, unsigned long, 
pdfium::base::PartitionBucket*) (root=0x7fe82c80, root@entry=0x7bb4c8f8 
, flags=flags@entry=0, size=size@entry=80, 
bucket=0x7fe749d0, bucket@entry=0x7bb4e180 ) 
at 
/run/build/libreoffice/workdir/UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/partition_alloc.cpp:816
#5  0x7b8e28e8 in fxcrt::StringDataTemplate::Create(unsigned long) 
(bucket=0x7bb4e180 , size=80, flags=0, 
root=) at 
/run/build/libreoffice/workdir/UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/partition_alloc.h:675
#6  0x7b8e28e8 in fxcrt::StringDataTemplate::Create(unsigned long) 
(type_name=0x7ba49d40 "StringDataTemplate", size=, flags=0, 
root=) at 
/run/build/libreoffice/workdir/UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/partition_alloc.h:798
#7  0x7b8e28e8 in fxcrt::StringDataTemplate::Create(unsigned long) 
(type_name=0x7ba49d40 "StringDataTemplate", size=, root=) at 
/run/build/libreoffice/workdir/UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/partition_alloc.h:808
#8  0x7b8e28e8 in fxcrt::StringDataTemplate::Create(unsigned 
long) (nLen=nLen@entry=16) at 
/run/build/libreoffice/workdir/UnpackedTarball/pdfium/core/fxcrt/string_data_template.h:39
#9  0x7b8e2a18 in fxcrt::StringDataTemplate::Create(char const*, unsigned 
long) (pStr=0x7bac56b5 "/usr/share/fonts", nLen=16) at 
/run/build/libreoffice/workdir/UnpackedTarball/pdfium/core/fxcrt/string_data_template.h:51
#10 0x7b8e01cc in fxcrt::ByteString::ByteString(char const*, unsigned long) 
(this=0xdef31c50, pStr=, nLen=) at 
/run/build/libreoffice/workdir/UnpackedTarball/pdfium/core/fxcrt/bytestring.cpp:96
#11 0x7b90d394 in IFX_SystemFontInfo::CreateDefault(char const**) 
(pUserPaths=0x0) at 
/run/build/libreoffice/workdir/UnpackedTarball/pdfium/core/fxge/fx_ge_linux.cpp:151
#12 0x7b90d4b4 in CFX_GEModule::InitPlatform() (this=) 
at /run/build/libreoffice/workdir/UnpackedTarball/pdfium/core/fxge/fx_ge_linux.cpp:161
#13 0x7b907630 in CFX_GEModule::Init(char const**) (this=, 
userFontPaths=) at 
/run/build/libreoffice/workdir/UnpackedTarball/pdfium/core/fxge/cfx_gemodule.cpp:46
#14 0x7b8088a4 in FPDF_InitLibraryWithConfig(FPDF_LIBRARY_CONFIG 
const*) (cfg=0xdef31d80) at 
/run/build/libreoffice/workdir/UnpackedTarball/pdfium/fpdfsdk/fpdfview.cpp:463
#15 0x7caadb50 in vcl::ImportPDF(SvStream&, Bitmap&, 
com::sun::star::uno::Sequence&, unsigned long, unsigned long) () at 
/run/build/libreoffice/instdir/program/libvcllo.so

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

[Libreoffice-commits] core.git: 2 commits - filter/source lotuswordpro/source

[Caolán McNamara]

 filter/source/graphicfilter/icgm/bitmap.cxx   |3 
 lotuswordpro/source/filter/lwptablelayout.cxx |   77 ++
 lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx |8 -
 3 files changed, 43 insertions(+), 45 deletions(-)

New commits:
commit 7b8c631a457aec6927b821e59837ef89703d7fa8
Author: Caolán McNamara 
Date:   Sun Feb 11 21:22:50 2018 +

various leaks

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

diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx 
b/lotuswordpro/source/filter/lwptablelayout.cxx
index eb94eaea6758..9da4852c1398 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -603,11 +603,11 @@ void LwpTableLayout::RegisterColumns()
 dDefaultColumn = nJustifiableColumn ? dTableWidth/nJustifiableColumn : 0;
 
 // register default column style
-XFColStyle *pColStyle = new XFColStyle();
-pColStyle->SetWidth(static_cast(dDefaultColumn));
+std::unique_ptr xColStyle(new XFColStyle);
+xColStyle->SetWidth(static_cast(dDefaultColumn));
 
 XFStyleManager* pXFStyleManager = 
LwpGlobalMgr::GetInstance()->GetXFStyleManager();
-m_DefaultColumnStyleName =  
pXFStyleManager->AddStyle(pColStyle).m_pStyle->GetStyleName();
+m_DefaultColumnStyleName =  
pXFStyleManager->AddStyle(xColStyle.release()).m_pStyle->GetStyleName();
 
 // register existed column style
 sal_uInt16 i=0;
@@ -643,17 +643,17 @@ void LwpTableLayout::RegisterRows()
 }
 
 // register default row style
-XFRowStyle * pRowStyle = new  XFRowStyle();
+std::unique_ptr xRowStyle(new XFRowStyle);
 if (m_nDirection & 0x0030)
 {
-pRowStyle->SetMinRowHeight(static_cast(pTable->GetHeight()));
+xRowStyle->SetMinRowHeight(static_cast(pTable->GetHeight()));
 }
 else
 {
-pRowStyle->SetRowHeight(static_cast(pTable->GetHeight()));
+xRowStyle->SetRowHeight(static_cast(pTable->GetHeight()));
 }
 XFStyleManager* pXFStyleManager = 
LwpGlobalMgr::GetInstance()->GetXFStyleManager();
-m_DefaultRowStyleName =  
pXFStyleManager->AddStyle(pRowStyle).m_pStyle->GetStyleName();
+m_DefaultRowStyleName =  
pXFStyleManager->AddStyle(xRowStyle.release()).m_pStyle->GetStyleName();
 
 // register style of rows
 LwpObjectID& rRowID = GetChildHead();
@@ -765,7 +765,7 @@ void LwpTableLayout::ParseTable()
 }
 
 // set name of object
-m_pXFTable = new XFTable;
+m_pXFTable.set(new XFTable);
 m_pXFTable->SetTableName(pSuper->GetName().str());
 // set table style
 m_pXFTable->SetStyleName(m_StyleName);
@@ -834,7 +834,6 @@ sal_uInt16 LwpTableLayout::ConvertHeadingRow(
 sal_uInt16 nContentRow;
 sal_uInt8 nCol = static_cast(GetTable()->GetColumn());
 rtl::Reference pTmpTable( new XFTable );
-XFRow* pXFRow;
 
 ConvertTable(pTmpTable.get(),nStartHeadRow,nEndHeadRow,0,nCol);
 
@@ -843,7 +842,7 @@ sal_uInt16 LwpTableLayout::ConvertHeadingRow(
 
 if (nRowNum == 1)
 {
-pXFRow = pTmpTable->GetRow(1);
+XFRow* pXFRow = pTmpTable->GetRow(1);
 pXFTable->AddHeaderRow(pXFRow);
 pTmpTable->RemoveRow(1);
 nContentRow = nEndHeadRow;
@@ -860,7 +859,7 @@ sal_uInt16 LwpTableLayout::ConvertHeadingRow(
 }
 else//can not split,the first row will be the heading row,the rest 
will be content row
 {
-pXFRow = pTmpTable->GetRow(1);
+XFRow* pXFRow = pTmpTable->GetRow(1);
 pXFTable->AddHeaderRow(pXFRow);
 pTmpTable->RemoveRow(1);
 nContentRow = m_RowsMap[0]->GetCurMaxSpannedRows(0,nCol);
@@ -876,19 +875,19 @@ void LwpTableLayout::SplitRowToCells(XFTable* pTmpTable, 
rtl::Reference
 sal_uInt16 nRowNum = pTmpTable->GetRowCount();
 sal_uInt8 nCol = static_cast(GetTable()->GetColumn());
 
-XFRow* pXFRow = new XFRow;
+rtl::Reference xXFRow(new XFRow);
 
 //register style for heading row
 double fHeight = 0;
 OUString styleName;
-XFRowStyle* pRowStyle = new XFRowStyle;
+std::unique_ptr xRowStyle(new XFRowStyle);
 styleName = pTmpTable->GetRow(1)->GetStyleName();
 
 // get settings of the row and assign them to new row style
 XFStyleManager* pXFStyleManager = 
LwpGlobalMgr::GetInstance()->GetXFStyleManager();
 XFRowStyle *pTempRowStyle = 
static_cast(pXFStyleManager->FindStyle(styleName));
 if (pTempRowStyle)
-*pRowStyle = *pTempRowStyle;
+*xRowStyle = *pTempRowStyle;
 
 for (i=1;i<=nRowNum;i++)
 {
@@ -897,19 +896,19 @@ void LwpTableLayout::SplitRowToCells(XFTable* pTmpTable, 
rtl::Reference
 }
 if (m_nDirection & 0x0030)
 {
-pRowStyle->SetMinRowHeight(static_cast(fHeight));
+xRowStyle->SetMinRowHeight(static_cast(fHeight));
 }
 

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

[Tor Lillqvist]

 extensions/source/ole/oleobjw.cxx|2 +-
 extensions/source/ole/unoconversionutilities.hxx |   17 ++---
 extensions/source/ole/unoobjw.cxx|2 +-
 3 files changed, 8 insertions(+), 13 deletions(-)

New commits:
commit 9d6257a995c3e6e6d1af1d850194ae14e7c26df1
Author: Tor Lillqvist 
Date:   Fri Feb 9 18:24:51 2018 +0200

Get rid of a few unused or once-used typedefs

This code is complicated enough without weirdly named typedefs for
trivial iterators. Just use 'auto'.

Change-Id: Ib2d9271ccd0f63eab338d9fe214a2523cb57ce97
Reviewed-on: https://gerrit.libreoffice.org/49510
Tested-by: Jenkins 
Reviewed-by: Tor Lillqvist 

diff --git a/extensions/source/ole/oleobjw.cxx 
b/extensions/source/ole/oleobjw.cxx
index 91819f0239a6..6d4cfd365ecb 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -115,7 +115,7 @@ IUnknownWrapper_Impl::~IUnknownWrapper_Impl()
 WrapperToAdapterMap.erase( it);
 }
 
- IT_Com it_c= ComPtrToWrapperMap.find( 
reinterpret_cast(m_spUnknown.p));
+auto it_c= ComPtrToWrapperMap.find( 
reinterpret_cast(m_spUnknown.p));
 if(it_c != ComPtrToWrapperMap.end())
 ComPtrToWrapperMap.erase(it_c);
 }
diff --git a/extensions/source/ole/unoconversionutilities.hxx 
b/extensions/source/ole/unoconversionutilities.hxx
index 008396ae4f96..dac687cc30ef 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -63,15 +63,12 @@ namespace ole_adapter
 {
 extern std::unordered_map AdapterToWrapperMap;
 extern std::unordered_map WrapperToAdapterMap;
-typedef std::unordered_map::iterator IT_Wrap;
-typedef std::unordered_map::iterator CIT_Wrap;
+
 //Maps IUnknown pointers to a weak reference of the respective wrapper class 
(e.g.
 // IUnknownWrapperImpl. It is the responsibility of the wrapper to remove the 
entry when
 // it is being destroyed.
 // Used to ensure that an Automation object is always mapped to the same UNO 
objects.
 extern std::unordered_map > 
ComPtrToWrapperMap;
-typedef std::unordered_map >::iterator 
IT_Com;
-typedef std::unordered_map 
>::const_iterator CIT_Com;
 
 // Maps XInterface pointers to a weak reference of its wrapper class (i.e.
 // InterfaceOleWrapper_Impl). It is the responsibility of the wrapper to 
remove the entry when
@@ -80,8 +77,6 @@ typedef std::unordered_map >::const_itera
 // UNO interface is mapped again to COM then the IDispach of the first mapped 
instance
 // must be returned.
 extern std::unordered_map > 
UnoObjToWrapperMap;
-typedef std::unordered_map >::iterator 
IT_Uno;
-typedef std::unordered_map 
>::const_iterator CIT_Uno;
 
 // createUnoObjectWrapper gets a wrapper instance by calling 
createUnoWrapperInstance
 // and initializes it via XInitialization. The wrapper object is required 
to implement
@@ -1368,7 +1363,7 @@ void 
UnoConversionUtilities::createUnoObjectWrapper(const Any & rObj, VARIANT
 
 Reference xIntWrapper;
 // Does a UNO wrapper exist already ?
-IT_Uno it_uno = UnoObjToWrapperMap.find( 
reinterpret_cast(xInt.get()));
+auto it_uno = UnoObjToWrapperMap.find( 
reinterpret_cast(xInt.get()));
 if(it_uno != UnoObjToWrapperMap.end())
 {
 xIntWrapper =  it_uno->second;
@@ -1383,9 +1378,9 @@ void 
UnoConversionUtilities::createUnoObjectWrapper(const Any & rObj, VARIANT
 else
 {
 Reference xIntComWrapper = xInt;
-typedef std::unordered_map::iterator IT;
+
 // Adapter? then get the COM wrapper to which the adapter 
delegates its calls
-IT it= AdapterToWrapperMap.find( 
reinterpret_cast(xInt.get()));
+auto it = AdapterToWrapperMap.find( 
reinterpret_cast(xInt.get()));
 if( it != AdapterToWrapperMap.end() )
 xIntComWrapper= reinterpret_cast(it->second);
 
@@ -1729,7 +1724,7 @@ Any 
UnoConversionUtilities::createOleObjectWrapper(VARIANT* pVar, const Type&
 // wrap ordinary dispatch objects. The dispatch-UNO objects usually are 
adapted to represent
 // particular UNO interfaces.
 Reference xIntWrapper;
-CIT_Com cit_currWrapper= ComPtrToWrapperMap.find( 
reinterpret_cast(spUnknown.p));
+auto cit_currWrapper= ComPtrToWrapperMap.find( 
reinterpret_cast(spUnknown.p));
 if(cit_currWrapper != ComPtrToWrapperMap.end())
 xIntWrapper = cit_currWrapper->second;
 if (xIntWrapper.is())
@@ -1738,7 +1733,7 @@ Any 
UnoConversionUtilities::createOleObjectWrapper(VARIANT* pVar, const Type&
 //find the proper Adapter. The pointer in the WrapperToAdapterMap are 
valid as long as
 //we get a pointer to the wrapper from ComPtrToWrapperMap, because the 
Adapter hold references
 //to the wrapper.
-CIT_Wrap it = 
WrapperToAdapterMap.find(reinterpret_cast(xIntWrapper.get()));
+auto it = 
WrapperToAdapterMap.find(reinterpret_cast(xIntWrap

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

[Julien Nabet]

 include/svx/strings.hrc   |1 +
 svx/source/dialog/imapdlg.cxx |3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6bcd433fe13ab402d2cc8433d98a78db140858e9
Author: Julien Nabet 
Date:   Sat Feb 10 20:32:34 2018 +0100

tdf#115601: make ImageMap dialog translatable

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

diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 5352e95d3550..c3ca32273fdc 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -859,6 +859,7 @@
 #define RID_SVXSTR_DASH10   
NC_("RID_SVXSTR_DASH10", "Dashed")
 #define RID_SVXSTR_DASH11   
NC_("RID_SVXSTR_DASH11", "Dashed")
 #define RID_SVXSTR_DASH12   
NC_("RID_SVXSTR_DASH12", "Line Style")
+#define RID_SVXSTR_IMAP_ALL_FILTER  
NC_("RID_SVXSTR_IMAP_ALL_FILTER", "All formats")
 #define RID_SVXSTR_LEND0
NC_("RID_SVXSTR_LEND0", "Arrow concave")
 #define RID_SVXSTR_LEND1
NC_("RID_SVXSTR_LEND1", "Square 45")
 #define RID_SVXSTR_LEND2
NC_("RID_SVXSTR_LEND2", "Small arrow")
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index a8792b246d04..8972b9155282 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -56,7 +56,6 @@
 #include 
 
 #define SELF_TARGET "_self"
-#define IMAP_ALL_FILTER OUString("")
 #define IMAP_CERN_FILTER"MAP - CERN"
 #define IMAP_NCSA_FILTER"MAP - NCSA"
 #define IMAP_BINARY_FILTER  "SIP - StarView ImageMap"
@@ -452,7 +451,7 @@ void SvxIMapDlg::DoOpen()
 FileDialogFlags::NONE, this);
 
 ImageMapaLoadIMap;
-const OUString  aFilter( IMAP_ALL_FILTER );
+const OUString  aFilter(SvxResId(RID_SVXSTR_IMAP_ALL_FILTER));
 
 aDlg.AddFilter( aFilter, IMAP_ALL_TYPE );
 aDlg.AddFilter( IMAP_CERN_FILTER, IMAP_CERN_TYPE );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/inc/docufld.hxx |   28 ++---
 sw/source/core/fields/docufld.cxx  |   76 ++---
 sw/source/core/fields/macrofld.cxx |   64 +++
 3 files changed, 84 insertions(+), 84 deletions(-)

New commits:
commit 09d17c25d970e49eddda5a3a5078dca6d88fc559
Author: Miklos Vajna 
Date:   Mon Feb 12 09:10:46 2018 +0100

sw: prefix members of SwJumpEditFieldType, SwMacroField and 
SwPageNumberField

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

diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index 3f1f6b7c494c..4d133ff26cb0 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -124,8 +124,8 @@ enum SwJumpEditFormat
 
 class SwPageNumberFieldType : public SwFieldType
 {
-SvxNumType  nNumberingType;
-boolbVirtuell;
+SvxNumType  m_nNumberingType;
+boolm_bVirtual;
 
 public:
 SwPageNumberFieldType();
@@ -140,9 +140,9 @@ public:
 // Page numbering.
 class SW_DLLPUBLIC SwPageNumberField : public SwField
 {
-OUString sUserStr;
-sal_uInt16  nSubType;
-short   nOffset;
+OUString m_sUserStr;
+sal_uInt16  m_nSubType;
+short   m_nOffset;
 // fdo#58074 store page number in SwField, not SwFieldType
 sal_uInt16 m_nPageNumber;
 sal_uInt16 m_nMaxPage;
@@ -166,8 +166,8 @@ public:
 virtual boolQueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) 
const override;
 virtual boolPutValue( const css::uno::Any& rVal, sal_uInt16 nWhich 
) override;
 
-const OUString& GetUserString() const{ return sUserStr; }
-void SetUserString( const OUString& rS )  { sUserStr = rS; }
+const OUString& GetUserString() const{ return m_sUserStr; }
+void SetUserString( const OUString& rS )  { m_sUserStr = rS; }
 };
 
 class SwAuthorFieldType : public SwFieldType
@@ -376,7 +376,7 @@ public:
 
 class SwMacroFieldType : public SwFieldType
 {
-SwDoc* pDoc;
+SwDoc* m_pDoc;
 
 public:
 SwMacroFieldType(SwDoc*);
@@ -386,9 +386,9 @@ public:
 
 class SW_DLLPUBLIC SwMacroField : public SwField
 {
-OUString aMacro;
-OUString aText;
-bool  bIsScriptURL;
+OUString m_aMacro;
+OUString m_aText;
+bool  m_bIsScriptURL;
 
 virtual OUString Expand() const override;
 virtual SwField* Copy() const override;
@@ -398,7 +398,7 @@ public:
 SwMacroField( SwMacroFieldType*, const OUString& rLibAndName,
   const OUString& rText);
 
-const OUString&  GetMacro() const { return aMacro; }
+const OUString&  GetMacro() const { return m_aMacro; }
 OUString GetLibName() const;
 OUString GetMacroName() const;
 SvxMacro GetSvxMacro() const;
@@ -631,8 +631,8 @@ public:
 // Field to jump to and edit.
 class SwJumpEditFieldType : public SwFieldType
 {
-SwDoc* pDoc;
-SwDepend aDep;
+SwDoc* m_pDoc;
+SwDepend m_aDep;
 
 public:
 SwJumpEditFieldType( SwDoc* pDoc );
diff --git a/sw/source/core/fields/docufld.cxx 
b/sw/source/core/fields/docufld.cxx
index 174eb02afaab..249f3ccabcc8 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -98,8 +98,8 @@ using namespace nsSwDocInfoSubType;
 
 SwPageNumberFieldType::SwPageNumberFieldType()
 : SwFieldType( SwFieldIds::PageNumber ),
-nNumberingType( SVX_NUM_ARABIC ),
-bVirtuell( false )
+m_nNumberingType( SVX_NUM_ARABIC ),
+m_bVirtual( false )
 {
 }
 
@@ -107,10 +107,10 @@ OUString SwPageNumberFieldType::Expand( SvxNumType 
nFormat, short nOff,
  sal_uInt16 const nPageNumber, sal_uInt16 const nMaxPage,
  const OUString& rUserStr ) const
 {
-SvxNumType nTmpFormat = (SVX_NUM_PAGEDESC == nFormat) ? nNumberingType : 
nFormat;
+SvxNumType nTmpFormat = (SVX_NUM_PAGEDESC == nFormat) ? m_nNumberingType : 
nFormat;
 int const nTmp = nPageNumber + nOff;
 
-if (0 > nTmp || SVX_NUM_NUMBER_NONE == nTmpFormat || (!bVirtuell && nTmp > 
nMaxPage))
+if (0 > nTmp || SVX_NUM_NUMBER_NONE == nTmpFormat || (!m_bVirtual && nTmp 
> nMaxPage))
 return OUString();
 
 if( SVX_NUM_CHAR_SPECIAL == nTmpFormat )
@@ -123,8 +123,8 @@ SwFieldType* SwPageNumberFieldType::Copy() const
 {
 SwPageNumberFieldType *pTmp = new SwPageNumberFieldType();
 
-pTmp->nNumberingType = nNumberingType;
-pTmp->bVirtuell  = bVirtuell;
+pTmp->m_nNumberingType = m_nNumberingType;
+pTmp->m_bVirtual  = m_bVirtual;
 
 return pTmp;
 }
@@ -134,9 +134,9 @@ void SwPageNumberFieldType::ChangeExpansion( SwDoc* pDoc,
 const SvxNumType* pNumFormat )
 {
 if( pNumFormat )
-nNumberingType = *pNumFormat;
+m_nNumberingType = *pNumFormat;
 
-bVirtuell = false;
+m_bVirtual = false;
 if (bVirt && pDoc)
 {
 // check the flag since t

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

[Johnny_M]

 svx/source/svdraw/svdmark.cxx |   34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 1b35e6de3ca5161f9da633675312456bba9ab5c7
Author: Johnny_M 
Date:   Sat Feb 10 14:35:53 2018 +0100

Translate German variable names

Akt -> Current
Neu -> New
Kopie -> Copy

in svdraw

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

diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index fbc060923ef6..25ee096abe2d 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -163,11 +163,11 @@ void SdrMarkList::ImpForceSort()
 {
 for(std::vector::iterator it = maList.begin(); it != 
maList.end(); )
 {
-SdrMark* pAkt = *it;
-if(pAkt->GetMarkedSdrObj() == nullptr)
+SdrMark* pCurrent = *it;
+if(pCurrent->GetMarkedSdrObj() == nullptr)
 {
 it = maList.erase( it );
-delete pAkt;
+delete pCurrent;
 }
 else
 ++it;
@@ -182,20 +182,20 @@ void SdrMarkList::ImpForceSort()
 // remove duplicates
 if(maList.size() > 1)
 {
-SdrMark* pAkt = maList.back();
+SdrMark* pCurrent = maList.back();
 for (size_t count = maList.size() - 1; count; --count)
 {
 size_t i = count - 1;
 SdrMark* pCmp = maList[i];
-assert(pAkt->GetMarkedSdrObj());
-if(pAkt->GetMarkedSdrObj() == pCmp->GetMarkedSdrObj())
+assert(pCurrent->GetMarkedSdrObj());
+if(pCurrent->GetMarkedSdrObj() == pCmp->GetMarkedSdrObj())
 {
 // Con1/Con2 Merging
 if(pCmp->IsCon1())
-pAkt->SetCon1(true);
+pCurrent->SetCon1(true);
 
 if(pCmp->IsCon2())
-pAkt->SetCon2(true);
+pCurrent->SetCon2(true);
 
 // delete pCmp
 maList.erase(maList.begin() + i);
@@ -204,7 +204,7 @@ void SdrMarkList::ImpForceSort()
 }
 else
 {
-pAkt = pCmp;
+pCurrent = pCmp;
 }
 }
 }
@@ -230,8 +230,8 @@ SdrMarkList& SdrMarkList::operator=(const SdrMarkList& rLst)
 for(size_t i = 0; i < rLst.GetMarkCount(); ++i)
 {
 SdrMark* pMark = rLst.GetMark(i);
-SdrMark* pNeuMark = new SdrMark(*pMark);
-maList.push_back(pNeuMark);
+SdrMark* pNewMark = new SdrMark(*pMark);
+maList.push_back(pNewMark);
 }
 
 maMarkName = rLst.maMarkName;
@@ -303,14 +303,14 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, bool 
bChkSort)
 }
 else
 {
-SdrMark* pKopie = new SdrMark(rMark);
-maList.push_back(pKopie);
+SdrMark* pCopy = new SdrMark(rMark);
+maList.push_back(pCopy);
 
 // now check if the sort is ok
 const SdrObjList* pLastOL = pLastObj!=nullptr ? 
pLastObj->GetObjList() : nullptr;
-const SdrObjList* pNeuOL = pNewObj !=nullptr ? pNewObj 
->GetObjList() : nullptr;
+const SdrObjList* pNewOL = pNewObj !=nullptr ? pNewObj 
->GetObjList() : nullptr;
 
-if(pLastOL == pNeuOL)
+if(pLastOL == pNewOL)
 {
 const sal_uLong nLastNum(pLastObj!=nullptr ? 
pLastObj->GetOrdNum() : 0);
 const sal_uLong nNewNum(pNewObj !=nullptr ? pNewObj 
->GetOrdNum() : 0);
@@ -354,8 +354,8 @@ void SdrMarkList::ReplaceMark(const SdrMark& rNewMark, 
size_t nNum)
 {
 delete pMark;
 SetNameDirty();
-SdrMark* pKopie = new SdrMark(rNewMark);
-maList[nNum] = pKopie;
+SdrMark* pCopy = new SdrMark(rNewMark);
+maList[nNum] = pCopy;
 mbSorted = false;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M]

 sw/source/filter/ww8/ww8par.cxx  |4 +-
 sw/source/filter/ww8/ww8scan.cxx |   66 +++
 sw/source/filter/ww8/ww8scan.hxx |   18 +-
 3 files changed, 44 insertions(+), 44 deletions(-)

New commits:
commit dcbe5eda8f3f698e4717e1458b2c1efb589b8ed6
Author: Johnny_M 
Date:   Sat Feb 10 14:24:46 2018 +0100

Translate German variable names

Akt -> Current in ww8

Note: Similar translation of function name parts will be done later,
to prevent a Git conflict

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

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index e6aca96267fd..5b5c9a91042f 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3728,7 +3728,7 @@ void 
SwWW8ImplReader::ProcessAktCollChange(WW8PLCFManResult& rRes,
 {
 bool bReSync;
 // Frame/Table/Autonumbering List Level
-bTabRowEnd = ProcessSpecial(bReSync, rRes.nAktCp + 
m_xPlcxMan->GetCpOfs());
+bTabRowEnd = ProcessSpecial(bReSync, rRes.nCurrentCp + 
m_xPlcxMan->GetCpOfs());
 if( bReSync )
 *pStartAttr = m_xPlcxMan->Get( &rRes ); // Get Attribut-Pos again
 }
@@ -3749,7 +3749,7 @@ long SwWW8ImplReader::ReadTextAttr(WW8_CP& rTextPos, long 
nTextEnd, bool& rbStar
 
 OSL_ENSURE(m_pPaM->GetNode().GetTextNode(), "Missing txtnode");
 bool bStartAttr = m_xPlcxMan->Get(&aRes); // Get Attribute position again
-aRes.nAktCp = rTextPos;  // Current Cp position
+aRes.nCurrentCp = rTextPos;  // Current Cp position
 
 bool bNewSection = (aRes.nFlags & MAN_MASK_NEW_SEP) && !m_bIgnoreText;
 if ( bNewSection ) // New Section
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 9b9949f484aa..ef25e6353e46 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -886,7 +886,7 @@ void WW8SprmIter::advance()
 {
 if (nRemLen > 0 )
 {
-sal_uInt16 nSize = nAktSize;
+sal_uInt16 nSize = nCurrentSize;
 if (nSize > nRemLen)
 nSize = nRemLen;
 pSprms += nSize;
@@ -901,18 +901,18 @@ void WW8SprmIter::UpdateMyMembers()
 
 if (bValid)
 {
-nAktId = mrSprmParser.GetSprmId(pSprms);
-nAktSize = mrSprmParser.GetSprmSize(nAktId, pSprms, nRemLen);
-pAktParams = pSprms + mrSprmParser.DistanceToData(nAktId);
-bValid = nAktSize <= nRemLen;
+nCurrentId = mrSprmParser.GetSprmId(pSprms);
+nCurrentSize = mrSprmParser.GetSprmSize(nCurrentId, pSprms, nRemLen);
+pCurrentParams = pSprms + mrSprmParser.DistanceToData(nCurrentId);
+bValid = nCurrentSize <= nRemLen;
 SAL_WARN_IF(!bValid, "sw.ww8", "sprm longer than remaining bytes, doc 
or parser is wrong");
 }
 
 if (!bValid)
 {
-nAktId = 0;
-pAktParams = nullptr;
-nAktSize = 0;
+nCurrentId = 0;
+pCurrentParams = nullptr;
+nCurrentSize = 0;
 nRemLen = 0;
 }
 }
@@ -2031,21 +2031,21 @@ OUString read_uInt16_BeltAndBracesString(SvStream& 
rStrm)
 }
 
 sal_Int32 WW8ScannerBase::WW8ReadString( SvStream& rStrm, OUString& rStr,
-WW8_CP nAktStartCp, long nTotalLen, rtl_TextEncoding eEnc ) const
+WW8_CP nCurrentStartCp, long nTotalLen, rtl_TextEncoding eEnc ) const
 {
 // Read in plain text, which can extend over several pieces
 rStr.clear();
 
-if (nAktStartCp < 0 || nTotalLen < 0)
+if (nCurrentStartCp < 0 || nTotalLen < 0)
 return 0;
 
-WW8_CP nBehindTextCp = nAktStartCp + nTotalLen;
+WW8_CP nBehindTextCp = nCurrentStartCp + nTotalLen;
 WW8_CP nNextPieceCp  = nBehindTextCp; // Initialization, important for Ver6
 long nTotalRead = 0;
 do
 {
 bool bIsUnicode(false), bPosOk(false);
-WW8_FC fcAct = WW8Cp2Fc(nAktStartCp,&bIsUnicode,&nNextPieceCp,&bPosOk);
+WW8_FC fcAct = 
WW8Cp2Fc(nCurrentStartCp,&bIsUnicode,&nNextPieceCp,&bPosOk);
 
 // Probably aimed beyond file end, doesn't matter!
 if( !bPosOk )
@@ -2058,7 +2058,7 @@ sal_Int32 WW8ScannerBase::WW8ReadString( SvStream& rStrm, 
OUString& rStr,
 WW8_CP nEnd = (nNextPieceCp < nBehindTextCp) ? nNextPieceCp
 : nBehindTextCp;
 WW8_CP nLen;
-const bool bFail = o3tl::checked_sub(nEnd, nAktStartCp, nLen);
+const bool bFail = o3tl::checked_sub(nEnd, nCurrentStartCp, nLen);
 if (bFail)
 break;
 
@@ -2070,7 +2070,7 @@ sal_Int32 WW8ScannerBase::WW8ReadString( SvStream& rStrm, 
OUString& rStr,
  : read_uInt8s_ToOUString(rStrm, nLen, eEnc);
 
 nTotalRead  += nLen;
-nAktStartCp += nLen;
+nCurrentStartCp += nLen;
 if ( nTotalRead != rStr.getLength() )
 break;
 }
@@ -3027,8 +3027,8 @@ boo

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

[Johnny_M]

 sc/source/filter/excel/excform8.cxx |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit ee47b7b4c805fc781dab48c65c4ff5fc701b3709
Author: Johnny_M 
Date:   Sat Feb 10 13:46:33 2018 +0100

Translate German variable names

Fakt -> Factor in Excel filter (excform8)

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

diff --git a/sc/source/filter/excel/excform8.cxx 
b/sc/source/filter/excel/excform8.cxx
index db501e8c87a4..ccd2211a275e 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -375,18 +375,18 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& 
rpTokArray, XclImpStream& aIn,
 break;
 case 0x19: // Special Attribute [327 279]
 {
-sal_uInt16 nData(0), nFakt(0);
+sal_uInt16 nData(0), nFactor(0);
 sal_uInt8 nOpt(0);
 
 nOpt = aIn.ReaduInt8();
 nData = aIn.ReaduInt16();
-nFakt = 2;
+nFactor = 2;
 
 if( nOpt & 0x04 )
 {
-// nFakt -> skip bytes or wordsAttrChoose
+// nFactor -> skip bytes or wordsAttrChoose
 nData++;
-aIn.Ignore(static_cast(nData) * nFakt);
+aIn.Ignore(static_cast(nData) * nFactor);
 }
 else if( nOpt & 0x10 )  // AttrSum
 DoMulArgs( ocSum, 1 );
@@ -1023,18 +1023,18 @@ ConvErr ExcelToSc8::Convert( ScRangeListTabs& 
rRangeList, XclImpStream& aIn, std
 break;
 case 0x19: // Special Attribute [327 279]
 {
-sal_uInt16 nData(0), nFakt(0);
+sal_uInt16 nData(0), nFactor(0);
 sal_uInt8 nOpt(0);
 
 nOpt = aIn.ReaduInt8();
 nData = aIn.ReaduInt16();
-nFakt = 2;
+nFactor = 2;
 
 if( nOpt & 0x04 )
 {
-// nFakt -> skip bytes or wordsAttrChoose
+// nFactor -> skip bytes or wordsAttrChoose
 ++nData;
-aIn.Ignore(static_cast(nData) * nFakt);
+aIn.Ignore(static_cast(nData) * nFactor);
 }
 }
 break;
@@ -1668,7 +1668,7 @@ void ExcelToSc8::GetAbsRefs( ScRangeList& r, 
XclImpStream& aIn, std::size_t nLen
 nOpt = aIn.ReaduInt8();
 nData = aIn.ReaduInt16();
 if( nOpt & 0x04 )
-{// nFakt -> skip bytes or wordsAttrChoose
+{// nFactor -> skip bytes or wordsAttrChoose
 nData++;
 nSeek = nData * 2;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M]

 sc/source/filter/lotus/lotattr.cxx |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit eb3bd34dfb55cf3afc088330e73fc03385da20ec
Author: Johnny_M 
Date:   Sat Feb 10 14:41:14 2018 +0100

Translate German variable names

Akt -> Current in Lotus filter (lotattr)

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

diff --git a/sc/source/filter/lotus/lotattr.cxx 
b/sc/source/filter/lotus/lotattr.cxx
index 66f0d75997eb..e303b435abbe 100644
--- a/sc/source/filter/lotus/lotattr.cxx
+++ b/sc/source/filter/lotus/lotattr.cxx
@@ -96,9 +96,9 @@ const ScPatternAttr& LotAttrCache::GetPattAttr( const 
LotAttrWK3& rAttr )
 ScPatternAttr*  pNewPatt = new ScPatternAttr(pDocPool);
 
 SfxItemSet& rItemSet = pNewPatt->GetItemSet();
-ENTRY *pAkt = new ENTRY( pNewPatt );
+ENTRY *pCurrent = new ENTRY( pNewPatt );
 
-pAkt->nHash0 = nRefHash;
+pCurrent->nHash0 = nRefHash;
 
 mpLotusRoot->maFontBuff.Fill( rAttr.nFont, rItemSet );
 
@@ -144,7 +144,7 @@ const ScPatternAttr& LotAttrCache::GetPattAttr( const 
LotAttrWK3& rAttr )
 rItemSet.Put( aHorJustify );
 }
 
-aEntries.push_back(std::unique_ptr(pAkt));
+aEntries.push_back(std::unique_ptr(pCurrent));
 
 return *pNewPatt;
 }
@@ -198,21 +198,21 @@ void LotAttrCol::SetAttr( const SCROW nRow, const 
ScPatternAttr& rAttr )
 (*iterLast)->nLastRow = nRow;
 else
 {
-ENTRY *pAkt = new ENTRY;
+ENTRY *pCurrent = new ENTRY;
 
-pAkt->pPattAttr = &rAttr;
-pAkt->nFirstRow = pAkt->nLastRow = nRow;
+pCurrent->pPattAttr = &rAttr;
+pCurrent->nFirstRow = pCurrent->nLastRow = nRow;
 
-aEntries.push_back(std::unique_ptr(pAkt));
+aEntries.push_back(std::unique_ptr(pCurrent));
 }
 }
 else
 {   // first entry
-ENTRY *pAkt = new ENTRY;
-pAkt->pPattAttr = &rAttr;
-pAkt->nFirstRow = pAkt->nLastRow = nRow;
+ENTRY *pCurrent = new ENTRY;
+pCurrent->pPattAttr = &rAttr;
+pCurrent->nFirstRow = pCurrent->nLastRow = nRow;
 
-aEntries.push_back(std::unique_ptr(pAkt));
+aEntries.push_back(std::unique_ptr(pCurrent));
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M]

 sw/source/filter/ww8/ww8graf.cxx |4 +-
 sw/source/filter/ww8/ww8par.cxx  |   58 +++
 sw/source/filter/ww8/ww8par.hxx  |   16 +-
 sw/source/filter/ww8/ww8par2.cxx |   12 
 sw/source/filter/ww8/ww8par3.cxx |   50 -
 sw/source/filter/ww8/ww8par6.cxx |   54 ++--
 6 files changed, 97 insertions(+), 97 deletions(-)

New commits:
commit bf183a4ef2368e38ee5fc94518815c34850d828e
Author: Johnny_M 
Date:   Sun Feb 11 11:37:15 2018 +0100

Translate German variable names

Akt -> Current
Act -> Current (in same context, including comments correction, under
assumption of a "false friend" wording by a non-English speaker)

in ww8par

Note: Similar translation of other occurrences in affected files will be 
done
separately

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

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 767381499e96..da262f684feb 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -606,7 +606,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(WW8_CP 
nStartCp, WW8_CP nEndCp,
 
 // get position of next SPRM
 bool bStartAttr = m_xPlcxMan->Get(&aRes);
-m_nAktColl = m_xPlcxMan->GetColl();
+m_nCurrentColl = m_xPlcxMan->GetColl();
 if (aRes.nSprmId)
 {
 if( bONLYnPicLocFc )
@@ -717,7 +717,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(WW8_CP 
nStartCp, WW8_CP nEndCp,
 }
 }
 // Fill in the remainder from the style
-InsertTxbxStyAttrs(*pS, m_nAktColl);
+InsertTxbxStyAttrs(*pS, m_nCurrentColl);
 
 if( pS->Count() )
 {
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 5b5c9a91042f..a3a90efed173 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1441,8 +1441,8 @@ const SfxPoolItem* 
SwWW8FltControlStack::GetFormatAttr(const SwPosition& rPos,
 SfxItemState eState = SfxItemState::DEFAULT;
 if (const SfxItemSet *pSet = pNd->GetpSwAttrSet())
 eState = pSet->GetItemState(RES_LR_SPACE, false);
-if (eState != SfxItemState::SET && rReader.m_nAktColl < 
rReader.m_vColl.size())
-pItem = &(rReader.m_vColl[rReader.m_nAktColl].maWordLR);
+if (eState != SfxItemState::SET && rReader.m_nCurrentColl < 
rReader.m_vColl.size())
+pItem = 
&(rReader.m_vColl[rReader.m_nCurrentColl].maWordLR);
 }
 
 /*
@@ -1619,17 +1619,17 @@ void SwWW8ImplReader::Read_Tab(sal_uInt16 , const 
sal_uInt8* pData, short nLen)
 
 const SwFormat * pSty = nullptr;
 sal_uInt16 nTabBase;
-if (m_pAktColl && m_nAktColl < m_vColl.size()) // StyleDef
+if (m_pAktColl && m_nCurrentColl < m_vColl.size()) // StyleDef
 {
-nTabBase = m_vColl[m_nAktColl].m_nBase;
+nTabBase = m_vColl[m_nCurrentColl].m_nBase;
 if (nTabBase < m_vColl.size())  // Based On
 pSty = m_vColl[nTabBase].m_pFormat;
 }
 else
 { // Text
-nTabBase = m_nAktColl;
-if (m_nAktColl < m_vColl.size())
-pSty = m_vColl[m_nAktColl].m_pFormat;
+nTabBase = m_nCurrentColl;
+if (m_nCurrentColl < m_vColl.size())
+pSty = m_vColl[m_nCurrentColl].m_pFormat;
 //TODO: figure out else here
 }
 
@@ -1941,7 +1941,7 @@ WW8ReaderSave::WW8ReaderSave(SwWW8ImplReader* pRdr 
,WW8_CP nStartCp) :
 mpPrevNumRule(pRdr->m_pPrevNumRule),
 mpTableDesc(pRdr->m_pTableDesc),
 mnInTable(pRdr->m_nInTable),
-mnAktColl(pRdr->m_nAktColl),
+mnCurrentColl(pRdr->m_nCurrentColl),
 mcSymbol(pRdr->m_cSymbol),
 mbIgnoreText(pRdr->m_bIgnoreText),
 mbSymbol(pRdr->m_bSymbol),
@@ -1963,7 +1963,7 @@ WW8ReaderSave::WW8ReaderSave(SwWW8ImplReader* pRdr 
,WW8_CP nStartCp) :
 pRdr->m_pPreviousNumPaM = nullptr;
 pRdr->m_pPrevNumRule = nullptr;
 pRdr->m_pTableDesc = nullptr;
-pRdr->m_nAktColl = 0;
+pRdr->m_nCurrentColl = 0;
 
 pRdr->m_xCtrlStck.reset(new SwWW8FltControlStack(&pRdr->m_rDoc, 
pRdr->m_nFieldFlags,
 *pRdr));
@@ -2005,7 +2005,7 @@ void WW8ReaderSave::Restore( SwWW8ImplReader* pRdr )
 pRdr->m_bInHyperlink = mbInHyperlink;
 pRdr->m_bWasParaEnd = mbWasParaEnd;
 pRdr->m_bPgSecBreak = mbPgSecBreak;
-pRdr->m_nAktColl = mnAktColl;
+pRdr->m_nCurrentColl = mnCurrentColl;
 pRdr->m_bHasBorder = mbHasBorder;
 pRdr->m_bFirstPara = mbFirstPara;
 
@@ -2770,8 +2770,8 @@ rtl_TextEncoding SwWW8ImplReader::GetCurrentCharSet()
 eSrcCharSet = m_aFontSrcCharSets.top();
 if ((eSrcCharSet == RTL_TEXTENCODING_DONTKNOW)

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

[Johnny_M]

 sc/source/filter/inc/tool.h   |4 ++--
 sc/source/filter/lotus/op.cxx |   32 
 2 files changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 85851cf46364e1fc1772bef23cdc7fb7cb6fa5a5
Author: Johnny_M 
Date:   Sat Feb 10 13:39:44 2018 +0100

Translate German variable names

Akt -> Current
Erg -> Result
Decimal (places) -> Fractinal (part), with related comment translation 
corrections

in Lotus filter

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

diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h
index b7c99a6f54a4..1f9ff7295858 100644
--- a/sc/source/filter/inc/tool.h
+++ b/sc/source/filter/inc/tool.h
@@ -25,8 +25,8 @@
 #include 
 
 // Default values
-const sal_uInt8 nDezStd = 0;// Decimal points for standard cells
-const sal_uInt8 nDezFloat = 2;  //" " float cells
+const sal_uInt8 nFractionalStd = 0;// Number of digits in fractional 
part for standard cells
+const sal_uInt8 nFractionalFloat = 2;  //" " " 
"  float cells
 
 struct LotusContext;
 
diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx
index 3998a08ca088..dceb1594b294 100644
--- a/sc/source/filter/lotus/op.cxx
+++ b/sc/source/filter/lotus/op.cxx
@@ -82,7 +82,7 @@ void OP_Integer(LotusContext& rContext, SvStream& r, 
sal_uInt16 /*n*/)
 rContext.pDoc->EnsureTable(0);
 rContext.pDoc->SetValue(ScAddress(nCol, nRow, 0), 
static_cast(nValue));
 
-// 0 decimal places!
+// 0 digits in fractional part!
 SetFormat(rContext, nCol, nRow, 0, nFormat, 0);
 }
 }
@@ -102,7 +102,7 @@ void OP_Number(LotusContext& rContext, SvStream& r, 
sal_uInt16 /*n*/)
 rContext.pDoc->EnsureTable(0);
 rContext.pDoc->SetValue(ScAddress(nCol, nRow, 0), fValue);
 
-SetFormat(rContext, nCol, nRow, 0, nFormat, nDezFloat);
+SetFormat(rContext, nCol, nRow, 0, nFormat, nFractionalFloat);
 }
 }
 
@@ -127,7 +127,7 @@ void OP_Label(LotusContext& rContext, SvStream& r, 
sal_uInt16 n)
 
 PutFormString(rContext, nCol, nRow, 0, pText.get());
 
-SetFormat(rContext, nCol, nRow, 0, nFormat, nDezStd);
+SetFormat(rContext, nCol, nRow, 0, nFormat, nFractionalStd);
 }
 }
 
@@ -143,26 +143,26 @@ void OP_Formula(LotusContext &rContext, SvStream& r, 
sal_uInt16 /*n*/)
 SCCOL nCol(static_cast(nTmpCol));
 SCROW nRow(static_cast(nTmpRow));
 
-const ScTokenArray* pErg;
+const ScTokenArray* pResult;
 sal_Int32 nBytesLeft = nFormulaSize;
 ScAddress aAddress(nCol, nRow, 0);
 
 svl::SharedStringPool& rSPool = 
rContext.pLotusRoot->pDoc->GetSharedStringPool();
 LotusToSc aConv(rContext, r, rSPool, rContext.pLotusRoot->eCharsetQ, 
false);
 aConv.Reset( aAddress );
-aConv.Convert( pErg, nBytesLeft );
+aConv.Convert( pResult, nBytesLeft );
 if (!aConv.good())
 return;
 
 if (ValidColRow(nCol, nRow))
 {
-ScFormulaCell* pCell = new ScFormulaCell(rContext.pLotusRoot->pDoc, 
aAddress, *pErg);
+ScFormulaCell* pCell = new ScFormulaCell(rContext.pLotusRoot->pDoc, 
aAddress, *pResult);
 pCell->AddRecalcMode( ScRecalcMode::ONLOAD_ONCE );
 rContext.pDoc->EnsureTable(0);
 rContext.pDoc->SetFormulaCell(ScAddress(nCol, nRow, 0), pCell);
 
-// nFormat = Default -> decimal places like Float
-SetFormat(rContext, nCol, nRow, 0, nFormat, nDezFloat);
+// nFormat = Default -> number of digits in fractional part like Float
+SetFormat(rContext, nCol, nRow, 0, nFormat, nFractionalFloat);
 }
 }
 
@@ -286,22 +286,22 @@ void OP_HiddenCols(LotusContext& rContext, SvStream& r, 
sal_uInt16 /*n*/)
 {
 sal_uInt16  nByte, nBit;
 SCCOL   nCount;
-sal_uInt8   nAkt;
+sal_uInt8   nCurrent;
 nCount = 0;
 
 for( nByte = 0 ; nByte < 32 ; nByte++ ) // 32 Bytes with ...
 {
-r.ReadUChar( nAkt );
+r.ReadUChar( nCurrent );
 for( nBit = 0 ; nBit < 8 ; nBit++ ) // ...each 8 Bits = 256 Bits
 {
-if( nAkt & 0x01 )   // is lowest Bit set?
+if( nCurrent & 0x01 )   // is lowest Bit set?
 {
 // -> Hidden Col
 rContext.pDoc->SetColHidden(nCount, nCount, 0, true);
 }
 
 nCount++;
-nAkt = nAkt / 2;// the next please...
+nCurrent = nCurrent / 2;// the next please...
 }
 }
 }
@@ -334,7 +334,7 @@ void OP_Blank(LotusContext& rContext, SvStream& r, 
sal_uInt16 /*n*/)
 SCCOL nCol(static_cast(nTmpCol));
 SCROW nRow(static_cast(nTmpRow));
 
-SetFormat(rContext, nCol, nRow, 0, nFormat, nDezFloat);
+SetFormat(rContext, nCol, nRow, 0, nFormat, nFractionalFloat);
 }
 
 void OP_BOF123(LotusContext& /*rCon

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

[Johnny_M]

 sw/source/ui/vba/vbapagesetup.cxx |   32 
 1 file changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 040c13b4b5195b801b38a96638abb87a73cae2ae
Author: Johnny_M 
Date:   Sat Feb 10 15:18:45 2018 +0100

Translate German variable names

akt -> current in vba

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

diff --git a/sw/source/ui/vba/vbapagesetup.cxx 
b/sw/source/ui/vba/vbapagesetup.cxx
index dec1c8b47652..e8f7bbbd8e70 100644
--- a/sw/source/ui/vba/vbapagesetup.cxx
+++ b/sw/source/ui/vba/vbapagesetup.cxx
@@ -79,20 +79,20 @@ void SAL_CALL SwVbaPageSetup::setHeaderDistance( double 
_headerdistance )
 {
 sal_Int32 newHeaderDistance = Millimeter::getInHundredthsOfOneMillimeter( 
_headerdistance );
 bool isHeaderOn = false;
-sal_Int32 aktTopMargin = 0;
-sal_Int32 aktSpacing = 0;
-sal_Int32 aktHeaderHeight = 0;
+sal_Int32 currentTopMargin = 0;
+sal_Int32 currentSpacing = 0;
+sal_Int32 currentHeaderHeight = 0;
 
 mxPageProps->getPropertyValue("HeaderIsOn") >>= isHeaderOn;
 if( !isHeaderOn )
 mxPageProps->setPropertyValue("HeaderIsOn", uno::makeAny( true ) );
 
-mxPageProps->getPropertyValue("TopMargin") >>= aktTopMargin;
-mxPageProps->getPropertyValue("HeaderBodyDistance") >>= aktSpacing;
-mxPageProps->getPropertyValue("HeaderHeight") >>= aktHeaderHeight;
+mxPageProps->getPropertyValue("TopMargin") >>= currentTopMargin;
+mxPageProps->getPropertyValue("HeaderBodyDistance") >>= currentSpacing;
+mxPageProps->getPropertyValue("HeaderHeight") >>= currentHeaderHeight;
 
-sal_Int32 newSpacing = aktSpacing - ( newHeaderDistance - aktTopMargin );
-sal_Int32 height = aktHeaderHeight - aktSpacing;
+sal_Int32 newSpacing = currentSpacing - ( newHeaderDistance - 
currentTopMargin );
+sal_Int32 height = currentHeaderHeight - currentSpacing;
 sal_Int32 newHeaderHeight = newSpacing + height;
 
 mxPageProps->setPropertyValue("TopMargin", uno::makeAny( newHeaderDistance 
) );
@@ -113,20 +113,20 @@ void SAL_CALL SwVbaPageSetup::setFooterDistance( double 
_footerdistance )
 {
 sal_Int32 newFooterDistance = Millimeter::getInHundredthsOfOneMillimeter( 
_footerdistance );
 bool isFooterOn = false;
-sal_Int32 aktBottomMargin = 0;
-sal_Int32 aktSpacing = 0;
-sal_Int32 aktFooterHeight = 0;
+sal_Int32 currentBottomMargin = 0;
+sal_Int32 currentSpacing = 0;
+sal_Int32 currentFooterHeight = 0;
 
 mxPageProps->getPropertyValue("FooterIsOn") >>= isFooterOn;
 if( !isFooterOn )
 mxPageProps->setPropertyValue("FooterIsOn", uno::makeAny( true ) );
 
-mxPageProps->getPropertyValue("BottomMargin") >>= aktBottomMargin;
-mxPageProps->getPropertyValue("FooterBodyDistance") >>= aktSpacing;
-mxPageProps->getPropertyValue("FooterHeight") >>= aktFooterHeight;
+mxPageProps->getPropertyValue("BottomMargin") >>= currentBottomMargin;
+mxPageProps->getPropertyValue("FooterBodyDistance") >>= currentSpacing;
+mxPageProps->getPropertyValue("FooterHeight") >>= currentFooterHeight;
 
-sal_Int32 newSpacing = aktSpacing - ( newFooterDistance - aktBottomMargin 
);
-sal_Int32 height = aktFooterHeight - aktSpacing;
+sal_Int32 newSpacing = currentSpacing - ( newFooterDistance - 
currentBottomMargin );
+sal_Int32 height = currentFooterHeight - currentSpacing;
 sal_Int32 newFooterHeight = newSpacing + height;
 
 mxPageProps->setPropertyValue("BottomMargin", uno::makeAny( 
newFooterDistance ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Johnny_M]

 sw/inc/doc.hxx   |4 +--
 sw/inc/swtable.hxx   |4 +--
 sw/source/core/doc/tblrwcl.cxx   |   42 +++
 sw/source/core/docnode/ndtbl.cxx |8 +++
 4 files changed, 29 insertions(+), 29 deletions(-)

New commits:
commit 499bff1f06b3a4660ff408a2bd54c64ad8fb5f05
Author: Johnny_M 
Date:   Sat Feb 10 15:12:26 2018 +0100

Translate German variable names

Akt -> Current in SwDoc and SwTable

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

diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 7eb5bf067c5a..331132911936 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1254,7 +1254,7 @@ public:
 
 void AppendUndoForInsertFromDB( const SwPaM& rPam, bool bIsTable );
 
-bool SetColRowWidthHeight( SwTableBox& rAktBox, TableChgWidthHeightType 
eType,
+bool SetColRowWidthHeight( SwTableBox& rCurrentBox, 
TableChgWidthHeightType eType,
 SwTwips nAbsDiff, SwTwips nRelDiff );
 SwTableBoxFormat* MakeTableBoxFormat();
 SwTableLineFormat* MakeTableLineFormat();
@@ -1262,7 +1262,7 @@ public:
 // helper function: cleanup before checking number value
 bool IsNumberFormat( const OUString& rString, sal_uInt32& F_Index, double& 
fOutNumber);
 // Check if box has numerical value. Change format of box if required.
-void ChkBoxNumFormat( SwTableBox& rAktBox, bool bCallUpdate );
+void ChkBoxNumFormat( SwTableBox& rCurrentBox, bool bCallUpdate );
 void SetTableBoxFormulaAttrs( SwTableBox& rBox, const SfxItemSet& rSet );
 void ClearBoxNumAttrs( const SwNodeIndex& rNode );
 void ClearLineNumAttrs( SwPosition const & rPos );
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index b41e9990f502..619d37dd432e 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -332,9 +332,9 @@ public:
 TableChgMode GetTableChgMode() const{ return m_eTableChgMode; }
 void SetTableChgMode( TableChgMode eMode )  { m_eTableChgMode = eMode; }
 
-bool SetColWidth( SwTableBox& rAktBox, TableChgWidthHeightType eType,
+bool SetColWidth( SwTableBox& rCurrentBox, TableChgWidthHeightType eType,
 SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo );
-bool SetRowHeight( SwTableBox& rAktBox, TableChgWidthHeightType eType,
+bool SetRowHeight( SwTableBox& rCurrentBox, TableChgWidthHeightType eType,
 SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo );
 void RegisterToFormat( SwFormat& rFormat );
 #ifdef DBG_UTIL
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index e15078e58628..22df3ed0b8dc 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -84,8 +84,8 @@ struct CpyTabFrame
 } Value;
 SwTableBoxFormat *pNewFrameFormat;
 
-explicit CpyTabFrame(SwFrameFormat* pAktFrameFormat) : pNewFrameFormat( 
nullptr )
-{   Value.pFrameFormat = pAktFrameFormat; }
+explicit CpyTabFrame(SwFrameFormat* pCurrentFrameFormat) : 
pNewFrameFormat( nullptr )
+{   Value.pFrameFormat = pCurrentFrameFormat; }
 
 bool operator==( const CpyTabFrame& rCpyTabFrame ) const
 { return  static_cast(Value.nSize) == 
static_cast(rCpyTabFrame.Value.nSize); }
@@ -3302,19 +3302,19 @@ void CheckBoxWidth( const SwTableLine& rLine, SwTwips 
nSize )
 {
 const SwTableBoxes& rBoxes = rLine.GetTabBoxes();
 
-SwTwips nAktSize = 0;
+SwTwips nCurrentSize = 0;
 // See if the tables have a correct width
 for (SwTableBoxes::const_iterator i(rBoxes.begin()); i != rBoxes.end(); 
++i)
 {
 const SwTableBox* pBox = *i;
 const SwTwips nBoxW = 
pBox->GetFrameFormat()->GetFrameSize().GetWidth();
-nAktSize += nBoxW;
+nCurrentSize += nBoxW;
 
 for( auto pLn : pBox->GetTabLines() )
 CheckBoxWidth( *pLn, nBoxW );
 }
 
-if (sal::static_int_cast< unsigned long >(std::abs(nAktSize - nSize)) >
+if (sal::static_int_cast< unsigned long >(std::abs(nCurrentSize - nSize)) >
 (COLFUZZY * rBoxes.size()))
 {
 OSL_FAIL( "Line's Boxes are too small or too large" );
@@ -3370,7 +3370,7 @@ static FndBox_* lcl_SaveInsDelData( CR_SetBoxWidth& 
rParam, SwUndo** ppUndo,
 return pFndBox;
 }
 
-bool SwTable::SetColWidth( SwTableBox& rAktBox, TableChgWidthHeightType eType,
+bool SwTable::SetColWidth( SwTableBox& rCurrentBox, TableChgWidthHeightType 
eType,
 SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo )
 {
 SetHTMLTableLayout(std::shared_ptr());// Delete 
HTML Layout
@@ -3385,15 +3385,15 @@ bool SwTable::SetColWidth( SwTableBox& rAktBox, 
TableChgWidthHeightType eType,
 bLeft = TableChgWidthHeightType::ColLeft == extractPosition( eType ) ||
 TableChgWidthHeightType::CellLeft == extractPosition( eType ),

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

[Johnny_M]

 editeng/source/rtf/svxrtf.cxx |   42 +-
 1 file changed, 21 insertions(+), 21 deletions(-)

New commits:
commit c0a23843907c2b5dc6652e2bb337b12be6028356
Author: Johnny_M 
Date:   Sat Feb 10 14:52:23 2018 +0100

Translate German variable names

Akt -> Current in rtf (svxrtf)

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

diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 297320a5658e..67bc1ce7bfe5 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -613,10 +613,10 @@ const vcl::Font& SvxRTFParser::GetFont( sal_uInt16 nId )
 
 SvxRTFItemStackType* SvxRTFParser::GetAttrSet_()
 {
-SvxRTFItemStackType* pAkt = aAttrStack.empty() ? nullptr : 
aAttrStack.back();
+SvxRTFItemStackType* pCurrent = aAttrStack.empty() ? nullptr : 
aAttrStack.back();
 SvxRTFItemStackType* pNew;
-if( pAkt )
-pNew = new SvxRTFItemStackType( *pAkt, *pInsPos, false/*bCopyAttr*/ );
+if( pCurrent )
+pNew = new SvxRTFItemStackType( *pCurrent, *pInsPos, 
false/*bCopyAttr*/ );
 else
 pNew = new SvxRTFItemStackType( *pAttrPool, &aWhichMap[0],
 *pInsPos );
@@ -678,7 +678,7 @@ void SvxRTFParser::AttrGroupEnd()   // process the current, 
delete from Stack
 {
 SvxRTFItemStackType *pOld = aAttrStack.empty() ? nullptr : 
aAttrStack.back();
 aAttrStack.pop_back();
-SvxRTFItemStackType *pAkt = aAttrStack.empty() ? nullptr : 
aAttrStack.back();
+SvxRTFItemStackType *pCurrent = aAttrStack.empty() ? nullptr : 
aAttrStack.back();
 
 do {// middle check loop
 sal_Int32 nOldSttNdIdx = pOld->pSttNd->GetIdx();
@@ -689,13 +689,13 @@ void SvxRTFParser::AttrGroupEnd()   // process the 
current, delete from Stack
 break;  // no attributes or Area
 
 // set only the attributes that are different from the parent
-if( pAkt && pOld->aAttrSet.Count() )
+if( pCurrent && pOld->aAttrSet.Count() )
 {
 SfxItemIter aIter( pOld->aAttrSet );
 const SfxPoolItem* pItem = aIter.GetCurItem(), *pGet;
 while( true )
 {
-if( SfxItemState::SET == pAkt->aAttrSet.GetItemState(
+if( SfxItemState::SET == pCurrent->aAttrSet.GetItemState(
 pItem->Which(), false, &pGet ) &&
 *pItem == *pGet )
 pOld->aAttrSet.ClearItem( pItem->Which() );
@@ -768,10 +768,10 @@ void SvxRTFParser::AttrGroupEnd()   // process the 
current, delete from Stack
 ClearStyleAttr_( *pNew );   //#i10381#, 
methinks.
 }
 
-if( pAkt )
+if( pCurrent )
 {
-
pAkt->Add(std::unique_ptr(pOld));
-pAkt->Add(std::move(pNew));
+
pCurrent->Add(std::unique_ptr(pOld));
+pCurrent->Add(std::move(pNew));
 }
 else
 {
@@ -792,23 +792,23 @@ void SvxRTFParser::AttrGroupEnd()   // process the 
current, delete from Stack
 
 /*
 #i21422#
-If the parent (pAkt) sets something e.g. , and the child (pOld)
+If the parent (pCurrent) sets something e.g. , and the child 
(pOld)
 unsets it and the style both are based on has it unset then
 clearing the pOld by looking at the style is clearly a disaster
-as the text ends up with pAkts bold and not pOlds no bold, this
+as the text ends up with pCurrents bold and not pOlds no bold, 
this
 should be rethought out. For the moment its safest to just do
 the clean if we have no parent, all we suffer is too many
 redundant properties.
 */
-if (IsChkStyleAttr() && !pAkt)
+if (IsChkStyleAttr() && !pCurrent)
 ClearStyleAttr_( *pOld );
 
-if( pAkt )
+if( pCurrent )
 {
-pAkt->Add(std::unique_ptr(pOld));
+pCurrent->Add(std::unique_ptr(pOld));
 // split up and create new entry, because it make no sense
 // to create a "so long" depend list. Bug 95010
-if (bCrsrBack && 50 < pAkt->m_pChildList->size())
+if (bCrsrBack && 50 < pCurrent->m_pChildList->size())
 {
 // at the beginning of a paragraph? Move

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

[Johnny_M]

 editeng/source/rtf/rtfitem.cxx |   68 -
 1 file changed, 34 insertions(+), 34 deletions(-)

New commits:
commit 8f05a01befe393a40fe828bbab90c6d8eaf6c959
Author: Johnny_M 
Date:   Sat Feb 10 13:58:06 2018 +0100

Translate German variable names

Akt -> Current in rtf (rtfitem)

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

diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 7d6cbc6fa8f9..be516bbcd4ef 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -214,36 +214,36 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet 
)
 if( !bChkStkPos )
 break;
 
-SvxRTFItemStackType* pAkt = aAttrStack.empty() ? nullptr : 
aAttrStack.back();
-if( !pAkt || (pAkt->pSttNd->GetIdx() == pInsPos->GetNodeIdx() 
&&
-pAkt->nSttCnt == pInsPos->GetCntIdx() ))
+SvxRTFItemStackType* pCurrent = aAttrStack.empty() ? nullptr : 
aAttrStack.back();
+if( !pCurrent || (pCurrent->pSttNd->GetIdx() == 
pInsPos->GetNodeIdx() &&
+pCurrent->nSttCnt == pInsPos->GetCntIdx() ))
 break;
 
 int nLastToken = GetStackPtr(-1)->nTokenId;
 if( RTF_PARD == nLastToken || RTF_PLAIN == nLastToken )
 break;
 
-if (pAkt->aAttrSet.Count() || pAkt->m_pChildList ||
-pAkt->nStyleNo )
+if (pCurrent->aAttrSet.Count() || pCurrent->m_pChildList ||
+pCurrent->nStyleNo )
 {
 // Open a new Group
 SvxRTFItemStackType* pNew = new SvxRTFItemStackType(
-*pAkt, *pInsPos, true );
+*pCurrent, *pInsPos, true );
 pNew->SetRTFDefaults( GetRTFDefaults() );
 
 // "Set" all valid attributes up until this point
 AttrGroupEnd();
-pAkt = aAttrStack.empty() ? nullptr : aAttrStack.back();  
// can be changed after AttrGroupEnd!
-pNew->aAttrSet.SetParent( pAkt ? &pAkt->aAttrSet : nullptr 
);
+pCurrent = aAttrStack.empty() ? nullptr : 
aAttrStack.back();  // can be changed after AttrGroupEnd!
+pNew->aAttrSet.SetParent( pCurrent ? &pCurrent->aAttrSet : 
nullptr );
 
 aAttrStack.push_back( pNew );
-pAkt = pNew;
+pCurrent = pNew;
 }
 else
 // continue to use this entry as a new one
-pAkt->SetStartPos( *pInsPos );
+pCurrent->SetStartPos( *pInsPos );
 
-pSet = &pAkt->aAttrSet;
+pSet = &pCurrent->aAttrSet;
 } while( false );
 
 switch( nToken )
@@ -268,11 +268,11 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet 
)
 {
 sal_uInt16 nStyleNo = -1 == nTokenValue ? 0 : 
sal_uInt16(nTokenValue);
 // set StyleNo to the current style on the AttrStack
-SvxRTFItemStackType* pAkt = aAttrStack.empty() ? nullptr : 
aAttrStack.back();
-if( !pAkt )
+SvxRTFItemStackType* pCurrent = aAttrStack.empty() ? 
nullptr : aAttrStack.back();
+if( !pCurrent )
 break;
 
-pAkt->nStyleNo = nStyleNo;
+pCurrent->nStyleNo = nStyleNo;
 }
 break;
 
@@ -1689,7 +1689,7 @@ void SvxRTFParser::RTFPardPlain( bool const bPard, 
SfxItemSet** ppSet )
 {
 if( !bNewGroup && !aAttrStack.empty() ) // not at the beginning of a new 
group
 {
-SvxRTFItemStackType* pAkt = aAttrStack.back();
+SvxRTFItemStackType* pCurrent = aAttrStack.back();
 
 int nLastToken = GetStackPtr(-1)->nTokenId;
 bool bNewStkEntry = true;
@@ -1697,30 +1697,30 @@ void SvxRTFParser::RTFPardPlain( bool const bPard, 
SfxItemSet** ppSet )
 RTF_PLAIN != nLastToken &&
 BRACELEFT != nLastToken )
 {
-if (pAkt->aAttrSet.Count() || pAkt->m_pChildList || pAkt->nStyleNo)
+if (pCurrent->aAttrSet.Count() || pCurrent->m_pChildList || 
pCurrent->nStyleNo)
 {
 // open a new group
-SvxRTFItemStackType* pNew = new SvxRTFItemStackType( *pAkt, 
*pInsPos, true );
+SvxRTFItemStackType* pNew = new SvxRTFItemStackType( 
*pCurrent, *pInsPos, true );
 pNew->SetRTFDefaults( GetRTFDefaults() );
 
 // Set all until here valid attributes
 AttrGroupEnd()

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

[Johnny_M]

 sc/source/filter/excel/excform.cxx |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 980de246715c95b6961367baf409c270dab58bc0
Author: Johnny_M 
Date:   Sat Feb 10 13:49:55 2018 +0100

Translate German variable names

Fakt -> Factor in Excel filter (excform)

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

diff --git a/sc/source/filter/excel/excform.cxx 
b/sc/source/filter/excel/excform.cxx
index aa1b71f2f546..499c315baf26 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -378,7 +378,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pResult, 
XclImpStream& aIn, std
 }
 case 0x19: // Special Attribute [327 279]
 {
-sal_uInt16  nData(0), nFakt(0);
+sal_uInt16  nData(0), nFactor(0);
 sal_uInt8   nOpt(0);
 
 nOpt = aIn.ReaduInt8();
@@ -386,19 +386,19 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pResult, 
XclImpStream& aIn, std
 if( meBiff == EXC_BIFF2 )
 {
 nData = aIn.ReaduInt8();
-nFakt = 1;
+nFactor = 1;
 }
 else
 {
 nData = aIn.ReaduInt16();
-nFakt = 2;
+nFactor = 2;
 }
 
 if( nOpt & 0x04 )
 {
-// nFakt -> skip bytes or wordsAttrChoose
+// nFactor -> skip bytes or wordsAttrChoose
 ++nData;
-aIn.Ignore(static_cast(nData) * nFakt);
+aIn.Ignore(static_cast(nData) * nFactor);
 }
 else if( nOpt & 0x10 )  // AttrSum
 DoMulArgs( ocSum, 1 );
@@ -970,7 +970,7 @@ ConvErr ExcelToSc::Convert( ScRangeListTabs& rRangeList, 
XclImpStream& aIn, std:
 break;
 case 0x19: // Special Attribute [327 279]
 {
-sal_uInt16 nData(0), nFakt(0);
+sal_uInt16 nData(0), nFactor(0);
 sal_uInt8 nOpt(0);
 
 nOpt = aIn.ReaduInt8();
@@ -978,19 +978,19 @@ ConvErr ExcelToSc::Convert( ScRangeListTabs& rRangeList, 
XclImpStream& aIn, std:
 if( meBiff == EXC_BIFF2 )
 {
 nData = aIn.ReaduInt8();
-nFakt = 1;
+nFactor = 1;
 }
 else
 {
 nData = aIn.ReaduInt16();
-nFakt = 2;
+nFactor = 2;
 }
 
 if( nOpt & 0x04 )
 {
-// nFakt -> skip bytes or wordsAttrChoose
+// nFactor -> skip bytes or wordsAttrChoose
 ++nData;
-aIn.Ignore(static_cast(nData) * nFakt);
+aIn.Ignore(static_cast(nData) * nFactor);
 }
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski]

 sfx2/source/control/unoctitm.cxx |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit a377db06eaf76d222c0e116a4c0f62a7e7736a26
Author: Mike Kaganski 
Date:   Mon Feb 12 09:47:38 2018 +0100

Use range-based for

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

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 1ebb919fbab7..31364d8f84a3 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -970,12 +970,10 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 
nSID, SfxItemState eSt
 InterceptLOKStateChangeEvent(pDispatcher->GetFrame(), aEvent, 
pState);
 }
 
-Sequence< OUString > seqNames = 
pDispatch->GetListeners().getContainedTypes();
-sal_Int32 nLength = seqNames.getLength();
-for (sal_Int32 i = 0; i < nLength; ++i)
+for (const OUString& rName: 
pDispatch->GetListeners().getContainedTypes())
 {
-if (seqNames[i] == aDispatchURL.Main || seqNames[i] == 
aDispatchURL.Complete)
-sendStatusChanged(seqNames[i], aEvent);
+if (rName == aDispatchURL.Main || rName == aDispatchURL.Complete)
+sendStatusChanged(rName, aEvent);
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 solenv/bin/assemble-flatpak.sh |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 6e004cce495713164778d035e00a39b5465b1c55
Author: Stephan Bergmann 
Date:   Fri Feb 9 15:44:16 2018 +0100

Include  in Flatpak appdata.xml

...fixing 
"No version information".  This is only minimal release information (cf.
), but is what is available directly in the build without
additional manual input.  Lack of either a date or timestamp attribute 
causes a
failure "org.libreoffice.LibreOffice.desktop: AppData problem: 
attribute-missing
:  has no timestamp", so include the current date in ISO 8601 
format to
silence that.

It is assumed that the LIBO_VERSION_* variables will only contain numeric
values, so don't need to be encoded when included in an XML attribute.

Change-Id: I442a01d5093ab2621897685c3bc1eeda4ee08fa9

diff --git a/solenv/bin/assemble-flatpak.sh b/solenv/bin/assemble-flatpak.sh
index 3eade815b11b..67cf47bad33d 100755
--- a/solenv/bin/assemble-flatpak.sh
+++ b/solenv/bin/assemble-flatpak.sh
@@ -43,7 +43,7 @@ done
 ## doesn't show more than five screenshots anyway, so restrict to one each from
 ## the five libreoffice-*.appdata.xml: Writer, Calc, Impress, Draw, Base):
 mkdir /app/share/appdata
-cat <<\EOF >/app/share/appdata/org.libreoffice.LibreOffice.appdata.xml
+cat /app/share/appdata/org.libreoffice.LibreOffice.appdata.xml
   ModernToolkit
   UserDocs
  
+ 
+  
+ 
 
 EOF
 
___
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' - solenv/bin

[Stephan Bergmann]

 solenv/bin/assemble-flatpak.sh |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 22034278a0955f2857ee1eaccdd2318bd9b9065b
Author: Stephan Bergmann 
Date:   Fri Feb 9 15:44:16 2018 +0100

Include  in Flatpak appdata.xml

...fixing 
"No version information".  This is only minimal release information (cf.
), but is what is available directly in the build without
additional manual input.  Lack of either a date or timestamp attribute 
causes a
failure "org.libreoffice.LibreOffice.desktop: AppData problem: 
attribute-missing
:  has no timestamp", so include the current date in ISO 8601 
format to
silence that.

It is assumed that the LIBO_VERSION_* variables will only contain numeric
values, so don't need to be encoded when included in an XML attribute.

Change-Id: I442a01d5093ab2621897685c3bc1eeda4ee08fa9
(cherry picked from commit 6e004cce495713164778d035e00a39b5465b1c55)
Reviewed-on: https://gerrit.libreoffice.org/49589
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/solenv/bin/assemble-flatpak.sh b/solenv/bin/assemble-flatpak.sh
index 3eade815b11b..67cf47bad33d 100755
--- a/solenv/bin/assemble-flatpak.sh
+++ b/solenv/bin/assemble-flatpak.sh
@@ -43,7 +43,7 @@ done
 ## doesn't show more than five screenshots anyway, so restrict to one each from
 ## the five libreoffice-*.appdata.xml: Writer, Calc, Impress, Draw, Base):
 mkdir /app/share/appdata
-cat <<\EOF >/app/share/appdata/org.libreoffice.LibreOffice.appdata.xml
+cat /app/share/appdata/org.libreoffice.LibreOffice.appdata.xml
   ModernToolkit
   UserDocs
  
+ 
+  
+ 
 
 EOF
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Error compiling LibreOffice git (Xinerama not functional?)

[Clemens Eisserer]

Hi,

I am trying to diagnose some performance issues I am experiencing
running LO on Linux.
Compiling on Fedora-27 seems a little bit troublesome, as I:

* had to set libxslt and libexslt includes and libraries manually
* disable xrandr, despite headers and library installed, it aborted
with "not functional"

however, it seems the feature causing the latest issue can not be
simply disabled via a switch:

checking whether and how to use Xinerama... yes, with dynamic linking
checking X11/extensions/Xinerama.h usability... yes
checking X11/extensions/Xinerama.h presence... yes
checking for X11/extensions/Xinerama.h... yes
checking for XineramaIsActive in -lXinerama... no
configure: error: Xinerama not functional?

Any idea why LibreOffice thinks my Xinerama is not functional?
Can I disable it somehow?

Thank you and best regards, Clemens
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Miklos Vajna]

 sal/android/libreofficekit-jni.c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 02f5c6d71de82cdb6e507e23f6f56379c7b04099
Author: Miklos Vajna 
Date:   Mon Feb 12 12:03:24 2018 +0100

sal android: fix -Werror,-Wimplicit-function-declaration

Change-Id: If19dbb654d473e8785dc69f96775c78cc95a7bd6

diff --git a/sal/android/libreofficekit-jni.c b/sal/android/libreofficekit-jni.c
index c5f53c92bcd5..4cd6594780e4 100644
--- a/sal/android/libreofficekit-jni.c
+++ b/sal/android/libreofficekit-jni.c
@@ -17,6 +17,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Error compiling LibreOffice git (Xinerama not functional?)

[Stephan Bergmann]

On 12.02.2018 12:00, Clemens Eisserer wrote:

I am trying to diagnose some performance issues I am experiencing
running LO on Linux.
Compiling on Fedora-27 seems a little bit troublesome, as I:

* had to set libxslt and libexslt includes and libraries manually
* disable xrandr, despite headers and library installed, it aborted
with "not functional"

however, it seems the feature causing the latest issue can not be
simply disabled via a switch:

checking whether and how to use Xinerama... yes, with dynamic linking
checking X11/extensions/Xinerama.h usability... yes
checking X11/extensions/Xinerama.h presence... yes
checking for X11/extensions/Xinerama.h... yes
checking for XineramaIsActive in -lXinerama... no
configure: error: Xinerama not functional?

Any idea why LibreOffice thinks my Xinerama is not functional?
Can I disable it somehow?


Did you install the relevant -devel packages, libxslt-devel, 
libXrandr-devel, libXinerama-devel?  Generally, `sudo dnf builddep 
libreoffice` (as given at 
) should be a good 
approximation of installing whatever packages will be needed.

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

Re: Error compiling LibreOffice git (Xinerama not functional?)

[Clemens Eisserer]

Hi Stephan,

> Did you install the relevant -devel packages, libxslt-devel,
> libXrandr-devel, libXinerama-devel?  Generally, `sudo dnf builddep
> libreoffice` (as given at

Sure, I manually instalelled the devel packages - however to make
sure, I also executed the dnf builddep command you mentioned.
However, the configure run still fails with the message mentioned
before - the header is there, but configure does not find
XineramaIsActive.

Best regards, Clemens
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Tor Lillqvist]

 extensions/source/ole/unoobjw.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2191169c83c15bfc9546204fc1640b1674717af1
Author: Tor Lillqvist 
Date:   Thu Feb 8 22:21:32 2018 +0200

Whitespace (alignment) fix

Change-Id: Ib3ecfc5524744f49f3995202f377a625ea80b998

diff --git a/extensions/source/ole/unoobjw.cxx 
b/extensions/source/ole/unoobjw.cxx
index 7955dbbd68aa..95683c2f6de4 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -782,10 +782,10 @@ STDMETHODIMP InterfaceOleWrapper_Impl::Invoke(DISPID 
dispidMember,
   REFIID /*riid*/,
   LCID /*lcid*/,
   unsigned short wFlags,
-   DISPPARAMS * pdispparams,
+  DISPPARAMS * pdispparams,
   VARIANT * pvarResult,
   EXCEPINFO * pexcepinfo,
-   unsigned int * puArgErr )
+  unsigned int * puArgErr )
 {
 comphelper::ProfileZone aZone("COM Bridge");
 HRESULT ret = S_OK;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: New Defects reported by Coverity Scan for LibreOffice

[Szymon Kłos]

Hi,

It wasn't intentional. My fix is already on gerrit: 
https://gerrit.libreoffice.org/#/c/49592/


Regards,

Szymon


W dniu 10.02.2018 o 18:13, Caolán McNamara pisze:

On Fri, 2018-02-09 at 18:50 +, scan-ad...@coverity.com wrote:

Hi,

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

_
___
*** CID 1429181:(DEADCODE)
/sd/source/filter/eppt/pptx-epptooxml.cxx: 816 in
oox::core::PowerPointExport::WriteTransition(const
std::shared_ptr &)()

since...

commit fa85592c0efba65f4a1b09fea950ec1c311bdd4c
Author: Szymon Kłos 
Date:   Mon Feb 5 12:41:58 2018 +0100

 tdf#115394 export custom transition time in PPTX

bool isAdvanceTimingSet = advanceTiming != -1;

was added, but its above the line which might change advanceTiming away
from its default of -1 (i.e. mAny >>= advanceTiming) is that
intentional or is there something to be fixed ?


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

Re: Error compiling LibreOffice git (Xinerama not functional?)

[Stephan Bergmann]

On 12.02.2018 12:13, Clemens Eisserer wrote:

Did you install the relevant -devel packages, libxslt-devel,
libXrandr-devel, libXinerama-devel?  Generally, `sudo dnf builddep
libreoffice` (as given at


Sure, I manually instalelled the devel packages - however to make
sure, I also executed the dnf builddep command you mentioned.
However, the configure run still fails with the message mentioned
before - the header is there, but configure does not find
XineramaIsActive.


Then you'd need to look into config.log why it's failing.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Error compiling LibreOffice git (Xinerama not functional?)

[David Tardon]

Hi,

On Mon, 2018-02-12 at 12:13 +0100, Clemens Eisserer wrote:
> Hi Stephan,
> 
> > Did you install the relevant -devel packages, libxslt-devel,
> > libXrandr-devel, libXinerama-devel?  Generally, `sudo dnf builddep
> > libreoffice` (as given at
> 
> Sure, I manually instalelled the devel packages - however to make
> sure, I also executed the dnf builddep command you mentioned.
> However, the configure run still fails with the message mentioned
> before - the header is there, but configure does not find
> XineramaIsActive.

Look for XineramaIsActive in config.log. That may give you a hint as to
why the test fails. My guess is a compile error, as, judging from what
have you written about your other problems, your system doesn't appear
to be in a good state. (Several of us build on F-27 daily. Just as we
did on F-26, F-25, etc. before. So a problem like yours would be
noticed...)

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

Re: Error compiling LibreOffice git (Xinerama not functional?)

[Clemens Eisserer]

Hi again,

> Look for XineramaIsActive in config.log. That may give you a hint as to
> why the test fails. My guess is a compile error, as, judging from what
> have you written about your other problems, your system doesn't appear
> to be in a good state. (Several of us build on F-27 daily. Just as we
> did on F-26, F-25, etc. before. So a problem like yours would be
> noticed...)

Thanks for the pointer - after some digging I think I've found the issue:

/usr/bin/ld: inkompatibles
/usr/lib/gcc/x86_64-redhat-linux/7/../../../libXinerama.so wird bei
der Suche nach -lXinerama übersprungen
/usr/bin/ld: inkompatibles //lib/libXinerama.so wird bei der Suche
nach -lXinerama übersprungen
/usr/bin/ld: inkompatibles //usr/lib/libXinerama.so wird bei der Suche
nach -lXinerama übersprungen
/usr/bin/ld: -lXinerama kann nicht gefunden werden


[ce@localhost temp]$ file
/usr/lib/gcc/x86_64-redhat-linux/7/../../../libXinerama.so
/usr/lib/gcc/x86_64-redhat-linux/7/../../../libXinerama.so: symbolic
link to libXinerama.so.1.0.0
[ce@localhost temp]$ file
/usr/lib/gcc/x86_64-redhat-linux/7/../../../libXinerama.so.1.0.0
/usr/lib/gcc/x86_64-redhat-linux/7/../../../libXinerama.so.1.0.0: ELF
32-bit LSB shared object, Intel 80386, version 1 (SYSV), dynamically
linked, BuildID[sha1]=6d3e82c64047b7d1bf51fa61af1ae58d8b53a741,
stripped

[ce@localhost temp]$ rpm -qf
/usr/lib/gcc/x86_64-redhat-linux/7/../../../libXinerama.so
libXinerama-devel-1.1.3-9.fc27.i686

So, the package libXinerama-devel.i686 seems to install into
x86_64-redhat-linux and confuses the whole system.

Hopefully I am able to resolv this.

Thanks & br, Clemens
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Mike Kaganski]

 vcl/source/control/ctrl.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit ad4b699980e0d02e535ec14fab3135453ab48d4e
Author: Mike Kaganski 
Date:   Mon Feb 12 11:14:09 2018 +0100

One less ctor/dtor

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

diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 7cc4cff385bf..a1307ae5f045 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -404,8 +404,7 @@ void Control::ApplySettings(vcl::RenderContext& 
rRenderContext)
 {
 const StyleSettings& rStyleSettings = 
rRenderContext.GetSettings().GetStyleSettings();
 
-vcl::Font rFont(GetCanonicalFont(rStyleSettings));
-ApplyControlFont(rRenderContext, rFont);
+ApplyControlFont(rRenderContext, GetCanonicalFont(rStyleSettings));
 
 ApplyControlForeground(rRenderContext, 
GetCanonicalTextColor(rStyleSettings));
 rRenderContext.SetTextFillColor();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

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

New commits:
commit be3314c9f16e8ca5480c01081d87f7deb7c50a8c
Author: Olivier Hallot 
Date:   Fri Feb 9 16:14:47 2018 -0200

Updated core
Project: help  145fe1d4c0d697cd15619dd682c622d3c146d95f

Better handling of help URLs anchors

Change-Id: I25a6b105f4a809839575e43cd4834cf96a1e5e7c
Reviewed-on: https://gerrit.libreoffice.org/49516
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 863b926ed16b..145fe1d4c0d6 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 863b926ed16b372800f75e8ac467afbf3443f61e
+Subproject commit 145fe1d4c0d697cd15619dd682c622d3c146d95f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: help3xsl/index2.html

[Olivier Hallot]

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

New commits:
commit 145fe1d4c0d697cd15619dd682c622d3c146d95f
Author: Olivier Hallot 
Date:   Fri Feb 9 16:14:47 2018 -0200

Better handling of help URLs anchors

Change-Id: I25a6b105f4a809839575e43cd4834cf96a1e5e7c
Reviewed-on: https://gerrit.libreoffice.org/49516
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/help3xsl/index2.html b/help3xsl/index2.html
index 578acbbd2..58a17f627 100644
--- a/help3xsl/index2.html
+++ b/help3xsl/index2.html
@@ -39,12 +39,13 @@
 var file = map[bookmark];
 // rebuild URL
 if (file === undefined){
-file = defaultFile;
-}
+var newURL = lang + '/' + defaultFile + '?System=' + system + '&DbPAR=' + 
module;
+}else{
 var indx = file.indexOf('#');
 var bm = file.substr(indx,file.length);
 file = file.substr(0,indx);
 var newURL = lang + '/' + file + '?System=' + system + '&DbPAR=' + module 
+ bm;
+}
 window.open(newURL,'_self');
 }else{
 // URL came from elsewhere, direct access to webroot, we redirect to main 
Help page
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

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

New commits:
commit b24a90799b16cde737a0f0e2b1d71acd8fd69019
Author: Noel Grandin 
Date:   Mon Feb 12 15:11:26 2018 +0200

crashtesting: tdf111681-6.pptx

regression from
commit e5012e53b919ae4921d6d35660bde323a6f28417
use scanline when reading pixel data

Change-Id: Ic9382426191d5cbbffc6c3fd6f7038ed93715b8e
Reviewed-on: https://gerrit.libreoffice.org/49598
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 3acb0a36f26a..797319164de4 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -1315,7 +1315,7 @@ void BitmapEx::setAlphaFrom( sal_uInt8 cIndexFrom, 
sal_Int8 nAlphaTo )
 Scanline pScanlineRead = pReadAccess->GetScanline( nY );
 for ( long nX = 0; nX < pReadAccess->Width(); nX++ )
 {
-const sal_uInt8 cIndex = pReadAccess->GetIndexFromData( 
pScanlineRead, nX );
+const sal_uInt8 cIndex = pReadAccess->GetPixelFromData( 
pScanlineRead, nX ).GetBlueOrIndex();
 if ( cIndex == cIndexFrom )
 pWriteAccess->SetPixelOnData( pScanline, nX, 
BitmapColor(nAlphaTo) );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini]

 oovbaapi/ooo/vba/msforms/XShape.idl |2 +-
 sc/inc/address.hxx  |2 +-
 sc/source/ui/unoobj/servuno.cxx |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5bf91d305191eacde979aba7c3b1ef36e13a7919
Author: Andrea Gelmini 
Date:   Sat Feb 10 10:25:55 2018 +0100

Fix typos

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

diff --git a/oovbaapi/ooo/vba/msforms/XShape.idl 
b/oovbaapi/ooo/vba/msforms/XShape.idl
index 2e7dc535280a..1337645798ae 100644
--- a/oovbaapi/ooo/vba/msforms/XShape.idl
+++ b/oovbaapi/ooo/vba/msforms/XShape.idl
@@ -56,7 +56,7 @@ interface XShape : ooo::vba::XHelperInterface
 void Select( [in]  /*Optional*/ any Replace );
 void ScaleHeight( [in] double Factor, [in] boolean RelativeToOriginalSize, 
[in] long Scale );
 void ScaleWidth( [in] double Factor, [in] boolean RelativeToOriginalSize, 
[in] long Scale );
-any ShapeRange( [in] any index );  // only here for convience
+any ShapeRange( [in] any index );  // only here for convenience
 };
 }; }; };
 
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 77ee970b08ee..a3c7040a21d5 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -149,7 +149,7 @@ enum class ScRefFlags : sal_uInt16
 ROW_VALID = 0x0100,
 COL_VALID = 0x0200,
 TAB_VALID = 0x0400,
-// BITS for convience
+// BITS for convenience
 BITS  = COL_ABS | ROW_ABS | TAB_ABS | TAB_3D
 | ROW_VALID | COL_VALID | TAB_VALID,
 // somewhat cheesy kludge to force the display of the document name even 
for
diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx
index e3ee59062ea7..8b958791c16c 100644
--- a/sc/source/ui/unoobj/servuno.cxx
+++ b/sc/source/ui/unoobj/servuno.cxx
@@ -127,7 +127,7 @@ public:
 aArgs[0] = maWorkbook;
 aArgs[1] <<= xModel;
 aArgs[2] <<= sSheetName;
-// use the convience function
+// use the convenience function
 maCachedObject <<= 
ooo::vba::createVBAUnoAPIServiceWithArgs( mpDocShell, 
"ooo.vba.excel.Worksheet", aArgs );
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini]

 starmath/source/mathtype.cxx |2 +-
 sw/source/filter/ww8/ww8par2.cxx |2 +-
 wizards/com/sun/star/wizards/agenda/TopicsControl.py |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fe47e5fdd3500ff371eed9092f96be7bdde5a18d
Author: Andrea Gelmini 
Date:   Fri Feb 9 13:25:16 2018 +0100

Fix typos

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

diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 402a75f0a613..dbae6cb3c9bc 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -2892,7 +2892,7 @@ bool MathType::HandleChar(sal_Int32 &rTextStart, int 
&rSetSize, int nLevel,
 if (xfEMBELL(nTag))
 {
 //A bit tricky, the character emblishments for
-//mathtype can all be listed after eachother, in
+//mathtype can all be listed after each other, in
 //starmath some must go before the character and some
 //must go after. In addition some of the emblishments
 //may repeated and in starmath some of these groups
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index d299331c85df..93f1190a6093 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -644,7 +644,7 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, 
bool bTableRowEnd,
 //data is the same as the current one
 if (bNowApo && InEqualApo(nCellLevel))
 {
-// two bordering eachother
+// two bordering each other
 if (!TestSameApo(aRet, pTabPos))
 aRet.mbStopApo = aRet.mbStartApo = true;
 }
diff --git a/wizards/com/sun/star/wizards/agenda/TopicsControl.py 
b/wizards/com/sun/star/wizards/agenda/TopicsControl.py
index cc42aa95552a..e345ddcd11b0 100644
--- a/wizards/com/sun/star/wizards/agenda/TopicsControl.py
+++ b/wizards/com/sun/star/wizards/agenda/TopicsControl.py
@@ -560,7 +560,7 @@ class TopicsControl(ControlScroller):
 self.focus(self.getControl(lowerRow, control))
 
 '''
-changes the values of the given rows with eachother
+changes the values of the given rows with each other
 @param row1 one can figure out what this parameter is...
 @param row2 one can figure out what this parameter is...
 '''
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: qadevOOo/tests

[Andrea Gelmini]

 qadevOOo/tests/java/ifc/linguistic2/_XSpellChecker.java |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 90a46122dc0ce401919914cb79f11081d6cc6b24
Author: Andrea Gelmini 
Date:   Sat Feb 10 10:29:32 2018 +0100

Fix typos

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

diff --git a/qadevOOo/tests/java/ifc/linguistic2/_XSpellChecker.java 
b/qadevOOo/tests/java/ifc/linguistic2/_XSpellChecker.java
index 1645b28bc34d..642444e2c98e 100644
--- a/qadevOOo/tests/java/ifc/linguistic2/_XSpellChecker.java
+++ b/qadevOOo/tests/java/ifc/linguistic2/_XSpellChecker.java
@@ -50,7 +50,7 @@ public class _XSpellChecker extends MultiMethodTest {
 
 /**
 * Test calls the method for a correctly spelled word and
-* for a uncorrectly spelled word and checks returned values. 
+* for a incorrectly spelled word and checks returned values. 
 * Has  OK  status if returned value is equal to true in first case,
 * if returned value is equal to false in second case and no exceptions
 * were thrown. 
@@ -75,7 +75,7 @@ public class _XSpellChecker extends MultiMethodTest {
 }
 
 /**
-* Test calls the method for a uncorrectly spelled word
+* Test calls the method for a incorrectly spelled word
 * and checks returned values. 
 * Has  OK  status if at least one spell alternative exists
 * and no exceptions were thrown. 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andrea Gelmini]

 lotuswordpro/inc/xfilter/xfcontentcontainer.hxx |2 +-
 vcl/unx/generic/gdi/gdiimpl.cxx |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 89202f2d76a92866ed3f3887d690e4fc45658e22
Author: Andrea Gelmini 
Date:   Sat Feb 10 01:32:52 2018 +0100

Fix typos

Change-Id: Ia01f85e87706b02ffb816b3385765e2729dafa02
Reviewed-on: https://gerrit.libreoffice.org/49585
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/lotuswordpro/inc/xfilter/xfcontentcontainer.hxx 
b/lotuswordpro/inc/xfilter/xfcontentcontainer.hxx
index 08a12d9b14ed..f3a843f1481f 100644
--- a/lotuswordpro/inc/xfilter/xfcontentcontainer.hxx
+++ b/lotuswordpro/inc/xfilter/xfcontentcontainer.hxx
@@ -92,7 +92,7 @@ public:
 rtl::Reference GetLastContent();
 voidRemoveLastContent();
 /**
- * @descr   convience function for add text content.
+ * @descr   convenience function for add text content.
  */
 voidAdd(const OUString& text);
 
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index 342edf526e57..823d4ca9018d 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -1589,7 +1589,7 @@ bool X11SalGraphicsImpl::drawPolyLine(
 const SalColor aKeepBrushColor = mnBrushColor;
 mnBrushColor = mnPenColor;
 
-// #i11575#desc5#b adjust B2D tesselation result to raster positions
+// #i11575#desc5#b adjust B2D tessellation result to raster positions
 basegfx::B2DPolygon aPolygon = rPolygon;
 const double fHalfWidth = 0.5 * rLineWidth.getX();
 
@@ -1601,12 +1601,12 @@ bool X11SalGraphicsImpl::drawPolyLine(
 bool bDrawnOk = true;
 if( bIsHairline )
 {
-// hairlines can benefit from a simplified tesselation
+// hairlines can benefit from a simplified tessellation
 // e.g. for hairlines the linejoin style can be ignored
 basegfx::B2DTrapezoidVector aB2DTrapVector;
 basegfx::utils::createLineTrapezoidFromB2DPolygon( aB2DTrapVector, 
aPolygon, rLineWidth.getX() );
 
-// draw tesselation result
+// draw tessellation result
 const int nTrapCount = aB2DTrapVector.size();
 if( nTrapCount > 0 )
 bDrawnOk = drawFilledTrapezoids( &aB2DTrapVector[0], nTrapCount, 
fTransparency );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 sc/source/ui/app/scdll.cxx |3 +++
 sd/source/ui/app/sddll.cxx |4 
 sw/source/uibase/app/swdll.cxx |4 
 3 files changed, 11 insertions(+)

New commits:
commit 93eef21ce1f74c848fcf0ad4f4eab7a8167a39a8
Author: Michael Meeks 
Date:   Mon Feb 12 12:04:23 2018 +0100

Disable lok_preload_hooks when not dynamically loading.

Change-Id: I00f1e8978607f450d3ad33f4515be1fc962c0332
Reviewed-on: https://gerrit.libreoffice.org/49591
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 

diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 6f8287cd1b9d..6ee59f75efe9 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -267,6 +267,8 @@ void ScDLL::Init()
 //  StarOne Services are now handled in the registry
 }
 
+#ifndef DISABLE_DYNLOADING
+
 extern "C" SAL_DLLPUBLIC_EXPORT
 void lok_preload_hook()
 {
@@ -276,5 +278,6 @@ void lok_preload_hook()
 ScAbstractDialogFactory::Create();
 }
 
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 511b66567d67..b4741e4dd7f6 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -290,10 +290,14 @@ void SdDLL::Init()
 #endif
 }
 
+#ifndef DISABLE_DYNLOADING
+
 extern "C" SAL_DLLPUBLIC_EXPORT
 void lok_preload_hook()
 {
 SdAbstractDialogFactory::Create();
 }
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/app/swdll.cxx b/sw/source/uibase/app/swdll.cxx
index 7df0cec3a0db..a126f56524ea 100644
--- a/sw/source/uibase/app/swdll.cxx
+++ b/sw/source/uibase/app/swdll.cxx
@@ -172,10 +172,14 @@ sw::Filters & SwDLL::getFilters()
 return *filters_.get();
 }
 
+#ifndef DISABLE_DYNLOADING
+
 extern "C" SAL_DLLPUBLIC_EXPORT
 void lok_preload_hook()
 {
 SwAbstractDialogFactory::Create();
 }
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Weekly QA Report (W06-2018)

[Xisco Fauli]

Hello,

What have happened in QA in the last 7 days?

  * 179 bugs have been created, of which, 90 are still unconfirmed (
Total Unconfirmed bugs: 509 )
        + Created bugs: http://tinyurl.com/ybal98xs
        + Still unconfirmed bugs: http://tinyurl.com/ya5ubcd6

  * 1264 comments have been written by 245 users.

  * 69 new users have signed up to Bugzilla.

== STATUSES CHANGED ==
  * 14 bugs have been changed to 'ASSIGNED'.
        + Link: http://tinyurl.com/ydevcpcc
        + Done by: Bartosz ( 4 ), Xisco Faulí ( 3 ), Miklos Vajna ( 1 ),
Heiko Tietze ( 1 ), Julien Nabet ( 1 ), Laurent BP ( 1 ), Justin L ( 1
), hcastro ( 1 ), Gabriele Ponzo ( 1 )

  * 2 bugs have been changed to 'CLOSED'.
        + Link: http://tinyurl.com/y6uykyn6
        + Done by: tim ( 1 ), Julien Nabet ( 1 )

  * 20 bugs have been changed to 'NEEDINFO'.
        + Link: http://tinyurl.com/ych83j7l
        + Done by: Xisco Faulí ( 11 ), Buovjaga ( 6 ), Timur ( 2 ),
Miklos Vajna ( 1 )

  * 67 bugs have been changed to 'NEW'.
        + Link: http://tinyurl.com/ybjchaqo
        + Done by: Buovjaga ( 17 ), Heiko Tietze ( 8 ), Aron Budea ( 7
), Xisco Faulí ( 5 ), Telesto ( 5 ), Yousuf Philips (jay) ( 3 ), Jacques
Guilleron ( 3 ), raal ( 2 ), Xavier Van Wijmeersch ( 1 ), V Stuart Foote
( 1 ), Kevin Suo ( 1 ), Volga ( 1 ), robert ( 1 ), Regina Henschel ( 1
), OfficeUser ( 1 ), ms ( 1 ), Maxim Monastirsky ( 1 ), Mike Kaganski (
1 ), m.a.riosv ( 1 ), Michael Meeks ( 1 ), manujvashist ( 1 ), Christian
( 1 ), Timur ( 1 ), Bartosz ( 1 ), Dieter Praas ( 1 )

  * 1 bug has been changed to 'REOPENED'.
        + Link: http://tinyurl.com/ya4c2yce
        + Done by: Eltomito ( 1 )

  * 45 bugs have been changed to 'RESOLVED DUPLICATE'.
        + Link: http://tinyurl.com/y9lupdlw
        + Done by: Xisco Faulí ( 6 ), Telesto ( 5 ), Maxim Monastirsky (
5 ), Julien Nabet ( 4 ), Kevin Suo ( 3 ), Jacques Guilleron ( 3 ),
Bartosz ( 3 ), Aron Budea ( 3 ), V Stuart Foote ( 2 ), Gabor Kelemen ( 2
), Buovjaga ( 1 ), StamatisZ ( 1 ), Stephan Bergmann ( 1 ),
rolywhittellwebb ( 1 ), Mike Kaganski ( 1 ), Mert Tumer ( 1 ),
mattreecebentley ( 1 ), Timur ( 1 ), Katarina Behrens (CIB) ( 1 )

  * 51 bugs have been changed to 'RESOLVED FIXED'.
        + Link: http://tinyurl.com/y726c8kx
        + Done by: Armin Le Grand (CIB) ( 7 ), Miklos Vajna ( 3 ),
Michael Stahl ( 3 ), Maxim Monastirsky ( 3 ), Eike Rathke ( 3 ), Aron
Budea ( 3 ), V Stuart Foote ( 2 ), Heiko Tietze ( 2 ), Julien Nabet ( 2
), Yousuf Philips (jay) ( 2 ), Mike Kaganski ( 2 ), Mark Hung ( 2 ),
Bartosz ( 2 ), Buovjaga ( 1 ), Andras Timar ( 1 ), Szymon Kłos ( 1 ),
Emre Öztürk ( 1 ), Olivier Hallot ( 1 ), László Németh ( 1 ), Muhammet
Kara ( 1 ), Mert Tumer ( 1 ), Adolfo Jayme ( 1 ), Cor Nouws ( 1 ),
Caolán McNamara ( 1 ), Martin ( 1 ), Tamas Bunth ( 1 ), Ahmed GHANMI ( 1
), Katarina Behrens (CIB) ( 1 )

  * 1 bug has been changed to 'RESOLVED INSUFFICIENTDATA'.
        + Link: http://tinyurl.com/y79ynsqp
        + Done by: Cor Nouws ( 1 )

  * 4 bugs have been changed to 'RESOLVED INVALID'.
        + Link: http://tinyurl.com/ycovotjc
        + Done by: Xisco Faulí ( 2 ), Andras Timar ( 1 ), Timur ( 1 )

  * 2 bugs have been changed to 'RESOLVED MOVED'.
        + Link: http://tinyurl.com/yayq5uuh
        + Done by: Xisco Faulí ( 2 )

  * 4 bugs have been changed to 'RESOLVED NOTABUG'.
        + Link: http://tinyurl.com/yazvyvuu
        + Done by: Xavier Van Wijmeersch ( 1 ), Heiko Tietze ( 1 ),
Janos ( 1 ), Aron Budea ( 1 )

  * 4 bugs have been changed to 'RESOLVED NOTOURBUG'.
        + Link: http://tinyurl.com/yao2r5ro
        + Done by: Xisco Faulí ( 2 ), Khaled Hosny ( 1 ), Alex Thurgood
( 1 )

  * 5 bugs have been changed to 'RESOLVED WONTFIX'.
        + Link: http://tinyurl.com/yc2m3lm5
        + Done by: Buovjaga ( 2 ), Heiko Tietze ( 1 ), Olivier Hallot (
1 ), Cor Nouws ( 1 )

  * 33 bugs have been changed to 'RESOLVED WORKSFORME'.
        + Link: http://tinyurl.com/y9q77udr
        + Done by: krishna [:kr1shna] ( 7 ), raal ( 4 ), Aron Budea ( 3
), Xisco Faulí ( 2 ), Telesto ( 2 ), Mike ( 2 ), Xavier Van Wijmeersch (
1 ), V Stuart Foote ( 1 ), Buovjaga ( 1 ), Heiko Tietze ( 1 ), Fernand (
1 ), Yousuf Philips (jay) ( 1 ), Luke ( 1 ), Ken Chappell ( 1 ),
Jean-Baptiste Faure ( 1 ), Timur ( 1 ), Gerry ( 1 ), David Chionne ( 1
), Cor Nouws ( 1 )

  * 22 bugs have been changed to 'UNCONFIRMED'.
        + Link: http://tinyurl.com/yd58a8ud
        + Done by: Buovjaga ( 3 ), krishna [:kr1shna] ( 3 ), Xisco Faulí
( 2 ), grofaty ( 2 ), vlb ( 1 ), u.fuchs ( 1 ), Kevin Suo ( 1 ), sey0626
( 1 ), Julien Nabet ( 1 ), robert ( 1 ), Alex Thurgood ( 1 ), Jo-Jo ( 1
), fratelliferretti ( 1 ), Dieter Praas ( 1 ), dev ( 1 ), awaschb ( 1 )

  * 6 bugs have been changed to 'VERIFIED FIXED'.
        + Link: http://tinyurl.com/y7ekkuq2
        + Done by: Buovjaga ( 2 ), Julien Nabet ( 1 ), steve -_- ( 1 ),
Justin L ( 1 ), Timur ( 1 )

  * 1 bug has been changed to 'VERIFIED INVALID'.
        + Link: http://tinyurl.com/ych44q

[Libreoffice-commits] core.git: solenv/flatpak-manifest.in

[Stephan Bergmann]

 solenv/flatpak-manifest.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9cf2616c5e709b5956ab88dacdfad2003f98
Author: Stephan Bergmann 
Date:   Mon Feb 12 15:48:23 2018 +0100

Work around i386 kernel vs. JVM bug for now by disabling all tests on i386

 "Libreoffice Writer
crashing with segmentation fault in libjvm.so _expand_stack_to when wiki 
plugin
installed" still hits various machines (e.g., my local 
4.14.16-300.fc27.x86_64
as well as 3.10.0-693.11.6.el7.x86_64 flathub-builder-pdx1, see
), causing --arch=i386
builds to fail tests that instantiate a JVM in-process, e.g.
CppunitTest_dbaccess_RowSetClones with SIGSEGV at

> #0  _expand_stack_to (bottom=0xff605fff , bottom@entry=0xff605000 ) at /run/build/java/hotspot/src/os/linux/vm/os_linux.cpp:608
> #1  0xed207564 in os::Linux::manually_expand_stack (t=0x58314800, 
addr=0xff605000 ) at 
/run/build/java/hotspot/src/os/linux/vm/os_linux.cpp:621
> #2  0xed211d5b in os::create_attached_thread (thread=0x58314800) at 
/run/build/java/hotspot/src/os/linux/vm/os_linux.cpp:839
> #3  os::create_main_thread (thread=0x58314800) at 
/run/build/java/hotspot/src/os/linux/vm/os_linux.cpp:789
> #4  0xed36d8a7 in Thread::set_as_starting_thread (this=0x58314800) at 
/run/build/java/hotspot/src/share/vm/runtime/thread.cpp:941
> #5  Threads::create_vm (args=0xffdf0810, canTryAgain=0xffdf068f) at 
/run/build/java/hotspot/src/share/vm/runtime/thread.cpp:3614
> #6  0xecfc5081 in JNI_CreateJavaVM_inner (args=0xffdf0810, 
penv=0xffdf0a84, vm=0xffdf0798) at 
/run/build/java/hotspot/src/share/vm/prims/jni.cpp:3937
> #7  JNI_CreateJavaVM (vm=0xffdf0798, penv=0xffdf0a84, args=0xffdf0810) at 
/run/build/java/hotspot/src/share/vm/prims/jni.cpp:4032
> #8  0xf32b5397 in jfw_plugin_startJavaVirtualMachine(JavaInfo const*, 
JavaVMOption const*, long, JavaVM_**, JNIEnv_**) () from 
/run/build/libreoffice/instdir/program/libjvmfwklo.so
...

Disabling tests leads to successful builds, but using Java functionality in 
the
LO flatpak on affected machines (where the above bug or similar for other 
Linux
distros is not yet fixed) will still crash, of course.  Users of the LO 
flatpak
will need to seek a fixed kernel (or there will need to be an update of
org.freedesktop.Sdk.Extension.openjdk9 and a rebuild of the LO flatpak, if 
it
turns out that a fix will need to be applied to OpenJDK instead of the 
kernel).
This workaround can be removed again once no Flathub build machines are 
affected
by the bug any longer.

(`uname -i`, reporting "i386", appears to be more appropriate for this check
than `uname -m`, which might probably report other tokens besides "i686".)

Change-Id: I6e4b01d1df5aff5ac31847fd56285506af003f4b

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index a12d62985e84..cbe5b6a226c7 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -549,7 +549,7 @@
 "buildsystem": "simple",
 "build-commands": [
 "./autogen.sh --prefix=/run/build/libreoffice/inst 
--with-distro=LibreOfficeFlatpak --disable-symbols $(if test \"$(uname -m)\" = 
aarch64; then printf %s --disable-pdfium; fi)",
-"make",
+"make $(if test \"$(uname -i)\" = i386; then printf 
build-nocheck; fi)",
 "make distro-pack-install",
 "make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'"
 ]
___
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' - solenv/flatpak-manifest.in

[Stephan Bergmann]

 solenv/flatpak-manifest.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 637d2ffe1b9290714c20c2b977b5817d471997c6
Author: Stephan Bergmann 
Date:   Mon Feb 12 15:48:23 2018 +0100

Work around i386 kernel vs. JVM bug for now by disabling all tests on i386

 "Libreoffice Writer
crashing with segmentation fault in libjvm.so _expand_stack_to when wiki 
plugin
installed" still hits various machines (e.g., my local 
4.14.16-300.fc27.x86_64
as well as 3.10.0-693.11.6.el7.x86_64 flathub-builder-pdx1, see
), causing --arch=i386
builds to fail tests that instantiate a JVM in-process, e.g.
CppunitTest_dbaccess_RowSetClones with SIGSEGV at

> #0  _expand_stack_to (bottom=0xff605fff , bottom@entry=0xff605000 ) at /run/build/java/hotspot/src/os/linux/vm/os_linux.cpp:608
> #1  0xed207564 in os::Linux::manually_expand_stack (t=0x58314800, 
addr=0xff605000 ) at 
/run/build/java/hotspot/src/os/linux/vm/os_linux.cpp:621
> #2  0xed211d5b in os::create_attached_thread (thread=0x58314800) at 
/run/build/java/hotspot/src/os/linux/vm/os_linux.cpp:839
> #3  os::create_main_thread (thread=0x58314800) at 
/run/build/java/hotspot/src/os/linux/vm/os_linux.cpp:789
> #4  0xed36d8a7 in Thread::set_as_starting_thread (this=0x58314800) at 
/run/build/java/hotspot/src/share/vm/runtime/thread.cpp:941
> #5  Threads::create_vm (args=0xffdf0810, canTryAgain=0xffdf068f) at 
/run/build/java/hotspot/src/share/vm/runtime/thread.cpp:3614
> #6  0xecfc5081 in JNI_CreateJavaVM_inner (args=0xffdf0810, 
penv=0xffdf0a84, vm=0xffdf0798) at 
/run/build/java/hotspot/src/share/vm/prims/jni.cpp:3937
> #7  JNI_CreateJavaVM (vm=0xffdf0798, penv=0xffdf0a84, args=0xffdf0810) at 
/run/build/java/hotspot/src/share/vm/prims/jni.cpp:4032
> #8  0xf32b5397 in jfw_plugin_startJavaVirtualMachine(JavaInfo const*, 
JavaVMOption const*, long, JavaVM_**, JNIEnv_**) () from 
/run/build/libreoffice/instdir/program/libjvmfwklo.so
...

Disabling tests leads to successful builds, but using Java functionality in 
the
LO flatpak on affected machines (where the above bug or similar for other 
Linux
distros is not yet fixed) will still crash, of course.  Users of the LO 
flatpak
will need to seek a fixed kernel (or there will need to be an update of
org.freedesktop.Sdk.Extension.openjdk9 and a rebuild of the LO flatpak, if 
it
turns out that a fix will need to be applied to OpenJDK instead of the 
kernel).
This workaround can be removed again once no Flathub build machines are 
affected
by the bug any longer.

(`uname -i`, reporting "i386", appears to be more appropriate for this check
than `uname -m`, which might probably report other tokens besides "i686".)

Change-Id: I6e4b01d1df5aff5ac31847fd56285506af003f4b
(cherry picked from commit 9cf2616c5e709b5956ab88dacdfad2003f98)
Reviewed-on: https://gerrit.libreoffice.org/49605
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index baff33ec3811..e313d8debfdb 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -549,7 +549,7 @@
 "buildsystem": "simple",
 "build-commands": [
 "./autogen.sh --prefix=/run/build/libreoffice/inst 
--with-distro=LibreOfficeFlatpak --disable-symbols $(if test \"$(uname -m)\" = 
aarch64; then printf %s --disable-pdfium; fi)",
-"make",
+"make $(if test \"$(uname -i)\" = i386; then printf 
build-nocheck; fi)",
 "make distro-pack-install",
 "make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'"
 ]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/ui/docshell/impex.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 664c2902a6672be51c4a3163a5bf44aa2145d408
Author: Eike Rathke 
Date:   Mon Feb 12 17:02:29 2018 +0100

CheckLinkFormulaNeedingCheck() for .slk import

Change-Id: I79953cf4fd6e9e00351a3b1f1687b6024085e395

diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index cd703cbe9714..da9d0c7bc9e2 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -1923,6 +1923,7 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm )
 const formula::FormulaGrammar::Grammar eGrammar = 
formula::FormulaGrammar::GRAM_PODF_A1;
 ScCompiler aComp( pDoc, aPos, eGrammar);
 ScTokenArray* pCode = aComp.CompileString( aText );
+pDoc->CheckLinkFormulaNeedingCheck( *pCode);
 if ( ch == 'M' )
 {
 ScMarkData aMark;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Laurent BP]

 sc/source/ui/formdlg/formula.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d69017c8a17be21657ea7ab9d37023ee59116799
Author: Laurent BP 
Date:   Sat Feb 10 20:54:25 2018 +0100

tdf#72440 Abs sheet ref must be given

When resolving tdf#90799, sheet ref was forced abs
But its value must be changed.
It worked only if initial sheet = Sheet1

Change-Id: I715f93dce93beb78d767e00dd45fb9634cb173a8
Reviewed-on: https://gerrit.libreoffice.org/49548
Reviewed-by: Eike Rathke 
Tested-by: Jenkins 

diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 1856d0ef4f0c..7c4590ff1db5 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -448,8 +448,9 @@ void ScFormulaDlg::SetReference( const ScRange& rRef, 
ScDocument* pRefDoc )
 bool bSingle = aRefData.Ref1 == aRefData.Ref2;
 if (m_CursorPos.Tab() != rRef.aStart.Tab())
 {
+// pointer-selected => absolute sheet reference
+aRefData.Ref1.SetAbsTab( rRef.aStart.Tab() );
 aRefData.Ref1.SetFlag3D(true);
-aRefData.Ref1.SetTabRel(false); // pointer-selected => 
absolute sheet reference
 }
 if (bSingle)
 aArray.AddSingleReference(aRefData.Ref1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 udkapi/com/sun/star/bridge/XBridgeSupplier.idl  |3 ---
 udkapi/com/sun/star/bridge/XBridgeSupplier2.idl |3 ---
 2 files changed, 6 deletions(-)

New commits:
commit 7517e53a96b956f369a6003690174fa156b7a0e5
Author: Tor Lillqvist 
Date:   Mon Feb 12 18:13:51 2018 +0200

Don't even mention CORBA, it isn't and won't be specified

Change-Id: I87f6effdd3ef68749a3326ff277c6e8e7412c956

diff --git a/udkapi/com/sun/star/bridge/XBridgeSupplier.idl 
b/udkapi/com/sun/star/bridge/XBridgeSupplier.idl
index fbdb6f606d8c..d6d6aff37faa 100644
--- a/udkapi/com/sun/star/bridge/XBridgeSupplier.idl
+++ b/udkapi/com/sun/star/bridge/XBridgeSupplier.idl
@@ -57,9 +57,6 @@
 
 JAVA:   
 not yet specified.  
-
-CORBA: 
-not yet specified.  
 
 
 Any implementation can supply its own bridges to other object
diff --git a/udkapi/com/sun/star/bridge/XBridgeSupplier2.idl 
b/udkapi/com/sun/star/bridge/XBridgeSupplier2.idl
index 01930ca321d4..94c36850116c 100644
--- a/udkapi/com/sun/star/bridge/XBridgeSupplier2.idl
+++ b/udkapi/com/sun/star/bridge/XBridgeSupplier2.idl
@@ -72,9 +72,6 @@
 
 JAVA:   
 not specified yet.  
-
-CORBA: 
-not specified yet.  
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 emfio/source/reader/wmfreader.cxx |   50 +-
 1 file changed, 33 insertions(+), 17 deletions(-)

New commits:
commit e5ace62c32191a2ae4183102c21e37575add39d8
Author: Caolán McNamara 
Date:   Mon Feb 12 12:50:29 2018 +

ofz: timeout

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

diff --git a/emfio/source/reader/wmfreader.cxx 
b/emfio/source/reader/wmfreader.cxx
index 983fe70a1a4e..eed575ef2bed 100644
--- a/emfio/source/reader/wmfreader.cxx
+++ b/emfio/source/reader/wmfreader.cxx
@@ -514,9 +514,6 @@ namespace emfio
 //record is Recordsize, RecordFunction, StringLength, 
, YStart, XStart
 const sal_uInt32 nNonStringLen = sizeof(sal_uInt32) + 4 * 
sizeof(sal_uInt16);
 const sal_uInt32 nRecSize = mnRecSize * 2;
-sal_uInt16 nLength = 0;
-mpInputStream->ReadUInt16(nLength);
-sal_uInt16 nStoredLength = (nLength + 1) &~ 1;
 
 if (nRecSize < nNonStringLen)
 {
@@ -524,6 +521,10 @@ namespace emfio
 break;
 }
 
+sal_uInt16 nLength = 0;
+mpInputStream->ReadUInt16(nLength);
+sal_uInt16 nStoredLength = (nLength + 1) &~ 1;
+
 if (nRecSize - nNonStringLen < nStoredLength)
 {
 SAL_WARN("vcl.wmf", "W_META_TEXTOUT too short, truncating 
string");
@@ -543,15 +544,37 @@ namespace emfio
 
 case W_META_EXTTEXTOUT:
 {
-mpInputStream->SeekRel(-6);
-auto nRecordPos = mpInputStream->Tell();
-sal_Int32 nRecordSize = 0;
-mpInputStream->ReadInt32( nRecordSize );
-mpInputStream->SeekRel(2);
+//record is Recordsize, RecordFunction, Y, X, StringLength, 
options, maybe rectangle, 
+sal_uInt32 nNonStringLen = sizeof(sal_uInt32) + 5 * 
sizeof(sal_uInt16);
+const sal_uInt32 nRecSize = mnRecSize * 2;
+
+if (nRecSize < nNonStringLen)
+{
+SAL_WARN("vcl.wmf", "W_META_EXTTEXTOUT too short");
+break;
+}
+
+auto nRecordPos = mpInputStream->Tell() - 6;
 Point aPosition = ReadYX();
 sal_uInt16 nLen = 0, nOptions = 0;
 mpInputStream->ReadUInt16( nLen ).ReadUInt16( nOptions );
 
+tools::Rectangle aRect;
+if (nOptions & ETO_CLIPPED)
+{
+nNonStringLen += 2 * sizeof(sal_uInt16);
+
+if (nRecSize < nNonStringLen)
+{
+SAL_WARN("vcl.wmf", "W_META_TEXTOUT too short");
+break;
+}
+
+const Point aPt1( ReadPoint() );
+const Point aPt2( ReadPoint() );
+aRect = tools::Rectangle( aPt1, aPt2 );
+}
+
 ComplexTextLayoutFlags nTextLayoutMode = 
ComplexTextLayoutFlags::Default;
 if ( nOptions & ETO_RTLREADING )
 nTextLayoutMode = ComplexTextLayoutFlags::BiDiRtl | 
ComplexTextLayoutFlags::TextOriginLeft;
@@ -559,19 +582,12 @@ namespace emfio
 SAL_WARN_IF( ( nOptions & ( ETO_PDY | ETO_GLYPH_INDEX ) ) != 
0, "vcl.wmf", "SJ: ETO_PDY || ETO_GLYPH_INDEX in WMF" );
 
 // output only makes sense if the text contains characters
-if (nLen && nRecordSize >= 0)
+if (nLen)
 {
 sal_Int32 nOriginalTextLen = nLen;
 sal_Int32 nOriginalBlockLen = ( nOriginalTextLen + 1 ) &~ 
1;
-tools::Rectangle aRect;
-if( nOptions & ETO_CLIPPED )
-{
-const Point aPt1( ReadPoint() );
-const Point aPt2( ReadPoint() );
-aRect = tools::Rectangle( aPt1, aPt2 );
-}
 
-auto nMaxStreamPos = nRecordPos + (nRecordSize << 1);
+auto nMaxStreamPos = nRecordPos + nRecSize;
 auto nRemainingSize = 
std::min(mpInputStream->remainingSize(), nMaxStreamPos - mpInputStream->Tell());
 if (nRemainingSize < 
static_cast(nOriginalBlockLen))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpdoc.cxx |   13 +---
 lotuswordpro/source/filter/lwpdoc.hxx |   10 ---
 lotuswordpro/source/filter/lwpframelayout.cxx |8 +-
 lotuswordpro/source/filter/lwpfribptr.cxx |   41 +-
 lotuswordpro/source/filter/lwppara.cxx|   74 ++
 lotuswordpro/source/filter/lwppara.hxx|2 
 6 files changed, 56 insertions(+), 92 deletions(-)

New commits:
commit 3a3c54659876aa07be1e38bce5d7f54d343f228a
Author: Caolán McNamara 
Date:   Mon Feb 12 08:58:30 2018 +

potential leaks

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

diff --git a/lotuswordpro/source/filter/lwpdoc.cxx 
b/lotuswordpro/source/filter/lwpdoc.cxx
index 779a98a31855..cd86f4bf6819 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -72,20 +72,16 @@
 
 LwpDocument::LwpDocument(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
 : LwpDLNFPVList(objHdr, pStrm)
-, m_pOwnedFoundry(nullptr)
 , m_bGettingFirstDivisionWithContentsThatIsNotOLE(false)
 , m_bGettingPreviousDivisionWithContents(false)
 , m_bGettingGetLastDivisionWithContents(false)
 , m_nFlags(0)
 , m_nPersistentFlags(0)
-, m_pLnOpts(nullptr)
 {
 }
 
 LwpDocument::~LwpDocument()
 {
-delete m_pLnOpts;
-delete m_pOwnedFoundry;
 }
 /**
  * @descr   Read VO_Document from object stream
@@ -104,7 +100,7 @@ void LwpDocument::Read()
 LwpUIDocument aUIDoc( m_pObjStrm.get() );
 }
 
-m_pLnOpts = new LwpLineNumberOptions(m_pObjStrm.get());
+m_xLnOpts.reset(new LwpLineNumberOptions(m_pObjStrm.get()));
 
 //Skip LwpUserDictFiles
 {
@@ -117,7 +113,8 @@ void LwpDocument::Read()
 LwpPrinterInfo aPrtInfo( m_pObjStrm.get() );
 }
 
-m_pFoundry = m_pOwnedFoundry = new LwpFoundry(m_pObjStrm.get(), this);
+m_xOwnedFoundry.reset(new LwpFoundry(m_pObjStrm.get(), this));
+m_pFoundry = m_xOwnedFoundry.get();
 
 m_DivOpts.ReadIndexed(m_pObjStrm.get());
 
@@ -348,9 +345,9 @@ void LwpDocument::RegisterGraphicsStyles()
  */
 void LwpDocument::RegisterLinenumberStyles()
 {
-if (!m_pLnOpts)
+if (!m_xLnOpts)
 return;
-m_pLnOpts->RegisterStyle();
+m_xLnOpts->RegisterStyle();
 }
 
 /**
diff --git a/lotuswordpro/source/filter/lwpdoc.hxx 
b/lotuswordpro/source/filter/lwpdoc.hxx
index e8551dcd466e..a2537a5abe2f 100644
--- a/lotuswordpro/source/filter/lwpdoc.hxx
+++ b/lotuswordpro/source/filter/lwpdoc.hxx
@@ -83,7 +83,7 @@ public:
 virtual ~LwpDocument() override;
 
 private:
-LwpFoundry* m_pOwnedFoundry;
+std::unique_ptr m_xOwnedFoundry;
 bool m_bGettingFirstDivisionWithContentsThatIsNotOLE;
 bool m_bGettingPreviousDivisionWithContents;
 bool m_bGettingGetLastDivisionWithContents;
@@ -98,13 +98,7 @@ private:
 DOC_CHILDDOC =  0x0800UL
 };
 
-//Code cleaning by change some members to local variables in Read()
-//Reserve the comments for future use
-//LwpSortOption* m_pDocSort;
-//LwpUIDocument* m_pUIDoc;
-LwpLineNumberOptions* m_pLnOpts;
-//LwpUserDictFiles* m_pUsrDicts;
-//LwpPrinterInfo* m_pPrtInfo;
+std::unique_ptr m_xLnOpts;
 
 LwpObjectID m_DivOpts;
 LwpObjectID m_FootnoteOpts;
diff --git a/lotuswordpro/source/filter/lwpframelayout.cxx 
b/lotuswordpro/source/filter/lwpframelayout.cxx
index df851fd8d4f2..ab51c1527d6c 100644
--- a/lotuswordpro/source/filter/lwpframelayout.cxx
+++ b/lotuswordpro/source/filter/lwpframelayout.cxx
@@ -1242,7 +1242,7 @@ void LwpRubyLayout::RegisterStyle()
 if (!pMarker)
 throw std::runtime_error("missing Ruby Marker");
 
-XFRubyStyle* pRubyStyle = new XFRubyStyle;
+std::unique_ptr xRubyStyle(new XFRubyStyle);
 
 enumXFRubyPosition eType = enumXFRubyLeft;
 if (m_nAlignment == LEFT)
@@ -1257,7 +1257,7 @@ void LwpRubyLayout::RegisterStyle()
 {
 eType =  enumXFRubyCenter;
 }
-pRubyStyle->SetAlignment(eType);
+xRubyStyle->SetAlignment(eType);
 
 eType = enumXFRubyTop;
 if (m_nPlacement == TOP)
@@ -1268,10 +1268,10 @@ void LwpRubyLayout::RegisterStyle()
 {
 eType =  enumXFRubyBottom;
 }
-pRubyStyle->SetPosition(eType);
+xRubyStyle->SetPosition(eType);
 
 XFStyleManager* pXFStyleManager = 
LwpGlobalMgr::GetInstance()->GetXFStyleManager();
-OUString rubyStyle = 
pXFStyleManager->AddStyle(pRubyStyle).m_pStyle->GetStyleName();
+OUString rubyStyle = 
pXFStyleManager->AddStyle(xRubyStyle.release()).m_pStyle->GetStyleName();
 pMarker->SetRubyStyleName(rubyStyle);
 
 LwpStory* pStory = GetContentStory();
diff --git a/lotuswordpro/source/filter/lwpfribptr.cxx 
b/lotuswordpro/source/filter/lwpfribptr.cxx
index a899458bca4e..902727aef38c 100644
--- a/lotuswordpro/source/filter/lwpfribptr.cxx
+++ b/lotuswordpro/source

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwpdoc.cxx |   31 +++
 lotuswordpro/source/filter/lwpdoc.hxx |2 +-
 2 files changed, 16 insertions(+), 17 deletions(-)

New commits:
commit afe0b204d164f039b226f226263ff2b99337ac0e
Author: Caolán McNamara 
Date:   Mon Feb 12 09:12:59 2018 +

replace m_pFoundry with m_xOwnedFoundry

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

diff --git a/lotuswordpro/source/filter/lwpdoc.cxx 
b/lotuswordpro/source/filter/lwpdoc.cxx
index cd86f4bf6819..6bb3c94aedb5 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -114,7 +114,6 @@ void LwpDocument::Read()
 }
 
 m_xOwnedFoundry.reset(new LwpFoundry(m_pObjStrm.get(), this));
-m_pFoundry = m_xOwnedFoundry.get();
 
 m_DivOpts.ReadIndexed(m_pObjStrm.get());
 
@@ -229,8 +228,8 @@ void LwpDocument::RegisterStyle()
 void LwpDocument::RegisterTextStyles()
 {
 //Register all text styles: para styles, character styles
-LwpDLVListHeadHolder* pParaStyleHolder = m_pFoundry
-? 
dynamic_cast(m_pFoundry->GetTextStyleHead().obj().get())
+LwpDLVListHeadHolder* pParaStyleHolder = m_xOwnedFoundry
+? 
dynamic_cast(m_xOwnedFoundry->GetTextStyleHead().obj().get())
 : nullptr;
 if(pParaStyleHolder)
 {
@@ -239,7 +238,7 @@ void LwpDocument::RegisterTextStyles()
 {
 if (pParaStyle->GetFoundry())
 throw std::runtime_error("loop in register text style");
-pParaStyle->SetFoundry(m_pFoundry);
+pParaStyle->SetFoundry(m_xOwnedFoundry.get());
 pParaStyle->RegisterStyle();
 pParaStyle = 
dynamic_cast(pParaStyle->GetNext().obj().get());
 }
@@ -252,10 +251,10 @@ void LwpDocument::RegisterTextStyles()
  */
 void LwpDocument::RegisterLayoutStyles()
 {
-if (m_pFoundry)
+if (m_xOwnedFoundry)
 {
 //Register all layout styles, before register all styles in para
-m_pFoundry->RegisterAllLayouts();
+m_xOwnedFoundry->RegisterAllLayouts();
 }
 
 //set initial pagelayout in story for parsing pagelayout
@@ -282,8 +281,8 @@ void LwpDocument::RegisterLayoutStyles()
 void LwpDocument::RegisterStylesInPara()
 {
 //Register all automatic styles in para
-rtl::Reference xContent(m_pFoundry
-? dynamic_cast 
(m_pFoundry->GetContentManager().GetContentList().obj().get())
+rtl::Reference xContent(m_xOwnedFoundry
+? dynamic_cast 
(m_xOwnedFoundry->GetContentManager().GetContentList().obj().get())
 : nullptr);
 if (xContent.is())
 {
@@ -293,7 +292,7 @@ void LwpDocument::RegisterStylesInPara()
 {
 aSeen.insert(xStory.get());
 //Register the child para
-xStory->SetFoundry(m_pFoundry);
+xStory->SetFoundry(m_xOwnedFoundry.get());
 xStory->DoRegisterStyle();
 
xStory.set(dynamic_cast(xStory->GetNext().obj(VO_STORY).get()));
 if (aSeen.find(xStory.get()) != aSeen.end())
@@ -306,11 +305,11 @@ void LwpDocument::RegisterStylesInPara()
  */
 void LwpDocument::RegisterBulletStyles()
 {
-if (!m_pFoundry)
+if (!m_xOwnedFoundry)
 return;
 //Register bullet styles
 LwpDLVListHeadHolder* pBulletHead = dynamic_cast
-(m_pFoundry->GetBulletManagerID().obj(VO_HEADHOLDER).get());
+(m_xOwnedFoundry->GetBulletManagerID().obj(VO_HEADHOLDER).get());
 if (!pBulletHead)
 return;
 LwpSilverBullet* pBullet = dynamic_cast
@@ -319,7 +318,7 @@ void LwpDocument::RegisterBulletStyles()
 while (pBullet)
 {
 aSeen.insert(pBullet);
-pBullet->SetFoundry(m_pFoundry);
+pBullet->SetFoundry(m_xOwnedFoundry.get());
 pBullet->RegisterStyle();
 pBullet = dynamic_cast 
(pBullet->GetNext().obj().get());
 if (aSeen.find(pBullet) != aSeen.end())
@@ -331,13 +330,13 @@ void LwpDocument::RegisterBulletStyles()
  */
 void LwpDocument::RegisterGraphicsStyles()
 {
-if (!m_pFoundry)
+if (!m_xOwnedFoundry)
 return;
 //Register all graphics styles, the first object should register the next;
-rtl::Reference pGraphic = 
m_pFoundry->GetGraphicListHead().obj(VO_GRAPHIC);
+rtl::Reference pGraphic = 
m_xOwnedFoundry->GetGraphicListHead().obj(VO_GRAPHIC);
 if (!pGraphic.is())
 return;
-pGraphic->SetFoundry(m_pFoundry);
+pGraphic->SetFoundry(m_xOwnedFoundry.get());
 pGraphic->DoRegisterStyle();
 }
 /**
@@ -425,7 +424,7 @@ void LwpDocument::ParseDocContent(IXFStream* pOutputStream)
 //master document not supported now.
 return;
 }
-pLayoutObj->SetFoundry(m_pFoundry);
+pLayoutObj->SetFoundry(m_xOwnedFoundry.get());
 pLayoutObj->DoParse(pOutputStream);
 }
 
diff --git a/lotuswordpro/source/filter/lwpdoc.hxx 
b/lot

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

[Szymon Kłos]

 sd/source/filter/eppt/pptx-epptooxml.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ac97ca547de9593ff5f8e7615f1aa779a5091126
Author: Szymon Kłos 
Date:   Mon Feb 12 12:42:45 2018 +0100

Coverity: unused value

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

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 6bc8bd0416e5..ca5f9ef56c67 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -705,7 +705,6 @@ void PowerPointExport::WriteTransition(const FSHelperPtr& 
pFS)
 
 if (GETA(Change))
 mAny >>= changeType;
-bool isAdvanceTimingSet = advanceTiming != -1;
 
 // 1 means automatic, 2 half automatic - not sure what it means - at least 
I don't see it in UI
 if (changeType == 1 && GETA(Duration))
@@ -804,6 +803,7 @@ void PowerPointExport::WriteTransition(const FSHelperPtr& 
pFS)
 }
 }
 
+bool isAdvanceTimingSet = advanceTiming != -1;
 if (nTransition14 || pPresetTransition || isTransitionDurationSet)
 {
 const char* pRequiresNS = (nTransition14 || isTransitionDurationSet) ? 
"p14" : "p15";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Acceptance as a GSoC organization

[Markus Mohrhard]

Hey fellow hackers,

LibreOffice has been accepted for GSoC 2018. I will start inviting mentors
soon. Please update the GSoC ideas page and shout if you have not been
added until next Monday.

Keep in mind that now students will start to show up and we should make
sure to review their patches in time.

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

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

[Noel Grandin]

 include/vcl/BitmapTools.hxx   |4 ++--
 vcl/source/bitmap/BitmapTools.cxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 457204cfce253450283de1c96b9178f4d9246405
Author: Noel Grandin 
Date:   Mon Feb 12 15:31:18 2018 +0200

fix pixel address calculation in RawBitmap

Change-Id: I42476a8049330ff02c555ecba49b49f3cf012086
Reviewed-on: https://gerrit.libreoffice.org/49599
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/include/vcl/BitmapTools.hxx b/include/vcl/BitmapTools.hxx
index 6339994a285d..6dc88967526e 100644
--- a/include/vcl/BitmapTools.hxx
+++ b/include/vcl/BitmapTools.hxx
@@ -19,7 +19,7 @@ namespace vcl {
 namespace bitmap {
 
 /**
- * intended to be used to feed into CreateFromData to create a BitmapEx
+ * Intended to be used to feed into CreateFromData to create a BitmapEx. RGB 
data format.
  */
 class VCL_DLLPUBLIC RawBitmap
 {
@@ -34,7 +34,7 @@ public:
 }
 void SetPixel(long nY, long nX, BitmapColor nColor)
 {
-long p = nY * maSize.getWidth() + nX;
+long p = (nY * maSize.getWidth() + nX) * 3;
 mpData[ p++ ] = nColor.GetRed();
 mpData[ p++ ] = nColor.GetGreen();
 mpData[ p   ] = nColor.GetBlue();
diff --git a/vcl/source/bitmap/BitmapTools.cxx 
b/vcl/source/bitmap/BitmapTools.cxx
index 767b4de7e25a..5f3d1062275e 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -151,7 +151,7 @@ BitmapEx CreateFromData( RawBitmap&& rawBitmap )
 auto nWidth = rawBitmap.maSize.getWidth();
 for( long y = 0; y < nHeight; ++y )
 {
-sal_uInt8 const *p = rawBitmap.mpData.get() + y * nWidth;
+sal_uInt8 const *p = rawBitmap.mpData.get() + (y * nWidth * 3);
 Scanline pScanline = pWrite->GetScanline(y);
 for (long x = 0; x < nWidth; ++x)
 {
___
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' - 4 commits - cui/source include/svx include/vcl svx/source vcl/source

[Tamás Zolnai]

 cui/source/dialogs/sdrcelldlg.cxx |2 +
 cui/source/inc/cuitabarea.hxx |8 +++--
 cui/source/inc/sdrcelldlg.hxx |1 
 cui/source/tabpages/backgrnd.cxx  |   20 -
 cui/source/tabpages/tparea.cxx|1 
 cui/source/tabpages/tpcolor.cxx   |   46 +--
 include/svx/xtable.hxx|1 
 include/vcl/ctrl.hxx  |2 -
 include/vcl/window.hxx|2 -
 svx/source/xoutdev/xtabcolr.cxx   |   13 
 vcl/source/control/ctrl.cxx   |   18 
 vcl/source/window/paint.cxx   |   55 +-
 12 files changed, 91 insertions(+), 78 deletions(-)

New commits:
commit dc6b1c2329bb744fb5e8c33749dcff34553645da
Author: Tamás Zolnai 
Date:   Sat Feb 10 17:31:44 2018 +0100

lokdialog: Render non-pixel based preview windows

PaintToDevice() method was designed for pixel based windows,
now I added some scaling to handle different units.

Reviewed-on: https://gerrit.libreoffice.org/49543
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 
(cherry picked from commit d6a2dc03806c4e7c0be8e4f2aee272f036f4765e)
Signed-off-by: Andras Timar 

Change-Id: Id242c44101c1e842409ba3a9b13291e48bdd44ca

diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 54341c5e4039..d88e04823ed8 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -1229,7 +1229,7 @@ void Window::LogicInvalidate(const Rectangle* pRectangle)
 // Added for dialog items. Pass invalidation to the parent window.
 else if (VclPtr pParent = GetParentWithLOKNotifier())
 {
-const tools::Rectangle aRect(Point(GetOutOffXPixel(), 
GetOutOffYPixel()), Size(GetOutputWidthPixel(), GetOutputHeightPixel()));
+const Rectangle aRect(Point(GetOutOffXPixel(), GetOutOffYPixel()), 
Size(GetOutputWidthPixel(), GetOutputHeightPixel()));
 pParent->LogicInvalidate(&aRect);
 }
 }
@@ -1356,9 +1356,29 @@ void Window::ImplPaintToDevice( OutputDevice* 
i_pTargetOutDev, const Point& i_rP
 bool bOutput = IsOutputEnabled();
 EnableOutput();
 
+double fScaleX = 1;
+double fScaleY = 1;
+bool bNeedsScaling = false;
+if(comphelper::LibreOfficeKit::isActive())
+{
+if(GetMapMode().GetMapUnit() != MapUnit::MapPixel &&
+// Some of the preview windows (SvxPreviewBase) uses different 
painting (drawinglayer primitives)
+// For these preview we don't need to scale even tough the unit is not 
pixel.
+GetMapMode().GetMapUnit() != MapUnit::Map100thMM)
+{
+bNeedsScaling = true;
+// 1000.0 is used to reduce rounding imprecision (Size uses 
integers)
+Size aLogicSize = PixelToLogic(Size(1000.0, 1000.0));
+fScaleX = aLogicSize.Width() / 1000.0;
+fScaleY = aLogicSize.Height() / 1000.0;
+}
+}
+else
+{   // TODO: Above scaling was added for LOK only, would be good to check 
how it works in other use cases
 SAL_WARN_IF( GetMapMode().GetMapUnit() != MapUnit::MapPixel, "vcl", 
"MapMode must be PIXEL based" );
-if ( GetMapMode().GetMapUnit() != MapUnit::MapPixel )
-return;
+if ( GetMapMode().GetMapUnit() != MapUnit::MapPixel )
+return;
+}
 
 // preserve graphicsstate
 Push();
@@ -1408,7 +1428,17 @@ void Window::ImplPaintToDevice( OutputDevice* 
i_pTargetOutDev, const Point& i_rP
 SetRefPoint();
 SetLayoutMode( GetLayoutMode() );
 SetDigitLanguage( GetDigitLanguage() );
-Rectangle aPaintRect( Point( 0, 0 ), GetOutputSizePixel() );
+
+Rectangle aPaintRect;
+if(bNeedsScaling)
+{
+aPaintRect = Rectangle( Point( 0, 0 ),
+Size(GetOutputSizePixel().Width() * fScaleX, 
GetOutputSizePixel().Height() * fScaleY)  );
+}
+else
+{
+aPaintRect = Rectangle( Point( 0, 0 ), GetOutputSizePixel() );
+}
 aClipRegion.Intersect( aPaintRect );
 SetClipRegion( aClipRegion );
 
@@ -1416,7 +1446,11 @@ void Window::ImplPaintToDevice( OutputDevice* 
i_pTargetOutDev, const Point& i_rP
 
 // background
 if( ! IsPaintTransparent() && IsBackground() && ! (GetParentClipMode() & 
ParentClipMode::NoClip ) )
+{
 Erase(*this);
+if(bNeedsScaling)
+aMtf.Scale(fScaleX, fScaleY);
+}
 // foreground
 Paint(*this, aPaintRect);
 // put a pop action to metafile
@@ -1430,11 +1464,14 @@ void Window::ImplPaintToDevice( OutputDevice* 
i_pTargetOutDev, const Point& i_rP
 VclPtrInstance pMaskedDevice(*i_pTargetOutDev,
 DeviceFormat::DEFAULT,
 DeviceFormat::DEFAULT);
+
+if(bNeedsScaling)
+pMaskedDevice->SetMapMode( GetMapMode() );
 pMaskedDevice->SetOutputSizePixel( GetOutputSizePixel() );
 pMaskedDevice->EnableRTL( IsRTLEnabled() );
 aMtf.WindStart();
 aMtf.Play( 

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

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

New commits:
commit a3cd6c70af6979e4608b180f868313dbee548d5a
Author: Olivier Hallot 
Date:   Mon Feb 12 15:10:39 2018 -0200

Updated core
Project: help  1b361a83c014ff9c8c2b80bbe779387ef0a209f5

Better handling of user language in help online

Change-Id: I6a14081321cfd94fe1efb1f2b5fd23f20d4a27fc
Reviewed-on: https://gerrit.libreoffice.org/49613
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 145fe1d4c0d6..1b361a83c014 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 145fe1d4c0d697cd15619dd682c622d3c146d95f
+Subproject commit 1b361a83c014ff9c8c2b80bbe779387ef0a209f5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: help3xsl/index2.html

[Olivier Hallot]

 help3xsl/index2.html |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1b361a83c014ff9c8c2b80bbe779387ef0a209f5
Author: Olivier Hallot 
Date:   Mon Feb 12 15:10:39 2018 -0200

Better handling of user language in help online

Change-Id: I6a14081321cfd94fe1efb1f2b5fd23f20d4a27fc
Reviewed-on: https://gerrit.libreoffice.org/49613
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 

diff --git a/help3xsl/index2.html b/help3xsl/index2.html
index 58a17f627..43816853c 100644
--- a/help3xsl/index2.html
+++ b/help3xsl/index2.html
@@ -49,7 +49,8 @@
 window.open(newURL,'_self');
 }else{
 // URL came from elsewhere, direct access to webroot, we redirect to main 
Help page
-
window.open('en-US/text/shared/main0108.html?&DbPAR=WRITER&System=WIN','_self');
+var userLang = navigator.language || navigator.userLanguage;
+window.open(userLang + 
'/text/shared/main0108.html?&DbPAR=WRITER&System=WIN','_self');
 }
 
 
___
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-desktop' - 2 commits - cui/source include/svx svx/source

[Tamás Zolnai]

 cui/source/dialogs/sdrcelldlg.cxx |2 +
 cui/source/inc/cuitabarea.hxx |8 --
 cui/source/inc/sdrcelldlg.hxx |1 
 cui/source/tabpages/tparea.cxx|1 
 cui/source/tabpages/tpcolor.cxx   |   46 --
 include/svx/xtable.hxx|1 
 svx/source/xoutdev/xtabcolr.cxx   |   13 ++
 7 files changed, 42 insertions(+), 30 deletions(-)

New commits:
commit 54dc7b05c164f787eef0a03d8543af8f9f7647d5
Author: Tamás Zolnai 
Date:   Wed Feb 7 15:54:41 2018 +0100

tdf#115506: Crash when trying to set pattern fill for tables in Impress

Setting pattern list was missed in this specific dialog.

Change-Id: I9f47e9e0dd4f99bf5403c70685508b0f14a5bd61
Reviewed-on: https://gerrit.libreoffice.org/49361
Reviewed-by: Julien Nabet 
Tested-by: Jenkins 
(cherry picked from commit de8a1b4f6c8fcca9fc9cc5ad83c393ecd7292f76)
Signed-off-by: Andras Timar 

diff --git a/cui/source/dialogs/sdrcelldlg.cxx 
b/cui/source/dialogs/sdrcelldlg.cxx
index d6e9244cb738..160477c157b9 100644
--- a/cui/source/dialogs/sdrcelldlg.cxx
+++ b/cui/source/dialogs/sdrcelldlg.cxx
@@ -34,6 +34,7 @@ SvxFormatCellsDialog::SvxFormatCellsDialog( vcl::Window* 
pParent, const SfxItemS
 , mpGradientList(pModel->GetGradientList())
 , mpHatchingList(pModel->GetHatchList())
 , mpBitmapList(pModel->GetBitmapList())
+, mpPatternList(pModel->GetPatternList())
 , m_nAreaPageId(0)
 {
 AddTabPage("name", RID_SVXPAGE_CHAR_NAME);
@@ -51,6 +52,7 @@ void SvxFormatCellsDialog::PageCreated( sal_uInt16 nId, 
SfxTabPage &rPage )
 rAreaPage.SetGradientList( mpGradientList );
 rAreaPage.SetHatchingList( mpHatchingList );
 rAreaPage.SetBitmapList( mpBitmapList );
+rAreaPage.SetPatternList( mpPatternList );;
 rAreaPage.ActivatePage( mrOutAttrs );
 }
 else if (nId == m_nBorderPageId)
diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx
index f5939979b96d..6b41e69fc8b3 100644
--- a/cui/source/inc/sdrcelldlg.hxx
+++ b/cui/source/inc/sdrcelldlg.hxx
@@ -34,6 +34,7 @@ private:
 XGradientListRefmpGradientList;
 XHatchListRef   mpHatchingList;
 XBitmapListRef  mpBitmapList;
+XPatternListRef mpPatternList;
 
 sal_uInt16  m_nAreaPageId;
 sal_uInt16  m_nBorderPageId;
commit 15c51b17dbe120ddc84bff7f72c7873214ffdcce
Author: Katarina Behrens 
Date:   Thu Feb 16 22:29:10 2017 +0100

tdf#103224: Get the initial colour right

Change-Id: I59309f5b433eb7aa92d05ce7d373d69cb413b258
Reviewed-on: https://gerrit.libreoffice.org/34383
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 
(cherry picked from commit f35e6f2504384ad66b475d39849ed10987b2da53)
Signed-off-by: Andras Timar 

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index dd941f844e28..fd11015ad623 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -734,7 +734,6 @@ private:
 XColorListRef pColorList;
 
 ChangeType* pnColorListState;
-sal_Int32*  pPos;
 
 XFillStyleItem  aXFStyleItem;
 XFillColorItem  aXFillColorItem;
@@ -754,6 +753,7 @@ private:
 
 void ImpColorCountChanged();
 void FillPaletteLB();
+long FindColorInPalette(const OUString& rPaletteName) const;
 
 DECL_LINK( ClickAddHdl_Impl, Button*, void );
 DECL_LINK( ClickWorkOnHdl_Impl, Button*, void );
@@ -766,11 +766,14 @@ private:
 void SetColorModel(ColorModel eModel);
 void ChangeColorModel();
 void UpdateColorValues( bool bUpdatePreset = true );
-static sal_Int32 SearchColorList(OUString const & aColorName);
 DECL_LINK( ModifiedHdl_Impl, Edit&, void );
 
 void UpdateModified();
 css::uno::Reference< css::uno::XComponentContext > m_context;
+
+static sal_Int32 FindInCustomColors( OUString const & aColorName );
+sal_Int32 FindInPalette( const Color& rColor );
+
 public:
 SvxColorTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs );
 virtual ~SvxColorTabPage() override;
@@ -786,7 +789,6 @@ public:
 virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
 
 voidSetPropertyList( XPropertyListType t, const XPropertyListRef &xRef 
);
-voidSetPos( sal_Int32* pInPos ) { pPos = pInPos; }
 voidSetColorList( const XColorListRef& pColList );
 
 
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index f2a054df2e55..d2e358c21ef7 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -401,7 +401,6 @@ void SvxAreaTabPage::CreatePage( sal_Int32 nId, SfxTabPage* 
pTab )
 if(nId == SOLID )
 {
 static_cast(pTab)->SetColorList( m_pColorList );
-static_cast(pTab)->SetPos( &m_nPos );
 static_cast(pTab)->SetColorChgd( m_pnColorListState 
);
 static_cast(pTab)->Construct();
 static_cast(pTab)->ActivatePage( m_

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - include/oox offapi/com oox/source sd/qa sd/source

[Szymon Kłos]

 include/oox/ppt/slidetransition.hxx   |4 +++
 offapi/com/sun/star/presentation/DrawPage.idl |9 +-
 oox/source/ppt/slidetransition.cxx|   30 --
 oox/source/ppt/slidetransitioncontext.cxx |6 
 oox/source/token/properties.txt   |1 
 sd/qa/unit/data/pptx/tdf115394.pptx   |binary
 sd/qa/unit/import-tests.cxx   |   34 ++
 sd/source/ui/inc/unoprnms.hxx |1 
 sd/source/ui/unoidl/unopage.cxx   |2 -
 9 files changed, 76 insertions(+), 11 deletions(-)

New commits:
commit 6f05db5a19c0bd82b937e2c79f766bb35c60acc1
Author: Szymon Kłos 
Date:   Fri Feb 2 10:21:50 2018 +0100

tdf#115394 import custom slide transition time in PPTX

* custom values are imported correctly
* standard (fast, slow, medium) values are changed
  to match values in the MSO

Change-Id: I004242afbbf641fe414abc8df248a2844c104502
Reviewed-on: https://gerrit.libreoffice.org/49139
Tested-by: Jenkins 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/49521
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/include/oox/ppt/slidetransition.hxx 
b/include/oox/ppt/slidetransition.hxx
index 41df7b2f7948..e0383aaf154f 100644
--- a/include/oox/ppt/slidetransition.hxx
+++ b/include/oox/ppt/slidetransition.hxx
@@ -42,7 +42,10 @@ namespace oox { namespace ppt {
 void setSlideProperties( PropertyMap& props );
 void setTransitionFilterProperties( const css::uno::Reference< 
css::animations::XTransitionFilter > & xFilter );
 
+/// Set one of standard values for slide transition duration
 void setOoxTransitionSpeed( sal_Int32 nToken );
+/// Set slide transition time directly
+void setOoxTransitionSpeed( double fDuration );
 void setMode( bool bMode )
 { mbMode = bMode; }
 void setOoxAdvanceTime( sal_Int32 nAdvanceTime )
@@ -66,6 +69,7 @@ namespace oox { namespace ppt {
 bool  mbTransitionDirectionNormal;
 ::sal_Int16 mnAnimationSpeed;
 ::sal_Int32 mnFadeColor;
+double mfTransitionDurationInSeconds;
 bool  mbMode; /**< 
http://api.libreoffice.org/docs/common/ref/com/sun/star/animations/XTransitionFilter.html
 Mode property */
 ::sal_Int32 mnAdvanceTime;
 };
diff --git a/offapi/com/sun/star/presentation/DrawPage.idl 
b/offapi/com/sun/star/presentation/DrawPage.idl
index 18e499e81420..0e070470ad25 100644
--- a/offapi/com/sun/star/presentation/DrawPage.idl
+++ b/offapi/com/sun/star/presentation/DrawPage.idl
@@ -79,11 +79,11 @@ published service DrawPage
 [property] short Layout;
 
 
-/** defines the speed of the fade-in effect of this page.
+/** Defines the speed of the fade-in effect of this page.
+@see TransitionSpeed
  */
 [property] com::sun::star::presentation::AnimationSpeed Speed;
 
-
 /** defines if a header presentation shape from the master page is visible
 on this page.
 */
@@ -142,6 +142,11 @@ published service DrawPage
 */
 [optional, property] long DateTimeFormat;
 
+/** Specifies slide transition time in seconds.
+@since LibreOffice 6.1
+@see Speed
+ */
+[property, optional] double TransitionDuration;
 };
 
 
diff --git a/oox/source/ppt/slidetransition.cxx 
b/oox/source/ppt/slidetransition.cxx
index 9ae715fa49c0..dc2dbf923b67 100644
--- a/oox/source/ppt/slidetransition.cxx
+++ b/oox/source/ppt/slidetransition.cxx
@@ -47,6 +47,7 @@ namespace oox { namespace ppt {
 , mbTransitionDirectionNormal( true )
 , mnAnimationSpeed( AnimationSpeed_FAST )
 , mnFadeColor( 0 )
+, mfTransitionDurationInSeconds( -1.0 )
 , mbMode( true )
 , mnAdvanceTime( -1 )
 {
@@ -59,6 +60,7 @@ namespace oox { namespace ppt {
 , mbTransitionDirectionNormal( true )
 , mnAnimationSpeed( AnimationSpeed_FAST )
 , mnFadeColor( 0 )
+, mfTransitionDurationInSeconds( -1.0 )
 , mbMode( true )
 , mnAdvanceTime( -1 )
 {
@@ -79,11 +81,13 @@ namespace oox { namespace ppt {
 aProps.setProperty( PROP_TransitionSubtype, mnTransitionSubType);
 aProps.setProperty( PROP_TransitionDirection, 
mbTransitionDirectionNormal);
 aProps.setProperty( PROP_Speed, mnAnimationSpeed);
+if( mfTransitionDurationInSeconds >= 0.0 )
+aProps.setProperty( PROP_TransitionDuration, 
mfTransitionDurationInSeconds);
 aProps.setProperty( PROP_TransitionFadeColor, mnFadeColor);
-if( mnAdvanceTime != -1 ) {
-aProps.setProperty( PROP_Duration, mnAdvanceTime/1000);
-aProps.setProperty( PROP_Change, static_cast(1));
-}
+if( mnAdvanceTime != -1 ) {
+aProps.setProperty( PROP_Duration, mnAdvanceTime/1000);
+aProps.setProperty( PROP_Change

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

[László Németh]

 extras/source/autocorr/lang/hu/DocumentList.xml |   27 
 1 file changed, 27 insertions(+)

New commits:
commit 8edb74677050ca96fa189b0c27484ba0cd89b37c
Author: László Németh 
Date:   Thu Feb 1 16:54:14 2018 +0100

tdf#115382 Hungarian autocorrect: help apostrophe usage

Reviewed-on: https://gerrit.libreoffice.org/49111
Tested-by: Jenkins 
Reviewed-by: László Németh 
(cherry-picked from 0d0c13bfbdff85a18433aee6e94558689f0cb722)

Change-Id: I1d3368c9acb7ddc90d84bde6db9940b76c3ad8d8
Reviewed-on: https://gerrit.libreoffice.org/49410
Tested-by: Jenkins 
Reviewed-by: László Németh 
Tested-by: László Németh 
Reviewed-by: Andras Timar 

diff --git a/extras/source/autocorr/lang/hu/DocumentList.xml 
b/extras/source/autocorr/lang/hu/DocumentList.xml
index cabf78bf3f67..0ba8796a563c 100644
--- a/extras/source/autocorr/lang/hu/DocumentList.xml
+++ b/extras/source/autocorr/lang/hu/DocumentList.xml
@@ -14,6 +14,15 @@
   
   
   
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
   
   
@@ -28,6 +37,8 @@
   
   
   
+  
+  
   
   
   
@@ -76,6 +87,10 @@
   
   
   
+  
+  
+  
+  
   
   
   
@@ -211,6 +226,12 @@
   
   
   
+  
+  
+  
+  
+  
+  
   
   
   
@@ -350,6 +371,8 @@
   
   
   
+  
+  
   
   
   
@@ -479,6 +502,8 @@
   
   
   
+  
+  
   
   
   
@@ -511,6 +536,8 @@
   
   
   
+  
+  
   
   
   
___
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' - extras/source

[László Németh]

 extras/source/autocorr/lang/hu/DocumentList.xml |   27 
 1 file changed, 27 insertions(+)

New commits:
commit 858a82c32ffabdf202c2798d16a6322cfb36b13a
Author: László Németh 
Date:   Thu Feb 1 16:54:14 2018 +0100

tdf#115382 Hungarian autocorrect: help apostrophe usage

Reviewed-on: https://gerrit.libreoffice.org/49111
Tested-by: Jenkins 
Reviewed-by: László Németh 
(cherry-picked from 0d0c13bfbdff85a18433aee6e94558689f0cb722)

Change-Id: I1d3368c9acb7ddc90d84bde6db9940b76c3ad8d8
Reviewed-on: https://gerrit.libreoffice.org/49411
Tested-by: Jenkins 
Reviewed-by: László Németh 
Tested-by: László Németh 
Reviewed-by: Andras Timar 

diff --git a/extras/source/autocorr/lang/hu/DocumentList.xml 
b/extras/source/autocorr/lang/hu/DocumentList.xml
index cabf78bf3f67..0ba8796a563c 100644
--- a/extras/source/autocorr/lang/hu/DocumentList.xml
+++ b/extras/source/autocorr/lang/hu/DocumentList.xml
@@ -14,6 +14,15 @@
   
   
   
+  
+  
+  
+  
+  
+  
+  
+  
+  
   
   
   
@@ -28,6 +37,8 @@
   
   
   
+  
+  
   
   
   
@@ -76,6 +87,10 @@
   
   
   
+  
+  
+  
+  
   
   
   
@@ -211,6 +226,12 @@
   
   
   
+  
+  
+  
+  
+  
+  
   
   
   
@@ -350,6 +371,8 @@
   
   
   
+  
+  
   
   
   
@@ -479,6 +502,8 @@
   
   
   
+  
+  
   
   
   
@@ -511,6 +536,8 @@
   
   
   
+  
+  
   
   
   
___
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' - include/svx svx/source

[Julien Nabet]

 include/svx/strings.hrc   |1 +
 svx/source/dialog/imapdlg.cxx |3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 714ceda6db9dbe8e2b4911872dfba146e9faa68f
Author: Julien Nabet 
Date:   Sat Feb 10 20:32:34 2018 +0100

tdf#115601: make ImageMap dialog translatable

Change-Id: Ie1ecb5cd3356144c28de366dbe5e13a3997604e2
Reviewed-on: https://gerrit.libreoffice.org/49547
(cherry picked from commit 6bcd433fe13ab402d2cc8433d98a78db140858e9)
Reviewed-on: https://gerrit.libreoffice.org/49582
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index a528db2322c1..2f09ea00f289 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -849,6 +849,7 @@
 #define RID_SVXSTR_DASH10   
NC_("RID_SVXSTR_DASH10", "Dashed")
 #define RID_SVXSTR_DASH11   
NC_("RID_SVXSTR_DASH11", "Dashed")
 #define RID_SVXSTR_DASH12   
NC_("RID_SVXSTR_DASH12", "Line Style")
+#define RID_SVXSTR_IMAP_ALL_FILTER  
NC_("RID_SVXSTR_IMAP_ALL_FILTER", "All formats")
 #define RID_SVXSTR_LEND0
NC_("RID_SVXSTR_LEND0", "Arrow concave")
 #define RID_SVXSTR_LEND1
NC_("RID_SVXSTR_LEND1", "Square 45")
 #define RID_SVXSTR_LEND2
NC_("RID_SVXSTR_LEND2", "Small arrow")
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index a8792b246d04..8972b9155282 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -56,7 +56,6 @@
 #include 
 
 #define SELF_TARGET "_self"
-#define IMAP_ALL_FILTER OUString("")
 #define IMAP_CERN_FILTER"MAP - CERN"
 #define IMAP_NCSA_FILTER"MAP - NCSA"
 #define IMAP_BINARY_FILTER  "SIP - StarView ImageMap"
@@ -452,7 +451,7 @@ void SvxIMapDlg::DoOpen()
 FileDialogFlags::NONE, this);
 
 ImageMapaLoadIMap;
-const OUString  aFilter( IMAP_ALL_FILTER );
+const OUString  aFilter(SvxResId(RID_SVXSTR_IMAP_ALL_FILTER));
 
 aDlg.AddFilter( aFilter, IMAP_ALL_TYPE );
 aDlg.AddFilter( IMAP_CERN_FILTER, IMAP_CERN_TYPE );
___
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' - sd/qa sd/source

[Szymon Kłos]

 sd/qa/unit/data/ppt/tdf115394.ppt |binary
 sd/qa/unit/export-tests.cxx   |   39 ++
 sd/qa/unit/import-tests.cxx   |   25 
 sd/source/filter/eppt/eppt.cxx|   26 ++---
 sd/source/filter/ppt/pptin.cxx|6 ++---
 5 files changed, 90 insertions(+), 6 deletions(-)

New commits:
commit d7763fb35f7556acffa5543f7b2a8eda47862fd1
Author: Szymon Kłos 
Date:   Wed Feb 7 12:22:52 2018 +0100

tdf#115394 export correct slide transition time in PPT

Change-Id: Ie293dd4cc128c256e39d54fdcd83bb5e13484662
Reviewed-on: https://gerrit.libreoffice.org/49345
Tested-by: Jenkins 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/49523
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sd/qa/unit/data/ppt/tdf115394.ppt 
b/sd/qa/unit/data/ppt/tdf115394.ppt
new file mode 100644
index ..1fd299a5e4be
Binary files /dev/null and b/sd/qa/unit/data/ppt/tdf115394.ppt differ
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index f42673006e82..a1f067287de5 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -95,6 +95,7 @@ public:
 void testEmbeddedPdf();
 void testTdf100926();
 void testTextRotation();
+void testTdf115394PPT();
 
 CPPUNIT_TEST_SUITE(SdExportTest);
 
@@ -112,6 +113,7 @@ public:
 CPPUNIT_TEST(testEmbeddedPdf);
 CPPUNIT_TEST(testTdf100926);
 CPPUNIT_TEST(testTextRotation);
+CPPUNIT_TEST(testTdf115394PPT);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -708,6 +710,43 @@ void SdExportTest::testTextRotation()
 xDocShRef->DoClose();
 }
 
+void SdExportTest::testTdf115394PPT()
+{
+sd::DrawDocShellRef xDocShRef = 
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/ppt/tdf115394.ppt"), PPT);
+
+// Export the document and import again for a check
+uno::Reference< lang::XComponent > xComponent(xDocShRef->GetModel(), 
uno::UNO_QUERY);
+uno::Reference xStorable(xComponent, uno::UNO_QUERY);
+utl::MediaDescriptor aMediaDescriptor;
+aMediaDescriptor["FilterName"] <<= 
OStringToOUString(OString(aFileFormats[PPT].pFilterName), 
RTL_TEXTENCODING_UTF8);
+
+utl::TempFile aTempFile;
+aTempFile.EnableKillingFile();
+xStorable->storeToURL(aTempFile.GetURL(), 
aMediaDescriptor.getAsConstPropertyValueList());
+xComponent.set(xStorable, uno::UNO_QUERY);
+xComponent->dispose();
+xDocShRef = loadURL(aTempFile.GetURL(), PPT);
+
+double fTransitionDuration;
+
+// Fast
+SdPage* pPage1 = xDocShRef->GetDoc()->GetSdPage(0, PageKind::Standard);
+fTransitionDuration = pPage1->getTransitionDuration();
+CPPUNIT_ASSERT_EQUAL(0.5, fTransitionDuration);
+
+// Medium
+SdPage* pPage2 = xDocShRef->GetDoc()->GetSdPage(1, PageKind::Standard);
+fTransitionDuration = pPage2->getTransitionDuration();
+CPPUNIT_ASSERT_EQUAL(0.75, fTransitionDuration);
+
+// Slow
+SdPage* pPage3 = xDocShRef->GetDoc()->GetSdPage(2, PageKind::Standard);
+fTransitionDuration = pPage3->getTransitionDuration();
+CPPUNIT_ASSERT_EQUAL(1.0, fTransitionDuration);
+
+xDocShRef->DoClose();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdExportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 187d678a2958..0796cebbaef0 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -151,6 +151,7 @@ public:
 void testActiveXCheckbox();
 void testTdf108926();
 void testTdf115394();
+void testTdf115394PPT();
 
 bool checkPattern(sd::DrawDocShellRef& rDocRef, int nShapeNumber, 
std::vector& rExpected);
 void testPatternImport();
@@ -221,6 +222,7 @@ public:
 CPPUNIT_TEST(testActiveXCheckbox);
 CPPUNIT_TEST(testTdf108926);
 CPPUNIT_TEST(testTdf115394);
+CPPUNIT_TEST(testTdf115394PPT);
 
 CPPUNIT_TEST_SUITE_END();
 };
@@ -2293,6 +2295,29 @@ void SdImportTest::testTdf115394()
 xDocShRef->DoClose();
 }
 
+void SdImportTest::testTdf115394PPT()
+{
+sd::DrawDocShellRef xDocShRef = 
loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/ppt/tdf115394.ppt"), PPT);
+double fTransitionDuration;
+
+// Fast
+SdPage* pPage1 = xDocShRef->GetDoc()->GetSdPage(0, PageKind::Standard);
+fTransitionDuration = pPage1->getTransitionDuration();
+CPPUNIT_ASSERT_EQUAL(0.5, fTransitionDuration);
+
+// Medium
+SdPage* pPage2 = xDocShRef->GetDoc()->GetSdPage(1, PageKind::Standard);
+fTransitionDuration = pPage2->getTransitionDuration();
+CPPUNIT_ASSERT_EQUAL(0.75, fTransitionDuration);
+
+// Slow
+SdPage* pPage3 = xDocShRef->GetDoc()->GetSdPage(2, PageKind::Standard);
+fTransitionDuration = pPage3->getTransitionDuration();
+CPPUNIT_ASSERT_EQUAL(1.0, fTransitionDuration);
+
+xDocShRef->DoClose();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sd/source/filter/

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - wsd/Storage.cpp

[Michael Meeks]

 wsd/Storage.cpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9168b2b73baca261ee246bddb2d3060531c65fed
Author: Michael Meeks 
Date:   Thu Feb 1 12:49:28 2018 +

Helpful error on non-matched WOPI host.

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

diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index eb158526..0d4aacb6 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -222,7 +222,7 @@ std::unique_ptr StorageBase::create(const 
Poco::URI& uri, const std
 {
 return std::unique_ptr(new WopiStorage(uri, jailRoot, 
jailPath));
 }
-
+LOG_ERR("No acceptable WOPI hosts found matching the target host [" << 
targetHost << "] in config.");
 throw UnauthorizedRequestException("No acceptable WOPI hosts found 
matching the target host [" + targetHost + "] in config.");
 }
 
___
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' - sd/qa sd/source

[Szymon Kłos]

 sd/qa/unit/export-tests-ooxml2.cxx   |   36 +++
 sd/source/filter/eppt/pptx-epptooxml.cxx |  151 ++-
 2 files changed, 146 insertions(+), 41 deletions(-)

New commits:
commit 67ad5a0d25f12ddb5cc95f7226601f54a1074696
Author: Szymon Kłos 
Date:   Mon Feb 5 12:41:58 2018 +0100

tdf#115394 export custom transition time in PPTX

Change-Id: Ib8f4cef713895029dc18f68a07baa4b65e4260c0
Reviewed-on: https://gerrit.libreoffice.org/49245
Tested-by: Jenkins 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/49522
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sd/qa/unit/export-tests-ooxml2.cxx 
b/sd/qa/unit/export-tests-ooxml2.cxx
index 3d1ad4f28b78..59d1d0e7f424 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -125,6 +125,7 @@ public:
 void testGroupsRotatedPosition();
 void testAccentColor();
 void testTdf114848();
+void testTdf115394();
 
 CPPUNIT_TEST_SUITE(SdOOXMLExportTest2);
 
@@ -171,6 +172,7 @@ public:
 CPPUNIT_TEST(testGroupsRotatedPosition);
 CPPUNIT_TEST(testAccentColor);
 CPPUNIT_TEST(testTdf114848);
+CPPUNIT_TEST(testTdf115394);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -1130,6 +1132,40 @@ void SdOOXMLExportTest2::testGroupRotation()
 assertXPath(pXmlDocContent, 
"/p:sld/p:cSld/p:spTree/p:grpSp/p:sp[2]/p:spPr/a:xfrm", "rot", "2040");
 }
 
+void SdOOXMLExportTest2::testTdf115394()
+{
+sd::DrawDocShellRef xDocShRef = 
loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf115394.pptx"), 
PPTX);
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+double fTransitionDuration;
+
+// Slow in MS formats
+SdPage* pPage1 = xDocShRef->GetDoc()->GetSdPage(0, PageKind::Standard);
+fTransitionDuration = pPage1->getTransitionDuration();
+CPPUNIT_ASSERT_EQUAL(1.0, fTransitionDuration);
+
+// Medium in MS formats
+SdPage* pPage2 = xDocShRef->GetDoc()->GetSdPage(1, PageKind::Standard);
+fTransitionDuration = pPage2->getTransitionDuration();
+CPPUNIT_ASSERT_EQUAL(0.75, fTransitionDuration);
+
+// Fast in MS formats
+SdPage* pPage3 = xDocShRef->GetDoc()->GetSdPage(2, PageKind::Standard);
+fTransitionDuration = pPage3->getTransitionDuration();
+CPPUNIT_ASSERT_EQUAL(0.5, fTransitionDuration);
+
+// Custom values
+SdPage* pPage4 = xDocShRef->GetDoc()->GetSdPage(3, PageKind::Standard);
+fTransitionDuration = pPage4->getTransitionDuration();
+CPPUNIT_ASSERT_EQUAL(0.25, fTransitionDuration);
+
+SdPage* pPage5 = xDocShRef->GetDoc()->GetSdPage(4, PageKind::Standard);
+fTransitionDuration = pPage5->getTransitionDuration();
+CPPUNIT_ASSERT_EQUAL(4.25, fTransitionDuration);
+
+xDocShRef->DoClose();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest2);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index f61d7017382e..07c290895970 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -643,7 +643,43 @@ void PowerPointExport::WriteTransition( const FSHelperPtr& 
pFS )
 sal_Int32 advanceTiming = -1;
 sal_Int32 changeType = 0;
 
-if( GETA( Speed ) ) {
+sal_Int32 nTransitionDuration = -1;
+bool isTransitionDurationSet = false;
+
+// try to use TransitionDuration instead of old Speed property
+if (GETA(TransitionDuration))
+{
+double fTransitionDuration = -1.0;
+mAny >>= fTransitionDuration;
+if (fTransitionDuration >= 0)
+{
+nTransitionDuration = fTransitionDuration * 1000.0;
+
+// override values because in MS formats meaning of 
fast/medium/slow is different
+if (nTransitionDuration <= 500)
+{
+// fast is default
+speed = nullptr;
+}
+else if (nTransitionDuration >= 1000)
+{
+speed = "slow";
+}
+else
+{
+speed = "med";
+}
+
+bool isStandardValue = nTransitionDuration == 500
+|| nTransitionDuration == 750
+|| nTransitionDuration == 1000;
+
+if(!isStandardValue)
+isTransitionDurationSet = true;
+}
+}
+else if (GETA(Speed))
+{
 mAny >>= animationSpeed;
 
 switch( animationSpeed ) {
@@ -666,45 +702,6 @@ void PowerPointExport::WriteTransition( const FSHelperPtr& 
pFS )
 if( changeType == 1 && GETA( Duration ) )
 mAny >>= advanceTiming;
 
-if (nTransition14 || pPresetTransition)
-{
-const char* pRequiresNS = nTransition14 ? "p14" : "p15";
-
-pFS->startElement(FSNS(XML_mc, XML_AlternateContent), FSEND);
-pFS->startElement(FSNS(XML_mc, XML_Choice), XML_Requires, pRequiresNS, 
FSEND)

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

[Szymon Kłos]

 include/oox/ppt/slidetransitioncontext.hxx |1 +
 oox/source/ppt/slidetransitioncontext.cxx  |9 -
 sd/qa/unit/data/pptx/tdf115394-zero.pptx   |binary
 sd/qa/unit/export-tests-ooxml2.cxx |   16 
 sd/source/filter/eppt/pptx-epptooxml.cxx   |   10 +-
 5 files changed, 30 insertions(+), 6 deletions(-)

New commits:
commit d55a5e99a6a6ca8f9cc39f49ee398906e962f213
Author: Szymon Kłos 
Date:   Thu Feb 8 23:21:38 2018 +0100

tdf#115394 correct transition in case of 0s

Change-Id: I23d18acef0bd5db4a4ad6fc67d409e7ed5c93949
Reviewed-on: https://gerrit.libreoffice.org/49462
Tested-by: Jenkins 
Reviewed-by: Szymon Kłos 
Reviewed-on: https://gerrit.libreoffice.org/49524
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/include/oox/ppt/slidetransitioncontext.hxx 
b/include/oox/ppt/slidetransitioncontext.hxx
index 4edaa3fcae9f..54b8d89ffb9b 100644
--- a/include/oox/ppt/slidetransitioncontext.hxx
+++ b/include/oox/ppt/slidetransitioncontext.hxx
@@ -47,6 +47,7 @@ namespace oox { namespace ppt {
 private:
 PropertyMap&maSlideProperties;
 boolmbHasTransition;
+boolmbHasTransitionDuration;
 SlideTransition maTransition;
 };
 
diff --git a/oox/source/ppt/slidetransitioncontext.cxx 
b/oox/source/ppt/slidetransitioncontext.cxx
index bed6060d4d4a..bc2a56845b54 100644
--- a/oox/source/ppt/slidetransitioncontext.cxx
+++ b/oox/source/ppt/slidetransitioncontext.cxx
@@ -47,6 +47,7 @@ SlideTransitionContext::SlideTransitionContext( 
FragmentHandler2& rParent, const
 : FragmentHandler2( rParent )
 , maSlideProperties( aProperties )
 , mbHasTransition( false )
+, mbHasTransitionDuration( false )
 {
 // ST_TransitionSpeed
 maTransition.setOoxTransitionSpeed( rAttribs.getToken( XML_spd, XML_fast ) 
);
@@ -54,7 +55,13 @@ SlideTransitionContext::SlideTransitionContext( 
FragmentHandler2& rParent, const
 // p14:dur
 sal_Int32 nDurationInMs = rAttribs.getInteger( P14_TOKEN( dur ), -1 );
 if( nDurationInMs > -1 )
+{
+// In MSO 0 is visible as 0.01s
+if( nDurationInMs == 0.0 )
+nDurationInMs = 10;
 maTransition.setOoxTransitionSpeed( nDurationInMs / 1000.0 );
+mbHasTransitionDuration = true;
+}
 
 // TODO
 rAttribs.getBool( XML_advClick, true );
@@ -182,7 +189,7 @@ void SlideTransitionContext::onEndElement()
 {
 if( isCurrentElement(PPT_TOKEN( transition )) )
 {
-if( mbHasTransition )
+if( mbHasTransition || mbHasTransitionDuration )
 {
 maTransition.setSlideProperties( maSlideProperties );
 mbHasTransition = false;
diff --git a/sd/qa/unit/data/pptx/tdf115394-zero.pptx 
b/sd/qa/unit/data/pptx/tdf115394-zero.pptx
new file mode 100644
index ..e8fb0cfa240c
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf115394-zero.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx 
b/sd/qa/unit/export-tests-ooxml2.cxx
index 59d1d0e7f424..80518487b96a 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -126,6 +126,7 @@ public:
 void testAccentColor();
 void testTdf114848();
 void testTdf115394();
+void testTdf115394Zero();
 
 CPPUNIT_TEST_SUITE(SdOOXMLExportTest2);
 
@@ -173,6 +174,7 @@ public:
 CPPUNIT_TEST(testAccentColor);
 CPPUNIT_TEST(testTdf114848);
 CPPUNIT_TEST(testTdf115394);
+CPPUNIT_TEST(testTdf115394Zero);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -1166,6 +1168,20 @@ void SdOOXMLExportTest2::testTdf115394()
 xDocShRef->DoClose();
 }
 
+void SdOOXMLExportTest2::testTdf115394Zero()
+{
+sd::DrawDocShellRef xDocShRef = 
loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/tdf115394-zero.pptx"),
 PPTX);
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+double fTransitionDuration;
+
+SdPage* pPage = xDocShRef->GetDoc()->GetSdPage(0, PageKind::Standard);
+fTransitionDuration = pPage->getTransitionDuration();
+CPPUNIT_ASSERT_EQUAL(0.01, fTransitionDuration);
+
+xDocShRef->DoClose();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest2);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx 
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 07c290895970..9d6f3066b7e9 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -634,10 +634,6 @@ void PowerPointExport::WriteTransition( const FSHelperPtr& 
pFS )
 }
 }
 
-// check if we resolved what transition to export
-if (!nPPTTransitionType && !bOOXmlSpecificTransition)
-return;
-
 AnimationSpeed animationSpeed = AnimationSpeed_MEDIUM;
 const char* speed = nullptr;
 sal_Int32 advanceTiming = -1;
@@ -695,7 +691,11 @@ void PowerPointExport::WriteTransition( const 

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - 2 commits - chart2/inc chart2/qa chart2/source offapi/com offapi/UnoApi_offapi.mk oox/inc oox/source sd/qa sw/qa sw/source writerfilt

[Szymon Kłos]

 chart2/inc/unonames.hxx  |1 
 chart2/qa/extras/chart2export.cxx|  159 +++
 chart2/qa/extras/chart2import.cxx|  154 ++
 chart2/qa/extras/data/pptx/tdf115107-2.pptx  |binary
 chart2/qa/extras/data/pptx/tdf115107.pptx|binary
 chart2/source/chartcore.component|1 
 chart2/source/model/main/DataPointProperties.cxx |   12 
 chart2/source/model/main/DataPointProperties.hxx |3 
 chart2/source/model/main/FormattedString.cxx |   44 +++
 chart2/source/model/main/FormattedString.hxx |   19 +
 chart2/source/view/charttypes/VSeriesPlotter.cxx |  126 +++-
 chart2/source/view/inc/AbstractShapeFactory.hxx  |7 
 chart2/source/view/inc/OpenglShapeFactory.hxx|7 
 chart2/source/view/inc/ShapeFactory.hxx  |7 
 chart2/source/view/inc/VSeriesPlotter.hxx|2 
 chart2/source/view/main/OpenglShapeFactory.cxx   |   12 
 chart2/source/view/main/ShapeFactory.cxx |   94 ++
 offapi/UnoApi_offapi.mk  |3 
 offapi/com/sun/star/chart2/DataPointCustomLabelField.idl |   26 +
 offapi/com/sun/star/chart2/DataPointCustomLabelFieldType.idl |   33 ++
 offapi/com/sun/star/chart2/DataPointProperties.idl   |8 
 offapi/com/sun/star/chart2/XDataPointCustomLabelField.idl|   43 ++
 oox/inc/drawingml/textfield.hxx  |2 
 oox/source/drawingml/chart/seriesconverter.cxx   |  112 +++
 oox/source/export/chartexport.cxx|  107 +++
 oox/source/token/properties.txt  |1 
 sd/qa/unit/data/pptx/tdf114821.pptx  |binary
 sd/qa/unit/import-tests.cxx  |   49 +++
 sw/qa/extras/ooxmlexport/data/graphic-object-fliph.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx|6 
 sw/source/filter/ww8/docxattributeoutput.cxx |   18 +
 writerfilter/source/dmapper/GraphicImport.cxx|   11 
 32 files changed, 1033 insertions(+), 34 deletions(-)

New commits:
commit 55e7f7f8d76db06505a04ff7b8505455aff50c5e
Author: Szymon Kłos 
Date:   Mon Feb 12 20:39:14 2018 +0100

tdf#114821 import/export/place complex data labels in charts

Change-Id: Ia44abcebb4febcabb1704aef85e396730ac2cd6f

diff --git a/chart2/inc/unonames.hxx b/chart2/inc/unonames.hxx
index 867a155e14aa..44c3bf67d3cb 100644
--- a/chart2/inc/unonames.hxx
+++ b/chart2/inc/unonames.hxx
@@ -29,6 +29,7 @@
 #define CHART_UNONAME_LABEL_BORDER_DASH "LabelBorderDash"
 #define CHART_UNONAME_LABEL_BORDER_DASHNAME "LabelBorderDashName"
 #define CHART_UNONAME_LABEL_BORDER_TRANS"LabelBorderTransparency"
+#define CHART_UNONAME_CUSTOM_LABEL_FIELDS   "CustomLabelFields"
 
 #endif
 
diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 5975c7a3cfa2..77c5ddffb9cb 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -13,6 +13,8 @@
 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -100,6 +102,8 @@ public:
 void testMultipleAxisXLSX();
 void testAxisTitleRotationXLSX();
 void testAxisCrossBetweenXSLX();
+void testCustomDataLabel();
+void testCustomDataLabelMultipleSeries();
 
 CPPUNIT_TEST_SUITE(Chart2ExportTest);
 CPPUNIT_TEST(testErrorBarXLSX);
@@ -164,6 +168,8 @@ public:
 CPPUNIT_TEST(testMultipleAxisXLSX);
 CPPUNIT_TEST(testAxisTitleRotationXLSX);
 CPPUNIT_TEST(testAxisCrossBetweenXSLX);
+CPPUNIT_TEST(testCustomDataLabel);
+CPPUNIT_TEST(testCustomDataLabelMultipleSeries);
 CPPUNIT_TEST_SUITE_END();
 
 protected:
@@ -1486,6 +1492,159 @@ void Chart2ExportTest::testAxisCrossBetweenXSLX()
 assertXPath(pXmlDoc, "(//c:crossBetween)[1]", "val", "midCat");
 }
 
+void Chart2ExportTest::testCustomDataLabel()
+{
+load("/chart2/qa/extras/data/pptx/", "tdf115107.pptx");
+xmlDocPtr pXmlDoc = parseExport("ppt/charts/chart1", "Impress MS 
PowerPoint 2007 XML");
+CPPUNIT_ASSERT(pXmlDoc);
+
+Reference xChartDoc(getChartDocFromDrawImpress(0, 
0), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xChartDoc.is());
+
+uno::Reference 
xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
+CPPUNIT_ASSERT(xDataSeries.is());
+float nFontSize;
+sal_Int64 nFontColor;
+sal_Int32 nCharUnderline;
+uno::Reference xPropertySet;
+uno::Sequence> aFields;
+
+// 1
+xPropertySet.set(xDataSeries->getDataPointByIndex(0), 
uno::UNO_QUERY_THROW);
+xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields;
+CPPUNIT_ASSERT_EQUAL(static_cast(2), aFields.getLength());
+
+
CPPUNIT_ASSERT_EQUAL(chart2::DataPointCust

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

[Miklos Vajna]

 writerperfect/source/writer/exp/xmlimp.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 6259dfce9d140368156c5fe8bb577c7589265dd5
Author: Miklos Vajna 
Date:   Mon Feb 12 16:08:41 2018 +0100

EPUB export: pick up XMP metadata from 'metadata.xmp'

This used to be .xmp, but that's inconsistent with how cover
image is not .jpg but cover.jpg (or .png, etc).

Also it was redundant, since these files are in the media directory, for
which the default is the  directory.

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

diff --git a/writerperfect/qa/unit/data/writer/epubexport/meta-xmp/meta-xmp.xmp 
b/writerperfect/qa/unit/data/writer/epubexport/meta-xmp/metadata.xmp
similarity index 100%
rename from writerperfect/qa/unit/data/writer/epubexport/meta-xmp/meta-xmp.xmp
rename to writerperfect/qa/unit/data/writer/epubexport/meta-xmp/metadata.xmp
diff --git a/writerperfect/source/writer/exp/xmlimp.cxx 
b/writerperfect/source/writer/exp/xmlimp.cxx
index 3ef02f69f008..812b27e7b69b 100644
--- a/writerperfect/source/writer/exp/xmlimp.cxx
+++ b/writerperfect/source/writer/exp/xmlimp.cxx
@@ -183,8 +183,7 @@ void FindXMPMetadata(const 
uno::Reference &xContext, con
 return;
 
 OUString aMediaDir = FindMediaDir(rDocumentBaseURL, rFilterData);
-INetURLObject aDocumentBaseURL(rDocumentBaseURL);
-OUString aURL = aMediaDir + aDocumentBaseURL.GetBase() + ".xmp";
+OUString aURL = aMediaDir + "metadata.xmp";
 SvFileStream aStream(aURL, StreamMode::READ);
 if (!aStream.IsOpen())
 return;
___
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' - sc/source

[Laurent BP]

 sc/source/ui/formdlg/formula.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c5647bd503b1d72229492b55257b0e3eb8f42464
Author: Laurent BP 
Date:   Sat Feb 10 20:54:25 2018 +0100

tdf#72440 Abs sheet ref must be given

When resolving tdf#90799, sheet ref was forced abs
But its value must be changed.
It worked only if initial sheet = Sheet1

Change-Id: I715f93dce93beb78d767e00dd45fb9634cb173a8
Reviewed-on: https://gerrit.libreoffice.org/49548
Reviewed-by: Eike Rathke 
Tested-by: Jenkins 
(cherry picked from commit d69017c8a17be21657ea7ab9d37023ee59116799)
Reviewed-on: https://gerrit.libreoffice.org/49608

diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 6c52eb700b4b..bc1ac159f7c8 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -448,8 +448,9 @@ void ScFormulaDlg::SetReference( const ScRange& rRef, 
ScDocument* pRefDoc )
 bool bSingle = aRefData.Ref1 == aRefData.Ref2;
 if (m_CursorPos.Tab() != rRef.aStart.Tab())
 {
+// pointer-selected => absolute sheet reference
+aRefData.Ref1.SetAbsTab( rRef.aStart.Tab() );
 aRefData.Ref1.SetFlag3D(true);
-aRefData.Ref1.SetTabRel(false); // pointer-selected => 
absolute sheet reference
 }
 if (bSingle)
 aArray.AddSingleReference(aRefData.Ref1);
___
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' - sc/source

[Laurent BP]

 sc/source/ui/formdlg/formula.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 505832b92e0e2a395ef22424de33168a76bcc2c3
Author: Laurent BP 
Date:   Sat Feb 10 20:54:25 2018 +0100

tdf#72440 Abs sheet ref must be given

When resolving tdf#90799, sheet ref was forced abs
But its value must be changed.
It worked only if initial sheet = Sheet1

Change-Id: I715f93dce93beb78d767e00dd45fb9634cb173a8
Reviewed-on: https://gerrit.libreoffice.org/49548
Reviewed-by: Eike Rathke 
Tested-by: Jenkins 
(cherry picked from commit d69017c8a17be21657ea7ab9d37023ee59116799)
Reviewed-on: https://gerrit.libreoffice.org/49609

diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 308b206537d0..8d44d7bc987b 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -431,8 +431,9 @@ void ScFormulaDlg::SetReference( const ScRange& rRef, 
ScDocument* pRefDoc )
 bool bSingle = aRefData.Ref1 == aRefData.Ref2;
 if (m_CursorPos.Tab() != rRef.aStart.Tab())
 {
+// pointer-selected => absolute sheet reference
+aRefData.Ref1.SetAbsTab( rRef.aStart.Tab() );
 aRefData.Ref1.SetFlag3D(true);
-aRefData.Ref1.SetTabRel(false); // pointer-selected => 
absolute sheet reference
 }
 if (bSingle)
 aArray.AddSingleReference(aRefData.Ref1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 extensions/source/ole/oleobjw.cxx  |5 -
 extensions/source/ole/servprov.cxx |   33 -
 extensions/source/ole/servprov.hxx |   26 ++
 extensions/source/ole/unoobjw.hxx  |   10 ++
 4 files changed, 8 insertions(+), 66 deletions(-)

New commits:
commit 4c925efc4373a5a09941b56d2edd30500987dd25
Author: Tor Lillqvist 
Date:   Mon Feb 12 15:24:12 2018 +0200

Reduce ASCII graphics and pointless comments a bit

Change-Id: Ia5cf6b923a6c6057463171d219af250ddb069bad

diff --git a/extensions/source/ole/oleobjw.cxx 
b/extensions/source/ole/oleobjw.cxx
index 6d4cfd365ecb..3e90adb54385 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -79,11 +79,6 @@ std::unordered_map 
AdapterToWrapperMap;
 std::unordered_map WrapperToAdapterMap;
 
 std::unordered_map > ComPtrToWrapperMap;
-/*
-
-class implementation IUnknownWrapper_Impl
-
-*/
 
 IUnknownWrapper_Impl::IUnknownWrapper_Impl( Reference 
const & xFactory,
sal_uInt8 unoWrapperClass, 
sal_uInt8 comWrapperClass):
diff --git a/extensions/source/ole/servprov.cxx 
b/extensions/source/ole/servprov.cxx
index 3bdd595f8197..9f217b2a8770 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -47,12 +47,6 @@ namespace ole_adapter
 // {82154420-0FBF-11d4-8313-005004526AB4}
 DEFINE_GUID(OID_ServiceManager, 0x82154420, 0xfbf, 0x11d4, 0x83, 0x13, 0x0, 
0x50, 0x4, 0x52, 0x6a, 0xb4);
 
-/*
-
-class implementation ProviderOleWrapper_Impl
-
-*/
-
 ProviderOleWrapper_Impl::ProviderOleWrapper_Impl(const 
Reference& smgr,
  const 
Reference& xSFact, GUID const * pGuid)
 : m_xSingleServiceFactory(xSFact),
@@ -180,12 +174,6 @@ STDMETHODIMP ProviderOleWrapper_Impl::LockServer(int 
/*fLock*/)
 return NOERROR;
 }
 
-/*
-
-class implementation OneInstanceOleWrapper_Impl
-
-*/
-
 OneInstanceOleWrapper_Impl::OneInstanceOleWrapper_Impl(  const 
Reference& smgr,
  const 
Reference& xInst,
  GUID const * pGuid )
@@ -305,13 +293,6 @@ STDMETHODIMP OneInstanceOleWrapper_Impl::LockServer(int 
/*fLock*/)
 return NOERROR;
 }
 
-
-/*
-
-class implementation OleConverter_Impl2
-
-*/
-
 OleConverter_Impl2::OleConverter_Impl2( const Reference 
&smgr):
 UnoConversionUtilities( smgr)
 
@@ -479,13 +460,6 @@ Reference< XInterface > 
OleConverter_Impl2::createComWrapperInstance()
 return Reference( xWeak, UNO_QUERY);
 }
 
-
-/*
-
-class implementation OleClient_Impl
-
-*/
-
 OleClient_Impl::OleClient_Impl( const Reference& smgr):
 UnoConversionUtilities( smgr)
 {
@@ -604,13 +578,6 @@ Reference< XInterface > 
OleClient_Impl::createComWrapperInstance( )
 return Reference( xWeak, UNO_QUERY);
 }
 
-
-/*
-
-class implementation OleServer_Impl
-
-*/
-
 OleServer_Impl::OleServer_Impl( const Reference& smgr):
 m_smgr( smgr)
 {
diff --git a/extensions/source/ole/servprov.hxx 
b/extensions/source/ole/servprov.hxx
index 2c31d2e11419..9173aa9de665 100644
--- a/extensions/source/ole/servprov.hxx
+++ b/extensions/source/ole/servprov.hxx
@@ -43,7 +43,7 @@ Reference OleClient_CreateInstance( const 
Reference OleServer_CreateInstance( const 
Reference & xSMgr);
 /*
 
-class declaration IClassFactoryWrapper
+IClassFactoryWrapper
 
 Specify abstract helper methods on class factories, which provide
 UNO objects. These methods are used by objects of class OleServer_Impl,
@@ -64,7 +64,7 @@ protected:
 
 /*
 
-class declaration ProviderOleWrapper_Impl
+ProviderOleWrapper_Impl
 
 Provides an UNO service provider as OLE class factory. Handle the
 OLE registration by overriding the abstract methods from
@@ -108,7 +108,7 @@ protected:
 
 /***

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

[Caolán McNamara]

 filter/source/graphicfilter/itiff/itiff.cxx |   12 
 vcl/source/filter/jpeg/jpegc.cxx|9 ++---
 vcl/workben/commonfuzzer.hxx|9 +
 3 files changed, 27 insertions(+), 3 deletions(-)

New commits:
commit 10b6a2b2d6a5cb938ead02cba2fa03f748c5f63c
Author: Caolán McNamara 
Date:   Mon Feb 12 14:17:30 2018 +

give up on recoverable errors earlier when fuzzing

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

diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index ddb5075fd817..8a8ea3707379 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -39,8 +39,6 @@ extern "C" {
 #include 
 #include 
 
-#define WarningLimit 1000
-
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning (disable: 4324) /* disable to __declspec(align()) aligned 
warning */
@@ -72,6 +70,11 @@ extern "C" void outputMessage (j_common_ptr cinfo)
 SAL_WARN("vcl.filter", "failure reading JPEG: " << buffer);
 }
 
+static int GetWarningLimit()
+{
+return utl::ConfigManager::IsFuzzing() ? 100 : 1000;
+}
+
 extern "C" void emitMessage (j_common_ptr cinfo, int msg_level)
 {
 if (msg_level < 0)
@@ -80,7 +83,7 @@ extern "C" void emitMessage (j_common_ptr cinfo, int 
msg_level)
 // reasonable limit (initially using ImageMagick's current limit of
 // 1000), then bail.
 // 
https://libjpeg-turbo.org/pmwiki/uploads/About/TwoIssueswiththeJPEGStandard.pdf
-if (cinfo->err->num_warnings++ > WarningLimit)
+if (++cinfo->err->num_warnings > GetWarningLimit())
 cinfo->err->error_exit(cinfo);
 else
 cinfo->err->output_message(cinfo);
commit 76c58b1cfbe2ab41b8e33d40953341410be7db96
Author: Caolán McNamara 
Date:   Mon Feb 12 15:20:03 2018 +

for ~perfect compression link fuzzer input limit to an output limit

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

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx 
b/filter/source/graphicfilter/itiff/itiff.cxx
index 6e7bb2461eac..0449cdff7e2b 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -513,6 +513,10 @@ sal_uInt8* TIFFReader::getMapData(sal_uInt32 np)
 
 bool TIFFReader::ReadMap()
 {
+//when fuzzing with a max len set, max decompress to 2000 times that limit
+static size_t nMaxAllowedDecompression = [](const char* pEnv) { size_t 
nRet = pEnv ? std::atoi(pEnv) : 0; return nRet * 2000; 
}(std::getenv("FUZZ_MAX_INPUT_LEN"));
+size_t nTotalDataRead = 0;
+
 if ( nCompression == 1 || nCompression == 32771 )
 {
 sal_uInt32 nStripBytesPerRow;
@@ -603,6 +607,9 @@ bool TIFFReader::ReadMap()
 bDifferentToPrev |= !aResult.m_bBufferUnchanged;
 if ( pTIFF->GetError() )
 return false;
+nTotalDataRead += nBytesPerRow;
+if (nMaxAllowedDecompression && nTotalDataRead > 
nMaxAllowedDecompression)
+return false;
 }
 if (!bDifferentToPrev)
 {
@@ -645,6 +652,11 @@ bool TIFFReader::ReadMap()
 if ( ( aLZWDecom.Decompress(getMapData(np), nBytesPerRow) != 
nBytesPerRow ) || pTIFF->GetError() )
 return false;
 }
+
+nTotalDataRead += nBytesPerRow;
+if (nMaxAllowedDecompression && nTotalDataRead > 
nMaxAllowedDecompression)
+return false;
+
 if ( !ConvertScanline( ny ) )
 return false;
 }
diff --git a/vcl/workben/commonfuzzer.hxx b/vcl/workben/commonfuzzer.hxx
index 9b6f5728572c..cc4830fa5990 100644
--- a/vcl/workben/commonfuzzer.hxx
+++ b/vcl/workben/commonfuzzer.hxx
@@ -87,6 +87,15 @@ void CommonInitialize(int *argc, char ***argv)
 setenv("SAL_DISABLE_DEFAULTPRINTER", "1", 1);
 setenv("SAL_NO_FONT_LOOKUP", "1", 1);
 
+//allow bubbling of max input len to fuzzer targets
+int nMaxLen = 0;
+for (int i = 0; i < *argc; ++i)
+{
+if (strncmp((*argv)[i], "-max_len=", 9) == 0)
+nMaxLen = atoi((*argv)[i] + 9);
+}
+setenv("FUZZ_MAX_INPUT_LEN", "1", nMaxLen);
+
 osl_setCommandArgs(*argc, *argv);
 
 OUString sExecDir = getExecutableDir();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 lotuswordpro/inc/xfilter/xfcontent.hxx|3 +++
 lotuswordpro/qa/cppunit/data/fail/ofz6208-1.lwp   |binary
 lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx |9 ++---
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 22fc8c634c5f9b09d45aff0403503f4d8226328d
Author: Caolán McNamara 
Date:   Mon Feb 12 14:01:20 2018 +

ofz#6208 Indirect-leak

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

diff --git a/lotuswordpro/inc/xfilter/xfcontent.hxx 
b/lotuswordpro/inc/xfilter/xfcontent.hxx
index 611f9daaa719..38021b4fcd7a 100644
--- a/lotuswordpro/inc/xfilter/xfcontent.hxx
+++ b/lotuswordpro/inc/xfilter/xfcontent.hxx
@@ -105,6 +105,7 @@ public:
 protected:
 XFContent()
 : m_bDoingToXml(false)
+, m_bInserted(false)
 {
 }
 
@@ -115,6 +116,8 @@ protected:
 OUString m_strStyleName;
 private:
 bool m_bDoingToXml;
+public:
+bool m_bInserted;
 };
 
 #endif
diff --git a/lotuswordpro/qa/cppunit/data/fail/ofz6208-1.lwp 
b/lotuswordpro/qa/cppunit/data/fail/ofz6208-1.lwp
new file mode 100644
index ..5b068065a1f0
Binary files /dev/null and b/lotuswordpro/qa/cppunit/data/fail/ofz6208-1.lwp 
differ
diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx 
b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx
index 67dc59017343..b1398bc023cd 100644
--- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx
@@ -68,8 +68,11 @@ XFContentContainer::~XFContentContainer()
 {
 }
 
-voidXFContentContainer::Add(XFContent *pContent)
+void XFContentContainer::Add(XFContent *pContent)
 {
+if (pContent->m_bInserted)
+throw std::runtime_error("already inserted");
+pContent->m_bInserted = true;
 m_aContents.emplace_back(pContent);
 }
 
@@ -80,12 +83,12 @@ void XFContentContainer::Add(const OUString& text)
 Add(xTC.get());
 }
 
-int XFContentContainer::GetCount() const
+int XFContentContainer::GetCount() const
 {
 return m_aContents.size();
 }
 
-voidXFContentContainer::Reset()
+void XFContentContainer::Reset()
 {
 m_aContents.clear();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source include/test test/source writerperfect/qa

[Miklos Vajna]

 filter/source/svg/svgexport.cxx  |2 ++
 include/test/xmltesttools.hxx|5 +
 test/source/xmltesttools.cxx |   27 +++
 writerperfect/qa/unit/EPUBExportTest.cxx |5 +
 4 files changed, 39 insertions(+)

New commits:
commit f8da775795052ad2eb879970c115d2e2a2fe8c81
Author: Miklos Vajna 
Date:   Mon Feb 12 17:53:48 2018 +0100

EPUB export, fixed layout: fix validation error with images

The "xlink" prefix for the "xlink:href" attribute on the "image" element
was not bound.

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

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index c1d25b82b1a6..7f08357a80ae 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -2333,6 +2333,8 @@ void SVGExport::writeMtf( const GDIMetaFile& rMtf )
  AddAttribute( XML_NAMESPACE_NONE, "baseProfile", "tiny" );
 
 AddAttribute( XML_NAMESPACE_NONE, "xmlns", constSvgNamespace );
+// For .
+AddAttribute(XML_NAMESPACE_XMLNS, "xlink", "http://www.w3.org/1999/xlink";);
 AddAttribute( XML_NAMESPACE_NONE, "stroke-width", OUString::number( 28.222 
) );
 AddAttribute( XML_NAMESPACE_NONE, "stroke-linejoin", "round" );
 AddAttribute( XML_NAMESPACE_NONE, "xml:space", "preserve" );
diff --git a/include/test/xmltesttools.hxx b/include/test/xmltesttools.hxx
index bfcaf91cdd6d..eba5c84a0644 100644
--- a/include/test/xmltesttools.hxx
+++ b/include/test/xmltesttools.hxx
@@ -76,6 +76,11 @@ protected:
  */
 void  assertXPathContent(xmlDocPtr pXmlDoc, const OString& rXPath, 
const OUString& rContent);
 /**
+ * Assert that rXPath exists and it has an rNSPrefix=rNSHref namespace 
definition.
+ */
+void assertXPathNSDef(xmlDocPtr pXmlDoc, const OString& rXPath, const 
OUString& rNSPrefix,
+  const OUString& rNSHref);
+/**
  * Assert that rXPath exists, and has exactly nNumberOfChildNodes child 
nodes.
  * Useful for checking that we do have a no child nodes to a specific node 
(nNumberOfChildNodes == 0).
  */
diff --git a/test/source/xmltesttools.cxx b/test/source/xmltesttools.cxx
index 5d476c46a5ec..45347b0c111b 100644
--- a/test/source/xmltesttools.cxx
+++ b/test/source/xmltesttools.cxx
@@ -123,6 +123,33 @@ void XmlTestTools::assertXPathContent(xmlDocPtr pXmlDoc, 
const OString& rXPath,
 CPPUNIT_ASSERT_EQUAL_MESSAGE(OString("In <" + OString(pXmlDoc->name) + ">, 
XPath contents of child does not match").getStr(), rContent, 
getXPathContent(pXmlDoc, rXPath));
 }
 
+void XmlTestTools::assertXPathNSDef(xmlDocPtr pXmlDoc, const OString& rXPath,
+const OUString& rNSPrefix, const OUString& 
rNSHref)
+{
+xmlXPathObjectPtr pXmlObj = getXPathNode(pXmlDoc, rXPath);
+xmlNodeSetPtr pXmlNodes = pXmlObj->nodesetval;
+CPPUNIT_ASSERT_MESSAGE(
+OString("In <" + OString(pXmlDoc->name) + ">, XPath '" + rXPath + "' 
not found").getStr(),
+xmlXPathNodeSetGetLength(pXmlNodes) > 0);
+
+xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0];
+bool bFound = false;
+for (xmlNsPtr pNamespace = pXmlNode->nsDef; pNamespace; pNamespace = 
pNamespace->next)
+{
+if (!pNamespace->prefix)
+continue;
+
+CPPUNIT_ASSERT(pNamespace->href);
+if (rNSPrefix == convert(pNamespace->prefix) && rNSHref == 
convert(pNamespace->href))
+{
+bFound = true;
+break;
+}
+}
+xmlXPathFreeObject(pXmlObj);
+CPPUNIT_ASSERT(bFound);
+}
+
 void XmlTestTools::assertXPathChildren(xmlDocPtr pXmlDoc, const OString& 
rXPath, int nNumberOfChildNodes)
 {
 #if LIBXML_VERSION >= 20703 /* xmlChildElementCount is only available in 
libxml2 >= 2.7.3 */
diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx 
b/writerperfect/qa/unit/EPUBExportTest.cxx
index 47e84ebf1bbc..81d70591a0da 100644
--- a/writerperfect/qa/unit/EPUBExportTest.cxx
+++ b/writerperfect/qa/unit/EPUBExportTest.cxx
@@ -874,6 +874,11 @@ void EPUBExportTest::testSVG()
 // one, causing a validation error.
 OString aActual(static_cast(aMemoryStream.GetBuffer()), 
aExpected.getLength());
 CPPUNIT_ASSERT_EQUAL(aExpected, aActual);
+
+// This failed, we used the xlink attribute namespace, but we did not
+// define its URL.
+mpXmlDoc = parseExport("OEBPS/images/image0001.svg");
+assertXPathNSDef(mpXmlDoc, "/svg:svg", "xlink", 
"http://www.w3.org/1999/xlink";);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(EPUBExportTest);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 desktop/source/lib/init.cxx   |6 ++-
 include/vcl/builder.hxx   |   10 +
 vcl/source/window/builder.cxx |   77 ++
 3 files changed, 64 insertions(+), 29 deletions(-)

New commits:
commit 707f787cd991f9c59712cd3020d127d09605c792
Author: Michael Meeks 
Date:   Sun Feb 11 00:01:44 2018 +0100

lok: enable pre-loading with Vcl's builder

Cache vclbuilder's loaded modules globally & simplify logic.

Pre-populate that cache on preload for LOK vs. a somewhat
inelegant pre-canned list of dialog libraries.

Change-Id: I86d936862a41495fd37908f3ee7eb2e0c363d651
Reviewed-on: https://gerrit.libreoffice.org/49550
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 2165a781725a..f5952665d148 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -98,6 +98,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 
@@ -3811,7 +3813,9 @@ static int lo_initialize(LibreOfficeKit* pThis, const 
char* pAppPath, const char
 // 2) comphelper::setProcessServiceFactory(xSFactory);
 // 3) InitVCL()
 aService->initialize({css::uno::makeAny("preload")});
-
+// Force load some modules
+VclBuilder::preload();
+VclAbstractDialogFactory::Create();
 preloadData();
 
 // Release Solar Mutex, lo_startmain thread should acquire it.
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 21a586718e55..68d29903b8c0 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -94,17 +94,13 @@ public:
 return m_sHelpRoot;
 }
 
+/// Pre-loads all modules containing UI information
+static void preload();
+
 private:
 VclBuilder(const VclBuilder&) = delete;
 VclBuilder& operator=(const VclBuilder&) = delete;
 
-typedef std::map> ModuleMap;
-
-//We store these until the builder is deleted, that way we can use the
-//ui-previewer on custom widgets and guarantee the modules they are from
-//exist for the duration of the dialog
-ModuleMap   m_aModuleMap;
-
 //If the toplevel window has any properties which need to be set on it,
 //but the toplevel is the owner of the builder, then its ctor
 //has not been completed during the building, so properties for it
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 9223a7eac1a1..becc75d63f41 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1099,6 +1099,49 @@ void VclBuilder::cleanupWidgetOwnScrolling(vcl::Window 
*pScrollParent, vcl::Wind
 extern "C" { static void thisModule() {} }
 #endif
 
+// We store these forever, closing modules is non-ideal from a performance
+// perspective, code pages will be freed up by the OS anyway if unused for
+// a while in many cases, and this helps us pre-init.
+typedef std::map> ModuleMap;
+static ModuleMap g_aModuleMap;
+static osl::Module g_aMergedLib;
+
+#ifndef SAL_DLLPREFIX
+#  define SAL_DLLPREFIX ""
+#endif
+
+void VclBuilder::preload()
+{
+#ifndef DISABLE_DYNLOADING
+
+#if ENABLE_MERGELIBS
+g_aMergedLibs->loadRelative(&thisModule, SVLIBRARY("merged"));
+#endif
+// find -name '*ui*' | xargs grep 'class=".*lo-' |
+// sed 's/.*class="//' | sed 's/-.*$//' | sort | uniq
+static const char *aWidgetLibs[] = {
+"sfxlo",  "svtlo", "svxcorelo", "foruilo",
+"vcllo",  "svxlo", "cuilo", "swlo",
+"swuilo", "sclo",  "sdlo",  "chartcontrollerlo",
+"smlo",   "scuilo","basctllo",  "sduilo",
+"scnlo",  "xsltdlglo", "pcrlo" // "dbulo"
+};
+for (auto & lib : aWidgetLibs)
+{
+OUStringBuffer sModuleBuf;
+sModuleBuf.append(SAL_DLLPREFIX);
+sModuleBuf.append(OUString::createFromAscii(lib));
+sModuleBuf.append(SAL_DLLEXTENSION);
+osl::Module* pModule = new osl::Module;
+OUString sModule = sModuleBuf.makeStringAndClear();
+if (pModule->loadRelative(&thisModule, sModule))
+g_aModuleMap.insert(std::make_pair(sModule, 
std::unique_ptr(pModule)));
+else
+delete pModule;
+}
+#endif // DISABLE_DYNLOADING
+}
+
 VclPtr VclBuilder::makeObject(vcl::Window *pParent, const OString 
&name, const OString &id,
 stringmap &rMap)
 {
@@ -1581,40 +1624,32 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 }
 else
 {
-#ifndef SAL_DLLPREFIX
-#define SAL_DLLPREFIX ""
-#endif
 sal_Int32 nDelim = name.indexOf('-');
 if (nDelim != -1)
 {
+OUString sFunction(OStringToOUString(OString("make") + 
name.copy(nDelim+1), RTL_TEXTENCODING_UTF8));
+
 #ifndef DISABLE_DYNLOADING
 OUStringBuffer sModuleBuf;
 sModuleBuf.append(SAL_DLLPREFIX);
 sModuleBuf.append(OStringToO

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

[Tor Lillqvist]

 extensions/README|2 +-
 extensions/source/ole/ole2uno.cxx|5 -
 extensions/source/ole/ole2uno.hxx|6 --
 extensions/source/ole/oleobjw.cxx|5 -
 extensions/source/ole/oleobjw.hxx|6 --
 extensions/source/ole/olethread.cxx  |5 -
 extensions/source/ole/servprov.cxx   |7 ---
 extensions/source/ole/servprov.hxx   |3 ---
 extensions/source/ole/servreg.cxx|7 +--
 extensions/source/ole/unoconversionutilities.hxx |4 +---
 extensions/source/ole/unoobjw.cxx|4 
 extensions/source/ole/unoobjw.hxx|5 -
 extensions/source/ole/windata.hxx|5 -
 13 files changed, 3 insertions(+), 61 deletions(-)

New commits:
commit d9fc18d5a797972ba182fbcae941535a50098dcb
Author: Tor Lillqvist 
Date:   Mon Feb 12 15:31:14 2018 +0200

Get rid of ole_adapter namespace level

None of this is DLLPUBLIC anyway, and it all goes into one DLL.

Change-Id: I3756f87aaa4561ef54a9e6aaeeac47b99350c6b3
Reviewed-on: https://gerrit.libreoffice.org/49616
Tested-by: Jenkins 
Reviewed-by: Tor Lillqvist 

diff --git a/extensions/README b/extensions/README
index eeff42a5d853..b74ff369baa1 100644
--- a/extensions/README
+++ b/extensions/README
@@ -24,7 +24,7 @@ See 
udkapi/com/sun/star/bridge/oleautomation/ApplicationRegistration.idl
 
 This is initialized in Desktop::Main() in Desktop::OpenClients_Impl()
 by creating the service "com.sun.star.bridge.OleApplicationRegistration",
-which is implemented by ole_adapter::OleServer_Impl.
+which is implemented by OleServer_Impl.
 
 See extensions/source/ole/
 
diff --git a/extensions/source/ole/ole2uno.cxx 
b/extensions/source/ole/ole2uno.cxx
index a42c26fac140..4899a2df11d4 100644
--- a/extensions/source/ole/ole2uno.cxx
+++ b/extensions/source/ole/ole2uno.cxx
@@ -23,8 +23,6 @@
 #include "ole2uno.hxx"
 
 using namespace osl;
-namespace ole_adapter
-{
 
 struct MutexInit
 {
@@ -43,7 +41,4 @@ Mutex * getBridgeMutex()
 MutexInit(), ::osl::GetGlobalMutex());
 }
 
-
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/ole/ole2uno.hxx 
b/extensions/source/ole/ole2uno.hxx
index a3447a8d952c..e4d83c48b73b 100644
--- a/extensions/source/ole/ole2uno.hxx
+++ b/extensions/source/ole/ole2uno.hxx
@@ -53,9 +53,6 @@ using namespace com::sun::star::beans;
 using namespace osl;
 using namespace std;
 
-namespace ole_adapter
-{
-
 VARTYPE getVarType( const Any& val);
 /* creates a Type object for a given type name.
 
@@ -78,9 +75,6 @@ public:
 
 Mutex* getBridgeMutex();
 
-} // end namespace
-
-
 #endif // INCLUDED_EXTENSIONS_SOURCE_OLE_OLE2UNO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/ole/oleobjw.cxx 
b/extensions/source/ole/oleobjw.cxx
index 3e90adb54385..b07c9bf067ac 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -57,9 +57,6 @@ using namespace ::com::sun::star;
 
 #define JSCRIPT_ID_PROPERTY L"_environment"
 #define JSCRIPT_ID  L"jscript"
-namespace ole_adapter
-{
-
 
 // key: XInterface pointer created by Invocation Adapter Factory
 // value: XInterface pointer to the wrapper class.
@@ -2496,6 +2493,4 @@ ITypeInfo* IUnknownWrapper_Impl::getTypeInfo()
 return m_spTypeInfo;
 }
 
-} // end namespace
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/ole/oleobjw.hxx 
b/extensions/source/ole/oleobjw.hxx
index dbf1b74924eb..6c673f178c82 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -46,10 +46,6 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::bridge;
 using namespace com::sun::star::bridge::oleautomation;
 
-namespace ole_adapter
-{
-
-
 typedef std::unordered_map> DispIdMap;
 
 typedef std::unordered_multimap TLBFuncIndexMap;
@@ -246,8 +242,6 @@ protected:
 bool m_bHasDfltProperty;
 };
 
-} // end namespace
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/ole/olethread.cxx 
b/extensions/source/ole/olethread.cxx
index 72434b89febb..6bb0c5daab2a 100644
--- a/extensions/source/ole/olethread.cxx
+++ b/extensions/source/ole/olethread.cxx
@@ -24,9 +24,6 @@
 
 using namespace std;
 
-namespace ole_adapter
-{
-
 void o2u_attachCurrentThread()
 {
 static osl::ThreadData oleThreadData;
@@ -44,6 +41,4 @@ void o2u_attachCurrentThread()
 }
 }
 
-} // end namespace
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/ole/servprov.cxx 
b/extensions/source/ole/servprov.cxx
index 9f217b2a8770..15e2ae246d87 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -37,10 +37,6 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::bridge;
 using namespa

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

[Eike Rathke]

 formula/source/core/api/token.cxx |   10 +-
 sc/source/core/tool/interpr4.cxx  |4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit a6c659283ab02cb59feda39b67e1837ed8c32730
Author: Eike Rathke 
Date:   Mon Feb 12 22:52:05 2018 +0100

Use FormulaCompiler::IsOpCodeJumpCommand() where applicable

Change-Id: I295e842da0192c21d318357caa574062085acd9d

diff --git a/formula/source/core/api/token.cxx 
b/formula/source/core/api/token.cxx
index cfd759562d59..05ca4cf5e1e9 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -86,7 +86,7 @@ bool FormulaToken::IsFunction() const
 eOp != ocTableRef &&
(GetByte() != 0  // 
x parameters
 || (SC_OPCODE_START_NO_PAR <= eOp && eOp < SC_OPCODE_STOP_NO_PAR)   // 
no parameter
-|| (ocIf == eOp || ocIfError == eOp || ocIfNA == eOp || ocChoose == 
eOp ) // @ jump commands
+|| FormulaCompiler::IsOpCodeJumpCommand( eOp )  // 
@ jump commands
 || (SC_OPCODE_START_1_PAR <= eOp && eOp < SC_OPCODE_STOP_1_PAR) // 
one parameter
 || (SC_OPCODE_START_2_PAR <= eOp && eOp < SC_OPCODE_STOP_2_PAR) // 
x parameters (cByte==0 in
 // 
FuncAutoPilot)
@@ -101,10 +101,10 @@ bool FormulaToken::IsFunction() const
 sal_uInt8 FormulaToken::GetParamCount() const
 {
 if ( eOp < SC_OPCODE_STOP_DIV && eOp != ocExternal && eOp != ocMacro &&
- eOp != ocIf && eOp != ocIfError && eOp != ocIfNA && eOp != ocChoose &&
+ !FormulaCompiler::IsOpCodeJumpCommand( eOp ) &&
  eOp != ocPercentSign )
 return 0;   // parameters and specials
-// ocIf, ocIfError, ocIfNA and ocChoose not for FAP, 
have cByte then
+// ocIf... jump commands not for FAP, have cByte then
 //2do: bool parameter whether FAP or not?
 else if ( GetByte() )
 return GetByte();   // all functions, also ocExternal and ocMacro
@@ -117,7 +117,7 @@ sal_uInt8 FormulaToken::GetParamCount() const
 return 0;   // no parameter
 else if (SC_OPCODE_START_1_PAR <= eOp && eOp < SC_OPCODE_STOP_1_PAR)
 return 1;   // one parameter
-else if ( eOp == ocIf || eOp == ocIfError || eOp == ocIfNA || eOp == 
ocChoose )
+else if (FormulaCompiler::IsOpCodeJumpCommand( eOp ))
 return 1;   // only the condition counts as parameter
 else
 return 0;   // all the rest, no Parameter, or
@@ -893,7 +893,7 @@ bool FormulaTokenArray::HasMatrixDoubleRefOps()
 }
 if ( eOp == ocPush || lcl_IsReference( eOp, t->GetType() )  )
 pStack[sp++] = t;
-else if ( eOp == ocIf || eOp == ocIfError || eOp == ocIfNA || eOp 
== ocChoose )
+else if (FormulaCompiler::IsOpCodeJumpCommand( eOp ))
 {   // ignore Jumps, pop previous Result (Condition)
 if ( sp )
 --sp;
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 942911d29ff2..c1cd4f835398 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -3987,7 +3987,7 @@ StackVar ScInterpreter::Interpret()
 nCurFmtType = SvNumFormatType::UNDEFINED;
 }
 else if (pTokenMatrixMap &&
- !(eOp == ocIf || eOp == ocIfError || eOp == ocIfNA || eOp == 
ocChoose) &&
+ !FormulaCompiler::IsOpCodeJumpCommand( eOp ) &&
 ((aTokenMatrixMapIter = pTokenMatrixMap->find( pCur)) !=
  pTokenMatrixMap->end()) &&
 (*aTokenMatrixMapIter).second->GetType() != svJumpMatrix)
@@ -4008,7 +4008,7 @@ StackVar ScInterpreter::Interpret()
 nFuncFmtType = SvNumFormatType::NUMBER;
 nFuncFmtIndex = 0;
 
-if ( eOp == ocIf || eOp == ocChoose || eOp == ocIfError || eOp == 
ocIfNA )
+if (FormulaCompiler::IsOpCodeJumpCommand( eOp ))
 nStackBase = sp;// don't mess around with the jumps
 else
 {
___
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-desktop' - 6 commits - chart2/inc chart2/qa chart2/source include/oox offapi/com offapi/UnoApi_offapi.mk oox/inc oox/source sd/qa sd/sou

[Szymon Kłos]

 chart2/inc/unonames.hxx  |1 
 chart2/qa/extras/chart2export.cxx|  159 ++
 chart2/qa/extras/chart2import.cxx|  154 ++
 chart2/qa/extras/data/pptx/tdf115107-2.pptx  |binary
 chart2/qa/extras/data/pptx/tdf115107.pptx|binary
 chart2/source/chartcore.component|1 
 chart2/source/model/main/DataPointProperties.cxx |   12 
 chart2/source/model/main/DataPointProperties.hxx |3 
 chart2/source/model/main/FormattedString.cxx |   44 +++
 chart2/source/model/main/FormattedString.hxx |   19 +
 chart2/source/view/charttypes/VSeriesPlotter.cxx |  126 +++-
 chart2/source/view/inc/AbstractShapeFactory.hxx  |7 
 chart2/source/view/inc/OpenglShapeFactory.hxx|7 
 chart2/source/view/inc/ShapeFactory.hxx  |7 
 chart2/source/view/inc/VSeriesPlotter.hxx|2 
 chart2/source/view/main/OpenglShapeFactory.cxx   |   12 
 chart2/source/view/main/ShapeFactory.cxx |   94 ++
 include/oox/ppt/slidetransition.hxx  |4 
 include/oox/ppt/slidetransitioncontext.hxx   |1 
 offapi/UnoApi_offapi.mk  |3 
 offapi/com/sun/star/chart2/DataPointCustomLabelField.idl |   26 +
 offapi/com/sun/star/chart2/DataPointCustomLabelFieldType.idl |   33 ++
 offapi/com/sun/star/chart2/DataPointProperties.idl   |8 
 offapi/com/sun/star/chart2/XDataPointCustomLabelField.idl|   43 ++
 offapi/com/sun/star/presentation/DrawPage.idl|9 
 oox/inc/drawingml/textfield.hxx  |2 
 oox/source/drawingml/chart/seriesconverter.cxx   |  112 ++-
 oox/source/export/chartexport.cxx|  107 +++
 oox/source/ppt/slidetransition.cxx   |   30 +-
 oox/source/ppt/slidetransitioncontext.cxx|   15 -
 oox/source/token/properties.txt  |2 
 sd/qa/unit/data/ppt/tdf115394.ppt|binary
 sd/qa/unit/data/pptx/tdf114821.pptx  |binary
 sd/qa/unit/data/pptx/tdf115394-zero.pptx |binary
 sd/qa/unit/data/pptx/tdf115394.pptx  |binary
 sd/qa/unit/export-tests-ooxml2.cxx   |   52 +++
 sd/qa/unit/export-tests.cxx  |   39 ++
 sd/qa/unit/import-tests.cxx  |  108 +++
 sd/source/filter/eppt/eppt.cxx   |   26 +
 sd/source/filter/eppt/pptx-epptooxml.cxx |  161 +++
 sd/source/filter/ppt/pptin.cxx   |6 
 sd/source/ui/inc/unoprnms.hxx|1 
 sd/source/ui/unoidl/unopage.cxx  |2 
 sw/qa/extras/ooxmlexport/data/graphic-object-fliph.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx|6 
 sw/source/filter/ww8/docxattributeoutput.cxx |   18 +
 writerfilter/source/dmapper/GraphicImport.cxx|   11 
 47 files changed, 1375 insertions(+), 98 deletions(-)

New commits:
commit 2ef5ccadeff6fdcb427fde71b0d2796a0afde057
Author: Szymon Kłos 
Date:   Mon Feb 12 20:39:14 2018 +0100

tdf#114821 import/export/place complex data labels in charts

Change-Id: Ia44abcebb4febcabb1704aef85e396730ac2cd6f

diff --git a/chart2/inc/unonames.hxx b/chart2/inc/unonames.hxx
index 867a155e14aa..44c3bf67d3cb 100644
--- a/chart2/inc/unonames.hxx
+++ b/chart2/inc/unonames.hxx
@@ -29,6 +29,7 @@
 #define CHART_UNONAME_LABEL_BORDER_DASH "LabelBorderDash"
 #define CHART_UNONAME_LABEL_BORDER_DASHNAME "LabelBorderDashName"
 #define CHART_UNONAME_LABEL_BORDER_TRANS"LabelBorderTransparency"
+#define CHART_UNONAME_CUSTOM_LABEL_FIELDS   "CustomLabelFields"
 
 #endif
 
diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 5975c7a3cfa2..77c5ddffb9cb 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -13,6 +13,8 @@
 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -100,6 +102,8 @@ public:
 void testMultipleAxisXLSX();
 void testAxisTitleRotationXLSX();
 void testAxisCrossBetweenXSLX();
+void testCustomDataLabel();
+void testCustomDataLabelMultipleSeries();
 
 CPPUNIT_TEST_SUITE(Chart2ExportTest);
 CPPUNIT_TEST(testErrorBarXLSX);
@@ -164,6 +168,8 @@ public:
 CPPUNIT_TEST(testMultipleAxisXLSX);
 CPPUNIT_TEST(testAxisTitleRotationXLSX);
 CPPUNIT_TEST(testAxisCrossBetweenXSLX);
+CPPUNIT_TEST(testCustomDataLabel);
+CPPUNIT_TEST(testCustomDataLabelMultipleSeries);
   

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

[Saurav Chirania]

 sw/qa/python/check_table.py |   55 +---
 1 file changed, 27 insertions(+), 28 deletions(-)

New commits:
commit 4469c1d4061e8cb463469e60e5d87af5f9bf9636
Author: Saurav Chirania 
Date:   Fri Feb 2 05:00:39 2018 +0530

tdf#97361 Tests in sw should be more pythonic

The modified files have been made more pythonic
by removing Java-like codes.

Change-Id: Ie015bb5fa2348d31682b843df7f9c6d86c5e9fc1
Reviewed-on: https://gerrit.libreoffice.org/49163
Tested-by: Jenkins 
Reviewed-by: Björn Michaelsen 

diff --git a/sw/qa/python/check_table.py b/sw/qa/python/check_table.py
index 60c2d726ed58..47389fdeef08 100644
--- a/sw/qa/python/check_table.py
+++ b/sw/qa/python/check_table.py
@@ -26,13 +26,13 @@ class CheckTable(unittest.TestCase):
 
 for x in range(3):
 for y in range(3):
-xTable.getCellByPosition(x, y).String = 'Cell %d %d' % (x, y)
+xTable[y,x].String = 'Cell %d %d' % (x, y)
 
 def _check_table(self, xTable):
 
 for x in range(3):
 for y in range(3):
-self.assertEqual('Cell %d %d' % (x, y), 
xTable.getCellByPosition(x, y).String)
+self.assertEqual('Cell %d %d' % (x, y), xTable[y,x].String)
 
 @classmethod
 def setUpClass(cls):
@@ -282,14 +282,14 @@ class CheckTable(unittest.TestCase):
 self._check_table(xTable)
 xTable.RowDescriptions = ('fooRow', 'bazRow')
 xTable.ColumnDescriptions = ('fooColumn', 'bazColumn')
-self.assertEqual('fooRow', xTable.getCellByPosition(0, 1).String)
-self.assertEqual('bazRow', xTable.getCellByPosition(0, 2).String)
-self.assertEqual('fooColumn', xTable.getCellByPosition(1, 0).String)
-self.assertEqual('bazColumn', xTable.getCellByPosition(2, 0).String)
-xTable.getCellByPosition(0, 1).String = 'Cell 0 1'  # reset changes 
values ...
-xTable.getCellByPosition(0, 2).String = 'Cell 0 2'
-xTable.getCellByPosition(1, 0).String = 'Cell 1 0'
-xTable.getCellByPosition(2, 0).String = 'Cell 2 0'
+self.assertEqual('fooRow', xTable[1,0].String)
+self.assertEqual('bazRow', xTable[2,0].String)
+self.assertEqual('fooColumn', xTable[0,1].String)
+self.assertEqual('bazColumn', xTable[0,2].String)
+xTable[1,0].String = 'Cell 0 1'  # reset changes values ...
+xTable[2,0].String = 'Cell 0 2'
+xTable[0,1].String = 'Cell 1 0'
+xTable[0,2].String = 'Cell 2 0'
 self._check_table(xTable)  # ... to ensure the rest was untouched
 # check disconnected table excepts, but doesn't crash
 xTable2 = xDoc.createInstance("com.sun.star.text.TextTable")
@@ -310,11 +310,11 @@ class CheckTable(unittest.TestCase):
 xTable.ChartColumnAsLabel = False
 xTable.ChartRowAsLabel = False
 # roundtrip
-xTable.Data = ((1, 2, 3), (4, 5, 6), (7, 8, 9), (10, 11, 12))
+xTable.Data = ((y for y in range(3*x+1,3*x+4)) for x in range(4))
 self.assertEqual(xTable.Data, ((1, 2, 3), (4, 5, 6), (7, 8, 9), (10, 
11, 12)))
 # missing row
 with self.assertRaises(Exception):
-xTable.Data = ((1, 2, 3), (4, 5, 6), (7, 8, 9))
+xTable.Data = ((y for y in range(3*x+1,3*x+4)) for x in range(3))
 # missing column
 with self.assertRaises(Exception):
 xTable.Data = ((1, 2), (4, 5), (7, 8), (10, 11))
@@ -342,7 +342,7 @@ class CheckTable(unittest.TestCase):
 xDoc.Text.insertTextContent(xCursor, xTable, False)
 xTable.ChartColumnAsLabel = False
 xTable.ChartRowAsLabel = False
-xTable.Data = ((1, 2, 3), (4, 5, 6), (7, 8, 9), (10, 11, 12))
+xTable.Data = ((y for y in range(3*x+1,3*x+4)) for x in range(4))
 xRows = xTable.Rows
 self.assertEqual(xRows.ImplementationName, 'SwXTableRows')
 self.assertTrue(xRows.supportsService('com.sun.star.text.TableRows'))
@@ -369,7 +369,7 @@ class CheckTable(unittest.TestCase):
 xDoc.Text.insertTextContent(xCursor, xTable, False)
 xTable.ChartColumnAsLabel = False
 xTable.ChartRowAsLabel = False
-xTable.Data = ((1, 2, 3), (4, 5, 6), (7, 8, 9), (10, 11, 12))
+xTable.Data = ((y for y in range(3*x+1,3*x+4)) for x in range(4))
 xRows = xTable.Rows
 xRows.insertByIndex(1, 2)
 nan = float('nan')
@@ -411,7 +411,7 @@ class CheckTable(unittest.TestCase):
 xDoc.Text.insertTextContent(xCursor, xTable, False)
 xTable.ChartColumnAsLabel = False
 xTable.ChartRowAsLabel = False
-xTable.Data = ((1, 2, 3), (4, 5, 6), (7, 8, 9), (10, 11, 12))
+xTable.Data = ((y for y in range(3*x+1,3*x+4)) for x in range(4))
 self.assertTrue(xTable.Name == 'Table1')
 self.assertIn('com.sun.star.text.GenericTextDocument', 
xDoc.SupportedServiceNames)
 xChartdataprovider = 
xDoc.createInstance('com.sun.

Bug Report

[noreply]

Hello, I'm a Libreoffice. I'ts just for reporting a bug in LibreOffice 
for Debian based systems (running on Elementary OS -> Ubuntu 16.04). 
There is a problem in the returning from the edition of an OLE object, 
when press scape, LibreOffice crashes, also in secure mode. It also 
fails to insert special characters in OLE mode.


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

Re: Implementing accessibility non-regression check tool

[Samuel Thibault]

Hello,

So there was a presentation about this tool at FOSDEM, the video
recording is already available on
https://fosdem.org/2018/schedule/event/ode_testing/
Basically, the tool (improved a bit since FOSDEM) is currently reporting
about 8000 warnings, i.e. 8 per file on average. I have attached the
evolution over time, we clearly see the migration to .ui files during
4.0 :) Looking at a few .ui files, there are some false positives, but
not so many, and they are usually based on semantic, so they wouldn't be
detectable anyway, one needs to mark them as such anyway. There are some
errors too (parsing error or missing targets), they are quite rare.

We have discussed with various people at FOSDEM about their feeling
on it, and thought how to proceed from there. Our goal is to achieve
zero-regression and fixing existing issues on the long run, while
avoiding to bother developers too hard. Our fears is that the tool might
produce too many false positives, that people need to be taught how to
fix the true positives, and that we don't want to do several a11y-fix
passes over all .ui files.

We thought about the following planning, step by step:

- Add to the build process error checking (only the hard errors such as
bogus target names). There are only a few existing issues, so we can fix
them alongside, and people won't introduce many, so making them errors
already shouldn't be bothering.

- Add to make check warning checking, one kind of warning at a time,
with suppression files alongside, so that the tool only displays "
suppressed warnings" and new warnings introduced by developers from
there. These warnings would point to wiki pages explaining the ins and
outs of the issues and how to fix them. Introducing warnings one kind
of warning at a time should leave time to developers for learning the
accessibility rules progressively. It should also allow to observe how
well false positives are treated before enabling all warnings.

- When we get more and more confident that warnings are solid, we can
make them fatal (one kind at a time), to really enforce non-regression.

- At the same time, we would work on fixing issues raised by the tool on
some set of dialog boxes, to check that fixing them does provide good
accessibility, and to what extent we want to introduce more warnings to
reach good accessibility.

- At some point we'll get confident that we won't introduce other
big classes of warnings over hundreds of .ui files. That's the point
where we can say "ok, let's start fixing the existing issues over
all .ui files once for good". We can then run through .ui files one
by one, fixing the issues and removing the corresponding suppression
lines. These could be used as "easy hacks" entries, they are usually
just a few lines to fix.

The progression of all of this could be monitored with statistics
reported e.g. in the minutes of ESC calls.

What do people think about this plan?

Samuel


libreoffice.eps
Description: PostScript document
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Eike Rathke]

 vcl/source/window/builder.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit adff6293ce22d84e5a380aa649e7d0f0ffdc4d80
Author: Eike Rathke 
Date:   Tue Feb 13 00:22:44 2018 +0100

Blind fix for MERGELIBS build

It's g_aMergedLib instead of g_aMergedLibs, and osl::Module is not a
unique_ptr or somesuch..

commit 707f787cd991f9c59712cd3020d127d09605c792
AuthorDate: Sun Feb 11 00:01:44 2018 +0100
CommitDate: Mon Feb 12 22:27:55 2018 +0100

Change-Id: I1f0266d189546dfe3b0d9eb449c878daebbf0da6

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index becc75d63f41..8deda5a66b83 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1115,7 +1115,7 @@ void VclBuilder::preload()
 #ifndef DISABLE_DYNLOADING
 
 #if ENABLE_MERGELIBS
-g_aMergedLibs->loadRelative(&thisModule, SVLIBRARY("merged"));
+g_aMergedLib.loadRelative(&thisModule, SVLIBRARY("merged"));
 #endif
 // find -name '*ui*' | xargs grep 'class=".*lo-' |
 // sed 's/.*class="//' | sed 's/-.*$//' | sort | uniq
@@ -1643,8 +1643,8 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 bool ok = false;
 #if ENABLE_MERGELIBS
 if (!g_aMergedLib.is())
-g_aMergedLib->loadRelative(&thisModule, 
SVLIBRARY("merged"));
-ok = g_aMergedLib->getFunctionSymbol(sFunction);
+g_aMergedLib.loadRelative(&thisModule, 
SVLIBRARY("merged"));
+ok = g_aMergedLib.getFunctionSymbol(sFunction);
 #endif
 if (!ok)
 ok = pModule->loadRelative(&thisModule, sModule);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth]

 sw/qa/extras/ooxmlexport/data/tdf106541_noinheritChapterNumbering.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |   17 
++
 2 files changed, 17 insertions(+)

New commits:
commit ed8221aa0b1550834f8ca18ca3af21f2a41e678d
Author: Justin Luth 
Date:   Sat Feb 10 13:38:34 2018 +0300

tdf#106541 preventative unit test: don't force inheritance

In LO, it appears to be impossible for a style based on a
Chapter Numbering List style to inherit the numbering and outline
level. Ensure that any fix for Word-authored documents that DO
inherit this don't break round-tripping natively created docx files.

Change-Id: I0cd4c25fbc7cd60346fcd949d5a3b89c2b311dbd
Reviewed-on: https://gerrit.libreoffice.org/49544
Tested-by: Jenkins 
Reviewed-by: Justin Luth 

diff --git 
a/sw/qa/extras/ooxmlexport/data/tdf106541_noinheritChapterNumbering.odt 
b/sw/qa/extras/ooxmlexport/data/tdf106541_noinheritChapterNumbering.odt
new file mode 100644
index ..2408ecf550e0
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/tdf106541_noinheritChapterNumbering.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 00448c979dbe..b7acdffbdc16 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -346,6 +346,23 @@ DECLARE_OOXMLEXPORT_TEST(testNumberingFont, 
"numbering-font.docx")
 CPPUNIT_ASSERT_EQUAL(OUString("Verdana"), getProperty(xStyle, 
"CharFontName"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf106541_noinheritChapterNumbering, 
"tdf106541_noinheritChapterNumbering.odt")
+{
+// in LO, it appears that styles based on the Chapter Numbering style 
explicitly sets the
+// numbering style/outline level to 0 by default, and prevents inheriting 
directly from "Outline" style.
+// Adding this preventative unit test to ensure that any fix for tdf106541 
doesn't make incorrect assumptions.
+CPPUNIT_ASSERT_EQUAL(OUString("Outline"), 
getProperty(getParagraph(1), "NumberingStyleName"));
+OUString sPara3NumberingStyle = getProperty(getParagraph(3), 
"NumberingStyleName");
+CPPUNIT_ASSERT_EQUAL(sPara3NumberingStyle, 
getProperty(getParagraph(4), "NumberingStyleName"));
+
+xmlDocPtr pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, "//body/txt/Special", 3);  //three of the four 
paragraphs have numbering
+assertXPath(pXmlDoc, "//body/txt[1]/Special", "rText", "1");
+assertXPath(pXmlDoc, "//body/txt[2]/Special", 0); //second paragraph style 
disables numbering
+assertXPath(pXmlDoc, "//body/txt[3]/Special", "rText", "I.");
+assertXPath(pXmlDoc, "//body/txt[4]/Special", "rText", "II.");
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf53856_conflictingStyle, 
"tdf53856_conflictingStyle.docx")
 {
 // The "Text" style conflicted with builtin paragraph style Caption -> Text
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

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

New commits:
commit c6b702cdd50003f756247e6352357e535f7167a0
Author: Michael Meeks 
Date:   Tue Feb 13 07:11:57 2018 +0100

Add missing SVLIBRARY include.

Change-Id: I10a1d9430f38499d77ad528ef98cff260873d4de

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 8deda5a66b83..353db7d5c633 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -44,6 +44,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #ifdef DISABLE_DYNLOADING
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 filter/source/graphicfilter/icgm/actimpr.cxx |2 
 filter/source/msfilter/msdffimp.cxx  |  259 +--
 include/vcl/BitmapTools.hxx  |2 
 3 files changed, 130 insertions(+), 133 deletions(-)

New commits:
commit 3bc228a1dd2f85e92ca341d16cb86e6eedef5eb7
Author: Noel Grandin 
Date:   Mon Feb 12 10:48:13 2018 +0200

use RawBitmap and BitmapEx in DffPropertyReader

part of making Bitmap an internal feature of vcl

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

diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx 
b/filter/source/graphicfilter/icgm/actimpr.cxx
index 5ec28efb1a89..fc701f64f570 100644
--- a/filter/source/graphicfilter/icgm/actimpr.cxx
+++ b/filter/source/graphicfilter/icgm/actimpr.cxx
@@ -555,7 +555,7 @@ void CGMImpressOutAct::DrawBitmap( CGMBitmapDescriptor* 
pBmpDesc )
 if ( pBmpDesc->mbVMirror )
 nMirr |= BmpMirrorFlags::Vertical;
 if ( nMirr != BmpMirrorFlags::NONE )
-pBmpDesc->mxBitmap.Mirror( nMirr ); // FIXME
+pBmpDesc->mxBitmap.Mirror( nMirr );
 
 mpCGM->ImplMapPoint( aOrigin );
 mpCGM->ImplMapX( fdx );
diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index ffd6cfda2ef0..6743f503480e 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -42,6 +42,7 @@
 #include 
 #include 
 #include 
+#include 
 #include "viscache.hxx"
 
 // SvxItem-Mapping. Is needed to successfully include the SvxItem-Header
@@ -,164 +1112,160 @@ void ApplyRectangularGradientAsBitmap( const 
SvxMSDffManager& rManager, SvStream
 double fFocusX = rManager.GetPropertyValue( DFF_Prop_fillToRight, 0 ) 
/ 65536.0;
 double fFocusY = rManager.GetPropertyValue( DFF_Prop_fillToBottom, 0 ) 
/ 65536.0;
 
-Bitmap aBitmap( aBitmapSizePixel, 24 );
-BitmapWriteAccess* pAcc = aBitmap.AcquireWriteAccess();
-if ( pAcc )
+vcl::bitmap::RawBitmap aBitmap(aBitmapSizePixel);
+
+for ( long nY = 0; nY < aBitmapSizePixel.Height(); nY++ )
 {
-for ( long nY = 0; nY < aBitmapSizePixel.Height(); nY++ )
+for ( long nX = 0; nX < aBitmapSizePixel.Width(); nX++ )
 {
-Scanline pScanline = pAcc->GetScanline(nY);
-for ( long nX = 0; nX < aBitmapSizePixel.Width(); nX++ )
-{
-double fX = static_cast< double >( nX ) / 
aBitmapSizePixel.Width();
-double fY = static_cast< double >( nY ) / 
aBitmapSizePixel.Height();
+double fX = static_cast< double >( nX ) / 
aBitmapSizePixel.Width();
+double fY = static_cast< double >( nY ) / 
aBitmapSizePixel.Height();
 
-double fD, fDist;
-if ( fX < fFocusX )
+double fD, fDist;
+if ( fX < fFocusX )
+{
+if ( fY < fFocusY )
 {
-if ( fY < fFocusY )
+if ( fX > fY )
 {
-if ( fX > fY )
-{
-fDist = fY;
-fD = fFocusY;
-}
-else
-{
-fDist = fX;
-fD = fFocusX;
-}
+fDist = fY;
+fD = fFocusY;
 }
 else
 {
-if ( fX > ( 1 - fY ) )
-{
-fDist = 1 - fY;
-fD = 1 - fFocusY;
-}
-else
-{
-fDist = fX;
-fD = fFocusX;
-}
+fDist = fX;
+fD = fFocusX;
 }
 }
 else
 {
-if ( fY < fFocusY )
+if ( fX > ( 1 - fY ) )
 {
-if ( ( 1 - fX ) > fY )
-{
-fDist = fY;
-fD = fFocusY;
-}
-else
-{
-fDist = 1 - fX;
-fD = 1 - fFocusX;
-}
+fDist = 1 - fY;
+fD = 1 - fF

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

[Noel Grandin]

 filter/source/graphicfilter/ipbm/ipbm.cxx |   55 +-
 filter/source/graphicfilter/iras/iras.cxx |   45 
 2 files changed, 34 insertions(+), 66 deletions(-)

New commits:
commit 5ea3a708c7d6a8088e438e021a07e5a6508daa74
Author: Noel Grandin 
Date:   Mon Feb 12 11:04:00 2018 +0200

use RawBitmap in RASReader

part of making Bitmap an internal detail of vcl

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

diff --git a/filter/source/graphicfilter/iras/iras.cxx 
b/filter/source/graphicfilter/iras/iras.cxx
index 810915dc09a7..251c3cf480b3 100644
--- a/filter/source/graphicfilter/iras/iras.cxx
+++ b/filter/source/graphicfilter/iras/iras.cxx
@@ -19,7 +19,7 @@
 
 
 #include 
-#include 
+#include 
 
 class FilterConfigItem;
 
@@ -50,7 +50,7 @@ private:
 sal_Int32   mnColorMapType, mnColorMapSize;
 sal_uInt8   mnRepCount, mnRepVal;   // RLE Decoding
 
-boolImplReadBody(BitmapWriteAccess * pAcc);
+boolImplReadBody(vcl::bitmap::RawBitmap&, 
std::vector const & rvPalette);
 boolImplReadHeader();
 sal_uInt8   ImplGetByte();
 
@@ -97,7 +97,7 @@ bool RASReader::ReadRAS(Graphic & rGraphic)
 return false;
 
 bool bPalette(false);
-BitmapPalette aPalette;
+std::vector aPalette;
 
 bool bOk = true;
 if ( mnDstBitsPerPix <= 8 ) // pallets pictures
@@ -116,7 +116,7 @@ bool RASReader::ReadRAS(Graphic & rGraphic)
 
 if ( ( mnDstColors >= 2 ) && ( ( mnColorMapSize % 3 ) == 0 ) )
 {
-aPalette.SetEntryCount(mnDstColors);
+aPalette.resize(mnDstColors);
 sal_uInt16  i;
 sal_uInt8   nRed[256], nGreen[256], nBlue[256];
 for ( i = 0; i < mnDstColors; i++ ) m_rRAS.ReadUChar( nRed[ i 
] );
@@ -124,7 +124,7 @@ bool RASReader::ReadRAS(Graphic & rGraphic)
 for ( i = 0; i < mnDstColors; i++ ) m_rRAS.ReadUChar( nBlue[ i 
] );
 for ( i = 0; i < mnDstColors; i++ )
 {
-aPalette[i] = BitmapColor(nRed[ i ], nGreen[ i ], nBlue[ i 
]);
+aPalette[i] = Color(nRed[ i ], nGreen[ i ], nBlue[ i ]);
 }
 bPalette = true;
 }
@@ -138,11 +138,11 @@ bool RASReader::ReadRAS(Graphic & rGraphic)
 if (!bPalette)
 {
 mnDstColors = 1 << mnDstBitsPerPix;
-aPalette.SetEntryCount(mnDstColors);
+aPalette.resize(mnDstColors);
 for ( sal_uInt16 i = 0; i < mnDstColors; i++ )
 {
 sal_uLong nCount = 255 - ( 255 * i / ( mnDstColors - 1 ) );
-aPalette[i] = BitmapColor(static_cast(nCount), 
static_cast(nCount), static_cast(nCount));
+aPalette[i] = Color(static_cast(nCount), 
static_cast(nCount), static_cast(nCount));
 }
 bPalette = true;
 }
@@ -172,22 +172,13 @@ bool RASReader::ReadRAS(Graphic & rGraphic)
 return false;
 }
 
-Bitmap aBmp(Size(mnWidth, mnHeight), mnDstBitsPerPix);
-Bitmap::ScopedWriteAccess pAcc(aBmp);
-if (!pAcc)
-return false;
-
-if (bPalette)
-{
-pAcc->SetPalette(aPalette);
-}
-
+vcl::bitmap::RawBitmap aBmp(Size(mnWidth, mnHeight));
 
 // read in the bitmap data
-mbStatus = ImplReadBody(pAcc.get());
+mbStatus = ImplReadBody(aBmp, aPalette);
 
 if ( mbStatus )
-rGraphic = aBmp;
+rGraphic = vcl::bitmap::CreateFromData(std::move(aBmp));
 
 return mbStatus;
 }
@@ -228,7 +219,7 @@ bool RASReader::ImplReadHeader()
 return mbStatus;
 }
 
-bool RASReader::ImplReadBody(BitmapWriteAccess * pAcc)
+bool RASReader::ImplReadBody(vcl::bitmap::RawBitmap& rBitmap, 
std::vector const & rvPalette)
 {
 sal_Int32 x, y;
 sal_uInt8nRed, nGreen, nBlue;
@@ -239,7 +230,6 @@ bool RASReader::ImplReadBody(BitmapWriteAccess * pAcc)
 sal_uInt8 nDat = 0;
 for (y = 0; y < mnHeight && mbStatus; ++y)
 {
-Scanline pScanline = pAcc->GetScanline(y);
 for (x = 0; x < mnWidth && mbStatus; ++x)
 {
 if (!(x & 7))
@@ -248,9 +238,9 @@ bool RASReader::ImplReadBody(BitmapWriteAccess * pAcc)
 if (!m_rRAS.good())
 mbStatus = false;
 }
-pAcc->SetPixelOnData(pScanline, x, BitmapColor(
+rBitmap.SetPixel(y, x, rvPalette[
 sal::static_int_cast< sal_uInt8 >(
-nDat >> ( ( x & 7 ) ^ 7 )) ));
+nDat >> ( ( x & 7 ) ^ 7 ))] );
 }
 if (!( ( x - 1 ) & 0x8 ) )
 {
@@ -265,11 +255,10 @@ bool

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

[Noel Grandin]

 avmedia/source/viewer/mediawindow.cxx  |4 +--
 avmedia/source/viewer/mediawindow_impl.cxx |   14 +-
 basctl/source/basicide/baside2.cxx |   10 +++
 basctl/source/basicide/baside2b.cxx|   38 ++---
 basctl/source/basicide/basides1.cxx|   10 +++
 basctl/source/basicide/layout.cxx  |2 -
 basctl/source/basicide/objdlg.cxx  |6 ++--
 basctl/source/dlged/dlged.cxx  |   36 +--
 basctl/source/dlged/dlgedobj.cxx   |   24 +-
 basctl/source/dlged/propbrw.cxx|8 +++---
 basic/source/runtime/inputbox.cxx  |6 ++--
 11 files changed, 79 insertions(+), 79 deletions(-)

New commits:
commit 1adb1a320a7e9832a41545bde13fd59d27ce7954
Author: Noel Grandin 
Date:   Mon Feb 12 16:48:57 2018 +0200

loplugin:changetoolsgen in avmedia..basic

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

diff --git a/avmedia/source/viewer/mediawindow.cxx 
b/avmedia/source/viewer/mediawindow.cxx
index a3a61feaa2c5..df416bb96db7 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -328,8 +328,8 @@ bool MediaWindow::isMediaURL( const OUString& rURL, const 
OUString& rReferer, bo
 {
 const awt::Size aAwtSize( 
xPlayer->getPreferredPlayerWindowSize() );
 
-pPreferredSizePixel->Width() = aAwtSize.Width;
-pPreferredSizePixel->Height() = aAwtSize.Height;
+pPreferredSizePixel->setWidth( aAwtSize.Width );
+pPreferredSizePixel->setHeight( aAwtSize.Height );
 }
 }
 }
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx 
b/avmedia/source/viewer/mediawindow_impl.cxx
index c8af35df34bf..1d1f5fe946cb 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -296,8 +296,8 @@ Size MediaWindowImpl::getPreferredSize() const
 {
 awt::Size aPrefSize( mxPlayer->getPreferredPlayerWindowSize() );
 
-aRet.Width() = aPrefSize.Width;
-aRet.Height() = aPrefSize.Height;
+aRet.setWidth( aPrefSize.Width );
+aRet.setHeight( aPrefSize.Height );
 }
 
 return aRet;
@@ -532,7 +532,7 @@ void MediaWindowImpl::Resize()
 const sal_Int32 nControlHeight = 
mpMediaWindowControl->GetSizePixel().Height();
 const sal_Int32 nControlY = std::max(aCurSize.Height() - 
nControlHeight - nOffset, 0L);
 
-aPlayerWindowSize.Height() = (nControlY - (nOffset << 1));
+aPlayerWindowSize.setHeight( nControlY - (nOffset << 1) );
 mpMediaWindowControl->SetPosSizePixel(Point(nOffset, nControlY ), 
Size(aCurSize.Width() - (nOffset << 1), nControlHeight));
 }
 if (mpChildWindow)
@@ -613,13 +613,13 @@ void MediaWindowImpl::Paint(vcl::RenderContext& 
rRenderContext, const tools::Rec
 
 if (fLogoWH < (double(aVideoRect.GetWidth()) / 
aVideoRect.GetHeight()))
 {
-aLogoSize.Width() = long(aVideoRect.GetHeight() * fLogoWH);
-aLogoSize.Height() = aVideoRect.GetHeight();
+aLogoSize.setWidth( long(aVideoRect.GetHeight() * fLogoWH) );
+aLogoSize.setHeight( aVideoRect.GetHeight() );
 }
 else
 {
-aLogoSize.Width() = aVideoRect.GetWidth();
-aLogoSize.Height()= long(aVideoRect.GetWidth() / fLogoWH);
+aLogoSize.setWidth( aVideoRect.GetWidth() );
+aLogoSize.setHeight( long(aVideoRect.GetWidth() / fLogoWH) );
 }
 }
 
diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index a2415818def2..43d7d0fd9f19 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -131,7 +131,7 @@ void lcl_PrintHeader( Printer* pPrinter, sal_uInt16 nPages, 
sal_uInt16 nCurPage,
 {
 aFont.SetWeight( WEIGHT_NORMAL );
 pPrinter->SetFont( aFont );
-aPos.X() += pPrinter->GetTextWidth( rTitle );
+aPos.setX( aPos.X() + pPrinter->GetTextWidth( rTitle ) );
 
 if( bOutput )
 {
@@ -810,8 +810,8 @@ sal_Int32 ModulWindow::FormatAndPrint( Printer* pPrinter, 
sal_Int32 nPrintPage )
 }
 
 Size aPaperSz = pPrinter->GetOutputSize();
-aPaperSz.Width() -= (Print::nLeftMargin + Print::nRightMargin);
-aPaperSz.Height() -= (Print::nTopMargin + Print::nBottomMargin);
+aPaperSz.setWidth( aPaperSz.Width() - (Print::nLeftMargin + 
Print::nRightMargin) );
+aPaperSz.setHeight( aPaperSz.Height() - (Print::nTopMargin + 
Print::nBottomMargin) );
 
 // nLinepPage is not correct if there's a line break
 sal_Int32 nLinespPage = aPaperSz.Height()/nLineH

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

[Yousuf Philips]

 sw/uiconfig/sglobal/menubar/menubar.xml |  139 +---
 1 file changed, 78 insertions(+), 61 deletions(-)

New commits:
commit 18d78dac064bdb16c54c89563d8df22803e84083
Author: Yousuf Philips 
Date:   Thu Feb 8 01:10:34 2018 +0400

tdf#103733 Unify writer master doc menu with writer

Change-Id: I147544acc2b783538f5a69fd0cdad1837b0abbd0
Reviewed-on: https://gerrit.libreoffice.org/49395
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 

diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml 
b/sw/uiconfig/sglobal/menubar/menubar.xml
index 614025b0fa5d..ab133daf836c 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -20,7 +20,7 @@
   
 
   
-  
+  
   
   
   
@@ -48,7 +48,14 @@
   
   
   
-  
+  
+
+  
+  
+  
+  
+
+  
   
 
   
@@ -118,7 +125,9 @@
   
   
   
+  
   
+  
   
   
   
@@ -156,8 +165,8 @@
   
   
 
-  
-  
+  
+  
   
   
   
@@ -196,7 +205,7 @@
   
   
   
-  
+  
   
   
   
@@ -222,7 +231,14 @@
   
 
   
-  
+  
+
+  
+  
+  
+  
+
+  
   
   
   
@@ -266,7 +282,9 @@
   
 
   
-  
+  
+  
+  
   
   
   
@@ -278,6 +296,7 @@
 
   
   
+  
   
   
   
@@ -321,41 +340,8 @@
 
   
   
-  
-  
   
-  
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
-  
+  
 
   
   
@@ -452,10 +438,10 @@
   
   
   
-  
-  
   
   
+  
+  
   
   
 
@@ -503,12 +489,6 @@
   
 
   
-  
-
-  
-  
-
-  
   
   
   
@@ -519,6 +499,8 @@
   
   
   
+  
+  
   
   
   
@@ -572,8 +554,6 @@
   
   
   
-  
-  
   
   
   
@@ -585,7 +565,10 @@
   
   
   
+  
+  
   
+  
   
   
   
@@ -664,6 +647,50 @@
   
 
   
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+  
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
   
 
   
@@ -697,16 +724,6 @@
   
   
   
-  
-
-  
-  
-  
-  
-  
-  
-
-  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Yousuf Philips]

 sw/uiconfig/swriter/ui/notebookbar_single.ui |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 71efbe9244818ae5a4245e7c7854b81fbafd16f7
Author: Yousuf Philips 
Date:   Fri Feb 9 16:34:15 2018 +0400

Notebookbar Single: Fix context glitch and spacing

Change-Id: I9417b45b190bab746e5f9fa08b7076b4488bcf16
Reviewed-on: https://gerrit.libreoffice.org/49492
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 

diff --git a/sw/uiconfig/swriter/ui/notebookbar_single.ui 
b/sw/uiconfig/swriter/ui/notebookbar_single.ui
index 7266c9019dbc..e75440e41e2a 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_single.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_single.ui
@@ -20,6 +20,8 @@
 True
 False
 center
+6
+6
 3
 
   
@@ -761,7 +763,7 @@
   
 
 
-  
+  
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: tools/Config.cpp

[Pranav Kant]

 tools/Config.cpp |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 463fc6044021b94440701bd80fb7a9a7ee0ae2d0
Author: Pranav Kant 
Date:   Tue Feb 13 12:33:01 2018 +0530

loolconfig: set-raw-config -> set

Change-Id: I7821bcf7bf8a6b8247e824d18b1d9f29b8db8851

diff --git a/tools/Config.cpp b/tools/Config.cpp
index 79f4398b..b5c815af 100644
--- a/tools/Config.cpp
+++ b/tools/Config.cpp
@@ -102,7 +102,7 @@ void Config::displayHelp()
 #if ENABLE_SUPPORT_KEY
   << "set-support-key\n"
 #endif
-  << "set-raw-config  " << std::endl;
+  << "set  " << std::endl;
 }
 
 void Config::defineOptions(OptionSet& optionSet)
@@ -299,7 +299,7 @@ int Config::main(const std::vector& args)
 changed = true;
 }
 #endif
-else if (args[0] == "set-raw-config")
+else if (args[0] == "set")
 {
 if (args.size() == 3)
 {
@@ -317,9 +317,9 @@ int Config::main(const std::vector& args)
 std::cerr << "No property, \"" << args[1] << "\"," << " found 
in config file." << std::endl;
 }
 else
-std::cerr << "set-raw-config expects a key and value as arguments" 
<< std::endl
+std::cerr << "set expects a key and value as arguments" << 
std::endl
   << "Eg: " << std::endl
-  << "set-raw-config logging.level trace" << std::endl;
+  << "set logging.level trace" << std::endl;
 
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg

[andreas kainz]

 icon-themes/elementary/cmd/lc_flowchartshapes.flowchart-sort.png |binary
 icon-themes/elementary_svg/cmd/lc_flowchartshapes.flowchart-sort.svg |2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1c8f53ae76b18c015095c9998df617a7800370ce
Author: andreas kainz 
Date:   Tue Feb 13 08:35:52 2018 +0100

tdf#115661 Elementary icon fix lc_flowchartshapes.flowchart-sort

Change-Id: I897bd294a5352b44de35b035a58368353f938e0d
Reviewed-on: https://gerrit.libreoffice.org/49619
Reviewed-by: andreas_kainz 
Tested-by: andreas_kainz 

diff --git a/icon-themes/elementary/cmd/lc_flowchartshapes.flowchart-sort.png 
b/icon-themes/elementary/cmd/lc_flowchartshapes.flowchart-sort.png
index 478769d0ce78..d641ee85fb31 100644
Binary files a/icon-themes/elementary/cmd/lc_flowchartshapes.flowchart-sort.png 
and b/icon-themes/elementary/cmd/lc_flowchartshapes.flowchart-sort.png differ
diff --git 
a/icon-themes/elementary_svg/cmd/lc_flowchartshapes.flowchart-sort.svg 
b/icon-themes/elementary_svg/cmd/lc_flowchartshapes.flowchart-sort.svg
index d7e6df08962f..08a288d1fe25 100644
--- a/icon-themes/elementary_svg/cmd/lc_flowchartshapes.flowchart-sort.svg
+++ b/icon-themes/elementary_svg/cmd/lc_flowchartshapes.flowchart-sort.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits