[Libreoffice-commits] help.git: Branch 'libreoffice-5-3' - source/text

[Gabor Kelemen]

 source/text/scalc/00/0404.xhp  |2 +-
 source/text/scalc/guide/cellreferences_url.xhp |4 ++--
 source/text/scalc/guide/webquery.xhp   |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2f2dfd4f23e1161b9d4b6585dcf1f8ee58e24dc5
Author: Gabor Kelemen 
Date:   Fri Nov 25 09:33:45 2016 +0100

tdf#103968 'Link to External Data' is now in the Sheet menu

Change-Id: If8b69923ff8e6e9ed2ab03c72330665c6ef788d5
Reviewed-on: https://gerrit.libreoffice.org/31189
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit 565f827138ee50a0754de1e0c9d9d16feb28076f)
Reviewed-on: https://gerrit.libreoffice.org/31260
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/source/text/scalc/00/0404.xhp 
b/source/text/scalc/00/0404.xhp
index 17d0ca9..c8e3cce 100644
--- a/source/text/scalc/00/0404.xhp
+++ b/source/text/scalc/00/0404.xhp
@@ -166,7 +166,7 @@
 
 Choose Insert - Names
 
-Choose Insert - Link to External 
data
+Choose Sheet - Link to External 
Data
 
 
 Choose Insert - Names - Define
diff --git a/source/text/scalc/guide/cellreferences_url.xhp 
b/source/text/scalc/guide/cellreferences_url.xhp
index ea86b3d..f34d34d 100644
--- a/source/text/scalc/guide/cellreferences_url.xhp
+++ b/source/text/scalc/guide/cellreferences_url.xhp
@@ -41,7 +41,7 @@ oldref="15">In a $[officename] Calc document, position the cursor in the cell 
into which you want to insert the external data.
 
 
-Choose Insert - Link to External Data. 
The External Data dialog appears.
+Choose Sheet - Link to External Data. 
The External Data dialog appears.
 
 
 Enter the URL of the document or Web page in the dialog. The URL 
must be in the format: http://www.my-bank.com/table.html. The URL for local or 
local area network files is the path seen in the File - 
Open dialog.
@@ -63,4 +63,4 @@ oldref="15">
 
 
-
\ No newline at end of file
+
diff --git a/source/text/scalc/guide/webquery.xhp 
b/source/text/scalc/guide/webquery.xhp
index 6fa3a43..65d7962 100644
--- a/source/text/scalc/guide/webquery.xhp
+++ b/source/text/scalc/guide/webquery.xhp
@@ -49,7 +49,7 @@
 Set the cell cursor at the cell where the new content will be 
inserted.
 
 
-Choose Insert - Link to External Data. This opens the 
External Data dialog.
+Choose Sheet - Link to External Data. This opens the 
External Data dialog.
 
 
 Enter the URL 
of the HTML document or the name of the spreadsheet. Press Enter when finished. 
Click the Browse button to open a file selection 
dialog.only after Enter the URL will be requested from the 
net.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - helpcontent2

[Gabor Kelemen]

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

New commits:
commit 60a596b48d670828c8c71658e45de7296a1848c6
Author: Gabor Kelemen 
Date:   Fri Nov 25 09:33:45 2016 +0100

Updated core
Project: help  2f2dfd4f23e1161b9d4b6585dcf1f8ee58e24dc5

tdf#103968 'Link to External Data' is now in the Sheet menu

Change-Id: If8b69923ff8e6e9ed2ab03c72330665c6ef788d5
Reviewed-on: https://gerrit.libreoffice.org/31189
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit 565f827138ee50a0754de1e0c9d9d16feb28076f)
Reviewed-on: https://gerrit.libreoffice.org/31260
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 8e04cdb..2f2dfd4 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8e04cdb5fd59a3f721597db6ac4c8092d80f70cc
+Subproject commit 2f2dfd4f23e1161b9d4b6585dcf1f8ee58e24dc5
___
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.1' - include/LibreOfficeKit

[Ashod Nakashian]

 include/LibreOfficeKit/LibreOfficeKitEnums.h |   64 +--
 1 file changed, 32 insertions(+), 32 deletions(-)

New commits:
commit 7273349b88c4e12b64c96a57d1bc15a6b4a00eab
Author: Ashod Nakashian 
Date:   Sat Nov 26 21:12:58 2016 -0500

Lok: number callback enum for easier debugging

Since the entries and their order are part of the
public API, and will not change, numbering them
makes it easier to trap particular callbacks by
their number (as that's what shows in logs and
the debugger).

Change-Id: Ife2fe3e601ce3dce0939363d748fcb54d3c85fd4
Reviewed-on: https://gerrit.libreoffice.org/31257
Tested-by: Jenkins 
Reviewed-by: Ashod Nakashian 
(cherry picked from commit 719f7cb94ce783349fb1cf366a78edd9996d3e37)
Reviewed-on: https://gerrit.libreoffice.org/31259
Tested-by: Ashod Nakashian 

diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 41b0eaf..a54fbb6 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -93,13 +93,13 @@ typedef enum
  *
  * @see LOK_FEATURE_PART_IN_INVALIDATION_CALLBACK.
  */
-LOK_CALLBACK_INVALIDATE_TILES,
+LOK_CALLBACK_INVALIDATE_TILES = 0,
 /**
  * The size and/or the position of the visible cursor changed.
  *
  * Rectangle format is the same as LOK_CALLBACK_INVALIDATE_TILES.
  */
-LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR,
+LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR = 1,
 /**
  * The list of rectangles representing the current text selection changed.
  *
@@ -108,7 +108,7 @@ typedef enum
  * LOK_CALLBACK_INVALIDATE_TILES. When there is no selection, an empty
  * string is provided.
  */
-LOK_CALLBACK_TEXT_SELECTION,
+LOK_CALLBACK_TEXT_SELECTION = 2,
 /**
  * The position and size of the cursor rectangle at the text
  * selection start. It is used to draw the selection handles.
@@ -118,7 +118,7 @@ typedef enum
  *
  * Rectangle format is the same as LOK_CALLBACK_INVALIDATE_TILES.
  */
-LOK_CALLBACK_TEXT_SELECTION_START,
+LOK_CALLBACK_TEXT_SELECTION_START = 3,
 /**
  * The position and size of the cursor rectangle at the text
  * selection end. It is used to draw the selection handles.
@@ -128,7 +128,7 @@ typedef enum
  *
  * Rectangle format is the same as LOK_CALLBACK_INVALIDATE_TILES.
  */
-LOK_CALLBACK_TEXT_SELECTION_END,
+LOK_CALLBACK_TEXT_SELECTION_END = 4,
 /**
  * The blinking text cursor is now visible or not.
  *
@@ -137,26 +137,26 @@ typedef enum
  * LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR once it becomes false. Payload is
  * either the "true" or the "false" string.
  */
-LOK_CALLBACK_CURSOR_VISIBLE,
+LOK_CALLBACK_CURSOR_VISIBLE = 5,
 /**
  * The size and/or the position of the graphic selection changed.
  *
  * Rectangle format is the same as LOK_CALLBACK_INVALIDATE_TILES.
  */
-LOK_CALLBACK_GRAPHIC_SELECTION,
+LOK_CALLBACK_GRAPHIC_SELECTION = 6,
 
 /**
  * User clicked on an hyperlink that should be handled by other
  * applications accordingly.
  */
-LOK_CALLBACK_HYPERLINK_CLICKED,
+LOK_CALLBACK_HYPERLINK_CLICKED = 7,
 
 /**
  * Emit state update to the client.
  * For example, when cursor is on bold text, this callback is triggered
  * with payload: ".uno:Bold=true"
  */
-LOK_CALLBACK_STATE_CHANGED,
+LOK_CALLBACK_STATE_CHANGED = 8,
 
 /**
  * Start a "status indicator" (here restricted to a progress bar type
@@ -172,25 +172,25 @@ typedef enum
  * loading a document and then constructing a LibreOfficeKitDocument
  * object.
  */
-LOK_CALLBACK_STATUS_INDICATOR_START,
+LOK_CALLBACK_STATUS_INDICATOR_START = 9,
 
 /**
  * Sets the numeric value of the status indicator.
  * The payload should be a percentage, an integer between 0 and 100.
  */
-LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE,
+LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE = 10,
 
 /**
  * Ends the status indicator.
  *
  * Not necessarily ever emitted.
  */
-LOK_CALLBACK_STATUS_INDICATOR_FINISH,
+LOK_CALLBACK_STATUS_INDICATOR_FINISH = 11,
 
 /**
  * No match was found for the search input
  */
-LOK_CALLBACK_SEARCH_NOT_FOUND,
+LOK_CALLBACK_SEARCH_NOT_FOUND = 12,
 
 /**
  * Size of the document changed.
@@ -198,14 +198,14 @@ typedef enum
  * Payload format is "width, height", i.e. clients get the new size without
  * having to do an explicit lok::Document::getDocumentSize() call.
  */
-LOK_CALLBACK_DOCUMENT_SIZE_CHANGED,
+LOK_CALLBACK_DOCUMENT_SIZE_CHANGED = 13,
 
 /**
  * The current part number is changed.
  *
  * Payload is a single 0-based integer.
  */
-LOK_CALLBACK_SET_PART,
+LOK_CALLBACK_SET_PART = 14,
 
 /**
  * Selec

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

[Ashod Nakashian]

 include/LibreOfficeKit/LibreOfficeKitEnums.h |   64 +--
 1 file changed, 32 insertions(+), 32 deletions(-)

New commits:
commit 719f7cb94ce783349fb1cf366a78edd9996d3e37
Author: Ashod Nakashian 
Date:   Sat Nov 26 21:12:58 2016 -0500

Lok: number callback enum for easier debugging

Since the entries and their order are part of the
public API, and will not change, numbering them
makes it easier to trap particular callbacks by
their number (as that's what shows in logs and
the debugger).

Change-Id: Ife2fe3e601ce3dce0939363d748fcb54d3c85fd4
Reviewed-on: https://gerrit.libreoffice.org/31257
Tested-by: Jenkins 
Reviewed-by: Ashod Nakashian 

diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h 
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 187fa98..d2ccc0f 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -93,13 +93,13 @@ typedef enum
  *
  * @see LOK_FEATURE_PART_IN_INVALIDATION_CALLBACK.
  */
-LOK_CALLBACK_INVALIDATE_TILES,
+LOK_CALLBACK_INVALIDATE_TILES = 0,
 /**
  * The size and/or the position of the visible cursor changed.
  *
  * Rectangle format is the same as LOK_CALLBACK_INVALIDATE_TILES.
  */
-LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR,
+LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR = 1,
 /**
  * The list of rectangles representing the current text selection changed.
  *
@@ -108,7 +108,7 @@ typedef enum
  * LOK_CALLBACK_INVALIDATE_TILES. When there is no selection, an empty
  * string is provided.
  */
-LOK_CALLBACK_TEXT_SELECTION,
+LOK_CALLBACK_TEXT_SELECTION = 2,
 /**
  * The position and size of the cursor rectangle at the text
  * selection start. It is used to draw the selection handles.
@@ -118,7 +118,7 @@ typedef enum
  *
  * Rectangle format is the same as LOK_CALLBACK_INVALIDATE_TILES.
  */
-LOK_CALLBACK_TEXT_SELECTION_START,
+LOK_CALLBACK_TEXT_SELECTION_START = 3,
 /**
  * The position and size of the cursor rectangle at the text
  * selection end. It is used to draw the selection handles.
@@ -128,7 +128,7 @@ typedef enum
  *
  * Rectangle format is the same as LOK_CALLBACK_INVALIDATE_TILES.
  */
-LOK_CALLBACK_TEXT_SELECTION_END,
+LOK_CALLBACK_TEXT_SELECTION_END = 4,
 /**
  * The blinking text cursor is now visible or not.
  *
@@ -137,26 +137,26 @@ typedef enum
  * LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR once it becomes false. Payload is
  * either the "true" or the "false" string.
  */
-LOK_CALLBACK_CURSOR_VISIBLE,
+LOK_CALLBACK_CURSOR_VISIBLE = 5,
 /**
  * The size and/or the position of the graphic selection changed.
  *
  * Rectangle format is the same as LOK_CALLBACK_INVALIDATE_TILES.
  */
-LOK_CALLBACK_GRAPHIC_SELECTION,
+LOK_CALLBACK_GRAPHIC_SELECTION = 6,
 
 /**
  * User clicked on an hyperlink that should be handled by other
  * applications accordingly.
  */
-LOK_CALLBACK_HYPERLINK_CLICKED,
+LOK_CALLBACK_HYPERLINK_CLICKED = 7,
 
 /**
  * Emit state update to the client.
  * For example, when cursor is on bold text, this callback is triggered
  * with payload: ".uno:Bold=true"
  */
-LOK_CALLBACK_STATE_CHANGED,
+LOK_CALLBACK_STATE_CHANGED = 8,
 
 /**
  * Start a "status indicator" (here restricted to a progress bar type
@@ -172,25 +172,25 @@ typedef enum
  * loading a document and then constructing a LibreOfficeKitDocument
  * object.
  */
-LOK_CALLBACK_STATUS_INDICATOR_START,
+LOK_CALLBACK_STATUS_INDICATOR_START = 9,
 
 /**
  * Sets the numeric value of the status indicator.
  * The payload should be a percentage, an integer between 0 and 100.
  */
-LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE,
+LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE = 10,
 
 /**
  * Ends the status indicator.
  *
  * Not necessarily ever emitted.
  */
-LOK_CALLBACK_STATUS_INDICATOR_FINISH,
+LOK_CALLBACK_STATUS_INDICATOR_FINISH = 11,
 
 /**
  * No match was found for the search input
  */
-LOK_CALLBACK_SEARCH_NOT_FOUND,
+LOK_CALLBACK_SEARCH_NOT_FOUND = 12,
 
 /**
  * Size of the document changed.
@@ -198,14 +198,14 @@ typedef enum
  * Payload format is "width, height", i.e. clients get the new size without
  * having to do an explicit lok::Document::getDocumentSize() call.
  */
-LOK_CALLBACK_DOCUMENT_SIZE_CHANGED,
+LOK_CALLBACK_DOCUMENT_SIZE_CHANGED = 13,
 
 /**
  * The current part number is changed.
  *
  * Payload is a single 0-based integer.
  */
