LibreOffice Gerrit News for submodules on 2014-10-06
Moin! ~~ Project dictionaries ~~ Nothing moved in the project for the last 25 hours ~~ Project translations ~~ Nothing moved in the project for the last 25 hours ~~ Project help ~~ * Open changes on master for project help changed in the last 25 hours: None * Merged changes on master for project help changed in the last 25 hours: + rename Design to Style in Web Wizard in https://gerrit.libreoffice.org/11810 from Stanislav Horáček + update names of menu items for sending e-mails in https://gerrit.libreoffice.org/11809 from Stanislav Horáček * Abandoned changes on master for project help changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 64945] inconvenient localized symbol code
https://bugs.freedesktop.org/show_bug.cgi?id=64945 --- Comment #18 from Urmas davian...@gmail.com --- There are usually no non-latin characters in formulas, so it wouldn't be much of a problem. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/filter/inc/excdoc.hxx |2
sc/source/filter/inc/excform.hxx |4 -
sc/source/filter/inc/expbase.hxx | 14 +--
sc/source/filter/inc/htmlexp.hxx | 20 ++---
sc/source/filter/inc/imp_op.hxx | 16 ++--
sc/source/filter/inc/lotform.hxx | 38 +-
sc/source/filter/inc/namebuff.hxx | 14 +--
sc/source/filter/inc/rtfexp.hxx |2
sc/source/filter/inc/scflt.hxx| 138 +++---
sc/source/filter/inc/tokstack.hxx | 66 +-
10 files changed, 157 insertions(+), 157 deletions(-)
New commits:
commit d7646a56c3555bae8ade3f996f2037472160f90c
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sat Oct 4 06:28:02 2014 -0400
fdo#39468 Translate German Comments - sc/source/filter/inc/
Change-Id: I26eacb2f8ab02c788e82aa6fdcb76d8fa07f64fb
Reviewed-on: https://gerrit.libreoffice.org/11803
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/sc/source/filter/inc/excdoc.hxx b/sc/source/filter/inc/excdoc.hxx
index dc606b6..6188033 100644
--- a/sc/source/filter/inc/excdoc.hxx
+++ b/sc/source/filter/inc/excdoc.hxx
@@ -56,7 +56,7 @@ private:
XclExpNoteListRef mxNoteList;
-// pRec mit new anlegen und vergessen, delete macht ExcTable selber!
+// re-create and forget pRec; delete is done by ExcTable itself!
voidAdd( XclExpRecordBase* pRec );
public:
diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx
index e057420..59e933f 100644
--- a/sc/source/filter/inc/excform.hxx
+++ b/sc/source/filter/inc/excform.hxx
@@ -35,9 +35,9 @@ protected:
enum ExtensionType { EXTENSION_ARRAY, EXTENSION_NLR, EXTENSION_MEMAREA };
typedef ::std::vector ExtensionType ExtensionTypeVec;
-boolbExternName;// wenn External Name gefunden
wurde
+boolbExternName;// external name was found
static const sal_uInt16 nRowMask;
-static const sal_uInt16 nLastInd; // letzter Index fuer Excel-SC-
+static const sal_uInt16 nLastInd; // last Index for Excel-SC-
// Token Umsetzung
XclFunctionProvider maFuncProv;
const XclBiff meBiff;
diff --git a/sc/source/filter/inc/expbase.hxx b/sc/source/filter/inc/expbase.hxx
index 2757113..e564e14 100644
--- a/sc/source/filter/inc/expbase.hxx
+++ b/sc/source/filter/inc/expbase.hxx
@@ -41,19 +41,19 @@ public:
ScExportBase( SvStream, ScDocument*, const ScRange );
virtual ~ScExportBase();
-// Hidden Cols/Rows an den Raendern trimmen,
-// return: sal_True wenn Bereich vorhanden
-// Start/End/Col/Row muessen gueltige Ausgangswerte
sein
+// Trim borders of hidden Cols/Rows,
+// return: sal_True if range exists
+// Start/End/Col/Row must have valid starting values
boolTrimDataArea( SCTAB nTab, SCCOL nStartCol,
SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow )
const;
-// Ausgabebereich einer Tabelle ermitteln,
-// Hidden Cols/Rows an den Raendern beruecksichtigt,
-// return: sal_True wenn Bereich vorhanden
+// Get Data Area of a table,
+// adjust borders of hidden Cols/Rows,
+// return: sal_True if range exists
boolGetDataArea( SCTAB nTab, SCCOL nStartCol,
SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow )
const;
-// Tabelle nicht vorhanden oder leer
+// table does not exist or is empty
boolIsEmptyTable( SCTAB nTab ) const;
ScFieldEditEngine GetEditEngine() const;
diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx
index 6120906..c895d03 100644
--- a/sc/source/filter/inc/htmlexp.hxx
+++ b/sc/source/filter/inc/htmlexp.hxx
@@ -70,11 +70,11 @@ struct ScHTMLStyle
struct ScHTMLGraphEntry
{
-ScRange aRange; // ueberlagerter Zellbereich
-SizeaSize; // Groesse in Pixeln
-SizeaSpace; // Spacing in Pixeln
+ScRange aRange; // mapped range
+SizeaSize; // size in pixels
+SizeaSpace; // spacing in pixels
SdrObject* pObject;
-boolbInCell;// ob in Zelle ausgegeben wird
+boolbInCell;// if output is in cell
boolbWritten;
ScHTMLGraphEntry( SdrObject* pObj, const ScRange rRange,
@@ -109,15 +109,15 @@ class ScHTMLExport : public ScExportBase
OUString
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/CellColorHandler.cxx | 293 +--
writerfilter/source/ooxml/model.xml | 76 ++---
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 46 +--
3 files changed, 180 insertions(+), 235 deletions(-)
New commits:
commit fd7a21d7ea6dd36d4d9b86ecf38ad798af3fb1df
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Oct 6 09:13:05 2014 +0200
Use constants for ST_Shd values
Change-Id: If8fbccf946f589abead0803b7ecbc63ecfc656b2
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx
b/writerfilter/source/dmapper/CellColorHandler.cxx
index 91e758f..9434b2e 100644
--- a/writerfilter/source/dmapper/CellColorHandler.cxx
+++ b/writerfilter/source/dmapper/CellColorHandler.cxx
@@ -52,44 +52,44 @@ uno::Any lcl_ConvertShd(sal_Int32 nIntValue)
// This should be in sync with the ST_Shd list in ooxml's model.xml.
switch (nIntValue)
{
-case 0: aRet = clear; break;
-case 1: aRet = solid; break;
-case 2: aRet = pct5; break;
-case 3: aRet = pct10; break;
-case 4: aRet = pct20; break;
-case 5: aRet = pct25; break;
-case 6: aRet = pct30; break;
-case 7: aRet = pct40; break;
-case 8: aRet = pct50; break;
-case 9: aRet = pct60; break;
-case 10: aRet = pct70; break;
-case 11: aRet = pct75; break;
-case 12: aRet = pct80; break;
-case 13: aRet = pct90; break;
-case 14: aRet = horzStripe; break;
-case 15: aRet = vertStripe; break;
-case 17: aRet = reverseDiagStripe; break;
-case 16: aRet = diagStripe; break;
-case 18: aRet = horzCross; break;
-case 19: aRet = diagCross; break;
-case 20: aRet = thinHorzStripe; break;
-case 21: aRet = thinVertStripe; break;
-case 23: aRet = thinReverseDiagStripe; break;
-case 22: aRet = thinDiagStripe; break;
-case 24: aRet = thinHorzCross; break;
-case 25: aRet = thinDiagCross; break;
-case 37: aRet = pct12; break;
-case 38: aRet = pct15; break;
-case 43: aRet = pct35; break;
-case 44: aRet = pct37; break;
-case 46: aRet = pct45; break;
-case 49: aRet = pct55; break;
-case 51: aRet = pct62; break;
-case 52: aRet = pct65; break;
-case 57: aRet = pct85; break;
-case 58: aRet = pct87; break;
-case 60: aRet = pct95; break;
-case 65535: aRet = nil; break;
+case NS_ooxml::LN_Value_ST_Shd_clear: aRet = clear; break;
+case NS_ooxml::LN_Value_ST_Shd_solid: aRet = solid; break;
+case NS_ooxml::LN_Value_ST_Shd_pct5: aRet = pct5; break;
+case NS_ooxml::LN_Value_ST_Shd_pct10: aRet = pct10; break;
+case NS_ooxml::LN_Value_ST_Shd_pct20: aRet = pct20; break;
+case NS_ooxml::LN_Value_ST_Shd_pct25: aRet = pct25; break;
+case NS_ooxml::LN_Value_ST_Shd_pct30: aRet = pct30; break;
+case NS_ooxml::LN_Value_ST_Shd_pct40: aRet = pct40; break;
+case NS_ooxml::LN_Value_ST_Shd_pct50: aRet = pct50; break;
+case NS_ooxml::LN_Value_ST_Shd_pct60: aRet = pct60; break;
+case NS_ooxml::LN_Value_ST_Shd_pct70: aRet = pct70; break;
+case NS_ooxml::LN_Value_ST_Shd_pct75: aRet = pct75; break;
+case NS_ooxml::LN_Value_ST_Shd_pct80: aRet = pct80; break;
+case NS_ooxml::LN_Value_ST_Shd_pct90: aRet = pct90; break;
+case NS_ooxml::LN_Value_ST_Shd_horzStripe: aRet = horzStripe; break;
+case NS_ooxml::LN_Value_ST_Shd_vertStripe: aRet = vertStripe; break;
+case NS_ooxml::LN_Value_ST_Shd_reverseDiagStripe: aRet =
reverseDiagStripe; break;
+case NS_ooxml::LN_Value_ST_Shd_diagStripe: aRet = diagStripe; break;
+case NS_ooxml::LN_Value_ST_Shd_horzCross: aRet = horzCross; break;
+case NS_ooxml::LN_Value_ST_Shd_diagCross: aRet = diagCross; break;
+case NS_ooxml::LN_Value_ST_Shd_thinHorzStripe: aRet =
thinHorzStripe; break;
+case NS_ooxml::LN_Value_ST_Shd_thinVertStripe: aRet =
thinVertStripe; break;
+case NS_ooxml::LN_Value_ST_Shd_thinReverseDiagStripe: aRet =
thinReverseDiagStripe; break;
+case NS_ooxml::LN_Value_ST_Shd_thinDiagStripe: aRet =
thinDiagStripe; break;
+case NS_ooxml::LN_Value_ST_Shd_thinHorzCross: aRet = thinHorzCross;
break;
+case NS_ooxml::LN_Value_ST_Shd_thinDiagCross: aRet = thinDiagCross;
break;
+case NS_ooxml::LN_Value_ST_Shd_pct12: aRet = pct12; break;
+case NS_ooxml::LN_Value_ST_Shd_pct15: aRet = pct15; break;
+case NS_ooxml::LN_Value_ST_Shd_pct35: aRet = pct35; break;
+case NS_ooxml::LN_Value_ST_Shd_pct37: aRet = pct37; break;
+case NS_ooxml::LN_Value_ST_Shd_pct45: aRet = pct45; break;
+case NS_ooxml::LN_Value_ST_Shd_pct55: aRet = pct55; break;
+case NS_ooxml::LN_Value_ST_Shd_pct62: aRet = pct62; break;
+case NS_ooxml::LN_Value_ST_Shd_pct65: aRet = pct65; break;
[Libreoffice-commits] core.git: include/svx svx/inc svx/source
include/svx/cube3d.hxx|6
include/svx/extrud3d.hxx |2
include/svx/lathe3d.hxx | 22 +--
include/svx/polygn3d.hxx | 72 ++
include/svx/scene3d.hxx |1
include/svx/sdr/contact/viewcontactofe3d.hxx |7
include/svx/sdr/contact/viewcontactofe3dscene.hxx |7
include/svx/sphere3d.hxx |4
svx/inc/dragmt3d.hxx |2
svx/inc/polygn3d.hxx | 72 --
svx/inc/sdr/contact/viewcontactofe3dcube.hxx | 12 -
svx/inc/sdr/contact/viewcontactofe3dextrude.hxx | 11 -
svx/inc/sdr/contact/viewcontactofe3dlathe.hxx | 11 -
svx/inc/sdr/contact/viewcontactofe3dpolygon.hxx | 12 -
svx/inc/sdr/contact/viewcontactofe3dsphere.hxx| 11 -
svx/source/customshapes/EnhancedCustomShape2d.cxx | 48 +++---
svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx |8 -
svx/source/dialog/dlgctl3d.cxx|2
svx/source/dialog/dlgutil.cxx |6
svx/source/dialog/langbox.cxx |8 -
svx/source/engine3d/dragmt3d.cxx |4
svx/source/engine3d/obj3d.cxx | 20 +-
svx/source/engine3d/objfac3d.cxx |2
svx/source/engine3d/polygn3d.cxx |2
svx/source/engine3d/scene3d.cxx | 16 +-
svx/source/engine3d/view3d.cxx| 48 +++---
svx/source/engine3d/view3d1.cxx |6
svx/source/gallery2/galbrws1.cxx |2
svx/source/gallery2/galbrws2.cxx |2
svx/source/gallery2/galctrl.cxx | 22 +--
svx/source/gallery2/galmisc.cxx |4
svx/source/items/chrtitem.cxx |2
svx/source/items/clipfmtitem.cxx |2
svx/source/sdr/contact/viewcontactofe3dpolygon.cxx|2
svx/source/unodraw/unoshap3.cxx |2
35 files changed, 216 insertions(+), 244 deletions(-)
New commits:
commit 3b34655cc5ba586a616533e2efe3426d7c4e5aef
Author: Noel Grandin n...@peralex.com
Date: Fri Oct 3 09:18:24 2014 +0200
loplugin: cstylecast
Change-Id: Id2b5b2510fb13f77592d7a0455f34ccd8a20c2d7
diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx
index 378717f..37ae37e 100644
--- a/include/svx/cube3d.hxx
+++ b/include/svx/cube3d.hxx
@@ -68,13 +68,13 @@ public:
// Set local parameters with geometry recreation
void SetCubePos(const basegfx::B3DPoint rNew);
-const basegfx::B3DPoint GetCubePos() { return aCubePos; }
+const basegfx::B3DPoint GetCubePos() const { return aCubePos; }
void SetCubeSize(const basegfx::B3DVector rNew);
-const basegfx::B3DVector GetCubeSize() { return aCubeSize; }
+const basegfx::B3DVector GetCubeSize() const { return aCubeSize; }
void SetPosIsCenter(bool bNew);
-bool GetPosIsCenter() { return bPosIsCenter; }
+bool GetPosIsCenter() const { return bPosIsCenter; }
sal_uInt16 GetSideFlags() { return nSideFlags; }
diff --git a/include/svx/extrud3d.hxx b/include/svx/extrud3d.hxx
index dbb8260..cdade62 100644
--- a/include/svx/extrud3d.hxx
+++ b/include/svx/extrud3d.hxx
@@ -91,7 +91,7 @@ public:
// set/get local parameters with geometry regeneration
void SetExtrudePolygon(const basegfx::B2DPolyPolygon rNew);
-const basegfx::B2DPolyPolygon GetExtrudePolygon() { return
maExtrudePolygon; }
+const basegfx::B2DPolyPolygon GetExtrudePolygon() const { return
maExtrudePolygon; }
virtual bool IsBreakObjPossible() SAL_OVERRIDE;
virtual SdrAttrObj* GetBreakObj() SAL_OVERRIDE;
diff --git a/include/svx/lathe3d.hxx b/include/svx/lathe3d.hxx
index 46d0167..b2138c5 100644
--- a/include/svx/lathe3d.hxx
+++ b/include/svx/lathe3d.hxx
@@ -52,43 +52,43 @@ private:
// HorizontalSegments:
sal_uInt32 GetHorizontalSegments() const
-{ return ((const
SfxUInt32Item)GetObjectItemSet().Get(SDRATTR_3DOBJ_HORZ_SEGS)).GetValue(); }
+{ return static_castconst
SfxUInt32Item(GetObjectItemSet().Get(SDRATTR_3DOBJ_HORZ_SEGS)).GetValue(); }
// VerticalSegments:
sal_uInt32 GetVerticalSegments() const
-{ return ((const
SfxUInt32Item)GetObjectItemSet().Get(SDRATTR_3DOBJ_VERT_SEGS)).GetValue(); }
+{ return static_castconst
SfxUInt32Item(GetObjectItemSet().Get(SDRATTR_3DOBJ_VERT_SEGS)).GetValue(); }
[Libreoffice-commits] core.git: external/boost
external/boost/boost.wdeprecated-auto_ptr.patch.0 | 32 +++--- 1 file changed, 16 insertions(+), 16 deletions(-) New commits: commit 8b3bb1ee9dd7062f7ab988ccd358556b75a373fa Author: Stephan Bergmann sberg...@redhat.com Date: Mon Oct 6 09:28:48 2014 +0200 Even latest Clang only claims GCC 4.2 Change-Id: I70d117f62b91c4d413add44368836c870f203f28 diff --git a/external/boost/boost.wdeprecated-auto_ptr.patch.0 b/external/boost/boost.wdeprecated-auto_ptr.patch.0 index 9be0eea..b92d773 100644 --- a/external/boost/boost.wdeprecated-auto_ptr.patch.0 +++ b/external/boost/boost.wdeprecated-auto_ptr.patch.0 @@ -4,7 +4,7 @@ # pragma once #endif -+#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) ++#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) || defined(__clang__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored -Wdeprecated-declarations +#endif @@ -16,7 +16,7 @@ } -+#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) ++#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) || defined(__clang__) +# pragma GCC diagnostic pop +#endif + @@ -27,7 +27,7 @@ # pragma once #endif -+#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) ++#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) || defined(__clang__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored -Wdeprecated-declarations +#endif @@ -39,7 +39,7 @@ } // namespace 'boost' -+#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) ++#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) || defined(__clang__) +# pragma GCC diagnostic pop +#endif + @@ -50,7 +50,7 @@ # pragma once #endif -+#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) ++#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) || defined(__clang__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored -Wdeprecated-declarations +#endif @@ -62,7 +62,7 @@ } // namespace 'boost' -+#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) ++#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) || defined(__clang__) +# pragma GCC diagnostic pop +#endif + @@ -73,7 +73,7 @@ # pragma once #endif -+#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) ++#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) || defined(__clang__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored -Wdeprecated-declarations +#endif @@ -84,7 +84,7 @@ } // namespace 'boost' -+#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) ++#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) || defined(__clang__) +# pragma GCC diagnostic pop +#endif + @@ -95,7 +95,7 @@ # pragma once #endif -+#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) ++#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) || defined(__clang__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored -Wdeprecated-declarations +#endif @@ -107,7 +107,7 @@ } -+#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) ++#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) || defined(__clang__) +# pragma GCC diagnostic pop +#endif + @@ -118,7 +118,7 @@ // http://www.boost.org/LICENSE_1_0.txt) // -+#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) ++#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) || defined(__clang__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored -Wdeprecated-declarations +#endif @@ -130,7 +130,7 @@ # pragma warn .8027 // Functions containing try are not expanded inline #endif -+#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) ++#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) || defined(__clang__) +# pragma GCC diagnostic pop +#endif + @@ -141,7 +141,7 @@ // http://www.boost.org/libs/smart_ptr/scoped_ptr.htm // -+#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) ++#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) || defined(__clang__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored -Wdeprecated-declarations +#endif @@ -153,7 +153,7 @@ } // namespace boost -+#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) ++#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) || defined(__clang__) +# pragma GCC diagnostic pop +#endif + @@ -164,7 +164,7 @@ // See http://www.boost.org/libs/smart_ptr/shared_ptr.htm for documentation. // -+#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) ++#if defined(__GNUC__) ((__GNUC__*100 + __GNUC_MINOR__) = 406) || defined(__clang__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored -Wdeprecated-declarations +#endif @@ -176,7 +176,7 @@ #endif // #if defined(BOOST_NO_MEMBER_TEMPLATES)
Re: Automatic buildbot verification
On 10/02/2014 05:48 PM, Miklos Vajna wrote: 1) Developer pushes to gerrit, somehow marking the change as I'm already confident with this, just pushing to gerrit so that I can do build verification. 2) Build verification happens. 3) If the change is marked somehow, then it also gets automatically merged. Question is what would be the best to mark these changes. Should we use a specially named topic for these changes, and reserve that name for this purpose? Or should the developer just +2 the change? I'm open to suggestions. However it can be implemented in gerrit, I very strongly favor a mechanism where committing for verification is a single command line step (that doesn't cheat by involving an obligatory client-side script to make it a single command invocation). (As far as I see you can't trigger buildbot verification on draft changes, also, then it wouldn't be possible to easily see such pending changes of others, I guess.) For 2) and 3), I guess that's not really a problem, once we agree on how to mark these just to be verified changes, then a simple script can trigger buildbot verification for the to be verified changes, and at the same time can merge he verified ones (let's say the script would listen to the gerrit change stream, or so). Sorry, I don't get what that is in I guess that's not really a problem. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Automatic buildbot verification
Hi Stephan, On Mon, Oct 06, 2014 at 09:37:53AM +0200, Stephan Bergmann sberg...@redhat.com wrote: However it can be implemented in gerrit, I very strongly favor a mechanism where committing for verification is a single command line step (that doesn't cheat by involving an obligatory client-side script to make it a single command invocation). See what David mentioned, that sounds like exactly what you mention here. E.g. if we agree that +2'ing your own change means please verify this, then auto-merge, then with David's change (in the long run, since that's Gerrit 2.9, and we run 2.8) you can do the push and mark as +2 in a single command-line step. For 2) and 3), I guess that's not really a problem, once we agree on how to mark these just to be verified changes, then a simple script can trigger buildbot verification for the to be verified changes, and at the same time can merge he verified ones (let's say the script would listen to the gerrit change stream, or so). Sorry, I don't get what that is in I guess that's not really a problem. I meant that e.g. it's possible to have a script running in a loop or from cron on e.g. the gerrit server that automatically picks up to-be-verified changes and auto-merges to-be-verified-and-now-verified changes as well. I wanted to give a scope to this thread, by explicitly stating that the unclear point to me at the moment is how to mark a change as I'm happy with this change, just verify it, and if it passes, please merge it. Bjoern and David already outlined two possible ways, let's see what will be the outcome. :-) Regards, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/Executable_ui-previewer.mk
vcl/Executable_ui-previewer.mk |1 + 1 file changed, 1 insertion(+) New commits: commit f5cfed29b05184894ec6ad2d14f73bff0b5a2783 Author: Tor Lillqvist t...@collabora.com Date: Mon Oct 6 11:03:20 2014 +0300 ui-previewer needs the tk library, too Prevent ui-previewer from crashing. I have no idea why this is needed and how it works. Or why there is no useful or even useless warning or error message at all. Change-Id: I461a611a6646b1d6c524fc04624e6d780eb7282a diff --git a/vcl/Executable_ui-previewer.mk b/vcl/Executable_ui-previewer.mk index 444ded1..ab19caa 100644 --- a/vcl/Executable_ui-previewer.mk +++ b/vcl/Executable_ui-previewer.mk @@ -25,6 +25,7 @@ $(eval $(call gb_Executable_use_libraries,ui-previewer,\ cppu \ cppuhelper \ sal \ + tk \ tl \ ucbhelper \ vcl \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 officecfg/registry qadevOOo/runner qadevOOo/tests sc/source sd/source sfx2/sdi sfx2/source svx/source sw/source
include/sfx2/app.hxx|1
include/sfx2/templdlg.hxx | 10 ---
officecfg/registry/data/org/openoffice/Office/Views.xcu |6 --
qadevOOo/runner/util/DesktopTools.java | 17 ++
qadevOOo/tests/java/mod/_toolkit/AccessibleDropDownListBox.java |5 +
sc/source/ui/view/tabvwsh.cxx |1
sd/source/ui/slideshow/slideshowimpl.cxx|1
sd/source/ui/view/drvwshrg.cxx |2
sd/source/ui/view/outlnvsh.cxx |1
sfx2/sdi/frmslots.sdi |1
sfx2/source/appl/appchild.cxx | 14 -
sfx2/source/appl/appreg.cxx |1
sfx2/source/dialog/templdlg.cxx | 16 -
sfx2/source/inc/templdgi.hxx|3 -
sfx2/source/view/viewfrm.cxx| 11
svx/source/sidebar/gallery/GalleryPanel.hxx | 27
--
sw/source/uibase/app/docst.cxx |8 --
sw/source/uibase/uiview/view0.cxx |1
sw/source/uibase/web/wview.cxx |1
19 files changed, 23 insertions(+), 104 deletions(-)
New commits:
commit a836afe471d6df7bfc932fc419f7ccad7d40efb2
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date: Thu Sep 25 16:54:39 2014 +0200
fdo#73151 Always open StylesFormatting dialog in the sidebar
Change-Id: I05b63dc00023945d92fd837bd64042135d3f9aed
Reviewed-on: https://gerrit.libreoffice.org/11648
Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 1f41a5d..8017757 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -175,7 +175,6 @@ public:
* @param pArgs Takes ownership
*/
sal_uIntPtr LoadTemplate( SfxObjectShellLock xDoc,
const OUString rFileName, bool bCopy=true, SfxItemSet* pArgs = 0 );
-SfxTemplateDialog* GetTemplateDialog();
vcl::Window* GetTopWindow() const;
// members
diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx
index 4bd6ac4..6e6ed778 100644
--- a/include/sfx2/templdlg.hxx
+++ b/include/sfx2/templdlg.hxx
@@ -34,7 +34,6 @@ class SfxTemplateDialog_Impl;
class SfxTemplateDialog : public SfxDockingWindow
{
private:
-friend class SfxTemplateDialogWrapper;
friend class SfxTemplateDialog_Impl;
SfxTemplateDialog_Impl* pImpl;
@@ -56,15 +55,6 @@ public:
static SfxStyleFamily SFX2_DLLPUBLIC NIdToSfxFamilyId(sal_uInt16 nId);
};
-// class SfxTemplateDialogWrapper
-
-class SFX2_DLLPUBLIC SfxTemplateDialogWrapper : public SfxChildWindow
-{
-public:
-SfxTemplateDialogWrapper
-(vcl::Window*,sal_uInt16,SfxBindings*,SfxChildWinInfo*);
-SFX_DECL_CHILDWINDOW_WITHID(SfxTemplateDialogWrapper);
-};
// class SfxTemplatePanelControl -
diff --git a/officecfg/registry/data/org/openoffice/Office/Views.xcu
b/officecfg/registry/data/org/openoffice/Office/Views.xcu
index 771ed28..a2c7f43 100644
--- a/officecfg/registry/data/org/openoffice/Office/Views.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Views.xcu
@@ -19,12 +19,6 @@
!DOCTYPE oor:component-data SYSTEM ../../../../component-update.dtd
oor:component-data xmlns:oor=http://openoffice.org/2001/registry;
xmlns:xs=http://www.w3.org/2001/XMLSchema;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xmlns:install=http://openoffice.org/2004/installation; oor:name=Views
oor:package=org.openoffice.Office
node oor:name=Windows
-!-- Hide StylesFormatting dialog --
-node oor:name=5539 oor:op=replace
- prop oor:name=Visible oor:type=xs:boolean
-valuefalse/value
- /prop
-/node
!-- Show sidebar only in Impress and Writer by default --
node oor:name=10336 oor:op=replace
prop oor:name=Visible oor:type=xs:boolean
diff --git a/qadevOOo/runner/util/DesktopTools.java
b/qadevOOo/runner/util/DesktopTools.java
index d44182c..646ffcbd 100644
--- a/qadevOOo/runner/util/DesktopTools.java
+++ b/qadevOOo/runner/util/DesktopTools.java
@@ -412,33 +412,33 @@ public class DesktopTools
}
/**
- * This function docks the Stylist onto the right side of the window./p
+ * This function docks the Navigator onto the right side of the window./p
* Note:P
* Since the svt.viewoptions cache the view configuration at start up
* the chage of the docking will be effective at a restart.
* @param xMSF the XMultiServiceFactory
*/
-
[Libreoffice-commits] core.git: configure.ac external/apache-commons external/jfreereport
configure.ac| 12 -
external/apache-commons/patches/logging.patch | 29
external/jfreereport/patches/common_build.patch | 19 ++-
3 files changed, 48 insertions(+), 12 deletions(-)
New commits:
commit 0595f3ff18f1105ba7bea4a9599c071575ea703c
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Oct 6 10:20:53 2014 +0200
Allow building with java9 (first installement)
In java9, there is no option for source/target 1.5,
the lowest version is 1.6.
This commit also patches the relevant external libraries
in order to be able to build with build-wide source/target
Change-Id: I68807c973a2a8be2f9b3a6e01243e36cb7110a12
diff --git a/configure.ac b/configure.ac
index f14180a..6e17ac2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6614,6 +6614,7 @@ if test $ENABLE_JAVA != ; then
fi
HAVE_JAVA6=
+HAVE_JAVA9=
dnl ===
dnl Checks for JDK.
dnl ===
@@ -6675,6 +6676,9 @@ you must use the --with-jdk-home configure option
explicitly])
if test $_jdk_ver -ge 10600; then
HAVE_JAVA6=TRUE
fi
+if test $_jdk_ver -ge 10900; then
+HAVE_JAVA9=TRUE
+fi
AC_MSG_RESULT([checked (JDK $_jdk)])
JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n s,//*bin//*java,,p`
@@ -6695,13 +6699,17 @@ else
JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME
fi
AC_SUBST([HAVE_JAVA6])
+AC_SUBST([HAVE_JAVA9])
dnl ===
dnl Set target Java bytecode version
dnl ===
if test $ENABLE_JAVA != ; then
-_java_target_ver=1.5
-
+if test $HAVE_JAVA9 == TRUE; then
+_java_target_ver=1.6
+else
+_java_target_ver=1.5
+fi
JAVA_SOURCE_VER=$_java_target_ver
JAVA_TARGET_VER=$_java_target_ver
fi
diff --git a/external/apache-commons/patches/logging.patch
b/external/apache-commons/patches/logging.patch
index 953cf61..c225e5a 100644
--- a/external/apache-commons/patches/logging.patch
+++ b/external/apache-commons/patches/logging.patch
@@ -1,19 +1,19 @@
--- misc/commons-logging-1.1.1-src/build.xml 2007-11-22 00:27:52.0
+0100
+++ misc/build/commons-logging-1.1.1-src/build.xml 2008-06-24
14:23:56.316301736 +0200
-@@ -130,10 +130,10 @@
+@@ -129,12 +129,6 @@
+
!-- == Compiler Defaults =
--
- !-- Version of java class files to generate. --
+- !-- Version of java class files to generate. --
- property name=target.version value=1.2/
-+ property name=target.version value=1.5/
-
- !-- Version of java source to accept --
+-
+- !-- Version of java source to accept --
- property name=source.version value=1.2/
-+ property name=source.version value=1.3/
-
+-
!-- Should Java compilations set the 'debug' compiler option? --
property name=compile.debug value=true/
-@@ -283,6 +283,10 @@
+
+@@ -283,6 +277,10 @@
classpathref=compile.classpath
classname=org.apache.avalon.framework.logger.Logger/
@@ -24,7 +24,18 @@
available file=${log4j12.jar} property=log4j12.present/
available file=${log4j13.jar} property=log4j13.present/
available file=${build.home}/docs
property=maven.generated.docs.present/
-@@ -373,6 +377,8 @@
+@@ -362,8 +360,8 @@
+debug=${compile.debug}
+deprecation=${compile.deprecation}
+optimize=${compile.optimize}
+- source=${source.version}
+- target=${target.version}
++ source=${ant.build.javac.source}
++ target=${ant.build.javac.target}
+
+ classpath refid=compile.classpath/
+
+@@ -373,6 +371,8 @@
unless=logkit.present/
exclude name=org/apache/commons/logging/impl/AvalonLogger.java
unless=avalon-framework.present/
diff --git a/external/jfreereport/patches/common_build.patch
b/external/jfreereport/patches/common_build.patch
index 2bc5459..b197f49 100644
--- a/external/jfreereport/patches/common_build.patch
+++ b/external/jfreereport/patches/common_build.patch
@@ -1,5 +1,14 @@
--- misc/libloader-1.1.3/common_build.xml 2009-11-16 10:25:34.0
+0100
+++ misc/build/libloader-1.1.3/common_build.xml2009-12-04
10:22:24.277647200 +0100
+@@ -136,8 +136,6 @@
+ property name=javac.deprecation
+ value=true
+ description=Indicates whether source should be compiled with
deprecation information /
+- property name=javac.source value=1.5 description=Provide source
compatibility with specified release /
+- property name=javac.target value=1.5 description=Generate class files
for specific VM version /
+
+ !-- Build Cache
[Bug 82579] get rid of premac.h / postmac.h wrapper headers
https://bugs.freedesktop.org/show_bug.cgi?id=82579 --- Comment #4 from Tor Lillqvist t...@iki.fi --- Forgot the quartz/hide-osl-timevalue.h, would be something like this. (But the above was just one test approach, not sure at all that it is sane.) #define TimeValue OslTimeValue #include osl/conditn.h #include osl/file.hxx #include osl/mutex.hxx #include osl/process.h #include osl/thread.hxx #include osl/time.h #undef TimeValue -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 82579] get rid of premac.h / postmac.h wrapper headers
https://bugs.freedesktop.org/show_bug.cgi?id=82579 Stephan Bergmann sberg...@redhat.com changed: What|Removed |Added CC||sberg...@redhat.com --- Comment #5 from Stephan Bergmann sberg...@redhat.com --- (In reply to Tor Lillqvist from comment #3) I guess handling TimeValue will be problematic here, as it is defined in a stable API header, osl/time.h. OK to break API (and ABI?) by renaming TimeValue there to OslTimeValue? Even though certainly very poor choice of non-prefixed name in osl/time.h, it would be better if we can work around the issue without breaking API (as outlined in your patch). -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 82579] get rid of premac.h / postmac.h wrapper headers
https://bugs.freedesktop.org/show_bug.cgi?id=82579 --- Comment #6 from Tor Lillqvist t...@iki.fi --- Or we could just say that having premac.h/postmac.h is not that bad after all and close this bug as WONTFIX. After all, the above approach at least is hardly any cleaner... -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'private/jmux/libreoffice-4-1-6+all-no-merge'
New branch 'private/jmux/libreoffice-4-1-6+all-no-merge' available with the following commits: commit 37b9f9a86378c8cec2c06fda8be87af1b9b79a3f Author: Ignaz Forster ignaz.fors...@muenchen.de Date: Wed Jul 30 12:47:58 2014 +0200 Change submodules location to old new name Change-Id: I62d1aa75330a134014809d04851f5172f73b0ff8 commit 0f631f2a0bffd7096940bfd8d456129bc3bfb25d Author: Florian Haftmann florian.haftm...@muenchen.de Date: Mon Jun 30 16:12:25 2014 +0200 proper relative submodule paths commit 7964aa2c72a649981d7891f2165c11d665adc62b Author: Florian Haftmann florian.haftm...@muenchen.de Date: Mon Jun 30 13:29:11 2014 +0200 official locations for submodules commit aae1bee2936dd6173d379e59ad6c8768af773a3b Author: Ulrich Kitzinger ulk...@hotmail.de Date: Thu Jun 5 08:58:53 2014 +0200 Submodule auf Branch libreoffice-lhm-416 gesetzt Change-Id: I106c5575b79d60615bf1502acef9f0958afbf11b commit b2e2bc6cf9ba9a6a92d2c5ecec35acedb11c0058 Author: Ulrich Kitzinger ulrich.kitzin...@muenchen.de Date: Thu Jan 30 09:18:40 2014 +0100 Branches von Submodulen auf libreoffice-lhm-41 gesetzt commit 1996acce741fc6e5b7754ef731c2be30106ba9fc Author: Ulrich Kitzinger ulrich.kitzin...@muenchen.de Date: Tue Jan 28 16:20:48 2014 +0100 In Git die Submodule geändert commit 080efa6ea51ce3d73909c48921e7af2716e15c30 Author: Florian Haftmann florian.haftm...@muenchen.de Date: Fri Aug 8 11:36:05 2014 +0200 restrict to single language on windows, where multi language support has been reported to make problems commit e060f738da695f0c999f1b9cfb680f963fcdf924 Author: Florian Haftmann florian.haftm...@muenchen.de Date: Fri Aug 8 11:32:41 2014 +0200 downgrade required by windows build commit a40de75b0b58813c0b9304d312b7a2d3e2a0285e Author: Florian Haftmann florian.haftm...@muenchen.de Date: Fri Aug 8 11:31:32 2014 +0200 factored out common option commit b5a2f42bb4696e79e388c096520cbfdaa0d0a31b Author: Florian Haftmann florian.haftm...@muenchen.de Date: Fri Aug 8 11:31:03 2014 +0200 formal reorganisation of options commit cfde7e835d3b213e01c2dd371ee320d51c32227c Author: Florian Haftmann florian.haftm...@muenchen.de Date: Thu Aug 7 16:02:23 2014 +0200 make 5afde3a0f81bb6704a162de8de766b25d43bac78 really effective commit 98991f9ca419c6c76240d9a506c3fa19ebbd5122 Author: Florian Haftmann florian.haftm...@muenchen.de Date: Tue Aug 5 17:17:47 2014 +0200 modernized windows settings commit f127979a6845bda469301b92bfbdb54adca6e5b3 Author: Florian Haftmann florian.haftm...@muenchen.de Date: Tue Aug 5 17:12:58 2014 +0200 factored out common version commit 534a2c004e2112a61d608489cd214a1593c59261 Author: Florian Haftmann florian.haftm...@muenchen.de Date: Tue Aug 5 17:07:40 2014 +0200 accumulation of configure options commit 0e63242a18fb71365a3ed24454d0376937b72721 Author: Florian Haftmann florian.haftm...@muenchen.de Date: Tue Aug 5 17:04:40 2014 +0200 more uniform apperance of options, with slight unification commit 1b151d4f1781db66f5cde7ef9ac403a37db93c1f Author: Florian Haftmann florian.haftm...@muenchen.de Date: Tue Aug 5 17:02:38 2014 +0200 lexical sorting of options commit 5a54288940809b4fabcaf36dd5cdcc9fab70e275 Author: Florian Haftmann florian.haftm...@muenchen.de Date: Tue Aug 5 16:58:08 2014 +0200 tuned whitespace commit 3a267b7863f89b238dfadee86b5b00b7714df61a Author: Florian Haftmann florian.haftm...@muenchen.de Date: Tue Aug 5 16:55:57 2014 +0200 dropped dead code commit 2824f79d912cdbffd25120dcde3d65d23f5d7ec9 Author: Ignaz Forster ignaz.fors...@muenchen.de Date: Wed Jul 30 15:37:26 2014 +0200 Remove special handling of -ure- package Change-Id: I22e8146c42f8e7e764377cfce4ef02fee6d976e7 commit 1e8280584f4ad3715deed86d856bfb692706851c Author: Florian Haftmann florian.haftm...@muenchen.de Date: Fri Jun 13 12:55:26 2014 +0200 recovered adjustment for windows from branch libreoffice-lhm-41 commit 3af22ee3a30c039fb39cc3c8e6d8ed6d32ea743f Author: Florian Haftmann florian.haftm...@muenchen.de Date: Fri Jun 13 12:36:55 2014 +0200 obsolete commit 77544b3f0aa895f4b9b265b6abeddb56fb8a5c0e Author: Ulrich Kitzinger ulk...@hotmail.de Date: Fri Jun 6 14:56:53 2014 +0200 patch-office-debs.sh-Skript an 4.1.6 angepasst commit 39544c28b4b2a32a52fd4f255d759bc1f7a21305 Author: Felix Geyer felix.ge...@dev-volker.tvc.muenchen.de Date: Wed Apr 9 14:19:32 2014 +0200 Create libreoffice-APP.png symlinks. This is needed so the window icon is correctly displayed. TRAC: #12093 Change-Id: If5cddb9da1d5187f774ec8a14cfbefee3ea80aa3 commit e611efb5d5e57874e82de92715945115422c3088 Author: Ulrich Kitzinger ulrich.kitzin...@muenchen.de Date: Wed Mar 12 15:40:16 2014 +0100 Template-Pfad wird vorkonfiguriert (Trac 11902) Change-Id: I849ba05f96dd34fc74e7d8f34c5c3cc192dfdc8a commit 2e92db521ce5ea3e937f73eca34e7eb2971e1f53 Author:
[Libreoffice-commits] core.git: include/sfx2
include/sfx2/sfxuno.hxx | 150
1 file changed, 150 deletions(-)
New commits:
commit b9301c1be3632304b5b1e1ea731e807f533fdd47
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Oct 6 11:03:38 2014 +0200
Remove unused macros
Change-Id: Id76b285d70acb4de3ab27dbf2f0f0bb4b46735c7
diff --git a/include/sfx2/sfxuno.hxx b/include/sfx2/sfxuno.hxx
index 1a028b2..c8264bd 100644
--- a/include/sfx2/sfxuno.hxx
+++ b/include/sfx2/sfxuno.hxx
@@ -91,156 +91,6 @@ typedef sal_Int32 FrameSearchFlags;
/* Helper for registry */
\
static css::uno::Reference css::uno::XInterface SAL_CALL
impl_createInstance( const css::uno::Reference css::lang::XMultiServiceFactory
xServiceManager ) throw( css::uno::Exception );
-// declaration of XInterface::queryInterface()
-// XInterface::aquire()
-// XInterface::release()
-// XTypeProvider::getTypes()
-// XTypeProvider::getImplementationId()
-// XServiceInfo::getImplementationName()
-// XServiceInfo::supportsService()
-// XServiceInfo::getSupportedServiceNames()
-// static xxx::impl_getStaticSupportedServiceNames()
-// static xxx::impl_getStaticImplementationName()
-// static xxx::impl_createInstance()
-// static xxx::impl_createFactory()
-#define SFX_DECL_XSERVICEINFO
\
-SFX_DECL_XSERVICEINFO_NOFACTORY
\
-static css::uno::Reference css::lang::XSingleServiceFactory
impl_createFactory( const css::uno::Reference css::lang::XMultiServiceFactory
xServiceManager );
-
-// implementation of XServiceInfo::getImplementationName()
-// XServiceInfo::supportsService()
-// XServiceInfo::getSupportedServiceNames()
-// static xxx::impl_getStaticSupportedServiceNames()
-// static xxx::impl_getStaticImplementationName()
-// static xxx::impl_createInstance()
-#define SFX_IMPL_XSERVICEINFO( IMPLCLASS, IMPLSERVICENAME, IMPLNAME )
\
-
\
-/* XServiceInfo */
\
-OUString SAL_CALL IMPLCLASS::getImplementationName() throw(
css::uno::RuntimeException ) \
-{
\
-return impl_getStaticImplementationName();
\
-}
\
-
\
-/* XServiceInfo */
\
-sal_Bool SAL_CALL IMPLCLASS::supportsService( const OUString sServiceName
) throw( css::uno::RuntimeException ) \
-{
\
-return cppu::supportsService(this, sServiceName);
\
-}
\
-
\
-/* XServiceInfo */
\
-css::uno::Sequence OUString SAL_CALL
IMPLCLASS::getSupportedServiceNames() throw( css::uno::RuntimeException )
\
-{
\
-return
[Libreoffice-commits] core.git: Branch 'private/jmux/libreoffice-4-1-6+all-no-merge' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/jmux/libreoffice-4-1-6+all-no-merge' - 3 commits - include/jvmfwk jvmfwk/source sw/source xmloff/source
Rebased ref, commits from common ancestor:
commit 87bd501da60e0976a9abc207a99b7dab1c9edf46
Author: Jan-Marek Glogowski glo...@fbihome.de
Date: Thu Sep 25 18:14:47 2014 +0200
i#101283 Fix collapsed bookmark handling
Correctly position the insert cursor in the case of a collapsed
bookmark.
Change-Id: I46707ab0e019aec1050864c9cb404a834e9a67fe
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx
b/xmloff/source/text/XMLTextMarkImportContext.cxx
index ae89ab0..acb67b5 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -274,10 +274,16 @@ void XMLTextMarkImportContext::EndElement()
m_rHelper.GetText()-createTextCursorByRange(
xEndRange);
try {
-xInsertionCursor-gotoRange(xStartRange, sal_True);
-} catch (uno::Exception) {
-OSL_ENSURE(false,
-cannot go to end position of bookmark);
+xInsertionCursor-gotoRange(xStartRange,
sal_True);
+if (xInsertionCursor-isCollapsed())
+{
+xInsertionCursor =
m_rHelper.GetText()-createTextCursorByRange(xStartRange);
+xInsertionCursor-gotoRange(xStartRange,
sal_False);
+}
+}
+catch (uno::Exception)
+{
+OSL_ENSURE(false, cannot go to end position
of bookmark);
}
//DBG_ASSERT(! xInsertionCursor-isCollapsed(),
commit 4e98212a0faab7540d383c4210f32567fa640e9e
Author: Michael Weghorn m.wegh...@posteo.de
Date: Wed Sep 10 14:56:25 2014 +0200
fdo#83753: consider JAVA_HOME and PATH when selecting JRE
adapted algorithm that selects the Java runtime to be used so that
Java installations associated with the JAVA_HOME and PATH
environment variables are preferred over others
Java installations are now analysed in the following order:
* installation that the JAVA_HOME environment
variable refers to (if it is set)
* Java installations in PATH
* other Java installation (algorithm that was used before)
Change-Id: I3a3ade25322def0c0432b369848f13a6b82034a1
Conflicts:
include/jvmfwk/framework.h
jvmfwk/source/framework.cxx
diff --git a/include/jvmfwk/framework.h b/include/jvmfwk/framework.h
index c404a95..6b1921e 100644
--- a/include/jvmfwk/framework.h
+++ b/include/jvmfwk/framework.h
@@ -72,8 +72,8 @@ extern C {
necessary to specify the bootstrap parameter
codeUNO_JAVA_JFW_SHARED_DATA/code.
/p
-pSetting the class path used by a Java VM should not be necesarry. The
locations
-of Jar files should be knows by a class loader. If a jar file depends on
another
+pSetting the class path used by a Java VM should not be necessary. The
locations
+of Jar files should be known by a class loader. If a jar file depends on
another
jar file then it can be referenced in the manifest file of the first jar.
However,
a user may add jars to the class path by using this API. If it becomes
necessary
to add files to the class path which is to be used by all users then one
can use
@@ -341,12 +341,25 @@ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL
jfw_isVMRunning(sal_Bool *bRunning)
p
While determining a proper JRE this function takes into account if a
user requires support for assistive technology tools. If user
-need that support they have to set up their system accordingly. When
support
-for assistive technology is required, then the lists of
+need that support they have to set up their system accordingly./p
+p
+If the JAVA_HOME environment variable is set, this function prefers
+the JRE which the variable refers to over other JREs.
+If JAVA_HOME is not set or does not refer to a suitable JRE,
+the PATH environment variable is inspected and the respective JREs
+are checked for their suitability next./p
+p
+When support for assistive technology is required, then the
codeJavaInfo/code objects,
which are provided by the codegetJavaInfo/code functions of the
plug-ins, are
-examined for a suitable JRE. That is, the codeJavaInfo/code objects
-from the list
+examined for a suitable JRE.
+That is, the codeJavaInfo/code object that refers to the JRE referred
to
+by JAVA_HOME is examined. If it does not have the flag
+codeJFW_FEATURE_ACCESSBRIDGE/code in the member codenFeatures/code
+then the JavaInfo/code objects that are related to the PATH variable
+are examined.
+If no suitable
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/paintfrm.cxx | 621 +++--
1 file changed, 335 insertions(+), 286 deletions(-)
New commits:
commit 68da0456a783afe65d9ff114477a36487450ca46
Author: Philipp Weissenbacher p.weissenbac...@gmail.com
Date: Mon Oct 6 09:53:04 2014 +0200
Improve Denglish and reformat comments
Change-Id: Ieb0d47240209f35a0558cb788a21ab45b405eb47
Reviewed-on: https://gerrit.libreoffice.org/11820
Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 91583a6..cf04cf9 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -144,7 +144,7 @@ class SwLineRect : public SwRect
SvxBorderStyle nStyle;
const SwTabFrm *pTab;
sal_uInt8 nSubColor; //colorize subsidiary lines
- bool bPainted; //already painted?
+ bool bPainted; //already painted?
sal_uInt8 nLock; //To distinguish the line and the hell
layer.
public:
SwLineRect( const SwRect rRect, const Color *pCol, const SvxBorderStyle
nStyle,
@@ -300,10 +300,12 @@ bool isTableBoundariesEnabled()
}
-// Set borders alignment statics.
-// adjustment for 'small' twip-to-pixel relations:
-// For 'small' twip-to-pixel relations (less then 2:1)
-// values of nHalfPixelSzW and nHalfPixelSzH are set to ZERO.
+/**
+ * Set borders alignment statics
+ * Adjustment for 'small' twip-to-pixel relations:
+ * For 'small' twip-to-pixel relations (less then 2:1)
+ * values of nHalfPixelSzW and nHalfPixelSzH are set to ZERO
+ */
void SwCalcPixStatics( OutputDevice *pOut )
{
// determine 'small' twip-to-pixel relation
@@ -357,7 +359,9 @@ void SwCalcPixStatics( OutputDevice *pOut )
aScaleY = rMap.GetScaleY();
}
-//To be able to save the statics so the paint is more or lees reentrant.
+/**
+ * To be able to save the statics so the paint is more or lees reentrant
+ */
class SwSavePaintStatics
{
boolbSFlyMetafile;
@@ -652,9 +656,8 @@ bool SwLineRect::MakeUnion( const SwRect rRect )
void SwLineRects::AddLineRect( const SwRect rRect, const Color *pCol, const
SvxBorderStyle nStyle,
const SwTabFrm *pTab, const sal_uInt8 nSCol )
{
-//Loop backwards because lines which can be combined, can usually be
painted
-//in the same context.
-
+// Loop backwards because lines which can be combined, can usually be
painted
+// in the same context
for (reverse_iterator it = aLineRects.rbegin(); it != aLineRects.rend();
++it)
{
@@ -786,9 +789,9 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
}
if ( rL1.Bottom() pLB-Bottom() )
-rL1.Top( pLB-Top() ); // extend i1 on the top
+rL1.Top( pLB-Top() ); // extend i1 on the top
else
-bRemove = true; //stopping, remove i1
+bRemove = true; //stopping, remove i1
}
}
else
@@ -844,7 +847,6 @@ void SwLineRects::ConnectEdges( OutputDevice *pOut )
void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const SwLineRects rRects )
{
// All help lines that are covered by any border will be removed or split
-
for (size_t i = 0; i aLineRects.size(); ++i)
{
// get a copy instead of a reference, because an insert may destroy
@@ -909,7 +911,7 @@ void SwSubsRects::RemoveSuperfluousSubsidiaryLines( const
SwLineRects rRects )
break;
}
}
-else//horizontal
+else // Horizontal
{
if ( aSubsRect.Top() = rLine.Bottom()
aSubsRect.Bottom() = rLine.Top() )
@@ -1211,18 +1213,21 @@ void SwSubsRects::PaintSubsidiary( OutputDevice *pOut,
// Various functions that are use in this file.
-// Note: function SwAlignRect(..) also used outside this file.
-// Correction: adjust rectangle on pixel level in order
-// to assure, that the border 'leaves its original pixel', if it has
to.
-// No prior adjustments for odd relation between pixel and twip.
+/**
+ * Function SwAlignRect(..) is also used outside this file
+ *
+ * Correction: adjust rectangle on pixel level in order to make sure,
+ * that the border leaves its original pixel, if it has to
+ * No prior adjustments for odd relation between pixel and twip
+ */
void SwAlignRect( SwRect rRect, const SwViewShell *pSh )
{
if( !rRect.HasArea() )
return;
-// Assure that view shell (parameter pSh) exists, if the output device
-// is taken from this view shell -- no output device, no alignment.
-// Output
[Libreoffice-commits] core.git: sw/source
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx | 16 +--
sw/source/core/ole/ndole.cxx | 49
+-
2 files changed, 35 insertions(+), 30 deletions(-)
New commits:
commit 8a8fa926c1fe843c5c79f7b300b7365855460e62
Author: Philipp Weissenbacher p.weissenbac...@gmail.com
Date: Mon Oct 6 10:12:46 2014 +0200
fdo#39468 Translate German comments - sw/source/core/
Change-Id: I64743b4f6b7bfd44b410d63ab13298a000a47221
Reviewed-on: https://gerrit.libreoffice.org/11821
Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
index be59ead..6e73a79 100644
--- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
@@ -714,9 +714,9 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
} // end of else nRelPosY = 0
} // end of aVert.GetVertOrient() == text::VertOrientation::NONE
-//Damit das Teil ggf. auf die richtige Seite gestellt und in die
-//PrtArea des LayLeaf gezogen werden kann, muss hier seine
-//absolute Position berechnet werden.
+// We need to calculate the part's absolute position, in order for
+// it to be put onto the right page and to be pulled into the
+// LayLeaf's PrtArea
const SwTwips nTopOfAnch = _GetTopForObjPos( *pAnchorFrmForVertPos,
fnRect, bVert );
if( bVert )
{
@@ -884,7 +884,7 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
if ( !bInSct
(GetAnchoredObj().GetObjRect().*fnRect-fnGetTop)() ==
(pUpperOfOrientFrm-*fnRect-fnGetPrtTop)() )
-//Das teil passt nimmer, da hilft auch kein moven.
+// It doesn't fit, moving it would not help either
anymore
break;
const SwLayoutFrm* pNextLay = pUpperOfOrientFrm-GetLeaf(
@@ -951,8 +951,8 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
}
else if ( bInSct )
{
-// Wenn wir innerhalb des Bereich nicht genug Platz
haben, gucken
-// wir uns mal die Seite an.
+// If we don't have enough room within the Area, we
take a look at
+// the Page
const SwLayoutFrm* pTmp =
pUpperOfOrientFrm-FindSctFrm()-GetUpper();
nDist =
(GetAnchoredObj().GetObjRect().*fnRect-fnBottomDist)(
(pTmp-*fnRect-fnGetPrtBottom)() );
@@ -1066,7 +1066,9 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
GetAnchoredObj().SetCurrRelPos( aRelPos );
}
-/** determine frame for horizontal position */
+/**
+ * Determine frame for horizontal position
+ */
const SwFrm SwToCntntAnchoredObjectPosition::_GetHoriVirtualAnchor(
const SwLayoutFrm _rProposedFrm )
const
{
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 8b2fc0f..35df868 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -247,25 +247,26 @@ const Graphic* SwOLENode::GetGraphic()
SwCntntNode *SwOLENode::SplitCntntNode( const SwPosition )
{
-// OLE-Objecte vervielfaeltigen ??
+// Multiply OLE objects?
OSL_FAIL( OleNode: can't split. );
return this;
}
-// Laden eines in den Undo-Bereich verschobenen OLE-Objekts
-
+/**
+ * Loading a OLE object that has been moved to the Undo Area
+ */
bool SwOLENode::RestorePersistentData()
{
OSL_ENSURE( aOLEObj.GetOleRef().is(), No object to restore! );
if ( aOLEObj.xOLERef.is() )
{
-// Falls bereits eine SvPersist-Instanz existiert, nehmen wir diese
+// If a SvPersist instance already exists, we use it
SfxObjectShell* p = GetDoc()-GetPersist();
if( !p )
{
-// TODO/LATER: reicht hier nicht ein EmbeddedObjectContainer? Was
passiert mit
-// diesem Dokument?
-OSL_ENSURE( false, warum wird hier eine DocShell angelegt? );
+// TODO/LATER: Isn't a EmbeddedObjectContainer sufficient here?
+// What happens to this document?
+OSL_ENSURE( false, Why are we creating a DocShell here? );
p = new SwDocShell( GetDoc(), SFX_CREATE_MODE_INTERNAL );
p-DoInitNew( NULL );
}
@@ -293,7 +294,9 @@ bool SwOLENode::RestorePersistentData()
return true;
}
-// OLE object is transported into UNDO area
+/**
+ * OLE object is transported into UNDO area
+ */
bool SwOLENode::SavePersistentData()
{
if( aOLEObj.xOLERef.is() )
@@
[Libreoffice-commits] core.git: 2 commits - o3tl/README vcl/Executable_ui-previewer.mk vcl/Executable_vcldemo.mk vcl/source
o3tl/README|2 ++
vcl/Executable_ui-previewer.mk |1 -
vcl/Executable_vcldemo.mk |1 -
vcl/source/app/svapp.cxx |1 +
4 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 83d020a49330aafefd051c24b746d13d126281db
Author: Tor Lillqvist t...@collabora.com
Date: Mon Oct 6 12:20:09 2014 +0300
Add guess at what o3tl means
Change-Id: I69c8ce10140e92714e9d5c4b4173ade59d36be08
diff --git a/o3tl/README b/o3tl/README
index de46c85..b49b075 100644
--- a/o3tl/README
+++ b/o3tl/README
@@ -1,5 +1,7 @@
Very basic template functionality, a bit like boost or stl, but specific to
LibO
+o3tl presumably stands for OOo [o3, get it?] tools
+
From
[http://blog.thebehrens.net/2006/01/15/update-cow_wrapper-is-available-now/]
The scope for o3tl is admittedly kind of ambitious, as it should contain
...very basic (template)
functionality, comparable to what's provided by boost or stl, but specific to
OOo (what comes to mind
commit 2d8f396d12f83f0c0b5f0c4adb1796d66fd0bd2f
Author: Tor Lillqvist t...@collabora.com
Date: Mon Oct 6 11:28:37 2014 +0300
Don't unintentionally unload the tk library
Fixes the root cause for the crashes in vcldemo and ui-previewer that
indirectly were fixed by 0b7631bccb2a47ab71a0c1edbabe8a5892ff5f9c and
f5cfed29b05184894ec6ad2d14f73bff0b5a2783. Those two commits are now
reverted.
Change-Id: If5dac37f032d2b74c977562c339e9799bbc4454c
diff --git a/vcl/Executable_ui-previewer.mk b/vcl/Executable_ui-previewer.mk
index ab19caa..444ded1 100644
--- a/vcl/Executable_ui-previewer.mk
+++ b/vcl/Executable_ui-previewer.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_Executable_use_libraries,ui-previewer,\
cppu \
cppuhelper \
sal \
- tk \
tl \
ucbhelper \
vcl \
diff --git a/vcl/Executable_vcldemo.mk b/vcl/Executable_vcldemo.mk
index 878ab62..fb29b9a 100644
--- a/vcl/Executable_vcldemo.mk
+++ b/vcl/Executable_vcldemo.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_Executable_set_include,vcldemo,\
$(eval $(call gb_Executable_use_libraries,vcldemo,\
tl \
-tk \
sal \
vcl \
cppu \
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index fd5806c..fd0077e 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1413,6 +1413,7 @@ UnoWrapperBase* Application::GetUnoWrapper( bool
bCreateIfNotExist )
{
pSVData-mpUnoWrapper = fnCreateWrapper();
}
+aTkLib.release();
}
DBG_ASSERT( pSVData-mpUnoWrapper, UnoWrapper could not be created!
);
#else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: o3tl/README
o3tl/README |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7979f7798e77456a7fcbcf438a8387ed751c0559 Author: Tor Lillqvist t...@collabora.com Date: Mon Oct 6 12:51:47 2014 +0300 It is template library, not tools Change-Id: I5ca7b0a0374a9ed0090413e8c6045e5d13097301 diff --git a/o3tl/README b/o3tl/README index b49b075..a017dfe 100644 --- a/o3tl/README +++ b/o3tl/README @@ -1,6 +1,6 @@ Very basic template functionality, a bit like boost or stl, but specific to LibO -o3tl presumably stands for OOo [o3, get it?] tools +o3tl stands for OOo [o3, get it?] template library From [http://blog.thebehrens.net/2006/01/15/update-cow_wrapper-is-available-now/] The scope for o3tl is admittedly kind of ambitious, as it should contain ...very basic (template) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/vcl-opengl2'
New branch 'feature/vcl-opengl2' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/api/RowSet.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 195674627cb887b1e0d92d756a285ad48ef1d362 Author: Lionel Elie Mamane lio...@mamane.lu Date: Mon Oct 6 12:22:03 2014 +0200 fdo#84658 on reexec, cancel modification before resetting IsModification state Change-Id: I878bff4d36ca1c2dd9474c937b03d0b366a6e911 diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index ea2e929..75c1958 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -561,6 +561,8 @@ void ORowSet::freeResources( bool _bComplete ) } m_aClones.clear(); +doCancelModification(); + m_aBookmark = Any(); m_bBeforeFirst = true; m_bAfterLast= false; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 40780, which changed state. Bug 40780 Summary: Impress Custom Animation Sound Effect not audible in Slide Show https://bugs.freedesktop.org/show_bug.cgi?id=40780 What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/perfwork' - 4 commits - include/oox oox/source sax/source
include/oox/token/tokenmap.hxx |9 +-
oox/source/token/tokenmap.cxx |7 -
sax/source/tools/CachedOutputStream.hxx | 46 ++-
sax/source/tools/fastserializer.cxx | 132 +++-
sax/source/tools/fastserializer.hxx | 13 +--
5 files changed, 125 insertions(+), 82 deletions(-)
New commits:
commit d0bff8fb54cb473037b6b1819e04f679881150f0
Author: Matúš Kukan matus.ku...@collabora.com
Date: Mon Oct 6 10:41:48 2014 +0200
FastSerializer: Add simpler writeByte method for single characters.
Change-Id: If1637e9e72270c0dfe8afea1362cad24e7a3f1cd
diff --git a/sax/source/tools/CachedOutputStream.hxx
b/sax/source/tools/CachedOutputStream.hxx
index fc74118..a6a2cfc 100644
--- a/sax/source/tools/CachedOutputStream.hxx
+++ b/sax/source/tools/CachedOutputStream.hxx
@@ -100,6 +100,15 @@ public:
mnCacheWrittenSize += nLen;
}
+void writeByte( const sal_Int8 cChar )
+{
+// Write when the buffer gets big enough
+if (mnCacheWrittenSize + 1 mnMaximumSize)
+flush();
+
+*(pSeq-elements + mnCacheWrittenSize++) = cChar;
+}
+
/// immediately write buffer into mxOutputStream and clear
void flush()
{
diff --git a/sax/source/tools/fastserializer.cxx
b/sax/source/tools/fastserializer.cxx
index ac8376b..ff089fd 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -43,14 +43,6 @@ using ::com::sun::star::io::XOutputStream;
// number of characters without terminating 0
#define N_CHARS(string) (SAL_N_ELEMENTS(string) - 1)
-static const char sClosingBracket[] = ;
-static const char sSlashAndClosingBracket[] = /;
-static const char sColon[] = :;
-static const char sOpeningBracket[] = ;
-static const char sOpeningBracketAndSlash[] = /;
-static const char sQuote[] = \;
-static const char sEqualSignAndQuote[] = =\;
-static const char sSpace[] = ;
static const char sXmlHeader[] = ?xml version=\1.0\ encoding=\UTF-8\
standalone=\yes\?\n;
namespace sax_fastparser {
@@ -111,10 +103,10 @@ namespace sax_fastparser {
case '': writeBytes( quot;, 6 ); break;
case '\n': writeBytes( #10;, 5 );break;
case '\r': writeBytes( #13;, 5 );break;
-default:writeBytes( cChar, 1 ); break;
+default:writeByte( cChar ); break;
}
else
-writeBytes( cChar, 1 );
+writeByte( cChar );
}
}
@@ -146,7 +138,7 @@ namespace sax_fastparser {
case '': writeBytes( quot;, 6 ); break;
case '\n': writeBytes( #10;, 5 );break;
case '\r': writeBytes( #13;, 5 );break;
-default:writeBytes( c, 1 ); break;
+default:writeByte( c ); break;
}
}
}
@@ -161,7 +153,7 @@ namespace sax_fastparser {
{
if( HAS_NAMESPACE( nElement ) ) {
writeBytes(mxFastTokenHandler-getUTF8Identifier(NAMESPACE(nElement)));
-writeBytes(sColon, N_CHARS(sColon));
+writeByte(':');
writeBytes(mxFastTokenHandler-getUTF8Identifier(TOKEN(nElement)));
} else
writeBytes(mxFastTokenHandler-getUTF8Identifier(nElement));
@@ -175,8 +167,7 @@ namespace sax_fastparser {
mxFastTokenHandler-getUTF8Identifier(NAMESPACE(nElement)));
Sequencesal_Int8 const name(
mxFastTokenHandler-getUTF8Identifier(TOKEN(nElement)));
-return OString(reinterpret_castsal_Char
const*(ns.getConstArray()), ns.getLength())
- + OString(sColon, N_CHARS(sColon))
+return OString(reinterpret_castsal_Char
const*(ns.getConstArray()), ns.getLength()) + :
+ OString(reinterpret_castsal_Char
const*(name.getConstArray()), name.getLength());
} else {
Sequencesal_Int8 const name(
@@ -198,7 +189,7 @@ namespace sax_fastparser {
m_DebugStartedElements.push(Element);
#endif
-writeBytes(sOpeningBracket, N_CHARS(sOpeningBracket));
+writeByte('');
writeId(Element);
if (pAttrList)
@@ -206,7 +197,7 @@ namespace sax_fastparser {
else
writeTokenValueList();
-writeBytes(sClosingBracket, N_CHARS(sClosingBracket));
+writeByte('');
}
void FastSaxSerializer::endFastElement( ::sal_Int32 Element )
@@ -218,11 +209,10 @@ namespace sax_fastparser {
m_DebugStartedElements.pop();
#endif
-writeBytes(sOpeningBracketAndSlash, N_CHARS(sOpeningBracketAndSlash));
-
+writeByte('');
+writeByte('/');
writeId(Element);
-
-writeBytes(sClosingBracket, N_CHARS(sClosingBracket));
+writeByte('');
}
void FastSaxSerializer::singleFastElement( ::sal_Int32 Element,
FastAttributeList*
Wrong Language in the Option-Dialog
Hi I have build today the LO (writer) with the german-language. The GUI have automatically switch to the germany language, but the List in the Option-Dialog is English? Look here: http://imgur.com/tfq0HBo Juergen ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/txtfrm.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 969941f996385fa48f405f51f97a39454ef2b79a
Author: Caolán McNamara caol...@redhat.com
Date: Wed Oct 1 12:17:38 2014 +0100
Related: fdo#58277 if the SwFrm is not IsValid so are its portions
i.e. they don't necessarily match the SwTxtNode anymore, e.g.
content deleted from node, SwFrm is invalid, old portions
refer to old offsets not new ones yet
Change-Id: I755051cd647aa7bb203a6e1f815193fb6ec39191
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 389127d..720f888 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -2512,9 +2512,9 @@ void SwTxtFrm::RecalcAllLines()
void SwTxtFrm::VisitPortions( SwPortionHandler rPH ) const
{
-const SwParaPortion* pPara = GetPara();
+const SwParaPortion* pPara = IsValid() ? GetPara() : NULL;
-if( pPara )
+if (pPara)
{
if ( IsFollow() )
rPH.Skip( GetOfst() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/vcl-opengl2' - 3 commits - config_host/config_features.h.in configure.ac include/vcl ios/experimental ios/.gitignore sw/source vcl/headless vcl/inc vcl/
config_host/config_features.h.in |5
configure.ac | 10
include/vcl/sysdata.hxx | 11
ios/.gitignore|1
ios/experimental/TiledLibreOffice/.gitignore |9
ios/experimental/TiledLibreOffice/TiledLibreOffice/.gitignore |1
sw/source/core/view/viewsh.cxx|3
vcl/Library_vcl.mk| 19
vcl/headless/svpgdi.cxx |5
vcl/headless/svpinst.cxx | 22
vcl/inc/headless/svpframe.hxx |7
vcl/inc/headless/svpgdi.hxx | 18
vcl/inc/headless/svpinst.hxx |6
vcl/inc/headless/svpvd.hxx|4
vcl/inc/opengl/openglinst.hxx | 54 +
vcl/inc/opengl/salbmp.h | 98 +++
vcl/inc/opengl/salgdi.h | 302 ++
vcl/inc/opengl/salvd.h| 57 +
vcl/inc/saldatabasic.hxx |9
vcl/ios/iosinst.cxx | 15
20 files changed, 645 insertions(+), 11 deletions(-)
New commits:
commit c3fe92ca70ad58e2fbac78508d343f06a80c7e86
Author: Ptyl Dragon p...@cloudon.com
Date: Mon Oct 6 14:40:58 2014 +0300
change return type to ImplFontCharMapPtr post creating vcl-opengl2 branch
Change-Id: Id2022cf1b3665b54356c28deda51d82e172a839e
diff --git a/vcl/inc/opengl/salgdi.h b/vcl/inc/opengl/salgdi.h
index 4631182..0f71248 100644
--- a/vcl/inc/opengl/salgdi.h
+++ b/vcl/inc/opengl/salgdi.h
@@ -185,7 +185,7 @@ public:
// get the current font's metrics
virtual voidGetFontMetric( ImplFontMetricData*, int /*
nFallbackLevel */ ) SAL_OVERRIDE {}
// get the repertoire of the current font
-virtual const ImplFontCharMap*
+virtual const ImplFontCharMapPtr
GetImplFontCharMap() const SAL_OVERRIDE
{
return nullptr;
commit 500149536c75fd4b3f81ebaf5fa624ee143809f6
Author: Ptyl Dragon p...@cloudon.com
Date: Mon Oct 6 12:52:55 2014 +0300
make works with OpenGLSalInstance / OpenGLSalGraphics
Change-Id: Ie5156dd15122586e9c173a3532759a3be728809a
diff --git a/configure.ac b/configure.ac
index f01ed6f..6e85b87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2448,6 +2448,7 @@ if test $_os != iOS -a $_os != Android; then
fi
if test $enable_vgl == yes; then
+ HAVE_VCL_OPEN_GL_BACKEND=TRUE
AC_DEFINE(HAVE_VCL_OPEN_GL_BACKEND)
fi
diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index 4cfc737..fa909af 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -20,6 +20,8 @@
#ifndef INCLUDED_VCL_SYSDATA_HXX
#define INCLUDED_VCL_SYSDATA_HXX
+#include config_features.h
+
#include vector
#include cstddef
@@ -36,9 +38,12 @@ class NSView;
#endif
#ifdef IOS
+#if HAVE_VCL_OPEN_GL_BACKEND
+#else
typedef const struct __CTFont * CTFontRef;
typedef struct CGContext *CGContextRef;
#endif
+#endif
#if defined( WNT )
#include windef.h
@@ -140,7 +145,10 @@ struct SystemGraphicsData
#elif defined( ANDROID )
// Nothing
#elif defined( IOS )
+#if HAVE_VCL_OPEN_GL_BACKEND
+#else
CGContextRefrCGContext; // CoreGraphics graphic context
+#endif
#elif defined( UNX )
void* pDisplay; // the relevant display connection
longhDrawable; // a drawable
@@ -159,7 +167,10 @@ struct SystemGraphicsData
#elif defined( ANDROID )
// Nothing
#elif defined( IOS )
+#if HAVE_VCL_OPEN_GL_BACKEND
+#else
, rCGContext( NULL )
+#endif
#elif defined( UNX )
, pDisplay( NULL )
, hDrawable( 0 )
diff --git a/ios/.gitignore b/ios/.gitignore
index 08c6a68..3d2a3a2 100644
--- a/ios/.gitignore
+++ b/ios/.gitignore
@@ -7,3 +7,4 @@
#
/lo.xcconfig
+/.log
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/.gitignore
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/.gitignore
new file mode 100644
index 000..ba78577
--- /dev/null
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/.gitignore
@@ -0,0 +1 @@
+/native-code.mm
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 0731c2b..7506b6b 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1851,7 +1851,10 @@ void touch_lo_draw_tile(void *context, int contextWidth,
int contextHeight, MLOD
if (pViewShell)
{
SystemGraphicsData aData;
+#if HAVE_VCL_OPEN_GL_BACKEND
+#else
aData.rCGContext = (CGContextRef) context;
+#endif
VirtualDevice aDevice(aData, (sal_uInt16)0);
[Libreoffice-commits] core.git: 4 commits - configure.ac solenv/gbuild
configure.ac |6 +++--- solenv/gbuild/platform/IOS_ARM_GCC.mk |4 solenv/gbuild/platform/com_GCC_defs.mk |1 + solenv/gbuild/platform/macosx.mk |4 solenv/gbuild/platform/mingw.mk|4 solenv/gbuild/platform/solaris.mk | 14 -- solenv/gbuild/platform/unxgcc.mk | 27 --- 7 files changed, 4 insertions(+), 56 deletions(-) New commits: commit d73cee7858edc04944578f52a6d838d866aafb61 Author: Michael Stahl mst...@redhat.com Date: Mon Oct 6 13:32:24 2014 +0200 gbuild: enable -Wnon-virtual-dtor for all GCC platforms It was disabled globally at a time when GCC did not yet support #pragma GCC diagnostic. Change-Id: I062f6b437e6119203f2b0824a25238b45b4f4e79 diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index 27659c4..96920cc 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -47,13 +47,9 @@ gb_CFLAGS := \ -Wshadow \ -fno-strict-aliasing \ -# For -Wno-non-virtual-dtor see http://markmail.org/message/664jsoqe6n6smy3b -# Re: [dev] warnings01: -Wnon-virtual-dtor message to d...@openoffice.org from -# Feb 1, 2006: gb_CXXFLAGS := \ $(gb_CXXFLAGS_COMMON) \ -Wno-ctor-dtor-privacy \ - -Wno-non-virtual-dtor \ -fno-strict-aliasing \ -fsigned-char \ $(CXXFLAGS_CXX11) \ diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 647aa8b..9cd9b48 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -62,6 +62,7 @@ gb_CFLAGS_COMMON := \ gb_CXXFLAGS_COMMON := \ -Wall \ + -Wnon-virtual-dtor \ -Wendif-labels \ -Wextra \ -Wundef \ diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 6501b0a..59d6a56 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -46,14 +46,10 @@ gb_CFLAGS := \ -fno-strict-aliasing \ #-Wshadow \ break in compiler headers already -# For -Wno-non-virtual-dtor see http://markmail.org/message/664jsoqe6n6smy3b -# Re: [dev] warnings01: -Wnon-virtual-dtor message to d...@openoffice.org from -# Feb 1, 2006: gb_CXXFLAGS := \ $(gb_CXXFLAGS_COMMON) \ -fPIC \ -Wno-ctor-dtor-privacy \ - -Wno-non-virtual-dtor \ -fno-strict-aliasing \ -fsigned-char \ $(CXXFLAGS_CXX11) diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk index 9719616..f60c1fc 100644 --- a/solenv/gbuild/platform/mingw.mk +++ b/solenv/gbuild/platform/mingw.mk @@ -36,13 +36,9 @@ gb_CFLAGS += \ -Wdeclaration-after-statement \ -fno-strict-aliasing \ -# For -Wno-non-virtual-dtor see http://markmail.org/message/664jsoqe6n6smy3b -# Re: [dev] warnings01: -Wnon-virtual-dtor message to d...@openoffice.org from -# Feb 1, 2006: gb_CXXFLAGS := \ $(gb_CXXFLAGS_COMMON) \ -Wno-ctor-dtor-privacy \ - -Wno-non-virtual-dtor \ -Wreturn-type \ -Wshadow \ -Wuninitialized \ diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 5e2b59f..1d3c256 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -61,7 +61,6 @@ gb_CXXFLAGS := \ -fPIC \ -Wshadow \ -Woverloaded-virtual \ - -Wnon-virtual-dtor \ -std=c++0x \ # enable debug STL diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 18da25c..034903a 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -43,7 +43,6 @@ gb_CXXFLAGS := \ -fPIC \ -Wshadow \ -Woverloaded-virtual \ - -Wnon-virtual-dtor \ $(CXXFLAGS_CXX11) \ commit c2056bd31caa61df9f9b6ffd26479ccd85ea8f1e Author: Michael Stahl mst...@redhat.com Date: Mon Oct 6 13:19:45 2014 +0200 gbuild: -Wnon-virtual-dtor and strict aliasing workaround for GCC 4.6 ... is obsolete, remove that. Change-Id: I541de32ac4389d8049c25c98b63a69d084d1594d diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 97f582b..5e2b59f 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -61,7 +61,7 @@ gb_CXXFLAGS := \ -fPIC \ -Wshadow \ -Woverloaded-virtual \ - -Wno-non-virtual-dtor \ + -Wnon-virtual-dtor \ -std=c++0x \ # enable debug STL @@ -71,19 +71,6 @@ gb_COMPILERDEFS += \ endif -ifeq ($(COM_GCC_IS_CLANG),) -gb_GccLess460 := $(shell expr $(GCC_VERSION) \ 406) - -#At least SLED 10.2 gcc 4.3 overly aggressively optimizes uno::Sequence into -#junk, so only strict-alias on = 4.6.0 -gb_StrictAliasingUnsafe := $(gb_GccLess460) - -ifeq ($(gb_StrictAliasingUnsafe),1) -gb_CFLAGS +=
[Libreoffice-commits] core.git: Branch 'feature/perfwork' - sax/source
sax/source/tools/CachedOutputStream.hxx |9
sax/source/tools/fastserializer.cxx | 58 +---
sax/source/tools/fastserializer.hxx |1
3 files changed, 32 insertions(+), 36 deletions(-)
New commits:
commit f387b15fea0406b792b4ae5dc9f1c7ff9df78f38
Author: Matúš Kukan matus.ku...@collabora.com
Date: Mon Oct 6 14:45:07 2014 +0200
Revert FastSerializer: Add simpler writeByte method for single characters.
Let's not do this. It's slower anyway, at least with clang.
This reverts commit d0bff8fb54cb473037b6b1819e04f679881150f0.
diff --git a/sax/source/tools/CachedOutputStream.hxx
b/sax/source/tools/CachedOutputStream.hxx
index a6a2cfc..fc74118 100644
--- a/sax/source/tools/CachedOutputStream.hxx
+++ b/sax/source/tools/CachedOutputStream.hxx
@@ -100,15 +100,6 @@ public:
mnCacheWrittenSize += nLen;
}
-void writeByte( const sal_Int8 cChar )
-{
-// Write when the buffer gets big enough
-if (mnCacheWrittenSize + 1 mnMaximumSize)
-flush();
-
-*(pSeq-elements + mnCacheWrittenSize++) = cChar;
-}
-
/// immediately write buffer into mxOutputStream and clear
void flush()
{
diff --git a/sax/source/tools/fastserializer.cxx
b/sax/source/tools/fastserializer.cxx
index ff089fd..ac8376b 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -43,6 +43,14 @@ using ::com::sun::star::io::XOutputStream;
// number of characters without terminating 0
#define N_CHARS(string) (SAL_N_ELEMENTS(string) - 1)
+static const char sClosingBracket[] = ;
+static const char sSlashAndClosingBracket[] = /;
+static const char sColon[] = :;
+static const char sOpeningBracket[] = ;
+static const char sOpeningBracketAndSlash[] = /;
+static const char sQuote[] = \;
+static const char sEqualSignAndQuote[] = =\;
+static const char sSpace[] = ;
static const char sXmlHeader[] = ?xml version=\1.0\ encoding=\UTF-8\
standalone=\yes\?\n;
namespace sax_fastparser {
@@ -103,10 +111,10 @@ namespace sax_fastparser {
case '': writeBytes( quot;, 6 ); break;
case '\n': writeBytes( #10;, 5 );break;
case '\r': writeBytes( #13;, 5 );break;
-default:writeByte( cChar ); break;
+default:writeBytes( cChar, 1 ); break;
}
else
-writeByte( cChar );
+writeBytes( cChar, 1 );
}
}
@@ -138,7 +146,7 @@ namespace sax_fastparser {
case '': writeBytes( quot;, 6 ); break;
case '\n': writeBytes( #10;, 5 );break;
case '\r': writeBytes( #13;, 5 );break;
-default:writeByte( c ); break;
+default:writeBytes( c, 1 ); break;
}
}
}
@@ -153,7 +161,7 @@ namespace sax_fastparser {
{
if( HAS_NAMESPACE( nElement ) ) {
writeBytes(mxFastTokenHandler-getUTF8Identifier(NAMESPACE(nElement)));
-writeByte(':');
+writeBytes(sColon, N_CHARS(sColon));
writeBytes(mxFastTokenHandler-getUTF8Identifier(TOKEN(nElement)));
} else
writeBytes(mxFastTokenHandler-getUTF8Identifier(nElement));
@@ -167,7 +175,8 @@ namespace sax_fastparser {
mxFastTokenHandler-getUTF8Identifier(NAMESPACE(nElement)));
Sequencesal_Int8 const name(
mxFastTokenHandler-getUTF8Identifier(TOKEN(nElement)));
-return OString(reinterpret_castsal_Char
const*(ns.getConstArray()), ns.getLength()) + :
+return OString(reinterpret_castsal_Char
const*(ns.getConstArray()), ns.getLength())
+ + OString(sColon, N_CHARS(sColon))
+ OString(reinterpret_castsal_Char
const*(name.getConstArray()), name.getLength());
} else {
Sequencesal_Int8 const name(
@@ -189,7 +198,7 @@ namespace sax_fastparser {
m_DebugStartedElements.push(Element);
#endif
-writeByte('');
+writeBytes(sOpeningBracket, N_CHARS(sOpeningBracket));
writeId(Element);
if (pAttrList)
@@ -197,7 +206,7 @@ namespace sax_fastparser {
else
writeTokenValueList();
-writeByte('');
+writeBytes(sClosingBracket, N_CHARS(sClosingBracket));
}
void FastSaxSerializer::endFastElement( ::sal_Int32 Element )
@@ -209,10 +218,11 @@ namespace sax_fastparser {
m_DebugStartedElements.pop();
#endif
-writeByte('');
-writeByte('/');
+writeBytes(sOpeningBracketAndSlash, N_CHARS(sOpeningBracketAndSlash));
+
writeId(Element);
-writeByte('');
+
+writeBytes(sClosingBracket, N_CHARS(sClosingBracket));
}
void FastSaxSerializer::singleFastElement( ::sal_Int32 Element,
FastAttributeList* pAttrList )
@@ -223,7
[Libreoffice-commits] core.git: 2 commits - sdext/source sw/source
sdext/source/presenter/PresenterHelpView.cxx |4 ++--
sw/source/core/tox/txmsrt.cxx|2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit e5ab3685550cf35c3eb9cb47530044f2d86433d5
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 6 09:19:18 2014 +0100
Related: coverity#704049 Unchecked return value
surely this should be IsLess not IsEqual, i.e.
see
commit 86a3fe47a66950e26d23d7d7f2680fa7d4fb0839
Date: Sat Oct 4 21:36:27 2014 -0500
coverity#704049 Unchecked return value
and
commit 3edb1dcdc82304c418fc32212bb0bdf2c92e414e
Date: Wed Jun 26 08:32:38 2002 +
#99877# Phonetic sorting for Asian languages
Change-Id: I6c78e388e986577c34b37643a877ab7f5c17b173
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index ee76ab1..d67d2ef 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -246,7 +246,7 @@ bool SwTOXSortTabBase::operator( const SwTOXSortTabBase
rCmp )
// else - compare AlternativeText
if( ( pEnd pEndCmp ) || ( !pEnd !pEndCmp ) )
{
-return pTOXIntl-IsEqual( GetTxt(), GetLocale(),
+return pTOXIntl-IsLess( GetTxt(), GetLocale(),
rCmp.GetTxt(),
rCmp.GetLocale() );
}
if( pEnd !pEndCmp )
commit 58ff30d1a1b9404255bb0dbca5ed52e8355292a4
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 6 09:14:21 2014 +0100
convert to floating point before divide
Change-Id: I0328ca6594b3809210ea124dcb744bad3b5eb92e
diff --git a/sdext/source/presenter/PresenterHelpView.cxx
b/sdext/source/presenter/PresenterHelpView.cxx
index c7a429c..7152b9a 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -291,8 +291,8 @@ void PresenterHelpView::Paint (const awt::Rectangle
rUpdateBox)
PresenterCanvasHelper::SetDeviceColor(aRenderState, mpFont-mnColor);
mxCanvas-drawLine(
-geometry::RealPoint2D((double)(aWindowBox.Width/2),
gnVerticalBorder),
-geometry::RealPoint2D((double)(aWindowBox.Width/2), mnSeparatorY -
gnVerticalBorder),
+geometry::RealPoint2D((aWindowBox.Width/2.0), gnVerticalBorder),
+geometry::RealPoint2D((aWindowBox.Width/2.0), mnSeparatorY -
gnVerticalBorder),
aViewState,
aRenderState);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - basegfx/CppunitTest_basegfx.mk basegfx/test basic/source comphelper/source connectivity/workben cui/source desktop/source drawinglayer/source include/comphe
basegfx/CppunitTest_basegfx.mk |1
basegfx/test/boxclipper.cxx |4
basic/source/runtime/methods.cxx |4
comphelper/source/misc/random.cxx| 58
connectivity/workben/testmoz/initUNO.cxx | 37
connectivity/workben/testmoz/main.cxx| 663
--
connectivity/workben/testmoz/makefile.mk | 61
connectivity/workben/testmoz/mozthread.cxx | 454
--
cui/source/customize/cfg.cxx |4
desktop/source/deployment/misc/lockfile.cxx |8
drawinglayer/source/primitive2d/polygonprimitive2d.cxx | 16
drawinglayer/source/texture/texture.cxx |9
include/comphelper/random.hxx| 21
include/drawinglayer/tools/converters.hxx|2
oox/source/export/chartexport.cxx|4
sc/Library_scopencl.mk |1
sc/source/core/data/global.cxx |2
sc/source/core/data/table3.cxx |5
sc/source/core/opencl/opencl_device.cxx |4
sc/source/core/tool/interpr1.cxx |2
sc/source/core/tool/interpr3.cxx |3
sc/source/ui/StatisticsDialogs/SamplingDialog.cxx| 13
scaddins/idl/com/sun/star/sheet/addin/XAnalysis.idl |2
scaddins/source/analysis/analysis.cxx|9
sd/source/core/CustomAnimationPreset.cxx |7
sd/source/ui/remotecontrol/AvahiNetworkService.cxx |5
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx |4
slideshow/source/inc/tools.hxx |5
svx/source/svdraw/sdrpagewindow.cxx |6
svx/source/svdraw/sdrpaintwindow.cxx | 32
sw/qa/core/uwriter.cxx | 16
sw/source/filter/ww8/docxattributeoutput.cxx |9
vbahelper/source/vbahelper/vbacommandbarhelper.cxx |4
vcl/source/window/debugevent.cxx |3
xmloff/source/text/txtlists.cxx |4
35 files changed, 149 insertions(+), 1333 deletions(-)
New commits:
commit 17dd074b3f775326b6787c0fc77d4048e541e220
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 6 12:50:20 2014 +0100
drop connectivity testmoz workben
Change-Id: I09b387606dee76605ad60dcf8cfb3fc68057d7be
diff --git a/connectivity/workben/testmoz/initUNO.cxx
b/connectivity/workben/testmoz/initUNO.cxx
deleted file mode 100644
index 2cc1d35..000
--- a/connectivity/workben/testmoz/initUNO.cxx
+++ /dev/null
@@ -1,37 +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 rtl/bootstrap.hxx
-#include cppuhelper/bootstrap.hxx
-#include com/sun/star/lang/XMultiServiceFactory.hpp
-
-using namespace cppu;
-using namespace com::sun::star::lang;
-using namespace com::sun::star;
-using namespace com::sun::star::uno;
-
-Reference XMultiServiceFactory InitializeFac( void )
-{
-ReferenceXComponentContext xComponentContext =
::cppu::defaultBootstrap_InitialComponentContext();
-ReferenceXMultiServiceFactory
xMS(xComponentContext-getServiceManager(), UNO_QUERY);
-return xMS;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/workben/testmoz/main.cxx
b/connectivity/workben/testmoz/main.cxx
deleted file mode 100644
index 0b49ea3..000
--- a/connectivity/workben/testmoz/main.cxx
+++ /dev/null
@@ -1,663 +0,0 @@
-/*
[ANN] LIbreOffice 4.2.7 RC1 available
Dear Community, The Document Foundation is pleased to announce the first release candidate of LibreOffice 4.2.7. The upcoming 4.2.7 will be the seventh (and last) in a sequence of frequent bugfix releases for our feature-packed 4.2 line. Feel free to give it a try instead of 4.2.6. The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Developers and QA might also be interested in the symbol server for windows debug information (see the release notes linked below for details) Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/community/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/LibreOffice_Localization_Guide or help with funding our operations: http://donate.libreoffice.org/ A list of known issues and fixed bugs with 4.2.7 RC1 is available from our wiki: http://wiki.documentfoundation.org/Releases/4.2.7/RC1 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. On behalf of the Community, Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: editeng/source
editeng/source/misc/svxacorr.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 76b50b7b0d58e73b973b79566e227a22b831fcbb
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 6 14:41:43 2014 +0100
Resolves: fdo#84698 crash in autoreplacement
Change-Id: I44d5dacb21870f77ca993b24f3a31433edb17c6d
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index b4ca129..79d5c39 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2791,7 +2791,8 @@ const SvxAutocorrWord*
SvxAutocorrWordList::WordMatches(const SvxAutocorrWord *p
if (!left_wildcard)
{
// fdo#33899 avoid 1/2, 1/3.. to be replaced by
fractions in dates, eg. 1/2/14
-if ( rTxt[nEndPos] == '/' rChk.indexOf( '/' ) != -1 )
return NULL;
+if (rTxt.getLength() nEndPos rTxt[nEndPos] == '/'
rChk.indexOf('/') != -1)
+return NULL;
return pFnd;
}
// get the first word delimiter position before the matching
.*word pattern
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 39625] Make existing cppunittests work
https://bugs.freedesktop.org/show_bug.cgi?id=39625 --- Comment #19 from David Tardon dtar...@redhat.com --- (In reply to Tobias Madl from comment #18) So for further information, i now removed all occurrence of testshl. But i still can't close the ticket, because on one hand there's the /sal/qa/systools/test_comtools.cxx test, which only runs under windows, so sb with a windows maschine has to fix this. (Suggestion to change the ticket to a windows dependency ticket). You could still do that yourself, put the patch to gerrit (with -2 code review so someone does not push it too soon) and ask on IRC to run buildbot on it. Maybe it would work :) -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/inc sw/source
sw/inc/format.hxx |4 ++
sw/inc/frmfmt.hxx |2 +
sw/inc/swtblfmt.hxx| 51 ++--
sw/source/core/attr/format.cxx | 18 +++---
sw/source/core/layout/atrfrm.cxx | 15 +---
sw/source/core/layout/paintfrm.cxx |2 -
sw/source/core/table/swtable.cxx | 66 +
7 files changed, 121 insertions(+), 37 deletions(-)
New commits:
commit 36cc153d32bc262c2285d333a1369f6ca36a7fba
Author: Armin Le Grand a...@apache.org
Date: Mon Oct 6 13:59:33 2014 +
i125163 Corrected FillStyle handling for tables in Writer
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 360358c..070a273 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -333,6 +333,10 @@ public:
*/
virtual sal_Bool IsShadowTransparent() const;
+// decide if DrawingLayer FillAttributes are supported. If answering
this with yes
+// the full FillStyle ItemSet will be used to handle/visualize the element
+virtual bool supportsFullDrawingLayerFillAttributeSet() const;
+
// Access to DrawingLayer FillAttributes in a preprocessed form for
primitive usage
virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr
getSdrAllFillAttributesHelper() const;
};
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index f5ce6ad..39ecd23 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -71,6 +71,8 @@ protected:
public:
TYPEINFO(); //Bereits in Basisklasse Client drin.
+//
+~SwFrmFmt();
//Vernichtet alle Frms in aDepend (Frms werden per PTR_CAST erkannt).
virtual void DelFrms();
diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index fe27009..5bba53a 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -32,18 +32,17 @@ class SW_DLLPUBLIC SwTableFmt : public SwFrmFmt
friend class SwDoc;
protected:
-SwTableFmt( SwAttrPool rPool, const sal_Char* pFmtNm,
-SwFrmFmt *pDrvdFrm )
-: SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableSetRange )
-{}
-SwTableFmt( SwAttrPool rPool, const String rFmtNm,
-SwFrmFmt *pDrvdFrm )
-: SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableSetRange )
-{}
-
+//
+SwTableFmt(SwAttrPool rPool,const sal_Char* pFmtNm, SwFrmFmt *pDrvdFrm);
+SwTableFmt(SwAttrPool rPool,const String rFmtNm, SwFrmFmt *pDrvdFrm);
public:
TYPEINFO(); //Bereits in Basisklasse Client drin.
+//
+virtual ~SwTableFmt();
+
+//
+virtual bool supportsFullDrawingLayerFillAttributeSet() const;
DECL_FIXEDMEMPOOL_NEWDEL(SwTableFmt)
};
@@ -53,17 +52,17 @@ class SwTableLineFmt : public SwFrmFmt
friend class SwDoc;
protected:
-SwTableLineFmt( SwAttrPool rPool, const sal_Char* pFmtNm,
-SwFrmFmt *pDrvdFrm )
-: SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange )
-{}
-SwTableLineFmt( SwAttrPool rPool, const String rFmtNm,
-SwFrmFmt *pDrvdFrm )
-: SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange )
-{}
+//
+SwTableLineFmt(SwAttrPool rPool,const sal_Char* pFmtNm, SwFrmFmt
*pDrvdFrm);
+SwTableLineFmt(SwAttrPool rPool,const String rFmtNm, SwFrmFmt *pDrvdFrm);
public:
TYPEINFO(); //Bereits in Basisklasse Client drin.
+//
+virtual ~SwTableLineFmt();
+
+//
+virtual bool supportsFullDrawingLayerFillAttributeSet() const;
DECL_FIXEDMEMPOOL_NEWDEL(SwTableLineFmt)
};
@@ -73,20 +72,20 @@ class SW_DLLPUBLIC SwTableBoxFmt : public SwFrmFmt
friend class SwDoc;
protected:
-SwTableBoxFmt( SwAttrPool rPool, const sal_Char* pFmtNm,
-SwFrmFmt *pDrvdFrm )
-: SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange )
-{}
-SwTableBoxFmt( SwAttrPool rPool, const String rFmtNm,
-SwFrmFmt *pDrvdFrm )
-: SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange )
-{}
+//
+SwTableBoxFmt(SwAttrPool rPool,const sal_Char* pFmtNm, SwFrmFmt
*pDrvdFrm);
+SwTableBoxFmt(SwAttrPool rPool,const String rFmtNm, SwFrmFmt *pDrvdFrm);
// zum Erkennen von Veraenderungen (haupts. TableBoxAttribute)
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue
);
+virtual void Modify(const SfxPoolItem* pOld,const SfxPoolItem* pNewValue);
public:
TYPEINFO(); //Bereits in Basisklasse Client drin.
+//
+virtual ~SwTableBoxFmt();
+
+//
+virtual bool supportsFullDrawingLayerFillAttributeSet() const;
DECL_FIXEDMEMPOOL_NEWDEL(SwTableBoxFmt)
};
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 456d9d1..6f67dd5 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -436,7 +436,7 @@ sal_Bool SwFmt::SetDerivedFrom(SwFmt *pDerFrom)
const
[Libreoffice-commits] core.git: filter/source include/filter sd/source
filter/source/msfilter/svdfppt.cxx | 101 +---
include/filter/msfilter/svdfppt.hxx | 25 +---
sd/source/filter/ppt/pptin.cxx | 29 --
3 files changed, 79 insertions(+), 76 deletions(-)
New commits:
commit b1d48f0d9a3442c11adae6e36325a463d89ce44e
Author: Takeshi Abe t...@fixedpoint.jp
Date: Sun Oct 5 11:40:03 2014 +0900
fdo#75757: remove inheritance to std::vector
from PptSlidePersistList.
This also puts in assertions that every entry in a PptSlidePersistList
is non-null.
Cf. 9536a28ede89e8c29940e8ba225215a45667062c
Change-Id: Iea35532ed668e58a3f02d3f3433a66c2d4e1fe2a
Reviewed-on: https://gerrit.libreoffice.org/11807
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 841a0ef..e4c54f0 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -118,6 +118,7 @@
#include svtools/embedhlp.hxx
#include algorithm
+#include cassert
#include set
#include rtl/strbuf.hxx
#include tools/time.hxx
@@ -199,9 +200,9 @@ SvStream ReadPptSlidePersistAtom( SvStream rIn,
PptSlidePersistAtom rAtom )
sal_uInt16 PptSlidePersistList::FindPage(sal_uInt32 nId) const
{
-for ( sal_uInt16 i=0; i size(); i++ )
+for ( sal_uInt16 i=0; i mvEntries.size(); i++ )
{
-if (operator[](i)-GetSlideId()==nId) return i;
+if (mvEntries[ i ].GetSlideId()==nId) return i;
}
return PPTSLIDEPERSIST_ENTRY_NOTFOUND;
}
@@ -1529,8 +1530,8 @@ SdrPowerPointImport::SdrPowerPointImport(
PowerPointImportParam rParam, const O
PptSlidePersistList* pPageList = GetPageList( PptPageKind(
nPageListNum ) );
for ( sal_uInt16 nPageNum = 0; nPageNum pPageList-size();
nPageNum++ )
{
-PptSlidePersistEntry* pE2 = (*pPageList)[ nPageNum ];
-sal_uLong nPersist = pE2-aPersistAtom.nPsrReference;
+PptSlidePersistEntry rE2 = (*pPageList)[ nPageNum ];
+sal_uLong nPersist = rE2.aPersistAtom.nPsrReference;
if ( ( nPersist 0 ) ( nPersist nPersistPtrAnz ) )
{
sal_uLong nFPos = pPersistPtr[ nPersist ];
@@ -1540,9 +1541,9 @@ SdrPowerPointImport::SdrPowerPointImport(
PowerPointImportParam rParam, const O
DffRecordHeader aSlideHd;
ReadDffRecordHeader( rStCtrl, aSlideHd );
if ( SeekToRec( rStCtrl, PPT_PST_SlideAtom,
aSlideHd.GetRecEndFilePos() ) )
-ReadPptSlideAtom( rStCtrl, pE2-aSlideAtom );
+ReadPptSlideAtom( rStCtrl, rE2.aSlideAtom );
else if ( SeekToRec( rStCtrl, PPT_PST_NotesAtom,
aSlideHd.GetRecEndFilePos() ) )
-ReadPptNotesAtom( rStCtrl, pE2-aNotesAtom );
+ReadPptNotesAtom( rStCtrl, rE2.aNotesAtom );
aSlideHd.SeekToContent( rStCtrl );
DffRecordHeader aPPTDrawingHd;
@@ -1555,30 +1556,30 @@ SdrPowerPointImport::SdrPowerPointImport(
PowerPointImportParam rParam, const O
{
DffRecordHeader aDgRecordHeader;
ReadDffRecordHeader( rStCtrl,
aDgRecordHeader );
-pE2-nDrawingDgId =
aDgRecordHeader.nRecInstance;
+rE2.nDrawingDgId =
aDgRecordHeader.nRecInstance;
aDgRecordHeader.SeekToEndOfRecord(
rStCtrl );
}
if ( SeekToRec( rStCtrl,
DFF_msofbtSolverContainer, aPPTDgContainer.GetRecEndFilePos() ) )
{
-pE2-pSolverContainer = new
SvxMSDffSolverContainer;
-ReadSvxMSDffSolverContainer( rStCtrl,
*( pE2-pSolverContainer ) );
+rE2.pSolverContainer = new
SvxMSDffSolverContainer;
+ReadSvxMSDffSolverContainer( rStCtrl,
*( rE2.pSolverContainer ) );
}
aPPTDgContainer.SeekToBegOfRecord( rStCtrl
);
SetDgContainer( rStCtrl ); // set this,
so that the escherimport is knowing of our drawings
}
}
// office xp is supporting more than one stylesheet
-if ( ( pE2-ePageKind == PPT_MASTERPAGE ) (
pE2-aSlideAtom.nMasterId == 0 ) ( pE2-bNotesMaster == false )
[Libreoffice-commits] core.git: scripting/java
scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java | 246 ++ scripting/java/com/sun/star/script/framework/browse/DialogFactory.java | 95 ++- scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java | 86 +-- scripting/java/com/sun/star/script/framework/browse/PkgProviderBrowseNode.java |6 scripting/java/com/sun/star/script/framework/browse/ProviderBrowseNode.java | 70 +- scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java | 114 ++-- scripting/java/com/sun/star/script/framework/container/DeployedUnoPackagesDB.java |8 scripting/java/com/sun/star/script/framework/container/Parcel.java | 63 +- scripting/java/com/sun/star/script/framework/container/ParcelContainer.java | 177 --- scripting/java/com/sun/star/script/framework/container/ParcelDescriptor.java | 15 scripting/java/com/sun/star/script/framework/container/ParsedScriptUri.java |3 scripting/java/com/sun/star/script/framework/container/ScriptEntry.java |9 scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java | 52 +- scripting/java/com/sun/star/script/framework/container/UnoPkgContainer.java | 100 ++-- scripting/java/com/sun/star/script/framework/container/XMLParser.java |2 scripting/java/com/sun/star/script/framework/container/XMLParserFactory.java | 55 +- scripting/java/com/sun/star/script/framework/io/UCBStreamHandler.java | 47 + scripting/java/com/sun/star/script/framework/io/XInputStreamImpl.java | 19 scripting/java/com/sun/star/script/framework/io/XInputStreamWrapper.java |4 scripting/java/com/sun/star/script/framework/io/XOutputStreamWrapper.java | 24 scripting/java/com/sun/star/script/framework/io/XStorageHelper.java | 53 +- scripting/java/com/sun/star/script/framework/log/LogUtils.java |2 scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java |5 scripting/java/com/sun/star/script/framework/provider/EditorScriptContext.java | 16 scripting/java/com/sun/star/script/framework/provider/NoSuitableClassLoaderException.java |5 scripting/java/com/sun/star/script/framework/provider/PathUtils.java | 10 scripting/java/com/sun/star/script/framework/provider/ScriptContext.java | 24 scripting/java/com/sun/star/script/framework/provider/ScriptEditor.java |2 scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java | 239 - scripting/java/com/sun/star/script/framework/provider/SwingInvocation.java |3 scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java |6 scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java | 26 - scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java | 116 ++-- scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceModel.java |3 scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptSourceView.java |2 scripting/java/com/sun/star/script/framework/provider/java/Resolver.java | 10 scripting/java/com/sun/star/script/framework/provider/java/ScriptDescriptor.java | 20 scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java | 124 ++--- scripting/java/com/sun/star/script/framework/provider/java/ScriptProxy.java | 14 scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java | 33 - scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java | 24 scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java | 79 +-- scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java |8 43 files changed, 1136 insertions(+), 883 deletions(-) New commits: commit e41597eade24f04893752a4339112b13419fefdd Author: Robert Antoni Buj i Gelonch robert@gmail.com Date: Fri Oct 3 17:07:28 2014 +0200 scripting: line break (code formatting)
Re: OASIS JIRA report | Proposal: hint for complex content
Hi Miklos, Miklos Vajna schrieb: Hi Regina, On Fri, Oct 03, 2014 at 12:08:06PM +0200, Regina Henschel rb.hensc...@t-online.de wrote: No, I do not know any. But I don't know, what MS does, when it converts the own complex shapes to ODF. Try it yourself: if you have e.g. a triangle containing a table, then they simply write the content of the table (but not the table itself) to ODF, to produce valid ODF. That's a discussion for an other proposal, though. Yes. But the element text:p is not simple. See the possible child elements listed in 5.1.3text:p For your purpose relevant is, that it can have a child draw:frame. And this in turn can have all you want, see the list in 10.4.2draw:frame. Especially the child table:table is possible. So you propose to add a fake paragraph and a fake frame to hack in a table into a shape content when you describe that in ODF, instead of simply allowing table:table inside e.g. draw:custom-shape? That sounds suboptimal to me. :-) But again, this is not proposed yet, so outside of the scope of the current discussion. Yes. I have put my suggestion in https://bugs.freedesktop.org/show_bug.cgi?id=84714 It depends on the children of text:p what renderer is needed. That should be detected on parsing. I disagree here. An implementation should be able to analyze the XML tree and react according to existing or not existing child elements. Please be aware of that LO's xmloff uses a SAX parser, so this is not easily possible. This list is to discuss patches to the LO codebase, not to discuss theoretical problems. ;-) (Or instructing developers what their implementation should do.) You are right in regard to implementation, but I will have to support your solutions in OASIS TC as far as file format is affected. Therefore I want to know why things are done and why it is necessary to do it that way. Please apologize if I sounded presumptuous. You have implemented a great feature. Especially getting Math-OLE inside a shape is a large improvement and I hope you continue and implement it for Draw and Impress too. However, now that you mentioned that an alternative way to describe a shape with a TextBox is to (mis-)use some existing ODF markup, instead of using an explicit new optional attribute, I reimplemented sw textboxes in xmloff in commit 9835a5823e0f559aabbc0e15ea126c82229c4bc7. It uses the same (somewhat ugly) trick how we detect draw vs sw shapes, just in this case for the content of customshapes. I have tested the new daily build containing that changes. Testing results in issues 84697, 84695, 84691; but I don't know, whether these exists before. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - download.lst
download.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7a859ef06fa26b4ec4f774d6a91d18d5375e00d1 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Thu Oct 2 21:14:40 2014 -0400 Update mdds to 0.11.1. (cherry picked from commit 8030c21def37f965a35b534038659fd0b513887c) Conflicts: download.lst Change-Id: Ie1c80029a762fcf92dc20ffe74260ea54c61da28 Reviewed-on: https://gerrit.libreoffice.org/11791 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/download.lst b/download.lst index 303033d..5a7c385 100644 --- a/download.lst +++ b/download.lst @@ -95,7 +95,7 @@ export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz export LIBXSLT_TARBALL := 9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz export MARIADB_TARBALL := 05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2 -export MDDS_TARBALL := a67a46ec9d00d283a7cd8dbdd2906b59-mdds_0.11.0.tar.bz2 +export MDDS_TARBALL := 896272c1a9e396b871cb4dffbd694503-mdds_0.11.1.tar.bz2 export MSPUB_MD5SUM := 1d489c4932109e72495b1df8b69e5f11 export MSPUB_TARBALL := libmspub-0.1.1.tar.bz2 export MWAW_MD5SUM := 6f1ac4a0e24131c422e1e91f07718fb6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/core/uwriter.cxx | 490 +
1 file changed, 292 insertions(+), 198 deletions(-)
New commits:
commit 2c6d17b02529f0bc8bfcb1fc16f9e1481ea71829
Author: Matthew J. Francis mjay.fran...@gmail.com
Date: Sun Oct 5 13:09:03 2014 +0800
Refactor giant SwDocTest::testModelToViewHelper() into smaller tests
This is to clear the way for following bugfixes which will add to /
amend these tests
Change-Id: Ie97aba72f1a4c7b1be37577b9bcab2b2f0750d17
Reviewed-on: https://gerrit.libreoffice.org/11808
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index a739ca0..a9f4fbd 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -80,6 +80,22 @@ public:
void testFileNameFields();
void testDocStat();
void testModelToViewHelper();
+void testModelToViewHelperPassthrough();
+void testModelToViewHelperExpandFieldsExpandFootnote();
+void testModelToViewHelperExpandFieldsExpandFootnoteReplaceMode();
+void testModelToViewHelperExpandFields();
+void testModelToViewHelperExpandFieldsReplaceMode();
+void testModelToViewHelperExpandFieldsHideInvisible();
+void testModelToViewHelperExpandFieldsHideRedlined();
+void testModelToViewHelperExpandFieldsHideInvisibleExpandFootnote();
+void
testModelToViewHelperExpandFieldsHideInvisibleExpandFootnoteReplaceMode();
+void testModelToViewHelperExpandFieldsHideHideRedlinedExpandFootnote();
+void
testModelToViewHelperExpandFieldsHideHideRedlinedExpandFootnoteReplaceMode();
+void testModelToViewHelperHideInvisibleHideRedlined();
+void
testModelToViewHelperExpandFieldsHideInvisibleHideRedlinedExpandFootnote();
+void
testModelToViewHelperExpandFieldsHideInvisibleHideRedlinedExpandFootnoteReplaceMode();
+void testModelToViewHelperExpandFieldsExpandFootnote2();
+void testModelToViewHelperExpandFieldsExpandFootnoteReplaceMode2();
void testSwScanner();
void testUserPerceivedCharCount();
void testGraphicAnchorDeletion();
@@ -92,7 +108,21 @@ public:
CPPUNIT_TEST(testPageDescName);
CPPUNIT_TEST(testFileNameFields);
CPPUNIT_TEST(testDocStat);
-CPPUNIT_TEST(testModelToViewHelper);
+CPPUNIT_TEST(testModelToViewHelperExpandFieldsExpandFootnote);
+CPPUNIT_TEST(testModelToViewHelperExpandFieldsExpandFootnoteReplaceMode);
+CPPUNIT_TEST(testModelToViewHelperExpandFields);
+CPPUNIT_TEST(testModelToViewHelperExpandFieldsReplaceMode);
+CPPUNIT_TEST(testModelToViewHelperExpandFieldsHideInvisible);
+CPPUNIT_TEST(testModelToViewHelperExpandFieldsHideRedlined);
+CPPUNIT_TEST(testModelToViewHelperExpandFieldsHideInvisibleExpandFootnote);
+
CPPUNIT_TEST(testModelToViewHelperExpandFieldsHideInvisibleExpandFootnoteReplaceMode);
+
CPPUNIT_TEST(testModelToViewHelperExpandFieldsHideHideRedlinedExpandFootnote);
+
CPPUNIT_TEST(testModelToViewHelperExpandFieldsHideHideRedlinedExpandFootnoteReplaceMode);
+CPPUNIT_TEST(testModelToViewHelperHideInvisibleHideRedlined);
+
CPPUNIT_TEST(testModelToViewHelperExpandFieldsHideInvisibleHideRedlinedExpandFootnote);
+
CPPUNIT_TEST(testModelToViewHelperExpandFieldsHideInvisibleHideRedlinedExpandFootnoteReplaceMode);
+CPPUNIT_TEST(testModelToViewHelperExpandFieldsExpandFootnote2);
+CPPUNIT_TEST(testModelToViewHelperExpandFieldsExpandFootnoteReplaceMode2);
CPPUNIT_TEST(testSwScanner);
CPPUNIT_TEST(testUserPerceivedCharCount);
CPPUNIT_TEST(testGraphicAnchorDeletion);
@@ -226,220 +256,284 @@ void SwDocTest::testUserPerceivedCharCount()
CPPUNIT_ASSERT_MESSAGE(Surrogate Pair should be counted as single
character, nCount == 1);
}
-void SwDocTest::testModelToViewHelper()
+SwTxtNode* getModelToViewTestDocument(SwDoc *pDoc)
{
-SwNodeIndex aIdx(m_pDoc-GetNodes().GetEndOfContent(), -1);
+SwNodeIndex aIdx(pDoc-GetNodes().GetEndOfContent(), -1);
SwPaM aPaM(aIdx);
-{
-SwFmtFtn aFtn;
-aFtn.SetNumStr(OUString(foo));
+SwFmtFtn aFtn;
+aFtn.SetNumStr(OUString(foo));
-
m_pDoc-getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
-m_pDoc-getIDocumentContentOperations().InsertString(aPaM,
OUString(A B ));
-SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
-sal_Int32 nPos = aPaM.GetPoint()-nContent.GetIndex();
-pTxtNode-InsertItem(aFtn, nPos, nPos);
-m_pDoc-getIDocumentContentOperations().InsertString(aPaM, OUString(
C ));
-nPos = aPaM.GetPoint()-nContent.GetIndex();
-pTxtNode-InsertItem(aFtn, nPos, nPos);
-m_pDoc-getIDocumentContentOperations().InsertString(aPaM, OUString(
D));
-CPPUNIT_ASSERT(pTxtNode-GetTxt().getLength() == (4*5) + 5 + 2);
-
-//set start of selection to first B
-aPaM.GetPoint()-nContent.Assign(aPaM.GetCntntNode(), 6);
-
[Libreoffice-commits] core.git: 2 commits - comphelper/source include/comphelper sw/source
comphelper/source/misc/random.cxx |4
include/comphelper/random.hxx |4
sw/source/core/bastyp/breakit.cxx |3 +++
3 files changed, 11 insertions(+)
New commits:
commit 946ea643185af680508a0333f63c086ed3f454a3
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 6 15:27:37 2014 +0100
Resolves: fdo#84649 can have negative values from ConvertToModelPosition
Change-Id: I570ee54e15a4cd4b11da26004164d9e6a1d8cdb9
diff --git a/sw/source/core/bastyp/breakit.cxx
b/sw/source/core/bastyp/breakit.cxx
index 0e3aeea..f3b229c 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -103,6 +103,9 @@ sal_uInt16 SwBreakIt::GetRealScriptOfText( const OUString
rTxt, sal_Int32 nPos
{
if( nPos nPos == rTxt.getLength() )
--nPos;
+else if( nPos 0)
+nPos = 0;
+
nScript = xBreak-getScriptType( rTxt, nPos );
sal_Int32 nChgPos = 0;
if ( i18n::ScriptType::WEAK == nScript nPos + 1 rTxt.getLength() )
commit de78b2ca3c24a822ad9b8456323b9d2210ae0487
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 6 15:26:13 2014 +0100
when size_t == unsigned int
Change-Id: If8cd3632d69f6456b0e1351efac0e428e0093e3b
diff --git a/comphelper/source/misc/random.cxx
b/comphelper/source/misc/random.cxx
index 4fb4a1f..c695ed1 100644
--- a/comphelper/source/misc/random.cxx
+++ b/comphelper/source/misc/random.cxx
@@ -66,6 +66,8 @@ unsigned int uniform_int_distribution(unsigned int a,
unsigned int b)
return dist(theRandomNumberGenerator::get().global_rng);
}
+#if SAL_TYPES_SIZEOFLONG == 8
+
// uniform size_t [a,b] distribution
size_t uniform_int_distribution(size_t a, size_t b)
{
@@ -73,6 +75,8 @@ size_t uniform_int_distribution(size_t a, size_t b)
return dist(theRandomNumberGenerator::get().global_rng);
}
+#endif
+
// uniform size_t [a,b) distribution
double uniform_real_distribution(double a, double b)
{
diff --git a/include/comphelper/random.hxx b/include/comphelper/random.hxx
index e7051a8..7c149fb 100644
--- a/include/comphelper/random.hxx
+++ b/include/comphelper/random.hxx
@@ -34,9 +34,13 @@ COMPHELPER_DLLPUBLIC int uniform_int_distribution(int a, int
b);
/// uniform distribution in [a,b]
COMPHELPER_DLLPUBLIC unsigned int uniform_int_distribution(unsigned int a,
unsigned int b);
+#if SAL_TYPES_SIZEOFLONG == 8
+
/// uniform distribution in [a,b]
COMPHELPER_DLLPUBLIC size_t uniform_int_distribution(size_t a, size_t b);
+#endif
+
} // namespace
} // namespace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 36/cc153d32bc262c2285d333a1369f6ca36a7fba
36/cc153d32bc262c2285d333a1369f6ca36a7fba |1 + 1 file changed, 1 insertion(+) New commits: commit 91d3734ef0acd1a278ff5e23d3d35a5ededeade6 Author: Caolán McNamara caol...@redhat.com Date: Mon Oct 6 15:38:07 2014 +0100 Notes added by 'git notes add' diff --git a/36/cc153d32bc262c2285d333a1369f6ca36a7fba b/36/cc153d32bc262c2285d333a1369f6ca36a7fba new file mode 100644 index 000..e473d92 --- /dev/null +++ b/36/cc153d32bc262c2285d333a1369f6ca36a7fba @@ -0,0 +1 @@ +prefer: d3de12fcfc85feb36eda3b0495807ef11d8fe772 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
RE: Anti-Virus vendors warnings
Hi I don't know is that helpful information. Symantec delete that files in my case - writerfilter\qa\cppunittests\rtftok\data\pass\ sf_508f4e169fb76c80745d3541bd01b0a2-73462-minimized.rtf Virus:Trojan.Mdropper - d:\bld\deb\workdir\UnpackedTarball\icu\source\bin\ genrb.exe Virus: Suspicious.Cloud - d:\bld\deb\workdir\UnpackedTarball\nss\nss\lib\zlib\out\ example.exe Virus: Suspicious.Cloud.5 The rtf-file have excluded from the scan. When I have this follow autogen.sh setting then the exe have the virus --with-external-tar=/cygdrive/d/src/lo/externalsrc --enable-pch --disable-ccache --disable-activex --disable-atl --enable-debug --with-ant-home=/cygdrive/d/src/lo/apache-ant-1.9.4 --with-junit=/cygdrive/d/src/lo/junit-4.10.jar --with-visual-studio=2012 BUT with this autogen.sh setting NO VIRUS for exe --with-external-tar=/cygdrive/d/src/lo/externalsrc --enable-pch --disable-ccache --disable-activex --disable-atl --enable-dbgutil --with-ant-home=/cygdrive/d/src/lo/apache-ant-1.9.4 --with-junit=/cygdrive/d/src/lo/junit-4.10.jar --with-visual-studio=2012 --with-lang=de en-GB In the Release Version have this autogen.sh setting and have the Virus for exe --with-external-tar=/cygdrive/d/src/lo/externalsrc --enable-pch --disable-ccache --disable-activex --disable-atl --with-ant-home=/cygdrive/d/src/lo/apache-ant-1.9.4 --with-junit=/cygdrive/d/src/lo/junit-4.10.jar I'm not really sure why, but it works in my case. Juergen ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source
sd/source/ui/remotecontrol/AvahiNetworkService.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 54e86f708cf0274ec6b2536200802cf6f406101d Author: Stephan Bergmann sberg...@redhat.com Date: Mon Oct 6 16:49:26 2014 +0200 Missing include Change-Id: I47ddb95018109e5e771324b699dfdc10f529dfc4 diff --git a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx index 9f53c5d..895cf7c 100644 --- a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx +++ b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx @@ -8,6 +8,7 @@ */ #include time.h #include iostream +#include limits #include new #include stdlib.h #include assert.h ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Anti-Virus vendors warnings
On 06/10/14 16:45, Juergen Funk Mailinglist wrote: Hi I don't know is that helpful information. Symantec delete that files in my case - writerfilter\qa\cppunittests\rtftok\data\pass\ sf_508f4e169fb76c80745d3541bd01b0a2-73462-minimized.rtf Virus:Trojan.Mdropper hi Juergen, i hope we can encrypt this one like the CVE test-cases, so it doesn't cause warnings any more. - d:\bld\deb\workdir\UnpackedTarball\icu\source\bin\ genrb.exe Virus: Suspicious.Cloud - d:\bld\deb\workdir\UnpackedTarball\nss\nss\lib\zlib\out\ example.exe Virus: Suspicious.Cloud.5 The rtf-file have excluded from the scan. those are probably not something we can work around easily; can you report and upload these files as false positive to your Anti-virus tool vendor? i mean, you are paying them for the tool, so they should fix it if it doesn't work :) When I have this follow autogen.sh setting then the exe have the virus --enable-debug BUT with this autogen.sh setting NO VIRUS for exe --enable-dbgutil so that's the random difference, perhaps it's because dbgutil uses MSVC debug runtime? fun... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/anchor-position.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |9 +
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |2 +-
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx|2 +-
sw/source/core/txtnode/ndtxt.cxx | 16
5 files changed, 27 insertions(+), 2 deletions(-)
New commits:
commit 0a4d77f35e96e4dfdf69cc5ceb788ddaa849084c
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Oct 6 15:26:35 2014 +0200
SwTxtNode::Update: don't move anchors at insert position
Use cases:
1) User of the XTextAppend API's uses appendTextPortion(), then
appendTextContent(), then appendTextPortion() again. It's expected that
the text content will be in the middle of the paragraph, but before, it
was at the end of it.
It's possible to work this around by inserting the text contents only at
the end of the paragraph (like it's done for ODF import in
XMLParaContext::~XMLParaContext()), but probably it's not a good idea to
copypaste this workaround in all the import filters.
2) User types some characters in a new document, then inserts a picture,
and sets anchor type to at-char. Now the anchor point is set to the end
of the paragraph, but it's impossible to type anything after that
character.
To be fair, now it's not possible to type something *before* the anchor
point, if it's at the first character, but hopefully that's less of an
issue, since setting the anchor type to at-char sets it to the end of
the paragraph, not at the start of it.
Change-Id: Ia8b33e8880aae86f62fae09cd5ac1cf82c83320f
diff --git a/sw/qa/extras/ooxmlexport/data/anchor-position.docx
b/sw/qa/extras/ooxmlexport/data/anchor-position.docx
new file mode 100644
index 000..b210ee9
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/anchor-position.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index d1ef8ae..487728d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -403,6 +403,15 @@ DECLARE_OOXMLEXPORT_TEST(testTableStyleBorderExport,
table-style-border-export.
CPPUNIT_ASSERT_EQUAL(sal_Int32(0x8064A2),
getPropertytable::BorderLine2(xCell, BottomBorder).Color);
}
+DECLARE_OOXMLEXPORT_TEST(testAnchorPosition, anchor-position.docx)
+{
+// The problem was that the at-char anchored picture was at the end of the
+// paragraph, so there were only two postions: a Text, then a Frame one.
+CPPUNIT_ASSERT_EQUAL(OUString(Text),
getPropertyOUString(getRun(getParagraph(1), 1), TextPortionType));
+CPPUNIT_ASSERT_EQUAL(OUString(Frame),
getPropertyOUString(getRun(getParagraph(1), 2), TextPortionType));
+CPPUNIT_ASSERT_EQUAL(OUString(Text),
getPropertyOUString(getRun(getParagraph(1), 3), TextPortionType));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 21b8976..7c36ee9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -466,7 +466,7 @@ DECLARE_OOXMLEXPORT_TEST(testFDO79915, fdo79915.docx)
if (!pXmlDoc)
return;
-assertXPathContent(pXmlDoc, /w:document/w:body/w:p[2]/w:r[8]/w:t, How
much buoyancy does the water provide?);
+assertXPathContent(pXmlDoc, /w:document/w:body/w:p[2]/w:r[10]/w:t, How
much buoyancy does the water provide?);
}
DECLARE_OOXMLEXPORT_TEST(testfdo79817, fdo79817.docx)
diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
index dae2b59..d636f9d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
@@ -902,7 +902,7 @@ DECLARE_OOXMLEXPORT_TEST(testOuterShdw,testOuterShdw.docx)
xmlDocPtr pXmlDoc = parseExport(word/document.xml);
if (!pXmlDoc)
return;
-assertXPath(pXmlDoc,
/w:document[1]/w:body[1]/w:p[1]/w:r[3]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/a:graphic[1]/a:graphicData[1]/wps:wsp[1]/wps:spPr[1]/a:effectLst[1]/a:outerShdw[1],
dist, 57811035);
+assertXPath(pXmlDoc,
//mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/a:graphic[1]/a:graphicData[1]/wps:wsp[1]/wps:spPr[1]/a:effectLst[1]/a:outerShdw[1],
dist, 57811035);
}
DECLARE_OOXMLEXPORT_TEST(testExtentValue, fdo74605.docx)
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 83f6c98..5f9f95c 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1097,6 +1097,22 @@ void SwTxtNode::Update(
bSortMarks = bAtLeastOneBookmarkMoved
bAtLeastOneExpandedBookmarkAtInsertionPosition;
}
+
+// at-char anchored flys shouldn't be moved, either.
+
[Libreoffice-commits] core.git: 3 commits - sw/inc sw/qa sw/source
sw/inc/format.hxx |2 +-
sw/inc/frmfmt.hxx |2 +-
sw/inc/swtblfmt.hxx|6 +++---
sw/qa/core/uwriter.cxx |4 ++--
sw/source/core/attr/format.cxx | 14 +++---
sw/source/core/inc/frame.hxx |2 +-
sw/source/core/layout/atrfrm.cxx | 12 ++--
sw/source/core/layout/findfrm.cxx |4 ++--
sw/source/core/layout/frmtool.cxx |2 +-
sw/source/core/layout/paintfrm.cxx |2 +-
sw/source/core/table/swtable.cxx |6 +++---
sw/source/filter/ww8/wrtww8.cxx|8 +++-
12 files changed, 35 insertions(+), 29 deletions(-)
New commits:
commit f0859c4eae0f567393811c308074723329f1faab
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 6 15:59:09 2014 +0100
Resolves: fdo#84588 loop in TableInfo::getNextNode
Change-Id: I5bb44dc94041c3b3cd9d80ba125594a48c9c921f
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index e64c9dd..64e86d0 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2645,9 +2645,15 @@ void MSWordExportBase::WriteText()
if ( rNd == rNd.GetNodes().GetEndOfContent() )
break;
-SwNode * pCurrentNode = pCurPam-GetPoint()-nNode.GetNode();
+const SwNode * pCurrentNode = pCurPam-GetPoint()-nNode.GetNode();
const SwNode * pNextNode = mpTableInfo-getNextNode(pCurrentNode);
+if (pCurrentNode == pNextNode)
+{
+SAL_WARN(sw.ww8, loop in TableInfo);
+pNextNode = NULL;
+}
+
if (pNextNode != NULL)
pCurPam-GetPoint()-nNode = SwNodeIndex(*pNextNode);
else
commit 1a725ff0b42a6a97720f4663b9c5426fd5919079
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 6 15:48:08 2014 +0100
cast to size_t altogether
Change-Id: I93cb374bd9743c45c4f3a98799a5f448dbb46fd8
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index a9f4fbd..6b28654 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -964,8 +964,8 @@ static SwPosition
getRandomPosition(SwDoc *pDoc, int /* nOffset */)
{
const SwPosition aPos(pDoc-GetNodes().GetEndOfContent());
-sal_uLong nNodes = aPos.nNode.GetNode().GetIndex() -
aPos.nNode.GetNode().StartOfSectionIndex();
-sal_uLong n =
comphelper::rng::uniform_int_distribution(static_castsal_uLong(0), nNodes);
+size_t nNodes = aPos.nNode.GetNode().GetIndex() -
aPos.nNode.GetNode().StartOfSectionIndex();
+size_t n =
comphelper::rng::uniform_int_distribution(static_castsize_t(0), nNodes);
SwPaM pam(aPos);
for (sal_uLong i = 0; i n; ++i)
{
commit 5c1482c3e37502bce2b3be106d1a70938ce8b30c
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 6 15:36:26 2014 +0100
Related; #i125163# rename IsAdaptedToNewFillProperties
to supportsFullDrawingLayerFillAttributeSet so as to rename our equivalent
solution of d3de12fcfc85feb36eda3b0495807ef11d8fe772
Resolves: fdo#81277 missing table cell background color in doc/html import
with that of 36cc153d32bc262c2285d333a1369f6ca36a7fba
i125163 Corrected FillStyle handling for tables in Writer
Change-Id: If8ecbc712e01d823d034ff3771bf38a4df16368d
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 1b60569..b576048 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -334,7 +334,7 @@ public:
// Access to DrawingLayer FillAttributes in a preprocessed form for
primitive usage
virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr
getSdrAllFillAttributesHelper() const;
-virtual bool IsAdaptedToNewFillProperties() const;
+virtual bool supportsFullDrawingLayerFillAttributeSet() const;
};
inline void SwFmt::SetName( const sal_Char* pNewName,
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 715f92a..8b33ec2 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -138,7 +138,7 @@ public:
// Access to DrawingLayer FillAttributes in a preprocessed form for
primitive usage
virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr
getSdrAllFillAttributesHelper() const SAL_OVERRIDE;
-virtual bool IsAdaptedToNewFillProperties() const SAL_OVERRIDE;
+virtual bool supportsFullDrawingLayerFillAttributeSet() const SAL_OVERRIDE;
};
// The FlyFrame-Format
diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index 142959e..181bf23 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -42,7 +42,7 @@ public:
DECL_FIXEDMEMPOOL_NEWDEL(SwTableFmt)
-virtual bool IsAdaptedToNewFillProperties() const SAL_OVERRIDE;
+virtual bool supportsFullDrawingLayerFillAttributeSet() const SAL_OVERRIDE;
};
class SwTableLineFmt : public SwFrmFmt
@@ -64,7 +64,7 @@ public:
DECL_FIXEDMEMPOOL_NEWDEL(SwTableLineFmt)
-virtual bool IsAdaptedToNewFillProperties() const SAL_OVERRIDE;
+virtual bool supportsFullDrawingLayerFillAttributeSet()
AW: Anti-Virus vendors warnings
Hi Michael, On 06/10/14 17:15, Michael Stahl Mailinglist wrote: those are probably not something we can work around easily; can you report and upload these files as false positive to your Anti-virus tool vendor? i mean, you are paying them for the tool, so they should fix it if it doesn't work :) I should talk with the admin. so that's the random difference, perhaps it's because dbgutil uses MSVC debug runtime? fun... But with virus detected have with --enable-debug switch and I think the MSVC debug runtime is on too. But a lot off inline code is disabled. But I have not try the new switch --diable-cve-tests, that make tomorrow Jürgen ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sc/source writerfilter/qa
dev/null
|binary
sc/source/ui/view/tabvwshb.cxx |
5 +
writerfilter/qa/cppunittests/rtftok/data/pass/CVE-pseudo-2009-0238-1.rtf
|binary
3 files changed, 5 insertions(+)
New commits:
commit bd1be89c1a5fd3457b6bfe8ca78789c047820f17
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 6 16:16:40 2014 +0100
encrypt sf_508f4e1..rtf to avoid it triggering virus detection
use name CVE-pseudo-2009-0238-1.rtf to record its detected as
Virus:Trojan.Mdropper and pseudo because its just a fuzzed
file from some random .rtf and not an original reproducer for
CVE-2009-0238
Change-Id: I85f6a72e0d32c14ea27cbe03bc4da3c2306fd1f5
diff --git
a/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-pseudo-2009-0238-1.rtf
b/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-pseudo-2009-0238-1.rtf
new file mode 100644
index 000..44ed969
Binary files /dev/null and
b/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-pseudo-2009-0238-1.rtf
differ
diff --git
a/writerfilter/qa/cppunittests/rtftok/data/pass/sf_508f4e169fb76c80745d3541bd01b0a2-73462-minimized.rtf
b/writerfilter/qa/cppunittests/rtftok/data/pass/sf_508f4e169fb76c80745d3541bd01b0a2-73462-minimized.rtf
deleted file mode 100644
index e8e27ee..000
Binary files
a/writerfilter/qa/cppunittests/rtftok/data/pass/sf_508f4e169fb76c80745d3541bd01b0a2-73462-minimized.rtf
and /dev/null differ
commit 76d4db3181dfd1524620377bb12a8e0332ae8ab0
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 6 16:00:35 2014 +0100
Resolves: fdo#80101 inserting non-chart as chart - unhandled exception
Change-Id: I4d5438292d9a5c49f1336304ebd3dc4e155dd212
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 289c7e8..5e635b0 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -306,6 +306,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest rReq)
break;
case SID_INSERT_DIAGRAM_FROM_FILE:
+try
{
sfx2::FileDialogHelper
aDlg(ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
0, OUString(com.sun.star.chart2.ChartDocument));
@@ -316,6 +317,10 @@ void ScTabViewShell::ExecDrawIns(SfxRequest rReq)
FuInsertChartFromFile(this, pWin, pView, pDrModel, rReq,
aURL);
}
}
+catch (const uno::Exception e)
+{
+SAL_WARN( sc, Cannot Insert Chart: e.Message);
+}
break;
case SID_OBJECTRESIZE:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: AW: Anti-Virus vendors warnings
On 06/10/14 17:25, Juergen Funk Mailinglist wrote: Hi Michael, On 06/10/14 17:15, Michael Stahl Mailinglist wrote: so that's the random difference, perhaps it's because dbgutil uses MSVC debug runtime? fun... But with virus detected have with --enable-debug switch and I think the MSVC debug runtime is on too. But a lot off inline code is disabled. actually, only --enable-dbgutil uses the MSVC debug runtime; the --enable-debug just disables optimizations, turns on PDB files (debuginfo) and enables some assertions. --enable-dbgutil is (nowadays) a super-set of --enable-debug. But I have not try the new switch --diable-cve-tests, that make tomorrow thankfully Caolan has now encrypted the RTF file that caused you trouble in commit bd1be89c1a5fd3457b6bfe8ca78789c047820f17, so that should work now. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source
sw/source/filter/ww8/wrtww8.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 2a1a50b1d565270327a213f4e237b9655824a872
Author: Caolán McNamara caol...@redhat.com
Date: Mon Oct 6 15:59:09 2014 +0100
Resolves: fdo#84588 loop in TableInfo::getNextNode
Change-Id: I5bb44dc94041c3b3cd9d80ba125594a48c9c921f
(cherry picked from commit f0859c4eae0f567393811c308074723329f1faab)
Reviewed-on: https://gerrit.libreoffice.org/11828
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 409eb82..f52a273 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2643,9 +2643,15 @@ void MSWordExportBase::WriteText()
if ( pNd == pNd-GetNodes().GetEndOfContent() )
break;
-SwNode * pCurrentNode = pCurPam-GetPoint()-nNode.GetNode();
+const SwNode * pCurrentNode = pCurPam-GetPoint()-nNode.GetNode();
const SwNode * pNextNode = mpTableInfo-getNextNode(pCurrentNode);
+if (pCurrentNode == pNextNode)
+{
+SAL_WARN(sw.ww8, loop in TableInfo);
+pNextNode = NULL;
+}
+
if (pNextNode != NULL)
pCurPam-GetPoint()-nNode = SwNodeIndex(*pNextNode);
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source
sw/source/core/uibase/docvw/edtwin.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit d4a1b5dc8aff03718625d03ad3ea77750069e196
Author: Jan-Marek Glogowski glo...@fbihome.de
Date: Wed Aug 6 17:44:56 2014 +0200
Input fields are always editable...
if the document isn't read-only. So backspace should always work in
input fields.
Regression from 961315f0838197e71e9bd49169afe673466e5eb8.
Reviewed-on: https://gerrit.libreoffice.org/10833
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit 428c45fc779223371818bd11b2b846e1c13ebe47)
Conflicts:
sw/source/uibase/docvw/edtwin.cxx
Change-Id: I06648ab075b198ee7914e7ae60bef87e7ff94f0a
Reviewed-on: https://gerrit.libreoffice.org/11779
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/source/core/uibase/docvw/edtwin.cxx
b/sw/source/core/uibase/docvw/edtwin.cxx
index e76b3dc..d4294af 100644
--- a/sw/source/core/uibase/docvw/edtwin.cxx
+++ b/sw/source/core/uibase/docvw/edtwin.cxx
@@ -1887,8 +1887,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
break;
case KEY_BACKSPACE:
case KEY_BACKSPACE | KEY_SHIFT:
-if ( !rSh.HasReadonlySel()
- !rSh.CrsrInsideInputFld() )
+if ( !rSh.HasReadonlySel() )
{
bool bDone = false;
// try to add comment for code snip:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/core/uwriter.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 99c48d6cc739fd542b33023e1ef51db3df169586 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Oct 6 18:13:51 2014 +0200 loplugin:unreffun Change-Id: I00240e0d17e40e187b82875bbd25a0630120c4d7 diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index 6b28654..e7a7156 100644 --- a/sw/qa/core/uwriter.cxx +++ b/sw/qa/core/uwriter.cxx @@ -79,7 +79,6 @@ public: void testPageDescName(); void testFileNameFields(); void testDocStat(); -void testModelToViewHelper(); void testModelToViewHelperPassthrough(); void testModelToViewHelperExpandFieldsExpandFootnote(); void testModelToViewHelperExpandFieldsExpandFootnoteReplaceMode(); @@ -108,6 +107,7 @@ public: CPPUNIT_TEST(testPageDescName); CPPUNIT_TEST(testFileNameFields); CPPUNIT_TEST(testDocStat); +CPPUNIT_TEST(testModelToViewHelperPassthrough); CPPUNIT_TEST(testModelToViewHelperExpandFieldsExpandFootnote); CPPUNIT_TEST(testModelToViewHelperExpandFieldsExpandFootnoteReplaceMode); CPPUNIT_TEST(testModelToViewHelperExpandFields); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: rsc/source
rsc/source/rscpp/cpp2.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 59accebda6a29307d8be9bc9be0c9fab141b4148
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Oct 6 18:15:54 2014 +0200
warning C4101: unreferenced local variable
Change-Id: I526e68b93f9665db25a824cc44ff231bcef29277
diff --git a/rsc/source/rscpp/cpp2.c b/rsc/source/rscpp/cpp2.c
index f082275..a0f3433 100644
--- a/rsc/source/rscpp/cpp2.c
+++ b/rsc/source/rscpp/cpp2.c
@@ -415,8 +415,6 @@ FILE_LOCAL int openinclude(char* filename, int searchlocal)
{
char** incptr;
char tmpname[NFWORK]; /* Filename work area */
-int len;
-int len2;
if (searchlocal)
{
@@ -431,8 +429,8 @@ FILE_LOCAL int openinclude(char* filename, int searchlocal)
if (filename[0] != '/'
hasdirectory(infile-filename, tmpname, NFWORK))
{
-len = strlen(tmpname);
-len2 = strlen(filename);
+int len = strlen(tmpname);
+int len2 = strlen(filename);
if(len + len2 NFWORK)
{
memcpy(tmpname + len, filename, len2);
@@ -445,7 +443,7 @@ FILE_LOCAL int openinclude(char* filename, int searchlocal)
}
else
{
-len = strlen(filename);
+int len = strlen(filename);
if(len NFWORK)
{
memcpy(tmpname, filename, len);
@@ -534,6 +532,8 @@ FILE_LOCAL int hasdirectory(char* source, char* result, int
max)
*/
char* tp;
+(void)max;
+
if ((tp = strrchr(source, ']')) == NULL
(tp = strrchr(source, ':')) == NULL)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - connectivity/source
connectivity/source/drivers/ado/APreparedStatement.cxx | 27 ---
connectivity/source/drivers/mozab/MPreparedStatement.hxx |1
connectivity/source/inc/ado/APreparedStatement.hxx | 11 +-
3 files changed, 4 insertions(+), 35 deletions(-)
New commits:
commit f641fd1526159e4a0effc99776a495bfaa053a6e
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Jun 17 17:39:19 2014 +0200
mozab driver: don't pretend to implement an interface one does not
Change-Id: I8ab2e2691ecf35e00283bd3144b2f4c8203adc3a
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.hxx
b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
index 4ad1764..44134df 100644
--- a/connectivity/source/drivers/mozab/MPreparedStatement.hxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
@@ -37,7 +37,6 @@ namespace connectivity
typedef ::cppu::ImplHelper5
::com::sun::star::sdbc::XPreparedStatement,
::com::sun::star::sdbc::XParameters,
::com::sun::star::sdbc::XResultSetMetaDataSupplier,
-
::com::sun::star::sdbc::XMultipleResults,
::com::sun::star::lang::XServiceInfo
OPreparedStatement_BASE;
class OPreparedStatement : public OCommonStatement,
commit 220deb0a0ed7b3efa14088acdab0520709309105
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Mon Jun 16 18:50:00 2014 +0200
ADO driver: don't override a virtual method just to call the one of the
parent
Change-Id: I39020452e8ff4b17b0c1cfb9ff54bf650ab97fc3
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx
b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 691408e..058a8bd 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -444,16 +444,6 @@ void SAL_CALL OPreparedStatement::clearParameters( )
throw(SQLException, Runtim
}
}
-void SAL_CALL OPreparedStatement::acquire() throw()
-{
-OStatement_Base::acquire();
-}
-
-void SAL_CALL OPreparedStatement::release() throw()
-{
-OStatement_Base::release();
-}
-
void OPreparedStatement::replaceParameterNodeName(OSQLParseNode* _pNode,
const OUString
_sDefaultName,
sal_Int32 _rParameterCount)
diff --git a/connectivity/source/inc/ado/APreparedStatement.hxx
b/connectivity/source/inc/ado/APreparedStatement.hxx
index 3a46f1f..8210f8a 100644
--- a/connectivity/source/inc/ado/APreparedStatement.hxx
+++ b/connectivity/source/inc/ado/APreparedStatement.hxx
@@ -63,8 +63,6 @@ namespace connectivity
// a Constructor, that is needed for when Returning the Object is
needed:
OPreparedStatement( OConnection* _pConnection,const OTypeInfoMap
_TypeInfo,const OUString sql);
-virtual void SAL_CALL acquire() throw();
-virtual void SAL_CALL release() throw();
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type rType )
throw(::com::sun::star::uno::RuntimeException);
//XTypeProvider
virtual ::com::sun::star::uno::Sequence
::com::sun::star::uno::Type SAL_CALL getTypes( )
throw(::com::sun::star::uno::RuntimeException);
commit 4f1787a5283876857dff391c827e7b454000ba0a
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Mon Jun 16 18:49:16 2014 +0200
ADO driver: don't pretend to implement an interface one does not
Change-Id: I6234974cfc1b7650a35b8f7b9a4132acf797c91b
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx
b/connectivity/source/drivers/ado/APreparedStatement.cxx
index c862d05..691408e 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -98,7 +98,6 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type
rType ) throw(Runt
return aRet.hasValue() ? aRet : ::cppu::queryInterface( rType,
static_cast
XPreparedStatement*(this),
static_cast XParameters*(this),
-static_cast
XPreparedBatchExecution*(this),
static_cast
XResultSetMetaDataSupplier*(this));
}
@@ -106,8 +105,7 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type
rType ) throw(Runt
{
::cppu::OTypeCollection aTypes( cppu::UnoTypeXPreparedStatement::get(),
cppu::UnoTypeXParameters::get(),
-
cppu::UnoTypeXResultSetMetaDataSupplier::get(),
-
cppu::UnoTypeXPreparedBatchExecution::get());
+
cppu::UnoTypeXResultSetMetaDataSupplier::get());
[Libreoffice-commits] core.git: Branch 'feature/perfwork' - sc/inc
sc/inc/documentimport.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cb2cec14405e3810907b09ede03876db6f605db6
Author: Andras Timar andras.ti...@collabora.com
Date: Mon Oct 6 19:20:33 2014 +0200
Windows build fix
Change-Id: I686457ca92ce1d503ea184e4d613b880610942da
diff --git a/sc/inc/documentimport.hxx b/sc/inc/documentimport.hxx
index 7d46216..e561fcd 100644
--- a/sc/inc/documentimport.hxx
+++ b/sc/inc/documentimport.hxx
@@ -44,7 +44,7 @@ class SC_DLLPUBLIC ScDocumentImport : boost::noncopyable
public:
-struct Attrs
+struct SC_DLLPUBLIC Attrs
{
ScAttrEntry* mpData;
size_t mnSize;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/ado/ACallableStatement.cxx | 12
connectivity/source/drivers/ado/AStatement.cxx | 15 ---
connectivity/source/inc/ado/ACallableStatement.hxx |2 --
connectivity/source/inc/ado/AStatement.hxx |3 ---
4 files changed, 32 deletions(-)
New commits:
commit fa8f2fdf45c168a25dd955ebd24780b4863d6cde
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Mon Oct 6 19:20:37 2014 +0200
ADO: don't override a virtual method just to call the one of the parent
Change-Id: Ibae309ffbb7b2500c9113a95ca3fc508de378976
diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx
b/connectivity/source/drivers/ado/ACallableStatement.cxx
index 8e0c510..abc2fb3 100644
--- a/connectivity/source/drivers/ado/ACallableStatement.cxx
+++ b/connectivity/source/drivers/ado/ACallableStatement.cxx
@@ -210,16 +210,4 @@ Reference XRef SAL_CALL OCallableStatement::getRef(
sal_Int32 /*columnIndex*/
}
-void SAL_CALL OCallableStatement::acquire() throw()
-{
-OPreparedStatement::acquire();
-}
-
-void SAL_CALL OCallableStatement::release() throw()
-{
-OPreparedStatement::release();
-}
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/ado/AStatement.cxx
b/connectivity/source/drivers/ado/AStatement.cxx
index ad4244e..733db83 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -817,21 +817,6 @@ OStatement::~OStatement()
}
IMPLEMENT_SERVICE_INFO(OStatement,com.sun.star.sdbcx.AStatement,com.sun.star.sdbc.Statement);
-void SAL_CALL OStatement_Base::acquire() throw()
-{
-OStatement_BASE::acquire();
-}
-
-void SAL_CALL OStatement::acquire() throw()
-{
-OStatement_Base::acquire();
-}
-
-void SAL_CALL OStatement::release() throw()
-{
-OStatement_Base::release();
-}
-
::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySetInfo
SAL_CALL OStatement_Base::getPropertySetInfo( )
throw(::com::sun::star::uno::RuntimeException)
{
return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
diff --git a/connectivity/source/inc/ado/ACallableStatement.hxx
b/connectivity/source/inc/ado/ACallableStatement.hxx
index 02569ae..eabdc3c 100644
--- a/connectivity/source/inc/ado/ACallableStatement.hxx
+++ b/connectivity/source/inc/ado/ACallableStatement.hxx
@@ -45,8 +45,6 @@ namespace connectivity
OCallableStatement( OConnection* _pConnection,const OTypeInfoMap
_TypeInfo,const OUString sql );
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type rType )
throw(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL acquire() throw();
-virtual void SAL_CALL release() throw();
// XRow
virtual sal_Bool SAL_CALL wasNull( )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
diff --git a/connectivity/source/inc/ado/AStatement.hxx
b/connectivity/source/inc/ado/AStatement.hxx
index 356a37a..6724e94 100644
--- a/connectivity/source/inc/ado/AStatement.hxx
+++ b/connectivity/source/inc/ado/AStatement.hxx
@@ -140,7 +140,6 @@ namespace connectivity
// OComponentHelper
virtual void SAL_CALL disposing(void);
// XInterface
-virtual void SAL_CALL acquire() throw();
virtual void SAL_CALL release() throw();
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type rType )
throw(::com::sun::star::uno::RuntimeException);
//XTypeProvider
@@ -177,8 +176,6 @@ namespace connectivity
DECLARE_SERVICE_INFO();
-virtual void SAL_CALL acquire() throw();
-virtual void SAL_CALL release() throw();
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type rType )
throw(::com::sun::star::uno::RuntimeException);
// XBatchExecution
virtual void SAL_CALL addBatch( const OUString sql )
throw(::com::sun::star::sdbc::SQLException,
::com::sun::star::uno::RuntimeException);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - connectivity/source
connectivity/source/drivers/ado/ACallableStatement.cxx | 12
connectivity/source/drivers/ado/APreparedStatement.cxx | 10 ++
connectivity/source/drivers/ado/AStatement.cxx | 15 +++
connectivity/source/inc/ado/ACallableStatement.hxx |2 ++
connectivity/source/inc/ado/APreparedStatement.hxx |2 ++
connectivity/source/inc/ado/AStatement.hxx |3 +++
6 files changed, 44 insertions(+)
New commits:
commit 9de01eeba7ecc2df5546b5a64559fed90f29ffbb
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Mon Oct 6 19:40:20 2014 +0200
Revert ADO driver: don't override a virtual method just to call the one of
the parent
This reverts commit 220deb0a0ed7b3efa14088acdab0520709309105.
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx
b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 058a8bd..691408e 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -444,6 +444,16 @@ void SAL_CALL OPreparedStatement::clearParameters( )
throw(SQLException, Runtim
}
}
+void SAL_CALL OPreparedStatement::acquire() throw()
+{
+OStatement_Base::acquire();
+}
+
+void SAL_CALL OPreparedStatement::release() throw()
+{
+OStatement_Base::release();
+}
+
void OPreparedStatement::replaceParameterNodeName(OSQLParseNode* _pNode,
const OUString
_sDefaultName,
sal_Int32 _rParameterCount)
diff --git a/connectivity/source/inc/ado/APreparedStatement.hxx
b/connectivity/source/inc/ado/APreparedStatement.hxx
index 8210f8a..3a46f1f 100644
--- a/connectivity/source/inc/ado/APreparedStatement.hxx
+++ b/connectivity/source/inc/ado/APreparedStatement.hxx
@@ -63,6 +63,8 @@ namespace connectivity
// a Constructor, that is needed for when Returning the Object is
needed:
OPreparedStatement( OConnection* _pConnection,const OTypeInfoMap
_TypeInfo,const OUString sql);
+virtual void SAL_CALL acquire() throw();
+virtual void SAL_CALL release() throw();
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type rType )
throw(::com::sun::star::uno::RuntimeException);
//XTypeProvider
virtual ::com::sun::star::uno::Sequence
::com::sun::star::uno::Type SAL_CALL getTypes( )
throw(::com::sun::star::uno::RuntimeException);
commit bf9339718984fc88e3f1cd3174b61eda5c13933b
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Mon Oct 6 19:39:51 2014 +0200
Revert ADO: don't override a virtual method to call the one of the parent
This reverts commit fa8f2fdf45c168a25dd955ebd24780b4863d6cde.
Change-Id: I252e29648fb59a15379ba2f3b63d6914a7fc3a93
diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx
b/connectivity/source/drivers/ado/ACallableStatement.cxx
index abc2fb3..8e0c510 100644
--- a/connectivity/source/drivers/ado/ACallableStatement.cxx
+++ b/connectivity/source/drivers/ado/ACallableStatement.cxx
@@ -210,4 +210,16 @@ Reference XRef SAL_CALL OCallableStatement::getRef(
sal_Int32 /*columnIndex*/
}
+void SAL_CALL OCallableStatement::acquire() throw()
+{
+OPreparedStatement::acquire();
+}
+
+void SAL_CALL OCallableStatement::release() throw()
+{
+OPreparedStatement::release();
+}
+
+
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/ado/AStatement.cxx
b/connectivity/source/drivers/ado/AStatement.cxx
index 733db83..ad4244e 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -817,6 +817,21 @@ OStatement::~OStatement()
}
IMPLEMENT_SERVICE_INFO(OStatement,com.sun.star.sdbcx.AStatement,com.sun.star.sdbc.Statement);
+void SAL_CALL OStatement_Base::acquire() throw()
+{
+OStatement_BASE::acquire();
+}
+
+void SAL_CALL OStatement::acquire() throw()
+{
+OStatement_Base::acquire();
+}
+
+void SAL_CALL OStatement::release() throw()
+{
+OStatement_Base::release();
+}
+
::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySetInfo
SAL_CALL OStatement_Base::getPropertySetInfo( )
throw(::com::sun::star::uno::RuntimeException)
{
return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
diff --git a/connectivity/source/inc/ado/ACallableStatement.hxx
b/connectivity/source/inc/ado/ACallableStatement.hxx
index eabdc3c..02569ae 100644
--- a/connectivity/source/inc/ado/ACallableStatement.hxx
+++ b/connectivity/source/inc/ado/ACallableStatement.hxx
@@ -45,6 +45,8 @@ namespace connectivity
OCallableStatement( OConnection* _pConnection,const OTypeInfoMap
_TypeInfo,const OUString sql );
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type rType )
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/token.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ce5cc7afb0f1c99237d04e0c754527c725d8491c Author: David Tardon dtar...@redhat.com Date: Mon Oct 6 20:24:52 2014 +0200 avoid use of ref. to possibly deleted object Change-Id: If5977b280fed8d8b053f59852d3984a59ce61a69 diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 396ffcb..f3c38ab 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -2371,9 +2371,9 @@ void ScTokenArray::ReadjustAbsolute3DReferences( const ScDocument* pOldDoc, cons sal_uInt16 nFileId; GetExternalTableData(pOldDoc, pNewDoc, rRef.Tab(), aTabName, nFileId); //replace with ScExternalSingleRefToken and adjust references -pCode[j]-DecRef(); ScExternalSingleRefToken* pToken = new ScExternalSingleRefToken(nFileId, aTabName, rRef); pToken-IncRef(); +pCode[j]-DecRef(); // ATTENTION: rRef can't be used after this point pCode[j] = pToken; } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Automatic buildbot verification
On Thu, 2014-10-02 at 18:01 +0200, Bjoern Michaelsen wrote: On Thu, Oct 02, 2014 at 05:48:49PM +0200, Miklos Vajna wrote: Question is what would be the best to mark these changes. Should we use a specially named topic for these changes, and reserve that name for this purpose? Or should the developer just +2 the change? I'm open to suggestions. So, the canonical way is to keep CodeReview for human review and Verify for mechanical review. So the usual workflow is: 1/ Patch gets uploaded Not for this project: commits are pushed directly to git, bypassing gerrit review branches. This is e.g. how it works at openstack. This is kind of useless to compare LO Gerrit workflow with OpenStack, where reviews are mandatory and nobody can push anything bypassing review. Not to mention their build cluster of hundreds centralized VMs with up to 10K builds [1] every day (source: Khai's presentation on last Gerrit conference). Thus a reviewer can: - either mark a change as +2 CodeReview, which means: Merge directly when it builds/tests successfully. - or mark a change as +1 CodeReview, which means: Testbuild this, but dont automerge. What we need is to seamlessly support 3 different LO Gerrit workflows: a) contributor push a change for review b) committer push a change to release branch for multiple reviews c) committer push a change to master for verification only + auto-merge Also note that in we could customize gerrit to have an additional row beyond CodeReview and Verified. gerrit supports as many custom rows as you like there. But I really think that is a bad idea. CodeReview and Verified are exactly what we need -- no additional stuff to document and confuse newcomers needed. Nobody said that newcomers should be able to mark or better to say activate c) worklfow above: they can only do a) and b). They cannot schedule gerrit-buildbot-build today as well (and have to ask). To support workflow c) new label (what you called row) is needed, for example OpenStack has introduced new Workflow-Label and abused it for two different purposes: Workflow-1 means: this is Work In Progress (WIP) change and is filtered out from custom dashboards. Workflow+1 means the change is approved in addition to Code-Review+2, so that Zuul (their python based queue manager) can merge this change. IOW we could introduce new label, say Worklfow, and activate it by uploading a change with direct voting feature during upload (what i've contributed upstream [2]): git push logerrit:HEAD:refs/for/master%l=Worklow+1,l=Coder-Review+2 [*] Of course this workflow can be activated by limited group of peoples after the upload. For all changes that were marked as Workflow+1, buildbot build is scheduled automatically. All changes that have Workflow+1, Coder-Review+2 and Verify+1 are get merged automagically. [*] By putting this review-approve alias in your .gitconfig file you could save some typing: [alias] r-a = push logerrit HEAD:refs/for/master%l=Worklow+1,l=Coder-Review+2 [1] http://status.openstack.org/zuul/ [2] https://gerrit-review.googlesource.com/56712 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - sc/source
sc/source/core/tool/token.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 69a7f2d94f0cb87cbc7f911f0393204a9c0eef1a
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Oct 6 14:33:49 2014 -0400
cp#1000103: Set 3D flag when adjusting reference on cell move.
This is conceptually a backport of 31abf4ce4e18cf2e94c6e598f255ae7cd8f675fa,
adjusted to apply to the 4.2 code base.
Change-Id: Id2979c7699e2b28cc752d527f4cb328da1529c0d
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 68f9cf6..73d284a 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2899,6 +2899,8 @@ void ScTokenArray::MoveReference(
{
aAbs.Move(rDelta.Col(), rDelta.Row(), rDelta.Tab());
rRef.SetAddress(aAbs, rPos);
+if (rDelta.Tab())
+rRef.SetFlag3D(aAbs.Tab()!=rPos.Tab());
}
}
break;
@@ -2911,6 +2913,8 @@ void ScTokenArray::MoveReference(
{
aAbs.Move(rDelta.Col(), rDelta.Row(), rDelta.Tab());
rRef.SetRange(aAbs, rPos);
+if (rDelta.Tab())
+rRef.Ref1.SetFlag3D(aAbs.aStart.Tab()!=rPos.Tab());
}
}
break;
commit 470ff027834f40682cbff14e36f32530f7a237af
Author: Eike Rathke er...@redhat.com
Date: Fri Aug 22 12:59:47 2014 +0200
resolved fdo#82936 do not clear the 3D flag on refupdate
Change-Id: I2ae1368a2ffc20e988ff3ab66590a9f98902b862
(cherry picked from commit 75aad687cb5e63a41303aea568bf68b2b5f15d31)
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 24f0343..68f9cf6 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -2847,7 +2847,8 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove(
}
rRef.SetAddress(aAbs, rNewPos);
-rRef.SetFlag3D(b3DFlag);
+if (b3DFlag)
+rRef.SetFlag3D(b3DFlag);
}
break;
case svDoubleRef:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 include/svtools include/vcl vcl/inc vcl/source
include/sfx2/module.hxx|2 +-
include/svtools/parrtf.hxx |2 --
include/svtools/svparser.hxx |4 ++--
include/vcl/window.hxx |8
vcl/inc/generic/glyphcache.hxx |2 +-
vcl/source/fontsubset/cff.cxx |2 +-
6 files changed, 9 insertions(+), 11 deletions(-)
New commits:
commit 445336074c2441a59377b313fc6da2396554abed
Author: Tor Lillqvist t...@collabora.com
Date: Mon Oct 6 20:57:31 2014 +0300
Remove pointless commented-out 'virtual' keywords
Nobody knows any more what such a metacomment was supposed to mean, if
it had any deeper meaning at all.
Change-Id: Iefb4fedc7b833c09ee0e39b3eb28202229323ef2
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index 77ba766..a04b8af 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -90,7 +90,7 @@ public:
const SfxItemSet rSet );
virtual voidInvalidate(sal_uInt16 nId = 0) SAL_OVERRIDE;
-/*virtual*/ boolIsChildWindowAvailable( const sal_uInt16
i_nId, const SfxViewFrame* i_pViewFrame ) const;
+boolIsChildWindowAvailable( const sal_uInt16
i_nId, const SfxViewFrame* i_pViewFrame ) const;
static SfxModule* GetActiveModule( SfxViewFrame* pFrame=NULL );
static FieldUnitGetCurrentFieldUnit();
diff --git a/include/svtools/parrtf.hxx b/include/svtools/parrtf.hxx
index 8b596ea..2730d5a 100644
--- a/include/svtools/parrtf.hxx
+++ b/include/svtools/parrtf.hxx
@@ -75,8 +75,6 @@ public:
int GetOpenBrakets() const { return nOpenBrakets; }
// fuers asynchrone lesen aus dem SvStream
-// virtual void SaveState( int nToken );
-// virtual void RestoreState();
virtual void Continue( int nToken ) SAL_OVERRIDE;
};
diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx
index 55a61df..4d176ec 100644
--- a/include/svtools/svparser.hxx
+++ b/include/svtools/svparser.hxx
@@ -143,8 +143,8 @@ public:
long CallAsyncCallLink() { return NewDataRead( this, 0 ); }
// fuers asynchrone lesen aus dem SvStream
-/*virtual*/ void SaveState( int nToken );
-/*virtual*/ void RestoreState();
+void SaveState( int nToken );
+void RestoreState();
virtual void Continue( int nToken );
inline void SetDownloadingFile( bool bSet ) { bDownloadingFile = bSet; }
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index ae94819..decc15c 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -709,10 +709,10 @@ public:
virtual boolNotify( NotifyEvent rNEvt );
virtual vcl::Window* GetPreferredKeyInputWindow();
-/*virtual*/ voidAddEventListener( const Link
rEventListener );
-/*virtual*/ voidRemoveEventListener( const Link
rEventListener );
-/*virtual*/ voidAddChildEventListener( const Link
rEventListener );
-/*virtual*/ voidRemoveChildEventListener( const Link
rEventListener );
+voidAddEventListener( const Link
rEventListener );
+voidRemoveEventListener( const Link
rEventListener );
+voidAddChildEventListener( const Link
rEventListener );
+voidRemoveChildEventListener( const Link
rEventListener );
ImplSVEvent * PostUserEvent( const Link rLink,
void* pCaller = NULL );
voidRemoveUserEvent( ImplSVEvent *
nUserEvent );
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 40a07da..1a3da60 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -55,7 +55,7 @@ class VCL_DLLPUBLIC GlyphCache
{
public:
explicitGlyphCache( GlyphCachePeer );
-/*virtual*/ ~GlyphCache();
+~GlyphCache();
static GlyphCache GetInstance();
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index 8293279..1bb6f06 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -1713,7 +1713,7 @@ class Type1Emitter
{
public:
explicitType1Emitter( FILE* pOutFile, bool bPfbSubset = true);
-/*virtual*/ ~Type1Emitter( void);
+~Type1Emitter( void);
voidsetSubsetName( const char* );
size_t emitRawData( const char* pData, size_t nLength) const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/perfwork' - 4 commits - sc/source
sc/source/core/opencl/op_statistical.cxx |6 +-
sc/source/core/opencl/opbase.cxx | 73 ++-
sc/source/core/opencl/opbase.hxx | 68
3 files changed, 103 insertions(+), 44 deletions(-)
New commits:
commit 8c40b70fc944526a5dcbdf40f9509ce25abe88da
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Oct 3 16:43:25 2014 -0400
Inlining make no sense for virtual functions.
Change-Id: I6392eaceb0544b7faa9a0c726acf6619d971dbb7
diff --git a/sc/source/core/opencl/opbase.cxx b/sc/source/core/opencl/opbase.cxx
index f19e36e..14ae124 100644
--- a/sc/source/core/opencl/opbase.cxx
+++ b/sc/source/core/opencl/opbase.cxx
@@ -88,17 +88,62 @@ DynamicKernelArgument::DynamicKernelArgument( const
std::string s,
FormulaTreeNodeRef ft ) :
mSymName(s), mFormulaTree(ft) { }
+std::string DynamicKernelArgument::GenDoubleSlidingWindowDeclRef( bool ) const
+{
+return std::string();
+}
+
+/// When Mix, it will be called
+std::string DynamicKernelArgument::GenStringSlidingWindowDeclRef( bool ) const
+{
+return std::string();
+}
+
+bool DynamicKernelArgument::IsMixedArgument() const
+{
+return false;
+}
+
/// Generate use/references to the argument
void DynamicKernelArgument::GenDeclRef( std::stringstream ss ) const
{
ss mSymName;
}
+void DynamicKernelArgument::GenNumDeclRef( std::stringstream ss ) const
+{
+ss ,;
+}
+
+void DynamicKernelArgument::GenStringDeclRef( std::stringstream ss ) const
+{
+ss ,;
+}
+
+void DynamicKernelArgument::GenSlidingWindowFunction( std::stringstream ) {}
+
FormulaToken* DynamicKernelArgument::GetFormulaToken() const
{
return mFormulaTree-GetFormulaToken();
}
+std::string DynamicKernelArgument::DumpOpName() const
+{
+return std::string();
+}
+
+void DynamicKernelArgument::DumpInlineFun( std::setstd::string,
std::setstd::string ) const {}
+
+const std::string DynamicKernelArgument::GetName() const
+{
+return mSymName;
+}
+
+bool DynamicKernelArgument::NeedParallelReduction() const
+{
+return false;
+}
+
VectorRef::VectorRef( const std::string s, FormulaTreeNodeRef ft, int idx ) :
DynamicKernelArgument(s, ft), mpClmem(NULL), mnIndex(idx)
{
@@ -144,6 +189,8 @@ std::string VectorRef::GenSlidingWindowDeclRef( bool nested
) const
return ss.str();
}
+void VectorRef::GenSlidingWindowFunction( std::stringstream ) {}
+
size_t VectorRef::GetWindowSize() const
{
FormulaToken* pCur = mFormulaTree-GetFormulaToken();
@@ -164,6 +211,28 @@ size_t VectorRef::GetWindowSize() const
}
}
+std::string VectorRef::DumpOpName() const
+{
+return std::string();
+}
+
+void VectorRef::DumpInlineFun( std::setstd::string, std::setstd::string
) const {}
+
+const std::string VectorRef::GetName() const
+{
+return mSymName;
+}
+
+cl_mem VectorRef::GetCLBuffer() const
+{
+return mpClmem;
+}
+
+bool VectorRef::NeedParallelReduction() const
+{
+return false;
+}
+
void Normal::GenSlidingWindowFunction(
std::stringstream ss, const std::string sSymName, SubArguments
vSubArguments )
{
diff --git a/sc/source/core/opencl/opbase.hxx b/sc/source/core/opencl/opbase.hxx
index 15dedc5..d806140 100644
--- a/sc/source/core/opencl/opbase.hxx
+++ b/sc/source/core/opencl/opbase.hxx
@@ -87,6 +87,7 @@ class DynamicKernelArgument : boost::noncopyable
{
public:
DynamicKernelArgument( const std::string s, FormulaTreeNodeRef ft );
+virtual ~DynamicKernelArgument() {}
/// Generate declaration
virtual void GenDecl( std::stringstream ss ) const = 0;
@@ -97,36 +98,31 @@ public:
/// When referenced in a sliding window function
virtual std::string GenSlidingWindowDeclRef( bool = false ) const = 0;
+/// Create buffer and pass the buffer to a given kernel
+virtual size_t Marshal( cl_kernel, int, int, cl_program ) = 0;
+
+virtual size_t GetWindowSize() const = 0;
+
/// When Mix, it will be called
-virtual std::string GenDoubleSlidingWindowDeclRef( bool = false ) const
-{ return std::string(); }
+virtual std::string GenDoubleSlidingWindowDeclRef( bool = false ) const;
/// When Mix, it will be called
-virtual std::string GenStringSlidingWindowDeclRef( bool = false ) const
-{ return std::string(); }
+virtual std::string GenStringSlidingWindowDeclRef( bool = false ) const;
-virtual bool IsMixedArgument() const
-{ return false; }
+virtual bool IsMixedArgument() const;
/// Generate use/references to the argument
virtual void GenDeclRef( std::stringstream ss ) const;
-virtual void GenNumDeclRef( std::stringstream ss ) const { ss ,;}
+virtual void GenNumDeclRef( std::stringstream ss ) const;
-virtual void GenStringDeclRef( std::stringstream ss ) const { ss ,;}
+virtual void GenStringDeclRef( std::stringstream ss ) const;
-/// Create buffer and pass the buffer to a given kernel
-virtual size_t Marshal( cl_kernel, int, int,
SolarMutex assert on adding an extension ?
If I try and install the extension from https://bugs.freedesktop.org/show_bug.cgi?id=46447#c151 in master I get... warn:vcl:29279:9:vcl/generic/app/geninst.cxx:116: CheckYieldMutex: 0!=9 which is SalYieldMutex* pYieldMutex = mpSalYieldMutex; if ( pYieldMutex-GetThreadId() != osl::Thread::getCurrentIdentifier() ) return false; causes this assert to trigger assert(ImplGetSVData()-mpDefInst-CheckYieldMutex()); from DBG_TESTSOLARMUTEX(); in svl/source/notify/SfxBroadcaster.cxx's SfxBroadcaster::AddListener all the way from ExtensionCmdQueue::Thread::execute where everything is happening in a thread to add an extension and so (because this is a basic extension) BasicManagerRepository::getApplicationBasicManager is called from the thread. What should we do here ? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
trying to install the nightly build
Hi, I thought I would try to use 4.4 more out of curiosity than anything else. I visited the download page for my architecture (Fedora 21 Alpha x86_64): http://dev-builds.libreoffice.org/daily/master/Linux-rpm_deb-x86_64@46-TDF/2014-10-04_21.31.09/ http://dev-builds.libreoffice.org/daily/master/Linux-rpm_deb-x86_64@46-TDF/2014-10-04_21.31.09/ and downloaded the rpm.tar.gz file. I unpacked this as I would any other LO release and navigated to the RPMS directory. I have tried a few times to install the whole package: sudo yum install *.rpm with no success. I have posted an attempt to simply install writer at the end of the mail. However, it seems a common problem is: Is there another development package I need to install to complete this installation? Cheers -- View this message in context: http://nabble.documentfoundation.org/trying-to-install-the-nightly-build-tp4124920.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-4.2-17'
Tag 'cp-4.2-17' created by Andras Timar andras.ti...@collabora.com at 2014-10-06 21:29 -0700 cp-4.2-17 Changes since cp-4.2-9: Olivier R (1): French dictionary update: v5.2 --- fr_FR/README_fr.txt | 13 fr_FR/description.xml |2 fr_FR/fr.aff |14658 +++--- fr_FR/fr.dic |15695 ++ 4 files changed, 15644 insertions(+), 14724 deletions(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-4.2-17'
Tag 'cp-4.2-17' created by Andras Timar andras.ti...@collabora.com at 2014-10-06 21:29 -0700 cp-4.2-17 Changes since libreoffice-4-2-branch-point-7: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-4.2-17'
Tag 'cp-4.2-17' created by Andras Timar andras.ti...@collabora.com at 2014-10-06 21:29 -0700 cp-4.2-17 Changes since cp-4.2-16: Andras Timar (1): sync with libreoffice-4-2-7 branch --- source/ar/cui/uiconfig/ui.po | 10 source/br/sc/source/ui/miscdlgs.po | 19 source/br/scaddins/source/analysis.po | 10 source/br/sfx2/source/dialog.po| 6 source/ca/sfx2/source/control.po | 10 source/cs/instsetoo_native/inc_openoffice/windows/msi_languages.po | 6 source/de/cui/uiconfig/ui.po | 14 source/de/formula/source/core/resource.po | 44 source/de/helpcontent2/source/text/shared/guide.po | 10 source/de/instsetoo_native/inc_openoffice/windows/msi_languages.po | 10 source/de/librelogo/source/pythonpath.po | 14 source/de/sw/uiconfig/swriter/ui.po| 6 source/en-GB/editeng/source/editeng.po | 12 source/en-GB/padmin/source.po | 8 source/en-GB/scaddins/source/pricing.po| 10 source/en-GB/scp2/source/accessories.po| 21 source/en-GB/sfx2/source/dialog.po | 8 source/en-GB/sfx2/uiconfig/ui.po | 10 source/en-GB/svx/source/unodialogs/textconversiondlgs.po | 9 source/en-GB/sw/source/ui/config.po| 12 source/en-GB/sw/source/ui/inc.po | 14 source/es/basctl/source/basicide.po| 6 source/es/cui/source/dialogs.po| 6 source/es/dbaccess/source/ui/dlg.po| 6 source/es/extensions/source/update/check.po| 6 source/es/sc/source/ui/src.po | 8 source/es/sc/uiconfig/scalc/ui.po | 12 source/es/sfx2/source/dialog.po| 6 source/es/sfx2/source/doc.po | 10 source/es/svx/source/stbctrls.po | 12 source/es/sw/source/core/undo.po | 8 source/es/sw/uiconfig/swriter/ui.po| 8 source/es/swext/mediawiki/help.po | 8 source/es/uui/source.po| 12 source/es/vcl/source/src.po| 6 source/es/wizards/source/euro.po | 10 source/es/wizards/source/formwizard.po | 8 source/es/wizards/source/importwizard.po | 16 source/et/sc/source/ui/src.po | 10 source/fi/sw/source/ui/inc.po | 15 source/fi/sw/uiconfig/swriter/ui.po| 12 source/fr/sd/uiconfig/sdraw/ui.po | 6 source/fr/sfx2/uiconfig/ui.po | 10 source/ja/helpcontent2/source/text/shared/00.po| 10 source/ja/sc/uiconfig/scalc/ui.po | 14 source/ja/svx/uiconfig/ui.po | 12 source/lv/svx/source/sidebar/paragraph.po | 15 source/nb/librelogo/source/pythonpath.po | 8 source/nb/scaddins/source/pricing.po | 10 source/nb/sw/source/ui/inc.po | 14 source/nl/connectivity/registry/evoab2/org/openoffice/Office/DataAccess.po | 6 source/nl/cui/source/options.po| 8 source/nl/cui/uiconfig/ui.po | 8 source/nl/dbaccess/uiconfig/ui.po | 10 source/nl/extensions/source/abpilot.po | 13 source/nl/officecfg/registry/data/org/openoffice/Office/UI.po | 8 source/nl/readlicense_oo/docs.po
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-4.2-17'
Tag 'cp-4.2-17' created by Andras Timar andras.ti...@collabora.com at 2014-10-06 21:29 -0700 cp-4.2-17 Changes since cp-4.2-16-19: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: trying to install the nightly build
thanks, I'll follow 82288 -- View this message in context: http://nabble.documentfoundation.org/trying-to-install-the-nightly-build-tp4124920p4124971.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 40780, which changed state. Bug 40780 Summary: Impress Custom Animation Sound Effect not audible in Slide Show https://bugs.freedesktop.org/show_bug.cgi?id=40780 What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: avmedia/source
avmedia/source/macavf/macavfcommon.hxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 7ba99c5b0a987de5a30d8bdcb3a2a6a8757527ff
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Oct 6 22:58:16 2014 +0200
-Werror,-Wnon-virtual-dtor
Change-Id: I8fa5c345760185baf1f0fa83c94898b2a5a86719
diff --git a/avmedia/source/macavf/macavfcommon.hxx
b/avmedia/source/macavf/macavfcommon.hxx
index f66f7d3..1f6c8c8 100644
--- a/avmedia/source/macavf/macavfcommon.hxx
+++ b/avmedia/source/macavf/macavfcommon.hxx
@@ -85,6 +85,7 @@ class MacAVObserverHandler
private:
static MacAVObserverObject* mpMacAVObserverObject;
public:
+virtual ~MacAVObserverHandler() {}
MacAVObserverObject* getObserver( void ) const;
virtual bool handleObservation( NSString* pKeyPath ) = 0;
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sd/source sw/source
sd/source/ui/unoidl/unopback.cxx |2 ++
sw/source/uibase/docvw/edtwin.cxx | 38 +-
2 files changed, 23 insertions(+), 17 deletions(-)
New commits:
commit 60a67da70fd9b6f69c68046cae471bdd1d34c407
Author: Michael Stahl mst...@redhat.com
Date: Mon Oct 6 23:47:11 2014 +0200
~SdUnoPageBackground() gets a SolarMutexGuard
Change-Id: I76582bb6a1a8dee56611f1463d3e63246eefb310
diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx
index 8b50af5..4157b12 100644
--- a/sd/source/ui/unoidl/unopback.cxx
+++ b/sd/source/ui/unoidl/unopback.cxx
@@ -71,6 +71,8 @@ SdUnoPageBackground::SdUnoPageBackground(
SdUnoPageBackground::~SdUnoPageBackground() throw()
{
+SolarMutexGuard g;
+
if( mpDoc )
EndListening( *mpDoc );
commit 5284e44ed0594a79b0cc22090a9a82b19962f6c2
Author: Michael Stahl mst...@redhat.com
Date: Mon Oct 6 23:37:18 2014 +0200
fdo#79604: sw: fix clicking on hyper-links in Draw objects
The URL is dispatched in MouseButtonUp(), but this relies on
MouseButtonDown() not selecting the drawing object when the cursor is
over an URL field.
(probably regression from commit 7e2f98d0a0c4a0f36a94353a256e7cc5caa3113b
and commit 5ed14025645200c77249da364870f5772c01df17)
Change-Id: Ib1504baff5d1fffd6ce53b41d3ff726d8e4d5c9d
diff --git a/sw/source/uibase/docvw/edtwin.cxx
b/sw/source/uibase/docvw/edtwin.cxx
index 7bf7da3..dcc3b9d 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -3167,8 +3167,27 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
case MOUSE_LEFT + KEY_MOD2:
{
+// fdo#79604: first, check if a link has been clicked - do not
+// select fly in this case!
+if (1 == nNumberOfClicks)
+{
+UpdatePointer( aDocPos, rMEvt.GetModifier() );
+SwEditWin::m_nDDStartPosY = aDocPos.Y();
+SwEditWin::m_nDDStartPosX = aDocPos.X();
+
+// hit an URL in DrawText object?
+if (bExecHyperlinks pSdrView)
+{
+SdrViewEvent aVEvt;
+pSdrView-PickAnything(rMEvt, SDRMOUSEBUTTONDOWN,
aVEvt);
+
+if (aVEvt.eEvent == SDREVENT_EXECUTEURL)
+bExecDrawTextLink = true;
+}
+}
+
bool bHandledFlyClick = false;
-if ( nNumberOfClicks == nNbFlyClicks )
+if (!bExecDrawTextLink nNumberOfClicks == nNbFlyClicks)
{
bHandledFlyClick = true;
// only try to select frame, if pointer already was
@@ -3291,22 +3310,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
switch ( nNumberOfClicks )
{
case 1:
-{
-UpdatePointer( aDocPos, rMEvt.GetModifier() );
-SwEditWin::m_nDDStartPosY = aDocPos.Y();
-SwEditWin::m_nDDStartPosX = aDocPos.X();
-
-// hit an URL in DrawText object?
-if (bExecHyperlinks pSdrView)
-{
-SdrViewEvent aVEvt;
-pSdrView-PickAnything(rMEvt, SDRMOUSEBUTTONDOWN,
aVEvt);
-
-if (aVEvt.eEvent == SDREVENT_EXECUTEURL)
-bExecDrawTextLink = true;
-}
break;
-}
case 2:
{
bFrmDrag = false;
@@ -3684,7 +3688,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
MoveCursor( rSh, aDocPos, bOnlyText, bLockView );
bCallBase = false;
}
-if ( !bOverURLGrf !bOnlyText )
+if (!bOverURLGrf !bExecDrawTextLink !bOnlyText)
{
const int nSelType = rSh.GetSelectionType();
// Check in general, if an object is selectable at given
position.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: recent coverity and rand
On Thu, 2014-10-02 at 16:44 +0100, Caolán McNamara wrote:
The latest coverity has taken a dislike to rand and we've a big block
of cids, cid#1242372 to cid#1242410 now marked with
static_checker_DC.WEAK_CRYPTO Don't call.
We have our own random pool stuff in sal, is there a drop in replacement
for rand in there somewhere or a common pattern we could follow in
replacing those ?
FYI, this change
double random(double min, double max)
{
-return floor(((double)rand() / ((unsigned int)RAND_MAX + 1)) * (max - min
+ 1) + min);
+return comphelper::rng::uniform_real_distribution(min, max);
}
in sc/source/core/opencl/opencl_device.cxx has made the opencl cppunit
test run extremely slow, if not hanging. I think I waited about 5
minutes before deciding to Ctrl-C. Switching it back to the rand()
based solution makes the test run normally.
Kohei
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: oox/source
oox/source/helper/binarystreambase.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ba650ae9bfdca346c65ce8cd9659d6ea3d47dd90
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Oct 7 07:47:25 2014 +0200
-Werror,-Wuninitialized
Change-Id: I91333f5290c84c6317b85572824be065da9cf64b
diff --git a/oox/source/helper/binarystreambase.cxx
b/oox/source/helper/binarystreambase.cxx
index 6b314fc..929fb60 100644
--- a/oox/source/helper/binarystreambase.cxx
+++ b/oox/source/helper/binarystreambase.cxx
@@ -54,7 +54,7 @@ void BinaryStreamBase::alignToBlock( sal_Int32 nBlockSize,
sal_Int64 nAnchorPos
}
BinaryXSeekableStream::BinaryXSeekableStream( const Reference XSeekable
rxSeekable ) :
-BinaryStreamBase( mxSeekable.is() ),
+BinaryStreamBase( rxSeekable.is() ),
mxSeekable( rxSeekable )
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-qa] [ANN] LIbreOffice 4.2.7 RC1 available
Dear Community, The Document Foundation is pleased to announce the first release candidate of LibreOffice 4.2.7. The upcoming 4.2.7 will be the seventh (and last) in a sequence of frequent bugfix releases for our feature-packed 4.2 line. Feel free to give it a try instead of 4.2.6. The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Developers and QA might also be interested in the symbol server for windows debug information (see the release notes linked below for details) Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/community/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/LibreOffice_Localization_Guide or help with funding our operations: http://donate.libreoffice.org/ A list of known issues and fixed bugs with 4.2.7 RC1 is available from our wiki: http://wiki.documentfoundation.org/Releases/4.2.7/RC1 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. On behalf of the Community, Christian ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 77775] FILEOPEN: Font Size in .pptx is visually different in words with same size
https://bugs.freedesktop.org/show_bug.cgi?id=5 --- Comment #10 from todven...@suomi24.fi --- Opened the original pptx and noticed the problem is gone in 4.3.2.2 and also dev build (Win 7). -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84556] FILEOPEN: formula error reading an xls file
https://bugs.freedesktop.org/show_bug.cgi?id=84556 Urmas davian...@gmail.com changed: What|Removed |Added Summary|FILESAVE: formula error |FILEOPEN: formula error |reading an xls file |reading an xls file -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 77775] FILEOPEN: Font Size in .pptx is visually different in words with same size
https://bugs.freedesktop.org/show_bug.cgi?id=5 tommy27 ba...@quipo.it changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME --- Comment #11 from tommy27 ba...@quipo.it --- I confirm is RESOLVED WORKSFORME in LO 4.3.2.2 @Jorge consider upgrading to 4.3.x -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 67945] FILEOPEN: when opening a file with INDIRECT to another sheet and chart - file dirty
https://bugs.freedesktop.org/show_bug.cgi?id=67945 A. Stucki a.stu...@solcept.ch changed: What|Removed |Added Status|NEEDINFO|UNCONFIRMED Ever confirmed|1 |0 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60838] EDITING: libreoffice goes to 100% becomes unusable
https://bugs.freedesktop.org/show_bug.cgi?id=60838 --- Comment #5 from Zhivko klemen.zivko...@gmail.com --- Yes it is still there However I cannot reproduce this in 4.2.2 version. CPU doesn't go to 100%, but also check strings in document are NOT marked. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 67945] FILEOPEN: when opening a file with INDIRECT to another sheet and chart - file dirty
https://bugs.freedesktop.org/show_bug.cgi?id=67945 --- Comment #7 from A. Stucki a.stu...@solcept.ch --- Just tested with LO 4.3.1.2 Win7/ 64 - still the same wrong behavior -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60838] EDITING: libreoffice goes to 100% becomes unusable
https://bugs.freedesktop.org/show_bug.cgi?id=60838 --- Comment #6 from Zhivko klemen.zivko...@gmail.com --- Created attachment 107390 -- https://bugs.freedesktop.org/attachment.cgi?id=107390action=edit FindReplaceDialog This is dialog to enter regexp text and issue regexp search -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84702] New: Crash when entering title
https://bugs.freedesktop.org/show_bug.cgi?id=84702 Bug ID: 84702 Summary: Crash when entering title Product: LibreOffice Version: unspecified Hardware: x86-64 (AMD64) OS: Linux (All) Status: UNCONFIRMED Severity: blocker Priority: medium Component: Presentation Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: couto.ty...@gmail.com LibreOffice impress crashes and blocks access to other programs when you try to click 'Click to add title' on a slide. OS: CentOS 6.5 Libreoffice version: 4.0.4.2 Steps: 1. Enter 'libreoffice ' in a terminal 2. Click 'Presentation' 3. Open 'Layouts' tab 4. Click on 'Title Only' layout 5. Click 'Click to add title' -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84700] Page Number Format is not Retained in TOC Other Automatic Indexes
https://bugs.freedesktop.org/show_bug.cgi?id=84700 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added CC||c...@nouenoff.nl --- Comment #4 from Cor Nouws c...@nouenoff.nl --- Hi Joel, (In reply to Joel Madero from comment #0) 4. Highlight the 1 5. Right click on highlighted 1 6. Left click on fields... 7. Select (Roman i,ii,iii) When I do this via Format Page Page ... Layout settings Format the correct numbering format does appear in the TOC. (Ubuntu 4.3.2 - but I guess it's like that in all versions) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84687] UI: Property mapping - deletion is neither registered nor effective
https://bugs.freedesktop.org/show_bug.cgi?id=84687 raal r...@post.cz changed: What|Removed |Added Status|UNCONFIRMED |NEW CC||r...@post.cz Ever confirmed|0 |1 --- Comment #1 from raal r...@post.cz --- I can confirm with LO 4.3.2.2, Win7 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75988] FILESAVE: Saving a CSV file with more than 100 columns crashes
https://bugs.freedesktop.org/show_bug.cgi?id=75988 m.a.riosv mari...@miguelangel.mobi changed: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 74496] EDITING: Cannot paste Excel selection of cells as bitmap into Writer
https://bugs.freedesktop.org/show_bug.cgi?id=74496 --- Comment #6 from Cor Nouws c...@nouenoff.nl --- Hmm... Just a note: sometimes I to experience that after a copy in another program, paste special is not available. Haven't tried to find out when/how. However, this seems different from the initial comment anyway. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81345] FILESAVE: Image from first page appears on all pages of document after saving file on LO
https://bugs.freedesktop.org/show_bug.cgi?id=81345 Joey Reid joeyisdama...@gmail.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=84645 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84645] FILEOPEN: RTF column handling not working
https://bugs.freedesktop.org/show_bug.cgi?id=84645 Joey Reid joeyisdama...@gmail.com changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=81345 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76250] Random headings appear in navigator and change their links when clicked
https://bugs.freedesktop.org/show_bug.cgi?id=76250 --- Comment #4 from Cor Nouws c...@nouenoff.nl --- (In reply to adam.projectbloc from comment #2) I don't understand what you mean by the phrase when styles (linked to outline) are used in a wrong manner. What did you do that was wrong that allowed you to reproduce the error? I have a couple of custom styles, page styles, number styles, paragraph styles. Sorry for not replying before and that I was not clear enough. When there are 'empty' entries in the Navigator header section, and clicking those puts the cursor in the header of a page, then usually the header has a wrong paragraph style or some numbering linked to it. Or the document is corrupt, but I do not expect that to happen often. Cheers, Cor -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84645] FILEOPEN: RTF column handling not working
https://bugs.freedesktop.org/show_bug.cgi?id=84645 --- Comment #6 from Joey Reid joeyisdama...@gmail.com --- @Miklos Could this be similar to Bug 81345 related to http://cgit.freedesktop.org/libreoffice/core/commit/?id=4e653d15eff26aa5283d8ba20611893f4c573f57 DOCX import: fix default section break type inside multiple columns Where you changed the dmapper PropertyMap? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84700] Page Number Format is not Retained in TOC Other Automatic Indexes
https://bugs.freedesktop.org/show_bug.cgi?id=84700 --- Comment #5 from Cor Nouws c...@nouenoff.nl --- Ah Joel, if this works OK for you too, pls update your blog ;) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75995] EDITING: can't edit or create editable text fields
https://bugs.freedesktop.org/show_bug.cgi?id=75995 Martin L ü c h e m heinric...@posteo.de changed: What|Removed |Added Version|4.2.0.4 release |4.2.6.3 release --- Comment #8 from Martin L ü c h e m heinric...@posteo.de --- This is a duplicate bug anyway so it should show that there was no solution on the initited bug anyway. Therefore I changed version. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84703] New: VIEWING: Erratic display of slide content in notes mode
https://bugs.freedesktop.org/show_bug.cgi?id=84703 Bug ID: 84703 Summary: VIEWING: Erratic display of slide content in notes mode Product: LibreOffice Version: 4.3.1.2 release Hardware: x86-64 (AMD64) OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Presentation Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: cont...@davidbourguignon.net Created attachment 107396 -- https://bugs.freedesktop.org/attachment.cgi?id=107396action=edit Test file demonstrating the bug Problem description: VIEWING - Slide content (ie. the slide image itself) appears sometimes when using notes mode, sometimes not, without apparent logic. - Aside from this, slide content is perfectly editable in normal mode, even when this content does not show up in notes mode... - Aside from this, notes are also perfectly editable. - As a result of this erratic display behavior, the PDF file lacks some slide images when printing pages containing slides notes. Steps to reproduce: 1. Open the ODP file in attachment. 2. See the result in notes mode. 3. See the result in PDF export. Current behavior: Erratic slide display in notes mode. Expected behavior: All slides are displayed in notes mode. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84704] New: SIDEBAR: Slow scrollbar scrolling when clicking
https://bugs.freedesktop.org/show_bug.cgi?id=84704 Bug ID: 84704 Summary: SIDEBAR: Slow scrollbar scrolling when clicking Product: LibreOffice Version: 4.1.6.2 release Hardware: Other OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Libreoffice Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: philip...@hotmail.com Blocks: 65138 When elements in the sidebar take up more space than is available, a scrollbar appears. The scrollbar scrolls correctly if you drag the slider up and down, or if you use the mouse scroll wheel to move up and down. The scrollbar doesnt scroll correctly when you click in the empty space between the scrollbar arrows and the slider. It moves at 1 pixel per click. Version: 4.4.0.0.alpha0+ Build ID: ced24ffba2fa1754c466b7944b0ee06d21292706 TinderBox: Linux-rpm_deb-x86@45-TDF, Branch:master, Time: 2014-10-04_21:36:54 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 65138] [META] Sidebar feature related issues
https://bugs.freedesktop.org/show_bug.cgi?id=65138 Jay Philips philip...@hotmail.com changed: What|Removed |Added Depends on||84704 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 84705] New: FILEOPEN: When opening libreoffice writer document also opens photoshop
https://bugs.freedesktop.org/show_bug.cgi?id=84705 Bug ID: 84705 Summary: FILEOPEN: When opening libreoffice writer document also opens photoshop Product: LibreOffice Version: 4.1.5.3 release Hardware: Other OS: Windows (All) Status: UNCONFIRMED Whiteboard: BSA Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: i...@supazter.net Problem description: Open writer document with ole object (photoshop cs v8)automatically opened photoshop. Steps to reproduce: 1. Open writer 2. insert ole object (adobe phostoshop version 8) 3. save and close document 4. When the document is opened so does photoshop This does not happen with other Libreoffice applications (calc, impress) Operating System: Windows XP Version: 4.1.5.3 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
