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

[Heiko Tietze]

 sd/uiconfig/simpress/ui/optimpressgeneralpage.ui |2 +-
 sw/uiconfig/swriter/ui/optcompatpage.ui  |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 5f9812e65e6c3c147c8143a046f934be4433fca6
Author: Heiko Tietze 
Date:   Mon Dec 11 15:55:06 2017 +0100

tdf#114310 Removed '(in current document)' from compatibility options

Change-Id: Ie91ca2c9aac9b3ab7ca103bf2e6b55d453255d77
Reviewed-on: https://gerrit.libreoffice.org/46242
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 

diff --git a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui 
b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
index 057f9877a511..fbee20afb08d 100644
--- a/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
+++ b/sd/uiconfig/simpress/ui/optimpressgeneralpage.ui
@@ -619,7 +619,7 @@
 
 
   
-Add _spacing between paragraphs 
and tables (in current document)
+Add _spacing between paragraphs 
and tables
 True
 True
 False
diff --git a/sw/uiconfig/swriter/ui/optcompatpage.ui 
b/sw/uiconfig/swriter/ui/optcompatpage.ui
index ed4a0c965a56..f297aeb6bc04 100644
--- a/sw/uiconfig/swriter/ui/optcompatpage.ui
+++ b/sw/uiconfig/swriter/ui/optcompatpage.ui
@@ -54,8 +54,8 @@
 1
 
   Use printer metrics for document 
formatting
-  Add spacing between paragraphs and tables (in 
current document)
-  Add paragraph and table spacing at tops of pages 
(in current document)
+  Add spacing between paragraphs and tables
+  Add paragraph and table spacing at tops of 
pages
   Use OpenOffice.org 1.1 tabstop formatting
   Do not add leading (extra space) between lines 
of text
   Use OpenOffice.org 1.1 line spacing
@@ -66,7 +66,7 @@
   Expand word space on lines with manual line 
breaks in justified paragraphs
   Protect form
   MS Word-compatible trailing blanks
-  Tolerate white lines of PDF page backgrounds for 
compatibility with old documents (in current document)
+  Tolerate white lines of PDF page backgrounds for 
compatibility with old documents
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/inc dbaccess/source officecfg/registry reportbuilder/README reportbuilder/registry reportdesign/README wizards/com

[Lionel Elie Mamane]

 dbaccess/inc/strings.hrc|  
  2 +-
 dbaccess/source/ext/macromigration/migrationlog.cxx |  
  2 +-
 officecfg/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu   |  
  2 +-
 officecfg/registry/data/org/openoffice/Setup.xcu|  
  2 +-
 officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs|  
  8 +---
 reportbuilder/README|  
  8 +++-
 reportbuilder/registry/data/org/openoffice/Setup.xcu|  
  3 +--
 reportdesign/README |  
  2 +-
 wizards/com/sun/star/wizards/report/IReportDocument.java|  
  2 +-
 wizards/com/sun/star/wizards/reportbuilder/ReportBuilderImplementation.java |  
  2 +-
 10 files changed, 16 insertions(+), 17 deletions(-)

New commits:
commit fe95086edda6a846b58f4ed568257e3fab46a0da
Author: Lionel Elie Mamane 
Date:   Wed Dec 13 04:27:13 2017 +0100

Remove traces of Report Builder's former status as extension

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

diff --git a/dbaccess/inc/strings.hrc b/dbaccess/inc/strings.hrc
index 47068f43d09e..d046ac5a299e 100644
--- a/dbaccess/inc/strings.hrc
+++ b/dbaccess/inc/strings.hrc
@@ -349,7 +349,7 @@
 #define STR_WARNINGS_DURING_CONNECT 
NC_("STR_WARNINGS_DURING_CONNECT", "Warnings were encountered while connecting 
to the data source. Press \"$buttontext$\" to view them.")
 #define STR_NAMED_OBJECT_ALREADY_EXISTS 