-LOK_CALLBACK_SET_PART,
+LOK_CALLBACK_SET_PART = 14,
 
 /**
  * Selection rectangles of the search result when find all is performed.
@@ -231,7 +231,7 @@ typedef enum
  * - searchResultSelection is an array of part-number an

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - oox/source sd/qa

[Mark Hung]

 oox/source/export/shapes.cxx   |8 +---
 sd/qa/unit/export-tests-ooxml2.cxx |2 --
 2 files changed, 1 insertion(+), 9 deletions(-)

New commits:
commit 308a00e1dc1799b33bfc26bd8e0ec2797128b671
Author: Mark Hung 
Date:   Wed Nov 23 20:23:37 2016 +0800

tdf#96052 - export the forbidden shape as path instead of preset shape.

OOXML noSmoking shape has different definition so that convert LO's
forbidden shape to OOXML noSmoking do not produce good result.
I put it on whitelist and now the geometry looks correct although handle
is lost.

This partially revert unit test for the shape in
2b4f9d0b2b0006fc7bebb9e696a32eabd1aeb993, where forbidden is exported as
a preset shape.

Change-Id: I2e134940fa4a36e6b7b814b008d859691fbcdd6a
Reviewed-on: https://gerrit.libreoffice.org/31110
Tested-by: Jenkins 
Reviewed-by: Mark Hung 
(cherry picked from commit b6f52c5c6bc57d831e09126f802739589e5eea37)
Reviewed-on: https://gerrit.libreoffice.org/31226

diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 820cb4c..7bd85a8 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -547,7 +547,6 @@ static bool lcl_IsOnBlacklist(OUString& rShapeType)
 OUStringLiteral("smiley"),
 OUStringLiteral("sun"),
 OUStringLiteral("flower"),
-OUStringLiteral("forbidden"),
 OUStringLiteral("bracket-pair"),
 OUStringLiteral("brace-pair"),
 OUStringLiteral("col-60da8460"),
@@ -606,6 +605,7 @@ static bool lcl_IsOnWhitelist(OUString& rShapeType)
 static
 #endif
 const std::initializer_list vWhitelist = {
+OUStringLiteral("forbidden"),
 OUStringLiteral("heart"),
 OUStringLiteral("puzzle")
 };
@@ -918,12 +918,6 @@ ShapeExport& ShapeExport::WriteCustomShape( const 
Reference< XShape >& xShape )
 lcl_AppendAdjustmentValue( aAvList, 0, adj );
 break;
 }
-case mso_sptNoSmoking:
-{
-sal_Int32 adj =  double( nXPosition )/7200 *5 ;
-lcl_AppendAdjustmentValue( aAvList, 0, adj );
-break;
-}
 case mso_sptDonut:
 case mso_sptSun:
 case mso_sptMoon:
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx 
b/sd/qa/unit/export-tests-ooxml2.cxx
index 05ef4aa..540e800 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -467,8 +467,6 @@ void SdOOXMLExportTest2::testPresetShapesExport()
 "adj1","val 10490",
 "donut",
 "adj","val 9601",
-"noSmoking",
-"adj","val 16118",
 "bevel",
 "adj","val 42587",
 "foldedCorner",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

CppCheck Report Update

[cppcheck.libreoff...@gmail.com]

A new cppcheck report is available at : 
http://dev-builds.libreoffice.org/cppcheck_reports/master/


Note:
The script generating this report was run at :
2016-27-11_02:30:37 with user buildslave at host vm140 as 
/home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s 
/home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w 
/home/buildslave/tmp/www

It can be found and improved here:

https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=cppcheck/cppcheck-report.sh


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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - include/oox oox/source sd/qa

[Tamás Zolnai]

 include/oox/drawingml/shape.hxx |6 +
 oox/source/drawingml/shape.cxx  |  111 +++-
 sd/qa/unit/data/pptx/tdf104015.pptx |binary
 sd/qa/unit/import-tests.cxx |   40 
 4 files changed, 130 insertions(+), 27 deletions(-)

New commits:
commit 502b8d0d4178174130609b4b3085714864fb7b64
Author: Tamás Zolnai 
Date:   Sat Nov 19 00:10:01 2016 +

tdf#104015: PPTX import: Title shape does not inherit fill properties

...from slide master.
The problem caused by that PPTX files contains not a
one-level master slide set, but has two levels: one
called slide master, other called slide layout.
Slide layout inherit properties from slide master and
normal slide inherit propetries from slide layout.
Bug appeared because, slide layout inherited properties
were not forwarded to the normal slide.

Reviewed-on: https://gerrit.libreoffice.org/30969
Tested-by: Jenkins 
Reviewed-by: Tamás Zolnai 
(cherry picked from commit 8d613870b2cd2e3e4396b4fa97dbd8080fda8f52)

Conflicts:
sd/qa/unit/import-tests.cxx

Change-Id: I587582498cf4315087f9a576c1b7fc41ee23e2fd
Reviewed-on: https://gerrit.libreoffice.org/30971
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 520bc51..80c17b2 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -125,7 +125,7 @@ public:
 
 table::TablePropertiesPtr   getTableProperties();
 
-EffectProperties&   getEffectProperties() { return 
*mpEffectPropertiesPtr; }
+EffectProperties&   getEffectProperties() const { return 
*mpEffectPropertiesPtr; }
 
 voidsetChildPosition( css::awt::Point 
nPosition ){ maChPosition = nPosition; }
 voidsetChildSize( css::awt::Size aSize ){ 
maChSize = aSize; }
@@ -259,6 +259,10 @@ protected:
 voidputPropertiesToGrabBag(
 const css::uno::Sequence< 
css::beans::PropertyValue >& aProperties );
 
+FillProperties  getActualFillProperties(const Theme* pTheme, const 
FillProperties* pParentShapeFillProps) const;
+LineProperties  getActualLineProperties(const Theme* pTheme) const;
+EffectPropertiesgetActualEffectProperties(const Theme* pTheme) const;
+
 std::vector< ShapePtr > maChildren;   // only used for 
group shapes
 css::awt::Size   maChSize; // only used for group shapes
 css::awt::Point  maChPosition; // only used for group shapes
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 483ba4d..5f6a066 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -302,11 +302,11 @@ void Shape::applyShapeReference( const Shape& 
rReferencedShape, bool bUseText )
 else
 mpTextBody.reset();
 maShapeProperties = rReferencedShape.maShapeProperties;
-mpShapeRefLinePropPtr = std::make_shared( 
*rReferencedShape.mpLinePropertiesPtr.get() );
-mpShapeRefFillPropPtr = std::make_shared( 
*rReferencedShape.mpFillPropertiesPtr.get() );
+mpShapeRefLinePropPtr = std::make_shared( 
rReferencedShape.getActualLineProperties(nullptr) );
+mpShapeRefFillPropPtr = std::make_shared( 
rReferencedShape.getActualFillProperties(nullptr, nullptr) );
 mpCustomShapePropertiesPtr = std::make_shared( 
*rReferencedShape.mpCustomShapePropertiesPtr.get() );
 mpTablePropertiesPtr = table::TablePropertiesPtr( 
rReferencedShape.mpTablePropertiesPtr.get() ? new table::TableProperties( 
*rReferencedShape.mpTablePropertiesPtr.get() ) : nullptr );
-mpShapeRefEffectPropPtr = std::make_shared( 
*rReferencedShape.mpEffectPropertiesPtr.get() );
+mpShapeRefEffectPropPtr = std::make_shared( 
rReferencedShape.getActualEffectProperties(nullptr) );
 mpMasterTextListStyle = std::make_shared( 
*rReferencedShape.mpMasterTextListStyle.get() );
 maSize = rReferencedShape.maSize;
 maPosition = rReferencedShape.maPosition;
@@ -654,25 +654,17 @@ Reference< XShape > Shape::createAndInsert(
 
 const GraphicHelper& rGraphicHelper = rFilterBase.getGraphicHelper();
 
-LineProperties aLineProperties;
-aLineProperties.maLineFill.moFillType = XML_noFill;
 sal_Int32 nLinePhClr = -1;
-FillProperties aFillProperties;
-aFillProperties.moFillType = XML_noFill;
 sal_Int32 nFillPhClr = -1;
-EffectProperties aEffectProperties;
 // TODO: use ph color when applying effect properties
 //sal_Int32 nEffectPhClr = -1;
 
-// First apply reference shape's properties (shape on the master slide)
-aFillProperties.assignUsed( *mpShapeRefFillPropPtr );
-aLineProperties.assignUsed( *mpShapeRefLinePropPtr );
-aEffectProperties.assignUsed( *mpShapeRefEffec

[Libreoffice-commits] core.git: Branch 'feature/mar-updater' - 12 commits - desktop/source onlineupdate/Executable_mar.mk onlineupdate/Executable_updater.mk onlineupdate/source

[Markus Mohrhard]

 desktop/source/app/updater.cxx|   16 -
 onlineupdate/Executable_mar.mk|4 --
 onlineupdate/Executable_updater.mk|5 +--
 onlineupdate/source/libmar/verify/cryptox.c   |5 +++
 onlineupdate/source/update/updater/progressui_win.cxx |4 +-
 onlineupdate/source/update/updater/updater.cxx|   30 ++
 6 files changed, 41 insertions(+), 23 deletions(-)

New commits:
commit 6c0ad32216c7c41d3da28d347e3c790247428242
Author: Markus Mohrhard 
Date:   Sat Nov 26 23:31:16 2016 +0100

include nss also on windows for the updater executable

Change-Id: I998355e0c4fb97a5b513be0072bced2a611c9928

diff --git a/onlineupdate/Executable_updater.mk 
b/onlineupdate/Executable_updater.mk
index a2342581..e5c1611 100644
--- a/onlineupdate/Executable_updater.mk
+++ b/onlineupdate/Executable_updater.mk
@@ -43,13 +43,14 @@ endif
 
 $(eval $(call gb_Executable_use_externals,updater,\
bzip2 \
+   nss3 \
$(if $(filter LINUX,$(OS)), \
-   gtk \
-   nss3 )\
+   gtk )\
 ))
 
 $(eval $(call gb_Executable_add_defs,updater,\
-DVERIFY_MAR_SIGNATURE \
+   -DNSS3 \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,updater,\
commit 3721d309d97e047a1498c8395052bf897e87752c
Author: Markus Mohrhard 
Date:   Sat Nov 26 23:30:25 2016 +0100

more XP_WIN to _WIN32

Change-Id: If2dd733f44675e1f4305afff84a1b16f8c8ff1c5

diff --git a/onlineupdate/source/update/updater/updater.cxx 
b/onlineupdate/source/update/updater/updater.cxx
index 1315b7c..5c8578c 100644
--- a/onlineupdate/source/update/updater/updater.cxx
+++ b/onlineupdate/source/update/updater/updater.cxx
@@ -1630,7 +1630,7 @@ PatchFile::Execute()
 // Go ahead and do a bit of cleanup now to minimize runtime overhead.
 // Make sure mPatchStream gets unlocked on Windows; the system will do 
that,
 // but not until some indeterminate future time, and we want determinism.
-#ifdef XP_WIN
+#ifdef _WIN32
 UnlockFile((HANDLE)_get_osfhandle(fileno(mPatchStream)), (DWORD)0, 
(DWORD)0, (DWORD)-1, (DWORD)-1);
 #endif
 // Set mPatchStream to nullptr to make AutoFile close the file,
@@ -3344,7 +3344,7 @@ int NS_main(int argc, NS_tchar **argv)
 NS_tmkdir(gDeleteDirPath, 0755);
 }
 }
-#endif /* XP_WIN */
+#endif /* _WIN32 */
 
 // Run update process on a background thread. ShowProgressUI may return
 // before QuitProgressUI has been called, so wait for UpdateThreadFunc 
to
@@ -3360,7 +3360,7 @@ int NS_main(int argc, NS_tchar **argv)
 }
 t.join();
 
