[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - filter/source
filter/source/xslt/odf2xhtml/export/xhtml/header.xsl | 24 +++
1 file changed, 15 insertions(+), 9 deletions(-)
New commits:
commit 78a8c751b87c1df5edb9093de368739bd1c09b9e
Author: Andreas Brandner <andreas.brand...@cib.de>
Date: Fri Apr 13 14:07:58 2018 +0200
tdf#116990 Unwanted line breaks if ODS export to XHTML
Change-Id: I86cc48d74f0572a7ba18beabbaf307bcaa069d38
Reviewed-on: https://gerrit.libreoffice.org/53087
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
Reviewed-on: https://gerrit.libreoffice.org/53409
diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
index 6af404c46137..ed1cb3ea6971 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
@@ -86,15 +86,21 @@
table { border-collapse:collapse; border-spacing:0; empty-cells:show
}
-
-
- td, th { vertical-align:top;
font-size:10pt;}
-
- td, th { vertical-align:top;
font-size:12pt;}
-
-
-h1, h2, h3, h4, h5, h6 { clear:both }
-
+
+
+td, th {
vertical-align:top; font-size:10pt;}
+
+td, th { vertical-align:top; font-size:12pt;}
+
+
+h1, h2, h3, h4, h5, h6 { clear:both;}
+
+
+
+p { white-space: nowrap; }
+
+
+
ol, ul { margin:0; padding:0;}
li { list-style: none; margin:0; padding:0;}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/xslt/odf2xhtml/export/xhtml/header.xsl |6 ++
1 file changed, 6 insertions(+)
New commits:
commit cc10b063235dcb25ad16f697ea0b1ff91a10bacb
Author: Andreas Brandner <andreas.brand...@cib.de>
Date: Fri Apr 13 14:07:58 2018 +0200
tdf#116990 Unwanted line breaks if ODS export to XHTML
Change-Id: I86cc48d74f0572a7ba18beabbaf307bcaa069d38
Reviewed-on: https://gerrit.libreoffice.org/53087
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
index b75d6ff7cfda..526e5cc56ae8 100644
--- a/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
+++ b/filter/source/xslt/odf2xhtml/export/xhtml/header.xsl
@@ -93,6 +93,12 @@
h1, h2, h3, h4, h5, h6 { clear:both;}
+
+
+p { white-space: nowrap; }
+
+
+
ol, ul { margin:0; padding:0;}
li { list-style: none; margin:0; padding:0;}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libcmis
external/libcmis/libcmis-fix-error-handling.patch | 14 +- 1 file changed, 13 insertions(+), 1 deletion(-) New commits: commit 974ef69c73a4e62b7513effa5c5b8d46ec0a1c80 Author: Andreas Brandner <andreas.brand...@cib.de> Date: Fri Feb 23 12:25:57 2018 +0100 tdf#115968: make libcmis work better with CIB doxima Change-Id: I1758bcee9a191937ed265dc26212f259a59fffef Reviewed-on: https://gerrit.libreoffice.org/50231 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de> diff --git a/external/libcmis/libcmis-fix-error-handling.patch b/external/libcmis/libcmis-fix-error-handling.patch index 09df7ac9ebe5..d0f1ae29cebc 100644 --- a/external/libcmis/libcmis-fix-error-handling.patch +++ b/external/libcmis/libcmis-fix-error-handling.patch @@ -17,4 +17,16 @@ diff -ur cmis.org/src/libcmis/xml-utils.cxx cmis/src/libcmis/xml-utils.cxx string timeStr = dateTimeStr.substr( teePos + 1 ); // Get the TZ if any - +@@ -459,10 +459,9 @@ + bool value = false; + if ( boolStr == "true" || boolStr == "1" ) + value = true; +-else if ( boolStr == "false" || boolStr == "0" ) +-value = false; + else +-throw Exception( string( "Invalid xsd:boolean input: " ) + boolStr ); ++// treat everthing else, including absence of property, as 'false', not as an error ++value = false; + return value; + } + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/tools tools/inc tools/source
include/tools/poly.hxx|8
tools/inc/poly.h | 14
tools/source/generic/poly.cxx | 1128 --
3 files changed, 558 insertions(+), 592 deletions(-)
New commits:
commit 225115af05cba9a603130914b49c5b28ed451108
Author: Andreas Brandner <andreas.brand...@cib.de>
Date: Fri Sep 15 09:17:17 2017 +0200
tdf#62525 tools: use cow_wrapper class for Polygon
Change-Id: I78f141762f593b36d32eb3eb2cda8fdae54b7277
Reviewed-on: https://gerrit.libreoffice.org/42309
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/include/tools/poly.hxx b/include/tools/poly.hxx
index 223f2c1e6731..a1351aa299a2 100644
--- a/include/tools/poly.hxx
+++ b/include/tools/poly.hxx
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include
@@ -72,10 +73,10 @@ namespace tools {
class SAL_WARN_UNUSED TOOLS_DLLPUBLIC Polygon
{
+public:
+typedef o3tl::cow_wrapper ImplType;
private:
-ImplPolygon*mpImplPolygon;
-
-TOOLS_DLLPRIVATE inline void ImplMakeUnique();
+ImplTypempImplPolygon;
public:
static void ImplReduceEdges( tools::Polygon& rPoly, const double&
rArea, sal_uInt16 nPercent );
@@ -101,6 +102,7 @@ public:
sal_uInt16 nPoints );
Polygon( const tools::Polygon& rPoly );
+Polygon( tools::Polygon&& rPoly);
~Polygon();
voidSetPoint( const Point& rPt, sal_uInt16 nPos );
diff --git a/tools/inc/poly.h b/tools/inc/poly.h
index 835beb8bcffe..4adb7184708e 100644
--- a/tools/inc/poly.h
+++ b/tools/inc/poly.h
@@ -30,17 +30,29 @@ public:
Point* mpPointAry;
PolyFlags* mpFlagAry;
sal_uInt16 mnPoints;
-sal_uInt32 mnRefCount;
};
class SAL_WARN_UNUSED ImplPolygon : public ImplPolygonData
{
public:
+ImplPolygon() { mpPointAry = nullptr; mpFlagAry = nullptr;
mnPoints = 0;};
ImplPolygon( sal_uInt16 nInitSize, bool bFlags = false );
ImplPolygon( sal_uInt16 nPoints, const Point* pPtAry,
const PolyFlags* pInitFlags );
ImplPolygon( const ImplPolygon& rImplPoly );
+ImplPolygon( const tools::Rectangle& rRect );
+ImplPolygon( const tools::Rectangle& rRect, sal_uInt32
nHorzRound, sal_uInt32 nVertRound);
+ImplPolygon( const Point& rCenter, long nRadX, long nRadY
);
+ImplPolygon( const tools::Rectangle& rBound, const Point&
rStart, const Point& rEnd,
+PolyStyle eStyle, bool bFullCircle );
+ImplPolygon( const Point& rBezPt1, const Point& rCtrlPt1,
const Point& rBezPt2,
+const Point& rCtrlPt2, sal_uInt16 nPoints
);
+ImplPolygon(const basegfx::B2DPolygon& rPolygon);
~ImplPolygon();
+booloperator==( const ImplPolygon& rCandidate ) const;
+
+voidImplInitDefault();
+voidImplInitSize(sal_uInt16 nInitSize, bool bFlags = false);
voidImplSetSize( sal_uInt16 nSize, bool bResize = true );
voidImplCreateFlagArray();
boolImplSplit( sal_uInt16 nPos, sal_uInt16 nSpace, ImplPolygon
const * pInitPoly = nullptr );
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 1904d85d5a9d..664428426352 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -53,95 +53,504 @@
#define SMALL_DVALUE0.001
#define FSQRT2 1.4142135623730950488016887242097
-static ImplPolygonData aStaticImplPolygon =
+inline double ImplGetParameter( const Point& rCenter, const Point& rPt, double
fWR, double fHR )
{
-nullptr, nullptr, 0, 0
-};
+const long nDX = rPt.X() - rCenter.X();
+double fAngle = atan2( -rPt.Y() + rCenter.Y(), ( ( nDX == 0 ) ?
0.1 : nDX ) );
+
+return atan2(fWR*sin(fAngle), fHR*cos(fAngle));
+}
+
+ImplPolygon::ImplPolygon( sal_uInt16 nInitSize, bool bFlags )
+{
+ImplInitSize(nInitSize, bFlags);
+}
+
+ImplPolygon::ImplPolygon( const ImplPolygon& rImpPoly )
+{
+if ( rImpPoly.mnPoints )
+{
+mpPointAry = new Point[ rImpPoly.mnPoints ];
+memcpy( mpPointAry,
+rImpPoly.mpPointAry,
+static_cast(rImpPoly.mnPoints)*sizeof(Point) );
+
+if( rImpPoly.mpFlagAry )
+{
+mpFlagAry = new PolyFlags[ rImpPoly.mnPoints ];
+memcpy( mpFlagAry, rImpPoly.mpFlagAry, rImpPoly.mnPoints );
+}
+else
+mpFlagAry = nullptr;
+}
+else
+{
+mpPointAry = nullptr;
+mpFlagAry = n
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sc/uiconfig
sc/uiconfig/scalc/ui/managenamesdialog.ui |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit db4064891122acc5f37bc78d15a310c576caabab Author: Andreas Brandner <andreas.brand...@cib.de> Date: Tue Sep 5 16:29:39 2017 +0200 tdf#111907 Allow box in Manage Names dialog to expand on resizing Reviewed-on: https://gerrit.libreoffice.org/41946 Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> (cherry picked from commit 9c34471f54870fc685c343f4af30310e75d3a9ca) Change-Id: I821e12d771d574dd191d9be86a19c23288902d5b diff --git a/sc/uiconfig/scalc/ui/managenamesdialog.ui b/sc/uiconfig/scalc/ui/managenamesdialog.ui index e4b2a8e42651..642a0caae7dc 100644 --- a/sc/uiconfig/scalc/ui/managenamesdialog.ui +++ b/sc/uiconfig/scalc/ui/managenamesdialog.ui @@ -378,7 +378,7 @@ -False +True True 1 @@ -390,6 +390,9 @@ cancel help + + + column ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - 2 commits - sc/source sw/qa sw/source
Rebased ref, commits from common ancestor:
commit 42327130ab4455eb4fc6f487873cbf83ce21223b
Author: Andreas Brandner <andreas.brand...@cib.de>
Date: Sun Nov 5 20:41:31 2017 +0100
tdf#66401 don't lose docx-combined-characters' font props on roundtrip
- font-size will now get halfed, if exported within a
combined-characters-field in docx
- font-property will get exported for every run in a field, this redundancy
is required by MS Word
Change-Id: Idbdb5bf3066e2ed86b494255d72d66eebf72f755
Reviewed-on: https://gerrit.libreoffice.org/44509
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 467177d013fa..e8cdfc86182c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1740,12 +1740,18 @@ void DocxAttributeOutput::DoWriteCmd( const OUString&
rCmd )
void DocxAttributeOutput::CmdField_Impl( const SwTextNode* pNode, sal_Int32
nPos, FieldInfos const & rInfos, bool bWriteRun )
{
+bool bWriteCombChars(false);
+
// Write the Field instruction
{
if ( bWriteRun )
{
m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
-DoWriteFieldRunProperties( pNode, nPos );
+
+if (rInfos.eType == ww::eEQ)
+bWriteCombChars = true;
+
+DoWriteFieldRunProperties( pNode, nPos, bWriteCombChars );
}
sal_Int32 nNbToken = comphelper::string::getTokenCount(rInfos.sCmd,
'\t');
@@ -1829,7 +1835,7 @@ void DocxAttributeOutput::CmdField_Impl( const
SwTextNode* pNode, sal_Int32 nPos
///
///
/// See, tdf#38778
-void DocxAttributeOutput::DoWriteFieldRunProperties( const SwTextNode * pNode,
sal_Int32 nPos )
+void DocxAttributeOutput::DoWriteFieldRunProperties( const SwTextNode * pNode,
sal_Int32 nPos, bool bWriteCombChars)
{
if (! pNode)
{
@@ -1859,7 +1865,17 @@ void DocxAttributeOutput::DoWriteFieldRunProperties(
const SwTextNode * pNode, s
// 3. output all other character properties
SwWW8AttrIter aAttrIt( m_rExport, *pNode );
-aAttrIt.OutAttr( nPos, false );
+aAttrIt.OutAttr( nPos, false, bWriteCombChars );
+
+// 4. explicitly write the font-properties, to ensure all runs in the
field have them
+// see tdf#66401
+if ( m_pFontsAttrList.is() )
+{
+XFastAttributeListRef xAttrList( m_pFontsAttrList.get() );
+m_pFontsAttrList.clear();
+
+m_pSerializer->singleElementNS( XML_w, XML_rFonts, xAttrList );
+}
m_pSerializer->endElementNS( XML_w, XML_rPr );
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 4c41f83d2f30..64fa4238e617 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -729,7 +729,7 @@ private:
void DoWriteCmd( const OUString& rCmd );
void CmdField_Impl( const SwTextNode* pNode, sal_Int32 nPos, FieldInfos
const & rInfos, bool bWriteRun );
void EndField_Impl( const SwTextNode* pNode, sal_Int32 nPos, FieldInfos&
rInfos );
-void DoWriteFieldRunProperties( const SwTextNode* pNode, sal_Int32 nPos );
+void DoWriteFieldRunProperties( const SwTextNode* pNode, sal_Int32 nPos,
bool bWriteCombChars = false );
virtual void GenerateBookmarksForSequenceField(const SwTextNode& rNode,
SwWW8AttrIter& rAttrIter) override;
static void AddToAttrList(
css::uno::Reference& pAttrList, sal_Int32
nAttrName, const sal_Char* sAttrValue );
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index e9ba18f40d6f..33b67ea5e627 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -382,7 +382,7 @@ static bool lcl_isFontsizeItem( const SfxPoolItem& rItem )
rItem.Which( ) == RES_CHRATR_CTL_FONTSIZE );
}
-void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby )
+void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby , bool
bWriteCombChars)
{
m_rExport.AttrOutput().RTLAndCJKState( IsCharRTL(), GetScript() );
@@ -488,7 +488,7 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby )
// tdf#38778 Fix output of the font in DOC run for fields
const SvxFontItem * pFontToOutput = ( rParentFont != *pFont )? pFont :
nullptr;
-m_rExport.ExportPoolItemsToCHP( aExportItems, GetScript(),
pFontToOutput );
+m_rExport.ExportPoolItemsToCHP( aExportItems, GetScript(),
pFontToOutput, bWriteCombChars );
// HasTextItem only allowed in the above range
m_rExport.m_aCurrentCharPropStarts.pop();
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
ind
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/data/tdf66401.docx |binary
sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx | 13 +
2 files changed, 13 insertions(+)
New commits:
commit ee57d2f8a57ac851c1250f2962ecd1fa987ee3d9
Author: Andreas Brandner <andreas.brand...@cib.de>
Date: Fri Oct 27 15:29:25 2017 +0200
related tdf#66401 docx Combined Characters roundtrip unit test
Change-Id: Ibe11882ab24e9161a36d195497b0a430497d7f79
Reviewed-on: https://gerrit.libreoffice.org/43953
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/sw/qa/extras/ooxmlexport/data/tdf66401.docx
b/sw/qa/extras/ooxmlexport/data/tdf66401.docx
new file mode 100644
index ..2e2ddca375d7
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf66401.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
index 736a4b9e6a24..458c91652873 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
@@ -692,6 +692,19 @@ DECLARE_OOXMLEXPORT_TEST( testTdf85161, "tdf85161.docx" )
CPPUNIT_ASSERT_EQUAL(OUString(u'\x5e'),getParagraph(1)->getString());
}
+DECLARE_OOXMLEXPORT_TEST( testTdf66401, "tdf66401.docx")
+{
+if (xmlDocPtr pXmlDoc = parseExport("word/document.xml"))
+{
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[1]/w:r[3]/w:rPr/w:rFonts", 1);
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[1]/w:r[3]/w:rPr/w:rFonts", "ascii", "Arial Black");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[3]/w:rPr/w:sz",
"val", "24");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[1]/w:r[9]/w:rPr/w:rFonts", 1);
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[1]/w:r[9]/w:rPr/w:rFonts", "ascii", "Arial Black");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[9]/w:rPr/w:sz",
"val", "24");
+}
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* 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: Branch 'private/swe/libreoffice-5-2+backports' - sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 22 +++---
sw/source/filter/ww8/docxattributeoutput.hxx |2 +-
sw/source/filter/ww8/wrtw8nds.cxx|4 ++--
sw/source/filter/ww8/wrtww8.hxx |4 ++--
sw/source/filter/ww8/ww8atr.cxx | 18 --
5 files changed, 40 insertions(+), 10 deletions(-)
New commits:
commit a3dbed366cdebac4e8cad5ecab6e735cd4b4efe3
Author: Andreas Brandner <andreas.brand...@cib.de>
Date: Sun Nov 5 20:41:31 2017 +0100
tdf#66401 don't lose docx-combined-characters' font props on roundtrip
- font-size will now get halfed, if exported within a
combined-characters-field in docx
- font-property will get exported for every run in a field, this redundancy
is required by MS Word
Change-Id: Idbdb5bf3066e2ed86b494255d72d66eebf72f755
Reviewed-on: https://gerrit.libreoffice.org/44509
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 467177d013fa..e8cdfc86182c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1740,12 +1740,18 @@ void DocxAttributeOutput::DoWriteCmd( const OUString&
rCmd )
void DocxAttributeOutput::CmdField_Impl( const SwTextNode* pNode, sal_Int32
nPos, FieldInfos const & rInfos, bool bWriteRun )
{
+bool bWriteCombChars(false);
+
// Write the Field instruction
{
if ( bWriteRun )
{
m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
-DoWriteFieldRunProperties( pNode, nPos );
+
+if (rInfos.eType == ww::eEQ)
+bWriteCombChars = true;
+
+DoWriteFieldRunProperties( pNode, nPos, bWriteCombChars );
}
sal_Int32 nNbToken = comphelper::string::getTokenCount(rInfos.sCmd,
'\t');
@@ -1829,7 +1835,7 @@ void DocxAttributeOutput::CmdField_Impl( const
SwTextNode* pNode, sal_Int32 nPos
///
///
/// See, tdf#38778
-void DocxAttributeOutput::DoWriteFieldRunProperties( const SwTextNode * pNode,
sal_Int32 nPos )
+void DocxAttributeOutput::DoWriteFieldRunProperties( const SwTextNode * pNode,
sal_Int32 nPos, bool bWriteCombChars)
{
if (! pNode)
{
@@ -1859,7 +1865,17 @@ void DocxAttributeOutput::DoWriteFieldRunProperties(
const SwTextNode * pNode, s
// 3. output all other character properties
SwWW8AttrIter aAttrIt( m_rExport, *pNode );
-aAttrIt.OutAttr( nPos, false );
+aAttrIt.OutAttr( nPos, false, bWriteCombChars );
+
+// 4. explicitly write the font-properties, to ensure all runs in the
field have them
+// see tdf#66401
+if ( m_pFontsAttrList.is() )
+{
+XFastAttributeListRef xAttrList( m_pFontsAttrList.get() );
+m_pFontsAttrList.clear();
+
+m_pSerializer->singleElementNS( XML_w, XML_rFonts, xAttrList );
+}
m_pSerializer->endElementNS( XML_w, XML_rPr );
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 4c41f83d2f30..64fa4238e617 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -729,7 +729,7 @@ private:
void DoWriteCmd( const OUString& rCmd );
void CmdField_Impl( const SwTextNode* pNode, sal_Int32 nPos, FieldInfos
const & rInfos, bool bWriteRun );
void EndField_Impl( const SwTextNode* pNode, sal_Int32 nPos, FieldInfos&
rInfos );
-void DoWriteFieldRunProperties( const SwTextNode* pNode, sal_Int32 nPos );
+void DoWriteFieldRunProperties( const SwTextNode* pNode, sal_Int32 nPos,
bool bWriteCombChars = false );
virtual void GenerateBookmarksForSequenceField(const SwTextNode& rNode,
SwWW8AttrIter& rAttrIter) override;
static void AddToAttrList(
css::uno::Reference& pAttrList, sal_Int32
nAttrName, const sal_Char* sAttrValue );
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index e9ba18f40d6f..33b67ea5e627 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -382,7 +382,7 @@ static bool lcl_isFontsizeItem( const SfxPoolItem& rItem )
rItem.Which( ) == RES_CHRATR_CTL_FONTSIZE );
}
-void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby )
+void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby , bool
bWriteCombChars)
{
m_rExport.AttrOutput().RTLAndCJKState( IsCharRTL(), GetScript() );
@@ -488,7 +488,7 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby )
// tdf#38778 Fix output of the font in DOC run for fields
const SvxFontItem * pFontToOutput = ( rParentFont != *pFont )? pFont :
nullptr;
-m_rExport.
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 22 +++---
sw/source/filter/ww8/docxattributeoutput.hxx |2 +-
sw/source/filter/ww8/wrtw8nds.cxx|4 ++--
sw/source/filter/ww8/wrtww8.hxx |4 ++--
sw/source/filter/ww8/ww8atr.cxx | 18 --
5 files changed, 40 insertions(+), 10 deletions(-)
New commits:
commit e4ccf5f597d84f5745d73d306e83594f665024bb
Author: Andreas Brandner <andreas.brand...@cib.de>
Date: Sun Nov 5 20:41:31 2017 +0100
tdf#66401 don't lose docx-combined-characters' font props on roundtrip
Change-Id: Idbdb5bf3066e2ed86b494255d72d66eebf72f755
Reviewed-on: https://gerrit.libreoffice.org/44336
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index d844268dbff3..1ab6cde62852 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1747,12 +1747,18 @@ void DocxAttributeOutput::DoWriteCmd( const OUString&
rCmd )
void DocxAttributeOutput::CmdField_Impl( const SwTextNode* pNode, sal_Int32
nPos, FieldInfos const & rInfos, bool bWriteRun )
{
+bool bWriteCombChars(false);
+
// Write the Field instruction
{
if ( bWriteRun )
{
m_pSerializer->startElementNS( XML_w, XML_r, FSEND );
-DoWriteFieldRunProperties( pNode, nPos );
+
+if (rInfos.eType == ww::eEQ)
+bWriteCombChars = true;
+
+DoWriteFieldRunProperties( pNode, nPos, bWriteCombChars );
}
sal_Int32 nNbToken = comphelper::string::getTokenCount(rInfos.sCmd,
'\t');
@@ -1836,7 +1842,7 @@ void DocxAttributeOutput::CmdField_Impl( const
SwTextNode* pNode, sal_Int32 nPos
///
///
/// See, tdf#38778
-void DocxAttributeOutput::DoWriteFieldRunProperties( const SwTextNode * pNode,
sal_Int32 nPos )
+void DocxAttributeOutput::DoWriteFieldRunProperties( const SwTextNode * pNode,
sal_Int32 nPos, bool bWriteCombChars)
{
if (! pNode)
{
@@ -1866,7 +1872,17 @@ void DocxAttributeOutput::DoWriteFieldRunProperties(
const SwTextNode * pNode, s
// 3. output all other character properties
SwWW8AttrIter aAttrIt( m_rExport, *pNode );
-aAttrIt.OutAttr( nPos, false );
+aAttrIt.OutAttr( nPos, false, bWriteCombChars );
+
+// 4. explicitly write the font-properties, to ensure all runs in the
field have them
+// see tdf#66401
+if ( m_pFontsAttrList.is() )
+{
+XFastAttributeListRef xAttrList( m_pFontsAttrList.get() );
+m_pFontsAttrList.clear();
+
+m_pSerializer->singleElementNS( XML_w, XML_rFonts, xAttrList );
+}
m_pSerializer->endElementNS( XML_w, XML_rPr );
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 7a09130e23e5..76bfc1a98af0 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -732,7 +732,7 @@ private:
void DoWriteCmd( const OUString& rCmd );
void CmdField_Impl( const SwTextNode* pNode, sal_Int32 nPos, FieldInfos
const & rInfos, bool bWriteRun );
void EndField_Impl( const SwTextNode* pNode, sal_Int32 nPos, FieldInfos&
rInfos );
-void DoWriteFieldRunProperties( const SwTextNode* pNode, sal_Int32 nPos );
+void DoWriteFieldRunProperties( const SwTextNode* pNode, sal_Int32 nPos,
bool bWriteCombChars = false );
virtual void GenerateBookmarksForSequenceField(const SwTextNode& rNode,
SwWW8AttrIter& rAttrIter) override;
static void AddToAttrList(
rtl::Reference& pAttrList, sal_Int32
nAttrName, const sal_Char* sAttrValue );
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index 23208e90a8fc..663036af6b70 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -379,7 +379,7 @@ static bool lcl_isFontsizeItem( const SfxPoolItem& rItem )
rItem.Which( ) == RES_CHRATR_CTL_FONTSIZE );
}
-void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby )
+void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby , bool
bWriteCombChars)
{
m_rExport.AttrOutput().RTLAndCJKState( mbCharIsRTL, GetScript() );
@@ -484,7 +484,7 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby )
// tdf#38778 Fix output of the font in DOC run for fields
const SvxFontItem * pFontToOutput = ( rParentFont != *pFont )? pFont :
nullptr;
-m_rExport.ExportPoolItemsToCHP( aExportItems, GetScript(),
pFontToOutput );
+m_rExport.ExportPoolItemsToCHP( aExportItems, GetScript(),
pFontToOutput, bWriteC
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/generic/window/salframe.cxx |4 1 file changed, 4 insertions(+) New commits: commit 7b2f4b328c68513429657520eca8a8836717c4ec Author: Andreas Brandner <andreas.brand...@cib.de> Date: Fri Oct 20 17:06:13 2017 +0200 Prevent gnome-shell f/ showing 'unresponsive app' during debug LibreOffice advertises NET_WM_PING atom, so mutter rightfully warns of an unresponsive application during debugging. Hack that out unconditionally for dbg_util builds, as per https://bugzilla.redhat.com/show_bug.cgi?id=981149 upstream refuses to make this configurable in any way. Change-Id: I12edbb49a067ad20903ca9b62557ee02c90c8a6e Reviewed-on: https://gerrit.libreoffice.org/43618 Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de> Tested-by: Thorsten Behrens <thorsten.behr...@cib.de> diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index e2eb2ee2d237..03ed240db5b9 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -689,8 +689,12 @@ void X11SalFrame::Init( SalFrameStyleFlags nSalFrameStyle, SalX11Screen nXScreen Atom a[3]; int n = 0; a[n++] = pDisplay_->getWMAdaptor()->getAtom( WMAdaptor::WM_DELETE_WINDOW ); + +#ifndef DBG_UTIL if( pDisplay_->getWMAdaptor()->getAtom( WMAdaptor::NET_WM_PING ) ) a[n++] = pDisplay_->getWMAdaptor()->getAtom( WMAdaptor::NET_WM_PING ); +#endif + if( (nSalFrameStyle & SalFrameStyleFlags::OWNERDRAWDECORATION) ) a[n++] = pDisplay_->getWMAdaptor()->getAtom( WMAdaptor::WM_TAKE_FOCUS ); XSetWMProtocols( GetXDisplay(), GetShellWindow(), a, n ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/uiconfig
starmath/uiconfig/smath/ui/fontsizedialog.ui | 49 +-- 1 file changed, 25 insertions(+), 24 deletions(-) New commits: commit 9e06588a980a6d33cf147c0370a655ad1499bfbe Author: Andreas Brandner <andreas.brand...@cib.de> Date: Fri Sep 15 10:40:37 2017 +0200 Moved Math/Font-Size dialog buttons to the bottom Change-Id: Iac1bd80836d42a136823bafb2290d32c693e0de5 Reviewed-on: https://gerrit.libreoffice.org/42316 Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> diff --git a/starmath/uiconfig/smath/ui/fontsizedialog.ui b/starmath/uiconfig/smath/ui/fontsizedialog.ui index fbf3d50e31b7..98f9c555ec08 100644 --- a/starmath/uiconfig/smath/ui/fontsizedialog.ui +++ b/starmath/uiconfig/smath/ui/fontsizedialog.ui @@ -1,5 +1,5 @@ - + @@ -24,21 +24,19 @@ False +vertical 12 False -vertical -start +end - -gtk-ok + +_Default True True -True -True True -True +True False @@ -47,10 +45,12 @@ - -gtk-cancel + +gtk-ok True True +True +True True True @@ -61,8 +61,8 @@ - -gtk-help + +gtk-cancel True True True @@ -75,17 +75,18 @@ - -_Default + +gtk-help True True True -True +True False True 3 +True @@ -118,10 +119,10 @@ True False -0 Base _size: True spinB_baseSize:0pt +0 False @@ -190,10 +191,10 @@ True False -0 _Operators: True spinB_function:0% +0 0 @@ -204,10 +205,10 @@ True False -0 _Limits: True spinB_limit:0% +0 0 @@ -244,10 +245,10 @@ True False -0 _Text: True spinB_text:0% +0 0 @@ -258,10 +259,10 @@ True False -0 _Functions: True spinB_function:0% +0 0 @@ -272,10 +273,10 @@ True False -0 _Indexes: True spinB_index:0% +0 0 @@ -339,11 +340,11 @@ - ok - cancel - help default + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/spelloptionsdialog.ui |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 417bcf6b3e46eb2b5b912fe1df35974a626eabe3 Author: Andreas Brandner <andreas.brand...@cib.de> Date: Fri Sep 15 17:19:51 2017 +0200 tdf#106946 Removed ability to resize Spellchecking-Options dialog Change-Id: I89182eeb01f8639aa7d7af61f0fe99d96568b6e3 Reviewed-on: https://gerrit.libreoffice.org/42330 Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> diff --git a/cui/uiconfig/ui/spelloptionsdialog.ui b/cui/uiconfig/ui/spelloptionsdialog.ui index 34bb3a66e92f..8f0cb94148e5 100644 --- a/cui/uiconfig/ui/spelloptionsdialog.ui +++ b/cui/uiconfig/ui/spelloptionsdialog.ui @@ -1,11 +1,12 @@ - + False 6 Options +False dialog @@ -79,5 +80,8 @@ cancel help + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - cui/source
cui/source/options/optgdlg.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 73e91d3652bbe4cf942464f9a6c582b574d578d1
Author: Andreas Brandner <andreas.brand...@cib.de>
Date: Fri Sep 8 18:51:21 2017 +0200
tdf#108406 offline help-images helpimg are no longer selectable as iconset
Change-Id: I6733ed2a04c01c288de2cd6af938a6c6ff1b4481
Reviewed-on: https://gerrit.libreoffice.org/42117
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
(cherry picked from commit 60adba3fb904ed66251ff39c82fe20bec151ef0b)
Reviewed-on: https://gerrit.libreoffice.org/42140
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 07496d9e6c26..40cbe21b8747 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -665,6 +665,10 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const
SfxItemSet& rSet)
StyleSettings aStyleSettings =
Application::GetSettings().GetStyleSettings();
mInstalledIconThemes = aStyleSettings.GetInstalledIconThemes();
+//Removing "Helpimg" from the list, as it is not a real iconset (see
tdf#108406)
+mInstalledIconThemes.erase(std::remove_if(mInstalledIconThemes.begin(),
mInstalledIconThemes.end(),
+[](vcl::IconThemeInfo theme) { return
theme.GetDisplayName() == "Helpimg";}), mInstalledIconThemes.end());
+
// Start with the automatically chosen icon theme
OUString autoThemeId = aStyleSettings.GetAutomaticallyChosenIconTheme();
const vcl::IconThemeInfo& autoIconTheme =
vcl::IconThemeInfo::FindIconThemeById(mInstalledIconThemes, autoThemeId);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/options/optgdlg.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 60adba3fb904ed66251ff39c82fe20bec151ef0b
Author: Andreas Brandner <andreas.brand...@cib.de>
Date: Fri Sep 8 18:51:21 2017 +0200
tdf#108406 offline help-images helpimg are no longer selectable as iconset
Change-Id: I6733ed2a04c01c288de2cd6af938a6c6ff1b4481
Reviewed-on: https://gerrit.libreoffice.org/42117
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index cded70d2be90..d68454e6f8d8 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -660,6 +660,10 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const
SfxItemSet& rSet)
StyleSettings aStyleSettings =
Application::GetSettings().GetStyleSettings();
mInstalledIconThemes = aStyleSettings.GetInstalledIconThemes();
+//Removing "Helpimg" from the list, as it is not a real iconset (see
tdf#108406)
+mInstalledIconThemes.erase(std::remove_if(mInstalledIconThemes.begin(),
mInstalledIconThemes.end(),
+[](vcl::IconThemeInfo theme) { return
theme.GetDisplayName() == "Helpimg";}), mInstalledIconThemes.end());
+
// Start with the automatically chosen icon theme
OUString autoThemeId = aStyleSettings.GetAutomaticallyChosenIconTheme();
const vcl::IconThemeInfo& autoIconTheme =
vcl::IconThemeInfo::FindIconThemeById(mInstalledIconThemes, autoThemeId);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/uiconfig
starmath/uiconfig/smath/ui/fonttypedialog.ui | 57 +-- 1 file changed, 29 insertions(+), 28 deletions(-) New commits: commit 8cbe2fa1535e475ab48b450a61fc471c3522fce4 Author: Andreas Brandner <andreas.brand...@cib.de> Date: Wed Sep 6 12:26:27 2017 +0200 tdf#101876 Math Fonts dialog: moved buttons to bottom of dialog Change-Id: I588d9a9f2c87e57bc596cdcae823834f500c7d67 Reviewed-on: https://gerrit.libreoffice.org/41984 Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de> Tested-by: Thorsten Behrens <thorsten.behr...@cib.de> diff --git a/starmath/uiconfig/smath/ui/fonttypedialog.ui b/starmath/uiconfig/smath/ui/fonttypedialog.ui index 898426702775..ce4ae9ecd349 100644 --- a/starmath/uiconfig/smath/ui/fonttypedialog.ui +++ b/starmath/uiconfig/smath/ui/fonttypedialog.ui @@ -1,5 +1,5 @@ - + @@ -13,21 +13,19 @@ False +vertical 12 False -vertical -start +end - -gtk-ok + +_Modify True True -True -True True -True +True False @@ -36,8 +34,8 @@ - -gtk-cancel + +gtk-help True True True @@ -46,12 +44,13 @@ False True -1 +0 +True - -_Modify + +_Default True True True @@ -64,10 +63,12 @@ - -gtk-help + +gtk-ok True True +True +True True True @@ -78,12 +79,12 @@ - -_Default + +gtk-cancel True True True -True +True False @@ -131,10 +132,10 @@ True False -0 _Variables: True variableCB +0 @@ -148,10 +149,10 @@ True False -0 _Functions: True functionCB +0 @@ -165,10 +166,10 @@ True False -0 _Numbers: True numberCB +0 @@ -182,10 +183,10 @@ True False -0 _Text: True textCB +0 @@ -284,10 +285,10 @@ True False -0 _Serif: True serifCB +0 @@ -301,10 +302,10 @@ True False -0 S_ans-serif: True sansCB +0 @@ -318,10 +319,10 @@ True False -0
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/managenamesdialog.ui | 13 - 1 file changed, 8 insertions(+), 5 deletions(-) New commits: commit 9c34471f54870fc685c343f4af30310e75d3a9ca Author: Andreas Brandner <andreas.brand...@cib.de> Date: Tue Sep 5 16:29:39 2017 +0200 tdf#111907 Allow box in Manage Names dialog to expand on resizing Change-Id: I821e12d771d574dd191d9be86a19c23288902d5b Reviewed-on: https://gerrit.libreoffice.org/41946 Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> diff --git a/sc/uiconfig/scalc/ui/managenamesdialog.ui b/sc/uiconfig/scalc/ui/managenamesdialog.ui index 058918e7efa5..8f6dc6e88169 100644 --- a/sc/uiconfig/scalc/ui/managenamesdialog.ui +++ b/sc/uiconfig/scalc/ui/managenamesdialog.ui @@ -1,5 +1,5 @@ - + @@ -132,9 +132,9 @@ True False start -0 Name: True +0 0 @@ -146,10 +146,10 @@ True False start -0 Scope: True scope +0 0 @@ -210,10 +210,10 @@ True False start -0 Range or formula expression: True range +0 0 @@ -378,7 +378,7 @@ -False +True True 1 @@ -390,6 +390,9 @@ cancel help + + + column ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/workben
sc/workben/addin.cxx | 547 -
sc/workben/addin.hxx | 92
sc/workben/makefile.mk | 86 ---
sc/workben/map.idl | 31 --
sc/workben/result.cxx | 98
sc/workben/result.hxx | 56 -
sc/workben/testadd.idl | 60 -
7 files changed, 970 deletions(-)
New commits:
commit 571abca0461485380017095087ebe39bc8280b67
Author: Andreas Brandner <andreas.brand...@cib.de>
Date: Tue Sep 5 16:55:48 2017 +0200
Remove add-in demo/test-files in sc/workben
Change-Id: Ie8a887e0a478bfe0fd3d31f895229e3aca553bee
Reviewed-on: https://gerrit.libreoffice.org/41948
Reviewed-by: Eike Rathke <er...@redhat.com>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/sc/workben/addin.cxx b/sc/workben/addin.cxx
deleted file mode 100644
index 0361ff0731cc..
--- a/sc/workben/addin.cxx
+++ /dev/null
@@ -1,547 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-
-#include "addin.hxx"
-#include "result.hxx"
-
-using namespace com::sun::star;
-
-SMART_UNO_IMPLEMENTATION( ScTestAddIn, UsrObject );
-
-#define SCTESTADDIN_SERVICE L"stardiv.one.sheet.DemoAddIn"
-
-extern "C" {
-
-sal_Bool SAL_CALL component_writeInfo(
-void * pServiceManager, registry::XRegistryKey * pRegistryKey )
-{
-if (pRegistryKey)
-{
-try
-{
-UString aImpl = L"/";
-aImpl += ScTestAddIn::getImplementationName_Static();
-aImpl += L"/UNO/SERVICES";
-
-uno::Reference xNewKey(
-
reinterpret_cast<registry::XRegistryKey*>(pRegistryKey)->createKey(aImpl) );
-
-uno::Sequence aSequ =
ScTestAddIn::getSupportedServiceNames_Static();
-const OUString * pArray = aSequ.getConstArray();
-for( INT32 i = 0; i < aSequ.getLength(); i++ )
-xNewKey->createKey( pArray[i] );
-
-return sal_True;
-}
-catch (registry::InvalidRegistryException&)
-{
-OSL_ENSHURE( false, "### InvalidRegistryException!" );
-}
-}
-return false;
-}
-
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
-const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
-{
-void* pRet = 0;
-
-if ( pServiceManager && UString(pImplName) ==
ScTestAddIn::getImplementationName_Static() )
-{
-uno::Reference xFactory(
cppu::createOneInstanceFactory(
-reinterpret_cast<lang::XMultiServiceFactory*>(pServiceManager),
-ScTestAddIn::getImplementationName_Static(),
-ScTestAddIn_CreateInstance,
-ScTestAddIn::getSupportedServiceNames_Static() ) );
-
-if (xFactory.is())
-{
-xFactory->acquire();
-pRet = xFactory.get();
-}
-}
-
-return pRet;
-}
-
-} // extern C
-
-ScTestAddIn::ScTestAddIn()
-{
-}
-
-ScTestAddIn::~ScTestAddIn()
-{
-}
-
-UString ScTestAddIn::getImplementationName_Static()
-{
-return L"stardiv.StarCalc.ScTestAddIn";
-}
-
-css::uno::Sequence< OUString > ScTestAddIn::getSupportedServiceNames_Static()
-{
-uno::Sequence< OUString > aRet(2);
-OUString* pArray = aRet.getArray();
-pArray[0] = L"com.sun.star.sheet.AddIn";
-pArray[1] = SCTESTADDIN_SERVICE;
-return aRet;
-}
-
-uno::Reference ScTestAddIn_CreateInstance(
-const uno::Reference& )
-{
-return (cppu::OWeakObject*)new ScTestAddIn();
-}
-
-// XAddIn
-
-UString ScTestAddIn::getProgrammaticFuntionName(const UString& aDisplayName)
-THROWS( (UsrSystemException) )
-{
-//!...
-return UString();
-}
-
-UString ScTestAddIn::getDisplayFunctionName(const UString& aProgrammaticName)
-
[Libreoffice-commits] core.git: sc/workben
sc/workben/dpcache/perf-test.cpp | 412 ---
sc/workben/opencl/platform_detect.cxx | 76 -
sc/workben/test.cxx | 1887 --
3 files changed, 2375 deletions(-)
New commits:
commit f2edc808762f0fb300923e266dde5d68fa70ace9
Author: Andreas Brandner <andreas.brand...@cib.de>
Date: Tue Sep 5 16:56:46 2017 +0200
Remove sc/workben-files
Change-Id: I0c3f3f212ea6f0e7f99e3b5edffef24bb279b456
Reviewed-on: https://gerrit.libreoffice.org/41937
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Eike Rathke <er...@redhat.com>
diff --git a/sc/workben/dpcache/perf-test.cpp b/sc/workben/dpcache/perf-test.cpp
deleted file mode 100644
index 28e7027207a2..
--- a/sc/workben/dpcache/perf-test.cpp
+++ /dev/null
@@ -1,412 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-using namespace std;
-
-namespace {
-
-class stack_printer
-{
-public:
-explicit stack_printer(const char* msg) :
-msMsg(msg)
-{
-fprintf(stdout, "%s: --begin\n", msMsg.c_str());
-mfStartTime = getTime();
-}
-
-~stack_printer()
-{
-double fEndTime = getTime();
-fprintf(stdout, "%s: --end (duration: %g sec)\n", msMsg.c_str(),
(fEndTime-mfStartTime));
-}
-
-void printTime(int line) const
-{
-double fEndTime = getTime();
-fprintf(stdout, "%s: --(%d) (duration: %g sec)\n", msMsg.c_str(),
line, (fEndTime-mfStartTime));
-}
-
-private:
-double getTime() const
-{
-timeval tv;
-gettimeofday(, NULL);
-return tv.tv_sec + tv.tv_usec / 100.0;
-}
-
-::std::string msMsg;
-double mfStartTime;
-};
-
-
-#if 1
-size_t val_count = 600;
-double multiplier = 30.0;
-bool dump_values = false;
-#else
-size_t val_count = 20;
-double multiplier = 10.0;
-bool dump_values = true;
-#endif
-
-struct field
-{
-std::vector items; /// unique values
-std::vector data; /// original value series as indices into
unique values.
-std::vector order; /// ascending order of the values as indices.
-
-field(const field&) = delete;
-const field operator=(const field&) = delete;
-};
-
-long compare(int left, int right)
-{
-if (left == right)
-return 0;
-if (left < right)
-return -1;
-return 1;
-}
-
-bool has_item(const std::vector& items, const std::vector& order,
int val, long& index)
-{
-index = items.size();
-bool found = false;
-long low = 0;
-long high = items.size() - 1;
-while (low <= high)
-{
-long this_index = (low + high) / 2;
-const long comp_res = compare(items[order[this_index]], val);
-if (comp_res < 0)
-low = this_index + 1;
-else
-{
-high = this_index - 1;
-if (comp_res == 0)
-{
-found = true;
-low = this_index;
-}
-}
-}
-index = low;
-return found;
-}
-
-bool check_items(const std::vector& items)
-{
-if (items.empty())
-return false;
-
-// Items are supposed to be all unique values.
-std::vector copied(items);
-sort(copied.begin(), copied.end());
-copied.erase(unique(copied.begin(), copied.end()), copied.end());
-return copied.size() == items.size();
-}
-
-bool check_order(const std::vector& items, const std::vector&
order)
-{
-// Ensure that the order is truly in ascending order.
-if (items.size() != order.size())
-return false;
-
-if (items.empty())
-return false;
-
-auto it = order.cbegin();
-std::vector::value_type prev = items[*it];
-for (++it; it != order.end(); ++it)
-{
-std::vector::value_type val = items[*it];
-if (prev >= val)
-return false;
-
-prev = val;
-}
-
-return true;
-}
-
-bool check_data(const std::vector& items, const std::vector&
data, const std::vector& original)
-{
-if (items.empty() || data.empty() || original.empty())
-return false;
-
-if (data.size() != original.size())
-return false;
-
-size_t n = data.size();
-for (size_t i = 0; i < n; ++i)
-{
-if (items[data[i]] != original[i])
-return false;
-}
-return true;
-}
-
-bool dump_and_check(const field& fld, const std::vector& original, bool
dump_values)
-{
-cout << "unique item count: " << fld.items.size() << endl;
-
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/tpcolor.cxx | 16
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit b55d2772e7b5f44b139fc7d5cb8b9196fd7ab1d7
Author: Andreas Brandner <andreas.brand...@cib.de>
Date: Tue Sep 5 12:00:45 2017 +0200
tdf#39674 find / fix all German spellings in internal APIs
Change-Id: Idcbfe301c13ffa1260ba3ab0665570db5ccc8112
Reviewed-on: https://gerrit.libreoffice.org/41929
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 3735ced06a89..62cf5e8293d3 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -722,39 +722,39 @@ void SvxColorTabPage::CmykToRgb_Impl( Color& rColor,
const sal_uInt16 nK )
sal_uInt16 SvxColorTabPage::ColorToPercent_Impl( sal_uInt16 nColor )
{
-sal_uInt16 nWert = 0;
+sal_uInt16 nValue = 0;
switch (eCM)
{
case ColorModel::RGB :
-nWert = nColor;
+nValue = nColor;
break;
case ColorModel::CMYK:
-nWert = (sal_uInt16) ( (double) nColor * 100.0 / 255.0 + 0.5 );
+nValue = (sal_uInt16) ( (double) nColor * 100.0 / 255.0 + 0.5 );
break;
}
-return nWert;
+return nValue;
}
sal_uInt16 SvxColorTabPage::PercentToColor_Impl( sal_uInt16 nPercent )
{
-sal_uInt16 nWert = 0;
+sal_uInt16 nValue = 0;
switch (eCM)
{
case ColorModel::RGB :
-nWert = nPercent;
+nValue = nPercent;
break;
case ColorModel::CMYK:
-nWert = (sal_uInt16) ( (double) nPercent * 255.0 / 100.0 + 0.5 );
+nValue = (sal_uInt16) ( (double) nPercent * 255.0 / 100.0 + 0.5 );
break;
}
-return nWert;
+return nValue;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/menufloatingwindow.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit a89c3dc4b0a2ec846af387833474b543b3f149ad
Author: Andreas Brandner <andreas.brand...@cib.de>
Date: Mon Sep 4 18:41:27 2017 +0200
tdf#39468 Translate German comments/terms
Change-Id: I528e7e4b4d365ff512cd03ea22f7517319541e05
Reviewed-on: https://gerrit.libreoffice.org/41907
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/vcl/source/window/menufloatingwindow.cxx
b/vcl/source/window/menufloatingwindow.cxx
index 0204828574e5..d6dd08d4e17e 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -280,7 +280,6 @@ IMPL_LINK_NOARG(MenuFloatingWindow, PopupEnd,
FloatingWindow*, void)
End();
if ( pActivePopup )
{
-//SAL_WARN_IF( pActivePopup->ImplGetWindow(), "vcl", "PopupEnd,
obwohl pActivePopup MIT Window!" );
KillActivePopup(); // should be ok to just remove it
//pActivePopup->bCanceled = true;
}
@@ -357,7 +356,7 @@ IMPL_LINK( MenuFloatingWindow, HighlightChanged, Timer*,
pTimer, void )
sal_uInt16 nRet = pActivePopup->ImplExecute( this,
tools::Rectangle( aItemTopLeft, aItemBottomRight ), FloatWinPopupFlags::Right,
pMenu, pTimer == nullptr );
SetPopupModeFlags( nOldFlags );
-// nRet != 0, wenn es waerend Activate() abgeschossen wurde...
+// nRet != 0, if it was stopped during Activate()...
if ( !nRet && ( pActivePopup == pTest ) &&
pActivePopup->ImplGetWindow() )
pActivePopup->ImplGetFloatingWindow()->AddPopupModeWindow(
this );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