NC_("STR_NAMED_OBJECT_ALREADY_EXISTS", "The name '$#$' already exists.\nPlease 
enter another name." )
 // #i96130# use hard coded name
-#define RID_STR_EXTENSION_NOT_PRESENT   
NC_("RID_STR_EXTENSION_NOT_PRESENT", "The report, \"$file$\", requires the 
Oracle Report Builder feature.")
+#define RID_STR_EXTENSION_NOT_PRESENT   
NC_("RID_STR_EXTENSION_NOT_PRESENT", "The report, \"$file$\", requires the 
Report Builder feature.")
 
 #define STR_COULDNOTCREATE_DRIVERMANAGER
NC_("STR_COULDNOTCREATE_DRIVERMANAGER", "Cannot connect to the SDBC driver 
manager (#servicename#).")
 #define STR_NOREGISTEREDDRIVER  
NC_("STR_NOREGISTEREDDRIVER", "A driver is not registered for the URL 
#connurl#.")
diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx 
b/dbaccess/source/ext/macromigration/migrationlog.cxx
index 1d17c8fec1d7..b46894ac0a58 100644
--- a/dbaccess/source/ext/macromigration/migrationlog.cxx
+++ b/dbaccess/source/ext/macromigration/migrationlog.cxx
@@ -316,7 +316,7 @@ namespace dbmm
 break;
 
 case ERR_NEW_STYLE_REPORT:
-pAsciiErrorDescription = "#doc# could not be processed, since 
you don't have the Oracle Report Builder (TM) extension installed.";
+pAsciiErrorDescription = "#doc# could not be processed, since 
you don't have the Report Builder feature installed.";
 aParameterNames.emplace_back("#doc#");
 break;
 
diff --git 
a/officecfg/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu 
b/officecfg/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
index 6bb41178bec2..137da86f2879 100644
--- a/officecfg/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
@@ -143,7 +143,7 @@
   
 
   
-Oracle Report Builder
+Report Builder
   
   
 
diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu 
b/officecfg/registry/data/org/openoffice/Setup.xcu
index 84a2bb68fa52..0472de91f20e 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -769,7 +769,7 @@
   GenericCategories
 
 
-  Base: Oracle Report Builder
+  Base: Report Builder
 
   
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs 
b/officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs
index 98230cea7199..556ddb72c710 100644
--- a/officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/ReportDesign.xcs
@@ -36,17 +36,11 @@
   
 specifies extension settings for the report designer.
   
-  
-
-  Direct download URL to the Oracle(tm) Report Builder 
extension.
-
-http://extensions.go-oo.org
-  
   
 
   Name of the extension.
 
-Oracle(tm) Report Builder
+Report Builder
   
 
 
diff --git a/reportbuilder/README b/reportbuilder/README
index 4bbe2db85936..25f8e85710ef 100644
--- a/reportbuilder/README
+++ b/reportbuil

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

[Noel Grandin]

 include/tools/link.hxx |4 ++--
 include/tools/zcodec.hxx   |2 +-
 tools/source/zcodec/zcodec.cxx |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b0ebc5608e2f56f7377a60f49957a42ef6a89e6a
Author: Noel Grandin 
Date:   Tue Dec 12 15:04:00 2017 +0200

sal_uIntPtr->size_t in ZCodec

to match the underlying fields

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

diff --git a/include/tools/zcodec.hxx b/include/tools/zcodec.hxx
index f5dd99ac7acb..57af7c50c2a1 100644
--- a/include/tools/zcodec.hxx
+++ b/include/tools/zcodec.hxx
@@ -58,7 +58,7 @@ class SAL_WARN_UNUSED TOOLS_DLLPUBLIC ZCodec
 voidUpdateCRC( sal_uInt8 const * pSource, long nDatSize );
 
 public:
-ZCodec( sal_uIntPtr nInBuf = 0x8000UL, sal_uIntPtr nOutBuf 
= 0x8000UL );
+ZCodec( size_t nInBufSize = 32768, size_t nOutBufSize = 
32768 );
 ~ZCodec();
 
 voidBeginCompression( int nCompressLevel = 
ZCODEC_DEFAULT_COMPRESSION, bool updateCrc = false, bool gzLib = false );
diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx
index 385ad7b04b58..bf317594f4af 100644
--- a/tools/source/zcodec/zcodec.cxx
+++ b/tools/source/zcodec/zcodec.cxx
@@ -37,7 +37,7 @@
 
 static const int gz_magic[2] = { 0x1f, 0x8b }; /* gzip magic header */
 
-ZCodec::ZCodec( sal_uIntPtr nInBufSize, sal_uIntPtr nOutBufSize )
+ZCodec::ZCodec( size_t nInBufSize, size_t nOutBufSize )
 : meState(STATE_INIT)
 , mbStatus(false)
 , mbFinish(false)
commit a000ee86e676535a07b28cf6a0b8dd9655164e3f
Author: Noel Grandin 
Date:   Tue Dec 12 14:59:56 2017 +0200

sal_uIntPtr->char* in Link

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

diff --git a/include/tools/link.hxx b/include/tools/link.hxx
index 8b65be4755dd..c4989e0593f3 100644
--- a/include/tools/link.hxx
+++ b/include/tools/link.hxx
@@ -88,8 +88,8 @@ public:
 bool operator !() const { return !IsSet(); }
 
 bool operator <(Link const & other) const {
-sal_uIntPtr ptr1 = reinterpret_cast(function_);
-sal_uIntPtr ptr2 = reinterpret_cast(other.function_);
+char* ptr1 = reinterpret_cast(function_);
+char* ptr2 = reinterpret_cast(other.function_);
 if (ptr1 < ptr2)
 return true;
 else if (ptr1 > ptr2)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 include/svx/contdlg.hxx|3 
 include/svx/galmisc.hxx|2 
 include/svx/svdmodel.hxx   |   26 ++--
 include/svx/svdmrkv.hxx|4 
 include/svx/svdpntv.hxx|6 -
 include/svx/svdview.hxx|6 -
 sd/source/core/drawdoc.cxx |2 
 sd/source/ui/animations/motionpathtag.cxx  |4 
 sd/source/ui/animations/motionpathtag.hxx  |4 
 sd/source/ui/annotations/annotationtag.cxx |4 
 sd/source/ui/annotations/annotationtag.hxx |4 
 sd/source/ui/func/smarttag.cxx |4 
 sd/source/ui/inc/View.hxx  |4 
 sd/source/ui/inc/smarttag.hxx  |4 
 sd/source/ui/view/sdview.cxx   |8 -
 svx/source/dialog/_contdlg.cxx |5 
 svx/source/gallery2/galmisc.cxx|5 
 svx/source/svdraw/svddrgv.cxx  |2 
 svx/source/svdraw/svdmodel.cxx |  154 -
 svx/source/svdraw/svdmrkv1.cxx |8 -
 20 files changed, 112 insertions(+), 147 deletions(-)

New commits:
commit 4c0026725cd6485f0024fd305dc35b8948c06e81
Author: Noel Grandin 
Date:   Tue Dec 12 14:55:17 2017 +0200

sal_uIntPtr->sal_Int32 in GalleryProgress

to match the underlying type on mxProgressBar->setValue

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

diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index 513c36bd1478..602c8283550f 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -127,7 +127,7 @@ class SVX_DLLPUBLIC GalleryProgress
 GalleryProgress( GraphicFilter* pFilter = 
nullptr );
 ~GalleryProgress();
 
-voidUpdate( sal_uIntPtr nVal, sal_uIntPtr 
nMaxVal );
+voidUpdate( sal_Int32 nVal, sal_Int32 nMaxVal 
);
 };
 
 class Gallery;
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index a410aa30d8f2..7e5c291d3491 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -369,10 +369,11 @@ GalleryProgress::~GalleryProgress()
 {
 }
 
-void GalleryProgress::Update( sal_uIntPtr nVal, sal_uIntPtr nMaxVal )
+void GalleryProgress::Update( sal_Int32 nVal, sal_Int32 nMaxVal )
 {
 if( mxProgressBar.is() && nMaxVal )
-mxProgressBar->setValue( std::min( (sal_uIntPtr)( (double) nVal / 
nMaxVal * GALLERY_PROGRESS_RANGE ), (sal_uIntPtr) GALLERY_PROGRESS_RANGE ) );
+mxProgressBar->setValue( std::min( (double) nVal / nMaxVal 
* GALLERY_PROGRESS_RANGE,
+  GALLERY_PROGRESS_RANGE ) 
);
 }
 
 
commit fd88c4b45426600bd09fc47f8df9ac1cb8030e95
Author: Noel Grandin 
Date:   Tue Dec 12 13:44:53 2017 +0200

use std::unique_ptr in SdrModel

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

diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 6649b83f62e0..1293ed60c762 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -157,22 +157,22 @@ protected:
 Fraction   aUIUnitFact;  // see above
 intnUIUnitDecimalMark; // see above
 
-SdrLayerAdmin*  pLayerAdmin;
+std::unique_ptr pLayerAdmin;
 SfxItemPool*pItemPool;
 comphelper::IEmbeddedHelper*
 m_pEmbeddedHelper; // helper for embedded objects to get 
rid of the SfxObjectShell
-SdrOutliner*pDrawOutliner;  // an Outliner for outputting text
-SdrOutliner*pHitTestOutliner;// an Outliner for the HitTest
-SdrOutliner*pChainingOutliner; // an Outliner for chaining overflowing 
text
+std::unique_ptr pDrawOutliner;  // an Outliner for outputting 
text
+std::unique_ptr pHitTestOutliner;// an Outliner for the 
HitTest
+std::unique_ptr pChainingOutliner; // an Outliner for 
chaining overflowing text
 sal_Int32   mnDefTextHgt;// Default text height in logical units
 VclPtr  pRefOutDev; // ReferenceDevice for the EditEngine
 rtl::Reference< SfxStyleSheetBasePool > mxStyleSheetPool;
 SfxStyleSheet*  pDefaultStyleSheet;
 SfxStyleSheet* mpDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj; // #i119287#
 sfx2::LinkManager* pLinkManager;   // LinkManager
-std::deque* pUndoStack;
-std::deque* pRedoStack;
-SdrUndoGroup*   pAktUndoGroup;  // for deeper
+std::unique_ptr>> pUndoStack;
+std::unique_ptr>> pRedoStack;
+std::unique_ptr pAktUndoGroup;  // for deeper
 sal_uInt16  nUndoLevel; // undo nesting
 boolbMyPool:1;// to clean up pMyPool from 303a
 boolmbUndoEnabled:1;  // If f

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

[Noel Grandin]

 include/svx/svddrag.hxx|   23 +--
 include/svx/svdmodel.hxx   |8 ++--
 sd/source/ui/animations/motionpathtag.cxx  |2 -
 sd/source/ui/annotations/annotationtag.cxx |2 -
 svx/source/engine3d/dragmt3d.cxx   |2 -
 svx/source/svdraw/svddrag.cxx  |   12 +++---
 svx/source/svdraw/svddrgmt.cxx |   58 ++---
 svx/source/svdraw/svdmodel.cxx |   14 +++
 svx/source/svdraw/svdomeas.cxx |2 -
 svx/source/svdraw/svdopath.cxx |   22 +--
 svx/source/svdraw/svdtext.cxx  |4 +-
 11 files changed, 74 insertions(+), 75 deletions(-)

New commits:
commit 078ee7560d4c7ac3883c0a625023ad22ec8dc326
Author: Noel Grandin 
Date:   Tue Dec 12 11:24:23 2017 +0200

sal_uIntPtr->sal_Int32 in SdrModel

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

diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 6808db46cc3f..d7924d795a80 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -164,7 +164,7 @@ protected:
 SdrOutliner*pDrawOutliner;  // an Outliner for outputting text
 SdrOutliner*pHitTestOutliner;// an Outliner for the HitTest
 SdrOutliner*pChainingOutliner; // an Outliner for chaining overflowing 
text
-sal_uIntPtr   nDefTextHgt;// Default text height in logical 
units
+sal_Int32   mnDefTextHgt;// Default text height in logical units
 VclPtr  pRefOutDev; // ReferenceDevice for the EditEngine
 rtl::Reference< SfxStyleSheetBasePool > mxStyleSheetPool;
 SfxStyleSheet*  pDefaultStyleSheet;
@@ -287,7 +287,7 @@ public:
 const SdrTextObj*GetFormattingTextObj() const;
 // put the TextDefaults (Font,Height,Color) in a Set
 void SetTextDefaults() const;
-static void  SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr 
nDefTextHgt );
+static void  SetTextDefaults( SfxItemPool* pItemPool, sal_Int32 
nDefTextHgt );
 
 SdrOutliner& GetChainingOutliner(const SdrTextObj* pObj) const;
 TextChain *  GetTextChain() const;
@@ -298,8 +298,8 @@ public:
 // If a new MapMode is set on the RefDevice (or similar)
 void RefDeviceChanged(); // not yet implemented
 // default font height in logical units
-void SetDefaultFontHeight(sal_uIntPtr nVal);
-sal_uIntPtr  GetDefaultFontHeight() const   { return 
nDefTextHgt; }
+void SetDefaultFontHeight(sal_Int32 nVal);
+sal_Int32GetDefaultFontHeight() const   { return 
mnDefTextHgt; }
 // default tabulator width for the EditEngine
 void SetDefaultTabulator(sal_uInt16 nVal);
 sal_uInt16   GetDefaultTabulator() const{ return 
nDefaultTabulator; }
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 95532a7b6b34..1290930214a8 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -185,9 +185,9 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, 
::comphelper::IEmbeddedHelper* _pEmbe
 // using static SdrEngineDefaults only if default SvxFontHeight item is not 
available
 const SfxPoolItem* pPoolItem = pItemPool->GetPoolDefaultItem( 
EE_CHAR_FONTHEIGHT );
 if ( pPoolItem )
-nDefTextHgt = static_cast(pPoolItem)->GetHeight();
+mnDefTextHgt = static_cast(pPoolItem)->GetHeight();
 else
-nDefTextHgt = SdrEngineDefaults::GetFontHeight();
+mnDefTextHgt = SdrEngineDefaults::GetFontHeight();
 
 pItemPool->SetPoolDefaultItem( makeSdrTextWordWrapItem( false ) );
 
@@ -689,10 +689,10 @@ SdrPage* SdrModel::AllocPage(bool bMasterPage)
 
 void SdrModel::SetTextDefaults() const
 {
-SetTextDefaults( pItemPool, nDefTextHgt );
+SetTextDefaults( pItemPool, mnDefTextHgt );
 }
 
-void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr 
nDefTextHgt )
+void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_Int32 nDefTextHgt )
 {
 // set application-language specific dynamic pool language defaults
 SvxFontItem aSvxFontItem( EE_CHAR_FONTINFO) ;
@@ -889,10 +889,10 @@ void SdrModel::RefDeviceChanged()
 ImpReformatAllTextObjects();
 }
 
-void SdrModel::SetDefaultFontHeight(sal_uIntPtr nVal)
+void SdrModel::SetDefaultFontHeight(sal_Int32 nVal)
 {
-if (nVal!=nDefTextHgt) {
-nDefTextHgt=nVal;
+if (nVal!=mnDefTextHgt) {
+mnDefTextHgt=nVal;
 Broadcast(SdrHint(SdrHintKind::DefaultFontHeightChange));
 ImpReformatAllTextObjects();
 }
diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx
index 1b7c81b037ec..48621a84560d 100644
--- a/svx/source/svdraw/svdtext.cxx
+++ b/svx/source/svdraw/svdtext.cxx
@@ -137,8 +137,8 @@ void 

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

[Matthias Freund]

 icon-themes/sifr/cmd/32/numberformatthousands.png  |binary
 icon-themes/sifr/cmd/lc_numberformatthousands.png  |binary
 icon-themes/sifr/cmd/sc_numberformatthousands.png  |binary
 icon-themes/sifr_dark/cmd/32/numberformatthousands.png |binary
 icon-themes/sifr_dark/cmd/lc_numberformatthousands.png |binary
 icon-themes/sifr_dark/cmd/sc_numberformatthousands.png |binary
 icon-themes/sifr_svg/cmd/32/numberformatthousands.svg  |  135 
 icon-themes/sifr_svg/cmd/lc_numberformatthousands.svg  |  141 +
 icon-themes/sifr_svg/cmd/sc_numberformatthousands.svg  |  135 
 9 files changed, 411 insertions(+)

New commits:
commit 8782ea036e97c383e0a979ed30c8da955c56877b
Author: Matthias Freund 
Date:   Tue Dec 12 21:32:28 2017 +0100

tdf#75256 New Icon NumberFormatThousands for Sifr

Change-Id: I0c076dafc1c565e77c4bfd1988d1b94a9a82672f
Reviewed-on: https://gerrit.libreoffice.org/46354
Tested-by: Jenkins 
Reviewed-by: Matthias Freund 

diff --git a/icon-themes/sifr/cmd/32/numberformatthousands.png 
b/icon-themes/sifr/cmd/32/numberformatthousands.png
new file mode 100644
index ..cf91bf722449
Binary files /dev/null and b/icon-themes/sifr/cmd/32/numberformatthousands.png 
differ
diff --git a/icon-themes/sifr/cmd/lc_numberformatthousands.png 
b/icon-themes/sifr/cmd/lc_numberformatthousands.png
new file mode 100644
index ..31fe85468611
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_numberformatthousands.png 
differ
diff --git a/icon-themes/sifr/cmd/sc_numberformatthousands.png 
b/icon-themes/sifr/cmd/sc_numberformatthousands.png
new file mode 100644
index ..913403a2e71d
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_numberformatthousands.png 
differ
diff --git a/icon-themes/sifr_dark/cmd/32/numberformatthousands.png 
b/icon-themes/sifr_dark/cmd/32/numberformatthousands.png
new file mode 100644
index ..1231788dc700
Binary files /dev/null and 
b/icon-themes/sifr_dark/cmd/32/numberformatthousands.png differ
diff --git a/icon-themes/sifr_dark/cmd/lc_numberformatthousands.png 
b/icon-themes/sifr_dark/cmd/lc_numberformatthousands.png
new file mode 100644
index ..f50fbacc74df
Binary files /dev/null and 
b/icon-themes/sifr_dark/cmd/lc_numberformatthousands.png differ
diff --git a/icon-themes/sifr_dark/cmd/sc_numberformatthousands.png 
b/icon-themes/sifr_dark/cmd/sc_numberformatthousands.png
new file mode 100644
index ..d5124721dd0e
Binary files /dev/null and 
b/icon-themes/sifr_dark/cmd/sc_numberformatthousands.png differ
diff --git a/icon-themes/sifr_svg/cmd/32/numberformatthousands.svg 
b/icon-themes/sifr_svg/cmd/32/numberformatthousands.svg
new file mode 100644
index ..b4756472d522
--- /dev/null
+++ b/icon-themes/sifr_svg/cmd/32/numberformatthousands.svg
@@ -0,0 +1,135 @@
+
+http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   viewBox="0 0 32 32"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="numberformatthousands.svg"
+   inkscape:version="0.92.2 (unknown)"
+   
inkscape:export-filename="/home/matthias/git/icons/sifr_svg/numberformatthousands.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   width="32"
+   height="32">
+  
+  
+
+  
+  
+
+  
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"; />
+
+http://creativecommons.org/licenses/by-sa/4.0/"; />
+
+  
+The Document Foundation
+  
+
+
+  
+Matthias Freund
+  
+
+  
+  http://creativecommons.org/licenses/by-sa/4.0/";>
+http://creativecommons.org/ns#Reproduction"; />
+http://creativecommons.org/ns#Distribution"; />
+http://creativecommons.org/ns#Notice"; />
+http://creativecommons.org/ns#Attribution"; />
+http://creativecommons.org/ns#DerivativeWorks"; />
+http://creativecommons.org/ns#ShareAlike"; />
+  
+
+  
+  
+  
+  
+
+
+  
+  
+
diff --git a/icon-themes/sifr_svg/cmd/lc_numberformatthousands.svg 
b/icon-themes/sifr_svg/cmd/lc_numberformatthousands.svg
new file mode 100644
index ..5475f9e0bb19
--- /dev/null
+++ b/icon-themes/sifr_svg/cmd/lc_numberformatthousands.svg
@@ -0,0 +1,141 @@
+
+http://www.openswatchbook.org/uri/2009/osb";
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   x

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_svg

[Matthias Freund]

 icon-themes/sifr/cmd/32/numberformatthousands.png  |binary
 icon-themes/sifr/cmd/lc_numberformatthousands.png  |binary
 icon-themes/sifr/cmd/sc_numberformatthousands.png  |binary
 icon-themes/sifr_dark/cmd/32/numberformatthousands.png |binary
 icon-themes/sifr_dark/cmd/lc_numberformatthousands.png |binary
 icon-themes/sifr_dark/cmd/sc_numberformatthousands.png |binary
 icon-themes/sifr_svg/cmd/32/numberformatthousands.svg  |  135 
 icon-themes/sifr_svg/cmd/lc_numberformatthousands.svg  |  141 +
 icon-themes/sifr_svg/cmd/sc_numberformatthousands.svg  |  135 
 9 files changed, 411 insertions(+)

New commits:
commit 93dd23d38b5de1d49227f31e1c24c591e509ebab
Author: Matthias Freund 
Date:   Tue Dec 12 21:32:28 2017 +0100

tdf#75256 New Icon NumberFormatThousands for Sifr

Change-Id: I0c076dafc1c565e77c4bfd1988d1b94a9a82672f
Reviewed-on: https://gerrit.libreoffice.org/46355
Tested-by: Jenkins 
Reviewed-by: Matthias Freund 

diff --git a/icon-themes/sifr/cmd/32/numberformatthousands.png 
b/icon-themes/sifr/cmd/32/numberformatthousands.png
new file mode 100644
index ..cf91bf722449
Binary files /dev/null and b/icon-themes/sifr/cmd/32/numberformatthousands.png 
differ
diff --git a/icon-themes/sifr/cmd/lc_numberformatthousands.png 
b/icon-themes/sifr/cmd/lc_numberformatthousands.png
new file mode 100644
index ..31fe85468611
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_numberformatthousands.png 
differ
diff --git a/icon-themes/sifr/cmd/sc_numberformatthousands.png 
b/icon-themes/sifr/cmd/sc_numberformatthousands.png
new file mode 100644
index ..913403a2e71d
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_numberformatthousands.png 
differ
diff --git a/icon-themes/sifr_dark/cmd/32/numberformatthousands.png 
b/icon-themes/sifr_dark/cmd/32/numberformatthousands.png
new file mode 100644
index ..1231788dc700
Binary files /dev/null and 
b/icon-themes/sifr_dark/cmd/32/numberformatthousands.png differ
diff --git a/icon-themes/sifr_dark/cmd/lc_numberformatthousands.png 
b/icon-themes/sifr_dark/cmd/lc_numberformatthousands.png
new file mode 100644
index ..f50fbacc74df
Binary files /dev/null and 
b/icon-themes/sifr_dark/cmd/lc_numberformatthousands.png differ
diff --git a/icon-themes/sifr_dark/cmd/sc_numberformatthousands.png 
b/icon-themes/sifr_dark/cmd/sc_numberformatthousands.png
new file mode 100644
index ..d5124721dd0e
Binary files /dev/null and 
b/icon-themes/sifr_dark/cmd/sc_numberformatthousands.png differ
diff --git a/icon-themes/sifr_svg/cmd/32/numberformatthousands.svg 
b/icon-themes/sifr_svg/cmd/32/numberformatthousands.svg
new file mode 100644
index ..b4756472d522
--- /dev/null
+++ b/icon-themes/sifr_svg/cmd/32/numberformatthousands.svg
@@ -0,0 +1,135 @@
+
+http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   viewBox="0 0 32 32"
+   version="1.1"
+   id="svg5"
+   sodipodi:docname="numberformatthousands.svg"
+   inkscape:version="0.92.2 (unknown)"
+   
inkscape:export-filename="/home/matthias/git/icons/sifr_svg/numberformatthousands.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   width="32"
+   height="32">
+  
+  
+
+  
+  
+
+  
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"; />
+
+http://creativecommons.org/licenses/by-sa/4.0/"; />
+
+  
+The Document Foundation
+  
+
+
+  
+Matthias Freund
+  
+
+  
+  http://creativecommons.org/licenses/by-sa/4.0/";>
+http://creativecommons.org/ns#Reproduction"; />
+http://creativecommons.org/ns#Distribution"; />
+http://creativecommons.org/ns#Notice"; />
+http://creativecommons.org/ns#Attribution"; />
+http://creativecommons.org/ns#DerivativeWorks"; />
+http://creativecommons.org/ns#ShareAlike"; />
+  
+
+  
+  
+  
+  
+
+
+  
+  
+
diff --git a/icon-themes/sifr_svg/cmd/lc_numberformatthousands.svg 
b/icon-themes/sifr_svg/cmd/lc_numberformatthousands.svg
new file mode 100644
index ..5475f9e0bb19
--- /dev/null
+++ b/icon-themes/sifr_svg/cmd/lc_numberformatthousands.svg
@@ -0,0 +1,141 @@
+
+http://www.openswatchbook.org/uri/2009/osb";
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   x

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - dictionaries

[Aron Budea]

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

New commits:
commit 4c26a1e8137d6428c8e2072f40664868ad171e58
Author: Aron Budea 
Date:   Wed Dec 13 05:38:30 2017 +0200

Updated core
Project: dictionaries  c0a966eb7480615d09ba8fc8a32d26b3e4fc6e49

Revert "Added "official" logo (icon) to English dictionaries"

This reverts commit a4cbc2b1d5c1210e618e02d960ec04944645bd0e.

Change-Id: I7996d1d3ffa9cf9dda41f8a60447211522cbca67
Reviewed-on: https://gerrit.libreoffice.org/46362
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/dictionaries b/dictionaries
index a4cbc2b1d5c1..c0a966eb7480 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit a4cbc2b1d5c1210e618e02d960ec04944645bd0e
+Subproject commit c0a966eb7480615d09ba8fc8a32d26b3e4fc6e49
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-6-0' - en/description.xml en/English.png

[Aron Budea]

 dev/null   |binary
 en/description.xml |3 ---
 2 files changed, 3 deletions(-)

New commits:
commit c0a966eb7480615d09ba8fc8a32d26b3e4fc6e49
Author: Aron Budea 
Date:   Wed Dec 13 05:38:30 2017 +0200

Revert "Added "official" logo (icon) to English dictionaries"

This reverts commit a4cbc2b1d5c1210e618e02d960ec04944645bd0e.

Change-Id: I7996d1d3ffa9cf9dda41f8a60447211522cbca67
Reviewed-on: https://gerrit.libreoffice.org/46362
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/en/English.png b/en/English.png
deleted file mode 100755
index 5e17844..000
Binary files a/en/English.png and /dev/null differ
diff --git a/en/description.xml b/en/description.xml
index 9b58e6a..78d7806 100644
--- a/en/description.xml
+++ b/en/description.xml
@@ -9,7 +9,4 @@
 
 
 
-
-
-
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Dictionary_en.mk en/English.png

[Aron Budea]

 Dictionary_en.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7ac9dd36dcbaef021399b8328d25c8a1ab000e83
Author: Aron Budea 
Date:   Wed Dec 13 04:29:54 2017 +0100

Add logo for English dict to the .mk as well

Change-Id: I9a64cce5dd06f75d536b0740c492358e89e90666
Reviewed-on: https://gerrit.libreoffice.org/46360
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/Dictionary_en.mk b/Dictionary_en.mk
index ce6354e..f42c813 100644
--- a/Dictionary_en.mk
+++ b/Dictionary_en.mk
@@ -12,6 +12,7 @@ $(eval $(call 
gb_Dictionary_Dictionary,dict-en,dictionaries/en))
 $(eval $(call gb_Dictionary_add_root_files,dict-en,\
dictionaries/en/affDescription.txt \
dictionaries/en/changelog.txt \
+   dictionaries/en/English.png \
dictionaries/en/en_AU.aff \
dictionaries/en/en_AU.dic \
dictionaries/en/en_CA.aff \
diff --git a/en/English.png b/en/English.png
old mode 100755
new mode 100644
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dictionaries

[Aron Budea]

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

New commits:
commit acab72a1a2ec6d62407c568ab8f0e198ab2c9063
Author: Aron Budea 
Date:   Wed Dec 13 04:29:54 2017 +0100

Updated core
Project: dictionaries  7ac9dd36dcbaef021399b8328d25c8a1ab000e83

Add logo for English dict to the .mk as well

Change-Id: I9a64cce5dd06f75d536b0740c492358e89e90666
Reviewed-on: https://gerrit.libreoffice.org/46360
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/dictionaries b/dictionaries
index cde2a4aa5184..7ac9dd36dcba 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit cde2a4aa5184e8c6dfa565db50d004a70a12e7d2
+Subproject commit 7ac9dd36dcbaef021399b8328d25c8a1ab000e83
___
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' - dictionaries

[Marco A . G . Pinto]

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

New commits:
commit 2f04492e896529f28726b6d0a9cb08468823e438
Author: Marco A.G.Pinto 
Date:   Wed Dec 6 20:38:06 2017 +

Updated core
Project: dictionaries  a4cbc2b1d5c1210e618e02d960ec04944645bd0e

Added "official" logo (icon) to English dictionaries

Change-Id: I7c0d250386cbd49a4a4869fa1ee165e957db3ae6
Reviewed-on: https://gerrit.libreoffice.org/45990
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 
(cherry picked from commit cde2a4aa5184e8c6dfa565db50d004a70a12e7d2)
Reviewed-on: https://gerrit.libreoffice.org/46359

diff --git a/dictionaries b/dictionaries
index ec302d7b361e..a4cbc2b1d5c1 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit ec302d7b361ed202139a9bee1e2d0094ff7792b4
+Subproject commit a4cbc2b1d5c1210e618e02d960ec04944645bd0e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-6-0' - en/description.xml en/English.png

[Marco A . G . Pinto]

 en/English.png |binary
 en/description.xml |3 +++
 2 files changed, 3 insertions(+)

New commits:
commit a4cbc2b1d5c1210e618e02d960ec04944645bd0e
Author: Marco A.G.Pinto 
Date:   Wed Dec 6 20:38:06 2017 +

Added "official" logo (icon) to English dictionaries

Change-Id: I7c0d250386cbd49a4a4869fa1ee165e957db3ae6
Reviewed-on: https://gerrit.libreoffice.org/45990
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 
(cherry picked from commit cde2a4aa5184e8c6dfa565db50d004a70a12e7d2)
Reviewed-on: https://gerrit.libreoffice.org/46359

diff --git a/en/English.png b/en/English.png
new file mode 100755
index 000..5e17844
Binary files /dev/null and b/en/English.png differ
diff --git a/en/description.xml b/en/description.xml
index 78d7806..9b58e6a 100644
--- a/en/description.xml
+++ b/en/description.xml
@@ -9,4 +9,7 @@
 
 
 
+
+
+
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: en/description.xml en/English.png

[Marco A . G . Pinto]

 en/English.png |binary
 en/description.xml |3 +++
 2 files changed, 3 insertions(+)

New commits:
commit cde2a4aa5184e8c6dfa565db50d004a70a12e7d2
Author: Marco A.G.Pinto 
Date:   Wed Dec 6 20:38:06 2017 +

Added "official" logo (icon) to English dictionaries

Change-Id: I7c0d250386cbd49a4a4869fa1ee165e957db3ae6
Reviewed-on: https://gerrit.libreoffice.org/45990
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/en/English.png b/en/English.png
new file mode 100755
index 000..5e17844
Binary files /dev/null and b/en/English.png differ
diff --git a/en/description.xml b/en/description.xml
index 78d7806..9b58e6a 100644
--- a/en/description.xml
+++ b/en/description.xml
@@ -9,4 +9,7 @@
 
 
 
+
+
+
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dictionaries

[Marco A . G . Pinto]

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

New commits:
commit 30011ac74add20f7d5f99257b863924a39c1afcd
Author: Marco A.G.Pinto 
Date:   Wed Dec 6 20:38:06 2017 +

Updated core
Project: dictionaries  cde2a4aa5184e8c6dfa565db50d004a70a12e7d2

Added "official" logo (icon) to English dictionaries

Change-Id: I7c0d250386cbd49a4a4869fa1ee165e957db3ae6
Reviewed-on: https://gerrit.libreoffice.org/45990
Reviewed-by: Aron Budea 
Tested-by: Aron Budea 

diff --git a/dictionaries b/dictionaries
index daa1165deae9..cde2a4aa5184 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit daa1165deae904b035dae296e97811fb2c4f771d
+Subproject commit cde2a4aa5184e8c6dfa565db50d004a70a12e7d2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

About the kikongo speller (kituba)

[Cyrille]

Hello,
I come back to you because I think the dictionary is now mature. I would
like to know if it is possible to propose it to the github hunspell repo
 or
better as a new package for Debian/Ubuntu. Currently I did already a
plugin for firefox and an extension for Libreoffice (even if it is not
necessary on Ubuntu if you have the hunspell installed). I did it first
for Windows. But I would like to know if it is possible to install it
for all applications on Windows too (But maybe I'm not in the right
place to ask my question?).

Thanks already for help.

Cyrille (L'Africain)

git repo for kituba dic 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - set_soenv.in

[Don Lewis]

 set_soenv.in |4 
 1 file changed, 4 insertions(+)

New commits:
commit 90ffe9bd128c98e558205d0699a2af8934c99da7
Author: Don Lewis 
Date:   Wed Dec 13 00:17:48 2017 +

Unset $debug in the environment if configured without --enable-debug.

Without this, once you pass --enable-debug to configure, you will
continue to get debug builds after disabling debug unless you restart
the shell.

Similarly, unset $EXTERNAL_WARNINGS_NOT_ERRORS if configure is run with
--enable-werror.

diff --git a/set_soenv.in b/set_soenv.in
index b7184d24e313..6ec61c6be3c2 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1613,9 +1613,13 @@ ToFile( "NO_BSYMBOLIC",  $NO_BSYMBOLIC,  "e" );
 ToFile( "TF_FILTER", "TRUE", "e" );
 if ("@ENABLE_DEBUG@" eq "TRUE") {
 ToFile( "debug", "true", "e" );
+} else {
+ToFile( "debug", "", "e" );
 }
 if ("@ENABLE_WERROR@" eq "FALSE") {
 ToFile( "EXTERNAL_WARNINGS_NOT_ERRORS", "TRUE",  "e" );
+} else {
+ToFile( "EXTERNAL_WARNINGS_NOT_ERRORS", "",  "e" );
 }
 ToFile( "PRODUCT",   "@PRODUCT@","e" );
 ToFile( "PROFULLSWITCH", "@PROFULLSWITCH@",  "e" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sw/inc sw/source

[Jan-Marek Glogowski]

 sw/inc/textboxhelper.hxx |   13 
 sw/source/core/doc/textboxhelper.cxx |   97 ---
 2 files changed, 110 deletions(-)

New commits:
commit 9e190bbb5d79805159d53a433826181df7f11982
Author: Jan-Marek Glogowski 
Date:   Fri Jul 22 18:00:59 2016 +0200

Remove now unused SwTextBoxHelper functions

(Manually cherry picked from commit 
f7f5d27066b696ac4e33246d3794bde8058e8622)

Change-Id: I39500424c79040b1887ea74081fdf0ea0bc5f009
Reviewed-on: https://gerrit.libreoffice.org/46331
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx
index 98983bad9f42..32fc2167c72a 100644
--- a/sw/inc/textboxhelper.hxx
+++ b/sw/inc/textboxhelper.hxx
@@ -73,8 +73,6 @@ public:
 static SwFrameFormat* getOtherTextBoxFormat(const SwFrameFormat* pFormat, 
sal_uInt16 nType);
 /// If we have an associated TextFrame, then return that.
 static SwFrameFormat* 
getOtherTextBoxFormat(css::uno::Reference xShape);
-static SwFrameFormat* findTextBox(const SwFrameFormat* pShape);
-static SwFrameFormat* findTextBox(const 
css::uno::Reference& xShape);
 /// Return the textbox rectangle of a draw shape (in twips).
 static Rectangle getTextRectangle(SwFrameFormat* pShape, bool bAbsolute = 
true);
 
@@ -91,17 +89,6 @@ public:
 /// Is pObject a textbox of a drawinglayer shape?
 static bool isTextBox(const SdrObject* pObject);
 
-/// Look up TextFrames in a document, which are in fact TextBoxes.
-static std::set findTextBoxes(const SwDoc* pDoc);
-/**
- * Look up TextFrames in a document, which are in fact TextBoxes.
- *
- * If rNode has a matching SwContentFrame, then only TextBoxes of rNode are
- * returned.
- */
-static std::set findTextBoxes(const SwNode& rNode);
-/// Build a textbox -> shape format map.
-static std::map findShapes(const SwDoc* 
pDoc);
 /// Count number of shapes in the document, excluding TextBoxes.
 static sal_Int32 getCount(const SwDoc* pDoc);
 /// Count number of shapes on the page, excluding TextBoxes.
diff --git a/sw/source/core/doc/textboxhelper.cxx 
b/sw/source/core/doc/textboxhelper.cxx
index 12464e37e4b6..23033eaeea38 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -126,27 +126,6 @@ void SwTextBoxHelper::destroy(SwFrameFormat* pShape)
 }
 }
 
-std::set SwTextBoxHelper::findTextBoxes(const SwDoc* 
pDoc)
-{
-std::set aTextBoxes;
-
-const SwFrameFormats& rSpzFrameFormats = *pDoc->GetSpzFrameFormats();
-for (SwFrameFormats::const_iterator it = rSpzFrameFormats.begin(); it != 
rSpzFrameFormats.end(); ++it)
-{
-const SwFrameFormat* pFormat = *it;
-
-// A TextBox in the context of this class is a fly frame that has a
-// matching (same RES_CNTNT) draw frame.
-if (!pFormat->GetAttrSet().HasItem(RES_CNTNT) || 
!pFormat->GetContent().GetContentIdx())
-continue;
-
-if (pFormat->Which() == RES_FLYFRMFMT && nullptr != 
pFormat->GetOtherTextBoxFormat())
-aTextBoxes.insert(pFormat);
-}
-
-return aTextBoxes;
-}
-
 bool SwTextBoxHelper::isTextBox(const SwFrameFormat* pShape, sal_uInt16 nType)
 {
assert(nType == RES_FLYFRMFMT || nType == RES_DRAWFRMFMT);
@@ -169,49 +148,6 @@ bool SwTextBoxHelper::isTextBox(const SwFrameFormat* 
pShape, sal_uInt16 nType)
return true;
 }
 
-std::set SwTextBoxHelper::findTextBoxes(const SwNode& 
rNode)
-{
-const SwDoc* pDoc = rNode.GetDoc();
-const SwContentNode* pContentNode = nullptr;
-const SwContentFrame* pContentFrame = nullptr;
-bool bHaveViewShell = 
pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
-if (bHaveViewShell && (pContentNode = rNode.GetContentNode()) && 
(pContentFrame = 
pContentNode->getLayoutFrame(pDoc->getIDocumentLayoutAccess().GetCurrentLayout(
-{
-// We can use the layout information to iterate over only the frames 
which are anchored to us.
-std::set aRet;
-const SwSortedObjs* pSortedObjs = pContentFrame->GetDrawObjs();
-if (pSortedObjs)
-{
-for (SwAnchoredObject* pAnchoredObject : *pSortedObjs)
-{
-SwFrameFormat* pTextBox = 
getOtherTextBoxFormat(&pAnchoredObject->GetFrameFormat(), RES_DRAWFRMFMT);
-if (pTextBox)
-aRet.insert(pTextBox);
-}
-}
-return aRet;
-}
-else
-// If necessary, here we could manually limit the returned set to the
-// ones which are anchored to rNode, but currently no need to do so.
-return findTextBoxes(pDoc);
-}
-
-std::map SwTextBoxHelper::findShapes(const 
SwDoc* pDoc)
-{
-std::map aRet;
-
-const SwFrameFormats& rSpzFrameFormats = *pDoc->GetSpzFrameFormats();
-for (SwFrameFormats::const_iterator it = rSpzFrameFormats.begin(); it != 
rSpzFrameFormats.end(); ++

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - 2 commits - sw/inc sw/qa sw/source

[Jan-Marek Glogowski]

 sw/inc/textboxhelper.hxx|   33 ++-
 sw/qa/extras/uiwriter/uiwriter.cxx  |   22 +-
 sw/source/core/doc/DocumentLayoutManager.cxx|2 
 sw/source/core/doc/docfly.cxx   |   18 -
 sw/source/core/doc/textboxhelper.cxx|  120 +++-
 sw/source/core/draw/dcontact.cxx|2 
 sw/source/core/draw/dview.cxx   |2 
 sw/source/core/frmedt/fecopy.cxx|3 
 sw/source/core/frmedt/feshview.cxx  |8 
 sw/source/core/layout/fly.cxx   |5 
 sw/source/core/objectpositioning/anchoredobjectposition.cxx |2 
 sw/source/core/text/porfly.cxx  |2 
 sw/source/core/unocore/unocoll.cxx  |4 
 sw/source/core/unocore/unodraw.cxx  |   36 ---
 sw/source/core/unocore/unoframe.cxx |3 
 sw/source/core/unocore/unoobj2.cxx  |7 
 sw/source/core/unocore/unoportenum.cxx  |9 
 sw/source/filter/ww8/docxattributeoutput.cxx|4 
 sw/source/filter/ww8/docxsdrexport.cxx  |4 
 sw/source/filter/ww8/rtfsdrexport.cxx   |7 
 sw/source/filter/ww8/rtfsdrexport.hxx   |3 
 sw/source/filter/xml/xmltble.cxx|3 
 sw/source/uibase/docvw/edtwin.cxx   |   11 -
 sw/source/uibase/shells/drawsh.cxx  |4 
 sw/source/uibase/uiview/viewdraw.cxx|2 
 25 files changed, 155 insertions(+), 161 deletions(-)

New commits:
commit 69a870f01bfce9bf768069fd3912c1676e7a9c06
Author: Jan-Marek Glogowski 
Date:   Fri Jul 22 17:59:28 2016 +0200

Add convenience function getOtherTextBoxFormat

Since we already have isTextBox to identify a text box, this
just adds a call to SwFrameFormat::GetOtherTextBoxFormat() to
actually return the corresponding SwFrameFormat.

This gets rid off all the remaining occurences of the
SwFrameFormat / Textbox sets and maps.

(Manually cherry picked from commit 
f7f5d27066b696ac4e33246d3794bde8058e8622)

Change-Id: Id5f05a1ff71e604658e7d8a0d0825f5671335b3f
Reviewed-on: https://gerrit.libreoffice.org/46330
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx
index eb94bbc1d194..98983bad9f42 100644
--- a/sw/inc/textboxhelper.hxx
+++ b/sw/inc/textboxhelper.hxx
@@ -62,7 +62,17 @@ public:
 /// Similar to syncProperty(), but used by the internal API (e.g. for UI 
purposes).
 static void syncFlyFrameAttr(SwFrameFormat& rShape, SfxItemSet& rSet);
 
+/**
+ * If we have an associated TextFrame, then return that.
+ *
+ * @param nType Expected frame format type.
+ *  Valid types are RES_DRAWFRMFMT and RES_FLYFRMFMT.
+ *
+ * @see isTextBox
+ */
+static SwFrameFormat* getOtherTextBoxFormat(const SwFrameFormat* pFormat, 
sal_uInt16 nType);
 /// If we have an associated TextFrame, then return that.
+static SwFrameFormat* 
getOtherTextBoxFormat(css::uno::Reference xShape);
 static SwFrameFormat* findTextBox(const SwFrameFormat* pShape);
 static SwFrameFormat* findTextBox(const 
css::uno::Reference& xShape);
 /// Return the textbox rectangle of a draw shape (in twips).
diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx 
b/sw/source/core/doc/DocumentLayoutManager.cxx
index 5fc0d4cc7483..254a4ee14ba7 100644
--- a/sw/source/core/doc/DocumentLayoutManager.cxx
+++ b/sw/source/core/doc/DocumentLayoutManager.cxx
@@ -494,7 +494,7 @@ SwFrameFormat *DocumentLayoutManager::CopyLayoutFormat(
 pDest->MakeFrames();
 
 // If the draw format has a TextBox, then copy its fly format as well.
-if (SwFrameFormat* pSourceTextBox = SwTextBoxHelper::findTextBox(&rSource))
+if (SwFrameFormat* pSourceTextBox = 
SwTextBoxHelper::getOtherTextBoxFormat(&rSource, RES_DRAWFRMFMT))
 {
 SwFormatAnchor boxAnchor(rNewAnchor);
 if (FLY_AS_CHAR == boxAnchor.GetAnchorId())
diff --git a/sw/source/core/doc/textboxhelper.cxx 
b/sw/source/core/doc/textboxhelper.cxx
index 33571730300e..12464e37e4b6 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -115,7 +115,7 @@ void SwTextBoxHelper::destroy(SwFrameFormat* pShape)
 // If a TextBox was enabled previously
 if (pShape->GetAttrSet().HasItem(RES_CNTNT))
 {
-SwFrameFormat* pFormat = findTextBox(pShape);
+SwFrameFormat* pFormat = pShape->GetOtherTextBoxFormat();
 
 // Unlink the TextBox's text range from the original shape.
 pShape->ResetFormatAttr(RES_CNTNT);
@@ -129,7 +129,6 @@ void SwTextBoxHelp

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sw/inc sw/source

[Jan-Marek Glogowski]

 sw/inc/frmfmt.hxx|6 ++
 sw/source/core/doc/DocumentLayoutManager.cxx |4 
 sw/source/core/doc/textboxhelper.cxx |   13 +
 sw/source/core/layout/atrfrm.cxx |   27 +--
 4 files changed, 48 insertions(+), 2 deletions(-)

New commits:
commit 75bd6c311f518853fc31affe04fff717d741d575
Author: Jan-Marek Glogowski 
Date:   Fri Jul 22 17:23:40 2016 +0200

Link DRAW and FLY format for faster textbox lookup

Currently we have to rebuild the list of text boxes for every
lookup. Instead of a managed set, or a per-document list etc.,
this introduces direct pointers between the corresponding
SwDrawFramFormat and SwFlyFrameFormat of a text box.

(Manually cherry picked from commit 
5bed080c77f99f22fd52ad6cf2d6274e7c1e12a8)

Change-Id: Iefba2d153d9d8b3f1185aa305e9f463a50e78f89
Reviewed-on: https://gerrit.libreoffice.org/46305
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 4291ced05f6e..c2a19706160c 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -41,12 +41,15 @@ class SW_DLLPUBLIC SwFrameFormat: public SwFormat
 friend class SwDoc;
 friend class SwPageDesc;///< Is allowed to call protected CTor.
 friend class ::sw::DocumentLayoutManager; ///< Is allowed to call 
protected CTor.
+friend class SwTextBoxHelper;
 
 css::uno::WeakReference m_wXObject;
 
 // DrawingLayer FillAttributes in a preprocessed form for primitive 
usage
 drawinglayer::attribute::SdrAllFillAttributesHelperPtr  maFillAttributes;
 
+SwFrameFormat *m_pOtherTextBoxFormat;
+
 protected:
 SwFrameFormat(
 SwAttrPool& rPool,
@@ -64,6 +67,9 @@ protected:
 
 virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue 
) override;
 
+SwFrameFormat* GetOtherTextBoxFormat() const { return 
m_pOtherTextBoxFormat; }
+void SetOtherTextBoxFormat( SwFrameFormat *pFormat );
+
 public:
 virtual ~SwFrameFormat();
 
diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx 
b/sw/source/core/doc/DocumentLayoutManager.cxx
index c5380df0b3de..5fc0d4cc7483 100644
--- a/sw/source/core/doc/DocumentLayoutManager.cxx
+++ b/sw/source/core/doc/DocumentLayoutManager.cxx
@@ -510,6 +510,10 @@ SwFrameFormat *DocumentLayoutManager::CopyLayoutFormat(
 SwFormatContent 
aContent(pDestTextBox->GetContent().GetContentIdx()->GetNode().GetStartNode());
 aSet.Put(aContent);
 pDest->SetFormatAttr(aSet);
+
+// Link FLY and DRAW formats, so it becomes a text box
+pDest->SetOtherTextBoxFormat(pDestTextBox);
+pDestTextBox->SetOtherTextBoxFormat(pDest);
 }
 
 return pDest;
diff --git a/sw/source/core/doc/textboxhelper.cxx 
b/sw/source/core/doc/textboxhelper.cxx
index 61402fe02c94..c75908384ebf 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -55,6 +56,18 @@ void SwTextBoxHelper::create(SwFrameFormat* pShape)
 uno::Reference 
xTextContentAppend(xTextDocument->getText(), uno::UNO_QUERY);
 xTextContentAppend->appendTextContent(xTextFrame, 
uno::Sequence());
 
+// Link FLY and DRAW formats, so it becomes a text box (needed for 
syncProperty calls).
+uno::Reference xRealTextFrame(xTextFrame, 
uno::UNO_QUERY);
+SwXTextFrame* pTextFrame = dynamic_cast(xRealTextFrame.get());
+assert(nullptr != pTextFrame);
+SwFrameFormat* pFormat = pTextFrame->GetFrameFormat();
+
+assert(nullptr != dynamic_cast(pShape));
+assert(nullptr != dynamic_cast(pFormat));
+
+pShape->SetOtherTextBoxFormat(pFormat);
+pFormat->SetOtherTextBoxFormat(pShape);
+
 // Initialize properties.
 uno::Reference xPropertySet(xTextFrame, 
uno::UNO_QUERY);
 uno::Any aEmptyBorder = uno::makeAny(table::BorderLine2());
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 849af3b88ed0..4a67225681e4 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -2502,7 +2502,8 @@ SwFrameFormat::SwFrameFormat(
 const sal_uInt16* pWhichRange)
 :   SwFormat(rPool, pFormatNm, (pWhichRange ? pWhichRange : 
aFrameFormatSetRange), pDrvdFrame, nFormatWhich),
 m_wXObject(),
-maFillAttributes()
+maFillAttributes(),
+m_pOtherTextBoxFormat(nullptr)
 {
 }
 
@@ -2514,7 +2515,8 @@ SwFrameFormat::SwFrameFormat(
 const sal_uInt16* pWhichRange)
 :   SwFormat(rPool, rFormatNm, (pWhichRange ? pWhichRange : 
aFrameFormatSetRange), pDrvdFrame, nFormatWhich),
 m_wXObject(),
-maFillAttributes()
+maFillAttributes(),
+m_pOtherTextBoxFormat(nullptr)
 {
 }
 
@@ -2528,6 +2530,27 @@ SwFrameFormat::~SwFrameFormat()
 
rAnchor.GetContentAnchor()->nNode.GetNode().RemoveAnchoredF

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

[Tomaž Vajngerl]

 sc/source/ui/unoobj/docuno.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c7a2538129f16ef1253ae974737d5c9676aaf883
Author: Tomaž Vajngerl 
Date:   Tue Dec 12 22:24:45 2017 +0900

tdf#114384 reset the print state if the sheet changes

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

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 0df42b9be2f1..d5560485bc62 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -1787,7 +1787,7 @@ uno::Sequence SAL_CALL 
ScModelObj::getRenderer( sal_Int32
 else
 {
 std::unique_ptr> 
pPrintFunc;
-if (m_pPrintState)
+if (m_pPrintState && m_pPrintState->nPrintTab == nTab)
 pPrintFunc.reset(new ScPrintFunc(pDocShell, 
pDocShell->GetPrinter(), *m_pPrintState, &aStatus.GetOptions()));
 else
 pPrintFunc.reset(new ScPrintFunc(pDocShell, 
pDocShell->GetPrinter(), nTab,
@@ -1934,7 +1934,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, 
const uno::Any& aSelec
 
 
 std::unique_ptr> pPrintFunc;
-if (m_pPrintState)
+if (m_pPrintState && m_pPrintState->nPrintTab == nTab)
 pPrintFunc.reset(new ScPrintFunc(pDev, pDocShell, *m_pPrintState, 
&aStatus.GetOptions()));
 else
 pPrintFunc.reset(new ScPrintFunc(pDev, pDocShell, nTab, 
pPrintFuncCache->GetFirstAttr(nTab), nTotalPages, pSelRange, 
&aStatus.GetOptions()));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 sc/source/ui/inc/printfun.hxx  |   35 ---
 sc/source/ui/view/printfun.cxx |   61 +
 2 files changed, 75 insertions(+), 21 deletions(-)

New commits:
commit 5217a2a0bf27e496cc429ee45dff7c239b466ae6
Author: Tomaž Vajngerl 
Date:   Tue Dec 12 22:22:32 2017 +0900

tdf#114256 add cache criterium when to recalculate page range size

Page range size can only be valid for the input parameters, which
includes the document size, which was not taken into account at all
before. Now we look at all this parameters to decide if we need to
recalculate or not.

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

diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx
index 34b2ecc2159e..2df47432c89a 100644
--- a/sc/source/ui/inc/printfun.hxx
+++ b/sc/source/ui/inc/printfun.hxx
@@ -97,6 +97,28 @@ public:
 namespace sc
 {
 
+struct PrintPageRangesInput
+{
+bool m_bSkipEmpty;
+bool m_bPrintArea;
+SCROW m_nStartRow;
+SCROW m_nEndRow;
+SCCOL m_nStartCol;
+SCCOL m_nEndCol;
+SCTAB m_nPrintTab;
+Size  m_aDocSize;
+
+PrintPageRangesInput()
+: m_bSkipEmpty(false)
+, m_bPrintArea(false)
+, m_nStartRow(0)
+, m_nEndRow(0)
+, m_nStartCol(0)
+, m_nEndCol(0)
+, m_nPrintTab(0)
+{}
+};
+
 class PrintPageRanges
 {
 public:
@@ -110,12 +132,16 @@ public:
 size_t m_nPagesY;
 size_t m_nTotalY;
 
-bool m_bCalculated;
+PrintPageRangesInput m_aInput;
+
+bool checkIfAlreadyCalculatedAndSet(bool bSkipEmpty, bool bPrintArea,
+SCROW nStartRow, SCROW nEndRow,
+SCCOL nStartCol, SCCOL nEndCol,
+SCTAB nPrintTab, Size const & 
aDocSize);
 
-void calculate(ScDocument* pDoc, ScPageTableParam const & rTableParam,
-   ScPageAreaParam const & rAreaParam,
+void calculate(ScDocument* pDoc, bool bSkipEmpty, bool bPrintArea,
SCROW nStartRow, SCROW nEndRow, SCCOL nStartCol, SCCOL 
nEndCol,
-   SCTAB nPrintTab);
+   SCTAB nPrintTab, Size const & aDocSize);
 };
 
 }
@@ -137,6 +163,7 @@ struct ScPrintState //  Save 
Variables from ScPrintFunc
 
 // Additional state of page ranges
 bool bSavedStateRanges;
+sc::PrintPageRangesInput aPrintPageRangesInput;
 size_t nTotalY;
 std::vector aPageEndX;
 std::vector aPageEndY;
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 82d12a53b4f2..a009dca5b88e 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -262,7 +262,7 @@ ScPrintFunc::ScPrintFunc(ScDocShell* pShell, SfxPrinter* 
pNewPrinter,
 m_aRanges.m_aPageEndX = rState.aPageEndX;
 m_aRanges.m_aPageEndY = rState.aPageEndY;
 m_aRanges.m_aPageRows = rState.aPageRows;
-m_aRanges.m_bCalculated = true;
+m_aRanges.m_aInput = rState.aPrintPageRangesInput;
 }
 
 aSrcOffset = pPrinter->PixelToLogic(pPrinter->GetPageOffsetPixel(), 
MapMode(MapUnit::Map100thMM));
@@ -326,7 +326,7 @@ ScPrintFunc::ScPrintFunc( OutputDevice* pOutDev, 
ScDocShell* pShell,
 m_aRanges.m_aPageEndX = rState.aPageEndX;
 m_aRanges.m_aPageEndY = rState.aPageEndY;
 m_aRanges.m_aPageRows = rState.aPageRows;
-m_aRanges.m_bCalculated = true;
+m_aRanges.m_aInput = rState.aPrintPageRangesInput;
 }
 
 Construct( pOptions );
@@ -353,6 +353,7 @@ void ScPrintFunc::GetPrintState(ScPrintState& rState,  bool 
bSavePageRanges)
 rState.aPageEndX = m_aRanges.m_aPageEndX;
 rState.aPageEndY = m_aRanges.m_aPageEndY;
 rState.aPageRows = m_aRanges.m_aPageRows;
+rState.aPrintPageRangesInput = m_aRanges.m_aInput;
 }
 }
 
@@ -3003,9 +3004,7 @@ static void lcl_SetHidden( const ScDocument* pDoc, SCTAB 
nPrintTab, ScPageRowEnt
 
 void ScPrintFunc::CalcPages()   // calculates aPageRect and pages 
from nZoom
 {
-pDoc->SetPageSize(nPrintTab, GetDocPageSize());
-
-m_aRanges.calculate(pDoc, aTableParam, aAreaParam, nStartRow, nEndRow, 
nStartCol, nEndCol, nPrintTab);
+m_aRanges.calculate(pDoc, aTableParam.bSkipEmpty, aAreaParam.bPrintArea, 
nStartRow, nEndRow, nStartCol, nEndCol, nPrintTab, GetDocPageSize());
 }
 
 namespace sc
@@ -3015,26 +3014,56 @@ PrintPageRanges::PrintPageRanges()
 : m_nPagesX(0)
 , m_nPagesY(0)
 , m_nTotalY(0)
-, m_bCalculated(false)
 {}
 
-void PrintPageRanges::calculate(ScDocument* pDoc, ScPageTableParam const & 
rTableParam,
-ScPageAreaParam const & rAreaParam,
+bool PrintPageRanges::checkIfAlreadyCalculatedAndSet(
+bool bSkipEmpty, bool bPrintArea,

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sysui/desktop

[Rene Engelhard]

 sysui/desktop/apparmor/program.soffice.bin |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 2fbeac18e2d91d7d56223493255ddc65bf89606c
Author: Rene Engelhard 
Date:   Mon Dec 11 17:54:44 2017 +

sysui/desktop/apparmor/program.soffice.bin: allow /usr/bin/gpgconf

Change-Id: I762ed3961d929204fdb97a3272fc9ca73f7d0234
Reviewed-on: https://gerrit.libreoffice.org/46257
Reviewed-by: Thorsten Behrens 
Tested-by: Jenkins 
Tested-by: Rene Engelhard 
Reviewed-by: Rene Engelhard 
Reviewed-on: https://gerrit.libreoffice.org/46332

diff --git a/sysui/desktop/apparmor/program.soffice.bin 
b/sysui/desktop/apparmor/program.soffice.bin
index b4baeab8f5ee..a365f6297781 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
+++ b/sysui/desktop/apparmor/program.soffice.bin
@@ -1,6 +1,7 @@
 # --
 #
 #Copyright (C) 2016 Canonical Ltd.
+#Copyright (C) 2017 Software in the Public Interest, Inc.
 #
 #This Source Code Form is subject to the terms of the Mozilla Public
 #License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -8,6 +9,7 @@
 #
 #Authors: Jonathan Davies 
 # Bryan Quigley 
+# Rene Engelhard 
 #
 # --
 
@@ -111,6 +113,7 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
   /usr/bin/bluetooth-sendto rmPUx,
   /usr/bin/lpr  rmPUx,
   /usr/bin/paperconfrmix,
+  /usr/bin/gpgconf  rmix,
 
   /dev/tty  rw,
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Heiko Tietze]

 sw/uiconfig/swriter/ui/optcompatpage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 290d7d857c9f4505b0d2ba29b8b40da5b47279f8
Author: Heiko Tietze 
Date:   Mon Dec 11 11:10:46 2017 +0100

tdf#114340 Naming issue %DOCUMENT need brackets

Change-Id: I0c5fa12300f05b765a61a0e8de94eb26c7e419a0
Reviewed-on: https://gerrit.libreoffice.org/46220
Tested-by: Jenkins 
Reviewed-by: Sophie Gautier 
Reviewed-by: Heiko Tietze 
(cherry picked from commit 2dae4d8e9e3479651ad7c651c404137b606da589)
Reviewed-on: https://gerrit.libreoffice.org/46334

diff --git a/sw/uiconfig/swriter/ui/optcompatpage.ui 
b/sw/uiconfig/swriter/ui/optcompatpage.ui
index e37af6eb7f83..ed4a0c965a56 100644
--- a/sw/uiconfig/swriter/ui/optcompatpage.ui
+++ b/sw/uiconfig/swriter/ui/optcompatpage.ui
@@ -101,7 +101,7 @@
   
 True
 False
-Compatibility options for %DOCNAME
+Compatibility options for '%DOCNAME'
 
   
 
___
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' - sw/source

[Xisco Fauli]

 sw/source/uibase/shells/basesh.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 16cf34a1d208b0e3e1f6ea9eadabbbd25894f829
Author: Xisco Fauli 
Date:   Mon Dec 4 19:03:45 2017 +0100

tdf#114219: Show Edit dialog entry in link section

Change-Id: I35c34d427cc5440994fc16ed7e4d307bc95bc533
Reviewed-on: https://gerrit.libreoffice.org/45817
Tested-by: Jenkins 
Reviewed-by: Gülşah Köse 
(cherry picked from commit 2eae1d741ebdc1e2ce1e512960e8152e178e0150)
Reviewed-on: https://gerrit.libreoffice.org/45931
Reviewed-by: Xisco Faulí 

diff --git a/sw/source/uibase/shells/basesh.cxx 
b/sw/source/uibase/shells/basesh.cxx
index 4ed0849265ff..f251045744a8 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -1399,7 +1399,8 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
 case FN_EDIT_CURRENT_REGION:
 //tdf#112808 if cursor is in an index, don't show the edit 
section.
 if( !rSh.GetCurrSection() ||
-rSh.GetCurrSection()->GetType() != CONTENT_SECTION )
+(rSh.GetCurrSection()->GetType() != CONTENT_SECTION &&
+rSh.GetCurrSection()->GetType() != FILE_LINK_SECTION ))
 {
 rSet.DisableItem(nWhich);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Xisco Fauli]

 sw/source/uibase/shells/basesh.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit cc77f3cff1d5926c460fd6418397bd6295497c1f
Author: Xisco Fauli 
Date:   Mon Dec 4 19:03:45 2017 +0100

tdf#114219: Show Edit dialog entry in link section

Change-Id: I35c34d427cc5440994fc16ed7e4d307bc95bc533
Reviewed-on: https://gerrit.libreoffice.org/45817
Tested-by: Jenkins 
Reviewed-by: Gülşah Köse 
(cherry picked from commit 2eae1d741ebdc1e2ce1e512960e8152e178e0150)
Reviewed-on: https://gerrit.libreoffice.org/45930
Reviewed-by: Xisco Faulí 

diff --git a/sw/source/uibase/shells/basesh.cxx 
b/sw/source/uibase/shells/basesh.cxx
index 0b2ef68570cf..58ee634b334b 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -1400,7 +1400,8 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
 case FN_EDIT_CURRENT_REGION:
 //tdf#112808 if cursor is in an index, don't show the edit 
section.
 if( !rSh.GetCurrSection() ||
-rSh.GetCurrSection()->GetType() != CONTENT_SECTION )
+(rSh.GetCurrSection()->GetType() != CONTENT_SECTION &&
+rSh.GetCurrSection()->GetType() != FILE_LINK_SECTION ))
 {
 rSet.DisableItem(nWhich);
 }
___
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 vcl/source

[Stephan Bergmann]

 filter/source/graphicfilter/ipcx/ipcx.cxx|2 +-
 filter/source/graphicfilter/iras/iras.cxx|2 +-
 include/vcl/scopedbitmapaccess.hxx   |7 ++-
 vcl/source/bitmap/BitmapScaleConvolution.cxx |4 ++--
 vcl/source/filter/igif/gifread.cxx   |6 +++---
 5 files changed, 9 insertions(+), 12 deletions(-)

New commits:
commit eb002da913cd1745b039bbc7e519542d7990fb49
Author: Stephan Bergmann 
Date:   Tue Dec 12 17:50:16 2017 +0100

Remove obsolete "explicit operator bool" hack

...and fix the call sites that exploited the hack's internals being non-
transparent.

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

diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx 
b/filter/source/graphicfilter/ipcx/ipcx.cxx
index 38c6d54664c2..4adfb3ec24f1 100644
--- a/filter/source/graphicfilter/ipcx/ipcx.cxx
+++ b/filter/source/graphicfilter/ipcx/ipcx.cxx
@@ -100,7 +100,7 @@ bool PCXReader::ReadPCX(Graphic & rGraphic)
 {
 aBmp = Bitmap( Size( nWidth, nHeight ), nDestBitsPerPixel );
 Bitmap::ScopedWriteAccess pAcc(aBmp);
-if ( pAcc == nullptr )
+if ( !pAcc )
 return false;
 
 if ( nDestBitsPerPixel <= 8 )
diff --git a/filter/source/graphicfilter/iras/iras.cxx 
b/filter/source/graphicfilter/iras/iras.cxx
index ac75b2a77bd3..232ac9807dc2 100644
--- a/filter/source/graphicfilter/iras/iras.cxx
+++ b/filter/source/graphicfilter/iras/iras.cxx
@@ -174,7 +174,7 @@ bool RASReader::ReadRAS(Graphic & rGraphic)
 
 Bitmap aBmp(Size(mnWidth, mnHeight), mnDstBitsPerPix);
 Bitmap::ScopedWriteAccess pAcc(aBmp);
-if (pAcc == nullptr)
+if (!pAcc)
 return false;
 
 if (bPalette)
diff --git a/include/vcl/scopedbitmapaccess.hxx 
b/include/vcl/scopedbitmapaccess.hxx
index 05eb39587bac..bcdfa2b1bd20 100644
--- a/include/vcl/scopedbitmapaccess.hxx
+++ b/include/vcl/scopedbitmapaccess.hxx
@@ -45,9 +45,6 @@ namespace vcl
  */
 template < class Access, class Bitmap, Access* (Bitmap::* Acquire)() > class 
ScopedBitmapAccess
 {
-typedef ScopedBitmapAccess< Access, Bitmap, Acquire > self_type;
-typedef bool (self_type::* unspecified_bool_type)() const;
-
 public:
 explicit ScopedBitmapAccess( Bitmap& rBitmap ) :
 mpAccess( nullptr ),
@@ -98,9 +95,9 @@ public:
 }
 
 bool operator!() const { return !mpAccess; }
-operator unspecified_bool_type() const
+explicit operator bool() const
 {
-return mpAccess ? &self_type::operator! : 0;
+return mpAccess;
 }
 
 Access* get() { return mpAccess; }
diff --git a/vcl/source/bitmap/BitmapScaleConvolution.cxx 
b/vcl/source/bitmap/BitmapScaleConvolution.cxx
index 49aed5d5940b..498d1084ab73 100644
--- a/vcl/source/bitmap/BitmapScaleConvolution.cxx
+++ b/vcl/source/bitmap/BitmapScaleConvolution.cxx
@@ -109,7 +109,7 @@ bool ImplScaleConvolutionHor(Bitmap& rSource, Bitmap& 
rTarget, const double& rSc
 ImplCalculateContributions(nWidth, nNewWidth, aNumberOfContributions, 
pWeights, pPixels, pCount, aKernel);
 rTarget = Bitmap(Size(nNewWidth, nHeight), 24);
 Bitmap::ScopedWriteAccess pWriteAcc(rTarget);
-bool bResult(nullptr != pWriteAcc);
+bool bResult(pWriteAcc);
 
 if(bResult)
 {
@@ -195,7 +195,7 @@ bool ImplScaleConvolutionVer(Bitmap& rSource, Bitmap& 
rTarget, const double& rSc
 ImplCalculateContributions(nHeight, nNewHeight, 
aNumberOfContributions, pWeights, pPixels, pCount, aKernel);
 rTarget = Bitmap(Size(nWidth, nNewHeight), 24);
 Bitmap::ScopedWriteAccess pWriteAcc(rTarget);
-bool bResult(nullptr != pWriteAcc);
+bool bResult(pWriteAcc);
 
 if(pWriteAcc)
 {
diff --git a/vcl/source/filter/igif/gifread.cxx 
b/vcl/source/filter/igif/gifread.cxx
index 9695f09d8784..f35d2d398c19 100644
--- a/vcl/source/filter/igif/gifread.cxx
+++ b/vcl/source/filter/igif/gifread.cxx
@@ -222,7 +222,7 @@ void GIFReader::CreateBitmaps( long nWidth, long nHeight, 
BitmapPalette* pPal,
   aBmp8.Erase( Color( COL_WHITE ) );
 
 pAcc8 = Bitmap::ScopedWriteAccess(aBmp8);
-bStatus = ( pAcc8 != nullptr );
+bStatus = bool(pAcc8);
 }
 }
 
@@ -685,13 +685,13 @@ Graphic GIFReader::GetIntermediateGraphic()
 aImGraphic = BitmapEx( aBmp8, aBmp1 );
 
 pAcc1 = Bitmap::ScopedWriteAccess(aBmp1);
-bStatus = bStatus && ( pAcc1 != nullptr );
+bStatus = bStatus && pAcc1;
 }
 else
 aImGraphic = aBmp8;
 
 pAcc8 = Bitmap::ScopedWriteAccess(aBmp8);
-bStatus = bStatus && ( pAcc8 != nullptr );
+bStatus = bStatus && pAcc8;
 }
 
 return aImGraphic;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedeskt

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

[Noel Grandin]

 include/svl/zforlist.hxx|   11 +-
 svl/source/numbers/zforlist.cxx |  156 +++-
 2 files changed, 82 insertions(+), 85 deletions(-)

New commits:
commit dcdaca599987ded1577bd04ed1e70f5bd02e943f
Author: Noel Grandin 
Date:   Thu Dec 7 11:50:26 2017 +0200

use a mutex per instance for SvNumberFormatter

instead of one mutex for all instances. We still keep the global mutex
for some operations because there are some shared global data
structures.

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

diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 87821414325e..5ac719d5fe4d 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -320,6 +320,7 @@ class NfCurrencyTable;
 
 class SVL_DLLPUBLIC SvNumberFormatter
 {
+friend class SvNumberFormatterRegistry_Impl;
 public:
 /**
  * We can't technically have an "infinite" value, so we use an arbitrary
@@ -803,6 +804,7 @@ public:
 static bool IsLocaleInstalled( LanguageType eLang );
 
 private:
+mutable ::osl::Mutex m_aMutex;
 css::uno::Reference< css::uno::XComponentContext > m_xContext;
 LanguageTag maLanguageTag;
 std::map> aFTable;
// Table of format keys to format entries
@@ -831,7 +833,7 @@ private:
 OUString aThousandSep;
 OUString aDateSep;
 
-SVL_DLLPRIVATE static bool  bCurrencyTableInitialized;
+SVL_DLLPRIVATE static volatile bool bCurrencyTableInitialized;
 SVL_DLLPRIVATE static sal_uInt16nSystemCurrencyPosition;
 SVL_DLLPRIVATE static SvNumberFormatterRegistry_Impl* pFormatterRegistry;
 
@@ -914,10 +916,11 @@ private:
 // Substitute a format during GetFormatEntry(), i.e. system formats.
 SvNumberformat* ImpSubstituteEntry( SvNumberformat* pFormat, sal_uInt32 * 
o_pRealKey = nullptr );
 
-public:
+// own mutex, may also be used by internal class 
SvNumberFormatterRegistry_Impl
+static ::osl::Mutex& GetGlobalMutex();
+::osl::Mutex& GetInstanceMutex() const { return m_aMutex; }
 
-// own static mutex, may also be used by internal class 
SvNumberFormatterRegistry_Impl
-static ::osl::Mutex& GetMutex();
+public:
 
 // called by SvNumberFormatterRegistry_Impl::Notify if the default system 
currency changes
 void ResetDefaultSystemCurrency();
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 2a112e866c9f..ec99b5caaefc 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -212,7 +212,7 @@ void SvNumberFormatterRegistry_Impl::Remove( 
SvNumberFormatter const * pThis )
 void SvNumberFormatterRegistry_Impl::ConfigurationChanged( 
utl::ConfigurationBroadcaster*,
ConfigurationHints 
nHint)
 {
-::osl::MutexGuard aGuard( SvNumberFormatter::GetMutex() );
+::osl::MutexGuard aGuard( SvNumberFormatter::GetGlobalMutex() );
 
 if ( nHint & ConfigurationHints::Locale )
 {
@@ -234,7 +234,7 @@ void SvNumberFormatterRegistry_Impl::ConfigurationChanged( 
utl::ConfigurationBro
 
 
 SvNumberFormatterRegistry_Impl* SvNumberFormatter::pFormatterRegistry = 
nullptr;
-bool SvNumberFormatter::bCurrencyTableInitialized = false;
+volatile bool SvNumberFormatter::bCurrencyTableInitialized = false;
 namespace
 {
 struct theCurrencyTable :
@@ -268,7 +268,7 @@ SvNumberFormatter::SvNumberFormatter( const Reference< 
XComponentContext >& rxCo
 SvNumberFormatter::~SvNumberFormatter()
 {
 {
-::osl::MutexGuard aGuard( GetMutex() );
+::osl::MutexGuard aGuard( GetGlobalMutex() );
 pFormatterRegistry->Remove( this );
 if ( !pFormatterRegistry->Count() )
 {
@@ -320,14 +320,14 @@ void SvNumberFormatter::ImpConstruct( LanguageType eLang )
 pMergeTable = nullptr;
 bNoZero = false;
 
-::osl::MutexGuard aGuard( GetMutex() );
+::osl::MutexGuard aGuard( GetGlobalMutex() );
 GetFormatterRegistry().Insert( this );
 }
 
 
 void SvNumberFormatter::ChangeIntl(LanguageType eLnge)
 {
-::osl::MutexGuard aGuard( GetMutex() );
+::osl::MutexGuard aGuard( GetInstanceMutex() );
 if (ActLnge != eLnge)
 {
 ActLnge = eLnge;
@@ -352,7 +352,7 @@ void SvNumberFormatter::ChangeIntl(LanguageType eLnge)
 
 
 // static
-::osl::Mutex& SvNumberFormatter::GetMutex()
+::osl::Mutex& SvNumberFormatter::GetGlobalMutex()
 {
 // #i77768# Due to a static reference in the toolkit lib
 // we need a mutex that lives longer than the svl library.
@@ -366,7 +366,7 @@ void SvNumberFormatter::ChangeIntl(LanguageType eLnge)
 // static
 SvNumberFormatterRegistry_Impl& SvNumberFormatter::GetFormatterRegistry()
 {
-::osl::MutexGuard aGuard( GetMutex() );
+::osl::MutexGuard aGuard( GetGlobalMutex() );
 if ( !pFormatterRegistry )
 {
 pFormatterRegistr

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

[Eike Rathke]

 svl/source/numbers/zforscan.cxx |  131 +---
 1 file changed, 69 insertions(+), 62 deletions(-)

New commits:
commit 38a3886fc1464e635985f9ec82b48e0a69f6e536
Author: Eike Rathke 
Date:   Tue Dec 12 22:54:19 2017 +0100

Determine possibly localized keywords early and once

.. instead of in every GetKeyWord() call, and force to EnglishOnly
if there aren't.

Change-Id: I56941298c0e02d041b80cdb5805905e24116405e

diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index ed3edf731096..d29ecddb1d16 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -301,7 +301,60 @@ void ImpSvNumberformatScan::SetDependentKeywords()
 sKeyword[NF_KEY_THAI_T] = sEnglishKeyword[NF_KEY_THAI_T];
 }
 
-const bool bL10n = (meKeywordLocalization != 
KeywordLocalization::EnglishOnly);
+bool bL10n = (meKeywordLocalization != KeywordLocalization::EnglishOnly);
+if (bL10n)
+{
+// Check if this actually is a locale that uses any localized keywords,
+// if not then disable localized keywords completely.
+if ( !eLang.anyOf( LANGUAGE_GERMAN,
+LANGUAGE_GERMAN_SWISS,
+LANGUAGE_GERMAN_AUSTRIAN,
+LANGUAGE_GERMAN_LUXEMBOURG,
+LANGUAGE_GERMAN_LIECHTENSTEIN,
+LANGUAGE_DUTCH,
+LANGUAGE_DUTCH_BELGIAN,
+LANGUAGE_FRENCH,
+LANGUAGE_FRENCH_BELGIAN,
+LANGUAGE_FRENCH_CANADIAN,
+LANGUAGE_FRENCH_SWISS,
+LANGUAGE_FRENCH_LUXEMBOURG,
+LANGUAGE_FRENCH_MONACO,
+LANGUAGE_FINNISH,
+LANGUAGE_ITALIAN,
+LANGUAGE_ITALIAN_SWISS,
+LANGUAGE_DANISH,
+LANGUAGE_NORWEGIAN,
+LANGUAGE_NORWEGIAN_BOKMAL,
+LANGUAGE_NORWEGIAN_NYNORSK,
+LANGUAGE_SWEDISH,
+LANGUAGE_SWEDISH_FINLAND,
+LANGUAGE_PORTUGUESE,
+LANGUAGE_PORTUGUESE_BRAZILIAN,
+LANGUAGE_SPANISH_MODERN,
+LANGUAGE_SPANISH_DATED,
+LANGUAGE_SPANISH_MEXICAN,
+LANGUAGE_SPANISH_GUATEMALA,
+LANGUAGE_SPANISH_COSTARICA,
+LANGUAGE_SPANISH_PANAMA,
+LANGUAGE_SPANISH_DOMINICAN_REPUBLIC,
+LANGUAGE_SPANISH_VENEZUELA,
+LANGUAGE_SPANISH_COLOMBIA,
+LANGUAGE_SPANISH_PERU,
+LANGUAGE_SPANISH_ARGENTINA,
+LANGUAGE_SPANISH_ECUADOR,
+LANGUAGE_SPANISH_CHILE,
+LANGUAGE_SPANISH_URUGUAY,
+LANGUAGE_SPANISH_PARAGUAY,
+LANGUAGE_SPANISH_BOLIVIA,
+LANGUAGE_SPANISH_EL_SALVADOR,
+LANGUAGE_SPANISH_HONDURAS,
+LANGUAGE_SPANISH_NICARAGUA,
+LANGUAGE_SPANISH_PUERTO_RICO ))
+{
+bL10n = false;
+meKeywordLocalization = KeywordLocalization::EnglishOnly;
+}
+}
 
 if ( bL10n && eLang.anyOf(
 LANGUAGE_GERMAN,
@@ -663,71 +716,25 @@ short ImpSvNumberformatScan::GetKeyWord( const OUString& 
sSymbol, sal_Int32 nPos
 if (i == 0 && meKeywordLocalization == 
KeywordLocalization::AllowEnglish)
 {
 // No localized (if so) keyword, try English keywords if keywords
-// are localized.
-LanguageType eLang = 
pFormatter->GetLocaleData()->getLoadedLanguageTag().getLanguageType( false);
-if ( eLang.anyOf( LANGUAGE_GERMAN,
-LANGUAGE_GERMAN_SWISS,
-LANGUAGE_GERMAN_AUSTRIAN,
-LANGUAGE_GERMAN_LUXEMBOURG,
-LANGUAGE_GERMAN_LIECHTENSTEIN,
-LANGUAGE_DUTCH,
-LANGUAGE_DUTCH_BELGIAN,
-LANGUAGE_FRENCH,
-LANGUAGE_FRENCH_BELGIAN,
-LANGUAGE_FRENCH_CANADIAN,
-LANGUAGE_FRENCH_SWISS,
-LANGUAGE_FRENCH_LUXEMBOURG,
-LANGUAGE_FRENCH_MONACO,
-LANGUAGE_FINNISH,
-LANGUAGE_ITALIAN,
-LANGUAGE_ITALIAN_SWISS,
-LANGUAGE_DANISH,
-LANGUAGE_NORWEGIAN,
-LANGUAGE_NORWEGIAN_BOKMAL,
-LANGUAGE_NORWEGIAN_NYNORSK,
-LANGUAGE_SWEDISH,
-LANGUAGE_SWEDISH_FINLAND,
-LANGUAGE_PORTUGUESE,
-LANGUAGE_PORTUGUESE_BRAZILIAN,
-LANGUAGE_SPANISH_MOD

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

[Michael Stahl]

 sw/source/core/layout/atrfrm.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 1e70464c380ecc0756ea29098632c503a60aec71
Author: Michael Stahl 
Date:   Tue Dec 12 22:47:15 2017 +0100

tdf#114396 sw: overly strict assertions in SwFrameFormat::Modify()

It's only a problem if the style contains an anchor position;
the anchor type by itself is fine, and the wrong assertion is
particularly stupid considering that
DocumentStylePoolManager::GetFormatFromPool() inits various
built-in styles with anchor types.

(regression from eed046433a847d3005e52c38963fb883322a39e6)

Change-Id: If8ac000b7f888686725d6bf0ef8e5fb38198c889

diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 207cb77d1954..2b15de1ffcd3 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -2615,8 +2615,9 @@ void SwFrameFormat::Modify( const SfxPoolItem* pOld, 
const SfxPoolItem* pNew )
 static_cast< const SwAttrSetChg* >(pNew)->GetChgSet()->GetItemState( 
RES_ANCHOR, false, &tmp );
 if( tmp )
 {
-assert(static_cast(pNew)->GetTheChgdSet() == 
&m_aSet); // must not be style's set!
 newAnchorPosition = static_cast< const SwFormatAnchor* >( tmp 
)->GetContentAnchor();
+assert(newAnchorPosition == nullptr || // style's set must not 
contain position!
+static_cast(pNew)->GetTheChgdSet() == 
&m_aSet);
 }
 }
 if( pNew && pNew->Which() == RES_ANCHOR )
@@ -2627,8 +2628,9 @@ void SwFrameFormat::Modify( const SfxPoolItem* pOld, 
const SfxPoolItem* pNew )
 static_cast< const SwAttrSetChg* >(pOld)->GetChgSet()->GetItemState( 
RES_ANCHOR, false, &tmp );
 if( tmp )
 {
-assert(static_cast(pOld)->GetTheChgdSet() == 
&m_aSet); // must not be style's set!
 oldAnchorPosition = static_cast< const SwFormatAnchor* >( tmp 
)->GetContentAnchor();
+assert(oldAnchorPosition == nullptr || // style's set must not 
contain position!
+static_cast(pOld)->GetTheChgdSet() == 
&m_aSet);
 }
 }
 if( pOld && pOld->Which() == RES_ANCHOR )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Association between ToC index object and its paragraph content

[Jens Tröger]

On Tue, Dec 12, 2017 at 03:53:41PM +0100, Michael Stahl wrote:
> On 12.12.2017 14:22, Jens Tröger wrote:
> > Michael, I the case you describe would I not see the same UNO object 
> > address for the same paragraph in the document? But iterating over the 
> > ToC’s paragraphs as described previously in this thread, I get for the 
> > index view:
> > 
> > pyuno object 
> > (com.sun.star.text.XTextContent)0x7feddb8d2638{implementationName=SwXParagraph,
> >  … }
> > 
> > and then for the global document view:
> > 
> > pyuno object 
> > (com.sun.star.text.XTextContent)0x7fedd9f5f598{implementationName=SwXParagraph,
> >  … }
> > 
> > for the same first entry paragraph in the ToC. In fact, if I instantiate 
> > the ToC’s text range three times, then I get three different objects for 
> > the first paragraph:
> > 
> > pyuno object (com.sun.star.text.XTextContent)0x7fc6b1d41188
> > pyuno object (com.sun.star.text.XTextContent)0x7fc6b1e66968
> > pyuno object (com.sun.star.text.XTextContent)0x7fc6b430e288
> > 
> > Do paragraphs have another unique identifier that associates these 
> > different instances as objects representing the same document paragraph?
> 
> do you retain a reference to the paragraphs somewhere?  Writer itself
> doesn't keep the SwXParagraph alive, so if your extension drops the last
> reference to it then it will be deleted and a new one created the next time.

This is getting interesting. If I get the first paragraph of the ToC
index twice then these are two different objects:

index_pars = index.Anchor   

index_cursor = document.Text.createTextCursorByRange(index_pars)

index_parenum1 = index_cursor.createEnumeration()   

while index_parenum1.hasMoreElements(): 

index_par1 = index_parenum1.nextElement()   

index_parenum2 = index_cursor.createEnumeration()   

while index_parenum2.hasMoreElements(): 

index_par2 = index_parenum2.nextElement()   

print(index_par1 == index_par2) 


If I do the same with the global document then the two paragraphs are
the same:

parenum1 = document.Text.createEnumeration()

while parenum1.hasMoreElements():   

par1 = parenum1.nextElement()   

parenum2 = document.Text.createEnumeration()

while parenum2.hasMoreElements():   

par2 = parenum2.nextElement()   

print(par1 == par2) 
  

If I collect all ToC index paragraphs in a list first and then iterate
over the entire document then paragraphs that are part of the ToC index
are found:

TOCPARSET = set()
index_pars = index.Anchor   

index_cursor = document.Text.createTextCursorByRange(index_pars)

index_parenum = index_cursor.createEnumeration()

while index_parenum.hasMoreElements():  

index_par = index_parenum.nextElement() 

TOCPARSET.add(index_par)


parenum = document.Text.createEnumeration() 

while parenum.hasMoreElements():

par = parenum.nextElement() 

print(par in TOCPARSET) 


While I would have expected the first example to print True, the third
example works fine and tells me what I'm looking for.

Thanks!
Jens

-- 
Jens Tröger
http://savage.light-speed.de/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Andras Timar]

Tag 'cp-5.3-34' created by Andras Timar  at 
2017-12-12 21:03 +

cp-5.3-34

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

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

[Andras Timar]

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

New commits:
commit b327117d8cf693c26ed98dd0d6baf3f9250583bb
Author: Andras Timar 
Date:   Tue Dec 12 22:03:19 2017 +0100

Bump version to 5.3-34

Change-Id: Ic51550e8383bf9d651642662b54030babc161da0

diff --git a/configure.ac b/configure.ac
index 8182bfdbf7d6..30cd2b094b32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[5.3.10.33],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[5.3.10.34],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

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

New commits:
commit 6315b8cbbd7b7e67d824e1dba4414bdf61e3e061
Author: Caolán McNamara 
Date:   Tue Dec 12 14:17:11 2017 +

tdf#114408 set correct tooltip rectangle

The original code tried to get the position of the window relative
to its parent and then ask the parent to adjust that position to
a position relative to the toplevel. But the position to use in
that case should have be WindowImpl::nX/WindowImpl::nY not GetPosPixel()

Much easier to just directly ask the the current window for its position
relative to the toplevel.

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

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index f2a9d47e16b5..1e76d47890a2 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1865,7 +1865,7 @@ void Window::RequestHelp( const HelpEvent& rHEvt )
 {
 Point aPos = GetPosPixel();
 if ( ImplGetParent() && !ImplIsOverlapWindow() )
-aPos = ImplGetParent()->OutputToScreenPixel( aPos );
+aPos = OutputToScreenPixel(Point(0, 0));
 tools::Rectangle   aRect( aPos, GetSizePixel() );
 
 Help::ShowBalloon( this, rHEvt.GetMousePosPixel(), aRect, rStr );
@@ -1880,7 +1880,7 @@ void Window::RequestHelp( const HelpEvent& rHEvt )
 {
 Point aPos = GetPosPixel();
 if ( ImplGetParent() && !ImplIsOverlapWindow() )
-aPos = ImplGetParent()->OutputToScreenPixel( aPos );
+aPos = OutputToScreenPixel(Point(0, 0));
 tools::Rectangle   aRect( aPos, GetSizePixel() );
 OUString  aHelpText;
 if ( !rStr.isEmpty() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz]

 icon-themes/breeze/cmd/lc_signaturelinedialog.png |binary
 icon-themes/breeze/cmd/sc_signaturelinedialog.png |binary
 icon-themes/breeze_dark/cmd/lc_signaturelinedialog.png|binary
 icon-themes/breeze_dark/cmd/sc_signaturelinedialog.png|binary
 icon-themes/breeze_svg/cmd/lc_signaturelinedialog.svg |6 ++
 icon-themes/breeze_svg/cmd/sc_signaturelinedialog.svg |6 ++
 icon-themes/elementary/cmd/lc_signaturelinedialog.png |binary
 icon-themes/elementary/cmd/sc_signaturelinedialog.png |binary
 icon-themes/elementary_svg/cmd/lc_signaturelinedialog.svg |1 +
 icon-themes/elementary_svg/cmd/sc_signaturelinedialog.svg |5 +
 10 files changed, 18 insertions(+)

New commits:
commit 2bfef3e6eedfc0e4eada1ddeba723dbc3ff83a4f
Author: andreas kainz 
Date:   Tue Dec 12 16:19:42 2017 +0100

Breeze Elementary-icons: add SignatureLineDialog icon

Change-Id: Id9218e2113643f3a8c31c20680ee7885ed273e58
Reviewed-on: https://gerrit.libreoffice.org/46316
Tested-by: Jenkins 
Reviewed-by: andreas_kainz 

diff --git a/icon-themes/breeze/cmd/lc_signaturelinedialog.png 
b/icon-themes/breeze/cmd/lc_signaturelinedialog.png
new file mode 100644
index ..9b50f6ce2417
Binary files /dev/null and b/icon-themes/breeze/cmd/lc_signaturelinedialog.png 
differ
diff --git a/icon-themes/breeze/cmd/sc_signaturelinedialog.png 
b/icon-themes/breeze/cmd/sc_signaturelinedialog.png
new file mode 100644
index ..a844a2bb8cef
Binary files /dev/null and b/icon-themes/breeze/cmd/sc_signaturelinedialog.png 
differ
diff --git a/icon-themes/breeze_dark/cmd/lc_signaturelinedialog.png 
b/icon-themes/breeze_dark/cmd/lc_signaturelinedialog.png
new file mode 100644
index ..bc5443c5a5a9
Binary files /dev/null and 
b/icon-themes/breeze_dark/cmd/lc_signaturelinedialog.png differ
diff --git a/icon-themes/breeze_dark/cmd/sc_signaturelinedialog.png 
b/icon-themes/breeze_dark/cmd/sc_signaturelinedialog.png
new file mode 100644
index ..72da6cf7d45f
Binary files /dev/null and 
b/icon-themes/breeze_dark/cmd/sc_signaturelinedialog.png differ
diff --git a/icon-themes/breeze_svg/cmd/lc_signaturelinedialog.svg 
b/icon-themes/breeze_svg/cmd/lc_signaturelinedialog.svg
new file mode 100644
index ..e7280817a0d9
--- /dev/null
+++ b/icon-themes/breeze_svg/cmd/lc_signaturelinedialog.svg
@@ -0,0 +1,6 @@
+http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
+ 
+ 
diff --git a/icon-themes/breeze_svg/cmd/sc_signaturelinedialog.svg 
b/icon-themes/breeze_svg/cmd/sc_signaturelinedialog.svg
new file mode 100644
index ..54de66ad5852
--- /dev/null
+++ b/icon-themes/breeze_svg/cmd/sc_signaturelinedialog.svg
@@ -0,0 +1,6 @@
+http://www.w3.org/2000/svg"; viewBox="0 0 16 16">
+ 
+ 
diff --git a/icon-themes/elementary/cmd/lc_signaturelinedialog.png 
b/icon-themes/elementary/cmd/lc_signaturelinedialog.png
new file mode 100644
index ..781549c2af61
Binary files /dev/null and 
b/icon-themes/elementary/cmd/lc_signaturelinedialog.png differ
diff --git a/icon-themes/elementary/cmd/sc_signaturelinedialog.png 
b/icon-themes/elementary/cmd/sc_signaturelinedialog.png
new file mode 100644
index ..34b9bef6df56
Binary files /dev/null and 
b/icon-themes/elementary/cmd/sc_signaturelinedialog.png differ
diff --git a/icon-themes/elementary_svg/cmd/lc_signaturelinedialog.svg 
b/icon-themes/elementary_svg/cmd/lc_signaturelinedialog.svg
new file mode 100644
index ..854adfa7020c
--- /dev/null
+++ b/icon-themes/elementary_svg/cmd/lc_signaturelinedialog.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
\ No newline at end of file
diff --git a/icon-themes/elementary_svg/cmd/sc_signaturelinedialog.svg 
b/icon-themes/elementary_svg/cmd/sc_signaturelinedialog.svg
new file mode 100644
index ..80c43d74fa2c
--- /dev/null
+++ b/icon-themes/elementary_svg/cmd/sc_signaturelinedialog.svg
@@ -0,0 +1,5 @@
+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

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

[Caolán McNamara]

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

New commits:
commit de0c542cd221ca2b189323fa7ce84b6cf55d2fd2
Author: Caolán McNamara 
Date:   Tue Dec 12 14:09:19 2017 +

tdf#114407 let tooltip children of non-nwf widgets be nwf themed

alternative is to not use themed text color when writing text
in non-nwf tooltips

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

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index fecc5530202c..f2a9d47e16b5 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2248,7 +2248,8 @@ void Window::Show(bool bVisible, ShowFlags nFlags)
 // required here, because frames never show up in the child hierarchy 
- which should be fixed
 // eg, the drop down of a combobox which is a system floating window
 if( mpWindowImpl->mbFrame && GetParent() && 
GetParent()->IsCompoundControl() &&
-GetParent()->IsNativeWidgetEnabled() != IsNativeWidgetEnabled() )
+GetParent()->IsNativeWidgetEnabled() != IsNativeWidgetEnabled() &&
+!(GetStyle() & WB_TOOLTIPWIN) )
 {
 EnableNativeWidget( GetParent()->IsNativeWidgetEnabled() );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 svl/source/numbers/zforlist.cxx |4 
 svl/source/numbers/zforscan.cxx |  211 ++--
 svl/source/numbers/zforscan.hxx |   12 ++
 3 files changed, 134 insertions(+), 93 deletions(-)

New commits:
commit b2cd9dd31183c45942c2f522104654ff1f8e6889
Author: Eike Rathke 
Date:   Tue Dec 12 21:13:18 2017 +0100

Resolves: tdf#114185 force KeywordLocalization::LocaleLegacy

... in GetPreviewStringGuess() that is used in Calc TEXT()
spreadsheet function, if the format code didn't resolve as English
or the format code needs to be (re)parsed otherwise as locale
dependent.

Also SvNumberFormatterServiceObj::convertNumberToPreviewString()
(XNumberFormatPreviewer::convertNumberToPreviewString()) if
bAllowEnglish==true.

Change-Id: I7c4b1a610d2bcb20fe0f0ae06efc81f998cae048

diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index d85fa3f2eb0b..2a112e866c9f 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1727,6 +1727,8 @@ bool SvNumberFormatter::GetPreviewStringGuess( const 
OUString& sFormatString,
   
pEntry->GetFormatstring() ) )
 {
 // other Format
+// Force locale's keywords.
+pFormatScanner->ChangeIntl( 
ImpSvNumberformatScan::KeywordLocalization::LocaleLegacy );
 sTmpString = sFormatString;
 pEntry.reset(new SvNumberformat( sTmpString, pFormatScanner,
  pStringScanner, nCheckPos, eLnge 
));
@@ -1747,6 +1749,8 @@ bool SvNumberFormatter::GetPreviewStringGuess( const 
OUString& sFormatString,
 
pEntry2->GetFormatstring() ) )
 {
 // other Format
+// Force locale's keywords.
+pFormatScanner->ChangeIntl( 
ImpSvNumberformatScan::KeywordLocalization::LocaleLegacy );
 sTmpString = sFormatString;
 pEntry.reset(new SvNumberformat( sTmpString, 
pFormatScanner,
  pStringScanner, nCheckPos, 
eLnge ));
commit 482182fd0331a0be371f8f58dc74aa05a68f0a1d
Author: Eike Rathke 
Date:   Tue Dec 12 20:43:18 2017 +0100

Prepare ImpSvNumberformatScan with KeywordLocalization context, tdf#114185

Change-Id: I3942a7de52bcedf491da83407791fcd0080aaf4d

diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index a48063f7df24..ed3edf731096 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -111,6 +111,7 @@ ImpSvNumberformatScan::ImpSvNumberformatScan( 
SvNumberFormatter* pFormatterP )
 , eNewLnge(LANGUAGE_DONTKNOW)
 , eTmpLnge(LANGUAGE_DONTKNOW)
 , nCurrPos(-1)
+, meKeywordLocalization(KeywordLocalization::AllowEnglish)
 {
 pFormatter = pFormatterP;
 xNFC = css::i18n::NumberFormatMapper::create( 
pFormatter->GetComponentContext() );
@@ -160,8 +161,9 @@ ImpSvNumberformatScan::~ImpSvNumberformatScan()
 Reset();
 }
 
-void ImpSvNumberformatScan::ChangeIntl()
+void ImpSvNumberformatScan::ChangeIntl( KeywordLocalization 
eKeywordLocalization )
 {
+meKeywordLocalization = eKeywordLocalization;
 bKeywordsNeedInit = true;
 bCompatCurNeedInit = true;
 // may be initialized by InitSpecialKeyword()
@@ -298,7 +300,10 @@ void ImpSvNumberformatScan::SetDependentKeywords()
 {
 sKeyword[NF_KEY_THAI_T] = sEnglishKeyword[NF_KEY_THAI_T];
 }
-if ( eLang.anyOf(
+
+const bool bL10n = (meKeywordLocalization != 
KeywordLocalization::EnglishOnly);
+
+if ( bL10n && eLang.anyOf(
 LANGUAGE_GERMAN,
 LANGUAGE_GERMAN_SWISS,
 LANGUAGE_GERMAN_AUSTRIAN,
@@ -335,7 +340,7 @@ void ImpSvNumberformatScan::SetDependentKeywords()
 else
 {
 // day
-if ( eLang.anyOf(
+if ( bL10n && eLang.anyOf(
 LANGUAGE_ITALIAN,
 LANGUAGE_ITALIAN_SWISS))
 {
@@ -348,7 +353,7 @@ void ImpSvNumberformatScan::SetDependentKeywords()
 sKeyword[NF_KEY_GG] = "XX";
 sKeyword[NF_KEY_GGG] = "XXX";
 }
-else if ( eLang.anyOf(
+else if ( bL10n && eLang.anyOf(
  LANGUAGE_FRENCH,
  LANGUAGE_FRENCH_BELGIAN,
  LANGUAGE_FRENCH_CANADIAN,
@@ -361,7 +366,7 @@ void ImpSvNumberformatScan::SetDependentKeywords()
 sKeyword[NF_KEY_DDD] = "JJJ";
 sKeyword[NF_KEY_] = "";
 }
-else if ( eLang == LANGUAGE_FINNISH )
+else if ( bL10n && eLang == LANGUAGE_FINNISH )
 {
 sKeyword[NF_KEY_D] = "P";
 sKeyword[NF_KEY_DD] = "PP";
@@ -376,7 +381,7 @@ void ImpSvNumberformatScan::SetDependentKeywords()
 sKeyword[NF_KEY_] = sEnglishKeyword[NF

[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/sifr

[Yousuf Philips]

 icon-themes/breeze/links.txt |4 ++--
 icon-themes/sifr/links.txt   |2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 62b08a7c7d1cb77906c8eab2218cba257e5be385
Author: Yousuf Philips 
Date:   Mon Dec 11 18:04:37 2017 +0400

tdf#114265 Use close icon in find in print preview

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

diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index fce62a1b8a59..314c6f4fd05b 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -432,16 +432,16 @@ cmd/sc_dsbeditdoc.png cmd/sc_editdoc.png
 # Quit
 cmd/lc_closemasterview.png cmd/lc_quit.png
 cmd/lc_closewin.png cmd/lc_quit.png
-cmd/lc_closepreview.png cmd/lc_quit.png
 cmd/sc_closemasterview.png cmd/sc_quit.png
 cmd/sc_closewin.png cmd/sc_quit.png
-cmd/sc_closepreview.png cmd/sc_quit.png
 
 # Close
 cmd/lc_closedocs.png cmd/lc_closedoc.png
 cmd/lc_exitsearch.png cmd/lc_closedoc.png
+cmd/lc_closepreview.png cmd/lc_closedoc.png
 cmd/sc_closedocs.png cmd/sc_closedoc.png
 cmd/sc_exitsearch.png cmd/sc_closedoc.png
+cmd/sc_closepreview.png cmd/sc_closedoc.png
 
 # arc
 cmd/lc_basicshapes.block-arc.png cmd/lc_arc.png
diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index 58d9a65f5852..08af510ca16f 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -64,6 +64,8 @@ cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png
 # Print Preview Toolbar
 cmd/lc_showsinglepage.png cmd/lc_adddirect.png
 cmd/sc_showsinglepage.png cmd/sc_adddirect.png
+cmd/lc_closepreview.png cmd/lc_exitsearch.png
+cmd/sc_closepreview.png cmd/sc_exitsearch.png
 
 # Horizontal Text Alignment (align* is in calc and *para is used in writer)
 #cmd/lc_alignleft.png cmd/lc_leftpara.png
___
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/inc sc/qa sc/source

[Dennis Francis]

 sc/inc/calcconfig.hxx|1 
 sc/inc/tokenarray.hxx|9 +--
 sc/inc/types.hxx |1 
 sc/qa/unit/parallelism.cxx   |   34 ++
 sc/source/core/data/formulacell.cxx  |   10 ++-
 sc/source/core/tool/calcconfig.cxx   |   16 
 sc/source/core/tool/formulagroup.cxx |2 -
 sc/source/core/tool/token.cxx|   45 +--
 8 files changed, 100 insertions(+), 18 deletions(-)

New commits:
commit 8807e568326679831869329aabf4f941be39f2ab
Author: Dennis Francis 
Date:   Thu Nov 30 14:36:24 2017 +0530

Do not use threading for formula group if...

...there is at least one opcode in the token array that is
in the blacklist set of opcodes for threading.

Cleaned up the logic by removing FormulaVectorEnabledForThreading
from ScFormulaVectorState enum and created two separate boolean
fields in ScTokenArray to keep track of whether OpenCL or threading
could be used.

Change-Id: Ieca0004b33a3cfea6ca5c0ff90bc8cea8746d102
Reviewed-on: https://gerrit.libreoffice.org/45564
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 
Tested-by: Jenkins 
(cherry picked from commit 330b1b5bcec06e3a8d35413ff921fa219bc0a8dc)
Reviewed-on: https://gerrit.libreoffice.org/46318

diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx
index eaf4f36f143b..77b16ab92162 100644
--- a/sc/inc/calcconfig.hxx
+++ b/sc/inc/calcconfig.hxx
@@ -49,6 +49,7 @@ struct SC_DLLPUBLIC ScCalcConfig
 bool mbHasStringRefSyntax:1;
 
 static bool isOpenCLEnabled();
+static bool isThreadingEnabled();
 static bool isSwInterpreterEnabled();
 
 bool mbOpenCLSubsetOnly:1;
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index 8b352b447f09..c054f11d0964 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -51,7 +51,9 @@ class SC_DLLPUBLIC ScTokenArray : public 
formula::FormulaTokenArray
 bool ImplGetReference( ScRange& rRange, const ScAddress& rPos, bool 
bValidOnly ) const;
 
 size_t mnHashValue;
-ScFormulaVectorState meVectorState;
+ScFormulaVectorState meVectorState : 4; // Only 4 bits
+bool mbOpenCLEnabled : 1;
+bool mbThreadingEnabled : 1;
 
 public:
 ScTokenArray();
@@ -66,7 +68,7 @@ public:
 size_t GetHash() const { return mnHashValue;}
 
 ScFormulaVectorState GetVectorState() const { return meVectorState;}
-void ResetVectorState() { meVectorState = FormulaVectorEnabled; }
+void ResetVectorState();
 bool IsFormulaVectorDisabled() const;
 
 /**
@@ -259,6 +261,9 @@ public:
 
 sal_Int32 GetWeight() const;
 
+bool IsEnabledForOpenCL() const { return mbOpenCLEnabled; }
+bool IsEnabledForThreading() const { return !mbOpenCLEnabled && 
mbThreadingEnabled; }
+
 #if DEBUG_FORMULA_COMPILER
 void Dump() const;
 #endif
diff --git a/sc/inc/types.hxx b/sc/inc/types.hxx
index cc82e363765d..51898c291fde 100644
--- a/sc/inc/types.hxx
+++ b/sc/inc/types.hxx
@@ -59,7 +59,6 @@ enum ScFormulaVectorState
 
 FormulaVectorEnabled,
 FormulaVectorCheckReference,
-FormulaVectorEnabledForThreading,
 FormulaVectorUnknown
 };
 
diff --git a/sc/qa/unit/parallelism.cxx b/sc/qa/unit/parallelism.cxx
index e3bb00502ea8..428d65a20bec 100644
--- a/sc/qa/unit/parallelism.cxx
+++ b/sc/qa/unit/parallelism.cxx
@@ -45,11 +45,13 @@ public:
 void testSUMIFS();
 void testDivision();
 void testVLOOKUP();
+void testVLOOKUPSUM();
 
 CPPUNIT_TEST_SUITE(ScParallelismTest);
 CPPUNIT_TEST(testSUMIFS);
 CPPUNIT_TEST(testDivision);
 CPPUNIT_TEST(testVLOOKUP);
+CPPUNIT_TEST(testVLOOKUPSUM);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -262,6 +264,38 @@ void ScParallelismTest::testVLOOKUP()
 m_pDoc->DeleteTab(0);
 }
 
+void ScParallelismTest::testVLOOKUPSUM()
+{
+m_pDoc->InsertTab(0, "1");
+
+const size_t nNumRows = 4096*4;
+OUString aTableRef = "$A$1:$B$" + OUString::number(nNumRows);
+for (size_t i = 0; i < nNumRows; ++i)
+{
+m_pDoc->SetValue(0, i, 0, static_cast(i));
+m_pDoc->SetValue(1, i, 0, static_cast(5*i + 100));
+m_pDoc->SetValue(2, i, 0, static_cast(nNumRows - i - 1));
+}
+for (size_t i = 0; i < nNumRows; ++i)
+{
+OUString aArgNum = "C" + OUString::number(i+1);
+m_pDoc->SetFormula(ScAddress(3, i, 0),
+   "=SUM(" + aArgNum + ";VLOOKUP(" + aArgNum + ";" + 
aTableRef + "; 2; 0)) + SUM($A1:$A2)",
+   formula::FormulaGrammar::GRAM_NATIVE_UI);
+}
+
+m_xDocShell->DoHardRecalc();
+
+size_t nArg;
+for (size_t i = 0; i < nNumRows; ++i)
+{
+OString aMsg = "At row " + OString::number(i);
+nArg = nNumRows - i - 1;
+CPPUNIT_ASSERT_EQUAL_MESSAGE(aMsg.getStr(), 6*nArg + 101, 
static_cast(m_pDoc->GetValue(3, i, 0)));
+}
+m_pDoc->DeleteTab(0);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ScParall

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - 5 commits - include/svx svx/source sw/inc sw/source

[Armin Le Grand]

 include/svx/framelink.hxx   |   35 
 svx/source/dialog/framelink.cxx |2 
 sw/inc/sw_primitivetypes2d.hxx  |1 
 sw/source/core/access/accfrmobj.cxx |2 
 sw/source/core/doc/notxtfrm.cxx |2 
 sw/source/core/draw/dflyobj.cxx |2 
 sw/source/core/edit/autofmt.cxx |2 
 sw/source/core/inc/cellfrm.hxx  |2 
 sw/source/core/inc/flyfrm.hxx   |2 
 sw/source/core/inc/frame.hxx|   41 
 sw/source/core/inc/ftnfrm.hxx   |6 
 sw/source/core/inc/layfrm.hxx   |2 
 sw/source/core/inc/notxtfrm.hxx |2 
 sw/source/core/inc/ptqueue.hxx  |4 
 sw/source/core/inc/rootfrm.hxx  |2 
 sw/source/core/inc/tabfrm.hxx   |2 
 sw/source/core/inc/txtfrm.hxx   |4 
 sw/source/core/layout/calcmove.cxx  |   26 
 sw/source/core/layout/dbg_lay.cxx   |2 
 sw/source/core/layout/findfrm.cxx   |2 
 sw/source/core/layout/flyincnt.cxx  |5 
 sw/source/core/layout/ftnfrm.cxx|4 
 sw/source/core/layout/layact.cxx|   16 
 sw/source/core/layout/newfrm.cxx|4 
 sw/source/core/layout/pagechg.cxx   |3 
 sw/source/core/layout/paintfrm.cxx  |  912 
+++---
 sw/source/core/layout/sectfrm.cxx   |2 
 sw/source/core/layout/ssfrm.cxx |7 
 sw/source/core/layout/tabfrm.cxx|4 
 sw/source/core/layout/trvlfrm.cxx   |   17 
 sw/source/core/layout/unusedf.cxx   |4 
 sw/source/core/layout/wsfrm.cxx |   28 
 sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx |2 
 sw/source/core/text/frmpaint.cxx|   37 
 sw/source/core/text/itrcrsr.cxx |4 
 sw/source/core/text/porfly.cxx  |2 
 sw/source/core/text/pormulti.cxx|2 
 sw/source/core/text/txtfrm.cxx  |2 
 sw/source/core/txtnode/txtedt.cxx   |8 
 sw/source/core/view/viewpg.cxx  |2 
 sw/source/core/view/viewsh.cxx  |   12 
 sw/source/core/view/vprint.cxx  |6 
 42 files changed, 492 insertions(+), 734 deletions(-)

New commits:
commit 2027cca2ae733a89329450da1888a4f1d4a6d6a0
Author: Armin Le Grand 
Date:   Tue Dec 5 19:35:20 2017 +0100

SwFrameBorder: Converted BorderRectangle functionality

to primitive usage, added a SwBorderRectanglePrimitive2D
which now encapsulates the four Styles and the transformation
of a single BorderLineRectangle. This is a preparation for
later buffered primitive usage at SwFrame level

Change-Id: I6689b94fe996ead8142553e8442e151e53d10e8a

diff --git a/sw/inc/sw_primitivetypes2d.hxx b/sw/inc/sw_primitivetypes2d.hxx
index 4ded8572088b..44509820f72c 100644
--- a/sw/inc/sw_primitivetypes2d.hxx
+++ b/sw/inc/sw_primitivetypes2d.hxx
@@ -25,6 +25,7 @@
 #define PRIMITIVE2D_ID_SWVIRTFLYDRAWOBJPRIMITIVE2D  (PRIMITIVE2D_ID_RANGE_SW| 
0)
 #define PRIMITIVE2D_ID_SWSIDEBARANCHORPRIMITIVE (PRIMITIVE2D_ID_RANGE_SW| 
1)
 #define PRIMITIVE2D_ID_SWSIDEBARSHADOWPRIMITIVE (PRIMITIVE2D_ID_RANGE_SW| 
2)
+#define PRIMITIVE2D_ID_SWBORDERRECTANGLERIMITIVE(PRIMITIVE2D_ID_RANGE_SW| 
3)
 
 #endif // INCLUDED_SW_INC_SW_PRIMITIVETYPES2D_HXX
 
diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index b2e16581b253..207afbede1fa 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -62,6 +62,8 @@
 #include 
 #include 
 #include 
+#include 
+
 #include 
 #include 
 #include 
@@ -224,7 +226,6 @@ public:
 };
 
 // Default zoom factor
-const static double aMinDistScale = 0.73;
 const static double aEdgeScale = 0.5;
 
 //To optimize the expensive RetouchColor determination
@@ -1183,42 +1184,6 @@ void SwAlignRect( SwRect &rRect, const SwViewShell *pSh, 
const vcl::RenderContex
 

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - helpcontent2

[Olivier Hallot]

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

New commits:
commit 3b28cd252dd69d140028d1dc1646d7a061eeb19f
Author: Olivier Hallot 
Date:   Tue Dec 12 17:34:20 2017 -0200

Updated core
Project: help  de8e57dbe34c7042701b810efc5aa111fee1a3de

Fix more typos in help pages

Change-Id: Ie6af0ec57f921df31bcb096d12b9e8dd938c40ba
Reviewed-on: https://gerrit.libreoffice.org/46337
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 
(cherry picked from commit 5bf98f3fd366b056c0a56bcc54e106673b0d5cd5)
Reviewed-on: https://gerrit.libreoffice.org/46338

diff --git a/helpcontent2 b/helpcontent2
index 7217219e9cd8..de8e57dbe34c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7217219e9cd8dcc4b9382ab13da804948565b7db
+Subproject commit de8e57dbe34c7042701b810efc5aa111fee1a3de
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-6-0' - source/text

[Olivier Hallot]

 source/text/sbasic/shared/0304.xhp  |4 ++--
 source/text/sbasic/shared/03150001.xhp  |2 +-
 source/text/scalc/01/data_form.xhp  |6 +++---
 source/text/swriter/guide/indices_enter.xhp |2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit de8e57dbe34c7042701b810efc5aa111fee1a3de
Author: Olivier Hallot 
Date:   Tue Dec 12 17:34:20 2017 -0200

Fix more typos in help pages

Change-Id: Ie6af0ec57f921df31bcb096d12b9e8dd938c40ba
Reviewed-on: https://gerrit.libreoffice.org/46337
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 
(cherry picked from commit 5bf98f3fd366b056c0a56bcc54e106673b0d5cd5)
Reviewed-on: https://gerrit.libreoffice.org/46338

diff --git a/source/text/sbasic/shared/0304.xhp 
b/source/text/sbasic/shared/0304.xhp
index bed14881a..02bf9d230 100644
--- a/source/text/sbasic/shared/0304.xhp
+++ b/source/text/sbasic/shared/0304.xhp
@@ -193,7 +193,7 @@
 End Sub
 
 Additional VBA constants
-The following constants are avalable when VBA compatibility 
mode is enabled
+The following constants are available when VBA compatibility 
mode is enabled
 
 
 
@@ -205,7 +205,7 @@
 Hexadecimal (decimal) value
 
 
-Desccription
+Description
 
 
 
diff --git a/source/text/sbasic/shared/03150001.xhp 
b/source/text/sbasic/shared/03150001.xhp
index 915e3c8c1..f4e06dbe8 100644
--- a/source/text/sbasic/shared/03150001.xhp
+++ b/source/text/sbasic/shared/03150001.xhp
@@ -101,7 +101,7 @@
 3
 
 
-Tueday
+Tuesday
 
 
 
diff --git a/source/text/scalc/01/data_form.xhp 
b/source/text/scalc/01/data_form.xhp
index 95dc5442e..a4581b3fc 100644
--- a/source/text/scalc/01/data_form.xhp
+++ b/source/text/scalc/01/data_form.xhp
@@ -36,7 +36,7 @@
 
 
 Preparing the data entry form
-To 
be effective, the Calc data table should have a header row, where each cell 
contents is the label of the column. The header cells contents becomes the 
label of each data field in the form.
+To 
be effective, the Calc data table should have a header row, where each cell 
contents is the label of the column. The header cells contents become the label 
of each data field in the form.
 
 Activating the form
 
@@ -44,7 +44,7 @@
 Place the cursor in the header row of the table.
 
 
-Choose Data - Form
+Choose Data - Form
 
 
 Filling the form with data
@@ -65,7 +65,7 @@
 Use the 
Tab and Shift-Tab keys to 
jump forth and back between text boxes of the form dialog.
 You also 
can use the form scroll bar to move between text boxes.
 Reopening the form dialog
-To 
reopen the form dialog, place the cursor on the header row and open the form. 
The displayed record in the form dialog is the fisrt data record. Move to the 
last record before entering new data otherwise the current record will be 
edited.
+To 
reopen the form dialog, place the cursor on the header row and open the form. 
The displayed record in the form dialog is the first data record. Move to the 
last record before entering new data otherwise the current record will be 
edited.
 
 Document Forms
 
diff --git a/source/text/swriter/guide/indices_enter.xhp 
b/source/text/swriter/guide/indices_enter.xhp
index 9cceb3a61..3fd81468f 100644
--- a/source/text/swriter/guide/indices_enter.xhp
+++ b/source/text/swriter/guide/indices_enter.xhp
@@ -65,7 +65,7 @@
 
 
   
-Choose 
Tools - Chapter Numbering and click the Numbering 
tab.
+Choose 
Tools - Chapter Numbering and click the 
Numbering tab.
   
   
 Select the 
paragraph style that you want to include in your table of contents in the 
Paragraph Style box.
___
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 0d97e1a8ecacd96d9a555ecd3907a6ce88fba4a0
Author: Olivier Hallot 
Date:   Tue Dec 12 17:34:20 2017 -0200

Updated core
Project: help  5bf98f3fd366b056c0a56bcc54e106673b0d5cd5

Fix more typos in help pages

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

diff --git a/helpcontent2 b/helpcontent2
index b8ee7a5bf9fb..5bf98f3fd366 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b8ee7a5bf9fba95a2bda283008a5bef5eff4131e
+Subproject commit 5bf98f3fd366b056c0a56bcc54e106673b0d5cd5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot]

 source/text/sbasic/shared/0304.xhp  |4 ++--
 source/text/sbasic/shared/03150001.xhp  |2 +-
 source/text/scalc/01/data_form.xhp  |6 +++---
 source/text/swriter/guide/indices_enter.xhp |2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 5bf98f3fd366b056c0a56bcc54e106673b0d5cd5
Author: Olivier Hallot 
Date:   Tue Dec 12 17:34:20 2017 -0200

Fix more typos in help pages

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

diff --git a/source/text/sbasic/shared/0304.xhp 
b/source/text/sbasic/shared/0304.xhp
index bed14881a..02bf9d230 100644
--- a/source/text/sbasic/shared/0304.xhp
+++ b/source/text/sbasic/shared/0304.xhp
@@ -193,7 +193,7 @@
 End Sub
 
 Additional VBA constants
-The following constants are avalable when VBA compatibility 
mode is enabled
+The following constants are available when VBA compatibility 
mode is enabled
 
 
 
@@ -205,7 +205,7 @@
 Hexadecimal (decimal) value
 
 
-Desccription
+Description
 
 
 
diff --git a/source/text/sbasic/shared/03150001.xhp 
b/source/text/sbasic/shared/03150001.xhp
index 915e3c8c1..f4e06dbe8 100644
--- a/source/text/sbasic/shared/03150001.xhp
+++ b/source/text/sbasic/shared/03150001.xhp
@@ -101,7 +101,7 @@
 3
 
 
-Tueday
+Tuesday
 
 
 
diff --git a/source/text/scalc/01/data_form.xhp 
b/source/text/scalc/01/data_form.xhp
index 95dc5442e..a4581b3fc 100644
--- a/source/text/scalc/01/data_form.xhp
+++ b/source/text/scalc/01/data_form.xhp
@@ -36,7 +36,7 @@
 
 
 Preparing the data entry form
-To 
be effective, the Calc data table should have a header row, where each cell 
contents is the label of the column. The header cells contents becomes the 
label of each data field in the form.
+To 
be effective, the Calc data table should have a header row, where each cell 
contents is the label of the column. The header cells contents become the label 
of each data field in the form.
 
 Activating the form
 
@@ -44,7 +44,7 @@
 Place the cursor in the header row of the table.
 
 
-Choose Data - Form
+Choose Data - Form
 
 
 Filling the form with data
@@ -65,7 +65,7 @@
 Use the 
Tab and Shift-Tab keys to 
jump forth and back between text boxes of the form dialog.
 You also 
can use the form scroll bar to move between text boxes.
 Reopening the form dialog
-To 
reopen the form dialog, place the cursor on the header row and open the form. 
The displayed record in the form dialog is the fisrt data record. Move to the 
last record before entering new data otherwise the current record will be 
edited.
+To 
reopen the form dialog, place the cursor on the header row and open the form. 
The displayed record in the form dialog is the first data record. Move to the 
last record before entering new data otherwise the current record will be 
edited.
 
 Document Forms
 
diff --git a/source/text/swriter/guide/indices_enter.xhp 
b/source/text/swriter/guide/indices_enter.xhp
index 9cceb3a61..3fd81468f 100644
--- a/source/text/swriter/guide/indices_enter.xhp
+++ b/source/text/swriter/guide/indices_enter.xhp
@@ -65,7 +65,7 @@
 
 
   
-Choose 
Tools - Chapter Numbering and click the Numbering 
tab.
+Choose 
Tools - Chapter Numbering and click the 
Numbering tab.
   
   
 Select the 
paragraph style that you want to include in your table of contents in the 
Paragraph Style box.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - framework/Library_fwk.mk solenv/gbuild

[Don Lewis]

 framework/Library_fwk.mk  |   11 --
 solenv/gbuild/LinkTarget.mk   |   41 +-
 solenv/gbuild/platform/freebsd.mk |4 +++
 solenv/gbuild/platform/linux.mk   |4 +++
 solenv/gbuild/platform/macosx.mk  |5 
 solenv/gbuild/platform/os2.mk |4 +++
 solenv/gbuild/platform/solaris.mk |5 
 solenv/gbuild/platform/windows.mk |6 -
 8 files changed, 60 insertions(+), 20 deletions(-)

New commits:
commit 9a6267c4a54c7321b50196c7b47dd98118f595f3
Author: Don Lewis 
Date:   Tue Dec 12 18:45:51 2017 +

Improvements to per-object optimization overrides in gbuild:

* Less Library.mk editing required to add an optimization exception
than what has been normally done to date.

* Add a variable to specify an override to -O1 instead of only
allowing -O0.

* Don't lose debug flags when overriding optimization.


Convert the recent Mac optimization override in framework/Library_fwk.mk
to the new style.


Improvements to Windows debug builds in gbuild:

* There are multiple dependency paths that trigger compiling a source
file.  Add a target specific $(PDBFILE) to the root of each so
that $(PDBFILE) is set properly when compiling.

Note: $(PDBFILE) is not getting set when compiling the sources
for the per-module (Google Test) tests.

* Don't inadvertantly disable the use of pre-compiled headers when
enabling debug (not specific to Windows).

Note: If both debug and pre-compiled headers are enabled, building
of modules that contain more than one library will fail due to
limitations of Visual Studio.  The problem is that when we
build the precompiled header, the output file(s) are based on the
module name.  Even though each Library_*.mk specifies the rule
to build the precompiled header, it is only built once for the
module.  Visual Studio requires that the $(PDBFILE) used when
compiling the sources match the $(PDBFILE) used when compiling
the precompiled header, but the value of $(PDBFILE) is specific
to each library.  The best fix would be to compile the headers
once for each library and stash the output in a per-library
specific place, but this requires some fairly extensive changes.
Another potential fix would be to use -Z7 optimization so that the
debug information is stored in the object files.

diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index fd66cae227c7..449800331fce 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -61,6 +61,11 @@ $(eval $(call gb_Library_add_linked_libs,fwk,\
 $(gb_STDLIBS) \
 ))
 
+# i126622 - Base 4.1.2 does not open Tables and Queries in Mac OSX
+ifeq ($(OS),MACOSX)
+$(call 
gb_LinkTarget_set_cxx_optimization,framework/source/loadenv/loadenv,$(gb_COMPILEROPT1FLAGS))
+endif
+
 $(eval $(call gb_Library_add_exception_objects,fwk,\
 framework/source/accelerators/acceleratorcache \
 framework/source/accelerators/acceleratorconfiguration \
@@ -190,10 +195,4 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\
 framework/source/xml/imagesdocumenthandler \
 ))
 
-# i126622 - Base 4.1.2 does not open Tables and Queries in Mac OSX
-ifeq ($(OS),MACOSX)
-$(call gb_CxxObject_get_target,framework/source/loadenv/loadenv):\
-T_CXXFLAGS := $(gb_LinkTarget_CXXFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) 
$(gb_COMPILERNOOPTFLAGS)
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 18e79404a1aa..faa7c2863ff8 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -109,10 +109,10 @@ gb_CxxObject_get_source = $(1)/$(2).cxx
 define gb_CxxObject__set_pchflags
 ifeq ($(gb_ENABLE_PCH),$(true))
 ifneq ($(strip $$(PCH_NAME)),)
-ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) 
$$(gb_LinkTarget_EXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(DEFS)))
+ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) 
$$(gb_LinkTarget_EXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(CXXFLAGS) $$(DEFS)))
 $$@ : PCHFLAGS := $$(call gb_PrecompiledHeader_get_enableflags,$$(PCH_NAME))
 else
-ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) 
$$(gb_LinkTarget_NOEXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(DEFS)))
+ifeq ($$(sort $$(PCH_CXXFLAGS) $$(PCH_DEFS) 
$$(gb_LinkTarget_NOEXCEPTIONFLAGS)),$$(sort $$(T_CXXFLAGS) $$(CXXFLAGS) 
$$(DEFS)))
 $$@ : PCHFLAGS := $$(call 
gb_NoexPrecompiledHeader_get_enableflags,$$(PCH_NAME))
 else
 $$(info No precompiled header available for $$*.)
@@ -333,12 +333,12 @@ $(call gb_LinkTarget_get_target,$(1)) : OBJCXXOBJECTS :=
 $(call gb_LinkTarget_get_clean_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS :=
 $(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $$(gb_LinkTarget_CFLAGS) 
$(CFLAGS)
+$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $$(gb_LinkTarget_CFLAGS)
 $(call gb

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - helpcontent2

[Olivier Hallot]

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

New commits:
commit 46f1574b3427c4f12aba7aa58875908059867bfe
Author: Olivier Hallot 
Date:   Tue Dec 12 16:59:01 2017 -0200

Updated core
Project: help  7217219e9cd8dcc4b9382ab13da804948565b7db

Fix Help pages typos.

Change-Id: I425e6ddc86c997b6e00b8e80c193ee6a7b6df4d3
Reviewed-on: https://gerrit.libreoffice.org/46335
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 
(cherry picked from commit b8ee7a5bf9fba95a2bda283008a5bef5eff4131e)
Reviewed-on: https://gerrit.libreoffice.org/46336

diff --git a/helpcontent2 b/helpcontent2
index a5712dab8209..7217219e9cd8 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a5712dab8209d675b5e493b4dd64fd1300997755
+Subproject commit 7217219e9cd8dcc4b9382ab13da804948565b7db
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot]

 source/text/sbasic/shared/03060300.xhp |6 +++---
 source/text/sbasic/shared/03060400.xhp |6 +++---
 source/text/sbasic/shared/03060500.xhp |6 +++---
 source/text/sbasic/shared/03070600.xhp |6 +++---
 source/text/sbasic/shared/03090203.xhp |4 ++--
 source/text/sbasic/shared/03103350.xhp |4 ++--
 source/text/sbasic/shared/03103600.xhp |4 ++--
 source/text/sbasic/shared/03103700.xhp |4 ++--
 source/text/sbasic/shared/03104000.xhp |2 +-
 source/text/scalc/01/func_countifs.xhp |2 +-
 source/text/scalc/01/func_sumifs.xhp   |2 +-
 11 files changed, 23 insertions(+), 23 deletions(-)

New commits:
commit b8ee7a5bf9fba95a2bda283008a5bef5eff4131e
Author: Olivier Hallot 
Date:   Tue Dec 12 16:59:01 2017 -0200

Fix Help pages typos.

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

diff --git a/source/text/sbasic/shared/03060300.xhp 
b/source/text/sbasic/shared/03060300.xhp
index 9585b5be9..a155b244d 100644
--- a/source/text/sbasic/shared/03060300.xhp
+++ b/source/text/sbasic/shared/03060300.xhp
@@ -20,7 +20,7 @@
 
 
   
-Imp-Operator [Runtime]
+Imp Operator [Runtime]
 /text/sbasic/shared/03060300.xhp
   
 
@@ -34,7 +34,7 @@
 
 
 
-Imp 
Operator [Runtime]
+Imp 
Operator [Runtime]
 Performs a 
logical implication on two expressions.
 
 
@@ -64,4 +64,4 @@
 
 
 
-
\ No newline at end of file
+
diff --git a/source/text/sbasic/shared/03060400.xhp 
b/source/text/sbasic/shared/03060400.xhp
index aa4eea768..195ca9a30 100644
--- a/source/text/sbasic/shared/03060400.xhp
+++ b/source/text/sbasic/shared/03060400.xhp
@@ -20,7 +20,7 @@
 
 
   
-Not-Operator [Runtime]
+Not Operator [Runtime]
 /text/sbasic/shared/03060400.xhp
   
 
@@ -34,7 +34,7 @@
 
 
 
-Not-Operator [Runtime]
+Not 
Operator [Runtime]
 Negates an 
expression by inverting the bit values.
 
 
@@ -63,4 +63,4 @@
 
 
 
-
\ No newline at end of file
+
diff --git a/source/text/sbasic/shared/03060500.xhp 
b/source/text/sbasic/shared/03060500.xhp
index d35a59abc..0fb206640 100644
--- a/source/text/sbasic/shared/03060500.xhp
+++ b/source/text/sbasic/shared/03060500.xhp
@@ -20,7 +20,7 @@
 
 
   
-Or-Operator [Runtime]
+Or Operator [Runtime]
 /text/sbasic/shared/03060500.xhp
   
 
@@ -34,7 +34,7 @@
 
 
 
-Or Operator 
[Runtime]
+Or Operator 
[Runtime]
 Performs a 
logical OR disjunction on two expressions.
 
 
@@ -64,4 +64,4 @@
 
 
 
-
\ No newline at end of file
+
diff --git a/source/text/sbasic/shared/03070600.xhp 
b/source/text/sbasic/shared/03070600.xhp
index ddb9f3f9d..4897f2d5f 100644
--- a/source/text/sbasic/shared/03070600.xhp
+++ b/source/text/sbasic/shared/03070600.xhp
@@ -20,7 +20,7 @@
 
 
   
-Mod-Operator [Runtime]
+Mod Operator [Runtime]
 /text/sbasic/shared/03070600.xhp
   
 
@@ -34,7 +34,7 @@
 
 
 
-Mod 
Operator [Runtime]
+Mod 
Operator [Runtime]
 Returns the 
integer remainder of a division.
 
 
@@ -63,4 +63,4 @@
 
 
 
-
\ No newline at end of file
+
diff --git a/source/text/sbasic/shared/03090203.xhp 
b/source/text/sbasic/shared/03090203.xhp
index fb2832414..41fed6d2d 100644
--- a/source/text/sbasic/shared/03090203.xhp
+++ b/source/text/sbasic/shared/03090203.xhp
@@ -21,7 +21,7 @@
 
 
 
-While...Wend Statement[Runtime]
+While...Wend Statement [Runtime]
 /text/sbasic/shared/03090203.xhp
 
 
@@ -31,7 +31,7 @@
 
 
   
-  While;While...Wend 
loopWhile...Wend 
Statement[Runtime]
+  While;While...Wend 
loopWhile...Wend Statement 
[Runtime]
   When a 
program encounters a While statement, it tests the condition. If the condition 
is False, the program continues directly following the Wend statement. If the 
condition is True, the loop is executed until the program finds Wend and then 
jumps back to the While statement. If the condition is still True, 
the loop is executed again.
   
   Unlike the 
Do...Loop 
statement, you cannot cancel a While...Wend loop with Exit. Never exit a 
While...Wend loop with GoTo, since this can cause a run-time error.
diff --git a/source/text/sbasic/shared/03103350.xhp 
b/source/text/sbasic/shared/03103350.xhp
index cc47ba628..45ffb6cf2 100644
--- a/source/text/sbasic/shared/03103350.xhp
+++ b/source/text/sbasic/shared/03103350.xhp
@@ -37,7 +37,7 @@
 
 
 
-Option VBASupport Statement [Runtime]
+Option VBASupport Statement [Runtime]
 Specifies that 
%PRODUCTNAME Basic will support some VBA statements, functions and 
objects.
 
 The 
support for VBA is not complete, but covers a large portion of the common usage 
patterns.
@@ -68,4 +68,4 @@
 
 
 
-
\ No newline at end of file
+
diff --git a/source/text/sbasic/shared/03103600.xhp 
b/source/text/sbasic/shared/03103600.xhp
index bb1da9b39..94231784d 100644
--- a/source/text/sbasic/shared/03103600.xhp
+++ b/source/text/sbasic/shared/03103600.xhp
@@ -35,7 +35,7 @@
 
 
 
-TypeName Function; VarType 
Function[Runtime]
+TypeName Function; VarType Function 
[Runtime]
 Retur

[Libreoffice-commits] help.git: Branch 'libreoffice-6-0' - source/text

[Olivier Hallot]

 source/text/sbasic/shared/03060300.xhp |6 +++---
 source/text/sbasic/shared/03060400.xhp |6 +++---
 source/text/sbasic/shared/03060500.xhp |6 +++---
 source/text/sbasic/shared/03070600.xhp |6 +++---
 source/text/sbasic/shared/03090203.xhp |4 ++--
 source/text/sbasic/shared/03103350.xhp |4 ++--
 source/text/sbasic/shared/03103600.xhp |4 ++--
 source/text/sbasic/shared/03103700.xhp |4 ++--
 source/text/sbasic/shared/03104000.xhp |2 +-
 source/text/scalc/01/func_countifs.xhp |2 +-
 source/text/scalc/01/func_sumifs.xhp   |2 +-
 11 files changed, 23 insertions(+), 23 deletions(-)

New commits:
commit 7217219e9cd8dcc4b9382ab13da804948565b7db
Author: Olivier Hallot 
Date:   Tue Dec 12 16:59:01 2017 -0200

Fix Help pages typos.

Change-Id: I425e6ddc86c997b6e00b8e80c193ee6a7b6df4d3
Reviewed-on: https://gerrit.libreoffice.org/46335
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 
(cherry picked from commit b8ee7a5bf9fba95a2bda283008a5bef5eff4131e)
Reviewed-on: https://gerrit.libreoffice.org/46336

diff --git a/source/text/sbasic/shared/03060300.xhp 
b/source/text/sbasic/shared/03060300.xhp
index 9585b5be9..a155b244d 100644
--- a/source/text/sbasic/shared/03060300.xhp
+++ b/source/text/sbasic/shared/03060300.xhp
@@ -20,7 +20,7 @@
 
 
   
-Imp-Operator [Runtime]
+Imp Operator [Runtime]
 /text/sbasic/shared/03060300.xhp
   
 
@@ -34,7 +34,7 @@
 
 
 
-Imp 
Operator [Runtime]
+Imp 
Operator [Runtime]
 Performs a 
logical implication on two expressions.
 
 
@@ -64,4 +64,4 @@
 
 
 
-
\ No newline at end of file
+
diff --git a/source/text/sbasic/shared/03060400.xhp 
b/source/text/sbasic/shared/03060400.xhp
index aa4eea768..195ca9a30 100644
--- a/source/text/sbasic/shared/03060400.xhp
+++ b/source/text/sbasic/shared/03060400.xhp
@@ -20,7 +20,7 @@
 
 
   
-Not-Operator [Runtime]
+Not Operator [Runtime]
 /text/sbasic/shared/03060400.xhp
   
 
@@ -34,7 +34,7 @@
 
 
 
-Not-Operator [Runtime]
+Not 
Operator [Runtime]
 Negates an 
expression by inverting the bit values.
 
 
@@ -63,4 +63,4 @@
 
 
 
-
\ No newline at end of file
+
diff --git a/source/text/sbasic/shared/03060500.xhp 
b/source/text/sbasic/shared/03060500.xhp
index d35a59abc..0fb206640 100644
--- a/source/text/sbasic/shared/03060500.xhp
+++ b/source/text/sbasic/shared/03060500.xhp
@@ -20,7 +20,7 @@
 
 
   
-Or-Operator [Runtime]
+Or Operator [Runtime]
 /text/sbasic/shared/03060500.xhp
   
 
@@ -34,7 +34,7 @@
 
 
 
-Or Operator 
[Runtime]
+Or Operator 
[Runtime]
 Performs a 
logical OR disjunction on two expressions.
 
 
@@ -64,4 +64,4 @@
 
 
 
-
\ No newline at end of file
+
diff --git a/source/text/sbasic/shared/03070600.xhp 
b/source/text/sbasic/shared/03070600.xhp
index ddb9f3f9d..4897f2d5f 100644
--- a/source/text/sbasic/shared/03070600.xhp
+++ b/source/text/sbasic/shared/03070600.xhp
@@ -20,7 +20,7 @@
 
 
   
-Mod-Operator [Runtime]
+Mod Operator [Runtime]
 /text/sbasic/shared/03070600.xhp
   
 
@@ -34,7 +34,7 @@
 
 
 
-Mod 
Operator [Runtime]
+Mod 
Operator [Runtime]
 Returns the 
integer remainder of a division.
 
 
@@ -63,4 +63,4 @@
 
 
 
-
\ No newline at end of file
+
diff --git a/source/text/sbasic/shared/03090203.xhp 
b/source/text/sbasic/shared/03090203.xhp
index fb2832414..41fed6d2d 100644
--- a/source/text/sbasic/shared/03090203.xhp
+++ b/source/text/sbasic/shared/03090203.xhp
@@ -21,7 +21,7 @@
 
 
 
-While...Wend Statement[Runtime]
+While...Wend Statement [Runtime]
 /text/sbasic/shared/03090203.xhp
 
 
@@ -31,7 +31,7 @@
 
 
   
-  While;While...Wend 
loopWhile...Wend 
Statement[Runtime]
+  While;While...Wend 
loopWhile...Wend Statement 
[Runtime]
   When a 
program encounters a While statement, it tests the condition. If the condition 
is False, the program continues directly following the Wend statement. If the 
condition is True, the loop is executed until the program finds Wend and then 
jumps back to the While statement. If the condition is still True, 
the loop is executed again.
   
   Unlike the 
Do...Loop 
statement, you cannot cancel a While...Wend loop with Exit. Never exit a 
While...Wend loop with GoTo, since this can cause a run-time error.
diff --git a/source/text/sbasic/shared/03103350.xhp 
b/source/text/sbasic/shared/03103350.xhp
index cc47ba628..45ffb6cf2 100644
--- a/source/text/sbasic/shared/03103350.xhp
+++ b/source/text/sbasic/shared/03103350.xhp
@@ -37,7 +37,7 @@
 
 
 
-Option VBASupport Statement [Runtime]
+Option VBASupport Statement [Runtime]
 Specifies that 
%PRODUCTNAME Basic will support some VBA statements, functions and 
objects.
 
 The 
support for VBA is not complete, but covers a large portion of the common usage 
patterns.
@@ -68,4 +68,4 @@
 
 
 
-
\ No newline at end of file
+
diff --git a/source/text/sbasic/shared/03103600.xhp 
b/source/text/sbasic/shared/03103600.xhp
index bb1da9b39..94231784d 100644
--- a/source/text/sbasic/shared/03103600.xhp
+++ b/source/text/sbasic/shared/03103600.xh

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

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

New commits:
commit da40275365df1d34cacfdd74850b7d3d17cf0125
Author: Olivier Hallot 
Date:   Tue Dec 12 16:59:01 2017 -0200

Updated core
Project: help  b8ee7a5bf9fba95a2bda283008a5bef5eff4131e

Fix Help pages typos.

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

diff --git a/helpcontent2 b/helpcontent2
index 769876a87a8e..b8ee7a5bf9fb 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 769876a87a8ebbdfa80a0bfa9bab11fcbf56a83c
+Subproject commit b8ee7a5bf9fba95a2bda283008a5bef5eff4131e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Tardon]

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

New commits:
commit 9a738c54ab732ad84077639b86924cdbaabb075c
Author: David Tardon 
Date:   Tue Dec 12 12:01:31 2017 +0100

system gpgmepp can't be used with dbgutil

Change-Id: Ib308a6328ce0caabf47d0ba28c3b1a52c89014a8

diff --git a/configure.ac b/configure.ac
index 449dfc1add54..e10df21a70ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3751,6 +3751,11 @@ if test -n "$enable_dbgutil" -a "$enable_dbgutil" != 
"no"; then
 else
 with_system_hunspell=no
 fi
+if test "$with_system_gpgmepp" = "yes"; then
+AC_MSG_ERROR([--with-system-gpgmepp conflicts with --enable-dbgutil])
+else
+with_system_gpgmepp=no
+fi
 else
 ENABLE_DBGUTIL=""
 MSVC_USE_DEBUG_RUNTIME=""
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Heiko Tietze]

 sw/uiconfig/swriter/ui/optcompatpage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2dae4d8e9e3479651ad7c651c404137b606da589
Author: Heiko Tietze 
Date:   Mon Dec 11 11:10:46 2017 +0100

tdf#114340 Naming issue %DOCUMENT need brackets

Change-Id: I0c5fa12300f05b765a61a0e8de94eb26c7e419a0
Reviewed-on: https://gerrit.libreoffice.org/46220
Tested-by: Jenkins 
Reviewed-by: Sophie Gautier 
Reviewed-by: Heiko Tietze 

diff --git a/sw/uiconfig/swriter/ui/optcompatpage.ui 
b/sw/uiconfig/swriter/ui/optcompatpage.ui
index e37af6eb7f83..ed4a0c965a56 100644
--- a/sw/uiconfig/swriter/ui/optcompatpage.ui
+++ b/sw/uiconfig/swriter/ui/optcompatpage.ui
@@ -101,7 +101,7 @@
   
 True
 False
-Compatibility options for %DOCNAME
+Compatibility options for '%DOCNAME'
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-5.4.4.2'

[Christian Lohmaier]

Tag 'libreoffice-5.4.4.2' created by Christian Lohmaier 
 at 2017-12-12 17:45 +

Tag libreoffice-5.4.4.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJaMBWwAAoJEPQ0oe+v7q6jjyMP/j3OlFIkz4bPmHYEjjB9jHd9
AGjWytoxGOvejvoIS6004dkgiGbBg4P+nHdjMYDzJmYGHZ7hhECS/j8vOBSHlcVr
fT+f3NPsx7vbEn7aQe0ynvArgGw8UkFSqALZJrnX0usfPbfSV/pDTmJZWA7n41I2
UM0+JFJ2E+7qtKaojATx2cf3UrnA0O8qYfAe6G4BVxInpVo4D9KdkB2TTk7PU/FO
yZjOHQ5E7wbId7pn2qfB1VdI6rg7Yf3Bc9B0jJ4lGhi49q99Aq8r335Y/PUgWa3e
5oEn1X7H1K2dp2ejt+LzS+WJUSaG5l99oq2scxVL3/Y3JoiwA04NIo63ZblH6stA
Ux5qqa7iud2VJKbchk9illgKVdlrwIUD5BIcj0cef4R/5KZP8XyljzO2htBZXKRU
eVjFQrW9xaGzzGia5SIf21UVqesE3lHpUnVUUVlt7V76rcbLYZCPKFmSNeL4KtE5
UOODZywdxfZ9Vl7wJNohIKfe6uuHFt2B6uVxqbn4Ayw3a2W4Zd07tEdxO4WsUw7+
oiU+7f/JDovKcvly88QtxMIuTYoOwUtEbIxGsZcFIGK39JEEPX2Dfc/Gt5DeDTlJ
lVN9QVmrIbOoFgsGBDKnMnJLDndFh3RZs+WvuCvvzjzCUg7eOegfxIBMWqxRbliw
GfJcf/5RJwlfpomT2nu4
=c6kL
-END PGP SIGNATURE-

Changes since libreoffice-5.4.4.1-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-5.4.4.2'

[Christian Lohmaier]

Tag 'libreoffice-5.4.4.2' created by Christian Lohmaier 
 at 2017-12-12 17:45 +

Tag libreoffice-5.4.4.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJaMBWtAAoJEPQ0oe+v7q6jSLwP/RvkBJAkVBuTLjqKxyEch4np
y+tyh+Wa8PIzwuYeg41jNP1Y60opleYHmRX+tlHWo7RJHXLWz9UsLQJaDoglFUPP
JOyu7rJ5Ip7kEvnf2gN3h2cvPDcS7CwGQ+JLPjFG62FQ0ki5dWP9HYwckI4PTZbh
6da7rx6QQxIULaavz+j5CzhPP0uloSC8gmtJBNn6iX2Cf06GcGVIzkOzgGXmbssA
dL8GLtauJoVvD1dPzOmk4vijBM7JD8HcgeAuPBl7qnxm8dGTCh/2/xi3st0YgXx6
So5BKKGLuiutWmwfLBn0i5Lx1UDJSj/uy3BghvKBokYL6uDZedksEXe8MXagWvzW
rCZT2nXuDSpIQciznfA7rGFJWOKPUvAXJ0Xj0U8HFfVG/tVx5Q0pgUsd6GsrLruX
8FRv8WI3/OcvASNkr9fJDBfbHmY7Wa42l/0z7GU0RYnEuw1hmLSxQHhD5pUVD1S4
fARJL43vnjaQoeRuEnRu64cSu9/dVfKR/b+lv5ImbRdlQt9/Pnc8eQrtsxKK0LGx
Ts7IG/Wq7NtFlZSAqOeJcql1CazQrJJIJcKozLIcNTF8IGuBHFdYh/YtIGgdyebf
3FUoXU6/4ugpJskxVYkOvlJBj69fN3Pm9bkNUsxI2OnPQipHdWe9QVjYLVZczdGA
jqwxUSS0eW160lp970YD
=Ko85
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-4' - configure.ac

[Christian Lohmaier]

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

New commits:
commit eabaf57a028e183aaeb78df3e10ae021a7ccc254
Author: Christian Lohmaier 
Date:   Tue Dec 12 18:45:50 2017 +0100

bump product version to 5.4.4.2.0+

Change-Id: I506df0e52235feab284ad6d64e9b3f9c3c57df30

diff --git a/configure.ac b/configure.ac
index aa1a5527a71f..956f7c2a378b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.4.4.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.4.4.2.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-5.4.4.2'

[Christian Lohmaier]

Tag 'libreoffice-5.4.4.2' created by Christian Lohmaier 
 at 2017-12-12 17:45 +

Tag libreoffice-5.4.4.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJaMBWzAAoJEPQ0oe+v7q6jNhQQALnm30rFJmzatVhVYwSGyQF7
mZgMmBdMemHYuu9cFepcpzT6NIi+gghQ4bwzHQhMRHqAZtt5/ccnsXVjm4pjJ0Vt
l3UxNUwRNW2pEjmMa3mcNl/uG1zECpPKIrWOBb8I2rTrUMiWIkg3FdRmwsaz8vNs
hGgAdD4LtcvqEShifooGZXXLtoUBzGxmnCQiWeCS1kKMLv6i8jb5FWTc0eI13ZhX
pZxJFnysWrpL25Cgwx3ajvFg/UEo/XP8S50rv90Z+i6QLcOWNmMhS67ejvs0OH+w
kNEJlRYuntXi1N4inigsgTpPVuu7srsPaUAiBTTjbuvoqwhMa8/BDaO0SxFDuLS9
k34T/AcaP6pM7yR4A/72If6HiQ4NwL2SbUonsEiKdmifF3BQf8RJmyuAPfKhiKOn
ItgnGYEmxc5+D0nZpCIgCQTwX0uObsioeMCBlTe5FJVl1BXkXGDpFZRPeRf0G+vU
JOkgfeFMunMtdC72okuHFHEp8JUzdpu4aTMBIm1PwqoRjsOFrkoWDKIFm+ph4RWa
Fh1I68EWbyEhwkv+9hA7D2+Nd3Ki0RGyityJ/70AVPc7R9OZl9y07bAYXbKXiNV6
KhFxoJu0nnxMeJVmWN++8T3oe8i6OFcC/H4X3eC/3wPPzkoebJZ/vMP3UM91M/gt
dZKOjQWD2XngKzFi2P/S
=jc10
-END PGP SIGNATURE-

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

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-5.4.4.2'

[Christian Lohmaier]

Tag 'libreoffice-5.4.4.2' created by Christian Lohmaier 
 at 2017-12-12 17:45 +

Tag libreoffice-5.4.4.2
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJaMBWqAAoJEPQ0oe+v7q6jvXwQAIbTR5O7ByDrnGG3Rdqns90L
Xgoi8NL5fUh1SML3gv0EimgRgh2LyCtl+060oxu1Oke3o4HFcDenTqET9UyPfGUt
CLcTEmUrzBx/Tl6ep1LbUUWnvr5R1ikqiq38WfQN89rB4g4cwirgGcoUJZRNijx7
2wzxeRMjdAZ6jytVV1kN1s1khv/YoSDUNAVmhwj6yN61KzPXHbMISqC8ViWZZjkO
E65q0HpDTACI69c1H/8Kr6oZ2OXhoO0bZKWvI39Pl67ln586iTb4zHCCNpNoFZh9
BC59AQSW8raJouTyx1m1Q+pVkPchJNUxo1r5qGf6WyzHzaMXsFbO3RSa/Wqr4p2j
8nEcbIJS7UuRGxVairfWByE0/0arun738kFhTM1qJGFZWrLJBvlJuAEbv++kxsGP
2ivmV6M4Qvu6Wdt5S5RG2iuDu5BMxX/UelK55jybgXDL4+4VrUD3HwxkxEr6fd83
6DLXppgMiXoNqpyXiXsmpIitjnQ6gKtMptP6/YAa+XzFpKzPJI/h2vvBkWVnwRYM
T/RZvkAdPWSMjzazGjAHU0n03zQLHCzoV7J/IApzqtalxWsnBVVnNre4KAuXa+yS
c76VlnvE0MMTkOWDXLK1oPHiYH5fHbo247agjePnG4mav23ZmDzCTZR4V/B/qC1r
5ba0y7Mn448FYzS4YZqH
=5aV6
-END PGP SIGNATURE-

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

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

[Eike Rathke]

 sc/source/core/tool/compiler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit edb92e348f422cd4db9d356419e4c36b9a7a67c4
Author: Eike Rathke 
Date:   Mon Dec 11 18:21:32 2017 +0100

Resolves: tdf#114406 treat % as the operator that it is

Regression from

commit 73c7e0921d752df53004ed55735f3ecc592f
Date:   Tue Sep 20 21:39:10 2016 +0200

sc-perf: tdf#79023 for ODFF do not call SvNumberFormatter to 
determine numeric

for ODFF, and for OOXML

commit a8a8ff59c5749bbe1f2f58ea8fd42d66e6ae2a81
Date:   Tue Sep 20 22:37:59 2016 +0200

sc-perf: tdf#79023 do not call SvNumberFormatter also for numbers 
in OOXML

Numbers followed by a percent operator like 100% were always
(wrongly) treated as one entity (by '%' having ScCharFlags::Value)
and incidentally handled by the number formatter's parser, which
so far "worked" in the sense that the correct constant number was
produced (i.e. 1 here), but the expression detail was lost.

The commits above for performance reasons when reading ODF or
OOXML files don't let a symbol pass through the number formatter's
parser anymore and the "100%" does not represent a strict number,
so lead to #NAME? error at the end.

Set the proper flags in the compiler's character table to treat
'%' as operator in all circumstances.

Change-Id: I266beb74a313c779370e5fac42f45d0fb5cdba0c
(cherry picked from commit f6b2349e880afa82f9267087fb48b6e4f8a9aa05)
Reviewed-on: https://gerrit.libreoffice.org/46264
Reviewed-by: Christian Lohmaier 
Reviewed-by: Caolán McNamara 
Reviewed-by: Miklos Vajna 
Tested-by: Christian Lohmaier 

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index b795802affb6..6c3e7af0c9bf 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -325,7 +325,7 @@ ScCompiler::Convention::Convention( 
FormulaGrammar::AddressConvention eConv )
 /* $ */ t[36] = ScCharFlags::CharWord | ScCharFlags::Word | 
ScCharFlags::CharIdent | ScCharFlags::Ident;
 if (FormulaGrammar::CONV_ODF == meConv)
 /* $ */ t[36] |= ScCharFlags::OdfNameMarker;
-/* % */ t[37] = ScCharFlags::Value;
+/* % */ t[37] = ScCharFlags::Char | ScCharFlags::WordSep | 
ScCharFlags::ValueSep;
 /* & */ t[38] = ScCharFlags::Char | ScCharFlags::WordSep | 
ScCharFlags::ValueSep;
 /* ' */ t[39] = ScCharFlags::NameSep;
 /* ( */ t[40] = ScCharFlags::Char | ScCharFlags::WordSep | 
ScCharFlags::ValueSep;
___
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

[Eike Rathke]

 sc/source/core/tool/compiler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 51bb22f7a8f1d9fe02243aa58427d63916226793
Author: Eike Rathke 
Date:   Mon Dec 11 18:21:32 2017 +0100

Resolves: tdf#114406 treat % as the operator that it is

Regression from

commit 73c7e0921d752df53004ed55735f3ecc592f
Date:   Tue Sep 20 21:39:10 2016 +0200

sc-perf: tdf#79023 for ODFF do not call SvNumberFormatter to 
determine numeric

for ODFF, and for OOXML

commit a8a8ff59c5749bbe1f2f58ea8fd42d66e6ae2a81
Date:   Tue Sep 20 22:37:59 2016 +0200

sc-perf: tdf#79023 do not call SvNumberFormatter also for numbers 
in OOXML

Numbers followed by a percent operator like 100% were always
(wrongly) treated as one entity (by '%' having ScCharFlags::Value)
and incidentally handled by the number formatter's parser, which
so far "worked" in the sense that the correct constant number was
produced (i.e. 1 here), but the expression detail was lost.

The commits above for performance reasons when reading ODF or
OOXML files don't let a symbol pass through the number formatter's
parser anymore and the "100%" does not represent a strict number,
so lead to #NAME? error at the end.

Set the proper flags in the compiler's character table to treat
'%' as operator in all circumstances.

Change-Id: I266beb74a313c779370e5fac42f45d0fb5cdba0c
(cherry picked from commit f6b2349e880afa82f9267087fb48b6e4f8a9aa05)
Reviewed-on: https://gerrit.libreoffice.org/46255
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index b795802affb6..6c3e7af0c9bf 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -325,7 +325,7 @@ ScCompiler::Convention::Convention( 
FormulaGrammar::AddressConvention eConv )
 /* $ */ t[36] = ScCharFlags::CharWord | ScCharFlags::Word | 
ScCharFlags::CharIdent | ScCharFlags::Ident;
 if (FormulaGrammar::CONV_ODF == meConv)
 /* $ */ t[36] |= ScCharFlags::OdfNameMarker;
-/* % */ t[37] = ScCharFlags::Value;
+/* % */ t[37] = ScCharFlags::Char | ScCharFlags::WordSep | 
ScCharFlags::ValueSep;
 /* & */ t[38] = ScCharFlags::Char | ScCharFlags::WordSep | 
ScCharFlags::ValueSep;
 /* ' */ t[39] = ScCharFlags::NameSep;
 /* ( */ t[40] = ScCharFlags::Char | ScCharFlags::WordSep | 
ScCharFlags::ValueSep;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - comphelper/source desktop/qa desktop/source include/comphelper include/LibreOfficeKit include/sfx2 sfx2/source vcl/source

[Jan Holesovsky]

 comphelper/source/misc/lok.cxx  |   17 +++--
 desktop/qa/desktop_lib/test_desktop_lib.cxx |3 ++-
 desktop/source/lib/init.cxx |   10 ++
 include/LibreOfficeKit/LibreOfficeKit.h |3 +++
 include/LibreOfficeKit/LibreOfficeKit.hxx   |   11 +++
 include/comphelper/lok.hxx  |7 +++
 include/sfx2/lokhelper.hxx  |2 ++
 include/sfx2/viewsh.hxx |5 +
 sfx2/source/view/lokhelper.cxx  |   17 +
 sfx2/source/view/viewsh.cxx |1 +
 vcl/source/window/builder.cxx   |   10 +++---
 11 files changed, 80 insertions(+), 6 deletions(-)

New commits:
commit f01e4365be66e666b1671279b8605f0113dfd8fa
Author: Jan Holesovsky 
Date:   Tue Dec 12 18:13:03 2017 +0100

lokdialog: Allow windows / dialogs in different languages.

Change-Id: I9f32161981aed73e6d97696e5f976af276d1625a
Reviewed-on: https://gerrit.libreoffice.org/46327
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index b8324a4defcd..2e8624d1e8d0 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -27,6 +27,10 @@ static bool g_bTiledAnnotations(true);
 
 static bool g_bRangeHeaders(false);
 
+static bool g_bLocalRendering(false);
+
+static LanguageTag g_aLanguageTag("en-US", true);
+
 void setActive(bool bActive)
 {
 g_bActive = bActive;
@@ -87,8 +91,6 @@ bool isRangeHeaders()
 return g_bRangeHeaders;
 }
 
-static bool g_bLocalRendering(false);
-
 void setLocalRendering(bool bLocalRendering)
 {
 g_bLocalRendering = bLocalRendering;
@@ -99,6 +101,17 @@ bool isLocalRendering()
 return g_bLocalRendering;
 }
 
+void setLanguageTag(const LanguageTag& languageTag)
+{
+if (g_aLanguageTag != languageTag)
+g_aLanguageTag = languageTag;
+}
+
+const LanguageTag& getLanguageTag()
+{
+return g_aLanguageTag;
+}
+
 static void (*pStatusIndicatorCallback)(void *data, 
statusIndicatorCallbackType type, int percent)(nullptr);
 static void *pStatusIndicatorCallbackData(nullptr);
 
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index fb801879d370..83c5f3544e37 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -2208,10 +2208,11 @@ void DesktopLOKTest::testABI()
 CPPUNIT_ASSERT_EQUAL(documentClassOffset(36), offsetof(struct 
_LibreOfficeKitDocumentClass, postWindow));
 CPPUNIT_ASSERT_EQUAL(documentClassOffset(37), offsetof(struct 
_LibreOfficeKitDocumentClass, postWindowKeyEvent));
 CPPUNIT_ASSERT_EQUAL(documentClassOffset(38), offsetof(struct 
_LibreOfficeKitDocumentClass, postWindowMouseEvent));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(39), offsetof(struct 
_LibreOfficeKitDocumentClass, setViewLanguage));
 
 // Extending is fine, update this, and add new assert for the offsetof the
 // new method
-CPPUNIT_ASSERT_EQUAL(documentClassOffset(39), sizeof(struct 
_LibreOfficeKitDocumentClass));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(40), sizeof(struct 
_LibreOfficeKitDocumentClass));
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(DesktopLOKTest);
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index e339d3a40467..17a731837656 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -618,6 +618,7 @@ static void doc_setView(LibreOfficeKitDocument* pThis, int 
nId);
 static int doc_getView(LibreOfficeKitDocument* pThis);
 static int doc_getViewsCount(LibreOfficeKitDocument* pThis);
 static bool doc_getViewIds(LibreOfficeKitDocument* pThis, int* pArray, size_t 
nSize);
+static void doc_setViewLanguage(LibreOfficeKitDocument* pThis, int nId, const 
char* language);
 static unsigned char* doc_renderFont(LibreOfficeKitDocument* pThis,
   const char *pFontName,
   const char *pChar,
@@ -683,6 +684,8 @@ LibLODocument_Impl::LibLODocument_Impl(const uno::Reference 
paintWindow = doc_paintWindow;
 m_pDocumentClass->postWindow = doc_postWindow;
 
+m_pDocumentClass->setViewLanguage = doc_setViewLanguage;
+
 gDocumentClass = m_pDocumentClass;
 }
 pClass = m_pDocumentClass.get();
@@ -3166,6 +3169,13 @@ static bool doc_getViewIds(LibreOfficeKitDocument* 
/*pThis*/, int* pArray, size_
 return SfxLokHelper::getViewIds(pArray, nSize);
 }
 
+static void doc_setViewLanguage(LibreOfficeKitDocument* /*pThis*/, int nId, 
const char* language)
+{
+SolarMutexGuard aGuard;
+
+SfxLokHelper::setViewLanguage(nId, OStringToOUString(language, 
RTL_TEXTENCODING_UTF8));
+}
+
 unsigned char* doc_renderFont(LibreOfficeKitDocument* /*pThis*/,
 const char* pFontName,
 const char* pChar,
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h 
b/include/LibreOffic

Re: Association between ToC index object and its paragraph content

[Andrew Pitonyak]

Disclaimer: I have not taken the time to look at the problem, but, if 
you have a text range, or have the ability to get a text range out of 
what you have, then you can compare the starting and ending positions. 
You might need to create a text cursor from the range to do this. I do 
not have the ability to test this at the moment, but that is where I 
would look if I needed to answer a similar question. Note also that with 
an appropriate cursor, you can do things such as jump to the start and 
end of a paragraph.


If a paragraph contains content that uses a different Text object, or 
you happen to be trying to compare content that lives in different text 
objects, this will fail; for example, each cell in a Text Table uses its 
own Text object if my memory serves me correctly. This means that you 
cannot compare the location of an object in one cell with that in 
another cell or outside the text table.


On 2017-12-12 5:04, Jens Tröger wrote:

Thanks Miklos!

Interesting detail though: for any number of XTextContent objects
(i.e. paragraphs with implementationName=SwXParagraph) which 
represent

_the same_ paragraph in the document, there’s no real way to tell
that these objects do, in fact, represent the same paragraph?

Huh. Cheers,
Jens


On Dec 12, 2017, at 19:37, Miklos Vajna  
wrote:


https://lists.freedesktop.org/archives/libreoffice/2017-December/079050.html
has code samples on how the reference-to-bookmark is represented as 
a
HyperlinkURL property, and how the bookmark is a Bookmark text 
portion.

There is no closer connection between these two, I think.

Regards,
Miklos


--
Jens Tröger
http://savage.light-speed.de/

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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - helpcontent2

[Olivier Hallot]

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

New commits:
commit 95cad02bf47024072ef998b085a40744c52173fd
Author: Olivier Hallot 
Date:   Tue Dec 12 15:17:44 2017 -0200

Updated core
Project: help  a5712dab8209d675b5e493b4dd64fd1300997755

tdf#114418 BASIC Format() function help page

Add link to Calc format code

Change-Id: Iffe4f46b9e9145588daf6d8ec6e87ad6977d5450
Reviewed-on: https://gerrit.libreoffice.org/46328
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 
(cherry picked from commit 769876a87a8ebbdfa80a0bfa9bab11fcbf56a83c)
Reviewed-on: https://gerrit.libreoffice.org/46329

diff --git a/helpcontent2 b/helpcontent2
index 5cce73dd589d..a5712dab8209 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5cce73dd589d3b2e8818228c95db28c29bad1f2f
+Subproject commit a5712dab8209d675b5e493b4dd64fd1300997755
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot]

 source/text/sbasic/shared/03120301.xhp |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 769876a87a8ebbdfa80a0bfa9bab11fcbf56a83c
Author: Olivier Hallot 
Date:   Tue Dec 12 15:17:44 2017 -0200

tdf#114418 BASIC Format() function help page

Add link to Calc format code

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

diff --git a/source/text/sbasic/shared/03120301.xhp 
b/source/text/sbasic/shared/03120301.xhp
index 7c3b038a9..a1f53eae1 100644
--- a/source/text/sbasic/shared/03120301.xhp
+++ b/source/text/sbasic/shared/03120301.xhp
@@ -92,6 +92,8 @@
 ' displays 
for example 6,328.20 in English locale, 6.328,20 in German locale.
 End Sub
 
+
+Number format codes in Calc
+
 
-
-
\ No newline at end of file
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-6-0' - source/text

[Olivier Hallot]

 source/text/sbasic/shared/03120301.xhp |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit a5712dab8209d675b5e493b4dd64fd1300997755
Author: Olivier Hallot 
Date:   Tue Dec 12 15:17:44 2017 -0200

tdf#114418 BASIC Format() function help page

Add link to Calc format code

Change-Id: Iffe4f46b9e9145588daf6d8ec6e87ad6977d5450
Reviewed-on: https://gerrit.libreoffice.org/46328
Reviewed-by: Olivier Hallot 
Tested-by: Olivier Hallot 
(cherry picked from commit 769876a87a8ebbdfa80a0bfa9bab11fcbf56a83c)
Reviewed-on: https://gerrit.libreoffice.org/46329

diff --git a/source/text/sbasic/shared/03120301.xhp 
b/source/text/sbasic/shared/03120301.xhp
index 7c3b038a9..a1f53eae1 100644
--- a/source/text/sbasic/shared/03120301.xhp
+++ b/source/text/sbasic/shared/03120301.xhp
@@ -92,6 +92,8 @@
 ' displays 
for example 6,328.20 in English locale, 6.328,20 in German locale.
 End Sub
 
+
+Number format codes in Calc
+
 
-
-
\ No newline at end of file
+
___
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 d73857e7d7f6a5bf38c6a2f396832faabaef65e2
Author: Olivier Hallot 
Date:   Tue Dec 12 15:17:44 2017 -0200

Updated core
Project: help  769876a87a8ebbdfa80a0bfa9bab11fcbf56a83c

tdf#114418 BASIC Format() function help page

Add link to Calc format code

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

diff --git a/helpcontent2 b/helpcontent2
index ed6eecfc6f33..769876a87a8e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ed6eecfc6f33cb7cbd33996dcd2d0f07f6e04405
+Subproject commit 769876a87a8ebbdfa80a0bfa9bab11fcbf56a83c
___
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' - icon-themes/elementary icon-themes/elementary_svg

[andreas kainz]

 icon-themes/elementary/cmd/de/lc_numberformatdecimal.png   |binary
 icon-themes/elementary/cmd/de/lc_numberformatthousands.png |binary
 icon-themes/elementary/cmd/de/sc_numberformatdecimal.png   |binary
 icon-themes/elementary/cmd/de/sc_numberformatthousands.png |binary
 icon-themes/elementary/cmd/es/lc_numberformatdecimal.png   |binary
 icon-themes/elementary/cmd/es/lc_numberformatthousands.png |binary
 icon-themes/elementary/cmd/es/sc_numberformatdecimal.png   |binary
 icon-themes/elementary/cmd/es/sc_numberformatthousands.png |binary
 icon-themes/elementary/cmd/fr/lc_numberformatdecimal.png   |binary
 icon-themes/elementary/cmd/fr/lc_numberformatthousands.png |binary
 icon-themes/elementary/cmd/fr/sc_numberformatdecimal.png   |binary
 icon-themes/elementary/cmd/fr/sc_numberformatthousands.png |binary
 icon-themes/elementary/cmd/lc_numberformatdecimal.png  |binary
 icon-themes/elementary/cmd/lc_numberformatthousands.png|binary
 icon-themes/elementary/cmd/sc_numberformatdecimal.png  |binary
 icon-themes/elementary/cmd/sc_numberformatthousands.png|binary
 icon-themes/elementary_svg/cmd/de/lc_numberformatdecimal.svg   |1 +
 icon-themes/elementary_svg/cmd/de/lc_numberformatthousands.svg |1 +
 icon-themes/elementary_svg/cmd/de/sc_numberformatdecimal.svg   |1 +
 icon-themes/elementary_svg/cmd/de/sc_numberformatthousands.svg |1 +
 icon-themes/elementary_svg/cmd/lc_numberformatdecimal.svg  |2 +-
 icon-themes/elementary_svg/cmd/lc_numberformatthousands.svg|1 +
 icon-themes/elementary_svg/cmd/sc_numberformatdecimal.svg  |2 +-
 icon-themes/elementary_svg/cmd/sc_numberformatthousands.svg|1 +
 24 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 6b7c5f29c2d31954ed811b7521850851d8662246
Author: andreas kainz 
Date:   Tue Dec 12 09:44:45 2017 +0100

Elementary-icons: add numberformatthousands

Change-Id: I3ec172b068cb471d246489259e8deb4dfb34f9e4
Reviewed-on: https://gerrit.libreoffice.org/46281
Tested-by: Jenkins 
Reviewed-by: andreas_kainz 
(cherry picked from commit b298ed318ee525e09722baf976d2608e398b8773)
Reviewed-on: https://gerrit.libreoffice.org/46313

diff --git a/icon-themes/elementary/cmd/de/lc_numberformatdecimal.png 
b/icon-themes/elementary/cmd/de/lc_numberformatdecimal.png
new file mode 100644
index ..0575c58fbb2f
Binary files /dev/null and 
b/icon-themes/elementary/cmd/de/lc_numberformatdecimal.png differ
diff --git a/icon-themes/elementary/cmd/de/lc_numberformatthousands.png 
b/icon-themes/elementary/cmd/de/lc_numberformatthousands.png
new file mode 100644
index ..e08d6e26
Binary files /dev/null and 
b/icon-themes/elementary/cmd/de/lc_numberformatthousands.png differ
diff --git a/icon-themes/elementary/cmd/de/sc_numberformatdecimal.png 
b/icon-themes/elementary/cmd/de/sc_numberformatdecimal.png
new file mode 100644
index ..4e06bc456c76
Binary files /dev/null and 
b/icon-themes/elementary/cmd/de/sc_numberformatdecimal.png differ
diff --git a/icon-themes/elementary/cmd/de/sc_numberformatthousands.png 
b/icon-themes/elementary/cmd/de/sc_numberformatthousands.png
new file mode 100644
index ..52c94c24e449
Binary files /dev/null and 
b/icon-themes/elementary/cmd/de/sc_numberformatthousands.png differ
diff --git a/icon-themes/elementary/cmd/es/lc_numberformatdecimal.png 
b/icon-themes/elementary/cmd/es/lc_numberformatdecimal.png
new file mode 100644
index ..0575c58fbb2f
Binary files /dev/null and 
b/icon-themes/elementary/cmd/es/lc_numberformatdecimal.png differ
diff --git a/icon-themes/elementary/cmd/es/lc_numberformatthousands.png 
b/icon-themes/elementary/cmd/es/lc_numberformatthousands.png
new file mode 100644
index ..e08d6e26
Binary files /dev/null and 
b/icon-themes/elementary/cmd/es/lc_numberformatthousands.png differ
diff --git a/icon-themes/elementary/cmd/es/sc_numberformatdecimal.png 
b/icon-themes/elementary/cmd/es/sc_numberformatdecimal.png
new file mode 100644
index ..4e06bc456c76
Binary files /dev/null and 
b/icon-themes/elementary/cmd/es/sc_numberformatdecimal.png differ
diff --git a/icon-themes/elementary/cmd/es/sc_numberformatthousands.png 
b/icon-themes/elementary/cmd/es/sc_numberformatthousands.png
new file mode 100644
index ..52c94c24e449
Binary files /dev/null and 
b/icon-themes/elementary/cmd/es/sc_numberformatthousands.png differ
diff --git a/icon-themes/elementary/cmd/fr/lc_numberformatdecimal.png 
b/icon-themes/elementary/cmd/fr/lc_numberformatdecimal.png
new file mode 100644
index ..0575c58fbb2f
Binary files /dev/null and 
b/icon-themes/elementary/cmd/fr/lc_numberformatdecimal.png differ
diff --git a/icon-themes/elementary/cmd/fr/lc_numberformatthousands.png 
b/icon-themes/elementary/cmd/fr/lc_numberformatthousands.png
new file mode 100644
index ..e08d6e26
Binary files /dev/null 

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sysui/desktop

[Rene Engelhard]

 sysui/desktop/apparmor/program.xpdfimport |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 558807803e2a3882b28a60012bef82ad4ee73c0a
Author: Rene Engelhard 
Date:   Mon Dec 11 20:03:45 2017 +0100

apparmor: copy xpdfimport definition into xpdfimport and allow "m"

Dec 11 18:46:11 sid kernel: [  176.085106] audit: type=1400 
audit(1513014371.237:22): apparmor="DENIED" operation="file_mmap" 
profile="libreoffice-xpdfimport" name="/usr/lib/libreoffice/program/xpdfimport" 
pid=1511 comm="xpdfimport" requested_mask="m" denied_mask="m" fsuid=1000 ouid=0

Change-Id: I31ddb412d1dd95506a00d22739a33d2e6770ba23
Reviewed-on: https://gerrit.libreoffice.org/46258
Reviewed-by: Rene Engelhard 
Tested-by: Rene Engelhard 
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sysui/desktop/apparmor/program.xpdfimport 
b/sysui/desktop/apparmor/program.xpdfimport
index 3934c0a04006..efe10dce020d 100644
--- a/sysui/desktop/apparmor/program.xpdfimport
+++ b/sysui/desktop/apparmor/program.xpdfimport
@@ -1,12 +1,14 @@
 # --
 #
 #Copyright (C) 2016 Canonical Ltd.
+#Copyright (C) 2017 Software in the Public Interest, Inc.
 #
 #This Source Code Form is subject to the terms of the Mozilla Public
 #License, v. 2.0. If a copy of the MPL was not distributed with this
 #file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-#Author: Bryan Quigley 
+#Authors: Bryan Quigley 
+# Rene Engelhard 
 #
 # --
 
@@ -22,6 +24,8 @@ profile libreoffice-xpdfimport INSTDIR-program/xpdfimport {
   /usr/share/libreoffice/share/config/* r,
   owner @{HOME}/.config/libreoffice{,dev}/?/user/uno_packages/cache/log.txt rw,
 
+  INSTDIR-program/xpdfimportpxm,
+
   #Uncomment for build testing (should be one directory <- of instdir)
   #/mnt/store/git/libo/**r,
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/filter/html/swhtml.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 786504f332919d498530ee1f97524b5ee2b70cf6
Author: Caolán McNamara 
Date:   Tue Dec 12 09:27:25 2017 +

other branch is 'if (GetMedum()' so '!GetMedium() here' is always true

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

diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index e0740fa50b51..0f5810542878 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -531,9 +531,7 @@ SvParserState SwHTMLParser::CallParser()
 m_nEventId = nullptr;
 }
 }
-
-// show progress bar
-else if( !GetMedium() || !GetMedium()->IsRemote() )
+else // show progress bar
 {
 rInput.Seek(STREAM_SEEK_TO_END);
 rInput.ResetError();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sw/inc sw/qa sw/source

[Jan-Marek Glogowski]

 sw/inc/IDocumentContentOperations.hxx   |2 -
 sw/qa/extras/mailmerge/data/sections_first_last.odt |binary
 sw/qa/extras/mailmerge/mailmerge.cxx|   38 +++
 sw/source/core/doc/docnew.cxx   |   40 +++-
 sw/source/core/docnode/nodes.cxx|   39 ---
 5 files changed, 86 insertions(+), 33 deletions(-)

New commits:
commit 1ee1db85c21c4bd6a59d087ad54c370b12522f06
Author: Jan-Marek Glogowski 
Date:   Thu Aug 11 18:39:20 2016 +0200

Fix SwDoc::AppendDoc for trailing sections

We already treat the StartOfContent node special in the CopyRange
function to prevent merging of SwTextNodes.

For trailing sections, we have to expand the code to treat
EndOfContent special too, because the supplied SwPaM range is
handled as [mark, point[, so it previously missed the section end
node, which resulted in "unhiding" the last section, if it was the
last node in the document.

Change-Id: Ie094e2a0182647a49c9ba45d08a7dd2cabe667c6
(cherry picked from commit d943d4faf92f0b86c25f3cd6fe77ed8a7d4905d1)

diff --git a/sw/inc/IDocumentContentOperations.hxx 
b/sw/inc/IDocumentContentOperations.hxx
index 75b4f841c28d..1572e218288e 100644
--- a/sw/inc/IDocumentContentOperations.hxx
+++ b/sw/inc/IDocumentContentOperations.hxx
@@ -80,7 +80,7 @@ public:
 be within the range!
 
 \warning The range has to include at least two nodes or has to be a
-SwDoc::IsColumnSelection!
+SwDoc::IsColumnSelection, because the rPam is treated [mark, point[.
 
 Normally this function should work only with content nodes. But there
 is a special case used by SwDoc::Paste, which starts the SwPaM at the
diff --git a/sw/qa/extras/mailmerge/data/sections_first_last.odt 
b/sw/qa/extras/mailmerge/data/sections_first_last.odt
new file mode 100644
index ..5a92adb0838d
Binary files /dev/null and 
b/sw/qa/extras/mailmerge/data/sections_first_last.odt differ
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx 
b/sw/qa/extras/mailmerge/mailmerge.cxx
index ed290c2be74d..e2fc6d26ac39 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 
 /**
  * Maps database URIs to the registered database names for quick lookups
@@ -506,5 +507,42 @@ DECLARE_FILE_MAILMERGE_TEST(testTdf102010, "empty.odt", 
"10-testing-addresses.od
 loadMailMergeDocument( 1 );
 }
 
+DECLARE_SHELL_MAILMERGE_TEST(test_sections_first_last, 
"sections_first_last.odt", "10-testing-addresses.ods", "testing-addresses")
+{
+// A document with a leading, middle and trailing section
+// Originally we were losing the trailing section during merge
+executeMailMerge();
+
+SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+// Get the size of the document in nodes
+SwDoc *pDoc = pTextDoc->GetDocShell()->GetDoc();
+sal_uLong nSize = pDoc->GetNodes().GetEndOfContent().GetIndex() - 
pDoc->GetNodes().GetEndOfExtras().GetIndex();
+nSize -= 2; // The common start and end node
+CPPUNIT_ASSERT_EQUAL( sal_uLong(13), nSize );
+
+SwXTextDocument* pTextDocMM = dynamic_cast(mxMMComponent.get());
+CPPUNIT_ASSERT(pTextDocMM);
+
+SwDoc *pDocMM = pTextDocMM->GetDocShell()->GetDoc();
+sal_uLong nSizeMM = pDocMM->GetNodes().GetEndOfContent().GetIndex() - 
pDocMM->GetNodes().GetEndOfExtras().GetIndex();
+nSizeMM -= 2;
+CPPUNIT_ASSERT_EQUAL( sal_uLong(10 * nSize), nSizeMM );
+
+CPPUNIT_ASSERT_EQUAL( sal_uInt16(19), 
pDocMM->GetDocShell()->GetWrtShell()->GetPhyPageNum() );
+
+// All even pages should be empty, all sub-documents have two pages
+const SwRootFrame* pLayout = 
pDocMM->getIDocumentLayoutAccess().GetCurrentLayout();
+const SwPageFrame* pPageFrm = static_cast( 
pLayout->Lower() );
+while ( pPageFrm )
+{
+bool bOdd = (1 == (pPageFrm->GetPhyPageNum() % 2));
+CPPUNIT_ASSERT_EQUAL( !bOdd, pPageFrm->IsEmptyPage() );
+CPPUNIT_ASSERT_EQUAL( sal_uInt16( bOdd ? 1 : 2 ), 
pPageFrm->GetVirtPageNum() );
+pPageFrm = static_cast( pPageFrm->GetNext() );
+}
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 4c90a33b628e..ba751a0c8096 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -967,20 +967,13 @@ SwNodeIndex SwDoc::AppendDoc(const SwDoc& rSource, 
sal_uInt16 const nStartPageNu
  bool const bDeletePrevious, int pageOffset, const 
sal_uLong nDocNo)
 {
 // GetEndOfExtras + 1 = StartOfContent == no content node!
-// this ensures, that we have at least two nodes in the SwPaM.
-// @see IDocumentContentOperations::CopyRange
+// This ensures it won't be merged in the SwTextNode 

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

[Caolán McNamara]

 lotuswordpro/source/filter/lwplayout.cxx |   14 ++
 lotuswordpro/source/filter/lwplayout.hxx |1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

New commits:
commit 866898afa9ccff04443473089896cda793a90d47
Author: Caolán McNamara 
Date:   Tue Dec 12 09:51:55 2017 +

ofz#4600 avoid recurse to death

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

diff --git a/lotuswordpro/source/filter/lwplayout.cxx 
b/lotuswordpro/source/filter/lwplayout.cxx
index 30ec9d0a4805..b746a2d94c1e 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -1915,6 +1915,7 @@ rtl::Reference 
LwpLayout::GetContainerLayout()
 
 LwpPlacableLayout::LwpPlacableLayout( LwpObjectHeader const &objHdr, 
LwpSvStream* pStrm )
 : LwpLayout(objHdr, pStrm)
+, m_bGettingWrapType(false)
 , m_nWrapType(0)
 , m_nBuoyancy(0)
 , m_nBaseLineOffset(0)
@@ -1970,19 +1971,24 @@ void LwpPlacableLayout::Read()
 */
 sal_uInt8 LwpPlacableLayout::GetWrapType()
 {
-if(m_nOverrideFlag & OVER_PLACEMENT)
+if (m_bGettingWrapType)
+throw std::runtime_error("recursion in layout");
+m_bGettingWrapType = true;
+sal_uInt8 nWrapType = LAY_WRAP_AROUND;
+if (m_nOverrideFlag & OVER_PLACEMENT)
 {
-return m_nWrapType;
+nWrapType = m_nWrapType;
 }
 else
 {
 rtl::Reference xBase(GetBasedOnStyle());
 if (LwpPlacableLayout* pLay = 
dynamic_cast(xBase.get()))
 {
-return pLay->GetWrapType();
+nWrapType = pLay->GetWrapType();
 }
 }
-return LAY_WRAP_AROUND;
+m_bGettingWrapType = false;
+return nWrapType;
 }
 /**
  * @descr:  get LayoutRelativity
diff --git a/lotuswordpro/source/filter/lwplayout.hxx 
b/lotuswordpro/source/filter/lwplayout.hxx
index cd84af5b380b..387d68488fd5 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -493,6 +493,7 @@ public:
 protected:
 void Read() override;
 protected:
+bool m_bGettingWrapType;
 sal_uInt8 m_nWrapType;
 sal_uInt8 m_nBuoyancy;
 sal_Int32 m_nBaseLineOffset;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Henry Castro]

 vcl/source/app/salusereventlist.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e650a23b203494cc005f689129e95801acb888a1
Author: Henry Castro 
Date:   Tue Dec 12 18:03:31 2017 +0200

Revert "lok: Assertion `m_aProcessingUserEvents.empty()' failed"

This reverts commit ad35cc9ed0faa6555bc09e5e065abb5cdc6c4ee6.

Change-Id: I8943deb0b78a14d10ed6e8d052b2ac8eb58bccae
Reviewed-on: https://gerrit.libreoffice.org/46321
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/vcl/source/app/salusereventlist.cxx 
b/vcl/source/app/salusereventlist.cxx
index 2dfc84cc230c..a3b77ecc2c19 100644
--- a/vcl/source/app/salusereventlist.cxx
+++ b/vcl/source/app/salusereventlist.cxx
@@ -53,6 +53,7 @@ bool SalUserEventList::DispatchUserEvents( bool 
bHandleAllCurrentEvents )
 
 {
 osl::MutexGuard aGuard( m_aUserEventsMutex );
+assert( m_aProcessingUserEvents.empty() );
 if( ! m_aUserEvents.empty() )
 {
 if( bHandleAllCurrentEvents )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Dennis Francis]

 sc/inc/calcconfig.hxx|1 
 sc/inc/tokenarray.hxx|9 +--
 sc/inc/types.hxx |1 
 sc/qa/unit/parallelism.cxx   |   34 ++
 sc/source/core/data/formulacell.cxx  |   10 ++-
 sc/source/core/tool/calcconfig.cxx   |   16 
 sc/source/core/tool/formulagroup.cxx |2 -
 sc/source/core/tool/token.cxx|   45 +--
 8 files changed, 100 insertions(+), 18 deletions(-)

New commits:
commit 330b1b5bcec06e3a8d35413ff921fa219bc0a8dc
Author: Dennis Francis 
Date:   Thu Nov 30 14:36:24 2017 +0530

Do not use threading for formula group if...

...there is at least one opcode in the token array that is
in the blacklist set of opcodes for threading.

Cleaned up the logic by removing FormulaVectorEnabledForThreading
from ScFormulaVectorState enum and created two separate boolean
fields in ScTokenArray to keep track of whether OpenCL or threading
could be used.

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

diff --git a/sc/inc/calcconfig.hxx b/sc/inc/calcconfig.hxx
index eaf4f36f143b..77b16ab92162 100644
--- a/sc/inc/calcconfig.hxx
+++ b/sc/inc/calcconfig.hxx
@@ -49,6 +49,7 @@ struct SC_DLLPUBLIC ScCalcConfig
 bool mbHasStringRefSyntax:1;
 
 static bool isOpenCLEnabled();
+static bool isThreadingEnabled();
 static bool isSwInterpreterEnabled();
 
 bool mbOpenCLSubsetOnly:1;
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index 071497e75323..308b4b23fa18 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -51,7 +51,9 @@ class SC_DLLPUBLIC ScTokenArray : public 
formula::FormulaTokenArray
 bool ImplGetReference( ScRange& rRange, const ScAddress& rPos, bool 
bValidOnly ) const;
 
 size_t mnHashValue;
-ScFormulaVectorState meVectorState;
+ScFormulaVectorState meVectorState : 4; // Only 4 bits
+bool mbOpenCLEnabled : 1;
+bool mbThreadingEnabled : 1;
 
 public:
 ScTokenArray();
@@ -69,7 +71,7 @@ public:
 size_t GetHash() const { return mnHashValue;}
 
 ScFormulaVectorState GetVectorState() const { return meVectorState;}
-void ResetVectorState() { meVectorState = FormulaVectorEnabled; }
+void ResetVectorState();
 bool IsFormulaVectorDisabled() const;
 
 /**
@@ -262,6 +264,9 @@ public:
 
 sal_Int32 GetWeight() const;
 
+bool IsEnabledForOpenCL() const { return mbOpenCLEnabled; }
+bool IsEnabledForThreading() const { return !mbOpenCLEnabled && 
mbThreadingEnabled; }
+
 #if DEBUG_FORMULA_COMPILER
 void Dump() const;
 #endif
diff --git a/sc/inc/types.hxx b/sc/inc/types.hxx
index cc82e363765d..51898c291fde 100644
--- a/sc/inc/types.hxx
+++ b/sc/inc/types.hxx
@@ -59,7 +59,6 @@ enum ScFormulaVectorState
 
 FormulaVectorEnabled,
 FormulaVectorCheckReference,
-FormulaVectorEnabledForThreading,
 FormulaVectorUnknown
 };
 
diff --git a/sc/qa/unit/parallelism.cxx b/sc/qa/unit/parallelism.cxx
index e3bb00502ea8..428d65a20bec 100644
--- a/sc/qa/unit/parallelism.cxx
+++ b/sc/qa/unit/parallelism.cxx
@@ -45,11 +45,13 @@ public:
 void testSUMIFS();
 void testDivision();
 void testVLOOKUP();
+void testVLOOKUPSUM();
 
 CPPUNIT_TEST_SUITE(ScParallelismTest);
 CPPUNIT_TEST(testSUMIFS);
 CPPUNIT_TEST(testDivision);
 CPPUNIT_TEST(testVLOOKUP);
+CPPUNIT_TEST(testVLOOKUPSUM);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -262,6 +264,38 @@ void ScParallelismTest::testVLOOKUP()
 m_pDoc->DeleteTab(0);
 }
 
+void ScParallelismTest::testVLOOKUPSUM()
+{
+m_pDoc->InsertTab(0, "1");
+
+const size_t nNumRows = 4096*4;
+OUString aTableRef = "$A$1:$B$" + OUString::number(nNumRows);
+for (size_t i = 0; i < nNumRows; ++i)
+{
+m_pDoc->SetValue(0, i, 0, static_cast(i));
+m_pDoc->SetValue(1, i, 0, static_cast(5*i + 100));
+m_pDoc->SetValue(2, i, 0, static_cast(nNumRows - i - 1));
+}
+for (size_t i = 0; i < nNumRows; ++i)
+{
+OUString aArgNum = "C" + OUString::number(i+1);
+m_pDoc->SetFormula(ScAddress(3, i, 0),
+   "=SUM(" + aArgNum + ";VLOOKUP(" + aArgNum + ";" + 
aTableRef + "; 2; 0)) + SUM($A1:$A2)",
+   formula::FormulaGrammar::GRAM_NATIVE_UI);
+}
+
+m_xDocShell->DoHardRecalc();
+
+size_t nArg;
+for (size_t i = 0; i < nNumRows; ++i)
+{
+OString aMsg = "At row " + OString::number(i);
+nArg = nNumRows - i - 1;
+CPPUNIT_ASSERT_EQUAL_MESSAGE(aMsg.getStr(), 6*nArg + 101, 
static_cast(m_pDoc->GetValue(3, i, 0)));
+}
+m_pDoc->DeleteTab(0);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(ScParallelismTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4-4' - readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 3195 +++-
 1 file changed, 1704 insertions(+), 1491 deletions(-)

New commits:
commit bf18f7a6bd6291413b9bbcbf584863fd113cb361
Author: Christian Lohmaier 
Date:   Tue Dec 12 16:40:09 2017 +0100

update credits

Change-Id: I400a7e2ac7549c5410b63772827404c3353826cb
(cherry picked from commit fdfdb98824103639ed4225e5b1f11629d48db27e)
(cherry picked from commit fd989b76221beeaa7528e86ca74e075274c9d3d6)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index d031023aa74c..ba5da83caf0b 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.3.2$Linux_X86_64
 
LibreOffice_project/92a7159f7e4af62137622921e809f8546db437e52012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.3.2$Linux_X86_64
 
LibreOffice_project/92a7159f7e4af62137622921e809f8546db437e52012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   658
+   690
501
41965
21327
@@ -16,9 +16,9 @@
  3649
  3471
  501
- 658
+ 690
  42464
- 21983
+ 22015
  0
  0
  false
@@ -71,7 +71,7 @@
false
false
true
-   7254539
+   7292632
false
false
false
@@ -317,24 +317,21 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  
-   
+   
   
   

   
-  
+  

   
   
@@ -398,16 +395,16 @@

   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

@@ -415,7 +412,7 @@
   

   
-  
+  

   
   
@@ -1047,14 +1044,14 @@

   
  Credits
-1296 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-11-29 15:24:50.
+1298 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-12-11 16:20:17.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
  
  
  
- 
+ 
  
   
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
@@ -1074,10 +1071,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 23112Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 23201Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 15327Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 15377Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1085,21 +1082,21 @@
  
  
   
-   *Noel GrandinCommits: 
8388Joined: 2011-12-12
+   *Noel GrandinCommits: 
8414Joined: 2011-12-12
   
   
-   Tor 
LillqvistCommits: 8068Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 8070Joined: 
201

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 3195 +++-
 1 file changed, 1704 insertions(+), 1491 deletions(-)

New commits:
commit fd989b76221beeaa7528e86ca74e075274c9d3d6
Author: Christian Lohmaier 
Date:   Tue Dec 12 16:40:09 2017 +0100

update credits

Change-Id: I400a7e2ac7549c5410b63772827404c3353826cb
(cherry picked from commit fdfdb98824103639ed4225e5b1f11629d48db27e)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index d031023aa74c..ba5da83caf0b 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.3.2$Linux_X86_64
 
LibreOffice_project/92a7159f7e4af62137622921e809f8546db437e52012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.3.2$Linux_X86_64
 
LibreOffice_project/92a7159f7e4af62137622921e809f8546db437e52012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   658
+   690
501
41965
21327
@@ -16,9 +16,9 @@
  3649
  3471
  501
- 658
+ 690
  42464
- 21983
+ 22015
  0
  0
  false
@@ -71,7 +71,7 @@
false
false
true
-   7254539
+   7292632
false
false
false
@@ -317,24 +317,21 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  
-   
+   
   
   

   
-  
+  

   
   
@@ -398,16 +395,16 @@

   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

@@ -415,7 +412,7 @@
   

   
-  
+  

   
   
@@ -1047,14 +1044,14 @@

   
  Credits
-1296 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-11-29 15:24:50.
+1298 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-12-11 16:20:17.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
  
  
  
- 
+ 
  
   
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
@@ -1074,10 +1071,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 23112Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 23201Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 15327Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 15377Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1085,21 +1082,21 @@
  
  
   
-   *Noel GrandinCommits: 
8388Joined: 2011-12-12
+   *Noel GrandinCommits: 
8414Joined: 2011-12-12
   
   
-   Tor 
LillqvistCommits: 8068Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 8070Joined: 
2010-03-23
   
   
-   Miklos 
VajnaCommits: 6676Joined: 
2010-0

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 3195 +++-
 1 file changed, 1704 insertions(+), 1491 deletions(-)

New commits:
commit 19dc4127601932745ec80676ebfea077665d6d57
Author: Christian Lohmaier 
Date:   Tue Dec 12 16:40:09 2017 +0100

update credits

Change-Id: I400a7e2ac7549c5410b63772827404c3353826cb
(cherry picked from commit fdfdb98824103639ed4225e5b1f11629d48db27e)

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index d031023aa74c..ba5da83caf0b 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.3.2$Linux_X86_64
 
LibreOffice_project/92a7159f7e4af62137622921e809f8546db437e52012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.3.2$Linux_X86_64
 
LibreOffice_project/92a7159f7e4af62137622921e809f8546db437e52012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   658
+   690
501
41965
21327
@@ -16,9 +16,9 @@
  3649
  3471
  501
- 658
+ 690
  42464
- 21983
+ 22015
  0
  0
  false
@@ -71,7 +71,7 @@
false
false
true
-   7254539
+   7292632
false
false
false
@@ -317,24 +317,21 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  
-   
+   
   
   

   
-  
+  

   
   
@@ -398,16 +395,16 @@

   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

@@ -415,7 +412,7 @@
   

   
-  
+  

   
   
@@ -1047,14 +1044,14 @@

   
  Credits
-1296 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-11-29 15:24:50.
+1298 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-12-11 16:20:17.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
  
  
  
- 
+ 
  
   
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
@@ -1074,10 +1071,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 23112Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 23201Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 15327Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 15377Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1085,21 +1082,21 @@
  
  
   
-   *Noel GrandinCommits: 
8388Joined: 2011-12-12
+   *Noel GrandinCommits: 
8414Joined: 2011-12-12
   
   
-   Tor 
LillqvistCommits: 8068Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 8070Joined: 
2010-03-23
   
   
-   Miklos 
VajnaCommits: 6676Joined: 
2010-0

[Libreoffice-commits] core.git: readlicense_oo/license

[Christian Lohmaier]

 readlicense_oo/license/CREDITS.fodt | 3195 +++-
 1 file changed, 1704 insertions(+), 1491 deletions(-)

New commits:
commit fdfdb98824103639ed4225e5b1f11629d48db27e
Author: Christian Lohmaier 
Date:   Tue Dec 12 16:40:09 2017 +0100

update credits

Change-Id: I400a7e2ac7549c5410b63772827404c3353826cb

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index d031023aa74c..ba5da83caf0b 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -1,10 +1,10 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
- Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.3.2$Linux_X86_64
 
LibreOffice_project/92a7159f7e4af62137622921e809f8546db437e52012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
+ Credits » 
LibreOfficeCreditscontributorscodersdevelopersCredits
 for the LibreOffice 
development/coding.LibreOffice/5.4.3.2$Linux_X86_64
 
LibreOffice_project/92a7159f7e4af62137622921e809f8546db437e52012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA
  
   
-   658
+   690
501
41965
21327
@@ -16,9 +16,9 @@
  3649
  3471
  501
- 658
+ 690
  42464
- 21983
+ 22015
  0
  0
  false
@@ -71,7 +71,7 @@
false
false
true
-   7254539
+   7292632
false
false
false
@@ -317,24 +317,21 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
-  
-  
-   
+   
   
   

   
-  
+  

   
   
@@ -398,16 +395,16 @@

   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   

@@ -415,7 +412,7 @@
   

   
-  
+  

   
   
@@ -1047,14 +1044,14 @@

   
  Credits
-1296 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-11-29 15:24:50.
+1298 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2017-12-11 16:20:17.
 * marks developers whose first contributions 
happened after 2010-09-28.
 Developers 
committing code since 2010-09-28
 
  
  
  
- 
+ 
  
   
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
@@ -1074,10 +1071,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Caolán 
McNamaraCommits: 23112Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 23201Joined: 
2000-10-10
   
   
-   Stephan 
BergmannCommits: 15327Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 15377Joined: 
2000-10-04
   
   
Ivo 
HinkelmannCommits: 9480Joined: 
2002-09-09
@@ -1085,21 +1082,21 @@
  
  
   
-   *Noel GrandinCommits: 
8388Joined: 2011-12-12
+   *Noel GrandinCommits: 
8414Joined: 2011-12-12
   
   
-   Tor 
LillqvistCommits: 8068Joined: 
2010-03-23
+   Tor 
LillqvistCommits: 8070Joined: 
2010-03-23
   
   
-   Miklos 
VajnaCommits: 6676Joined: 
2010-07-29
+   Miklos 
VajnaCommits: 6699Joined: 
2010-07-29
   
  

[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sc/qa

[Thorsten Behrens]

 sc/qa/unit/chart2dataprovider.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c3a89f189d5bb8a389931840d566ffab63f4fa2d
Author: Thorsten Behrens 
Date:   Tue Dec 12 16:02:17 2017 +0100

sc: fix build for subsequentcheck

Change-Id: I84e020791fdb4c5633177594c23aea4a147b0168

diff --git a/sc/qa/unit/chart2dataprovider.cxx 
b/sc/qa/unit/chart2dataprovider.cxx
index d7fd25122797..3c78f23eb900 100644
--- a/sc/qa/unit/chart2dataprovider.cxx
+++ b/sc/qa/unit/chart2dataprovider.cxx
@@ -81,7 +81,7 @@ void lcl_createAndCheckDataProvider(ScDocument& rDoc, const 
OUString& cellRange,
 void ScChart2DataProviderTest::testHeaderExpansion()
 {
 ScDocShellRef xDocSh = loadDoc("chart2dataprovider.", FORMAT_ODS);
-CPPUNIT_ASSERT_MESSAGE("Failed to load ch.ods.", xDocSh.is());
+CPPUNIT_ASSERT_MESSAGE("Failed to load ch.ods.", xDocSh.Is());
 
 ScDocument& rDoc = xDocSh->GetDocument();
 
___
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-4' - sc/source

[Eike Rathke]

 sc/source/core/tool/compiler.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7f1f7a057f5a9348507ea684271104cfbb9d0c66
Author: Eike Rathke 
Date:   Sat Dec 2 15:32:06 2017 +0100

ofz#4484 another stab at mnRangeOpPosInSymbol

Commit cd0b749cc4b4f268d26639fb3c6cbf2128b2d7df still missed it by
one position behind string length.

Also move the check to end of i18n symbol parsing for all
constellations.

 Conflicts:
sc/source/core/tool/compiler.cxx

Change-Id: I7b5e1375fe711dcc3f659e558702de78893d25a5
Reviewed-on: https://gerrit.libreoffice.org/45720
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
Reviewed-by: Christian Lohmaier 
Reviewed-by: Miklos Vajna 

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 62200282b2f0..b795802affb6 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2683,9 +2683,9 @@ Label_MaskStateMachine:
 {
 SetError( FormulaError::StringOverflow );
 nLen = MAXSTRLEN-1;
-if (mnRangeOpPosInSymbol > nLen)
-mnRangeOpPosInSymbol = -1;
 }
+if (mnRangeOpPosInSymbol >= nLen)
+mnRangeOpPosInSymbol = -1;
 lcl_UnicodeStrNCpy( cSymbol, aSymbol.getStr(), nLen );
 pSym = &cSymbol[nLen];
 }
___
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-4' - translations

[Christian Lohmaier]

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

New commits:
commit 1e73b0e7eb1005226df5ae19142f7672eb9050ca
Author: Christian Lohmaier 
Date:   Tue Dec 12 15:45:34 2017 +0100

Updated core
Project: translations  f3f238f5b8ead7b471b45dd69a1b3fdf34129d89

update translations for 5.4.4 rc2

and force-fix errors using pocheck

Change-Id: Ia9763286dd244aeac984a7c75c13b1490d59475f
(cherry picked from commit 9d6d27be79b7b949c15642340f032efdbbd0a56f)

diff --git a/translations b/translations
index c05c7f010e6c..f3f238f5b8ea 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit c05c7f010e6c90e88ebf3999da94bc18fd127d01
+Subproject commit f3f238f5b8ead7b471b45dd69a1b3fdf34129d89
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-5-4-4' - 2 commits - source/ab source/bg source/da source/de source/es source/id source/ja source/lt source/lv source/tr source/zh-TW

[Christian Lohmaier]

 source/ab/basic/source/classes.po  |   12 -
 source/ab/connectivity/source/resource.po  |6 
 source/ab/cui/source/dialogs.po|   18 -
 source/ab/cui/source/tabpages.po   |   24 +-
 source/ab/cui/uiconfig/ui.po   |   10 -
 source/ab/editeng/source/items.po  |6 
 source/ab/extras/source/autocorr/emoji.po  |8 
 source/ab/filter/source/config/fragments/filters.po|8 
 source/ab/filter/source/config/fragments/internalgraphicfilters.po |6 
 source/ab/forms/source/resource.po |6 
 source/ab/formula/source/core/resource.po  |6 
 source/ab/librelogo/source/pythonpath.po   |6 
 source/ab/officecfg/registry/data/org/openoffice/Office.po |   30 +--
 source/ab/officecfg/registry/data/org/openoffice/Office/UI.po  |   98 
+-
 source/ab/readlicense_oo/docs.po   |6 
 source/ab/sc/source/ui/navipi.po   |   12 -
 source/ab/sc/source/ui/src.po  |   12 -
 source/ab/sc/uiconfig/scalc/ui.po  |   18 -
 source/ab/scp2/source/draw.po  |6 
 source/ab/sd/source/core.po|8 
 source/ab/sd/source/ui/app.po  |   10 -
 source/ab/sd/uiconfig/simpress/ui.po   |   10 -
 source/ab/svtools/source/dialogs.po|   56 ++---
 source/ab/svtools/source/misc.po   |6 
 source/ab/svtools/uiconfig/ui.po   |6 
 source/ab/svx/source/gallery2.po   |6 
 source/ab/svx/source/src.po|6 
 source/ab/svx/source/svdraw.po |   22 +-
 source/ab/svx/uiconfig/ui.po   |8 
 source/ab/sw/source/ui/app.po  |8 
 source/ab/sw/source/ui/dochdl.po   |6 
 source/ab/sw/source/ui/fldui.po|8 
 source/ab/sw/source/ui/index.po|6 
 source/ab/sw/source/ui/shells.po   |6 
 source/ab/sw/source/ui/utlui.po|   16 -
 source/ab/sw/source/uibase/ribbar.po   |   10 -
 source/ab/sw/uiconfig/swriter/ui.po|   22 +-
 source/bg/cui/uiconfig/ui.po   |6 
 source/bg/wizards/source/template.po   |6 
 source/da/helpcontent2/source/text/simpress/guide.po   |8 
 source/da/sd/uiconfig/simpress/ui.po   |   10 -
 source/de/cui/uiconfig/ui.po   |6 
 source/de/extensions/source/update/check.po|   10 -
 source/de/helpcontent2/source/text/sbasic/shared.po|   26 +-
 source/de/helpcontent2/source/text/sbasic/shared/02.po |8 
 source/de/helpcontent2/source/text/scalc/01.po |   60 
+++---
 source/de/helpcontent2/source/text/scalc/guide.po  |   10 -
 source/de/helpcontent2/source/text/sdraw.po|6 
 source/de/helpcontent2/source/text/sdraw/04.po |8 
 source/de/helpcontent2/source/text/shared.po   |6 
 source/de/helpcontent2/source/text/shared/00.po|   14 -
 source/de/helpcontent2/source/text/shared/01.po|   76 
+++
 source/de/helpcontent2/source/text/shared/02.po|   34 +--
 source/de/helpcontent2/source/text/shared/04.po|6 
 source/de/helpcontent2/source/text/shared/05.po|6 
 source/de/helpcontent2/source/text/shared/autokorr.po  |8 
 source/de/helpcontent2/source/text/shared/explorer/database.po |8 
 source/de/helpcontent2/source/text/shared/guide.po |   72 
+++
 source/de/helpcontent2/source/text/shared/optionen.po  |   14 -
 source/de/helpcontent2/source/text/simpress.po |8 
 source/de/helpcontent2/source/text/simpress/02.po  |   16 -
 source/de/helpcontent2/source/text/simpress/guide.po   |   10 -
 source/de/helpcontent2/source/text/smath/01.po |   18 -
 source/de/helpcontent2/source/text/swriter.po  |   10 -
 source/de/helpcontent2/source/text/swriter/00.po  

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

[Aron Budea]

 sc/qa/unit/data/xlsx/built-in_ranges.xlsx |binary
 sc/qa/unit/subsequent_export-test.cxx |   28 
 sc/source/filter/excel/xltools.cxx|6 +-
 sc/source/filter/inc/xltools.hxx  |4 ++--
 4 files changed, 35 insertions(+), 3 deletions(-)

New commits:
commit 3f50e9ccde342259fd6f24c40599d820f21eba7b
Author: Aron Budea 
Date:   Tue Nov 28 07:23:12 2017 +0100

tdf#109240, tdf#112571: don't export dupe built-in named ranges

XclTools::GetBuiltInDefNameIndex(...) only checked for prefix used in
binary Excel format, and didn't recognize OOXML built-in names, which
resulted in saving them twice in OOXML files.

Adapt to check both binary and OOXML prefixes, similarly to
XclTools::IsBuiltInStyleName(...).

Saving "bad" files after the fix will purge bad "_0", "_0_0" etc.
suffixed built-in names due to how GetBuiltInDefNameIndex(...) works.

Change-Id: I1bbe11f9c654a142a4626003df4cb0fd2a0f9c71
Reviewed-on: https://gerrit.libreoffice.org/45381
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
(cherry picked from commit f8b9d0fb0767d8bbe8477f92abaf6b8e0ff65546)
Reviewed-on: https://gerrit.libreoffice.org/45702
Reviewed-by: Christian Lohmaier 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/qa/unit/data/xlsx/built-in_ranges.xlsx 
b/sc/qa/unit/data/xlsx/built-in_ranges.xlsx
new file mode 100644
index ..b18a4862fdd6
Binary files /dev/null and b/sc/qa/unit/data/xlsx/built-in_ranges.xlsx differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index 4e692e570784..09b7f9e49cc8 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -105,6 +105,7 @@ public:
 void testConditionalFormatRangeListXLSX();
 void testMiscRowHeightExport();
 void testNamedRangeBugfdo62729();
+void testBuiltinRangesXLSX();
 void testRichTextExportODS();
 void testRichTextCellFormatXLSX();
 void testFormulaRefSheetNameODS();
@@ -214,6 +215,7 @@ public:
 CPPUNIT_TEST(testConditionalFormatRangeListXLSX);
 CPPUNIT_TEST(testMiscRowHeightExport);
 CPPUNIT_TEST(testNamedRangeBugfdo62729);
+CPPUNIT_TEST(testBuiltinRangesXLSX);
 CPPUNIT_TEST(testRichTextExportODS);
 CPPUNIT_TEST(testRichTextCellFormatXLSX);
 CPPUNIT_TEST(testFormulaRefSheetNameODS);
@@ -1145,6 +1147,32 @@ void ScExportTest::testNamedRangeBugfdo62729()
 xDocSh->DoClose();
 }
 
+void ScExportTest::testBuiltinRangesXLSX()
+{
+ScDocShellRef xShell = loadDoc("built-in_ranges.", FORMAT_XLSX);
+CPPUNIT_ASSERT(xShell.is());
+ScDocShellRef xDocSh = saveAndReload(xShell.get(), FORMAT_XLSX);
+CPPUNIT_ASSERT(xDocSh.is());
+xShell->DoClose();
+
+xmlDocPtr pDoc = XPathHelper::parseExport(*xDocSh, m_xSFactory, 
"xl/workbook.xml", FORMAT_XLSX);
+CPPUNIT_ASSERT(pDoc);
+
+//assert the existing OOXML built-in names are still there
+assertXPathContent(pDoc, 
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm._FilterDatabase'][@localSheetId='0']",
 "'Sheet1 Test'!$A$1:$A$5");
+assertXPathContent(pDoc, 
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm._FilterDatabase'][@localSheetId='1']",
 "'Sheet2 Test'!$K$10:$K$14");
+assertXPathContent(pDoc, 
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm.Print_Area'][@localSheetId='0']",
 "'Sheet1 Test'!$A$1:$A$5");
+assertXPathContent(pDoc, 
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm.Print_Area'][@localSheetId='1']",
 "'Sheet2 Test'!$K$10:$M$18");
+
+//...and that no extra ones are added (see tdf#112571)
+assertXPath(pDoc, 
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm._FilterDatabase_0'][@localSheetId='0']",
 0);
+assertXPath(pDoc, 
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm._FilterDatabase_0'][@localSheetId='1']",
 0);
+assertXPath(pDoc, 
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm.Print_Area_0'][@localSheetId='0']",
 0);
+assertXPath(pDoc, 
"/x:workbook/x:definedNames/x:definedName[@name='_xlnm.Print_Area_0'][@localSheetId='1']",
 0);
+
+xDocSh->DoClose();
+}
+
 void ScExportTest::testRichTextExportODS()
 {
 struct
diff --git a/sc/source/filter/excel/xltools.cxx 
b/sc/source/filter/excel/xltools.cxx
index 374fc6256b21..a68327f93d39 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -482,8 +482,12 @@ OUString XclTools::GetBuiltInDefNameXml( sal_Unicode 
cBuiltIn )
 
 sal_Unicode XclTools::GetBuiltInDefNameIndex( const OUString& rDefName )
 {
-sal_Int32 nPrefixLen = strlen(maDefNamePrefix);
+sal_Int32 nPrefixLen = 0;
 if( rDefName.startsWithIgnoreAsciiCase( maDefNamePrefix ) )
+nPrefixLen = strlen(maDefNamePrefix);
+else if( rDefName.startsWithIgnoreAsciiCase( maDefNamePrefixXml ) )
+nPrefixLen = strlen(maDefNamePrefixXml);
+if( nPrefixLen > 0 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - translations

[Christian Lohmaier]

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

New commits:
commit fb27ad457c9f050774d4cb65f828a3498581f9ab
Author: Christian Lohmaier 
Date:   Tue Dec 12 15:45:34 2017 +0100

Updated core
Project: translations  9d6d27be79b7b949c15642340f032efdbbd0a56f

update translations for 5.4.4 rc2

and force-fix errors using pocheck

Change-Id: Ia9763286dd244aeac984a7c75c13b1490d59475f

diff --git a/translations b/translations
index f14dbe367fbd..9d6d27be79b7 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit f14dbe367fbd95092538121400fbeb029336fdfa
+Subproject commit 9d6d27be79b7b949c15642340f032efdbbd0a56f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-5-4' - source/ab source/bg source/da source/de source/es source/id source/ja source/lt source/lv source/tr source/zh-TW

[Christian Lohmaier]

 source/ab/basic/source/classes.po  |   12 -
 source/ab/connectivity/source/resource.po  |6 
 source/ab/cui/source/dialogs.po|   18 -
 source/ab/cui/source/tabpages.po   |   24 +-
 source/ab/cui/uiconfig/ui.po   |   10 -
 source/ab/editeng/source/items.po  |6 
 source/ab/extras/source/autocorr/emoji.po  |8 
 source/ab/filter/source/config/fragments/filters.po|8 
 source/ab/filter/source/config/fragments/internalgraphicfilters.po |6 
 source/ab/forms/source/resource.po |6 
 source/ab/formula/source/core/resource.po  |6 
 source/ab/librelogo/source/pythonpath.po   |6 
 source/ab/officecfg/registry/data/org/openoffice/Office.po |   30 +--
 source/ab/officecfg/registry/data/org/openoffice/Office/UI.po  |   98 
+-
 source/ab/readlicense_oo/docs.po   |6 
 source/ab/sc/source/ui/navipi.po   |   12 -
 source/ab/sc/source/ui/src.po  |   12 -
 source/ab/sc/uiconfig/scalc/ui.po  |   18 -
 source/ab/scp2/source/draw.po  |6 
 source/ab/sd/source/core.po|8 
 source/ab/sd/source/ui/app.po  |   10 -
 source/ab/sd/uiconfig/simpress/ui.po   |   10 -
 source/ab/svtools/source/dialogs.po|   56 ++---
 source/ab/svtools/source/misc.po   |6 
 source/ab/svtools/uiconfig/ui.po   |6 
 source/ab/svx/source/gallery2.po   |6 
 source/ab/svx/source/src.po|6 
 source/ab/svx/source/svdraw.po |   22 +-
 source/ab/svx/uiconfig/ui.po   |8 
 source/ab/sw/source/ui/app.po  |8 
 source/ab/sw/source/ui/dochdl.po   |6 
 source/ab/sw/source/ui/fldui.po|8 
 source/ab/sw/source/ui/index.po|6 
 source/ab/sw/source/ui/shells.po   |6 
 source/ab/sw/source/ui/utlui.po|   16 -
 source/ab/sw/source/uibase/ribbar.po   |   10 -
 source/ab/sw/uiconfig/swriter/ui.po|   22 +-
 source/bg/cui/uiconfig/ui.po   |6 
 source/bg/wizards/source/template.po   |6 
 source/da/helpcontent2/source/text/simpress/guide.po   |8 
 source/da/sd/uiconfig/simpress/ui.po   |   10 -
 source/de/cui/uiconfig/ui.po   |6 
 source/de/extensions/source/update/check.po|   10 -
 source/de/helpcontent2/source/text/sbasic/shared.po|   26 +-
 source/de/helpcontent2/source/text/sbasic/shared/02.po |8 
 source/de/helpcontent2/source/text/scalc/01.po |   60 
+++---
 source/de/helpcontent2/source/text/scalc/guide.po  |   10 -
 source/de/helpcontent2/source/text/sdraw.po|6 
 source/de/helpcontent2/source/text/sdraw/04.po |8 
 source/de/helpcontent2/source/text/shared.po   |6 
 source/de/helpcontent2/source/text/shared/00.po|   14 -
 source/de/helpcontent2/source/text/shared/01.po|   76 
+++
 source/de/helpcontent2/source/text/shared/02.po|   34 +--
 source/de/helpcontent2/source/text/shared/04.po|6 
 source/de/helpcontent2/source/text/shared/05.po|6 
 source/de/helpcontent2/source/text/shared/autokorr.po  |8 
 source/de/helpcontent2/source/text/shared/explorer/database.po |8 
 source/de/helpcontent2/source/text/shared/guide.po |   72 
+++
 source/de/helpcontent2/source/text/shared/optionen.po  |   14 -
 source/de/helpcontent2/source/text/simpress.po |8 
 source/de/helpcontent2/source/text/simpress/02.po  |   16 -
 source/de/helpcontent2/source/text/simpress/guide.po   |   10 -
 source/de/helpcontent2/source/text/smath/01.po |   18 -
 source/de/helpcontent2/source/text/swriter.po  |   10 -
 source/de/helpcontent2/source/text/swriter/00.po  

Re: Association between ToC index object and its paragraph content

[Michael Stahl]

On 12.12.2017 14:22, Jens Tröger wrote:
> Michael, I the case you describe would I not see the same UNO object address 
> for the same paragraph in the document? But iterating over the ToC’s 
> paragraphs as described previously in this thread, I get for the index view:
> 
> pyuno object 
> (com.sun.star.text.XTextContent)0x7feddb8d2638{implementationName=SwXParagraph,
>  … }
> 
> and then for the global document view:
> 
> pyuno object 
> (com.sun.star.text.XTextContent)0x7fedd9f5f598{implementationName=SwXParagraph,
>  … }
> 
> for the same first entry paragraph in the ToC. In fact, if I instantiate the 
> ToC’s text range three times, then I get three different objects for the 
> first paragraph:
> 
> pyuno object (com.sun.star.text.XTextContent)0x7fc6b1d41188
> pyuno object (com.sun.star.text.XTextContent)0x7fc6b1e66968
> pyuno object (com.sun.star.text.XTextContent)0x7fc6b430e288
> 
> Do paragraphs have another unique identifier that associates these different 
> instances as objects representing the same document paragraph?

do you retain a reference to the paragraphs somewhere?  Writer itself
doesn't keep the SwXParagraph alive, so if your extension drops the last
reference to it then it will be deleted and a new one created the next time.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_svg icon-themes/elementary icon-themes/elementary_svg

[andreas kainz]

 icon-themes/breeze/links.txt |4 ++--
 icon-themes/breeze_dark/links.txt|4 ++--
 icon-themes/breeze_svg/links.txt |4 ++--
 icon-themes/elementary/links.txt |4 ++--
 icon-themes/elementary_svg/links.txt |4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 76ec2c12c8e0fb3e3dc8645e4da96515b5b4630d
Author: andreas kainz 
Date:   Tue Dec 12 09:48:38 2017 +0100

Breez and Elementary-icons: fix av02048 for avmedia

Change-Id: Iaeb96f8b1dffaee73230c7d4a4817d1cf0b821a6
Reviewed-on: https://gerrit.libreoffice.org/46282
Tested-by: Jenkins 
Reviewed-by: andreas_kainz 
(cherry picked from commit 126b910380d13c91938f8b5d5f398fc5390403e4)
Reviewed-on: https://gerrit.libreoffice.org/46302

diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index 5c7a13247d97..fce62a1b8a59 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -1,13 +1,13 @@
 # avmedia
 # ==
-avmedia/res/av02048.png cmd/sc_avmediaplayer.png
+avmedia/res/av02048.png cmd/sc_open.png
 avmedia/res/av02049.png cmd/sc_runbasic.png
 avmedia/res/av02050.png cmd/sc_mediapause.png
 avmedia/res/av02051.png cmd/sc_basicstop.png
 avmedia/res/av02052.png cmd/sc_mediarepeat.png
 avmedia/res/av02053.png cmd/sc_ok.png
 avmedia/res/av02054.png cmd/sc_mediamute.png
-avmedia/res/avl02048.png cmd/lc_avmediaplayer.png
+avmedia/res/avl02048.png cmd/lc_open.png
 avmedia/res/avl02049.png cmd/lc_runbasic.png
 avmedia/res/avl02050.png cmd/lc_mediapause.png
 avmedia/res/avl02051.png cmd/lc_basicstop.png
diff --git a/icon-themes/breeze_dark/links.txt 
b/icon-themes/breeze_dark/links.txt
index 5c7a13247d97..fce62a1b8a59 100644
--- a/icon-themes/breeze_dark/links.txt
+++ b/icon-themes/breeze_dark/links.txt
@@ -1,13 +1,13 @@
 # avmedia
 # ==
-avmedia/res/av02048.png cmd/sc_avmediaplayer.png
+avmedia/res/av02048.png cmd/sc_open.png
 avmedia/res/av02049.png cmd/sc_runbasic.png
 avmedia/res/av02050.png cmd/sc_mediapause.png
 avmedia/res/av02051.png cmd/sc_basicstop.png
 avmedia/res/av02052.png cmd/sc_mediarepeat.png
 avmedia/res/av02053.png cmd/sc_ok.png
 avmedia/res/av02054.png cmd/sc_mediamute.png
-avmedia/res/avl02048.png cmd/lc_avmediaplayer.png
+avmedia/res/avl02048.png cmd/lc_open.png
 avmedia/res/avl02049.png cmd/lc_runbasic.png
 avmedia/res/avl02050.png cmd/lc_mediapause.png
 avmedia/res/avl02051.png cmd/lc_basicstop.png
diff --git a/icon-themes/breeze_svg/links.txt b/icon-themes/breeze_svg/links.txt
index 5c7a13247d97..fce62a1b8a59 100644
--- a/icon-themes/breeze_svg/links.txt
+++ b/icon-themes/breeze_svg/links.txt
@@ -1,13 +1,13 @@
 # avmedia
 # ==
-avmedia/res/av02048.png cmd/sc_avmediaplayer.png
+avmedia/res/av02048.png cmd/sc_open.png
 avmedia/res/av02049.png cmd/sc_runbasic.png
 avmedia/res/av02050.png cmd/sc_mediapause.png
 avmedia/res/av02051.png cmd/sc_basicstop.png
 avmedia/res/av02052.png cmd/sc_mediarepeat.png
 avmedia/res/av02053.png cmd/sc_ok.png
 avmedia/res/av02054.png cmd/sc_mediamute.png
-avmedia/res/avl02048.png cmd/lc_avmediaplayer.png
+avmedia/res/avl02048.png cmd/lc_open.png
 avmedia/res/avl02049.png cmd/lc_runbasic.png
 avmedia/res/avl02050.png cmd/lc_mediapause.png
 avmedia/res/avl02051.png cmd/lc_basicstop.png
diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt
index 37a928ab6d08..da32b7960d83 100644
--- a/icon-themes/elementary/links.txt
+++ b/icon-themes/elementary/links.txt
@@ -1,13 +1,13 @@
 # avmedia
 # ==
-avmedia/res/av02048.png cmd/sc_avmediaplayer.png
+avmedia/res/av02048.png cmd/sc_open.png
 avmedia/res/av02049.png cmd/sc_runbasic.png
 avmedia/res/av02050.png cmd/sc_mediapause.png
 avmedia/res/av02051.png cmd/sc_basicstop.png
 avmedia/res/av02052.png cmd/sc_mediarepeat.png
 avmedia/res/av02053.png cmd/sc_ok.png
 avmedia/res/av02054.png cmd/sc_mediamute.png
-avmedia/res/avl02048.png cmd/lc_avmediaplayer.png
+avmedia/res/avl02048.png cmd/lc_open.png
 avmedia/res/avl02049.png cmd/lc_runbasic.png
 avmedia/res/avl02050.png cmd/lc_mediapause.png
 avmedia/res/avl02051.png cmd/lc_basicstop.png
diff --git a/icon-themes/elementary_svg/links.txt 
b/icon-themes/elementary_svg/links.txt
index ea3e1f51e9a1..75910bf9c08d 100644
--- a/icon-themes/elementary_svg/links.txt
+++ b/icon-themes/elementary_svg/links.txt
@@ -1,13 +1,13 @@
 # avmedia
 # ==
-avmedia/res/av02048.svg cmd/sc_avmediaplayer.svg
+avmedia/res/av02048.svg cmd/sc_open.svg
 avmedia/res/av02049.svg cmd/sc_runbasic.svg
 avmedia/res/av02050.svg cmd/sc_mediapause.svg
 avmedia/res/av02051.svg cmd/sc_basicstop.svg
 avmedia/res/av02052.svg cmd/sc_mediarepeat.svg
 avmedia/res/av02053.svg cmd/sc_ok.svg
 avmedia/res/av02054.svg cmd/sc_mediamute.svg
-avmedia/res/avl02048.svg cmd/lc_avmediaplayer.svg
+avmedia/res/avl02048.s

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

[Caolán McNamara]

 sw/source/filter/html/swhtml.cxx|   15 ---
 sw/source/filter/html/swhtml.hxx|6 ++
 sw/source/filter/inc/fltshell.hxx   |   24 
 sw/source/filter/ww8/ww8par.cxx |   18 +-
 sw/source/filter/ww8/ww8par.hxx |   10 --
 vcl/source/app/salusereventlist.cxx |1 -
 6 files changed, 39 insertions(+), 35 deletions(-)

New commits:
commit 810b5f6491850d70bfe2da1f58927a3404d37d49
Author: Caolán McNamara 
Date:   Mon Dec 11 15:20:17 2017 +

reuse ImportProgress class for exception safety

cause if no EndProgress is called then the shell leaks
so the document leaks, etc

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

diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 1d865e761e59..e0740fa50b51 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -537,8 +537,9 @@ SvParserState SwHTMLParser::CallParser()
 {
 rInput.Seek(STREAM_SEEK_TO_END);
 rInput.ResetError();
-::StartProgress( STR_STATSTR_W4WREAD, 0, rInput.Tell(),
- m_xDoc->GetDocShell() );
+
+m_xProgress.reset(new ImportProgress(m_xDoc->GetDocShell(), 0, 
rInput.Tell()));
+
 rInput.Seek(STREAM_SEEK_TO_BEGIN);
 rInput.ResetError();
 }
@@ -619,7 +620,7 @@ void SwHTMLParser::Continue( HtmlTokenId nToken )
 }
 
 // disable progress bar again
-EndProgress( m_xDoc->GetDocShell() );
+m_xProgress.reset();
 
 bool bLFStripped = false;
 if( SvParserState::Pending != GetStatus() )
@@ -1414,8 +1415,8 @@ void SwHTMLParser::NextToken( HtmlTokenId nToken )
 SetTextCollAttrs();
 }
 // progress bar
-if( !GetMedium() || !GetMedium()->IsRemote() )
-::SetProgressState( rInput.Tell(), m_xDoc->GetDocShell() );
+if (m_xProgress)
+m_xProgress->Update(rInput.Tell());
 }
 break;
 
@@ -2498,9 +2499,9 @@ void SwHTMLParser::ShowStatline()
 OSL_ENSURE( SvParserState::Working==eState, "ShowStatLine not in working 
state - That can go wrong" );
 
 // scroll bar
-if( !GetMedium() || !GetMedium()->IsRemote() )
+if (m_xProgress)
 {
-::SetProgressState( rInput.Tell(), m_xDoc->GetDocShell() );
+m_xProgress->Update(rInput.Tell());
 CheckActionViewShell();
 }
 else
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index 799d856b4577..c02309b7e4c0 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -363,6 +364,11 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient
 friend class CellSaveStruct;
 friend class CaptionSaveStruct;
 
+/*
+ Progress bar
+ */
+std::unique_ptr m_xProgress;
+
 OUString  m_aPathToFile;
 OUString  m_sBaseURL;
 OUString  m_aBasicLib;
diff --git a/sw/source/filter/inc/fltshell.hxx 
b/sw/source/filter/inc/fltshell.hxx
index bc8fb87bf806..e1a8503d657d 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -25,8 +25,10 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -319,6 +321,28 @@ public:
 
 SW_DLLPUBLIC void UpdatePageDescs(SwDoc &rDoc, size_t nInPageDescOffset);
 
+class ImportProgress
+{
+private:
+SwDocShell *m_pDocShell;
+public:
+ImportProgress(SwDocShell *pDocShell, long nStartVal, long nEndVal)
+: m_pDocShell(pDocShell)
+{
+::StartProgress(STR_STATSTR_W4WREAD, nStartVal, nEndVal, m_pDocShell);
+}
+
+void Update(sal_uInt16 nProgress)
+{
+::SetProgressState(nProgress, m_pDocShell);// Update
+}
+
+~ImportProgress()
+{
+::EndProgress(m_pDocShell);
+}
+};
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 696826550e3d..db82bf84f21c 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4902,22 +4902,6 @@ void SwWW8ImplReader::ReadGlobalTemplateSettings( const 
OUString& sCreatedFrom,
 }
 }
 
-ImportProgress::ImportProgress(SwDocShell *pDocShell)
-: m_pDocShell(pDocShell)
-{
-::StartProgress(STR_STATSTR_W4WREAD, 0, 100, m_pDocShell);
-}
-
-void ImportProgress::Update(sal_uInt16 nProgress)
-{
-::SetProgressState(nProgress, m_pDocShell);// Update
-}
-
-ImportProgress::~ImportProgress()
-{
-::EndProgress(m_pDocShell);
-}
-
 ErrCode SwWW8ImplReader::CoreLoad(WW8Glossary const *pGloss)
 {
 m_rDoc.SetDocumentType( SwDoc::DOCTYPE_MSWORD );
@@ -5006,7 +4990,

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_svg

[andreas kainz]

 icon-themes/breeze/cmd/de/lc_numberformatdecimal.png|binary
 icon-themes/breeze/cmd/de/lc_numberformatthousands.png  |binary
 icon-themes/breeze/cmd/de/sc_numberformatdecimal.png|binary
 icon-themes/breeze/cmd/de/sc_numberformatthousands.png  |binary
 icon-themes/breeze/cmd/es/lc_numberformatdecimal.png|binary
 icon-themes/breeze/cmd/es/lc_numberformatthousands.png  |binary
 icon-themes/breeze/cmd/es/sc_numberformatdecimal.png|binary
 icon-themes/breeze/cmd/es/sc_numberformatthousands.png  |binary
 icon-themes/breeze/cmd/fr/lc_numberformatdecimal.png|binary
 icon-themes/breeze/cmd/fr/lc_numberformatthousands.png  |binary
 icon-themes/breeze/cmd/fr/sc_numberformatdecimal.png|binary
 icon-themes/breeze/cmd/fr/sc_numberformatthousands.png  |binary
 icon-themes/breeze/cmd/lc_numberformatthousands.png |binary
 icon-themes/breeze/cmd/sc_numberformatthousands.png |binary
 icon-themes/breeze_dark/cmd/de/lc_numberformatdecimal.png   |binary
 icon-themes/breeze_dark/cmd/de/lc_numberformatthousands.png |binary
 icon-themes/breeze_dark/cmd/de/sc_numberformatthousands.png |binary
 icon-themes/breeze_dark/cmd/es/lc_numberformatdecimal.png   |binary
 icon-themes/breeze_dark/cmd/es/lc_numberformatthousands.png |binary
 icon-themes/breeze_dark/cmd/es/sc_numberformatthousands.png |binary
 icon-themes/breeze_dark/cmd/fr/lc_numberformatdecimal.png   |binary
 icon-themes/breeze_dark/cmd/fr/lc_numberformatthousands.png |binary
 icon-themes/breeze_dark/cmd/fr/sc_numberformatthousands.png |binary
 icon-themes/breeze_dark/cmd/lc_numberformatthousands.png|binary
 icon-themes/breeze_dark/cmd/sc_numberformatthousands.png|binary
 icon-themes/breeze_svg/cmd/de/lc_numberformatdecimal.svg|8 
 icon-themes/breeze_svg/cmd/de/lc_numberformatthousands.svg  |6 ++
 icon-themes/breeze_svg/cmd/de/sc_numberformatthousands.svg  |6 ++
 icon-themes/breeze_svg/cmd/lc_numberformatthousands.svg |7 +++
 icon-themes/breeze_svg/cmd/sc_numberformatthousands.svg |7 +++
 30 files changed, 30 insertions(+), 4 deletions(-)

New commits:
commit 6e9646ccc4a6dc82b944970d0912ca9715068b03
Author: andreas kainz 
Date:   Tue Dec 12 09:25:55 2017 +0100

Breeze-icons: add numberformatthousands

Change-Id: I336532d07640fe63a988d89c96f03a7ecbe374f8
Reviewed-on: https://gerrit.libreoffice.org/46278
Tested-by: Jenkins 
Reviewed-by: andreas_kainz 
(cherry picked from commit e5e9633a7c859ca64ddd1c2fc8d5be084da72aac)
Reviewed-on: https://gerrit.libreoffice.org/46292

diff --git a/icon-themes/breeze/cmd/de/lc_numberformatdecimal.png 
b/icon-themes/breeze/cmd/de/lc_numberformatdecimal.png
index e3face04e098..414f9316d3be 100644
Binary files a/icon-themes/breeze/cmd/de/lc_numberformatdecimal.png and 
b/icon-themes/breeze/cmd/de/lc_numberformatdecimal.png differ
diff --git a/icon-themes/breeze/cmd/de/lc_numberformatthousands.png 
b/icon-themes/breeze/cmd/de/lc_numberformatthousands.png
new file mode 100644
index ..45a69590abb1
Binary files /dev/null and 
b/icon-themes/breeze/cmd/de/lc_numberformatthousands.png differ
diff --git a/icon-themes/breeze/cmd/de/sc_numberformatdecimal.png 
b/icon-themes/breeze/cmd/de/sc_numberformatdecimal.png
index b73bfb60a626..2128fba6ac59 100644
Binary files a/icon-themes/breeze/cmd/de/sc_numberformatdecimal.png and 
b/icon-themes/breeze/cmd/de/sc_numberformatdecimal.png differ
diff --git a/icon-themes/breeze/cmd/de/sc_numberformatthousands.png 
b/icon-themes/breeze/cmd/de/sc_numberformatthousands.png
new file mode 100644
index ..8f106e308176
Binary files /dev/null and 
b/icon-themes/breeze/cmd/de/sc_numberformatthousands.png differ
diff --git a/icon-themes/breeze/cmd/es/lc_numberformatdecimal.png 
b/icon-themes/breeze/cmd/es/lc_numberformatdecimal.png
index e3face04e098..414f9316d3be 100644
Binary files a/icon-themes/breeze/cmd/es/lc_numberformatdecimal.png and 
b/icon-themes/breeze/cmd/es/lc_numberformatdecimal.png differ
diff --git a/icon-themes/breeze/cmd/es/lc_numberformatthousands.png 
b/icon-themes/breeze/cmd/es/lc_numberformatthousands.png
new file mode 100644
index ..45a69590abb1
Binary files /dev/null and 
b/icon-themes/breeze/cmd/es/lc_numberformatthousands.png differ
diff --git a/icon-themes/breeze/cmd/es/sc_numberformatdecimal.png 
b/icon-themes/breeze/cmd/es/sc_numberformatdecimal.png
index b73bfb60a626..2128fba6ac59 100644
Binary files a/icon-themes/breeze/cmd/es/sc_numberformatdecimal.png and 
b/icon-themes/breeze/cmd/es/sc_numberformatdecimal.png differ
diff --git a/icon-themes/breeze/cmd/es/sc_numberformatthousands.png 
b/icon-themes/breeze/cmd/es/sc_numberformatthousands.png
new file mode 100644
index ..8f106e308176
Binary files /dev/null and 
b/icon-themes/breeze/cmd/es/sc_numberformatthousands.png differ
diff --git a/icon-themes/breeze/cmd/fr/lc_numberformatdecimal.png 
b/icon-themes/breeze/cmd/fr/lc_

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

[andreas kainz]

 icon-themes/elementary/cmd/de/lc_numberformatdecimal.png   |binary
 icon-themes/elementary/cmd/de/lc_numberformatthousands.png |binary
 icon-themes/elementary/cmd/de/sc_numberformatdecimal.png   |binary
 icon-themes/elementary/cmd/de/sc_numberformatthousands.png |binary
 icon-themes/elementary/cmd/es/lc_numberformatdecimal.png   |binary
 icon-themes/elementary/cmd/es/lc_numberformatthousands.png |binary
 icon-themes/elementary/cmd/es/sc_numberformatdecimal.png   |binary
 icon-themes/elementary/cmd/es/sc_numberformatthousands.png |binary
 icon-themes/elementary/cmd/fr/lc_numberformatdecimal.png   |binary
 icon-themes/elementary/cmd/fr/lc_numberformatthousands.png |binary
 icon-themes/elementary/cmd/fr/sc_numberformatdecimal.png   |binary
 icon-themes/elementary/cmd/fr/sc_numberformatthousands.png |binary
 icon-themes/elementary/cmd/lc_numberformatdecimal.png  |binary
 icon-themes/elementary/cmd/lc_numberformatthousands.png|binary
 icon-themes/elementary/cmd/sc_numberformatdecimal.png  |binary
 icon-themes/elementary/cmd/sc_numberformatthousands.png|binary
 icon-themes/elementary_svg/cmd/de/lc_numberformatdecimal.svg   |1 +
 icon-themes/elementary_svg/cmd/de/lc_numberformatthousands.svg |1 +
 icon-themes/elementary_svg/cmd/de/sc_numberformatdecimal.svg   |1 +
 icon-themes/elementary_svg/cmd/de/sc_numberformatthousands.svg |1 +
 icon-themes/elementary_svg/cmd/lc_numberformatdecimal.svg  |2 +-
 icon-themes/elementary_svg/cmd/lc_numberformatthousands.svg|1 +
 icon-themes/elementary_svg/cmd/sc_numberformatdecimal.svg  |2 +-
 icon-themes/elementary_svg/cmd/sc_numberformatthousands.svg|1 +
 24 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit b298ed318ee525e09722baf976d2608e398b8773
Author: andreas kainz 
Date:   Tue Dec 12 09:44:45 2017 +0100

Elementary-icons: add numberformatthousands

Change-Id: I3ec172b068cb471d246489259e8deb4dfb34f9e4
Reviewed-on: https://gerrit.libreoffice.org/46281
Tested-by: Jenkins 
Reviewed-by: andreas_kainz 

diff --git a/icon-themes/elementary/cmd/de/lc_numberformatdecimal.png 
b/icon-themes/elementary/cmd/de/lc_numberformatdecimal.png
new file mode 100644
index ..0575c58fbb2f
Binary files /dev/null and 
b/icon-themes/elementary/cmd/de/lc_numberformatdecimal.png differ
diff --git a/icon-themes/elementary/cmd/de/lc_numberformatthousands.png 
b/icon-themes/elementary/cmd/de/lc_numberformatthousands.png
new file mode 100644
index ..e08d6e26
Binary files /dev/null and 
b/icon-themes/elementary/cmd/de/lc_numberformatthousands.png differ
diff --git a/icon-themes/elementary/cmd/de/sc_numberformatdecimal.png 
b/icon-themes/elementary/cmd/de/sc_numberformatdecimal.png
new file mode 100644
index ..4e06bc456c76
Binary files /dev/null and 
b/icon-themes/elementary/cmd/de/sc_numberformatdecimal.png differ
diff --git a/icon-themes/elementary/cmd/de/sc_numberformatthousands.png 
b/icon-themes/elementary/cmd/de/sc_numberformatthousands.png
new file mode 100644
index ..52c94c24e449
Binary files /dev/null and 
b/icon-themes/elementary/cmd/de/sc_numberformatthousands.png differ
diff --git a/icon-themes/elementary/cmd/es/lc_numberformatdecimal.png 
b/icon-themes/elementary/cmd/es/lc_numberformatdecimal.png
new file mode 100644
index ..0575c58fbb2f
Binary files /dev/null and 
b/icon-themes/elementary/cmd/es/lc_numberformatdecimal.png differ
diff --git a/icon-themes/elementary/cmd/es/lc_numberformatthousands.png 
b/icon-themes/elementary/cmd/es/lc_numberformatthousands.png
new file mode 100644
index ..e08d6e26
Binary files /dev/null and 
b/icon-themes/elementary/cmd/es/lc_numberformatthousands.png differ
diff --git a/icon-themes/elementary/cmd/es/sc_numberformatdecimal.png 
b/icon-themes/elementary/cmd/es/sc_numberformatdecimal.png
new file mode 100644
index ..4e06bc456c76
Binary files /dev/null and 
b/icon-themes/elementary/cmd/es/sc_numberformatdecimal.png differ
diff --git a/icon-themes/elementary/cmd/es/sc_numberformatthousands.png 
b/icon-themes/elementary/cmd/es/sc_numberformatthousands.png
new file mode 100644
index ..52c94c24e449
Binary files /dev/null and 
b/icon-themes/elementary/cmd/es/sc_numberformatthousands.png differ
diff --git a/icon-themes/elementary/cmd/fr/lc_numberformatdecimal.png 
b/icon-themes/elementary/cmd/fr/lc_numberformatdecimal.png
new file mode 100644
index ..0575c58fbb2f
Binary files /dev/null and 
b/icon-themes/elementary/cmd/fr/lc_numberformatdecimal.png differ
diff --git a/icon-themes/elementary/cmd/fr/lc_numberformatthousands.png 
b/icon-themes/elementary/cmd/fr/lc_numberformatthousands.png
new file mode 100644
index ..e08d6e26
Binary files /dev/null and 
b/icon-themes/elementary/cmd/fr/lc_numberformatthousands.png differ
diff --git a/icon-themes/elementary/cmd/fr/sc_numberfo

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

[Gabor Kelemen]

 cui/inc/strings.hrc  |9 -
 cui/source/tabpages/page.cxx |   11 ++-
 include/svx/strings.hrc  |   11 ---
 sw/source/ui/frmdlg/frmpage.cxx  |8 
 sw/source/uibase/inc/frmpage.hxx |3 ++-
 sw/uiconfig/swriter/ui/frmaddpage.ui |   35 ++-
 6 files changed, 26 insertions(+), 51 deletions(-)

New commits:
commit 9807290ccb87c0901a53f885a81a6aab93181f1d
Author: Gabor Kelemen 
Date:   Sun Dec 10 15:31:02 2017 +0100

tdf#113959 Use svxlo-FrameDirectionListBox instead of ListBox

Final part. Here frmaddpage.ui is migrated, but to reuse the 2
other strings we need to shake up their original place in page.cxx

Now all the stings are moved to svx and occur only once in the code base.

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

diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index af4fbb388b57..330931871a47 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -315,15 +315,6 @@
 
 #define RID_SVXSTR_OPT_PROXYPORTS   
NC_("RID_SVXSTR_OPT_PROXYPORTS", "Invalid value!\n\nThe maximum value for a 
port number is 65535.")
 
-#define RID_SVXSTR_FRAMEDIR_LTR 
NC_("RID_SVXSTR_FRAMEDIR_LTR", "Left-to-right (LTR)")
-#define RID_SVXSTR_FRAMEDIR_RTL 
NC_("RID_SVXSTR_FRAMEDIR_RTL", "Right-to-left (RTL)")
-#define RID_SVXSTR_FRAMEDIR_SUPER   
NC_("RID_SVXSTR_FRAMEDIR_SUPER", "Use superordinate object settings")
-// page direction
-#define RID_SVXSTR_PAGEDIR_LTR_HORI 
NC_("RID_SVXSTR_PAGEDIR_LTR_HORI", "Left-to-right (horizontal)")
-#define RID_SVXSTR_PAGEDIR_RTL_HORI 
NC_("RID_SVXSTR_PAGEDIR_RTL_HORI", "Right-to-left (horizontal)")
-#define RID_SVXSTR_PAGEDIR_RTL_VERT 
NC_("RID_SVXSTR_PAGEDIR_RTL_VERT", "Right-to-left (vertical)")
-#define RID_SVXSTR_PAGEDIR_LTR_VERT 
NC_("RID_SVXSTR_PAGEDIR_LTR_VERT", "Left-to-right (vertical)")
-
 #define RID_SVXSTR_DESC_GRADIENT
NC_("RID_SVXSTR_DESC_GRADIENT", "Please enter a name for the gradient:")
 #define RID_SVXSTR_DESC_NEW_BITMAP  
NC_("RID_SVXSTR_DESC_NEW_BITMAP", "Please enter a name for the bitmap:")
 #define RID_SVXSTR_DESC_EXT_BITMAP  
NC_("RID_SVXSTR_DESC_EXT_BITMAP", "Please enter a name for the external 
bitmap:")
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index f1de9a5e2185..4f2303c28a40 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -30,7 +30,8 @@
 #include 
 #include 
 
-#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -216,11 +217,11 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, 
const SfxItemSet& rAttr
 
 //  fill text flow listbox with valid entries
 
-m_pTextFlowBox->InsertEntryValue( CuiResId( RID_SVXSTR_PAGEDIR_LTR_HORI ), 
SvxFrameDirection::Horizontal_LR_TB );
+m_pTextFlowBox->InsertEntryValue( SvxResId( RID_SVXSTR_PAGEDIR_LTR_HORI ), 
SvxFrameDirection::Horizontal_LR_TB );
 
 
 if( bCTL )
-m_pTextFlowBox->InsertEntryValue( CuiResId( 
RID_SVXSTR_PAGEDIR_RTL_HORI ), SvxFrameDirection::Horizontal_RL_TB );
+m_pTextFlowBox->InsertEntryValue( SvxResId( 
RID_SVXSTR_PAGEDIR_RTL_HORI ), SvxFrameDirection::Horizontal_RL_TB );
 
 
 // #109989# do not show vertical directions in Writer/Web
@@ -228,8 +229,8 @@ SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, 
const SfxItemSet& rAttr
 {
 if( bCJK )
 {
-m_pTextFlowBox->InsertEntryValue( CuiResId( 
RID_SVXSTR_PAGEDIR_RTL_VERT ), SvxFrameDirection::Vertical_RL_TB );
-m_pTextFlowBox->InsertEntryValue( CuiResId( 
RID_SVXSTR_PAGEDIR_LTR_VERT ), SvxFrameDirection::Vertical_LR_TB );
+m_pTextFlowBox->InsertEntryValue( SvxResId( 
RID_SVXSTR_PAGEDIR_RTL_VERT ), SvxFrameDirection::Vertical_RL_TB );
+m_pTextFlowBox->InsertEntryValue( SvxResId( 
RID_SVXSTR_PAGEDIR_LTR_VERT ), SvxFrameDirection::Vertical_LR_TB );
 }
 }
 
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index cd670874e1e6..1fbcfc2066b2 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1628,9 +1628,14 @@
 #define RID_SUBSETSTR_SYRIAC_SUPPLEMENT 
NC_("RID_SUBSETMAP", "Syriac Supplement")
 #define RID_SUBSETSTR_ZANABAZAR_SQUARE  
NC_("RID_SUBSETMAP", "Zanabazar Square")
 
-#define RID_SVXSTR_FRAMEDIR_LTR 
NC_("RID_SVXSTR_FRAMEDIR_LTR", "Left-to-right (LTR)")
-#define RID_SVXSTR_FRAMEDIR_RTL 
NC_("RID_SVXSTR_FRAMEDIR_RTL", "Right-to-left (RTL)")
-#define RID_SVXSTR_FRAMEDIR_SUPER   
NC_("RID_SVXSTR_FRAMEDIR_SUPER", "Use superordinate object settings")
+#define RID_SVXSTR_FRAMEDIR

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

[Caolán McNamara]

 svtools/source/svhtml/parhtml.cxx |   26 +++---
 sw/source/filter/html/htmltab.cxx |3 +++
 2 files changed, 26 insertions(+), 3 deletions(-)

New commits:
commit 4fe154d6e068aa9accdb64e8ebd4d1491b6c94f9
Author: Caolán McNamara 
Date:   Mon Dec 11 15:19:18 2017 +

ensure dec ref if exception called

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

diff --git a/svtools/source/svhtml/parhtml.cxx 
b/svtools/source/svhtml/parhtml.cxx
index ec8f7f5db683..9e5974ae5d40 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -237,6 +237,27 @@ HTMLParser::~HTMLParser()
 {
 }
 
+namespace
+{
+class RefGuard
+{
+private:
+HTMLParser& m_rParser;
+public:
+RefGuard(HTMLParser& rParser)
+: m_rParser(rParser)
+{
+m_rParser.AddFirstRef();
+}
+
+~RefGuard()
+{
+if (m_rParser.GetStatus() != SvParserState::Pending)
+m_rParser.ReleaseRef(); // Parser not needed anymore
+}
+};
+}
+
 SvParserState HTMLParser::CallParser()
 {
 eState = SvParserState::Working;
@@ -246,10 +267,9 @@ SvParserState HTMLParser::CallParser()
 nPre_LinePos = 0;
 bPre_IgnoreNewPara = false;
 
-AddFirstRef();
+RefGuard aRefGuard(*this);
+
 Continue( HtmlTokenId::NONE );
-if( SvParserState::Pending != eState )
-ReleaseRef();   // Parser not needed anymore
 
 return eState;
 }
diff --git a/sw/source/filter/html/htmltab.cxx 
b/sw/source/filter/html/htmltab.cxx
index 84e7b3b31a2f..5680ca23b932 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -2717,7 +2717,10 @@ const SwStartNode *SwHTMLParser::InsertTableSection( 
sal_uInt16 nPoolId )
 {
 SwTableNode *pTableNd = pNd->FindTableNode();
 if (!pTableNd)
+{
+eState = SvParserState::Error;
 throw std::runtime_error("missing table");
+}
 if( pTableNd->GetTable().GetHTMLTableLayout() )
 { // if there is already a HTMTableLayout, this table is already 
finished
   // and we have to look for the right table in the environment
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz]

 icon-themes/breeze/links.txt |4 ++--
 icon-themes/breeze_dark/links.txt|4 ++--
 icon-themes/breeze_svg/links.txt |4 ++--
 icon-themes/elementary/links.txt |4 ++--
 icon-themes/elementary_svg/links.txt |4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 126b910380d13c91938f8b5d5f398fc5390403e4
Author: andreas kainz 
Date:   Tue Dec 12 09:48:38 2017 +0100

Breez and Elementary-icons: fix av02048 for avmedia

Change-Id: Iaeb96f8b1dffaee73230c7d4a4817d1cf0b821a6
Reviewed-on: https://gerrit.libreoffice.org/46282
Tested-by: Jenkins 
Reviewed-by: andreas_kainz 

diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index 5c7a13247d97..fce62a1b8a59 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -1,13 +1,13 @@
 # avmedia
 # ==
-avmedia/res/av02048.png cmd/sc_avmediaplayer.png
+avmedia/res/av02048.png cmd/sc_open.png
 avmedia/res/av02049.png cmd/sc_runbasic.png
 avmedia/res/av02050.png cmd/sc_mediapause.png
 avmedia/res/av02051.png cmd/sc_basicstop.png
 avmedia/res/av02052.png cmd/sc_mediarepeat.png
 avmedia/res/av02053.png cmd/sc_ok.png
 avmedia/res/av02054.png cmd/sc_mediamute.png
-avmedia/res/avl02048.png cmd/lc_avmediaplayer.png
+avmedia/res/avl02048.png cmd/lc_open.png
 avmedia/res/avl02049.png cmd/lc_runbasic.png
 avmedia/res/avl02050.png cmd/lc_mediapause.png
 avmedia/res/avl02051.png cmd/lc_basicstop.png
diff --git a/icon-themes/breeze_dark/links.txt 
b/icon-themes/breeze_dark/links.txt
index 5c7a13247d97..fce62a1b8a59 100644
--- a/icon-themes/breeze_dark/links.txt
+++ b/icon-themes/breeze_dark/links.txt
@@ -1,13 +1,13 @@
 # avmedia
 # ==
-avmedia/res/av02048.png cmd/sc_avmediaplayer.png
+avmedia/res/av02048.png cmd/sc_open.png
 avmedia/res/av02049.png cmd/sc_runbasic.png
 avmedia/res/av02050.png cmd/sc_mediapause.png
 avmedia/res/av02051.png cmd/sc_basicstop.png
 avmedia/res/av02052.png cmd/sc_mediarepeat.png
 avmedia/res/av02053.png cmd/sc_ok.png
 avmedia/res/av02054.png cmd/sc_mediamute.png
-avmedia/res/avl02048.png cmd/lc_avmediaplayer.png
+avmedia/res/avl02048.png cmd/lc_open.png
 avmedia/res/avl02049.png cmd/lc_runbasic.png
 avmedia/res/avl02050.png cmd/lc_mediapause.png
 avmedia/res/avl02051.png cmd/lc_basicstop.png
diff --git a/icon-themes/breeze_svg/links.txt b/icon-themes/breeze_svg/links.txt
index 5c7a13247d97..fce62a1b8a59 100644
--- a/icon-themes/breeze_svg/links.txt
+++ b/icon-themes/breeze_svg/links.txt
@@ -1,13 +1,13 @@
 # avmedia
 # ==
-avmedia/res/av02048.png cmd/sc_avmediaplayer.png
+avmedia/res/av02048.png cmd/sc_open.png
 avmedia/res/av02049.png cmd/sc_runbasic.png
 avmedia/res/av02050.png cmd/sc_mediapause.png
 avmedia/res/av02051.png cmd/sc_basicstop.png
 avmedia/res/av02052.png cmd/sc_mediarepeat.png
 avmedia/res/av02053.png cmd/sc_ok.png
 avmedia/res/av02054.png cmd/sc_mediamute.png
-avmedia/res/avl02048.png cmd/lc_avmediaplayer.png
+avmedia/res/avl02048.png cmd/lc_open.png
 avmedia/res/avl02049.png cmd/lc_runbasic.png
 avmedia/res/avl02050.png cmd/lc_mediapause.png
 avmedia/res/avl02051.png cmd/lc_basicstop.png
diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt
index 37a928ab6d08..da32b7960d83 100644
--- a/icon-themes/elementary/links.txt
+++ b/icon-themes/elementary/links.txt
@@ -1,13 +1,13 @@
 # avmedia
 # ==
-avmedia/res/av02048.png cmd/sc_avmediaplayer.png
+avmedia/res/av02048.png cmd/sc_open.png
 avmedia/res/av02049.png cmd/sc_runbasic.png
 avmedia/res/av02050.png cmd/sc_mediapause.png
 avmedia/res/av02051.png cmd/sc_basicstop.png
 avmedia/res/av02052.png cmd/sc_mediarepeat.png
 avmedia/res/av02053.png cmd/sc_ok.png
 avmedia/res/av02054.png cmd/sc_mediamute.png
-avmedia/res/avl02048.png cmd/lc_avmediaplayer.png
+avmedia/res/avl02048.png cmd/lc_open.png
 avmedia/res/avl02049.png cmd/lc_runbasic.png
 avmedia/res/avl02050.png cmd/lc_mediapause.png
 avmedia/res/avl02051.png cmd/lc_basicstop.png
diff --git a/icon-themes/elementary_svg/links.txt 
b/icon-themes/elementary_svg/links.txt
index ea3e1f51e9a1..75910bf9c08d 100644
--- a/icon-themes/elementary_svg/links.txt
+++ b/icon-themes/elementary_svg/links.txt
@@ -1,13 +1,13 @@
 # avmedia
 # ==
-avmedia/res/av02048.svg cmd/sc_avmediaplayer.svg
+avmedia/res/av02048.svg cmd/sc_open.svg
 avmedia/res/av02049.svg cmd/sc_runbasic.svg
 avmedia/res/av02050.svg cmd/sc_mediapause.svg
 avmedia/res/av02051.svg cmd/sc_basicstop.svg
 avmedia/res/av02052.svg cmd/sc_mediarepeat.svg
 avmedia/res/av02053.svg cmd/sc_ok.svg
 avmedia/res/av02054.svg cmd/sc_mediamute.svg
-avmedia/res/avl02048.svg cmd/lc_avmediaplayer.svg
+avmedia/res/avl02048.svg cmd/lc_open.svg
 avmedia/res/avl02049.svg cmd/lc_runbasic.svg
 avmedia/res/avl02050.svg cmd/lc_mediapause.svg
 avmedia/res/a

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

[Marco Cecchetti]

 sc/sdi/scalc.sdi  |4 +-
 sc/source/ui/view/cellsh3.cxx |   82 +++---
 2 files changed, 56 insertions(+), 30 deletions(-)

New commits:
commit 789c68003818fa1a5cb17d234d80035006c7e585
Author: Marco Cecchetti 
Date:   Tue Dec 12 12:17:32 2017 +0100

lok: calc: get uno:RowHeight/uno:ColumnWidth to work with online 2.1/3.0

This is a follow up patch for back-porting of
6fea94f8c2b31ac9ab7c92ae81b6dc07ffe6dd28

see tdf#107806: Semantic and syntax for .uno:RowHeight have been
changed

This patch support both Width/ColumnWidth and Height/RowHeight
parameters, so that cp-5.3 can work with both online-2.1 and 3.0

Change-Id: I6a421f91460574561581300ab64ec3c6e8fc46fe
Reviewed-on: https://gerrit.libreoffice.org/46294
Reviewed-by: Henry Castro 
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 2f855e4a7d38..544655e5fe4f 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -721,7 +721,7 @@ SfxInt16Item Column SID_RANGE_COL
 
 
 SfxUInt16Item ColumnWidth FID_COL_WIDTH
-(SfxUInt16Item ColumnWidth FID_COL_WIDTH,SfxUInt16Item Column FN_PARAM_1)
+(SfxUInt16Item ColumnWidth FID_COL_WIDTH,SfxUInt16Item Column 
FN_PARAM_1,SfxUInt16Item Width FN_PARAM_2)
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
@@ -4461,7 +4461,7 @@ SfxInt32Item Row SID_RANGE_ROW
 
 
 SfxUInt16Item RowHeight FID_ROW_HEIGHT
-(SfxUInt16Item RowHeight FID_ROW_HEIGHT,SfxInt32Item Row FN_PARAM_1)
+(SfxUInt16Item RowHeight FID_ROW_HEIGHT,SfxInt32Item Row 
FN_PARAM_1,SfxUInt16Item Height FN_PARAM_2)
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 78e47be0f182..a16241225e8b 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -543,24 +543,37 @@ void ScCellShell::Execute( SfxRequest& rReq )
 const SfxPoolItem* pHeight;
 sal_uInt16 nHeight;
 
-if ( pReqArgs && pReqArgs->HasItem( FID_ROW_HEIGHT, &pHeight ) 
&&
- pReqArgs->HasItem( FN_PARAM_1, &pRow ) )
+if ( pReqArgs && pReqArgs->HasItem( FN_PARAM_1, &pRow ) )
 {
-std::vector aRanges;
-SCCOLROW nRow = static_cast(pRow)->GetValue() - 1;
-nHeight = static_cast(pHeight)->GetValue();
-ScMarkData& rMark = GetViewData()->GetMarkData();
+enum { NONE, OLD, NEW } eParamType;
 
-if ( rMark.IsRowMarked( static_cast(nRow) ) )
-{
-aRanges = rMark.GetMarkedRowSpans();
-}
-else
+eParamType = NONE;
+if ( pReqArgs->HasItem( FN_PARAM_2, &pHeight ) )
+eParamType = OLD;
+else if ( pReqArgs->HasItem( FID_ROW_HEIGHT, &pHeight ) )
+eParamType = NEW;
+
+if ( eParamType != NONE )
 {
-aRanges.push_back(sc::ColRowSpan(nRow, nRow));
-}
+std::vector aRanges;
+SCCOLROW nRow = static_cast(pRow)->GetValue() - 1;
+nHeight = static_cast(pHeight)->GetValue();
+ScMarkData& rMark = GetViewData()->GetMarkData();
+
+if ( rMark.IsRowMarked( static_cast(nRow) ) )
+{
+aRanges = rMark.GetMarkedRowSpans();
+}
+else
+{
+aRanges.push_back(sc::ColRowSpan(nRow, nRow));
+}
+
+if ( eParamType == NEW )
+nHeight = HMMToTwips(nHeight);
 
-pTabViewShell->SetWidthOrHeight(false, aRanges, 
SC_SIZE_DIRECT, HMMToTwips(nHeight));
+pTabViewShell->SetWidthOrHeight(false, aRanges, 
SC_SIZE_DIRECT, nHeight);
+}
 }
 else if ( pReqArgs && pReqArgs->HasItem( FID_ROW_HEIGHT, 
&pHeight ) )
 {
@@ -649,24 +662,37 @@ void ScCellShell::Execute( SfxRequest& rReq )
 const SfxPoolItem* pWidth;
 sal_uInt16 nWidth;
 
-if ( pReqArgs && pReqArgs->HasItem( FID_COL_WIDTH, &pWidth ) &&
- pReqArgs->HasItem( FN_PARAM_1, &pColumn ) )
+if ( pReqArgs && pReqArgs->HasItem( FN_PARAM_1, &pColumn ) )
 {
-std::vector aRanges;
-SCCOLROW nColumn = static_cast(pColumn)->GetValue() - 1;
-nWidth = static_cast(pWidth)->GetValue();
-ScMarkData& rMark = GetViewData()->GetMarkData();

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - odk/settings

[Michael Stahl]

 odk/settings/settings.mk |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit 31950120038198908895525cfed35897694b7b8e
Author: Michael Stahl 
Date:   Mon Dec 11 17:26:59 2017 +0100

odk: fix 32-bit Linux build on 64-bit OS

In this situation gcc/g++ will default to x86_64, so pass the "-m32"
flag to produce x86 binaries.

Change-Id: Ie31cd4240e353db606621cb03107ce03a74cfbef
(cherry picked from commit 71d7532f59b6e87729617d6c91bf65f7364ac78a)
Reviewed-on: https://gerrit.libreoffice.org/46260
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index e21d33829ba9..25b31cd68fac 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -358,6 +358,10 @@ ifeq "$(PROCTYPE)" "powerpc"
 CC_FLAGS+=-fPIC
 endif
 
+ifeq "$(PROCTYPE)" "x86"
+CC_FLAGS+=-m32
+endif
+
 SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" 
-I"$(OO_SDK_JAVA_HOME)/include/linux"
 CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
 CC_DEFINES_JNI=-DUNX -DGCC -DLINUX -DCPPU_ENV=$(CPPU_ENV)
@@ -372,9 +376,19 @@ LIBRARY_LINK_FLAGS=-shared -Wl,-z,origin 
'-Wl,-rpath,$$ORIGIN'
 ifeq "$(PROCTYPE)" "powerpc"
 LIBRARY_LINK_FLAGS+=-fPIC
 endif
+
+ifeq "$(PROCTYPE)" "x86"
+LIBRARY_LINK_FLAGS+=-m32
+endif
+
 COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS)
 
 EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs 
-Wl,--no-whole-archive
+
+ifeq "$(PROCTYPE)" "x86"
+EXE_LINK_FLAGS+=-m32
+endif
+
 LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)"
 LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" 
-L"$(OO_SDK_JAVA_HOME)/lib"
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Association between ToC index object and its paragraph content

[Jens Tröger]

Michael, I the case you describe would I not see the same UNO object address 
for the same paragraph in the document? But iterating over the ToC’s paragraphs 
as described previously in this thread, I get for the index view:

pyuno object 
(com.sun.star.text.XTextContent)0x7feddb8d2638{implementationName=SwXParagraph, 
… }

and then for the global document view:

pyuno object 
(com.sun.star.text.XTextContent)0x7fedd9f5f598{implementationName=SwXParagraph, 
… }

for the same first entry paragraph in the ToC. In fact, if I instantiate the 
ToC’s text range three times, then I get three different objects for the first 
paragraph:

pyuno object (com.sun.star.text.XTextContent)0x7fc6b1d41188
pyuno object (com.sun.star.text.XTextContent)0x7fc6b1e66968
pyuno object (com.sun.star.text.XTextContent)0x7fc6b430e288

Do paragraphs have another unique identifier that associates these different 
instances as objects representing the same document paragraph?

Jens


> On Dec 12, 2017, at 22:27, Michael Stahl  wrote:
> actually you can, because the SwXParagraph instance is cached, so if
> such an object already exists at the time when a new one is to be
> created the existing one is reused.
> 
> in C++ you can compare that via just 2 css::uno::Reference<...> and
> operator==, not sure how other UNO language bindings compare the object
> identity, but it should be possible.
> 
> the only exception to this is if there is a paragraph enumeration that
> partially selects a paragraph - those are never cached.
> 
> (also, not every UNO document  model service in Writer implements such
> caching.)

--
Jens Tröger
http://savage.light-speed.de/

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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - helpcontent2

[Gabor Kelemen]

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

New commits:
commit 3d4d6623a3545a33b0ba416cea9005b2c01e3e17
Author: Gabor Kelemen 
Date:   Tue Dec 12 00:22:02 2017 +0100

Updated core
Project: help  5cce73dd589d3b2e8818228c95db28c29bad1f2f

Fix extended help in Table Wizard of Base

Add missing HIDs and fix a broken one

Change-Id: I4478cdd2e10bf994509c828444701c5875bc3125
Reviewed-on: https://gerrit.libreoffice.org/46269
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 
(cherry picked from commit ed6eecfc6f33cb7cbd33996dcd2d0f07f6e04405)
Reviewed-on: https://gerrit.libreoffice.org/46299

diff --git a/helpcontent2 b/helpcontent2
index f7c555e40d97..5cce73dd589d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f7c555e40d979db2916a9e22be5b1782967904f3
+Subproject commit 5cce73dd589d3b2e8818228c95db28c29bad1f2f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Gabor Kelemen]

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

New commits:
commit ff7cf9afb9eb3785a38e84658b28aed87f11a92b
Author: Gabor Kelemen 
Date:   Tue Dec 12 00:22:02 2017 +0100

Updated core
Project: help  ed6eecfc6f33cb7cbd33996dcd2d0f07f6e04405

Fix extended help in Table Wizard of Base

Add missing HIDs and fix a broken one

Change-Id: I4478cdd2e10bf994509c828444701c5875bc3125
Reviewed-on: https://gerrit.libreoffice.org/46269
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/helpcontent2 b/helpcontent2
index 83d2ccb8248f..ed6eecfc6f33 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 83d2ccb8248fbe24ccb0206b60d6f15c439f07f6
+Subproject commit ed6eecfc6f33cb7cbd33996dcd2d0f07f6e04405
___
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' - helpcontent2

[Gabor Kelemen]

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

New commits:
commit af47d4c7cf31ca2ce73d8f6776085acb35e7530e
Author: Gabor Kelemen 
Date:   Mon Dec 11 00:01:22 2017 +0100

Updated core
Project: help  f7c555e40d979db2916a9e22be5b1782967904f3

Remove unnecessary page from Gallery context menus explanation

The confirmation window is a simple Yes/No now, no need to keep
a whole page for this.

Change-Id: I182d4937d049ae62e0b62180ed94115369aea2c7
Reviewed-on: https://gerrit.libreoffice.org/46268
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 
(cherry picked from commit 83d2ccb8248fbe24ccb0206b60d6f15c439f07f6)
Reviewed-on: https://gerrit.libreoffice.org/46298

diff --git a/helpcontent2 b/helpcontent2
index e0eed8146dd9..f7c555e40d97 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e0eed8146dd91534623b315e4066f344a6626dbb
+Subproject commit f7c555e40d979db2916a9e22be5b1782967904f3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen]

 source/text/shared/autopi/01090100.xhp |4 
 source/text/shared/explorer/database/tablewizard02.xhp |4 
 source/text/shared/explorer/database/tablewizard03.xhp |2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit ed6eecfc6f33cb7cbd33996dcd2d0f07f6e04405
Author: Gabor Kelemen 
Date:   Tue Dec 12 00:22:02 2017 +0100

Fix extended help in Table Wizard of Base

Add missing HIDs and fix a broken one

Change-Id: I4478cdd2e10bf994509c828444701c5875bc3125
Reviewed-on: https://gerrit.libreoffice.org/46269
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 

diff --git a/source/text/shared/autopi/01090100.xhp 
b/source/text/shared/autopi/01090100.xhp
index 9b8d6ce9f..fdf5c130a 100644
--- a/source/text/shared/autopi/01090100.xhp
+++ b/source/text/shared/autopi/01090100.xhp
@@ -52,6 +52,7 @@
 
 
 
+
 
 
 
@@ -81,6 +82,7 @@
 
 
 
+
 
 
 <<
@@ -90,6 +92,7 @@
 
 
 
+
 
 
 
@@ -100,6 +103,7 @@
 
 
 
+
 
 
 
diff --git a/source/text/shared/explorer/database/tablewizard02.xhp 
b/source/text/shared/explorer/database/tablewizard02.xhp
index 1d394ae8e..f6f149f72 100644
--- a/source/text/shared/explorer/database/tablewizard02.xhp
+++ b/source/text/shared/explorer/database/tablewizard02.xhp
@@ -43,16 +43,20 @@
 Field 
information
 Field name
 Displays the name of the selected data field. If you want, you can 
enter a new name.
+
 Field 
type
 Select a field type.
 AutoValue
 If set to Yes, the values for this data field are generated by the 
database engine.
 Entry required
 If set to Yes, this field must not be empty.not in 
spec doc
+
 Length
 Specifies the number of characters for the data 
field.
+
 Decimal 
places
 Specifies the number of decimal places for the data field. This option 
is only available for numerical or decimal data fields.
+
 Default 
value
 Specifies the default value for a Yes/No field.
 Auto-increment 
statement
diff --git a/source/text/shared/explorer/database/tablewizard03.xhp 
b/source/text/shared/explorer/database/tablewizard03.xhp
index d09aa8e2f..68597bcf0 100644
--- a/source/text/shared/explorer/database/tablewizard03.xhp
+++ b/source/text/shared/explorer/database/tablewizard03.xhp
@@ -60,7 +60,7 @@
 Select a field and click > to add it to the list of primary key 
fields.
 
 
-
+
 Primary 
key fields
 Select a field and click < to remove it from the list of primary key 
fields. The primary key is created as a concatenation of the fields in this 
list, from top to bottom.
 Table Wizard - Create table
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-6-0' - 2 commits - AllLangHelp_shared.mk source/text

[Gabor Kelemen]

 AllLangHelp_shared.mk  |1 
 source/text/shared/00/0010.xhp |2 
 source/text/shared/01/03150100.xhp |   46 -
 source/text/shared/autopi/01090100.xhp |4 +
 source/text/shared/explorer/database/tablewizard02.xhp |4 +
 source/text/shared/explorer/database/tablewizard03.xhp |2 
 6 files changed, 10 insertions(+), 49 deletions(-)

New commits:
commit 5cce73dd589d3b2e8818228c95db28c29bad1f2f
Author: Gabor Kelemen 
Date:   Tue Dec 12 00:22:02 2017 +0100

Fix extended help in Table Wizard of Base

Add missing HIDs and fix a broken one

Change-Id: I4478cdd2e10bf994509c828444701c5875bc3125
Reviewed-on: https://gerrit.libreoffice.org/46269
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 
(cherry picked from commit ed6eecfc6f33cb7cbd33996dcd2d0f07f6e04405)
Reviewed-on: https://gerrit.libreoffice.org/46299

diff --git a/source/text/shared/autopi/01090100.xhp 
b/source/text/shared/autopi/01090100.xhp
index 9b8d6ce9f..fdf5c130a 100644
--- a/source/text/shared/autopi/01090100.xhp
+++ b/source/text/shared/autopi/01090100.xhp
@@ -52,6 +52,7 @@
 
 
 
+
 
 
 
@@ -81,6 +82,7 @@
 
 
 
+
 
 
 <<
@@ -90,6 +92,7 @@
 
 
 
+
 
 
 
@@ -100,6 +103,7 @@
 
 
 
+
 
 
 
diff --git a/source/text/shared/explorer/database/tablewizard02.xhp 
b/source/text/shared/explorer/database/tablewizard02.xhp
index 1d394ae8e..f6f149f72 100644
--- a/source/text/shared/explorer/database/tablewizard02.xhp
+++ b/source/text/shared/explorer/database/tablewizard02.xhp
@@ -43,16 +43,20 @@
 Field 
information
 Field name
 Displays the name of the selected data field. If you want, you can 
enter a new name.
+
 Field 
type
 Select a field type.
 AutoValue
 If set to Yes, the values for this data field are generated by the 
database engine.
 Entry required
 If set to Yes, this field must not be empty.not in 
spec doc
+
 Length
 Specifies the number of characters for the data 
field.
+
 Decimal 
places
 Specifies the number of decimal places for the data field. This option 
is only available for numerical or decimal data fields.
+
 Default 
value
 Specifies the default value for a Yes/No field.
 Auto-increment 
statement
diff --git a/source/text/shared/explorer/database/tablewizard03.xhp 
b/source/text/shared/explorer/database/tablewizard03.xhp
index d09aa8e2f..68597bcf0 100644
--- a/source/text/shared/explorer/database/tablewizard03.xhp
+++ b/source/text/shared/explorer/database/tablewizard03.xhp
@@ -60,7 +60,7 @@
 Select a field and click > to add it to the list of primary key 
fields.
 
 
-
+
 Primary 
key fields
 Select a field and click < to remove it from the list of primary key 
fields. The primary key is created as a concatenation of the fields in this 
list, from top to bottom.
 Table Wizard - Create table
commit f7c555e40d979db2916a9e22be5b1782967904f3
Author: Gabor Kelemen 
Date:   Mon Dec 11 00:01:22 2017 +0100

Remove unnecessary page from Gallery context menus explanation

The confirmation window is a simple Yes/No now, no need to keep
a whole page for this.

Change-Id: I182d4937d049ae62e0b62180ed94115369aea2c7
Reviewed-on: https://gerrit.libreoffice.org/46268
Reviewed-by: Gabor Kelemen 
Tested-by: Gabor Kelemen 
(cherry picked from commit 83d2ccb8248fbe24ccb0206b60d6f15c439f07f6)
Reviewed-on: https://gerrit.libreoffice.org/46298

diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index fe7a85d80..e1b0bfdca 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -142,7 +142,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 helpcontent2/source/text/shared/01/0305 \
 helpcontent2/source/text/shared/01/0306 \
 helpcontent2/source/text/shared/01/0311 \
-helpcontent2/source/text/shared/01/03150100 \
 helpcontent2/source/text/shared/01/0317 \
 helpcontent2/source/text/shared/01/0399 \
 helpcontent2/source/text/shared/01/0405 \
diff --git a/source/text/shared/00/0010.xhp 
b/source/text/shared/00/0010.xhp
index 1d13d1e6d..0e3e59413 100644
--- a/source/text/shared/00/0010.xhp
+++ b/source/text/shared/00/0010.xhp
@@ -53,7 +53,7 @@
   
   
   Delete
-  Deletes the current 
selection. If multiple objects are selected, all will be deleted. In most 
cases, a security query appears before objects are 
deleted.
+  Deletes the current 
selection. If multiple objects are selected, all will be deleted. In most 
cases, a confirmation question appears before objects are 
deleted.
   The object 
is either physically deleted from the data carrier or the object display is 
removed, depending on context.
   
   
diff --git a/source/text/shared/01/03150100.xhp 
b/source/text/shared/01/03150100.xhp
deleted file mode 100644
index 241ca35ff..0
--- a/source/text/shared/01/03150100.xhp
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
-
-Confirm Delete
-/text/shared/01/03150

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - desktop/qa include/LibreOfficeKit

[Jan Holesovsky]

 desktop/qa/desktop_lib/test_desktop_lib.cxx |   64 
 include/LibreOfficeKit/LibreOfficeKit.h |6 +-
 2 files changed, 67 insertions(+), 3 deletions(-)

New commits:
commit fb956dccc281f594295d6952aed870e55edc7659
Author: Jan Holesovsky 
Date:   Mon Dec 11 22:46:43 2017 +0100

Fix binary incompatible change in the LOK API + add unit test.

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

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index a387f4ea1d05..fb801879d370 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -116,6 +116,7 @@ public:
 void testCommentsCallbacksWriter();
 void testRunMacro();
 void testExtractParameter();
+void testABI();
 
 CPPUNIT_TEST_SUITE(DesktopLOKTest);
 CPPUNIT_TEST(testGetStyles);
@@ -156,6 +157,7 @@ public:
 CPPUNIT_TEST(testCommentsCallbacksWriter);
 CPPUNIT_TEST(testRunMacro);
 CPPUNIT_TEST(testExtractParameter);
+CPPUNIT_TEST(testABI);
 CPPUNIT_TEST_SUITE_END();
 
 uno::Reference mxComponent;
@@ -2150,6 +2152,68 @@ void DesktopLOKTest::testExtractParameter()
 CPPUNIT_ASSERT_EQUAL(OUString("Something1,Something2=blah,Something3"), 
aOptions);
 }
 
+namespace {
+
+size_t documentClassOffset(int i)
+{
+return sizeof(static_cast(nullptr)->nSize) + i * sizeof(void*);
+}
+
+}
+
+void DesktopLOKTest::testABI()
+{
+// STABLE ABI, NEVER CHANGE (unless there's a very good reason, agreed by 
ESC, etc.)
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(0), offsetof(struct 
_LibreOfficeKitDocumentClass, destroy));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(1), offsetof(struct 
_LibreOfficeKitDocumentClass, saveAs));
+
+// Unstable ABI, but still think twice before changing this
+// Eg. can't you add your new member at the end of the struct instead of
+// in the middle?  The thing you are changing - is it already part of some
+// release?
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(2), offsetof(struct 
_LibreOfficeKitDocumentClass, getDocumentType));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(3), offsetof(struct 
_LibreOfficeKitDocumentClass, getParts));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(4), offsetof(struct 
_LibreOfficeKitDocumentClass, getPartPageRectangles));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(5), offsetof(struct 
_LibreOfficeKitDocumentClass, getPart));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(6), offsetof(struct 
_LibreOfficeKitDocumentClass, setPart));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(7), offsetof(struct 
_LibreOfficeKitDocumentClass, getPartName));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(8), offsetof(struct 
_LibreOfficeKitDocumentClass, setPartMode));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(9), offsetof(struct 
_LibreOfficeKitDocumentClass, paintTile));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(10), offsetof(struct 
_LibreOfficeKitDocumentClass, getTileMode));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(11), offsetof(struct 
_LibreOfficeKitDocumentClass, getDocumentSize));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(12), offsetof(struct 
_LibreOfficeKitDocumentClass, initializeForRendering));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(13), offsetof(struct 
_LibreOfficeKitDocumentClass, registerCallback));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(14), offsetof(struct 
_LibreOfficeKitDocumentClass, postKeyEvent));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(15), offsetof(struct 
_LibreOfficeKitDocumentClass, postMouseEvent));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(16), offsetof(struct 
_LibreOfficeKitDocumentClass, postUnoCommand));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(17), offsetof(struct 
_LibreOfficeKitDocumentClass, setTextSelection));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(18), offsetof(struct 
_LibreOfficeKitDocumentClass, getTextSelection));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(19), offsetof(struct 
_LibreOfficeKitDocumentClass, paste));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(20), offsetof(struct 
_LibreOfficeKitDocumentClass, setGraphicSelection));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(21), offsetof(struct 
_LibreOfficeKitDocumentClass, resetSelection));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(22), offsetof(struct 
_LibreOfficeKitDocumentClass, getCommandValues));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(23), offsetof(struct 
_LibreOfficeKitDocumentClass, setClientZoom));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(24), offsetof(struct 
_LibreOfficeKitDocumentClass, setClientVisibleArea));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(25), offsetof(struct 
_LibreOfficeKitDocumentClass, createView));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(26), offsetof(struct 
_LibreOfficeKit

[Libreoffice-commits] core.git: desktop/qa include/LibreOfficeKit

[Jan Holesovsky]

 desktop/qa/desktop_lib/test_desktop_lib.cxx |   64 
 include/LibreOfficeKit/LibreOfficeKit.h |6 +-
 2 files changed, 67 insertions(+), 3 deletions(-)

New commits:
commit dcba1752892cb22e3f4b63e7d648931f7cb5f89b
Author: Jan Holesovsky 
Date:   Mon Dec 11 22:46:43 2017 +0100

Fix binary incompatible change in the LOK API + add unit test.

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

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 81a9f11e7eb5..71bd1af0adaf 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -116,6 +116,7 @@ public:
 void testCommentsCallbacksWriter();
 void testRunMacro();
 void testExtractParameter();
+void testABI();
 
 CPPUNIT_TEST_SUITE(DesktopLOKTest);
 CPPUNIT_TEST(testGetStyles);
@@ -158,6 +159,7 @@ public:
 CPPUNIT_TEST(testCommentsCallbacksWriter);
 CPPUNIT_TEST(testRunMacro);
 CPPUNIT_TEST(testExtractParameter);
+CPPUNIT_TEST(testABI);
 CPPUNIT_TEST_SUITE_END();
 
 uno::Reference mxComponent;
@@ -2230,6 +2232,68 @@ void DesktopLOKTest::testExtractParameter()
 comphelper::LibreOfficeKit::setActive(false);
 }
 