-#ifdef XP_WIN
+#ifdef _WIN32
 if (argc > callbackIndex && !sReplaceRequest) {
 if (callbackFile != INVALID_HANDLE_VALUE) {
 CloseHandle(callbackFile);
@@ -3447,7 +3447,7 @@ int NS_main(int argc, NS_tchar **argv)
 LogFinish();
 
 int retVal = LaunchCallbackAndPostProcessApps(argc, argv, callbackIndex
-#ifdef XP_WIN
+#ifdef _WIN32
 , elevatedLockFilePath
 , updateLockFileHandle
 #elif XP_MACOSX
commit d1431ec89ce824b2c408f5f636b5748cfdf571ee
Author: Markus Mohrhard 
Date:   Sat Nov 26 23:29:40 2016 +0100

add missing windows error codes

Error codes taken for now from the mozilla code.

Change-Id: Ib5b8ce4effb62ff0149a70a293ef6d19a0af4bb7

diff --git a/onlineupdate/source/update/updater/updater.cxx 
b/onlineupdate/source/update/updater/updater.cxx
index 0b2d047..1315b7c 100644
--- a/onlineupdate/source/update/updater/updater.cxx
+++ b/onlineupdate/source/update/updater/updater.cxx
@@ -65,6 +65,12 @@
 #include 
 #include "uachelper.h"
 #include "pathhash.h"
+
+// TODO:moggi taken from the mozilla code -- find a better solution
+#define INVALID_APPLYTO_DIR_ERROR 74
+#define REMOVE_FILE_SPEC_ERROR 71
+#define INVALID_APPLYTO_DIR_STAGED_ERROR 72
+
 #endif
 
 
commit 8bc6f620ff843070e70bfc7da49c776d38839859
Author: Markus Mohrhard 
Date:   Sat Nov 26 23:19:12 2016 +0100

always build with NSS and therefore verify signatures

Change-Id: I7b697b95e620ce915d762ce5d09af33a9e812107

diff --git a/onlineupdate/Executable_mar.mk b/onlineupdate/Executable_mar.mk
index e6f18ef..3410ae2 100644
--- a/onlineupdate/Executable_mar.mk
+++ b/onlineupdate/Executable_mar.mk
@@ -32,13 +32,9 @@ $(eval $(call gb_Executable_add_libs,mar,\
 ))
 endif
 
-ifeq ($(filter WNT MACOSX,$(OS)),)
-$(eval $(call gb_Executable_use_externals,mar,nss3))
-
 $(eval $(call gb_Executable_add_defs,mar,\
-DMAR_NSS \
 ))
-endif
 
 $(eval $(call gb_Executable_add_defs,mar,\

-DAPP_VERSION=\"$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)\"
 \
commit 9adca375d2f4115a2fa0b57bd4e62288aeb6955f
Author: Markus Mohrhard 
Date:   Sat Nov 26 23:18:47 2016 +0100

remove header includes

Change-Id: I72c4b65b733875c8bc18a7e6718e1470bcaf611d

diff --git a/onlineupdate/sou

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

[Michael Meeks]

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

New commits:
commit b3bc9d55c715f3c5357742e54a51c3116294199b
Author: Michael Meeks 
Date:   Sat Nov 26 15:47:15 2016 +

tdf#101327 - tolerate exceptions during window construction better.

It appears we can end up being a frame window, which is not added
into the list of frames; so tolerate that.

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

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 293d735..63951eb 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -565,12 +565,22 @@ void Window::dispose()
 pSVData->maWinData.mpFirstFrame = 
mpWindowImpl->mpFrameData->mpNextFrame;
 else
 {
+sal_Int32 nWindows = 0;
 vcl::Window* pSysWin = pSVData->maWinData.mpFirstFrame;
-while ( pSysWin->mpWindowImpl->mpFrameData->mpNextFrame.get() != 
this )
+while ( pSysWin && 
pSysWin->mpWindowImpl->mpFrameData->mpNextFrame.get() != this )
+{
 pSysWin = pSysWin->mpWindowImpl->mpFrameData->mpNextFrame;
+nWindows++;
+}
 
-assert (mpWindowImpl->mpFrameData->mpNextFrame.get() != pSysWin);
-pSysWin->mpWindowImpl->mpFrameData->mpNextFrame = 
mpWindowImpl->mpFrameData->mpNextFrame;
+if ( pSysWin )
+{
+assert (mpWindowImpl->mpFrameData->mpNextFrame.get() != 
pSysWin);
+pSysWin->mpWindowImpl->mpFrameData->mpNextFrame = 
mpWindowImpl->mpFrameData->mpNextFrame;
+}
+else // if it is not in the list, we can't remove it.
+SAL_WARN("vcl", "Window " << this << " marked as frame window, 
"
+ "is missing from list of " << nWindows << " frames");
 }
 mpWindowImpl->mpFrame->SetCallback( nullptr, nullptr );
 pSVData->mpDefInst->DestroyFrame( mpWindowImpl->mpFrame );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

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

New commits:
commit 115671bf929a82709c535b475bf19f4967a666c8
Author: Michael Meeks 
Date:   Sat Nov 26 15:47:15 2016 +

tdf#101327 - tolerate exceptions during window construction better.

It appears we can end up being a frame window, which is not added
into the list of frames; so tolerate that.

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

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 8774541..f50e662 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -535,12 +535,22 @@ void Window::dispose()
 pSVData->maWinData.mpFirstFrame = 
mpWindowImpl->mpFrameData->mpNextFrame;
 else
 {
+sal_Int32 nWindows = 0;
 vcl::Window* pSysWin = pSVData->maWinData.mpFirstFrame;
-while ( pSysWin->mpWindowImpl->mpFrameData->mpNextFrame.get() != 
this )
+while ( pSysWin && 
pSysWin->mpWindowImpl->mpFrameData->mpNextFrame.get() != this )
+{
 pSysWin = pSysWin->mpWindowImpl->mpFrameData->mpNextFrame;
+nWindows++;
+}
 
-assert (mpWindowImpl->mpFrameData->mpNextFrame.get() != pSysWin);
-pSysWin->mpWindowImpl->mpFrameData->mpNextFrame = 
mpWindowImpl->mpFrameData->mpNextFrame;
+if ( pSysWin )
+{
+assert (mpWindowImpl->mpFrameData->mpNextFrame.get() != 
pSysWin);
+pSysWin->mpWindowImpl->mpFrameData->mpNextFrame = 
mpWindowImpl->mpFrameData->mpNextFrame;
+}
+else // if it is not in the list, we can't remove it.
+SAL_WARN("vcl", "Window " << this << " marked as frame window, 
"
+ "is missing from list of " << nWindows << " frames");
 }
 mpWindowImpl->mpFrame->SetCallback( nullptr, nullptr );
 pSVData->mpDefInst->DestroyFrame( mpWindowImpl->mpFrame );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Khaled Hosny]

 vcl/inc/sallayout.hxx  |2 --
 vcl/unx/generic/print/glyphset.hxx |2 --
 2 files changed, 4 deletions(-)

New commits:
commit 84c5999372ca4af1c79ab3134fda1d67d4ea95d6
Author: Khaled Hosny 
Date:   Sat Nov 26 22:46:35 2016 +0200

Unused typedef’s

Change-Id: Ieec1d33b5baa42c0b67e4119fd12ee10f6eb3be4
Reviewed-on: https://gerrit.libreoffice.org/31251
Reviewed-by: Khaled Hosny 
Tested-by: Khaled Hosny 

diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index fddc8d1..c20a582 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -324,8 +324,6 @@ public:
 boolAllowKashida() const{ return ((mnFlags & ALLOW_KASHIDA) != 0); 
}
 };
 
-typedef std::list GlyphList;
-
 class VCL_PLUGIN_PUBLIC GenericSalLayout : public SalLayout
 {
 public:
diff --git a/vcl/unx/generic/print/glyphset.hxx 
b/vcl/unx/generic/print/glyphset.hxx
index 92c6756..fccaacc 100644
--- a/vcl/unx/generic/print/glyphset.hxx
+++ b/vcl/unx/generic/print/glyphset.hxx
@@ -45,8 +45,6 @@ private:
 OString maBaseName;
 rtl_TextEncodingmnBaseEncoding;
 
-typedef std::unordered_map< sal_Unicode, sal_uInt8 > char_map_t;
-typedef std::list< char_map_t > char_list_t;
 typedef std::unordered_map< sal_GlyphId, sal_uInt8 > glyph_map_t;
 typedef std::list< glyph_map_t > glyph_list_t;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - accessibility/source

[Tamás Zolnai]

 accessibility/source/standard/vclxaccessiblebox.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b9f2330497427a3d5938ec0a2b15b18ce4571404
Author: Tamás Zolnai 
Date:   Sat Nov 26 18:22:42 2016 +

tdf#99687: Find Text widget fails to emit object:text-caret-moved events

Must be an integration bug:
efb23f29983f87104a684e7fab00b84fc59d131d

Change-Id: I53b15975fb97a299103fab870307b03b2607e9e5
Reviewed-on: https://gerrit.libreoffice.org/31238
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 
(cherry picked from commit c1afa80bb3613c9202fa9d83447fdd5d57667cb6)
Reviewed-on: https://gerrit.libreoffice.org/31248
Tested-by: Jenkins 

diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx 
b/accessibility/source/standard/vclxaccessiblebox.cxx
index 6f3997e..4a28c71 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -236,7 +236,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const 
VclWindowEvent& rVclWindowEven
 
 case VCLEVENT_EDIT_MODIFY:
 case VCLEVENT_EDIT_SELECTIONCHANGED:
- // case VCLEVENT_EDIT_CARETCHANGED:
+case VCLEVENT_EDIT_CARETCHANGED:
 // Modify/Selection events are handled by the combo box instead of
 // directly by the edit field (Why?).  Therefore, delegate this
 // call to the edit field.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

owen anderson license statement

[Owen Anderson]

All of my past & future contributions to LibreOffice may be licensed under
the MPLv2/LGPlv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - oox/inc oox/source sd/qa

[Tamás Zolnai]

 oox/inc/drawingml/textbody.hxx |8 -
 oox/inc/drawingml/textparagraph.hxx|7 
 oox/source/drawingml/textbody.cxx  |   34 +-
 oox/source/drawingml/textparagraph.cxx |   51 ++---
 oox/source/ppt/pptshape.cxx|   11 +++
 sd/qa/unit/data/pptx/tdf103876.pptx|binary
 sd/qa/unit/import-tests.cxx|   21 +
 7 files changed, 113 insertions(+), 19 deletions(-)

New commits:
commit f75d03bd90b27034a69c47f5413ec013dafc97c6
Author: Tamás Zolnai 
Date:   Tue Nov 15 23:18:03 2016 +0100

tdf#103876: PPTX import: Title shape's character properties are wrong

Text properties are applied on a shape during text insertion,
but if a placeholder shape has no text, then it has a placehodler
text which should have the right text properties.

Change-Id: I54175d52dd25915ee4d7153298e01ec07c6be1f6
Reviewed-on: https://gerrit.libreoffice.org/30881
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 
(cherry picked from commit 5c7f3e4a7190bf9821bed102f96a926c9a894e59)
Reviewed-on: https://gerrit.libreoffice.org/30940
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/oox/inc/drawingml/textbody.hxx b/oox/inc/drawingml/textbody.hxx
index 5f8b053..0435297 100644
--- a/oox/inc/drawingml/textbody.hxx
+++ b/oox/inc/drawingml/textbody.hxx
@@ -59,7 +59,13 @@ public:
 const css::uno::Reference < css::text::XTextCursor 
> & xAt,
 const TextCharacterProperties& 
rTextStyleProperties,
 const TextListStylePtr& pMasterTextListStyle ) 
const;
-bool isEmpty();
+bool isEmpty() const;
+
+voidApplyStyleEmpty(
+const ::oox::core::XmlFilterBase& rFilterBase,
+const css::uno::Reference < css::text::XText > & 
xText,
+const TextCharacterProperties& 
rTextStyleProperties,
+const TextListStylePtr& pMasterTextListStylePtr) 
const;
 protected:
 TextParagraphVector maParagraphs;
 TextBodyProperties  maTextProperties;
diff --git a/oox/inc/drawingml/textparagraph.hxx 
b/oox/inc/drawingml/textparagraph.hxx
index 43bf51a..2a4db6a 100644
--- a/oox/inc/drawingml/textparagraph.hxx
+++ b/oox/inc/drawingml/textparagraph.hxx
@@ -53,6 +53,13 @@ public:
 TextCharacterProperties& getEndProperties() { return 
maEndProperties; }
 const TextCharacterProperties&   getEndProperties() const { return 
maEndProperties; }
 
+TextCharacterProperties  getCharacterStyle(
+const TextCharacterProperties& rTextStyleProperties,
+const TextListStyle& rTextListStyle) const;
+
+TextParagraphPropertiesPtr  getParagraphStyle(
+const TextListStyle& rTextListStyle) const;
+
 voidinsertAt(
 const ::oox::core::XmlFilterBase& 
rFilterBase,
 const css::uno::Reference < 
css::text::XText > & xText,
diff --git a/oox/source/drawingml/textbody.cxx 
b/oox/source/drawingml/textbody.cxx
index 3aa835e..662a52f 100644
--- a/oox/source/drawingml/textbody.cxx
+++ b/oox/source/drawingml/textbody.cxx
@@ -22,9 +22,11 @@
 #include 
 #include 
 #include "drawingml/textparagraph.hxx"
+#include "oox/helper/propertyset.hxx"
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::text;
+using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::frame;
 
 namespace oox { namespace drawingml {
@@ -69,7 +71,7 @@ void TextBody::insertAt(
 (*aIt)->insertAt( rFilterBase, xText, xAt, rTextStyleProperties, 
aCombinedTextStyle, aIt == aBeg, nCharHeight );
 }
 
-bool TextBody::isEmpty()
+bool TextBody::isEmpty() const
 {
 if ( maParagraphs.size() <= 0 )
 return true;
@@ -85,6 +87,36 @@ bool TextBody::isEmpty()
 return aRuns[0]->getText().getLength() <= 0;
 }
 
+void TextBody::ApplyStyleEmpty(
+const ::oox::core::XmlFilterBase& rFilterBase,
+const Reference < XText > & xText,
+const TextCharacterProperties& rTextStyleProperties,
+const TextListStylePtr& pMasterTextListStylePtr) const
+{
+assert(isEmpty());
+
+// Apply character properties
+TextListStyle aCombinedTextStyle;
+aCombinedTextStyle.apply( *pMasterTextListStylePtr );
+aCombinedTextStyle.apply( maTextListStyle );
+
+PropertySet aPropSet(xText);
+TextCharacterProperties 
aTextCharacterProps(maParagraphs[0]->getCharacterStyle(rTextStyleProperties, 
aCombinedTextStyle));
+aTextCharacterProps.pushToPropSet(aPropSet, rFilterBase);
+
+// Apply paragraph properties
+TextParagraphPropertiesPtr pTextParagraphStyle = 
maParagraphs[0]->getParagraphStyle(aCombinedTextStyle);
+if (pTextParagraphStyle.get())
+{
+Reference< XPropertySet > xProps(xText, UNO_QUERY);
+PropertyMap aioB

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

[Andras Timar]

 cui/source/options/optbasic.cxx |   25 -
 1 file changed, 12 insertions(+), 13 deletions(-)

New commits:
commit d5be8dddc43e8a880d546fb9a6e8fbb45278eeca
Author: Andras Timar 
Date:   Sat Nov 26 19:52:54 2016 +0100

respect read-only config items in Basic IDE Options dialog

Change-Id: I4a23b347c5fed948045427bc440e7a821b95b63c
Reviewed-on: https://gerrit.libreoffice.org/31242
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index 3feb235a..38324ea 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -62,19 +62,18 @@ void SvxBasicIDEOptionsPage::dispose()
 
 void SvxBasicIDEOptionsPage::LoadConfig()
 {
-bool bProcClose = 
officecfg::Office::BasicIDE::Autocomplete::AutocloseProc::get();
-bool bExtended = 
officecfg::Office::BasicIDE::Autocomplete::UseExtended::get();
-bool bCodeCompleteOn = 
officecfg::Office::BasicIDE::Autocomplete::CodeComplete::get();
-bool bParenClose = 
officecfg::Office::BasicIDE::Autocomplete::AutocloseParenthesis::get();
-bool bQuoteClose = 
officecfg::Office::BasicIDE::Autocomplete::AutocloseDoubleQuotes::get();
-bool bCorrect = 
officecfg::Office::BasicIDE::Autocomplete::AutoCorrect::get();
-
-pCodeCompleteChk->Check( bCodeCompleteOn );
-pAutocloseProcChk->Check( bProcClose );
-pAutocloseQuotesChk->Check( bQuoteClose );
-pAutocloseParenChk->Check( bParenClose );
-pAutoCorrectChk->Check( bCorrect );
-pUseExtendedTypesChk->Check( bExtended );
+pCodeCompleteChk->Check( 
officecfg::Office::BasicIDE::Autocomplete::CodeComplete::get() );
+pCodeCompleteChk->Enable( 
!officecfg::Office::BasicIDE::Autocomplete::CodeComplete::isReadOnly() );
+pAutocloseProcChk->Check( 
officecfg::Office::BasicIDE::Autocomplete::AutocloseProc::get() );
+pAutocloseProcChk->Enable( 
!officecfg::Office::BasicIDE::Autocomplete::AutocloseProc::isReadOnly() );
+pAutocloseQuotesChk->Check( 
officecfg::Office::BasicIDE::Autocomplete::AutocloseDoubleQuotes::get() );
+pAutocloseQuotesChk->Enable( 
!officecfg::Office::BasicIDE::Autocomplete::AutocloseDoubleQuotes::isReadOnly() 
);
+pAutocloseParenChk->Check( 
officecfg::Office::BasicIDE::Autocomplete::AutocloseParenthesis::get() );
+pAutocloseParenChk->Enable( 
!officecfg::Office::BasicIDE::Autocomplete::AutocloseParenthesis::isReadOnly() 
);
+pAutoCorrectChk->Check( 
officecfg::Office::BasicIDE::Autocomplete::AutoCorrect::get() );
+pAutoCorrectChk->Enable( 
!officecfg::Office::BasicIDE::Autocomplete::AutoCorrect::isReadOnly() );
+pUseExtendedTypesChk->Check( 
officecfg::Office::BasicIDE::Autocomplete::UseExtended::get() );
+pUseExtendedTypesChk->Enable( 
!officecfg::Office::BasicIDE::Autocomplete::UseExtended::isReadOnly() );
 }
 
 bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Windows linking errors after removing old Graphite code

[Khaled Hosny]

On Sat, Nov 26, 2016 at 07:53:15PM +, Kaganski Mike wrote:
> 11/26/2016 10:43 PM, Noel Grandin пишет:
> > the windows buildbots are currently broken, and it very much looks 
> > like this stuff is the reason, e.g. see
> >
> > http://ci.libreoffice.org/job/lo_tb_master_win64_dbg/lastBuild/console
> 
> I had this problem locally until I forced graphite2 rebuild.
> Could it be that buildbots cache "unchanging" bits like externals?

Yes, comparing the above log with this one
http://ci.libreoffice.org/job/lo_gerrit/3220/Config=windows_msc_dbgutil_32/consoleFull
I think the difference is that Tinderbox builds don’t do make clean and
I think either harfbuzz or graphite need to be rebuilt.

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

Re: Windows linking errors after removing old Graphite code

[Kaganski Mike]

11/26/2016 10:43 PM, Noel Grandin пишет:
> the windows buildbots are currently broken, and it very much looks 
> like this stuff is the reason, e.g. see
>
> http://ci.libreoffice.org/job/lo_tb_master_win64_dbg/lastBuild/console

I had this problem locally until I forced graphite2 rebuild.
Could it be that buildbots cache "unchanging" bits like externals?

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

Re: Windows linking errors after removing old Graphite code

[Khaled Hosny]

On Sat, Nov 26, 2016 at 09:43:50PM +0200, Noel Grandin wrote:
> the windows buildbots are currently broken, and it very much looks like
> this stuff is the reason, e.g. see
> 
> http://ci.libreoffice.org/job/lo_tb_master_win64_dbg/lastBuild/console

I saw this earlier today, but the Gerrit builds are passing so i don’t
know what is going on.

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

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

[tagezi]

 desktop/source/app/cmdlineargs.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 87a098e3bb72910399473ee0fbe32a70cad9c737
Author: tagezi 
Date:   Sat Nov 26 11:07:23 2016 +0200

Remove extra "=" symbol for "--splash-pipe" argument

This argument ignores any parameters since commit
5c22a03320f20ae9ac2c3c16025e7c5e3a7915d5.
It is a part of documenting cmdline.

Change-Id: I9d7f06f692d77379b3d96b741987f83771bd13c2
Reviewed-on: https://gerrit.libreoffice.org/31243
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/desktop/source/app/cmdlineargs.cxx 
b/desktop/source/app/cmdlineargs.cxx
index 112fa58..443a87a 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -329,7 +329,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& 
supplier )
 {
 m_version = true;
 }
-else if ( oArg.startsWith("splash-pipe=") )
+else if ( oArg.startsWith("splash-pipe") )
 {
 m_splashpipe = true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Windows linking errors after removing old Graphite code

[Noel Grandin]

the windows buildbots are currently broken, and it very much looks like
this stuff is the reason, e.g. see

http://ci.libreoffice.org/job/lo_tb_master_win64_dbg/lastBuild/console
​
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - vcl/inc vcl/README.vars vcl/source

[Khaled Hosny]

 vcl/README.vars  |1 -
 vcl/inc/svids.hrc|3 ---
 vcl/source/app/svapp.cxx |8 
 vcl/source/gdi/sallayout.cxx |3 +--
 vcl/source/src/app.src   |   15 ---
 5 files changed, 1 insertion(+), 29 deletions(-)

New commits:
commit d76bd987ca2b853b85a9464787ae1fdc19321f5b
Author: Khaled Hosny 
Date:   Sat Nov 26 20:10:21 2016 +0200

Do not check for SAL_NO_COMMON_LAYOUT any more

It has no effect except on Windows, and this will go out soon.

Change-Id: I238518624e3288dea259e5ec9d5d76c8f691fd8c

diff --git a/vcl/README.vars b/vcl/README.vars
index d50a03b..e97d85d 100644
--- a/vcl/README.vars
+++ b/vcl/README.vars
@@ -6,7 +6,6 @@ SAL_USE_VCLPLUGIN - use a VCL plugin
 SAL_NO_NWF - disable native widgets
 SAL_FORCEDPI - force a specific DPI (gtk & gtk3 plugins only)
 SAL_FORCE_HC - force high-contrast mode
-SAL_NO_COMMON_LAYOUT - disable CommonSalLayout layout engine for text layout
 
 VCL_DOUBLEBUFFERING_AVOID_PAINT - don't paint the buffer, useful to see where 
we do direct painting
 VCL_DOUBLEBUFFERING_FORCE_ENABLE - enable double buffered painting
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index d879df0..ebae19b 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -772,8 +772,7 @@ bool SalLayout::IsSpacingGlyph( sal_GlyphId nGlyph )
 
 bool SalLayout::UseCommonLayout()
 {
-static bool bUse = getenv("SAL_NO_COMMON_LAYOUT") == nullptr;
-return bUse;
+return true;
 }
 
 GenericSalLayout::GenericSalLayout()
commit e17302a110c0dd143a4ea11855a3d2c736e49fdd
Author: Khaled Hosny 
Date:   Sat Nov 26 20:08:53 2016 +0200

Revert "Add layout engine info to the About dialog"

This reverts commit f351b3624de79b5806a066202a3a0d6fa59c8469.

diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index fa27f8b..891fe57 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -180,9 +180,6 @@
 #define SV_APP_GL   10803
 #define SV_APP_DEFAULT  10804
 #define SV_APP_VCLBACKEND   10805
-#define SV_APP_LAYOUT_ENGINE10806
-#define SV_APP_LAYOUT_NEW   10807
-#define SV_APP_LAYOUT_OLD   10808
 
 #define SV_ICON_SIZE48_START2
 #define SV_ICON_SIZE32_START21000
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 2efd08f..af80c7c 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -57,7 +57,6 @@
 
 #include "salinst.hxx"
 #include "salframe.hxx"
-#include "sallayout.hxx"
 #include "salsys.hxx"
 #include "svdata.hxx"
 #include "salimestatus.hxx"
@@ -1219,13 +1218,6 @@ OUString Application::GetHWOSConfInfo()
 aDetails.append( "; " );
 #endif
 
-aDetails.append( VclResId(SV_APP_LAYOUT_ENGINE).toString() );
-if (SalLayout::UseCommonLayout())
-aDetails.append( VclResId(SV_APP_LAYOUT_NEW).toString() );
-else
-aDetails.append( VclResId(SV_APP_LAYOUT_OLD).toString() );
-aDetails.append( "; " );
-
 return aDetails.makeStringAndClear();
 }
 
diff --git a/vcl/source/src/app.src b/vcl/source/src/app.src
index 0197d98..b36686d 100644
--- a/vcl/source/src/app.src
+++ b/vcl/source/src/app.src
@@ -39,19 +39,4 @@ String SV_APP_VCLBACKEND
 Text [ en-US ] = "VCL: ";
 };
 
-String SV_APP_LAYOUT_ENGINE
-{
-Text [ en-US ] = "Layout Engine: ";
-};
-
-String SV_APP_LAYOUT_NEW
-{
-Text [ en-US ] = "new";
-};
-
-String SV_APP_LAYOUT_OLD
-{
-Text [ en-US ] = "old";
-};
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Khaled Hosny]

 vcl/inc/CommonSalLayout.hxx  |   17 +-
 vcl/inc/sallayout.hxx|8 -
 vcl/source/gdi/sallayout.cxx |  279 ---
 3 files changed, 15 insertions(+), 289 deletions(-)

New commits:
commit 3dab9849115284f9a126356e2354ad7fb8557663
Author: Khaled Hosny 
Date:   Sat Nov 26 17:29:16 2016 +0200

More dead code

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

diff --git a/vcl/inc/CommonSalLayout.hxx b/vcl/inc/CommonSalLayout.hxx
index e5345d7..05ea342 100644
--- a/vcl/inc/CommonSalLayout.hxx
+++ b/vcl/inc/CommonSalLayout.hxx
@@ -61,6 +61,8 @@ class CommonSalLayout : public GenericSalLayout
 hb_set_t*   mpVertGlyphs;
 boolIsVerticalAlternate(hb_codepoint_t nGlyphIndex);
 
+voidSetNeedFallback(ImplLayoutArgs&, sal_Int32, bool);
+
 public:
 #if defined(_WIN32)
 explicitCommonSalLayout(HDC, WinFontInstance&, const 
WinFontFace&);
@@ -74,16 +76,15 @@ public:
 #endif
 
 virtual voidInitFont() const override;
-voidSetNeedFallback(ImplLayoutArgs&, sal_Int32, bool);
-voidAdjustLayout(ImplLayoutArgs&) override;
-boolLayoutText(ImplLayoutArgs&) override;
-voidDrawText(SalGraphics&) const override;
-std::shared_ptr CreateTextLayoutCache(OUString 
const&) const override;
+voidAdjustLayout(ImplLayoutArgs&) final override;
+boolLayoutText(ImplLayoutArgs&) final override;
+voidDrawText(SalGraphics&) const final override;
+std::shared_ptr CreateTextLayoutCache(OUString 
const&) const final override;
 
-virtual boolGetCharWidths(DeviceCoordinate* pCharWidths) const 
override;
-virtual voidApplyDXArray(ImplLayoutArgs&) override;
+boolGetCharWidths(DeviceCoordinate* pCharWidths) const 
final override;
+voidApplyDXArray(ImplLayoutArgs&) final override;
 
-virtual boolIsKashidaPosValid(int nCharPos) const override;
+boolIsKashidaPosValid(int nCharPos) const final 
override;
 };
 
 enum class VerticalOrientation {
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 3fab81f..fddc8d1 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -332,10 +332,8 @@ public:
 // used by layout engines
 voidAppendGlyph( const GlyphItem& );
 voidReserve(int size) { m_GlyphItems.reserve(size + 1); }
-virtual voidAdjustLayout( ImplLayoutArgs& ) override;
-virtual voidApplyDXArray( ImplLayoutArgs& );
-voidJustify( DeviceCoordinate nNewWidth );
-voidKashidaJustify( long nIndex, int nWidth );
+virtual voidApplyDXArray(ImplLayoutArgs&) = 0;
+voidJustify(DeviceCoordinate nNewWidth);
 voidApplyAsianKerning(const OUString& rStr);
 voidSortGlyphItems();
 
@@ -359,7 +357,7 @@ protected:
 virtual voidDropGlyph( int nStart ) override;
 virtual voidSimplify( bool bIsBase ) override;
 
-virtual boolGetCharWidths( DeviceCoordinate* pCharWidths ) const;
+virtual boolGetCharWidths(DeviceCoordinate* pCharWidths) const = 0;
 
 std::vector m_GlyphItems;
 
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 63a65e6..d879df0 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -751,6 +751,9 @@ bool SalLayout::GetBoundRect( SalGraphics& rSalGraphics, 
Rectangle& rRect ) cons
 return bRet;
 }
 
+// FIXME: This function is just broken, it assumes any glyph at index 3 in the
+// font is space, which though common is not a hard requirement and not the
+// only glyph for space characters. Fix the call sites and fix them.
 bool SalLayout::IsSpacingGlyph( sal_GlyphId nGlyph )
 {
 bool bRet = false;
@@ -784,80 +787,6 @@ void GenericSalLayout::AppendGlyph( const GlyphItem& 
rGlyphItem )
 m_GlyphItems.push_back(rGlyphItem);
 }
 
-bool GenericSalLayout::GetCharWidths( DeviceCoordinate* pCharWidths ) const
-{
-// initialize character extents buffer
-int nCharCount = mnEndCharPos - mnMinCharPos;
-for( int n = 0; n < nCharCount; ++n )
-pCharWidths[n] = 0;
-
-// determine cluster extents
-for( std::vector::const_iterator pGlyphIter = 
m_GlyphItems.begin(), end = m_GlyphItems.end(); pGlyphIter != end ; 
++pGlyphIter)
-{
-// use cluster start to get char index
-if( !pGlyphIter->IsClusterStart() )
-continue;
-
-int n = pGlyphIter->mnCharPos;
-if( n >= mnEndCharPos )
-continue;
-n -= mnMinCharPos;
-if( n < 0 )
-continue;
-
-// left glyph in cluster defines 

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

[Gabor Kelemen]

 source/text/scalc/01/04060103.xhp |3 ++-
 source/text/scalc/01/04060118.xhp |8 
 source/text/scalc/01/04060119.xhp |4 +++-
 3 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 67f77ad0e414cfc4d08b821944616f5b819ac774
Author: Gabor Kelemen 
Date:   Fri Nov 25 11:12:32 2016 +0100

tdf#103241 Link XIRR and IRR as well as XNPV and NPV to each other

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

diff --git a/source/text/scalc/01/04060103.xhp 
b/source/text/scalc/01/04060103.xhp
index aeaf02e..4550c4b 100644
--- a/source/text/scalc/01/04060103.xhp
+++ b/source/text/scalc/01/04060103.xhp
@@ -723,6 +723,7 @@
 IRR
  Calculates the internal rate of 
return for an investment. The values represent cash flow values at 
regular intervals, at least one value must be negative (payments), and at least 
one value must be positive (income).
+ If 
the payments take place at irregular intervals, use the XIRR 
function.
  Syntax
  IRR(Values; Guess)
@@ -765,4 +766,4 @@
   Financial Functions Part Three
   

-
\ No newline at end of file
+
diff --git a/source/text/scalc/01/04060118.xhp 
b/source/text/scalc/01/04060118.xhp
index b2dd4bb..14181cc 100644
--- a/source/text/scalc/01/04060118.xhp
+++ b/source/text/scalc/01/04060118.xhp
@@ -171,7 +171,7 @@
 
 XIRR
 Calculates the internal rate of return for a list of 
payments which take place on different dates. The calculation is based 
on a 365 days per year basis, ignoring leap years.
-If the payments 
take place at regular intervals, use the IRR function.
+If the payments 
take place at regular intervals, use the IRR 
function.
 
 Syntax
 XIRR(Values; Dates; 
Guess)
@@ -275,8 +275,8 @@
 
 
 XNPV
-Calculates the capital value (net present value)for a 
list of payments which take place on different dates. The calculation 
is based on a 365 days per year basis, ignoring leap years.
-If the payments 
take place at regular intervals, use the NPV function.
+Calculates the capital value (net present value) for a 
list of payments which take place on different dates. The calculation 
is based on a 365 days per year basis, ignoring leap years.
+If the payments 
take place at regular intervals, use the NPV 
function.
 
 Syntax
 XNPV(Rate; Values; 
Dates)
@@ -601,4 +601,4 @@
 
 
 
-
\ No newline at end of file
+
diff --git a/source/text/scalc/01/04060119.xhp 
b/source/text/scalc/01/04060119.xhp
index d2301cf..e6fb335 100644
--- a/source/text/scalc/01/04060119.xhp
+++ b/source/text/scalc/01/04060119.xhp
@@ -328,7 +328,9 @@
 
 
 NPV
-Returns the present value of an 
investment based on a series of periodic cash flows and a discount rate. To get 
the net present value, subtract the cost of the project (the initial cash flow 
at time zero) from the returned value.
+Returns the present value of an investment based on a series 
of periodic cash flows and a discount rate. To get the net present value, 
subtract the cost of the project (the initial cash flow at time zero) from the 
returned value.
+If the 
payments take place at irregular intervals, use the XNPV 
function.
+
 Syntax
 NPV(Rate; Value1; Value2; ...)
 
___
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 45d001aabe8df0f6fd825fb3dbcbd9b4ff12626c
Author: Gabor Kelemen 
Date:   Fri Nov 25 11:12:32 2016 +0100

Updated core
Project: help  67f77ad0e414cfc4d08b821944616f5b819ac774

tdf#103241 Link XIRR and IRR as well as XNPV and NPV to each other

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

diff --git a/helpcontent2 b/helpcontent2
index fad1d9b..67f77ad 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit fad1d9b854420d35adec033b26e0e5d90a4f7725
+Subproject commit 67f77ad0e414cfc4d08b821944616f5b819ac774
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 source/text/scalc/guide/print_title_row.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fad1d9b854420d35adec033b26e0e5d90a4f7725
Author: Andras Timar 
Date:   Sat Nov 26 19:15:24 2016 +0100

type: missing space

Change-Id: Ia0a6e032611b8c76c6b7c55adf0b5307c63dc8e9

diff --git a/source/text/scalc/guide/print_title_row.xhp 
b/source/text/scalc/guide/print_title_row.xhp
index 88fd905..8347dd7 100644
--- a/source/text/scalc/guide/print_title_row.xhp
+++ b/source/text/scalc/guide/print_title_row.xhp
@@ -18,7 +18,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-   
+
 
 
 
@@ -45,7 +45,7 @@
 Printing Rows or Columns on Every Page
 
 If you have a sheet that is so large that it will be printed 
multiple pages, you can set up rows or columns to repeat on each printed 
page.
-As an example, If you want to print the top two rows of the sheet as 
well as the first column (A)on all pages, do the following:
+As an example, If you want to print the top two rows of the sheet as 
well as the first column (A) on all pages, do the following:
 
 
 Choose Format - Print Ranges - Edit. The Edit 
Print Ranges dialog appears.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Andras Timar]

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

New commits:
commit d1cef2586671c0ade8caf7607a16b265feb37892
Author: Andras Timar 
Date:   Sat Nov 26 19:15:24 2016 +0100

Updated core
Project: help  fad1d9b854420d35adec033b26e0e5d90a4f7725

type: missing space

Change-Id: Ia0a6e032611b8c76c6b7c55adf0b5307c63dc8e9

diff --git a/helpcontent2 b/helpcontent2
index 565f827..fad1d9b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 565f827138ee50a0754de1e0c9d9d16feb28076f
+Subproject commit fad1d9b854420d35adec033b26e0e5d90a4f7725
___
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/scalc/00/0404.xhp  |2 +-
 source/text/scalc/guide/cellreferences_url.xhp |4 ++--
 source/text/scalc/guide/webquery.xhp   |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 565f827138ee50a0754de1e0c9d9d16feb28076f
Author: Gabor Kelemen 
Date:   Fri Nov 25 09:33:45 2016 +0100

tdf#103968 'Link to External Data' is now in the Sheet menu

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

diff --git a/source/text/scalc/00/0404.xhp 
b/source/text/scalc/00/0404.xhp
index 17d0ca9..e2646da 100644
--- a/source/text/scalc/00/0404.xhp
+++ b/source/text/scalc/00/0404.xhp
@@ -166,7 +166,7 @@
 
 Choose Insert - Names
 
-Choose Insert - Link to External 
data
+Choose Sheet - Link to External 
data
 
 
 Choose Insert - Names - Define
diff --git a/source/text/scalc/guide/cellreferences_url.xhp 
b/source/text/scalc/guide/cellreferences_url.xhp
index ea86b3d..f34d34d 100644
--- a/source/text/scalc/guide/cellreferences_url.xhp
+++ b/source/text/scalc/guide/cellreferences_url.xhp
@@ -41,7 +41,7 @@ oldref="15">In a $[officename] Calc document, position the cursor in the cell 
into which you want to insert the external data.
 
 
-Choose Insert - Link to External Data. 
The External Data dialog appears.
+Choose Sheet - Link to External Data. 
The External Data dialog appears.
 
 
 Enter the URL of the document or Web page in the dialog. The URL 
must be in the format: http://www.my-bank.com/table.html. The URL for local or 
local area network files is the path seen in the File - 
Open dialog.
@@ -63,4 +63,4 @@ oldref="15">
 
 
-
\ No newline at end of file
+
diff --git a/source/text/scalc/guide/webquery.xhp 
b/source/text/scalc/guide/webquery.xhp
index 6fa3a43..65d7962 100644
--- a/source/text/scalc/guide/webquery.xhp
+++ b/source/text/scalc/guide/webquery.xhp
@@ -49,7 +49,7 @@
 Set the cell cursor at the cell where the new content will be 
inserted.
 
 
-Choose Insert - Link to External Data. This opens the 
External Data dialog.
+Choose Sheet - Link to External Data. This opens the 
External Data dialog.
 
 
 Enter the URL 
of the HTML document or the name of the spreadsheet. Press Enter when finished. 
Click the Browse button to open a file selection 
dialog.only after Enter the URL will be requested from the 
net.
___
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 9be3f4378eb556c26d41a03c42771821687fa138
Author: Gabor Kelemen 
Date:   Fri Nov 25 09:33:45 2016 +0100

Updated core
Project: help  565f827138ee50a0754de1e0c9d9d16feb28076f

tdf#103968 'Link to External Data' is now in the Sheet menu

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

diff --git a/helpcontent2 b/helpcontent2
index 6025b3e..565f827 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 6025b3e9288965cebf6d5ee7bff8bf4338d1391e
+Subproject commit 565f827138ee50a0754de1e0c9d9d16feb28076f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 cui/source/options/optsave.cxx |   20 +++-
 1 file changed, 15 insertions(+), 5 deletions(-)

New commits:
commit 14171010959a4ebf0f6373b6e7f20d1f0741d5a4
Author: Andras Timar 
Date:   Sat Nov 26 17:00:43 2016 +0100

respect read-only config items in Options - Load/Save - General dialog

Change-Id: I110e8eb2b858c8b86b01d46bec40873939ae53d8
Reviewed-on: https://gerrit.libreoffice.org/31236
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 09d5a92..8ca666b 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -397,8 +397,10 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
 SvtSaveOptions aSaveOpt;
 aLoadUserSettingsCB->Check(aSaveOpt.IsLoadUserSettings());
 aLoadUserSettingsCB->SaveValue();
+
aLoadUserSettingsCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_USEUSERDATA));
 aLoadDocPrinterCB->Check( aSaveOpt.IsLoadDocumentPrinter() );
 aLoadDocPrinterCB->SaveValue();
+
aLoadDocPrinterCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_LOADDOCPRINTER));
 
 if ( !pImpl->bInitialized )
 {
@@ -471,25 +473,33 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
 }
 
 aDocInfoCB->Check(aSaveOpt.IsDocInfoSave());
+aDocInfoCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_DOCINFSAVE));
 
 aBackupCB->Check(aSaveOpt.IsBackup());
-bool bBackupRO = aSaveOpt.IsReadOnly(SvtSaveOptions::E_BACKUP);
-aBackupCB->Enable(!bBackupRO);
+aBackupCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_BACKUP));
 
 aAutoSaveCB->Check(aSaveOpt.IsAutoSave());
+aAutoSaveCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_AUTOSAVE));
+
 aUserAutoSaveCB->Check(aSaveOpt.IsUserAutoSave());
+
aUserAutoSaveCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_USERAUTOSAVE));
+
 aWarnAlienFormatCB->Check(aSaveOpt.IsWarnAlienFormat());
 
aWarnAlienFormatCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_WARNALIENFORMAT));
 
-aAutoSaveEdit->SetValue( aSaveOpt.GetAutoSaveTime() );
+aAutoSaveEdit->SetValue(aSaveOpt.GetAutoSaveTime());
+
aAutoSaveEdit->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_AUTOSAVETIME));
 
 // save relatively
-aRelativeFsysCB->Check( aSaveOpt.IsSaveRelFSys() );
+aRelativeFsysCB->Check(aSaveOpt.IsSaveRelFSys());
+
aRelativeFsysCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_SAVERELFSYS));
 
-aRelativeInetCB->Check( aSaveOpt.IsSaveRelINet() );
+aRelativeInetCB->Check(aSaveOpt.IsSaveRelINet());
+
aRelativeInetCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_SAVERELINET));
 
 void* pDefaultVersion = reinterpret_cast( 
aSaveOpt.GetODFDefaultVersion() );
 aODFVersionLB->SelectEntryPos( aODFVersionLB->GetEntryPos( pDefaultVersion 
) );
+
aODFVersionLB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_ODFDEFAULTVERSION));
 
 AutoClickHdl_Impl( aAutoSaveCB );
 ODFVersionHdl_Impl( *aODFVersionLB );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - cui/source

[Andras Timar]

 cui/source/options/optsave.cxx |   20 +++-
 1 file changed, 15 insertions(+), 5 deletions(-)

New commits:
commit 5f9bd7677047abfc9d3bde0db78f74ff23204f0d
Author: Andras Timar 
Date:   Sat Nov 26 17:00:43 2016 +0100

respect read-only config items in Options - Load/Save - General dialog

Change-Id: I110e8eb2b858c8b86b01d46bec40873939ae53d8
Reviewed-on: https://gerrit.libreoffice.org/31237
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 09d5a92..8ca666b 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -397,8 +397,10 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
 SvtSaveOptions aSaveOpt;
 aLoadUserSettingsCB->Check(aSaveOpt.IsLoadUserSettings());
 aLoadUserSettingsCB->SaveValue();
+
aLoadUserSettingsCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_USEUSERDATA));
 aLoadDocPrinterCB->Check( aSaveOpt.IsLoadDocumentPrinter() );
 aLoadDocPrinterCB->SaveValue();
+
aLoadDocPrinterCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_LOADDOCPRINTER));
 
 if ( !pImpl->bInitialized )
 {
@@ -471,25 +473,33 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
 }
 
 aDocInfoCB->Check(aSaveOpt.IsDocInfoSave());
+aDocInfoCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_DOCINFSAVE));
 
 aBackupCB->Check(aSaveOpt.IsBackup());
-bool bBackupRO = aSaveOpt.IsReadOnly(SvtSaveOptions::E_BACKUP);
-aBackupCB->Enable(!bBackupRO);
+aBackupCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_BACKUP));
 
 aAutoSaveCB->Check(aSaveOpt.IsAutoSave());
+aAutoSaveCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_AUTOSAVE));
+
 aUserAutoSaveCB->Check(aSaveOpt.IsUserAutoSave());
+
aUserAutoSaveCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_USERAUTOSAVE));
+
 aWarnAlienFormatCB->Check(aSaveOpt.IsWarnAlienFormat());
 
aWarnAlienFormatCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_WARNALIENFORMAT));
 
-aAutoSaveEdit->SetValue( aSaveOpt.GetAutoSaveTime() );
+aAutoSaveEdit->SetValue(aSaveOpt.GetAutoSaveTime());
+
aAutoSaveEdit->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_AUTOSAVETIME));
 
 // save relatively
-aRelativeFsysCB->Check( aSaveOpt.IsSaveRelFSys() );
+aRelativeFsysCB->Check(aSaveOpt.IsSaveRelFSys());
+
aRelativeFsysCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_SAVERELFSYS));
 