+namespace {
+
+size_t documentClassOffset(int i)
+{
+return sizeof(static_cast(nullptr)->nSize) + i * sizeof(void*);
+}
+
+}
+
+void DesktopLOKTest::testABI()
+{
+// STABLE ABI, NEVER CHANGE (unless there's a very good reason, agreed by 
ESC, etc.)
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(0), offsetof(struct 
_LibreOfficeKitDocumentClass, destroy));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(1), offsetof(struct 
_LibreOfficeKitDocumentClass, saveAs));
+
+// Unstable ABI, but still think twice before changing this
+// Eg. can't you add your new member at the end of the struct instead of
+// in the middle?  The thing you are changing - is it already part of some
+// release?
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(2), offsetof(struct 
_LibreOfficeKitDocumentClass, getDocumentType));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(3), offsetof(struct 
_LibreOfficeKitDocumentClass, getParts));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(4), offsetof(struct 
_LibreOfficeKitDocumentClass, getPartPageRectangles));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(5), offsetof(struct 
_LibreOfficeKitDocumentClass, getPart));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(6), offsetof(struct 
_LibreOfficeKitDocumentClass, setPart));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(7), offsetof(struct 
_LibreOfficeKitDocumentClass, getPartName));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(8), offsetof(struct 
_LibreOfficeKitDocumentClass, setPartMode));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(9), offsetof(struct 
_LibreOfficeKitDocumentClass, paintTile));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(10), offsetof(struct 
_LibreOfficeKitDocumentClass, getTileMode));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(11), offsetof(struct 
_LibreOfficeKitDocumentClass, getDocumentSize));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(12), offsetof(struct 
_LibreOfficeKitDocumentClass, initializeForRendering));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(13), offsetof(struct 
_LibreOfficeKitDocumentClass, registerCallback));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(14), offsetof(struct 
_LibreOfficeKitDocumentClass, postKeyEvent));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(15), offsetof(struct 
_LibreOfficeKitDocumentClass, postMouseEvent));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(16), offsetof(struct 
_LibreOfficeKitDocumentClass, postUnoCommand));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(17), offsetof(struct 
_LibreOfficeKitDocumentClass, setTextSelection));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(18), offsetof(struct 
_LibreOfficeKitDocumentClass, getTextSelection));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(19), offsetof(struct 
_LibreOfficeKitDocumentClass, paste));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(20), offsetof(struct 
_LibreOfficeKitDocumentClass, setGraphicSelection));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(21), offsetof(struct 
_LibreOfficeKitDocumentClass, resetSelection));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(22), offsetof(struct 
_LibreOfficeKitDocumentClass, getCommandValues));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(23), offsetof(struct 
_LibreOfficeKitDocumentClass, setClientZoom));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(24), offsetof(struct 
_LibreOfficeKitDocumentClass, setClientVisibleArea));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(25), offsetof(struct 
_LibreOfficeKitDocumentClass, createView));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(26), offsetof(struct 
_LibreOfficeKitDocumentClass,