-aRelativeInetCB->Check( aSaveOpt.IsSaveRelINet() );
+aRelativeInetCB->Check(aSaveOpt.IsSaveRelINet());
+
aRelativeInetCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_SAVERELINET));
 
 void* pDefaultVersion = reinterpret_cast( 
aSaveOpt.GetODFDefaultVersion() );
 aODFVersionLB->SelectEntryPos( aODFVersionLB->GetEntryPos( pDefaultVersion 
) );
+
aODFVersionLB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_ODFDEFAULTVERSION));
 
 AutoClickHdl_Impl( aAutoSaveCB );
 ODFVersionHdl_Impl( *aODFVersionLB );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tamás Zolnai]

 accessibility/source/standard/vclxaccessiblebox.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c1afa80bb3613c9202fa9d83447fdd5d57667cb6
Author: Tamás Zolnai 
Date:   Sat Nov 26 18:22:42 2016 +

tdf#99687: Find Text widget fails to emit object:text-caret-moved events

Must be an integration bug:
efb23f29983f87104a684e7fab00b84fc59d131d

Change-Id: I53b15975fb97a299103fab870307b03b2607e9e5
Reviewed-on: https://gerrit.libreoffice.org/31238
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 

diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx 
b/accessibility/source/standard/vclxaccessiblebox.cxx
index 6f3997e..4a28c71 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -236,7 +236,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const 
VclWindowEvent& rVclWindowEven
 
 case VCLEVENT_EDIT_MODIFY:
 case VCLEVENT_EDIT_SELECTIONCHANGED:
- // case VCLEVENT_EDIT_CARETCHANGED:
+case VCLEVENT_EDIT_CARETCHANGED:
 // Modify/Selection events are handled by the combo box instead of
 // directly by the edit field (Why?).  Therefore, delegate this
 // call to the edit field.
___
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.1' - cui/source

[Andras Timar]

 cui/source/options/optsave.cxx |   20 +++-
 1 file changed, 15 insertions(+), 5 deletions(-)

New commits:
commit 42f5548b0e3c6c843571a2cdf58bd9a70779495e
Author: Andras Timar 
Date:   Sat Nov 26 17:00:43 2016 +0100

respect read-only config items in Options - Load/Save - General dialog

Change-Id: I110e8eb2b858c8b86b01d46bec40873939ae53d8

diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index e1b63ce..f5cf2b2 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -399,8 +399,10 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
 SvtSaveOptions aSaveOpt;
 aLoadUserSettingsCB->Check(aSaveOpt.IsLoadUserSettings());
 aLoadUserSettingsCB->SaveValue();
+
aLoadUserSettingsCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_USEUSERDATA));
 aLoadDocPrinterCB->Check( aSaveOpt.IsLoadDocumentPrinter() );
 aLoadDocPrinterCB->SaveValue();
+
aLoadDocPrinterCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_LOADDOCPRINTER));
 
 if ( !pImpl->bInitialized )
 {
@@ -473,25 +475,33 @@ void SvxSaveTabPage::Reset( const SfxItemSet* )
 }
 
 aDocInfoCB->Check(aSaveOpt.IsDocInfoSave());
+aDocInfoCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_DOCINFSAVE));
 
 aBackupCB->Check(aSaveOpt.IsBackup());
-bool bBackupRO = aSaveOpt.IsReadOnly(SvtSaveOptions::E_BACKUP);
-aBackupCB->Enable(!bBackupRO);
+aBackupCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_BACKUP));
 
 aAutoSaveCB->Check(aSaveOpt.IsAutoSave());
+aAutoSaveCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_AUTOSAVE));
+
 aUserAutoSaveCB->Check(aSaveOpt.IsUserAutoSave());
+
aUserAutoSaveCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_USERAUTOSAVE));
+
 aWarnAlienFormatCB->Check(aSaveOpt.IsWarnAlienFormat());
 
aWarnAlienFormatCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_WARNALIENFORMAT));
 
-aAutoSaveEdit->SetValue( aSaveOpt.GetAutoSaveTime() );
+aAutoSaveEdit->SetValue(aSaveOpt.GetAutoSaveTime());
+
aAutoSaveEdit->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_AUTOSAVETIME));
 
 // save relatively
-aRelativeFsysCB->Check( aSaveOpt.IsSaveRelFSys() );
+aRelativeFsysCB->Check(aSaveOpt.IsSaveRelFSys());
+
aRelativeFsysCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_SAVERELFSYS));
 
-aRelativeInetCB->Check( aSaveOpt.IsSaveRelINet() );
+aRelativeInetCB->Check(aSaveOpt.IsSaveRelINet());
+
aRelativeInetCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_SAVERELINET));
 
 void* pDefaultVersion = reinterpret_cast( 
aSaveOpt.GetODFDefaultVersion() );
 aODFVersionLB->SelectEntryPos( aODFVersionLB->GetEntryPos( pDefaultVersion 
) );
+
aODFVersionLB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_ODFDEFAULTVERSION));
 
 AutoClickHdl_Impl( aAutoSaveCB );
 ODFVersionHdl_Impl( *aODFVersionLB );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

 include/unotest/directories.hxx|2 --
 test/source/screenshot_test.cxx|   10 +-
 unotest/source/cpp/directories.cxx |2 --
 3 files changed, 5 insertions(+), 9 deletions(-)

New commits:
commit bc13c1c2bab46135ef7c05fa1a772989f8ff4460
Author: Christian Lohmaier 
Date:   Thu Nov 24 11:26:21 2016 +0100

screenshots: builddir is not neccessarily same as srcdir

Change-Id: Ic7d3d7854eeb5511d5e94e7329fcffa8a3ccba34
Reviewed-on: https://gerrit.libreoffice.org/31160
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/include/unotest/directories.hxx b/include/unotest/directories.hxx
index 3e44558..ae105d9 100644
--- a/include/unotest/directories.hxx
+++ b/include/unotest/directories.hxx
@@ -40,10 +40,8 @@ public:
 // return a URL to a given c-str path from the workdir directory
 OUString getURLFromWorkdir( const char *pPath );
 
-#ifdef _WIN32
 // return a Path to a given c-str path from the workdir directory
 OUString getPathFromWorkdir( const char *pPath );
-#endif
 };
 
 }
diff --git a/test/source/screenshot_test.cxx b/test/source/screenshot_test.cxx
index b4e8633..dcd0bef 100644
--- a/test/source/screenshot_test.cxx
+++ b/test/source/screenshot_test.cxx
@@ -36,7 +36,7 @@ using namespace css;
 using namespace css::uno;
 
 ScreenshotTest::ScreenshotTest()
-:   m_aScreenshotDirectory("/workdir/screenshots/"),
+:   m_aScreenshotDirectory("/screenshots/"),
 maKnownDialogs()
 {
 SvtSysLocaleOptions localeOptions;
@@ -54,8 +54,8 @@ void ScreenshotTest::setUp()
 mxDesktop = css::frame::Desktop::create( 
comphelper::getComponentContext(getMultiServiceFactory()) );
 CPPUNIT_ASSERT_MESSAGE("no desktop!", mxDesktop.is());
 
-osl::FileBase::RC err = osl::Directory::create( 
m_directories.getURLFromSrc( m_aScreenshotDirectory ) );
-CPPUNIT_ASSERT_MESSAGE( "Failed to create screenshot directory", (err == 
osl::FileBase::E_None || err == osl::FileBase::E_EXIST) );
+osl::FileBase::RC err = osl::Directory::create( 
m_directories.getURLFromWorkdir( OUStringToOString(m_aScreenshotDirectory, 
RTL_TEXTENCODING_UTF8).getStr())) ;
+CPPUNIT_ASSERT_MESSAGE(OUStringToOString("Failed to create screenshot 
directory - " + m_directories.getURLFromWorkdir( 
OUStringToOString(m_aScreenshotDirectory, RTL_TEXTENCODING_UTF8).getStr()), 
RTL_TEXTENCODING_UTF8).getStr(), (err == osl::FileBase::E_None || err == 
osl::FileBase::E_EXIST) );
 
 // initialize maKnownDialogs
 if (maKnownDialogs.empty())
@@ -70,11 +70,11 @@ void ScreenshotTest::implSaveScreenshot(const Bitmap& 
rScreenshot, const OString
 splitHelpId(rScreenshotId, aDirname, aBasename);
 aDirname = m_aScreenshotDirectory + maCurrentLanguage + "/" + aDirname;
 
-osl::FileBase::RC err = 
osl::Directory::createPath(m_directories.getURLFromSrc(aDirname));
+osl::FileBase::RC err = 
osl::Directory::createPath(m_directories.getURLFromWorkdir(OUStringToOString(aDirname,RTL_TEXTENCODING_UTF8).getStr()));
 CPPUNIT_ASSERT_MESSAGE(OUStringToOString("Failed to create " + aDirname, 
RTL_TEXTENCODING_UTF8).getStr(),
 (err == osl::FileBase::E_None || err == osl::FileBase::E_EXIST));
 
-OUString aFullPath = m_directories.getSrcRootPath() + aDirname + "/" + 
aBasename + ".png";
+OUString aFullPath = 
m_directories.getPathFromWorkdir(OUStringToOString(aDirname + "/" + aBasename + 
".png",RTL_TEXTENCODING_UTF8).getStr());
 SvFileStream aNew(aFullPath, StreamMode::WRITE | StreamMode::TRUNC);
 CPPUNIT_ASSERT_MESSAGE(OUStringToOString("Failed to open " + 
OUString::number(aNew.GetErrorCode()), RTL_TEXTENCODING_UTF8).getStr(), 
aNew.IsOpen());
 
diff --git a/unotest/source/cpp/directories.cxx 
b/unotest/source/cpp/directories.cxx
index 55084a2..508af53 100644
--- a/unotest/source/cpp/directories.cxx
+++ b/unotest/source/cpp/directories.cxx
@@ -59,11 +59,9 @@ OUString test::Directories::getURLFromWorkdir( const char 
*pPath )
 return m_aWorkdirRootURL + OUString::createFromAscii( pPath );
 }
 
-#ifdef _WIN32 // ifdef just to keep it out of unusedcode.easy
 OUString test::Directories::getPathFromWorkdir( const char *pPath )
 {
 return m_aWorkdirRootPath + OUString::createFromAscii( pPath );
 }
-#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

 android/source/AndroidManifest.xml|2 +-
 android/source/ic_launcher-web.png|binary
 android/source/res/mipmap-hdpi/ic_launcher.png|binary
 android/source/res/mipmap-mdpi/ic_launcher.png|binary
 android/source/res/mipmap-xhdpi/ic_launcher.png   |binary
 android/source/res/mipmap-xxhdpi/ic_launcher.png  |binary
 android/source/res/mipmap-xxxhdpi/ic_launcher.png |binary
 dev/null  |binary
 8 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e40a2670d1a0146d523ba65a9d9ceecceb8c78c4
Author: Christian Lohmaier 
Date:   Fri Nov 25 16:05:26 2016 +0100

android: launcher icon should be mipmap, not drawable

as non-native mipmap resolutions don't get stripped from the apk (as
drawables would), but launchers and similar might still want to show the
higher-res version instead. Google Play store now enforces this.
Also rename to the common name for it ("ic_launcher" instead of "main")

Change-Id: I97318287f05556f5db0afaa0b23c0d8c9628465e
Reviewed-on: https://gerrit.libreoffice.org/31204
Tested-by: Jenkins 
Reviewed-by: Christian Lohmaier 

diff --git a/android/source/AndroidManifest.xml 
b/android/source/AndroidManifest.xml
index d9d8e1e..2c395c1 100644
--- a/android/source/AndroidManifest.xml
+++ b/android/source/AndroidManifest.xml
@@ -10,7 +10,7 @@
 
 https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Repository.mk scp2/source

[Matúš Kukan]

 Repository.mk  |   27 +
 scp2/source/ooo/file_extra_ooo.scp |  182 -
 scp2/source/ooo/file_ooo.scp   |   11 --
 scp2/source/ooo/module_ooo.scp |   23 
 4 files changed, 27 insertions(+), 216 deletions(-)

New commits:
commit 42b959ff7241f955bfa68ee484d81c2d90be5434
Author: Matúš Kukan 
Date:   Fri Nov 25 22:42:42 2016 +0100

tdf#90753: Move extras packages to AutoInstall

Change-Id: I3e1504bb8a68a6142ab4035b2cb81c03d9af9227

diff --git a/Repository.mk b/Repository.mk
index 60c9fa0..2015556 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -780,8 +780,35 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
$(if $(SYSTEM_LIBEXTTEXTCAT),,libexttextcat_fingerprint) \
officecfg_misc \
+   extras_autocorr \
+   extras_autotextuser \
+   extras_cfgsrvnolang \
+   extras_cfgusr \
+   extras_database \
+   extras_databasebiblio \
+   extras_gallbullets \
+   extras_gallhtmlexpo \
+   extras_gallmytheme \
+   extras_gallroot \
+   extras_gallsystem \
+   extras_gallwwwback \
+   extras_gallwwwgraf \
extras_glade \
extras_labels \
+   $(if $(filter WNT,$(OS)),extras_newfiles) \
+   extras_palettes \
+   extras_tplofficorr \
+   extras_tploffimisc \
+   extras_tplpresnt \
+   extras_tpl_styles \
+   extras_tplpersonal \
+   extras_tplwizbitmap \
+   extras_tplwizdesktop \
+   extras_tplwizletter \
+   extras_tplwizfax \
+   extras_tplwizagenda \
+   extras_tplwizreport \
+   extras_tplwizstyles \
framework_dtd \
package_dtd \
xmloff_dtd \
diff --git a/scp2/source/ooo/file_extra_ooo.scp 
b/scp2/source/ooo/file_extra_ooo.scp
index 59a408c..b1a66a9 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -18,13 +18,6 @@
 
 #include "macros.inc"
 
-File gid_File_Extra_Autocorr
-Dir = FILELIST_DIR;
-USER_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_autocorr.filelist";
-End
-
 File gid_File_Extra_Autotextshare_Lang
 Dir = FILELIST_DIR;
 USER_FILE_BODY;
@@ -32,27 +25,6 @@ File gid_File_Extra_Autotextshare_Lang
 EXTRA_ALL_LANG(autotextshare,filelist);
 End
 
-File gid_File_Extra_Autotextuser
-Dir = FILELIST_DIR;
-USER_FILE_BODY;
-Styles = (FILELIST, WORKSTATION, DOCLANG);
-Name = "extras_autotextuser.filelist";
-End
-
-File gid_File_Extra_Cfgusr
-Dir = FILELIST_DIR;
-USER_FILE_BODY;
-Styles = (FILELIST, WORKSTATION);
-Name = "extras_cfgusr.filelist";
-End
-
-File gid_File_Extra_Cfgsrv
-Dir = FILELIST_DIR;
-TXT_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_cfgsrvnolang.filelist";
-End
-
 File gid_File_sd_web
 Dir = FILELIST_DIR;
 TXT_FILE_BODY;
@@ -60,20 +32,6 @@ File gid_File_sd_web
 Name = "sd_web.filelist";
 End
 
-File gid_File_Extra_Database
-Dir = FILELIST_DIR;
-USER_FILE_BODY;
-Styles = (FILELIST, WORKSTATION);
-Name = "extras_database.filelist";
-End
-
-File gid_File_Extra_Databasebiblio
-Dir = FILELIST_DIR;
-USER_FILE_BODY;
-Styles = (FILELIST, WORKSTATION);
-Name = "extras_databasebiblio.filelist";
-End
-
 File gid_File_Extra_Emojiconfig
 Dir = FILELIST_DIR;
 USER_FILE_BODY;
@@ -99,27 +57,6 @@ End
 
 #endif
 
-File gid_File_Extra_Gallbullets
-Dir = FILELIST_DIR;
-TXT_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_gallbullets.filelist";
-End
-
-File gid_File_Extra_Gallhtmlexpo
-Dir = FILELIST_DIR;
-TXT_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_gallhtmlexpo.filelist";
-End
-
-File gid_File_Extra_Gallroot
-Dir = FILELIST_DIR;
-TXT_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_gallroot.filelist";
-End
-
 #if defined (WITH_GALLERY_BUILD)
 
 GALLERY_FILELIST(arrows)
@@ -136,125 +73,6 @@ GALLERY_FILELIST(txtshapes)
 
 #endif
 
-File gid_File_Extra_Gallmytheme
-Dir = FILELIST_DIR;
-USER_FILE_BODY;
-Styles = (FILELIST, WORKSTATION);
-Name = "extras_gallmytheme.filelist";
-End
-
-File gid_File_Extra_Gallsystem
-Dir = FILELIST_DIR;
-TXT_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_gallsystem.filelist";
-End
-
-File gid_File_Extra_Gallwwwback
-Dir = FILELIST_DIR;
-TXT_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_gallwwwback.filelist";
-End
-
-File gid_File_Extra_Gallwwwgraf
-Dir = FILELIST_DIR;
-TXT_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_gallwwwgraf.filelist";
-End
-
-File gid_File_Extra_Palettes
-Dir = FILELIST_DIR;
-USER_FILE_BODY;
-Styles = (FILELIST, WORKSTATION);
-Name = "extras_palettes.filelist";
-End
-
-File gid_File_Extra_Tplofficorr
-Dir = FILELIST_DIR;
-TXT_FILE_BODY;
-Styles = (FILELIST);
-Name = "extras_tplofficorr.filelist";
-End
-
-File gid_File_Extra_Tploffimi

Re: Windows linking errors after removing old Graphite code

[Khaled Hosny]

On Fri, Nov 25, 2016 at 05:12:03PM +0100, Michael Stahl wrote:
> On 24.11.2016 22:04, Khaled Hosny wrote:
> > I’m getting linking after removing the old Graphite integration:
> > https://gerrit.libreoffice.org/#/c/31143/
> > 
> > But I’m getting unexpected linking errors, complaining about almost all
> > Graphite symbol used by HarfBuzz:
> > libharfbuzz.lib(libharfbuzz_la-hb-graphite2.obj) : error LNK2019: 
> > unresolved external symbol __imp__gr_make_face referenced in function 
> > __hb_graphite2_shaper_face_data_create
> > 
> > Full build:
> > http://ci.libreoffice.org/job/lo_gerrit/3105/Config=linux_clang_dbgutil_64/console
> > 
> > My experience with of Windows toolchain is rather primitive, so I’m lost
> > here. I’m guessing that because Graphite is statically linked, after
> > removing the old code the linker does not see the use of these symbols
> > and drops them or something like that. But I’m not sure if I’m guessing
> > right or how to fix this.
> 
> i suspect it's because you remove this file:
> 
> https://gerrit.libreoffice.org/#/c/31143/4/vcl/inc/graphite_static.hxx
> 
> presumably it was included before graphite headers previously, and would
> suppress a __declspec(dllimport) from the graphite headers, so now you
> get unresolved dllimport symbols like "__imp__gr_make_face referenced"
> 
> ... actually no, this is implausible since the unresolved symbols aren't
> in vcl objects but in the harfbuzz static library.
> 
> ... figured it out now, should be fixed with commit
> 086631af59636cd9a6a45b747a1bc59b4b547794, no idea why this doesn't fail
> on current master already.

Thanks, this fixed the build indeed. I guess since HarfBuzz is
statically linked and the symbols were available because of the old code
was including graphite_static.hxx things just worked by accident since
the linking happens in vcl not harfbuzz module (not that I know anything
about how linkers work), I guess it would have been broken if one tried
to build with --disable-graphite.

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

[Libreoffice-commits] core.git: include/vcl sw/source vcl/inc vcl/Library_vcl.mk vcl/quartz vcl/source

[Khaled Hosny]

 include/vcl/outdev.hxx  |5 
 sw/source/core/txtnode/fntcache.cxx |   15 
 vcl/Library_vcl.mk  |2 
 vcl/inc/quartz/salgdi.h |4 
 vcl/inc/sallayout.hxx   |2 
 vcl/quartz/CTRunData.cxx|   94 
 vcl/quartz/CTRunData.hxx|   42 -
 vcl/quartz/ctfonts.cxx  |   17 
 vcl/quartz/ctlayout.cxx |  787 
 vcl/quartz/salgdi.cxx   |   18 
 vcl/source/outdev/text.cxx  |   77 +--
 11 files changed, 40 insertions(+), 1023 deletions(-)

New commits:
commit d761d952f460e1943e94c5a7556b3b01d2259666
Author: Khaled Hosny 
Date:   Fri Nov 25 14:00:07 2016 +0200

Kill old Core Text layout engine

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

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 2403fc9..15bdb8f 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -142,11 +142,10 @@ enum class SalLayoutFlags
 SubstituteDigits= 0x0400,
 KashidaJustification= 0x0800,
 ForFallback = 0x2000,
-DrawBullet  = 0x4000,
 };
 namespace o3tl
 {
-template<> struct typed_flags : 
is_typed_flags {};
+template<> struct typed_flags : 
is_typed_flags {};
 }
 
 typedef std::vector< Rectangle > MetricVector;
@@ -1178,7 +1177,7 @@ private:
 SAL_DLLPRIVATE void ImplInitAboveTextLineSize();
 
 
-SAL_DLLPRIVATE bool ImplDrawTextDirect( SalLayout&, bool 
bTextLines, sal_uInt32 flags = 0 );
+SAL_DLLPRIVATE void ImplDrawTextDirect( SalLayout&, bool 
bTextLines);
 SAL_DLLPRIVATE void ImplDrawSpecialText( SalLayout& );
 SAL_DLLPRIVATE void ImplDrawTextRect( long nBaseX, long nBaseY, 
long nX, long nY, long nWidth, long nHeight );
 
diff --git a/sw/source/core/txtnode/fntcache.cxx 
b/sw/source/core/txtnode/fntcache.cxx
index a92fb87..e89a762 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -1384,10 +1384,8 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
 {
 const OUString* pStr = &rInf.GetText();
 
-#if !defined(MACOSX) && !defined(IOS)
 OUString aStr;
 OUString aBulletOverlay;
-#endif
 bool bBullet = rInf.GetBullet();
 if( m_bSymbol )
 bBullet = false;
@@ -1492,7 +1490,6 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
 
 nScrPos = pScrArray[ 0 ];
 
-#if !defined(MACOSX) && !defined(IOS)
 if( bBullet )
 {
 // !!! HACK !!!
@@ -1532,7 +1529,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
 aBulletOverlay = aBulletOverlay.replaceAt(i, 1, 
OUString(CH_BLANK));
 }
 }
-#endif
+
 sal_Int32 nCnt = rInf.GetText().getLength();
 if ( nCnt < rInf.GetIdx() )
 nCnt = 0;
@@ -1556,16 +1553,11 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
 if ( bSwitchH2V )
 rInf.GetFrame()->SwitchHorizontalToVertical( aTextOriginPos );
 
-#if defined(MACOSX) || defined(IOS)
-rInf.GetOut().DrawTextArray( aTextOriginPos, rInf.GetText(),
- pKernArray, rInf.GetIdx(), 1, bBullet 
? SalLayoutFlags::DrawBullet : SalLayoutFlags::NONE );
-#else
 rInf.GetOut().DrawTextArray( aTextOriginPos, rInf.GetText(),
  pKernArray, rInf.GetIdx(), 1 );
 if( bBullet )
 rInf.GetOut().DrawTextArray( aTextOriginPos, *pStr, pKernArray,
  rInf.GetIdx() ? 1 : 0, 1 );
-#endif
 }
 else
 {
@@ -1746,10 +1738,6 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
 if ( bSwitchH2V )
 rInf.GetFrame()->SwitchHorizontalToVertical( 
aTextOriginPos );
 
-#if defined(MACOSX) || defined(IOS)
-rInf.GetOut().DrawTextArray( aTextOriginPos, *pStr, pKernArray 
+ nOffs,
- rInf.GetIdx() + nOffs , nLen - 
nOffs, bBullet ? SalLayoutFlags::DrawBullet : SalLayoutFlags::NONE );
-#else
 // If we paint bullets instead of spaces, we use a copy of
 // the paragraph string. For the layout engine, the copy
 // of the string has to be an environment of the range which
@@ -1804,7 +1792,6 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
 pTmpFont->SetStrikeout(aPreviousStrikeout);
 rInf.GetOut().Pop();
 }
-#endif
 }
 }
 delete[] pScrArray;
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 48870e4..ce9b6c0 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -422,9 +422,7 @@ vcl_quartz_code= \
 vcl/quartz/salvd \
 
 vcl_coretext_

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

[Khaled Hosny]

 vcl/inc/unx/fontmanager.hxx |  114 ++--
 vcl/inc/unx/printergfx.hxx  |   23 -
 vcl/unx/generic/fontmanager/fontcache.cxx   |  123 +---
 vcl/unx/generic/fontmanager/fontconfig.cxx  |6 
 vcl/unx/generic/fontmanager/fontmanager.cxx |  368 +++---
 vcl/unx/generic/print/genpspgraphics.cxx|   58 +---
 vcl/unx/generic/print/glyphset.cxx  |  319 ---
 vcl/unx/generic/print/glyphset.hxx  |   27 -
 vcl/unx/generic/print/text_gfx.cxx  |  387 
 9 files changed, 196 insertions(+), 1229 deletions(-)

New commits:
commit 30ebc895c95ee66adf172717249aa1789b309eff
Author: Khaled Hosny 
Date:   Fri Nov 25 09:19:15 2016 +0200

There is one font file type now

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

diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
index a7a2753..0a2de15 100644
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -53,14 +53,6 @@ class FontSelectPattern;
 namespace psp {
 class PPDParser;
 
-namespace fonttype
-{
-enum type {
-Unknown = 0,
-TrueType = 2,
-};
-}
-
 /*
  *  the difference between FastPrintFontInfo and PrintFontInfo
  *  is that the information in FastPrintFontInfo can usually
@@ -74,7 +66,6 @@ enum type {
 struct FastPrintFontInfo
 {
 fontID m_nID; // FontID
-fonttype::type m_eType;
 
 // font attributes
 OUString   m_aFamilyName;
@@ -90,7 +81,6 @@ struct FastPrintFontInfo
 
 FastPrintFontInfo()
 : m_nID(0)
-, m_eType(fonttype::Unknown)
 , m_eFamilyStyle(FAMILY_DONTKNOW)
 , m_eItalic(ITALIC_DONTKNOW)
 , m_eWidth(WIDTH_DONTKNOW)
@@ -131,16 +121,13 @@ struct CharacterMetric
 class FontCache;
 
 // a class to manage printable fonts
-// aims are type1 and truetype fonts
 
 class FontCache;
 
 class VCL_PLUGIN_PUBLIC PrintFontManager
 {
 struct PrintFont;
-struct TrueTypeFontFile;
 friend struct PrintFont;
-friend struct TrueTypeFontFile;
 friend class FontCache;
 
 struct PrintFontMetrics
@@ -171,46 +158,37 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
 
 struct PrintFont
 {
-fonttype::type  m_eType;
-
 // font attributes
-int m_nFamilyName;  // atom
-std::vector< int >  m_aAliases;
-int m_nPSName;  // atom
-OUStringm_aStyleName;
-FontItalic  m_eItalic;
-FontWidth   m_eWidth;
-FontWeight  m_eWeight;
-FontPitch   m_ePitch;
-rtl_TextEncodingm_aEncoding;
-CharacterMetric m_aGlobalMetricX;
-CharacterMetric m_aGlobalMetricY;
-PrintFontMetrics*   m_pMetrics;
-int m_nAscend;
-int m_nDescend;
-int m_nLeading;
-int m_nXMin; // font bounding 
box
-int m_nYMin;
-int m_nXMax;
-int m_nYMax;
-bool
m_bHaveVerticalSubstitutedGlyphs;
-boolm_bUserOverride;
-
-explicit PrintFont( fonttype::type eType );
-virtual ~PrintFont();
-virtual bool queryMetricPage( int nPage, utl::MultiAtomProvider* 
pProvider ) = 0;
-};
-
-struct TrueTypeFontFile : public PrintFont
-{
-int   m_nDirectory;   // atom containing system dependent 
path
-OString  m_aFontFile;// relative to directory
-int   m_nCollectionEntry; // 0 for regular fonts, 0 to ... for 
fonts stemming from collections
-unsigned int  m_nTypeFlags;   // copyright bits and PS-OpenType 
flag
-
-TrueTypeFontFile();
-virtual ~TrueTypeFontFile() override;
-virtual bool queryMetricPage( int nPage, utl::MultiAtomProvider* 
pProvider ) override;
+int   m_nFamilyName;  // atom
+std::vector  m_aAliases;
+int   m_nPSName;  // atom
+OUString  m_aStyleName;
+FontItalicm_eItalic;
+FontWidth m_eWidth;
+FontWeightm_eWeight;
+FontPitch m_ePitc

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

[Andras Timar]

 cui/source/options/optopencl.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 8993c3d11e7ff433db98afa9906c755b7ee15ed6
Author: Andras Timar 
Date:   Wed Sep 7 21:00:35 2016 +0200

check for read-only state of OpenCL settings

Reviewed-on: https://gerrit.libreoffice.org/28730
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 6ebca1d1094d8fd85e485e504e810a1954befcc3)

Change-Id: Ia3695d5e4901e527ef847a86e737f6c7eba5085f

diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index 2bf4cfe..a88ca12 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -63,8 +63,10 @@ SvxOpenCLTabPage::SvxOpenCLTabPage(vcl::Window* pParent, 
const SfxItemSet& rSet)
 get(mpDrvVersion,"driverversion");
 
 
mpUseSwInterpreter->Check(officecfg::Office::Common::Misc::UseSwInterpreter::get());
+
mpUseSwInterpreter->Enable(!officecfg::Office::Common::Misc::UseSwInterpreter::isReadOnly());
 
 mpUseOpenCL->Check(maConfig.mbUseOpenCL);
+
mpUseOpenCL->Enable(!officecfg::Office::Common::Misc::UseOpenCL::isReadOnly());
 mpUseOpenCL->SetClickHdl(LINK(this, SvxOpenCLTabPage, EnableOpenCLHdl));
 
 mpBlackListEdit->SetClickHdl(LINK(this, SvxOpenCLTabPage, 
BlackListEditHdl));
@@ -104,6 +106,9 @@ SvxOpenCLTabPage::SvxOpenCLTabPage(vcl::Window* pParent, 
const SfxItemSet& rSet)
 mpBlackList->SetTabs(aTabs, MAP_PIXEL);
 mpWhiteList->SetTabs(aTabs, MAP_PIXEL);
 
+mpBlackListFrame->Enable(maConfig.mbUseOpenCL);
+mpWhiteListFrame->Enable(maConfig.mbUseOpenCL);
+
 }
 
 SvxOpenCLTabPage::~SvxOpenCLTabPage()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Regarding ./setup for download or cloning source code

[Nikhil Kumar vats]

Hello,
I have installed cywgin as mentioned here [
https://wiki.documentfoundation.org/Development/lode]

When I run ./setup its says connection time out. I have proxy in me
internet service with user authentication. I also used
export=http_proxy=http://usern...@userpass...etc etc command in cywgin but
that not worked.
Can anyone give me solution?
 Any help is appreciated.

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

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

[Khaled Hosny]

 vcl/inc/unx/printergfx.hxx   |3 
 vcl/unx/generic/print/genpspgraphics.cxx |  111 +--
 vcl/unx/generic/print/text_gfx.cxx   |   22 --
 3 files changed, 5 insertions(+), 131 deletions(-)

New commits:
commit 368de904974b18dc5a8d237e046c0ed005f7c85d
Author: Khaled Hosny 
Date:   Thu Nov 24 09:21:56 2016 +0200

Kill PspFontLayout

It should never get used any way. CairoTextRender::GetTextLayout()
returns nullptr for the unlikely even that there is no Freetypefont for
the requested fallback level, so we do the same.

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

diff --git a/vcl/inc/unx/printergfx.hxx b/vcl/inc/unx/printergfx.hxx
index 0b0512e..88c04d5 100644
--- a/vcl/inc/unx/printergfx.hxx
+++ b/vcl/inc/unx/printergfx.hxx
@@ -365,8 +365,7 @@ public:
   const sal_Int32* pDeltaArray);
 voidSetTextColor (PrinterColor& rTextColor)
 { maTextColor = rTextColor; }
-sal_Int32   GetCharWidth (sal_uInt16 nFrom, sal_uInt16 nTo,
-  long *pWidthArray);
+
 // for CTL
 voidDrawGlyphs( const Point& rPoint,
 sal_GlyphId* pGlyphIds,
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx 
b/vcl/unx/generic/print/genpspgraphics.cxx
index a02005a..a0f1314 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -553,93 +553,6 @@ LogicalFontInstance* ImplPspFontData::CreateFontInstance( 
FontSelectPattern& rFS
 return pEntry;
 }
 
-class PspFontLayout : public GenericSalLayout
-{
-public:
-explicitPspFontLayout( ::psp::PrinterGfx& );
-virtual boolLayoutText( ImplLayoutArgs& ) override;
-virtual voidInitFont() const override;
-virtual voidDrawText( SalGraphics& ) const override;
-private:
-::psp::PrinterGfx&  mrPrinterGfx;
-sal_IntPtr  mnFontID;
-int mnFontHeight;
-int mnFontWidth;
-boolmbVertical;
-boolmbArtItalic;
-boolmbArtBold;
-};
-
-PspFontLayout::PspFontLayout( ::psp::PrinterGfx& rGfx )
-:   mrPrinterGfx( rGfx )
-{
-mnFontID = mrPrinterGfx.GetFontID();
-mnFontHeight = mrPrinterGfx.GetFontHeight();
-mnFontWidth  = mrPrinterGfx.GetFontWidth();
-mbVertical   = mrPrinterGfx.GetFontVertical();
-mbArtItalic  = mrPrinterGfx.GetArtificialItalic();
-mbArtBold= mrPrinterGfx.GetArtificialBold();
-}
-
-bool PspFontLayout::LayoutText( ImplLayoutArgs& rArgs )
-{
-mbVertical = bool(rArgs.mnFlags & SalLayoutFlags::Vertical);
-
-long nUnitsPerPixel = 1;
-sal_GlyphId aOldGlyphId( GF_DROPPED);
-long nGlyphWidth = 0;
-int nCharPos = -1;
-Point aNewPos( 0, 0 );
-GlyphItem aPrevItem;
-rtl_TextEncoding aFontEnc = mrPrinterGfx.GetFontMgr().getFontEncoding( 
mnFontID );
-const int nLength = rArgs.mrStr.getLength();
-const sal_Unicode *pStr = rArgs.mrStr.getStr();
-Reserve(nLength);
-
-for(;;)
-{
-bool bRightToLeft;
-if( !rArgs.GetNextPos( &nCharPos, &bRightToLeft ) )
-break;
-
-sal_Unicode cChar = pStr[ nCharPos ];
-if( bRightToLeft )
-cChar = GetMirroredChar( cChar );
-// symbol font aliasing: 0x0020-0x00ff -> 0xf020 -> 0xf0ff
-if( aFontEnc == RTL_TEXTENCODING_SYMBOL )
-if( cChar < 256 )
-cChar += 0xf000;
-sal_GlyphId aGlyphId( cChar);  // printer glyphs = unicode
-
-// update fallback_runs if needed
-psp::CharacterMetric aMetric;
-// coverity[callee_ptr_arith]
-mrPrinterGfx.GetFontMgr().getMetrics( mnFontID, cChar, cChar, 
&aMetric, mbVertical );
-if( aMetric.width == -1 && aMetric.height == -1 )
-rArgs.NeedFallback( nCharPos, bRightToLeft );
-
-// finish previous glyph
-if( aOldGlyphId != GF_DROPPED )
-AppendGlyph( aPrevItem );
-aOldGlyphId = aGlyphId;
-aNewPos.X() += nGlyphWidth;
-
-// prepare GlyphItem for appending it in next round
-nUnitsPerPixel = mrPrinterGfx.GetCharWidth( cChar, cChar, &nGlyphWidth 
);
-int nGlyphFlags = bRightToLeft ? GlyphItem::IS_RTL_GLYPH : 0;
-aGlyphId |= GF_ISCHAR;
-aPrevItem = GlyphItem( nCharPos, aGlyphId, aNewPos, nGlyphFlags, 
nGlyphWidth );
-}
-
-// append last glyph item if any
-if( aOldGlyphId != GF_DROPPED )
-AppendGlyph( aPrevItem );
-
-SetOrientation( mrPrinterGfx.GetFontAngle() );
-SetUnitsPerPixel( nUnitsPerPixel );
-return (aOldGlyphId != GF_DROPPED);
-}
-
 class PspCommonSalLayout : public CommonSalLayout
 {
 public:
@@ -676,7 +589,7 @@ void PspCommonSalLayout::InitFont() const
  

[Libreoffice-commits] core.git: vcl/headless vcl/inc vcl/quartz vcl/source vcl/unx vcl/win

[Khaled Hosny]

 vcl/headless/svptext.cxx |9 ++---
 vcl/inc/headless/svpgdi.hxx  |3 +--
 vcl/inc/quartz/salgdi.h  |3 +--
 vcl/inc/salgdi.hxx   |3 +--
 vcl/inc/textrender.hxx   |2 +-
 vcl/inc/unx/cairotextrender.hxx  |2 +-
 vcl/inc/unx/genpspgraphics.h |3 +--
 vcl/inc/unx/salgdi.h |3 +--
 vcl/inc/win/salgdi.h |3 +--
 vcl/quartz/salgdi.cxx|2 +-
 vcl/source/gdi/CommonSalLayout.cxx   |2 +-
 vcl/unx/generic/gdi/cairotextrender.cxx  |4 +++-
 vcl/unx/generic/gdi/font.cxx |9 ++---
 vcl/unx/generic/print/genpspgraphics.cxx |8 +---
 vcl/win/gdi/winlayout.cxx|2 +-
 15 files changed, 19 insertions(+), 39 deletions(-)

New commits:
commit 59859a8aaa75384159e315ee2577d5cc7e2aa6e8
Author: Khaled Hosny 
Date:   Thu Nov 24 01:32:11 2016 +0200

ServerFontLayout is already gone

Kill DrawServerFontLayout, and rename DrawSalLayout to DrawTextLayout,
in parity with GetTextLayout.

Change-Id: I3f61efd8c6ecde64f28301dca6a7c91eb0873702
Reviewed-on: https://gerrit.libreoffice.org/31224
Reviewed-by: Khaled Hosny 
Tested-by: Khaled Hosny 

diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx
index 011a51c..65c7d05 100644
--- a/vcl/headless/svptext.cxx
+++ b/vcl/headless/svptext.cxx
@@ -117,14 +117,9 @@ SalLayout* SvpSalGraphics::GetTextLayout( ImplLayoutArgs& 
rArgs, int nFallbackLe
 return m_aTextRenderImpl.GetTextLayout(rArgs, nFallbackLevel);
 }
 
-void SvpSalGraphics::DrawServerFontLayout( const GenericSalLayout& rSalLayout, 
const FreetypeFont& rFreetypeFont )
+void SvpSalGraphics::DrawTextLayout(const CommonSalLayout& rLayout)
 {
-m_aTextRenderImpl.DrawServerFontLayout( rSalLayout, rFreetypeFont );
-}
-
-void SvpSalGraphics::DrawSalLayout( const CommonSalLayout& rSalLayout )
-{
-DrawServerFontLayout( rSalLayout, rSalLayout.getFontData() );
+m_aTextRenderImpl.DrawTextLayout(rLayout);
 }
 
 void SvpSalGraphics::SetTextColor( SalColor nSalColor )
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 97fd678..a5440e2 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -168,8 +168,7 @@ public:
 virtual boolGetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& 
) override;
 virtual boolGetGlyphOutline( sal_GlyphId nIndex, 
basegfx::B2DPolyPolygon& ) override;
 virtual SalLayout*  GetTextLayout( ImplLayoutArgs&, int nFallbackLevel 
) override;
-virtual voidDrawSalLayout( const CommonSalLayout& ) override;
-virtual voidDrawServerFontLayout( const GenericSalLayout&, 
const FreetypeFont& ) override;
+virtual voidDrawTextLayout( const CommonSalLayout& ) override;
 virtual boolsupportsOperation( OutDevSupportType ) const 
override;
 virtual voiddrawPixel( long nX, long nY ) override;
 virtual voiddrawPixel( long nX, long nY, SalColor nSalColor ) 
override;
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 61fe823..2e3f97d 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -400,8 +400,7 @@ public:
 virtual boolGetGlyphOutline( sal_GlyphId, 
basegfx::B2DPolyPolygon& ) override;
 
 virtual SalLayout*  GetTextLayout( ImplLayoutArgs&, int nFallbackLevel 
) override;
-virtual voidDrawSalLayout( const CommonSalLayout& ) override;
-virtual voidDrawServerFontLayout( const GenericSalLayout&, 
const FreetypeFont& ) override {};
+virtual voidDrawTextLayout( const CommonSalLayout& ) override;
 virtual boolsupportsOperation( OutDevSupportType ) const 
override;
 
 #ifdef MACOSX
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index f61805e..71a8442 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -217,8 +217,7 @@ public:
 virtual boolGetGlyphOutline( sal_GlyphId, 
basegfx::B2DPolyPolygon& ) = 0;
 
 virtual SalLayout*  GetTextLayout( ImplLayoutArgs&, int 
nFallbackLevel ) = 0;
-virtual voidDrawSalLayout( const CommonSalLayout& ) = 0;
-virtual voidDrawServerFontLayout( const GenericSalLayout&, 
const FreetypeFont& ) = 0;
+virtual voidDrawTextLayout( const CommonSalLayout& ) = 0;
 
 virtual boolsupportsOperation( OutDevSupportType ) const = 
0;
 
diff --git a/vcl/inc/textrender.hxx b/vcl/inc/textrender.hxx
index cfd2f97..0c01526 100644
--- a/vcl/inc/textrender.hxx
+++ b/vcl/inc/textrender.hxx
@@ -70,7 +70,7 @@ public:
 virtual boolGetGlyphBoundRect( sal_GlyphId nIndex, 
Rectangle& ) = 0;
 virtual boolGetGlyphOutline( sal_GlyphId nIndex, 
basegfx::B2DPolyPolygon& ) = 0;
 vi

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

[Khaled Hosny]

 include/vcl/outdev.hxx   |3 +--
 vcl/source/gdi/sallayout.cxx |1 -
 vcl/unx/generic/gdi/cairotextrender.cxx  |   13 -
 vcl/unx/generic/print/genpspgraphics.cxx |   18 --
 4 files changed, 9 insertions(+), 26 deletions(-)

New commits:
commit 8c173ce9ba4d90770cd85b148fe3122a097396a7
Author: Khaled Hosny 
Date:   Thu Nov 24 01:12:17 2016 +0200

DisableGlyphProcessing flag is never set now

Change-Id: I4a56c5d7490dd78f5cb72f2b821fb43c93f64b2d
Reviewed-on: https://gerrit.libreoffice.org/31223
Reviewed-by: Khaled Hosny 
Tested-by: Khaled Hosny 

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 0088136..2403fc9 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -141,13 +141,12 @@ enum class SalLayoutFlags
 EnableLigatures = 0x0200,
 SubstituteDigits= 0x0400,
 KashidaJustification= 0x0800,
-DisableGlyphProcessing  = 0x1000,
 ForFallback = 0x2000,
 DrawBullet  = 0x4000,
 };
 namespace o3tl
 {
-template<> struct typed_flags : 
is_typed_flags {};
+template<> struct typed_flags : 
is_typed_flags {};
 }
 
 typedef std::vector< Rectangle > MetricVector;
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 4c15c8f..63a65e6 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -75,7 +75,6 @@ std::ostream &operator <<(std::ostream& s, ImplLayoutArgs 
&rArgs)
 TEST(EnableLigatures);
 TEST(SubstituteDigits);
 TEST(KashidaJustification);
-TEST(DisableGlyphProcessing);
 TEST(ForFallback);
 #undef TEST
 s << "}";
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx 
b/vcl/unx/generic/gdi/cairotextrender.cxx
index ea5ab47..5109470 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -478,17 +478,12 @@ bool CairoTextRender::GetGlyphOutline( sal_GlyphId 
aGlyphId,
 return false;
 }
 
-SalLayout* CairoTextRender::GetTextLayout( ImplLayoutArgs& rArgs, int 
nFallbackLevel )
+SalLayout* CairoTextRender::GetTextLayout(ImplLayoutArgs& /*rArgs*/, int 
nFallbackLevel)
 {
-SalLayout* pLayout = nullptr;
+if (mpFreetypeFont[nFallbackLevel])
+return new CommonSalLayout(*mpFreetypeFont[nFallbackLevel]);
 
-if( mpFreetypeFont[ nFallbackLevel ]
-&& !(rArgs.mnFlags & SalLayoutFlags::DisableGlyphProcessing) )
-{
-pLayout = new CommonSalLayout(*mpFreetypeFont[nFallbackLevel]);
-}
-
-return pLayout;
+return nullptr;
 }
 
 #if ENABLE_CAIRO_CANVAS
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx 
b/vcl/unx/generic/print/genpspgraphics.cxx
index 3f346b5..d6e6c03 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -946,22 +946,12 @@ bool GenPspGraphics::GetGlyphOutline( sal_GlyphId 
aGlyphId,
 return false;
 }
 
-SalLayout* GenPspGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int 
nFallbackLevel )
+SalLayout* GenPspGraphics::GetTextLayout(ImplLayoutArgs& /*rArgs*/, int 
nFallbackLevel)
 {
-if( nFallbackLevel > 0 )
-rArgs.mnFlags &= ~SalLayoutFlags::DisableGlyphProcessing;
-
-GenericSalLayout* pLayout = nullptr;
-
-if( m_pFreetypeFont[ nFallbackLevel ]
-&& !(rArgs.mnFlags & SalLayoutFlags::DisableGlyphProcessing) )
-{
-pLayout = new PspCommonSalLayout(*m_pPrinterGfx, 
*m_pFreetypeFont[nFallbackLevel]);
-}
+if (m_pFreetypeFont[nFallbackLevel])
+return new PspCommonSalLayout(*m_pPrinterGfx, 
*m_pFreetypeFont[nFallbackLevel]);
 else
-pLayout = new PspFontLayout( *m_pPrinterGfx );
-
-return pLayout;
+return new PspFontLayout(*m_pPrinterGfx);
 }
 
 bool GenPspGraphics::CreateFontSubset(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/inc/table.hxx |4 +++-
 sc/source/core/data/documen2.cxx |8 +++-
 sc/source/core/data/table2.cxx   |   23 ---
 3 files changed, 26 insertions(+), 9 deletions(-)

New commits:
commit 6af70ec9d0f87553a7fb795d957d41cf6d2d7c6d
Author: Eike Rathke 
Date:   Sat Nov 26 11:23:24 2016 +0100

Resolves: tdf#103493 copying note captions needs a completed destination 
sheet

If a copied sheet's destination position is before its source position, the
source's ScColumn::nTab members still pointed to the original source 
position
when the captions were created, which led to the wrong drawing layer page 
being
used and at the end the drawing shapes not being correctly assigned.

Change-Id: I9c3cc97d8b4486756023b9ab02da28079a1d0627
(cherry picked from commit 0a2a7436b4041bb34b01a183b9264af8488d1af3)
Reviewed-on: https://gerrit.libreoffice.org/31228
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index e984c2e..da69ea9 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -454,7 +454,9 @@ public:
 sc::CopyToDocContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, 
SCROW nRow2,
 InsertDeleteFlags nFlags, bool bMarked, ScTable* pDestTab,
 const ScMarkData* pMarkData = nullptr, bool bAsLink = false, bool 
bColRowFlags = true,
-bool bGlobalNamesToLocal = false );
+bool bGlobalNamesToLocal = false, bool bCopyCaptions = true );
+
+void CopyCaptionsToTable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW 
nRow2, ScTable* pDestTab, bool bCloneCaption );
 
 void UndoToTable(
 sc::CopyToDocContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, 
SCROW nRow2,
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 20db59e..766aa9f 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -899,7 +899,7 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, 
const ScMarkData* pOnlyM
 sc::CopyToDocContext aCopyDocCxt(*this);
 maTabs[nOldPos]->CopyToTable(aCopyDocCxt, 0, 0, MAXCOL, MAXROW, 
InsertDeleteFlags::ALL,
 (pOnlyMarked != nullptr), maTabs[nNewPos], pOnlyMarked,
-false /*bAsLink*/, true /*bColRowFlags*/, bGlobalNamesToLocal 
);
+false /*bAsLink*/, true /*bColRowFlags*/, bGlobalNamesToLocal, 
false /*bCopyCaptions*/ );
 maTabs[nNewPos]->SetTabBgColor(maTabs[nOldPos]->GetTabBgColor());
 
 SCTAB nDz = nNewPos - nOldPos;
@@ -938,6 +938,12 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, 
const ScMarkData* pOnlyM
 // Copy the RTL settings
 maTabs[nNewPos]->SetLayoutRTL(maTabs[nOldPos]->IsLayoutRTL());
 maTabs[nNewPos]->SetLoadingRTL(maTabs[nOldPos]->IsLoadingRTL());
+
+// Finally copy the note captions, which need
+// 1. the updated source ScColumn::nTab members if nNewPos <= nOldPos
+// 2. row heights and column widths of the destination
+// 3. RTL settings of the destination
+maTabs[nOldPos]->CopyCaptionsToTable( 0, 0, MAXCOL, MAXROW, 
maTabs[nNewPos], true /*bCloneCaption*/);
 }
 
 return bValid;
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 0f817d9..a046bc5 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1089,7 +1089,7 @@ void ScTable::StartListeningFormulaCells(
 void ScTable::CopyToTable(
 sc::CopyToDocContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW 
nRow2,
 InsertDeleteFlags nFlags, bool bMarked, ScTable* pDestTab, const 
ScMarkData* pMarkData,
-bool bAsLink, bool bColRowFlags, bool bGlobalNamesToLocal )
+bool bAsLink, bool bColRowFlags, bool bGlobalNamesToLocal, bool 
bCopyCaptions )
 {
 if (!ValidColRow(nCol1, nRow1) || !ValidColRow(nCol2, nRow2))
 return;
@@ -1209,14 +1209,23 @@ void ScTable::CopyToTable(
 if(nFlags & InsertDeleteFlags::OUTLINE) // also only when bColRowFlags
 pDestTab->SetOutlineTable( pOutlineTable );
 
-if (nFlags & (InsertDeleteFlags::NOTE|InsertDeleteFlags::ADDNOTES))
+if (bCopyCaptions && (nFlags & (InsertDeleteFlags::NOTE | 
InsertDeleteFlags::ADDNOTES)))
 {
 bool bCloneCaption = (nFlags & InsertDeleteFlags::NOCAPTIONS) == 
InsertDeleteFlags::NONE;
-for (SCCOL i = nCol1; i <= nCol2; i++)
-{
-aCol[i].CopyCellNotesToDocument(nRow1, nRow2, pDestTab->aCol[i], 
bCloneCaption);
-pDestTab->aCol[i].UpdateNoteCaptions(nRow1, nRow2);
-}
+CopyCaptionsToTable( nCol1, nRow1, nCol2, nRow2, pDestTab, 
bCloneCaption);
+}
+}
+
+void ScTable::CopyCaptionsToTable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, 
SCROW nRow2, ScTable* pDestTab,
+bool bCloneCaption )
+{
+if (!ValidColRow(nCol1, nRow1) || !ValidColRow(nCol2, nRow2))
+return;
+
+for (SCCOL i = nCol1; i <= nCol2; i++)
+ 

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

[Eike Rathke]

 sc/inc/table.hxx |4 +++-
 sc/source/core/data/documen2.cxx |8 +++-
 sc/source/core/data/table2.cxx   |   23 ---
 3 files changed, 26 insertions(+), 9 deletions(-)

New commits:
commit 0a2a7436b4041bb34b01a183b9264af8488d1af3
Author: Eike Rathke 
Date:   Sat Nov 26 11:23:24 2016 +0100

Resolves: tdf#103493 copying note captions needs a completed destination 
sheet

If a copied sheet's destination position is before its source position, the
source's ScColumn::nTab members still pointed to the original source 
position
when the captions were created, which led to the wrong drawing layer page 
being
used and at the end the drawing shapes not being correctly assigned.

Change-Id: I9c3cc97d8b4486756023b9ab02da28079a1d0627

diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index e984c2e..da69ea9 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -454,7 +454,9 @@ public:
 sc::CopyToDocContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, 
SCROW nRow2,
 InsertDeleteFlags nFlags, bool bMarked, ScTable* pDestTab,
 const ScMarkData* pMarkData = nullptr, bool bAsLink = false, bool 
bColRowFlags = true,
-bool bGlobalNamesToLocal = false );
+bool bGlobalNamesToLocal = false, bool bCopyCaptions = true );
+
+void CopyCaptionsToTable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW 
nRow2, ScTable* pDestTab, bool bCloneCaption );
 
 void UndoToTable(
 sc::CopyToDocContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, 
SCROW nRow2,
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 20db59e..766aa9f 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -899,7 +899,7 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, 
const ScMarkData* pOnlyM
 sc::CopyToDocContext aCopyDocCxt(*this);
 maTabs[nOldPos]->CopyToTable(aCopyDocCxt, 0, 0, MAXCOL, MAXROW, 
InsertDeleteFlags::ALL,
 (pOnlyMarked != nullptr), maTabs[nNewPos], pOnlyMarked,
-false /*bAsLink*/, true /*bColRowFlags*/, bGlobalNamesToLocal 
);
+false /*bAsLink*/, true /*bColRowFlags*/, bGlobalNamesToLocal, 
false /*bCopyCaptions*/ );
 maTabs[nNewPos]->SetTabBgColor(maTabs[nOldPos]->GetTabBgColor());
 
 SCTAB nDz = nNewPos - nOldPos;
@@ -938,6 +938,12 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, 
const ScMarkData* pOnlyM
 // Copy the RTL settings
 maTabs[nNewPos]->SetLayoutRTL(maTabs[nOldPos]->IsLayoutRTL());
 maTabs[nNewPos]->SetLoadingRTL(maTabs[nOldPos]->IsLoadingRTL());
+
+// Finally copy the note captions, which need
+// 1. the updated source ScColumn::nTab members if nNewPos <= nOldPos
+// 2. row heights and column widths of the destination
+// 3. RTL settings of the destination
+maTabs[nOldPos]->CopyCaptionsToTable( 0, 0, MAXCOL, MAXROW, 
maTabs[nNewPos], true /*bCloneCaption*/);
 }
 
 return bValid;
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 0f817d9..a046bc5 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1089,7 +1089,7 @@ void ScTable::StartListeningFormulaCells(
 void ScTable::CopyToTable(
 sc::CopyToDocContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW 
nRow2,
 InsertDeleteFlags nFlags, bool bMarked, ScTable* pDestTab, const 
ScMarkData* pMarkData,
-bool bAsLink, bool bColRowFlags, bool bGlobalNamesToLocal )
+bool bAsLink, bool bColRowFlags, bool bGlobalNamesToLocal, bool 
bCopyCaptions )
 {
 if (!ValidColRow(nCol1, nRow1) || !ValidColRow(nCol2, nRow2))
 return;
@@ -1209,14 +1209,23 @@ void ScTable::CopyToTable(
 if(nFlags & InsertDeleteFlags::OUTLINE) // also only when bColRowFlags
 pDestTab->SetOutlineTable( pOutlineTable );
 
-if (nFlags & (InsertDeleteFlags::NOTE|InsertDeleteFlags::ADDNOTES))
+if (bCopyCaptions && (nFlags & (InsertDeleteFlags::NOTE | 
InsertDeleteFlags::ADDNOTES)))
 {
 bool bCloneCaption = (nFlags & InsertDeleteFlags::NOCAPTIONS) == 
InsertDeleteFlags::NONE;
-for (SCCOL i = nCol1; i <= nCol2; i++)
-{
-aCol[i].CopyCellNotesToDocument(nRow1, nRow2, pDestTab->aCol[i], 
bCloneCaption);
-pDestTab->aCol[i].UpdateNoteCaptions(nRow1, nRow2);
-}
+CopyCaptionsToTable( nCol1, nRow1, nCol2, nRow2, pDestTab, 
bCloneCaption);
+}
+}
+
+void ScTable::CopyCaptionsToTable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, 
SCROW nRow2, ScTable* pDestTab,
+bool bCloneCaption )
+{
+if (!ValidColRow(nCol1, nRow1) || !ValidColRow(nCol2, nRow2))
+return;
+
+for (SCCOL i = nCol1; i <= nCol2; i++)
+{
+aCol[i].CopyCellNotesToDocument(nRow1, nRow2, pDestTab->aCol[i], 
bCloneCaption);
+pDestTab->aCol[i].UpdateNoteCaptions(nRow1, nRow2);
 }
 }
 

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

[Justin Luth]

 dev/null  |binary
 sw/qa/extras/ooxmlexport/data/rhbz988516.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |   13 +
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |   12 
 writerfilter/source/dmapper/DomainMapper.cxx  |1 +
 5 files changed, 14 insertions(+), 12 deletions(-)

New commits:
commit 7b250d56981f78e77454a2a3fd670731b2358e75
Author: Justin Luth 
Date:   Sat Nov 26 12:30:03 2016 +0300

tdf#103975 docx import: don't remove sectPr with BreakItem

If an empty sectPr paragraph contains Page/Column break
information, do not discard it.

Change-Id: If817debccb924eb9cf0ffdc374c960d25908370f
Reviewed-on: https://gerrit.libreoffice.org/31227
Reviewed-by: Justin Luth 
Tested-by: Justin Luth 

diff --git a/sw/qa/extras/ooxmlimport/data/rhbz988516.docx 
b/sw/qa/extras/ooxmlexport/data/rhbz988516.docx
similarity index 100%
rename from sw/qa/extras/ooxmlimport/data/rhbz988516.docx
rename to sw/qa/extras/ooxmlexport/data/rhbz988516.docx
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 2182cbc1..8d117e6 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -61,6 +61,19 @@ DECLARE_OOXMLEXPORT_TEST(testTdf41542_borderlessPadding, 
"tdf41542_borderlessPad
 CPPUNIT_ASSERT_EQUAL( 3, getPages() );
 }
 
+DECLARE_OOXMLEXPORT_TEST(testRhbz988516, "rhbz988516.docx")
+{
+// The problem was that the list properties of the footer leaked into body
+CPPUNIT_ASSERT_EQUAL(OUString(), getProperty(getParagraph(1), 
"NumberingStyleName"));
+CPPUNIT_ASSERT_EQUAL(OUString("Enclosure 3"), 
getParagraph(3)->getString());
+CPPUNIT_ASSERT_EQUAL(OUString(), getProperty(getParagraph(2), 
"NumberingStyleName"));
+CPPUNIT_ASSERT_EQUAL(OUString(), getProperty(getParagraph(3), 
"NumberingStyleName"));
+CPPUNIT_ASSERT_EQUAL(OUString(), getProperty(getParagraph(4), 
"NumberingStyleName"));
+
+// tdf#103975 The problem was that an empty paragraph with page break info 
was removed.
+CPPUNIT_ASSERT_EQUAL( 3, getPages() );
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf103389, "tdf103389.docx")
 {
 xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 1e9a5e6..05a4904 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -175,18 +175,6 @@ DECLARE_OOXMLIMPORT_TEST(testN751017, "n751017.docx")
 CPPUNIT_ASSERT(bFoundGet);
 }
 
-DECLARE_OOXMLIMPORT_TEST(testRhbz988516, "rhbz988516.docx")
-{
-// The problem was that the list properties of the footer leaked into body
-CPPUNIT_ASSERT_EQUAL(OUString(),
-getProperty(getParagraph(1), "NumberingStyleName"));
-CPPUNIT_ASSERT_EQUAL(OUString("Enclosure 3"), 
getParagraph(2)->getString());
-CPPUNIT_ASSERT_EQUAL(OUString(),
-getProperty(getParagraph(2), "NumberingStyleName"));
-CPPUNIT_ASSERT_EQUAL(OUString(),
-getProperty(getParagraph(3), "NumberingStyleName"));
-}
-
 DECLARE_OOXMLIMPORT_TEST(testN751077, "n751077.docx")
 {
 /*
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 18c991b..26168b8 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3267,6 +3267,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, 
size_t len)
 // no runs, we should not create a paragraph for it in Writer, 
unless that would remove the whole section.
 bool bRemove = !m_pImpl->GetParaChanged() && 
m_pImpl->GetParaSectpr()
&& !bSingleParagraph
+   && !( pContext && pContext->isSet(PROP_BREAK_TYPE) )
&& !m_pImpl->GetIsDummyParaAddedForTableInSection()
&& !m_pImpl->GetIsLastParagraphFramed();
 PropertyMapPtr xContext = bRemove ? 
m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH) : PropertyMapPtr();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bartosz Kosiorek]

 sc/source/filter/xml/XMLStylesExportHelper.cxx |   11 ++-
 sc/source/filter/xml/XMLStylesExportHelper.hxx |7 ---
 sc/source/filter/xml/xmldrani.cxx  |4 +---
 sc/source/filter/xml/xmldrani.hxx  |7 +++
 sc/source/filter/xml/xmlfilti.cxx  |2 +-
 sc/source/filter/xml/xmlfilti.hxx  |3 +--
 6 files changed, 16 insertions(+), 18 deletions(-)

New commits:
commit b0c3665b2a74256e8dca9743073c668df30839b4
Author: Bartosz Kosiorek 
Date:   Fri Nov 25 00:53:22 2016 +0100

tdf#48140 Replace uno with direct calls

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

diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx 
b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index 06dd75f..5b1b82f 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -68,9 +68,9 @@ bool ScMyValidation::IsEqual(const ScMyValidation& aVal) const
 if (aVal.bIgnoreBlanks == bIgnoreBlanks &&
 aVal.bShowImputMessage == bShowImputMessage &&
 aVal.bShowErrorMessage == bShowErrorMessage &&
-aVal.aBaseCell.Sheet == aBaseCell.Sheet &&
-aVal.aBaseCell.Column == aBaseCell.Column &&
-aVal.aBaseCell.Row == aBaseCell.Row &&
+aVal.aBaseCell.Tab() == aBaseCell.Tab() &&
+aVal.aBaseCell.Col() == aBaseCell.Col() &&
+aVal.aBaseCell.Row() == aBaseCell.Row() &&
 aVal.aAlertStyle == aAlertStyle &&
 aVal.aValidationType == aValidationType &&
 aVal.aOperator == aOperator &&
@@ -143,7 +143,8 @@ void ScMyValidationsContainer::AddValidation(const 
uno::Any& aTempAny,
 aValidation.sFormula1 = xCondition->getFormula1();
 aValidation.sFormula2 = xCondition->getFormula2();
 aValidation.aOperator = xCondition->getOperator();
-aValidation.aBaseCell = xCondition->getSourcePosition();
+table::CellAddress aCellAddress= 
xCondition->getSourcePosition();
+aValidation.aBaseCell = ScAddress( 
static_cast(aCellAddress.Column), static_cast(aCellAddress.Row), 
aCellAddress.Sheet );
 }
 //ScMyValidationRange aValidationRange;
 bool bEqualFound(false);
@@ -286,7 +287,7 @@ OUString 
ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const ScMy
 return sCondition;
 }
 
-OUString ScMyValidationsContainer::GetBaseCellAddress(ScDocument* pDoc, const 
table::CellAddress& aCell)
+OUString ScMyValidationsContainer::GetBaseCellAddress(ScDocument* pDoc, const 
ScAddress& aCell)
 {
 OUString sAddress;
 ScRangeStringConverter::GetStringFromAddress( sAddress, aCell, pDoc, 
::formula::FormulaGrammar::CONV_OOO );
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx 
b/sc/source/filter/xml/XMLStylesExportHelper.hxx
index 2d385d5..6736212 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.hxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx
@@ -23,9 +23,10 @@
 #include 
 #include 
 #include 
+
+#include "address.hxx"
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -44,7 +45,7 @@ struct ScMyValidation
 OUString   sImputTitle;
 OUString   sFormula1;
 OUString   sFormula2;
-css::table::CellAddress  aBaseCell;
+ScAddress  aBaseCell;
 css::sheet::ValidationAlertStyle aAlertStyle;
 css::sheet::ValidationType   aValidationType;
 css::sheet::ConditionOperatoraOperator;
@@ -83,7 +84,7 @@ public:
 void   AddValidation(const css::uno::Any& aAny,
 sal_Int32& nValidationIndex);
 static OUStringGetCondition(ScXMLExport& rExport, const 
ScMyValidation& aValidation);
-static OUStringGetBaseCellAddress(ScDocument* pDoc, const 
css::table::CellAddress& aCell);
+static OUStringGetBaseCellAddress(ScDocument* pDoc, const 
ScAddress& aCell);
 static voidWriteMessage(ScXMLExport& rExport,
 const OUString& sTitle, const OUString& 
sMessage,
 const bool bShowMessage, const bool 
bIsHelpMessage);
diff --git a/sc/source/filter/xml/xmldrani.cxx 
b/sc/source/filter/xml/xmldrani.cxx
index c525b04..7f81c22 100644
--- a/sc/source/filter/xml/xmldrani.cxx
+++ b/sc/source/filter/xml/xmldrani.cxx
@@ -288,9 +288,7 @@ std::unique_ptr 
ScXMLDatabaseRangeContext::ConvertToDBData(const OUStr
 
 if (bFilterConditionSourceRange)
 {
-ScRange aAdvSource;
-ScUnoConversion::FillScRange(aAdvSource, 
aFilterConditionSourceRangeAddress);
-pData->SetAdvancedQuerySource(&aAdvSource);
+pData->SetAdvancedQuerySource( &aFilterConditionSourceRangeAddress );
 }
 
 {
diff --git a/sc/source/filt

[Libreoffice-commits] core.git: vcl/CustomTarget_afm_hash.mk vcl/inc vcl/Library_vcl.mk vcl/Module_vcl.mk vcl/unx

[Khaled Hosny]

 vcl/CustomTarget_afm_hash.mk |   20 
 vcl/Library_vcl.mk   |3 
 vcl/Module_vcl.mk|1 
 vcl/inc/unx/fontmanager.hxx  |   65 
 vcl/inc/unx/genpspgraphics.h |3 
 vcl/inc/unx/printergfx.hxx   |2 
 vcl/unx/generic/fontmanager/adobe_encoding_table.hxx | 1078 -
 vcl/unx/generic/fontmanager/afm_keyword_list |   62 
 vcl/unx/generic/fontmanager/fontcache.cxx|   42 
 vcl/unx/generic/fontmanager/fontmanager.cxx  |  672 
 vcl/unx/generic/fontmanager/parseAFM.cxx | 1465 ---
 vcl/unx/generic/fontmanager/parseAFM.hxx |  323 
 vcl/unx/generic/gdi/cairotextrender.cxx  |   10 
 vcl/unx/generic/print/genpspgraphics.cxx |   49 
 vcl/unx/generic/print/glyphset.cxx   |  131 -
 vcl/unx/generic/print/glyphset.hxx   |5 
 vcl/unx/generic/print/text_gfx.cxx   |   73 
 17 files changed, 21 insertions(+), 3983 deletions(-)

New commits:
commit abe4d7bd0a1ec4b5a31cc5622080952e4cd53ebf
Author: Khaled Hosny 
Date:   Thu Nov 24 00:53:05 2016 +0200

Kill code for Type 1 fonts on Unix

We already ignore them, so this is unreachable code now.

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

diff --git a/vcl/CustomTarget_afm_hash.mk b/vcl/CustomTarget_afm_hash.mk
deleted file mode 100644
index bf88fb9..000
--- a/vcl/CustomTarget_afm_hash.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/generic/fontmanager))
-
-$(call gb_CustomTarget_get_target,vcl/unx/generic/fontmanager) : \
-   $(call 
gb_CustomTarget_get_workdir,vcl/unx/generic/fontmanager)/afm_hash.hpp
-
-$(call gb_CustomTarget_get_workdir,vcl/unx/generic/fontmanager)/afm_hash.hpp : 
\
-   $(SRCDIR)/vcl/unx/generic/fontmanager/afm_keyword_list \
-   | $(call 
gb_CustomTarget_get_workdir,vcl/unx/generic/fontmanager)/.dir
-   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GPF,1)
-   $(GPERF) -C -t -l -L C++ -m 20 -Z AfmKeywordHash -k '1,4,6,$$' $< | sed 
-e 's/(char\*)0/(char\*)0, NOPE/g' | grep -v '^#line' > $@
-
-# vim: set noet sw=4:
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 990ca11..48870e4 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -35,8 +35,6 @@ endif
 
 $(eval $(call 
gb_Library_set_precompiled_header,vcl,$(SRCDIR)/vcl/inc/pch/precompiled_vcl))
 
-$(eval $(call gb_Library_use_custom_headers,vcl,officecfg/registry 
vcl/unx/generic/fontmanager))
-
 $(eval $(call gb_Library_set_include,vcl,\
 $$(INCLUDE) \
 -I$(SRCDIR)/vcl/inc \
@@ -549,7 +547,6 @@ vcl_headless_freetype_code=\
 vcl/unx/generic/fontmanager/fontconfig \
 vcl/unx/generic/fontmanager/fontmanager \
 vcl/unx/generic/fontmanager/helper \
-vcl/unx/generic/fontmanager/parseAFM \
 vcl/headless/svpcairotextrender \
 vcl/unx/generic/print/bitmap_gfx \
 vcl/unx/generic/print/common_gfx \
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 97e20f0..767d5f7 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -20,7 +20,6 @@
 $(eval $(call gb_Module_Module,vcl))
 
 $(eval $(call gb_Module_add_targets,vcl,\
-CustomTarget_afm_hash \
 Library_vcl \
Package_opengl \
$(if $(filter WNT,$(OS)), \
diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
index 7f0e057..46a951a 100644
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -57,7 +57,6 @@ namespace fonttype
 {
 enum type {
 Unknown = 0,
-Type1 = 1,
 TrueType = 2,
 };
 }
@@ -65,8 +64,8 @@ enum type {
 /*
  *  the difference between FastPrintFontInfo and PrintFontInfo
  *  is that the information in FastPrintFontInfo can usually
- *  be gathered without opening either the font file or
- *  an afm metric file. they are gathered from fonts.dir alone.
+ *  be gathered without opening either the font file, they are
+ *  gathered from fonts.dir alone.
  *  if only FastPrintFontInfo is gathered and PrintFontInfo
  *  on demand and for less fonts, then performance in startup
  *  increases considerably
@@ -88,7 +87,6 @@ struct FastPrintFontInfo
 FontPitch  m_ePitch;
 rtl_TextEncoding   m_aEncoding;
 bool   m_bSubsettable;
-bool   m_bEmbeddable;
 
 FastPrintFontInfo()
 : m_nID(0)
@@ -100,7 +98,6 @@ struct FastPrintFontInfo