LibreOffice Gerrit News for core on 2014-03-13
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#76078: LO Crashes while saving the docx file containing only opening in https://gerrit.libreoffice.org/8561 from Dinesh Patil about module starmath, sw + fdo#75604: File Corruption - Issue related to the nested AlternateContent in https://gerrit.libreoffice.org/8555 from Yogesh Bharate about module sw + FDO#76013 : If original file has image whose link is broken RT gets corru in https://gerrit.libreoffice.org/8549 from Umesh Kadam about module oox, sw + fdo#74772 : File Corruption - Issue related to List Bullet Numbering in https://gerrit.libreoffice.org/8539 from Rajashri Udhoji about module sw End of freshness + fdo#74775: Preseved Citation after round trip. in https://gerrit.libreoffice.org/8473 from Rohit Deshmukh about module sw, writerfilter + fdo#74702 Moved ImplReleaseGraphics into correct classes in https://gerrit.libreoffice.org/8548 from Chris Sherlock about module include, vcl + fdo#76016 Changed oox/CustomTarget_generated.mk in https://gerrit.libreoffice.org/8540 from Vinaya Mandke about module oox, sw * Merged changes on master for project core changed in the last 25 hours: + CppunitTest_sw_rtfexport: enable on MACOSX in https://gerrit.libreoffice.org/8562 from Miklos Vajna + Remove dead code from SdrObjEditView in https://gerrit.libreoffice.org/8552 from Alex Henrie + Simplify linear searches in FilterConfigCache in https://gerrit.libreoffice.org/8502 from Alex Henrie + fdo#76015 : Oleobject relationship entry was exported into wrong file. in https://gerrit.libreoffice.org/8534 from Sushil Shinde + fdo#68849 Add header guards to bridges/* files. in https://gerrit.libreoffice.org/8500 from Jason Gerlowski * Abandoned changes on master for project core changed in the last 25 hours: + fdo#74929 Chart grid is getting lost in https://gerrit.libreoffice.org/8159 from Priyanka Gaikwad * Open changes needing tweaks, but being untouched for more than a week: + FDO#74886: Data labels are not preserved for Column Chart in RT file in https://gerrit.libreoffice.org/8098 from Umesh Kadam + sal: use posix_memalign only if it's available in https://gerrit.libreoffice.org/8405 from Douglas Mencken + fdo#71984 fix first line indentation in footnotes for MS Word documents in https://gerrit.libreoffice.org/8160 from Andras Timar + fd0#74150:Numbered list getting display after RT -table-within-table-1.do in https://gerrit.libreoffice.org/7767 from Rajashri Udhoji + Lots of changes to Tango icons in https://gerrit.libreoffice.org/7987 from Miroslav Mazel + sw/docx export: fix handling of document with header and section(s) in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer + fdo#51525 Fix duplicate Paste Special entries in Calc. in https://gerrit.libreoffice.org/7784 from Andrzej Hunt + fdo#72661: Check ‘Hyphenation active’ automatically in https://gerrit.libreoffice.org/7291 from Jiwoong Youn + sa/l add release_assert() and assert that stay even in release code in https://gerrit.libreoffice.org/7625 from Norbert Thiebaud + fdo#69407: On transparent frames, shadows are painted in foreground. in https://gerrit.libreoffice.org/7070 from Mohamed-Ali BEN MANSOUR + add a header to provide posix compatible wrapper for platform lacking in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud + WIP fdo#72987 Use firebird backup format for .odb in https://gerrit.libreoffice.org/7299 from Andrzej Hunt + sw/export docx: add unit test for document with header and section(s) in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer + fix for exporting of text watermark to DOCX in https://gerrit.libreoffice.org/5568 from Adam CloudOn + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej Hunt + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn 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
Re: your mail
[adding dev list back to Cc] Anup Rai wrote: I also wanted to know what is the soft deadline to submit the solved easy hack. I'd consider student application deadline (March 21st) to be an almost-hard deadline also for the EasyHack submission. Happy Hacking, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - basic/qa basic/source include/basic include/vcl vcl/inc vcl/qa vcl/source vcl/unx
basic/qa/cppunit/basic_coverage.cxx |8 +++---
basic/source/basmgr/basmgr.cxx| 10
basic/source/classes/image.cxx|2 -
basic/source/classes/sbxmod.cxx |2 -
basic/source/inc/image.hxx|2 -
basic/source/runtime/methods.cxx |2 -
basic/source/sbx/sbxform.cxx | 23 +-
include/basic/sbmod.hxx |2 -
include/basic/sbxform.hxx | 22 -
include/vcl/GraphicNativeTransform.hxx|2 -
include/vcl/builder.hxx | 32 +-
include/vcl/outdev.hxx|4 +--
vcl/inc/graphite_features.hxx |4 +--
vcl/inc/outfont.hxx |6 ++--
vcl/inc/unx/saldisp.hxx |2 -
vcl/qa/cppunit/graphicfilter/filters-test.cxx |4 +--
vcl/source/filter/GraphicNativeTransform.cxx |2 -
vcl/source/filter/wmf/emfwr.cxx |2 -
vcl/source/filter/wmf/emfwr.hxx |2 -
vcl/source/gdi/outdev3.cxx|3 +-
vcl/source/gdi/outdevnative.cxx |4 +--
vcl/source/glyphs/graphite_features.cxx |4 +--
vcl/source/window/builder.cxx | 22 -
vcl/unx/generic/app/keysymnames.cxx |2 -
vcl/unx/gtk/a11y/atkimage.cxx |2 -
vcl/unx/gtk/a11y/atktable.cxx |2 -
26 files changed, 87 insertions(+), 85 deletions(-)
New commits:
commit 78a2020846b855ed925ab88f06fa70a282a75e5a
Author: Noel Grandin n...@peralex.com
Date: Thu Mar 13 08:38:29 2014 +0200
vcl: prefer passing OUString and OString by reference
Change-Id: I6c2c6f597ca62c004ad7dc606cef3a3b10e810b6
diff --git a/include/vcl/GraphicNativeTransform.hxx
b/include/vcl/GraphicNativeTransform.hxx
index f90499a..b6b66fc 100644
--- a/include/vcl/GraphicNativeTransform.hxx
+++ b/include/vcl/GraphicNativeTransform.hxx
@@ -28,7 +28,7 @@ class VCL_DLLPUBLIC GraphicNativeTransform
bool rotateBitmapOnly (sal_uInt16 aRotation);
bool rotateJPEG (sal_uInt16 aRotation);
-bool rotateGeneric(sal_uInt16 aRotation, OUString aType);
+bool rotateGeneric(sal_uInt16 aRotation, const OUString aType);
public:
GraphicNativeTransform(Graphic rGraphic);
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index b545df0..f8208f5 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -145,15 +145,15 @@ private:
typedef std::vectorOString row;
std::vectorrow m_aEntries;
};
-const ListStore* get_model_by_name(OString sID) const;
+const ListStore* get_model_by_name(const OString sID) const;
static void mungeModel(ListBox rTarget, const ListStore rStore,
sal_uInt16 nActiveId);
typedef stringmap TextBuffer;
-const TextBuffer* get_buffer_by_name(OString sID) const;
+const TextBuffer* get_buffer_by_name(const OString sID) const;
static void mungeTextBuffer(VclMultiLineEdit rTarget, const TextBuffer
rTextBuffer);
typedef stringmap Adjustment;
-const Adjustment *get_adjustment_by_name(OString sID) const;
+const Adjustment *get_adjustment_by_name(const OString sID) const;
static void mungeAdjustment(NumericFormatter rTarget, const Adjustment
rAdjustment);
static void mungeAdjustment(DateField rTarget, const Adjustment
rAdjustment);
static void mungeAdjustment(TimeField rTarget, const Adjustment
rAdjustment);
@@ -236,8 +236,8 @@ private:
bool m_bToplevelParentFound;
ParserState *m_pParserState;
-::Window *get_by_name(OString sID);
-void delete_by_name(OString sID);
+::Window *get_by_name(const OString sID);
+void delete_by_name(const OString sID);
class sortIntoBestTabTraversalOrder
: public std::binary_functionconst ::Window*, const ::Window*, bool
@@ -255,13 +255,13 @@ private:
css::uno::Referencecss::frame::XFrame m_xFrame;
public:
-VclBuilder(::Window *pParent, OUString sUIRootDir, OUString sUIFile,
-OString sID = OString(),
+VclBuilder(::Window *pParent, const OUString sUIRootDir, const OUString
sUIFile,
+const OString sID = OString(),
const
com::sun::star::uno::Referencecom::sun::star::frame::XFrame rFrame =
com::sun::star::uno::Referencecom::sun::star::frame::XFrame());
~VclBuilder();
::Window *get_widget_root();
//sID must exist and be of type T
-template typename T T* get(T* ret, OString sID)
+template typename T T* get(T* ret, const OString sID)
{
::Window *w = get_by_name(sID);
SAL_WARN_IF(!w, vcl.layout, widget \ sID.getStr() \ not
found in .ui);
@@ -271,7 +271,7 @@ public:
ret = static_castT*(w);
return ret;
}
-PopupMenu* get_menu(PopupMenu* ret, OString sID)
+
[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source
include/vcl/dockwin.hxx | 14 +++---
include/vcl/syswin.hxx|4 ++--
vcl/inc/brdwin.hxx|2 +-
vcl/source/window/brdwin.cxx |8
vcl/source/window/dockmgr.cxx |6 +++---
vcl/source/window/dockwin.cxx |6 +++---
vcl/source/window/syswin.cxx |6 +++---
7 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit 50bd9482c72ab848c7336955a2b8f890b9cad5ab
Author: Tor Lillqvist t...@collabora.com
Date: Wed Mar 12 16:34:21 2014 +0200
Spelling fix: pined
Change-Id: I7e9e0a3c03e6158894787f6eb072bebdbee0fcad
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index 7330209..21d7fd4 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -110,7 +110,7 @@ private:
mbLastFloatMode:1,
mbStartFloat:1,
mbTrackDock:1,
-mbPined:1,
+mbPinned:1,
mbRollUp:1,
mbDockBtn:1,
mbHideBtn:1,
@@ -255,7 +255,7 @@ private:
mbLastFloatMode:1,
mbStartFloat:1,
mbTrackDock:1,
-mbPined:1,
+mbPinned:1,
mbRollUp:1,
mbDockBtn:1,
mbHideBtn:1;
@@ -301,7 +301,7 @@ public:
virtual voidDataChanged( const DataChangedEvent rDCEvt );
voidSetPin( bool bPin );
-boolIsPined() const;
+boolIsPinned() const;
voidRollUp();
voidRollDown();
@@ -347,14 +347,14 @@ inline void DockingWindow::SetPin( bool bPin )
{
if ( mpFloatWin )
mpFloatWin-SetPin( bPin );
-mbPined = bPin;
+mbPinned = bPin;
}
-inline bool DockingWindow::IsPined() const
+inline bool DockingWindow::IsPinned() const
{
if ( mpFloatWin )
-return mpFloatWin-IsPined();
-return mbPined;
+return mpFloatWin-IsPinned();
+return mbPinned;
}
inline void DockingWindow::RollUp()
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index e63c5af..50bdd55 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -143,7 +143,7 @@ private:
SizemaOrgSize;
SizemaRollUpOutSize;
SizemaMinOutSize;
-boolmbPined;
+boolmbPinned;
boolmbRollUp;
boolmbRollFunc;
boolmbDockBtn;
@@ -197,7 +197,7 @@ public:
boolIsTitleButtonVisible( sal_uInt16 nButton ) const;
voidSetPin( bool bPin );
-boolIsPined() const { return mbPined; }
+boolIsPinned() const { return mbPinned; }
voidRollUp();
voidRollDown();
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index 296b415..d0055c9 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -95,7 +95,7 @@ private:
boolmbFloatWindow;
boolmbSmallOutBorder;
boolmbFrameBorder;
-boolmbPined;
+boolmbPinned;
boolmbRollUp;
boolmbMenuHide;
boolmbDockBtn;
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index c88719e..aca9456 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -598,7 +598,7 @@ bool ImplBorderWindowView::ImplTracking(
ImplBorderFrameData* pData, const Track
if (
pBorderWindow-ImplGetClientWindow()-IsSystemWindow() )
{
SystemWindow* pClientWindow =
(SystemWindow*)(pBorderWindow-ImplGetClientWindow());
-pClientWindow-SetPin( !pClientWindow-IsPined() );
+pClientWindow-SetPin( !pClientWindow-IsPinned() );
pClientWindow-Pin();
}
}
@@ -1828,7 +1828,7 @@ void ImplStdBorderWindowView::DrawWindow( sal_uInt16
nDrawFlags, OutputDevice* p
!pData-maPinRect.IsEmpty() )
{
Image aImage;
-ImplGetPinImage( pData-mnPinState, pBorderWindow-mbPined, aImage );
+ImplGetPinImage( pData-mnPinState, pBorderWindow-mbPinned, aImage );
Size aImageSize = aImage.GetSizePixel();
long nRectHeight = pData-maPinRect.GetHeight();
Point aPos( pData-maPinRect.TopLeft() );
@@ -1917,7 +1917,7 @@ void ImplBorderWindow::ImplInit( Window* pParent,
mnMaxHeight = SHRT_MAX;
mnRollHeight= 0;
mnOrgMenuHeight = 0;
-mbPined = false;
+mbPinned= false;
mbRollUp= false;
mbMenuHide = false;
mbDockBtn = false;
@@ -2259,7 +2259,7 @@ void ImplBorderWindow::SetBorderStyle( sal_uInt16 nStyle )
void
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/documen2.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit aa6fe2a0e62bdde897697c4e254d4256ff2accde Author: Miklos Vajna vmik...@collabora.co.uk Date: Thu Mar 13 07:49:05 2014 +0100 -Werror=shadow Change-Id: I6160150950d981a01b49cfc4c740683c1fd89b8e diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index c23ccc0..6363515 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -900,8 +900,8 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM pNewList-UpdateReference(aRefCxt); maTabs[nNewPos]-SetCondFormList( pNewList ); -sc::SetFormulaDirtyContext aCxt; -SetAllFormulasDirty(aCxt); +sc::SetFormulaDirtyContext aFormulaDirtyCxt; +SetAllFormulasDirty(aFormulaDirtyCxt); if (pDrawLayer) DrawCopyPage( static_castsal_uInt16(nOldPos), static_castsal_uInt16(nNewPos) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75757] remove inheritance to std::map and std::vector
https://bugs.freedesktop.org/show_bug.cgi?id=75757 --- Comment #5 from Vasek vaek...@gmail.com --- My mistake, I didn't understand. Now it is ok. I will work on it. Thanks -- 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
[PATCH]
Hi everybody!
Attached there is a patch for bug 53472.
It allows to use adaptively-sized integral symbols in Starmath by means of
a new command intd.
Cheers,
Matteo
From 8960e64124a29fe77e75cd04c3609ba55ea2eefd Mon Sep 17 00:00:00 2001
From: matteocam matteo.campane...@gmail.com
Date: Tue, 25 Feb 2014 14:37:55 -0500
Subject: [PATCH 1/5] Created Dynamic Integral Symbols class
Change-Id: Id86ea4292126b36c37d973ac4acbcc1e5cb7ed97
---
starmath/inc/node.hxx| 28 +++-
starmath/source/node.cxx | 23 +++
2 files changed, 50 insertions(+), 1 deletion(-)
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index bce53f2..5335e6a 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -73,7 +73,7 @@ enum SmNodeType
/*10*/ NBINDIAGONAL, NSUBSUP,NMATRIX,NPLACE, NTEXT,
/*15*/ NSPECIAL, NGLYPH_SPECIAL, NMATH, NBLANK, NERROR,
/*20*/ NLINE, NEXPRESSION,NPOLYLINE, NROOT, NROOTSYMBOL,
-/*25*/ NRECTANGLE, NVERTICAL_BRACE, NMATHIDENT
+/*25*/ NRECTANGLE, NVERTICAL_BRACE, NMATHIDENT,NDYNINT
};
@@ -618,6 +618,32 @@ public:
void Accept(SmVisitor* pVisitor);
};
+
+
+/** Dynamic Integral symbol node
+ *
+ * Node for drawing dynamicall sized integral symbols.
+ *
+ * XXX: It might be created a parent class SmDynamicSizedNode
+(for both dynamic integrals, roots and other dynamic symbols)
+
+ */
+class SmDynIntegralNode : public SmMathSymbolNode
+{
+sal_uLong nBodyWidth; // width of body (argument) of integral sign
+
+public:
+SmDynIntegralNode(const SmToken rNodeToken)
+: SmMathSymbolNode(NDYNINT, rNodeToken)
+{}
+
+sal_uLong GetBodyWidth() const {return nBodyWidth;};
+virtual void AdaptToX(const OutputDevice rDev, sal_uLong nHeight);
+virtual void AdaptToY(const OutputDevice rDev, sal_uLong nHeight);
+
+void Accept(SmVisitor* pVisitor);
+};
+
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 6ffd0fb..9268e55 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -622,6 +622,7 @@ void SmNode::DumpAsDot(std::ostream out, OUString* label, int number, int id,
case NRECTANGLE: outSmRectangleNode; break;
case NVERTICAL_BRACE: outSmVerticalBraceNode; break;
case NMATHIDENT: outSmMathIdentifierNode; break;
+case NINTDYN:outSmDynIntegralNode; break;
default:
outUnknown Node;
}
@@ -2296,6 +2297,24 @@ void SmRootSymbolNode::AdaptToY(const OutputDevice rDev, sal_uLong nHeight)
/**/
+void SmDynIntegralNode::AdaptToX(const OutputDevice /*rDev*/, sal_uLong nWidth)
+{
+// XXX: copied from SmRootSymbol for now
+//nBodyWidth = nWidth;
+}
+
+
+void SmDynIntegralNode::AdaptToY(const OutputDevice rDev, sal_uLong nHeight)
+{
+// XXX: copied from SmRootSymbol for now
+// some additional length so that the horizontal
+// bar will be positioned above the argument
+//SmMathSymbolNode::AdaptToY(rDev, nHeight + nHeight / 10L);
+}
+
+
+/**/
+
void SmRectangleNode::AdaptToX(const OutputDevice /*rDev*/, sal_uLong nWidth)
{
@@ -3194,6 +3213,10 @@ void SmRootSymbolNode::Accept(SmVisitor* pVisitor) {
pVisitor-Visit(this);
}
+void SmDynIntegralNode::Accept(SmVisitor* pVisitor) {
+pVisitor-Visit(this);
+}
+
void SmRectangleNode::Accept(SmVisitor* pVisitor) {
pVisitor-Visit(this);
}
--
1.8.3.2
From a9019baf943d56c225e02d7c4f87119c2ba79d12 Mon Sep 17 00:00:00 2001
From: matteocam matteo.campane...@gmail.com
Date: Tue, 25 Feb 2014 21:47:22 -0500
Subject: [PATCH 2/5] Added files
Change-Id: I71862f579784890d3075ff9f5a63bd756a55b93d
---
starmath/source/mathtype.cxx| 2 ++
starmath/source/mathtype.hxx| 2 +-
starmath/source/ooxmlexport.cxx | 1 +
starmath/source/rtfexport.cxx | 1 +
4 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index b90b79d..8212421 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -2516,6 +2516,7 @@ void MathType::HandleOperator(SmNode *pNode,int nLevel)
switch(pNode-GetToken().eType)
{
case TINT:
+case TINTD:
if (nOldVariation != 0xff)
pS-WriteUChar( sal_uInt8(0x18) ); //selector
else
@@ -2640,6 +2641,7 @@ void MathType::HandleOperator(SmNode *pNode,int nLevel)
pS-WriteUChar( sal_uInt8(0x86) );
pS-WriteUInt16( sal_uInt16(0x222B) );
case TINT:
+case TINTD:
case TLINT:
pS-WriteUChar( sal_uInt8(CHAR) );
pS-WriteUChar( sal_uInt8(0x86) );
diff --git
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/lvlPicBulletId.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |9 +
sw/source/filter/ww8/wrtww8.cxx |4 +++-
3 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 3075b062261435d568d0680c3405ca61a7a40f39
Author: Rajashri rajashri.udh...@synerzip.com
Date: Wed Mar 12 10:44:57 2014 +0530
fdo#74772 : File Corruption - Issue related to List Bullet Numbering
- A File containing a graphic shape bullet is captured as a numPictBullet in
MS office[in numbering.xml].
- Currently LO has support for graphic bullet as Image. Graphic bullet as
Shape
needs to be preserved in LO.
- Since the numPictBullet is not exported in LO, but in abstractNum
lvlPicBulletId was exported which lead to corruption.
- Fixed the corruption caused due to lvlPicBulletId.
- However the shape is not getting retained. Need to add implementation
for gprahic bullet as a shape.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: I2fc2b1ab4b75e8a050e66837a64578b235059473
diff --git a/sw/qa/extras/ooxmlexport/data/lvlPicBulletId.docx
b/sw/qa/extras/ooxmlexport/data/lvlPicBulletId.docx
new file mode 100644
index 000..28e656b
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/lvlPicBulletId.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index b7fdef7..045d41e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2744,6 +2744,15 @@ DECLARE_OOXMLEXPORT_TEST(testOLEObjectinHeader,
2129393649.docx)
assertXPath(pXmlDoc,/rels:Relationships/rels:Relationship[1],Id,rId1);
}
+DECLARE_OOXMLEXPORT_TEST(testlvlPicBulletId, lvlPicBulletId.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/numbering.xml);
+if (!pXmlDoc)
+ return;
+assertXPath(pXmlDoc,
/w:numbering[1]/w:abstractNum[1]/w:lvl[1]/w:lvlPicBulletId[1], 0);
+
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 82b0fbd..9832e18 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -1423,7 +1423,9 @@ int MSWordExportBase::CollectGrfsOfBullets()
}
if (!bHas)
{
-m_vecBulletPic.push_back(pGraf);
+Size aSize(pGraf-GetPrefSize());
+if (0 != aSize.Height() 0 != aSize.Width())
+ m_vecBulletPic.push_back(pGraf);
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 include/svl sfx2/inc sfx2/source svl/source
include/sfx2/brokenpackageint.hxx |4 ++--
include/sfx2/dinfdlg.hxx | 20 ++--
include/sfx2/evntconf.hxx |2 +-
include/sfx2/objsh.hxx |4 ++--
include/sfx2/templatelocalview.hxx |2 +-
include/sfx2/thumbnailview.hxx |2 +-
include/svl/itemprop.hxx |2 +-
include/svl/undo.hxx |2 +-
sfx2/inc/guisaveas.hxx |6 +++---
sfx2/source/appl/appuno.cxx| 12 ++--
sfx2/source/appl/shutdowniconunx.cxx |2 +-
sfx2/source/config/evntconf.cxx|4 ++--
sfx2/source/control/templatelocalview.cxx |2 +-
sfx2/source/control/thumbnailview.cxx |2 +-
sfx2/source/dialog/filedlghelper.cxx |2 +-
sfx2/source/doc/DocumentMetadataAccess.cxx |4 ++--
sfx2/source/doc/SfxDocumentMetaData.cxx|6 +++---
sfx2/source/doc/guisaveas.cxx |7 ---
sfx2/source/doc/objstor.cxx|4 ++--
svl/source/fsstor/fsstorage.cxx|2 +-
svl/source/inc/passwordcontainer.hxx |2 +-
svl/source/items/itemprop.cxx |2 +-
svl/source/passwordcontainer/passwordcontainer.cxx |4 ++--
svl/source/undo/undo.cxx |2 +-
24 files changed, 51 insertions(+), 50 deletions(-)
New commits:
commit 0dc38bdde056cf33a545d85f9e1211f06d579ff7
Author: Noel Grandin n...@peralex.com
Date: Thu Mar 13 09:34:37 2014 +0200
sfx2,svl: prefer passing OUString and OString by reference
Change-Id: I9833265f6e635a057cea2c4a945cc73809b1e2ef
diff --git a/include/sfx2/brokenpackageint.hxx
b/include/sfx2/brokenpackageint.hxx
index c93d41e..1047b30 100644
--- a/include/sfx2/brokenpackageint.hxx
+++ b/include/sfx2/brokenpackageint.hxx
@@ -28,7 +28,7 @@ class SFX2_DLLPUBLIC RequestPackageReparation
{
RequestPackageReparation_Impl* pImp;
public:
-RequestPackageReparation( OUString aName );
+RequestPackageReparation( const OUString aName );
~RequestPackageReparation();
sal_BoolisApproved();
com::sun::star::uno::Reference
::com::sun::star::task::XInteractionRequest GetRequest();
@@ -39,7 +39,7 @@ class SFX2_DLLPUBLIC NotifyBrokenPackage
{
NotifyBrokenPackage_Impl* pImp;
public:
-NotifyBrokenPackage( OUString aName );
+NotifyBrokenPackage( const OUString aName );
~NotifyBrokenPackage();
sal_BoolisAborted();
com::sun::star::uno::Reference
::com::sun::star::task::XInteractionRequest GetRequest();
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 3d572b3..beffc57 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -110,13 +110,13 @@ public:
sal_Int32 getAutoloadDelay() const { return m_AutoloadDelay; }
voidsetAutoloadDelay(sal_Int32 i_val) { m_AutoloadDelay = i_val; }
OUString getAutoloadURL() const { return m_AutoloadURL; }
-voidsetAutoloadURL(OUString i_val) { m_AutoloadURL = i_val; }
+voidsetAutoloadURL(const OUString i_val) { m_AutoloadURL = i_val;
}
OUString getDefaultTarget() const { return m_DefaultTarget; }
-voidsetDefaultTarget(OUString i_val) { m_DefaultTarget = i_val; }
+voidsetDefaultTarget(const OUString i_val) { m_DefaultTarget =
i_val; }
OUString getTemplateName() const { return m_TemplateName; }
-voidsetTemplateName(OUString i_val) { m_TemplateName = i_val; }
+voidsetTemplateName(const OUString i_val) { m_TemplateName =
i_val; }
OUString getAuthor() const { return m_Author; }
-voidsetAuthor(OUString i_val) { m_Author = i_val; }
+voidsetAuthor(const OUString i_val) { m_Author = i_val; }
::com::sun::star::util::DateTime
getCreationDate() const { return m_CreationDate; }
@@ -124,7 +124,7 @@ public:
m_CreationDate = i_val;
}
OUString getModifiedBy() const { return m_ModifiedBy; }
-voidsetModifiedBy(OUString i_val) { m_ModifiedBy = i_val; }
+voidsetModifiedBy(const OUString i_val) { m_ModifiedBy = i_val; }
::com::sun::star::util::DateTime
getModificationDate() const { return m_ModificationDate; }
@@ -132,7 +132,7 @@ public:
m_ModificationDate = i_val;
}
OUString getPrintedBy() const { return m_PrintedBy; }
-voidsetPrintedBy(OUString i_val) { m_PrintedBy = i_val; }
+voidsetPrintedBy(const OUString i_val) { m_PrintedBy = i_val; }
::com::sun::star::util::DateTime
getPrintDate() const { return m_PrintDate; }
voidsetPrintDate(::com::sun::star::util::DateTime
Re: [PATCH]
Hi Matteo, Thanks for working on this issue and having a patch ready for review! However, the proper way to submit patches for code-review (and subsequent submission on master) is using the gerrit. You can find details on how to do that herehttps://wiki.documentfoundation.org/Development/gerrit . Best, Adam On Thu, Mar 13, 2014 at 9:52 AM, Matteo Campanelli matteo.campane...@gmail.com wrote: Hi everybody! Attached there is a patch for bug 53472. It allows to use adaptively-sized integral symbols in Starmath by means of a new command intd. Cheers, Matteo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- [image: appicon.png] *Adam Fyne* Twitter http://www.twitter.com/cloudoninc | LinkedInhttp://www.linkedin.com/company/cloudon | Facebook http://www.facebook.com/cloudoninc | Bloghttp://site.cloudon.com/blog ___ 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 73113, which changed state. Bug 73113 Summary: LOOKUP function results in #N/A https://bugs.freedesktop.org/show_bug.cgi?id=73113 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 'libreoffice-4-2' - include/xmloff sw/qa xmloff/source
include/xmloff/xmlimp.hxx |7 ++
sw/qa/extras/odfimport/data/fdo75872_aoo40.odt |binary
sw/qa/extras/odfimport/data/fdo75872_ooo33.odt |binary
sw/qa/extras/odfimport/odfimport.cxx | 20
xmloff/source/core/xmlimp.cxx | 25 ++
xmloff/source/draw/XMLGraphicsDefaultStyle.cxx | 59 -
6 files changed, 108 insertions(+), 3 deletions(-)
New commits:
commit 0fc0d2579f6f3e26cd8b56da730184d6933cc8fe
Author: Michael Stahl mst...@redhat.com
Date: Wed Mar 12 22:21:16 2014 +0100
fdo#75872: ODF import: fix up graphics defaults stroke/fill colors
These have changed a few times, notably in LO 4.0 with commit
895890563cb0cc5fa872bdfd06918a46cdda172d and AOO 4.0 with commit
c0eb5e7772c848806db8ab461f77f9549c1d8b2b; unfortunately historic OOo and
current AOO do not write the values into ODF files, whereas LO 4.x does
(probably by accident, since 45d3577bc5726eee44f491fd30a7f11dc428431a
by design).
Try to set the defaults depending on the generator; since the defaults
are not specified by ODF they are implementation defined anyway so this
should be OK.
Change-Id: I1270d6e0cdeea5cb493724a0998f661a0cf644f1
(cherry picked from commit 92cb21ebeda98c5193c50c4cf7ef3d60611c2a52)
Reviewed-on: https://gerrit.libreoffice.org/8563
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 6005677..534158a 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -420,9 +420,14 @@ public:
static const sal_uInt16 OOo_32x = 32;
static const sal_uInt16 OOo_33x = 33;
static const sal_uInt16 OOo_34x = 34;
+// for AOO, no release overlaps with OOo, so continue OOo version numbers
+static const sal_uInt16 AOO_40x = 40;
+static const sal_uInt16 AOO_4x = 41;
static const sal_uInt16 LO_flag = 0x100;
static const sal_uInt16 LO_3x = 30 | LO_flag;
-static const sal_uInt16 LO_4x = 40 | LO_flag;
+static const sal_uInt16 LO_41x = 41 | LO_flag;
+static const sal_uInt16 LO_42x = 42 | LO_flag;
+static const sal_uInt16 LO_4x = 43 | LO_flag;
static const sal_uInt16 ProductVersionUnknown = SAL_MAX_UINT16;
/** depending on whether the generator version indicates LO, compare
diff --git a/sw/qa/extras/odfimport/data/fdo75872_aoo40.odt
b/sw/qa/extras/odfimport/data/fdo75872_aoo40.odt
new file mode 100644
index 000..549a567
Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo75872_aoo40.odt
differ
diff --git a/sw/qa/extras/odfimport/data/fdo75872_ooo33.odt
b/sw/qa/extras/odfimport/data/fdo75872_ooo33.odt
new file mode 100644
index 000..4cc3de7
Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo75872_ooo33.odt
differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx
b/sw/qa/extras/odfimport/odfimport.cxx
index 87e7402..879513b 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -278,6 +278,26 @@ DECLARE_ODFIMPORT_TEST(testFdo56272, fdo56272.odt)
CPPUNIT_ASSERT_EQUAL(sal_Int32(422), xShape-getPosition().Y); // Was -2371
}
+DECLARE_ODFIMPORT_TEST(testFdo75872_ooo33, fdo75872_ooo33.odt)
+{
+// graphics default style: line color and fill color changed
+uno::Referencedrawing::XShape xShape = getShape(1);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(COL_BLACK),
+ getPropertysal_Int32(xShape, LineColor));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(RGB_COLORDATA(153, 204, 255)),
+ getPropertysal_Int32(xShape, FillColor));
+}
+
+DECLARE_ODFIMPORT_TEST(testFdo75872_aoo40, fdo75872_aoo40.odt)
+{
+// graphics default style: line color and fill color changed
+uno::Referencedrawing::XShape xShape = getShape(1);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(RGB_COLORDATA(128, 128, 128)),
+ getPropertysal_Int32(xShape, LineColor));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(RGB_COLORDATA(0xCF, 0xE7, 0xF5)),
+ getPropertysal_Int32(xShape, FillColor));
+}
+
DECLARE_ODFIMPORT_TEST(testFdo55814, fdo55814.odt)
{
uno::Referencetext::XTextFieldsSupplier xTextFieldsSupplier(mxComponent,
uno::UNO_QUERY);
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index c46757f..2127d0e 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -193,7 +193,20 @@ getBuildIdsProperty(uno::Referencebeans::XPropertySet
const xImportInfo)
else
{
SAL_INFO_IF('4' != loVersion[0],
xmloff.core, unknown LO version: loVersion);
-mnGeneratorVersion = SvXMLImport::LO_4x;
+if ('4' == loVersion[0]
loVersion.getLength() 1
+ (loVersion[1] == '0' || loVersion[1] ==
'1'))
+
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa sw/source
sw/qa/extras/uiwriter/data/fdo75110.odt |binary
sw/qa/extras/uiwriter/uiwriter.cxx | 15 +++
sw/source/core/edit/eddel.cxx |9 +++--
3 files changed, 22 insertions(+), 2 deletions(-)
New commits:
commit fea99d32aec1c24b7cbc7a4063b21a471072509b
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Mar 12 17:28:10 2014 +0100
fdo#75110 SwEditShell::DeleteSel fix start of selection when bSelAll == true
(cherry picked from commit f9b62506b22c3eb885ffd5a4ec8025c33df7b2d4)
Conflicts:
sw/qa/extras/uiwriter/uiwriter.cxx
Change-Id: I3e8ce585b29619061b18ab1ab8f0cf6c7d421074
Reviewed-on: https://gerrit.libreoffice.org/8559
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
diff --git a/sw/qa/extras/uiwriter/data/fdo75110.odt
b/sw/qa/extras/uiwriter/data/fdo75110.odt
new file mode 100644
index 000..f4c2f2b
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/fdo75110.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 12c76b8..a86d2ca 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -23,11 +23,13 @@ public:
//EDITING: undo searchreplace corrupt text when searching backward
void testReplaceBackward();
void testFdo69893();
+void testFdo75110();
CPPUNIT_TEST_SUITE(SwUiWriterTest);
CPPUNIT_TEST(testReplaceForward);
CPPUNIT_TEST(testReplaceBackward);
CPPUNIT_TEST(testFdo69893);
+CPPUNIT_TEST(testFdo75110);
CPPUNIT_TEST_SUITE_END();
private:
@@ -78,6 +80,19 @@ void SwUiWriterTest::testReplaceForward()
CPPUNIT_ASSERT_EQUAL(ORIGINAL_REPLACE_CONTENT, pTxtNode-GetTxt());
}
+void SwUiWriterTest::testFdo75110()
+{
+SwDoc* pDoc = createDoc(fdo75110.odt);
+SwWrtShell* pWrtShell = pDoc-GetDocShell()-GetWrtShell();
+
+pWrtShell-SelAll();
+// The problem was that SwEditShell::DeleteSel() what this Delete()
invokes took the wrong selection...
+pWrtShell-Delete();
+sw::UndoManager rUndoManager = pDoc-GetUndoManager();
+// ... so this Undo() call resulted in a crash.
+rUndoManager.Undo();
+}
+
void SwUiWriterTest::testReplaceBackward()
{
SwDoc* pDoc = createDoc();
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx
index e94ea3b..6a4fc87 100644
--- a/sw/source/core/edit/eddel.cxx
+++ b/sw/source/core/edit/eddel.cxx
@@ -89,9 +89,14 @@ void SwEditShell::DeleteSel( SwPaM rPam, sal_Bool* pUndo )
}
else
{
+SwPaM aPam(rPam);
+if (bSelectAll)
+// Selection starts at the first para of the first cell, but we
+// want to delete the table node before the first cell as well.
+aPam.Start()-nNode =
aPam.Start()-nNode.GetNode().FindTableNode()-GetIndex();
// delete everything
-GetDoc()-DeleteAndJoin( rPam );
-SaveTblBoxCntnt( rPam.GetPoint() );
+GetDoc()-DeleteAndJoin( aPam );
+SaveTblBoxCntnt( aPam.GetPoint() );
}
// Selection is not needed anymore
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Matteo Campanelli license statement
All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Matteo Campanelli ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH]
Thanks Adam. I followed the procedure and now the code is on Gerrit. On Thu, Mar 13, 2014 at 5:18 AM, Adam Fyne adam.f...@cloudon.com wrote: Hi Matteo, Thanks for working on this issue and having a patch ready for review! However, the proper way to submit patches for code-review (and subsequent submission on master) is using the gerrit. You can find details on how to do that herehttps://wiki.documentfoundation.org/Development/gerrit . Best, Adam On Thu, Mar 13, 2014 at 9:52 AM, Matteo Campanelli matteo.campane...@gmail.com wrote: Hi everybody! Attached there is a patch for bug 53472. It allows to use adaptively-sized integral symbols in Starmath by means of a new command intd. Cheers, Matteo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- [image: appicon.png] *Adam Fyne* Twitter http://www.twitter.com/cloudoninc | LinkedInhttp://www.linkedin.com/company/cloudon | Facebook http://www.facebook.com/cloudoninc | Bloghttp://site.cloudon.com/blog ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: framework/source
framework/source/uielement/menubarmerger.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d575b23c187fb66bbe13c4fe6df8a8cb1ccbc135 Author: Caolán McNamara caol...@redhat.com Date: Thu Mar 13 10:50:11 2014 + coverity#705817 Dereference before null check Change-Id: Ia96b3e78b65ebea0d74267468906e9bda2ae3da6 diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx index b814e77..f74a722 100644 --- a/framework/source/uielement/menubarmerger.cxx +++ b/framework/source/uielement/menubarmerger.cxx @@ -132,7 +132,7 @@ ReferencePathInfo MenuBarMerger::FindReferencePath( } i++; } -while (( pCurrMenu != 0 ) ( i nCount ) ( eResult == RP_OK )); +while ((i nCount) (eResult == RP_OK)); aResult.pPopupMenu = pCurrMenu; aResult.nPos = nPos; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: EasyHack proposition - Crop image functionality improvement (fdo#34555)
Please, it's necessary. +1 - Lexnos Corporation / www.lexnos.com / @lexnos / Skype: lexnos.com -- View this message in context: http://nabble.documentfoundation.org/EasyHack-proposition-Crop-image-functionality-improvement-fdo-34555-tp3832241p4101192.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] core.git: cui/source include/svtools include/svx svtools/source svx/source
cui/source/factory/dlgfact.cxx|4 ++--
cui/source/factory/dlgfact.hxx|4 ++--
include/svtools/ServerDetailsControls.hxx |4 ++--
include/svtools/inettbc.hxx |2 +-
include/svtools/place.hxx |2 +-
include/svtools/toolboxcontroller.hxx |2 +-
include/svx/DescriptionGenerator.hxx |2 +-
include/svx/nbdtmg.hxx|4 ++--
include/svx/svxdlg.hxx|8
include/svx/xmleohlp.hxx |2 +-
svtools/source/config/helpopt.cxx |2 +-
svtools/source/config/miscopt.cxx |2 +-
svtools/source/config/slidesorterbaropt.cxx |2 +-
svtools/source/config/toolpanelopt.cxx|2 +-
svtools/source/control/inettbc.cxx|4 +++-
svtools/source/dialogs/ServerDetailsControls.cxx |2 +-
svtools/source/uno/toolboxcontroller.cxx |2 +-
svx/source/accessibility/DescriptionGenerator.cxx |2 +-
svx/source/gengal/gengal.cxx |4 ++--
svx/source/sidebar/nbdtmg.cxx |4 ++--
svx/source/toolbars/fontworkbar.cxx |2 +-
svx/source/xml/xmleohlp.cxx |5 +++--
22 files changed, 35 insertions(+), 32 deletions(-)
New commits:
commit 41776e53c54968881021c25f1173d190cfd2ba5d
Author: Noel Grandin n...@peralex.com
Date: Thu Mar 13 13:12:33 2014 +0200
svtools,svx: prefer passing OUString and OString by reference
Change-Id: Iceb2cbcda9d8ddb4ee00db9365c751e0e5d8b3a6
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index cf9696b..d5bc424 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -578,12 +578,12 @@ bool AbstractSvxHlinkDlgMarkWnd_Impl::ConnectToDialog(
bool bDoit )const
return pDlg-ConnectToDialog(bDoit);
}
-void AbstractSvxHlinkDlgMarkWnd_Impl::RefreshTree ( OUString aStrURL )
+void AbstractSvxHlinkDlgMarkWnd_Impl::RefreshTree ( const OUString aStrURL )
{
pDlg-RefreshTree(aStrURL);
}
-void AbstractSvxHlinkDlgMarkWnd_Impl::SelectEntry ( OUString aStrMark )
+void AbstractSvxHlinkDlgMarkWnd_Impl::SelectEntry ( const OUString aStrMark )
{
pDlg-SelectEntry(aStrMark);
}
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index ee41b25..2804ecb 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -285,8 +285,8 @@ class AbstractSvxHlinkDlgMarkWnd_Impl : public
AbstractSvxHlinkDlgMarkWnd
virtual SizeGetSizePixel() const;
virtual boolMoveTo( Point aNewPos ) const;
virtual boolConnectToDialog( bool bDoit = true )const;
-virtual voidRefreshTree ( OUString aStrURL ) ;
-virtual voidSelectEntry ( OUString aStrMark );
+virtual voidRefreshTree ( const OUString aStrURL ) ;
+virtual voidSelectEntry ( const OUString aStrMark );
virtual sal_uInt16 SetError( sal_uInt16 nError) ;
};
diff --git a/include/svtools/ServerDetailsControls.hxx
b/include/svtools/ServerDetailsControls.hxx
index 02c2673..6155b4b 100644
--- a/include/svtools/ServerDetailsControls.hxx
+++ b/include/svtools/ServerDetailsControls.hxx
@@ -62,7 +62,7 @@ class HostDetailsContainer : public DetailsContainer
Edit* m_pEDPath;
public:
-HostDetailsContainer( VclBuilderContainer* pBuilder, sal_uInt16 nPort,
OUString sScheme );
+HostDetailsContainer( VclBuilderContainer* pBuilder, sal_uInt16 nPort,
const OUString sScheme );
virtual ~HostDetailsContainer( ) { };
virtual void show( bool bShow = true );
@@ -70,7 +70,7 @@ class HostDetailsContainer : public DetailsContainer
virtual bool setUrl( const INetURLObject rUrl );
protected:
-void setScheme( OUString sScheme ) { m_sScheme = sScheme; }
+void setScheme( const OUString sScheme ) { m_sScheme = sScheme; }
/** Verifies that the schement split from the URL can be handled by
the container and set the proper controls accordingly if needed.
diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx
index d0d3a00..0ee7b10 100644
--- a/include/svtools/inettbc.hxx
+++ b/include/svtools/inettbc.hxx
@@ -78,7 +78,7 @@ public:
voidUpdatePickList( );
-static OUString ParseSmart( OUString aText, OUString
aBaseURL, const OUString aWorkDir );
+static OUString ParseSmart( const OUString aText, const
OUString aBaseURL, const OUString aWorkDir );
voidSetFilter(const OUString _sFilter);
diff --git a/include/svtools/place.hxx b/include/svtools/place.hxx
index 406d75c..e46eba4 100644
---
[Libreoffice-commits] core.git: 8 commits - include/sfx2 include/svx include/tools include/vcl rsc/inc rsc/source sc/source svl/source sw/source tools/source unusedcode.easy vcl/source
include/sfx2/new.hxx |1
include/svx/srchdlg.hxx|1
include/tools/rc.h |5 -
include/tools/rcid.h | 16 ++---
include/vcl/field.hxx |6 -
include/vcl/morebtn.hxx|6 -
rsc/inc/rscdb.hxx |8 --
rsc/source/parser/rscicpx.cxx | 129 -
rsc/source/parser/rscinit.cxx | 60 ---
sc/source/ui/inc/pvlaydlg.hxx |2
svl/source/items/style.cxx |1
sw/source/ui/frmdlg/column.cxx |1
tools/source/rc/resmgr.cxx |6 -
unusedcode.easy| 13
vcl/source/control/morebtn.cxx | 48 ---
15 files changed, 13 insertions(+), 290 deletions(-)
New commits:
commit eee4c914aee9794125077d4ae7c6dd171b8fb223
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 13 10:25:37 2014 +
Related: fdo#30770 fix rtf cut/paste crash
regression since 0c17ccc493d0c7a80f37600dae76a09a119bef78
Change-Id: I15396ad4d0906c7c3b27c318d73455ac494ae754
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 406e5c2..b83e773 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -437,6 +437,7 @@ SfxStyleSheetBase*
SfxStyleSheetIterator::operator[](sal_uInt16 nIdx)
if( IsTrivialSearch())
{
retval =
pBasePool-mIndexedStyleSheets-GetStyleSheetByPosition(nIdx).get();
+nAktPosition = nIdx;
}
else
{
commit 1eeb20f3958666ec6ba6e0fcf52e92e5eb447a14
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 13 10:02:45 2014 +
CurrencyFields cannot be loaded from .src anymore
Change-Id: I3ccdb71e39a13dc8c697d3a52dc693cff10c614d
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index 17b81cd..0b2ac17 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -92,7 +92,7 @@
#define RSC_PATTERNFIELD(RSC_NOTYPE + 0x62)
#define RSC_NUMERICFIELD(RSC_NOTYPE + 0x63)
#define RSC_METRICFIELD (RSC_NOTYPE + 0x64)
-#define RSC_CURRENCYFIELD (RSC_NOTYPE + 0x65)
+
#define RSC_DATEFIELD (RSC_NOTYPE + 0x66)
#define RSC_TIMEFIELD (RSC_NOTYPE + 0x67)
#define RSC_PATTERNBOX (RSC_NOTYPE + 0x68)
@@ -101,7 +101,7 @@
-#define RSC_LONGCURRENCYFIELD (RSC_NOTYPE + 0x6e)
+
#define RSC_TOOLBOXITEM (RSC_NOTYPE + 0x70)
#define RSC_TOOLBOX (RSC_NOTYPE + 0x71)
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index 6e037fb..435bed6 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -600,9 +600,8 @@ public:
class VCL_DLLPUBLIC CurrencyField : public SpinField, public CurrencyFormatter
{
public:
-CurrencyField( Window* pParent, WinBits nWinStyle
);
-
-~CurrencyField();
+CurrencyField( Window* pParent, WinBits nWinStyle );
+~CurrencyField();
virtual boolPreNotify( NotifyEvent rNEvt );
virtual boolNotify( NotifyEvent rNEvt );
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index b71e094..e36e296 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -218,8 +218,6 @@ class RscTypCont
RscTop *InitClassPatternField( RscTop * pSuper );
RscTop *InitClassNumericField( RscTop * pSuper );
RscTop *InitClassMetricField( RscTop * pSuper );
-RscTop *InitClassCurrencyField( const char * pClassName, sal_uInt32
nRT,
-RscTop * pSuper );
RscTop *InitClassDateField( RscTop * pSuper, RscTop * pClassDate );
RscTop *InitClassTimeField( RscTop * pSuper, RscTop * pClassTime );
RscTop *InitClassPatternBox( RscTop * pSuper );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 5bd3dcd..432cc80 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -1455,37 +1455,6 @@ RscTop * RscTypCont::InitClassMetricField( RscTop *
pSuper )
return pClassMetricField;
}
-RscTop * RscTypCont::InitClassCurrencyField
-(
-const char * pClassName,
-sal_uInt32 nRT,
-RscTop * pSuper
-)
-{
-AtomnId;
-RscTop *pClassCurrencyField;
-
-// Klasse anlegen
-nId = pHS-getID( pClassName );
-pClassCurrencyField = new RscClass( nId, nRT, pSuper );
-pClassCurrencyField-SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-
-aNmTb.Put( nId, CLASSNAME, pClassCurrencyField );
-
-// Variablen anlegen
-nId = aNmTb.Put( First, VARNAME );
-pClassCurrencyField-SetVariable( nId, aIdLong, NULL,
- 0, CURRENCYFIELD_FIRST );
-nId = aNmTb.Put( Last, VARNAME );
-pClassCurrencyField-SetVariable( nId, aIdLong, NULL,
- 0, CURRENCYFIELD_LAST );
-nId = aNmTb.Put( SpinSize, VARNAME );
-pClassCurrencyField-SetVariable( nId, aIdLong, NULL,
- 0,
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 95/2f581cb77f52e9aaa974496dc8d86b335cb424
95/2f581cb77f52e9aaa974496dc8d86b335cb424 |1 + 1 file changed, 1 insertion(+) New commits: commit 3f1b8adf8cebb5081b43307644595cb401861af0 Author: Caolán McNamara caol...@redhat.com Date: Thu Mar 13 11:25:00 2014 + Notes added by 'git notes add' diff --git a/95/2f581cb77f52e9aaa974496dc8d86b335cb424 b/95/2f581cb77f52e9aaa974496dc8d86b335cb424 new file mode 100644 index 000..b959cbe --- /dev/null +++ b/95/2f581cb77f52e9aaa974496dc8d86b335cb424 @@ -0,0 +1 @@ +prefer: 933f481a50d8e82d03cec3e842015273ba3fc988 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/templdlg.hxx|2 +-
sfx2/source/inc/templdgi.hxx |2 +-
sfx2/source/sidebar/SidebarDockingWindow.cxx |6 ++
3 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 8ad74d8866c77ca52f8c2562b728fc876c23f1c0
Author: Andre Fischer a...@apache.org
Date: Wed Mar 12 14:21:27 2014 +
Related: #i124392# fill in SidebarDockingWindow::DoDispose
(cherry picked from commit 952f581cb77f52e9aaa974496dc8d86b335cb424)
Conflicts:
sfx2/inc/sfx2/sidebar/SidebarChildWindow.hxx
sfx2/source/dialog/templdlg.cxx
sfx2/source/inc/templdgi.hxx
Change-Id: Idf06437dfc45e02d9e2303df84d52ba0837de108
diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx
index 25b152a..96a03df 100644
--- a/include/sfx2/templdlg.hxx
+++ b/include/sfx2/templdlg.hxx
@@ -85,7 +85,7 @@ class SFX2_DLLPUBLIC SfxTemplatePanelControl : public
DockingWindow
{
public:
SfxTemplatePanelControl (SfxBindings* pBindings, Window* pParentWindow);
-~SfxTemplatePanelControl (void);
+virtual ~SfxTemplatePanelControl();
virtual voidUpdate();
virtual voidDataChanged( const DataChangedEvent _rDCEvt );
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 8a4dfdc..f064bba 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -276,7 +276,7 @@ public:
TYPEINFO();
SfxCommonTemplateDialog_Impl( SfxBindings* pB, Window*, bool );
-~SfxCommonTemplateDialog_Impl();
+virtual ~SfxCommonTemplateDialog_Impl();
DECL_LINK( MenuSelectHdl, Menu * );
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx
b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index 259123d..1fb9f0a 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -66,6 +66,12 @@ SidebarDockingWindow::~SidebarDockingWindow (void)
void SidebarDockingWindow::DoDispose (void)
{
+Referencelang::XComponent xComponent
(static_castXWeak*(mpSidebarController.get()), UNO_QUERY);
+mpSidebarController.clear();
+if (xComponent.is())
+{
+xComponent-dispose();
+}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 6 commits - comphelper/source include/comphelper include/toolkit toolkit/source ucb/source writerfilter/source
comphelper/source/misc/ihwrapnofilter.cxx | 10 --- include/comphelper/ihwrapnofilter.hxx | 11 include/comphelper/weakeventlistener.hxx |4 +-- include/toolkit/awt/vclxgraphics.hxx | 12 - toolkit/source/awt/vclxwindow.cxx | 27 ++--- ucb/source/sorter/sortdynres.cxx |4 +-- ucb/source/sorter/sortdynres.hxx |4 +-- writerfilter/source/dmapper/TextEffectsHandler.cxx |4 +++ 8 files changed, 19 insertions(+), 57 deletions(-) New commits: commit d7c1a65dd64504e7a910150e577c10ef3658d08b Author: Stephan Bergmann sberg...@redhat.com Date: Thu Mar 13 12:49:37 2014 +0100 Missing include Change-Id: I98c098f45bcc9f1c250826c371d52b7524aa59e7 diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx b/writerfilter/source/dmapper/TextEffectsHandler.cxx index 36db317..7c1aa24 100644 --- a/writerfilter/source/dmapper/TextEffectsHandler.cxx +++ b/writerfilter/source/dmapper/TextEffectsHandler.cxx @@ -8,6 +8,10 @@ * */ +#include sal/config.h + +#include map + #include TextEffectsHandler.hxx #include rtl/ustrbuf.hxx commit 81c9fe933e4aed25b0fe801c1fea856f02381282 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Mar 13 12:07:50 2014 +0100 Getter members of VCLXGraphics not in XGraphics need not be virtual Change-Id: Ia67fc51120068d5ae0f6d47d7716e7fb6f62c748 diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx index 9b60927..dea8264 100644 --- a/include/toolkit/awt/vclxgraphics.hxx +++ b/include/toolkit/awt/vclxgraphics.hxx @@ -95,17 +95,17 @@ public: // ::com::sun::star::awt::XGraphics Attributes virtual ::com::sun::star::uno::Reference ::com::sun::star::awt::XDevice SAL_CALL getDevice() throw (::com::sun::star::uno::RuntimeException, std::exception); -virtual ::sal_Int32 SAL_CALL getTextColor() throw (::com::sun::star::uno::RuntimeException); +virtual ::sal_Int32 getTextColor() throw (::com::sun::star::uno::RuntimeException) SAL_FINAL; virtual void SAL_CALL setTextColor( ::sal_Int32 _textcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception); -virtual ::sal_Int32 SAL_CALL getTextFillColor() throw (::com::sun::star::uno::RuntimeException); +virtual ::sal_Int32 getTextFillColor() throw (::com::sun::star::uno::RuntimeException) SAL_FINAL; virtual void SAL_CALL setTextFillColor( ::sal_Int32 _textfillcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception); -virtual ::sal_Int32 SAL_CALL getLineColor() throw (::com::sun::star::uno::RuntimeException); +virtual ::sal_Int32 getLineColor() throw (::com::sun::star::uno::RuntimeException) SAL_FINAL; virtual void SAL_CALL setLineColor( ::sal_Int32 _linecolor ) throw (::com::sun::star::uno::RuntimeException, std::exception); -virtual ::sal_Int32 SAL_CALL getFillColor() throw (::com::sun::star::uno::RuntimeException); +virtual ::sal_Int32 getFillColor() throw (::com::sun::star::uno::RuntimeException) SAL_FINAL; virtual void SAL_CALL setFillColor( ::sal_Int32 _fillcolor ) throw (::com::sun::star::uno::RuntimeException, std::exception); -virtual ::com::sun::star::awt::RasterOperation SAL_CALL getRasterOp() throw (::com::sun::star::uno::RuntimeException); +virtual ::com::sun::star::awt::RasterOperation getRasterOp() throw (::com::sun::star::uno::RuntimeException) SAL_FINAL; virtual void SAL_CALL setRasterOp( ::com::sun::star::awt::RasterOperation _rasterop ) throw (::com::sun::star::uno::RuntimeException, std::exception); -virtual ::com::sun::star::uno::Reference ::com::sun::star::awt::XFont SAL_CALL getFont() throw (::com::sun::star::uno::RuntimeException); +virtual ::com::sun::star::uno::Reference ::com::sun::star::awt::XFont getFont() throw (::com::sun::star::uno::RuntimeException) SAL_FINAL; virtual void SAL_CALL setFont( const ::com::sun::star::uno::Reference ::com::sun::star::awt::XFont _font ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::awt::SimpleFontMetric SAL_CALL getFontMetric() throw (::com::sun::star::uno::RuntimeException, std::exception); commit 6e469f76bb94ae08b758f8a0e1acbf8ee9d51c3f Author: Stephan Bergmann sberg...@redhat.com Date: Thu Mar 13 12:04:04 2014 +0100 Remove unused VCLXWindowImpl parts Change-Id: I6b26243e9669c791fdf1bd68193675ca780d41ee diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index ee84c9a..9b5ff6b 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -60,6 +60,7 @@ #include toolkit/helper/unopropertyarrayhelper.hxx #include boost/bind.hpp +#include boost/noncopyable.hpp using namespace ::com::sun::star; @@ -84,7 +85,7 @@ namespace MouseWheelBehavior = ::com::sun::star::awt::MouseWheelBehavior; //=
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/bnc865381.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 12
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 15 +++
writerfilter/source/dmapper/DomainMapperTableManager.hxx |7 +++
writerfilter/source/dmapper/TablePropertiesHandler.cxx | 12
5 files changed, 38 insertions(+), 8 deletions(-)
New commits:
commit e6e828a72b97bb639e160d52bbe2a095d03b892b
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Mar 12 11:42:34 2014 +0100
bnc#865381 DOCX import: table cell btLr text direction fixes
(cherry picked from commit 48b5b7641d0df960558082e8948da8598f801264)
(cherry picked from commit 970160f78ef6cc7abacfa252daa8451e1f0117bb)
Change-Id: I527955671e1100f05da717bffe002131baaf0291
Reviewed-on: https://gerrit.libreoffice.org/8553
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/extras/ooxmlimport/data/bnc865381.docx
b/sw/qa/extras/ooxmlimport/data/bnc865381.docx
new file mode 100755
index 000..bb125cc
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/bnc865381.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 1a2ee5f..ab7404f 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1059,6 +1059,18 @@ DECLARE_OOXMLIMPORT_TEST(testTbLrHeight,
tblr-height.docx)
CPPUNIT_ASSERT_EQUAL(text::SizeType::FIX,
getPropertysal_Int16(xTableRows-getByIndex(0), SizeType));
}
+DECLARE_OOXMLIMPORT_TEST(testBnc865381, bnc865381.docx)
+{
+uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xTables(xTablesSupplier-getTextTables(), uno::UNO_QUERY);
+uno::Referencetext::XTextTable xTextTable(xTables-getByIndex(0),
uno::UNO_QUERY);
+uno::Referencetable::XTableRows xTableRows(xTextTable-getRows(),
uno::UNO_QUERY);
+// Second row has a vertically merged cell, make sure size type is not FIX
in that case (otherwise B2 is not readable).
+CPPUNIT_ASSERT(text::SizeType::FIX !=
getPropertysal_Int16(xTableRows-getByIndex(1), SizeType));
+// Explicit size of 41 mm100 was set, so the vertical text in A2 was not
readable.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0),
getPropertysal_Int32(xTableRows-getByIndex(1), Height));
+}
+
DECLARE_OOXMLIMPORT_TEST(testFdo53985, fdo53985.docx)
{
// Unhandled excetion prevented import of the rest of the document.
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index cc7d119..764a065 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -55,6 +55,7 @@ DomainMapperTableManager::DomainMapperTableManager(bool
bOOXML) :
m_aTmpTableProperties(),
m_bPushCurrentWidth(false),
m_bRowSizeTypeInserted(false),
+m_bHasBtlrCell(false),
m_bTableSizeTypeInserted(false),
m_nLayoutType(0),
m_nMaxFixedWidth(0),
@@ -340,10 +341,15 @@ bool DomainMapperTableManager::sprm(Sprm rSprm)
SAL_INFO( writerfilter, Have inserted textDirection
nIntValue );
// We're faking a text direction, so don't allow
multiple lines.
-TablePropertyMapPtr pRowPropMap( new TablePropertyMap
);
-pRowPropMap-Insert(PROP_SIZE_TYPE,
uno::makeAny(text::SizeType::FIX));
-m_bRowSizeTypeInserted = true;
-insertRowProps(pRowPropMap);
+if (!getCellProps() ||
getCellProps()-find(PROP_VERTICAL_MERGE) == getCellProps()-end())
+{
+// Though in case there will be a vertical merge,
don't do this, it hides text that is supposed to be visible.
+TablePropertyMapPtr pRowPropMap( new
TablePropertyMap );
+pRowPropMap-Insert(PROP_SIZE_TYPE,
uno::makeAny(text::SizeType::FIX));
+m_bRowSizeTypeInserted = true;
+insertRowProps(pRowPropMap);
+}
+m_bHasBtlrCell = true;
}
break;
case 4: // lrTbV
@@ -727,6 +733,7 @@ void DomainMapperTableManager::endOfRowAction()
m_nGridBefore = m_nGridAfter = 0;
m_bRowSizeTypeInserted = false;
+m_bHasBtlrCell = false;
m_bTableSizeTypeInserted = false;
#ifdef DEBUG_DOMAINMAPPER
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index f36ac5d2..e9e9779 100644
---
[Libreoffice-commits] core.git: 2 commits - comphelper/source forms/source include/comphelper include/toolkit
comphelper/source/property/propagg.cxx |8
forms/source/component/DatabaseForm.cxx |4 ++--
forms/source/component/DatabaseForm.hxx |4 ++--
include/comphelper/propagg.hxx |4 ++--
include/toolkit/awt/vclxgraphics.hxx| 12 ++--
5 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 22684273d58b1ae9146fcc6c8dfceb90ddf846d9
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Mar 13 14:00:03 2014 +0100
forward*PropertyValue functions need not be SAL_CALL
...and _bSuccess parameter is unused
Change-Id: Iee5e1d5c2d4272f342b2867bfe76f8c87dcd69d4
diff --git a/comphelper/source/property/propagg.cxx
b/comphelper/source/property/propagg.cxx
index 5928578..545da88 100644
--- a/comphelper/source/property/propagg.cxx
+++ b/comphelper/source/property/propagg.cxx
@@ -424,13 +424,13 @@ namespace internal
}
catch( const Exception )
{
-m_rAggregationHelper.forwardedPropertyValue( _nHandle, false );
+m_rAggregationHelper.forwardedPropertyValue( _nHandle );
throw;
}
m_nCurrentlyForwarding = -1;
-m_rAggregationHelper.forwardedPropertyValue( _nHandle, true );
+m_rAggregationHelper.forwardedPropertyValue( _nHandle );
}
}
}
@@ -1013,13 +1013,13 @@ void
OPropertySetAggregationHelper::declareForwardedProperty( sal_Int32 _nHandle
}
-void SAL_CALL OPropertySetAggregationHelper::forwardingPropertyValue(
sal_Int32 )
+void OPropertySetAggregationHelper::forwardingPropertyValue( sal_Int32 )
{
// not interested in
}
-void SAL_CALL OPropertySetAggregationHelper::forwardedPropertyValue(
sal_Int32, bool )
+void OPropertySetAggregationHelper::forwardedPropertyValue( sal_Int32 )
{
// not interested in
}
diff --git a/forms/source/component/DatabaseForm.cxx
b/forms/source/component/DatabaseForm.cxx
index 64f098d..418701c 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -1800,7 +1800,7 @@ void ODatabaseForm::setFastPropertyValue_NoBroadcast(
sal_Int32 nHandle, const A
}
-void SAL_CALL ODatabaseForm::forwardingPropertyValue( sal_Int32 _nHandle )
+void ODatabaseForm::forwardingPropertyValue( sal_Int32 _nHandle )
{
OSL_ENSURE( _nHandle == PROPERTY_ID_ACTIVE_CONNECTION,
ODatabaseForm::forwardingPropertyValue: unexpected property! );
if ( _nHandle == PROPERTY_ID_ACTIVE_CONNECTION )
@@ -1812,7 +1812,7 @@ void SAL_CALL ODatabaseForm::forwardingPropertyValue(
sal_Int32 _nHandle )
}
-void SAL_CALL ODatabaseForm::forwardedPropertyValue( sal_Int32 _nHandle, bool
/*_bSuccess*/ )
+void ODatabaseForm::forwardedPropertyValue( sal_Int32 _nHandle )
{
OSL_ENSURE( _nHandle == PROPERTY_ID_ACTIVE_CONNECTION,
ODatabaseForm::forwardedPropertyValue: unexpected property! );
if ( _nHandle == PROPERTY_ID_ACTIVE_CONNECTION )
diff --git a/forms/source/component/DatabaseForm.hxx
b/forms/source/component/DatabaseForm.hxx
index 1e9386f..c26cebf 100644
--- a/forms/source/component/DatabaseForm.hxx
+++ b/forms/source/component/DatabaseForm.hxx
@@ -443,8 +443,8 @@ public:
protected:
// OPropertySetAggregationHelper overridables
-virtual void SAL_CALL forwardingPropertyValue( sal_Int32 _nHandle );
-virtual void SAL_CALL forwardedPropertyValue( sal_Int32 _nHandle, bool
_bSuccess );
+virtual void forwardingPropertyValue( sal_Int32 _nHandle ) SAL_OVERRIDE;
+virtual void forwardedPropertyValue( sal_Int32 _nHandle ) SAL_OVERRIDE;
// OInterfaceContainer overridables
virtual void implInserted( const ElementDescription* _pElement );
diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx
index 7765b6c..8ec9e4d 100644
--- a/include/comphelper/propagg.hxx
+++ b/include/comphelper/propagg.hxx
@@ -301,7 +301,7 @@ protected:
@see declareForwardedProperty
@see forwardedPropertyValue
*/
-virtual void SAL_CALL forwardingPropertyValue( sal_Int32 _nHandle );
+virtual void forwardingPropertyValue( sal_Int32 _nHandle );
/** called immediately after a property value which is overwritten in this
instance
has been forwarded to the aggregate
@@ -309,7 +309,7 @@ protected:
@see declareForwardedProperty
@see forwardingPropertyValue
*/
-virtual void SAL_CALL forwardedPropertyValue( sal_Int32 _nHandle, bool
_bSuccess );
+virtual void forwardedPropertyValue( sal_Int32 _nHandle );
/// must be called before aggregation, if aggregation is used
void setAggregation(const ::com::sun::star::uno::Reference
::com::sun::star::uno::XInterface ) throw(
::com::sun::star::lang::IllegalArgumentException );
commit a60275ed8ca84a7fade2206bd8eed4e3bd7a8068
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Mar 13 13:57:50 2014 +0100
...and now actually non-virtual
...as promised by
[Libreoffice-commits] core.git: include/vbahelper include/xmloff vbahelper/source xmloff/inc xmloff/source
include/vbahelper/vbahelper.hxx |2 include/vbahelper/vbashapes.hxx |6 - include/vbahelper/vbatextframe.hxx |4 - include/xmloff/SettingsExportHelper.hxx |6 - include/xmloff/attrlist.hxx |2 include/xmloff/txtimp.hxx |4 - include/xmloff/xmlaustp.hxx |2 vbahelper/source/vbahelper/vbahelper.cxx|2 vbahelper/source/vbahelper/vbalineformat.cxx|2 vbahelper/source/vbahelper/vbalineformat.hxx|2 vbahelper/source/vbahelper/vbashapes.cxx|9 +- vbahelper/source/vbahelper/vbatextframe.cxx |4 - xmloff/inc/XMLFootnoteConfigurationImportContext.hxx|4 - xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx |4 - xmloff/inc/XMLLineNumberingImportContext.hxx|6 - xmloff/inc/forms/property_handler.hxx |2 xmloff/inc/txtflde.hxx |4 - xmloff/inc/txtfldi.hxx |4 - xmloff/inc/txtlists.hxx | 36 +- xmloff/source/chart/SchXMLAxisContext.cxx |2 xmloff/source/chart/SchXMLAxisContext.hxx |2 xmloff/source/chart/transporttypes.hxx |4 - xmloff/source/core/DomBuilderContext.cxx|4 - xmloff/source/core/SettingsExportHelper.cxx |6 - xmloff/source/core/attrlist.cxx |2 xmloff/source/forms/handler/vcl_date_handler.cxx|2 xmloff/source/forms/handler/vcl_date_handler.hxx|2 xmloff/source/forms/handler/vcl_time_handler.cxx|2 xmloff/source/forms/handler/vcl_time_handler.hxx|2 xmloff/source/style/xmlaustp.cxx|2 xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx|4 - xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx |4 - xmloff/source/text/XMLLineNumberingImportContext.cxx|2 xmloff/source/text/txtflde.cxx |4 - xmloff/source/text/txtfldi.cxx |2 xmloff/source/text/txtimp.cxx |6 - xmloff/source/text/txtlists.cxx | 36 +- xmloff/source/text/txtparai.cxx | 28 +++ xmloff/source/text/txtparaimphint.hxx |2 39 files changed, 111 insertions(+), 112 deletions(-) New commits: commit fddde2b74a24b1e88e33940ee98f7fa2887dc58c Author: Noel Grandin n...@peralex.com Date: Thu Mar 13 15:04:48 2014 +0200 xmloff,vbahelper: prefer passing OUString and OString by reference Change-Id: I8b7e4284c122549c03edaa7f3963cbfb2024b3fc diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx index 236beae..6b3c2c2 100644 --- a/include/vbahelper/vbahelper.hxx +++ b/include/vbahelper/vbahelper.hxx @@ -230,7 +230,7 @@ class VBAHELPER_DLLPUBLIC ContainerUtilities public: static OUString getUniqueName( const css::uno::Sequence OUString _slist, const OUString _sElementName, const OUString _sSuffixSeparator); -static OUString getUniqueName( const css::uno::Sequence OUString _slist, const OUString _sElementName, const OUString _sSuffixSeparator, sal_Int32 _nStartSuffix ); +static OUString getUniqueName( const css::uno::Sequence OUString _slist, const OUString _sElementName, const OUString _sSuffixSeparator, sal_Int32 _nStartSuffix ); static sal_Int32 FieldInList( const css::uno::Sequence OUString SearchList, const OUString SearchString ); }; diff --git a/include/vbahelper/vbashapes.hxx b/include/vbahelper/vbashapes.hxx index 65905dd..2e8e979d 100644 --- a/include/vbahelper/vbashapes.hxx +++ b/include/vbahelper/vbashapes.hxx @@ -42,18 +42,18 @@ protected: virtual OUString getServiceImplName(); virtual css::uno::SequenceOUString getServiceNames(); virtual css::uno::Reference css::container::XIndexAccess getShapesByArrayIndices( const css::uno::Any Index ) throw (css::uno::RuntimeException); -css::uno::Reference css::drawing::XShape createShape( OUString service ) throw (css::uno::RuntimeException); +css::uno::Reference css::drawing::XShape createShape( const OUString service ) throw (css::uno::RuntimeException); css::uno::Any AddRectangle( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, css::uno::Any aRange ) throw (css::uno::RuntimeException);
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - writerfilter/source
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 15 +++
writerfilter/source/dmapper/DomainMapperTableManager.hxx |7 +++
writerfilter/source/dmapper/TablePropertiesHandler.cxx | 12
3 files changed, 26 insertions(+), 8 deletions(-)
New commits:
commit 9cd8fb08f47bc0900e49a32eaee165b956406096
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Wed Mar 12 11:42:34 2014 +0100
bnc#865381 DOCX import: table cell btLr text direction fixes
(cherry picked from commit 48b5b7641d0df960558082e8948da8598f801264)
(cherry picked from commit 970160f78ef6cc7abacfa252daa8451e1f0117bb)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
writerfilter/source/dmapper/DomainMapperTableManager.cxx
writerfilter/source/dmapper/TablePropertiesHandler.cxx
Change-Id: I527955671e1100f05da717bffe002131baaf0291
Reviewed-on: https://gerrit.libreoffice.org/8554
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 157fbf8..6ca05de 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -55,6 +55,7 @@ DomainMapperTableManager::DomainMapperTableManager(bool
bOOXML) :
m_aTmpTableProperties(),
m_bPushCurrentWidth(false),
m_bRowSizeTypeInserted(false),
+m_bHasBtlrCell(false),
m_bTableSizeTypeInserted(false),
m_nLayoutType(0),
m_nMaxFixedWidth(0),
@@ -336,10 +337,15 @@ bool DomainMapperTableManager::sprm(Sprm rSprm)
SAL_INFO( writerfilter, Have inserted textDirection
nIntValue );
// We're faking a text direction, so don't allow
multiple lines.
-TablePropertyMapPtr pRowPropMap( new TablePropertyMap
);
-pRowPropMap-Insert(PROP_SIZE_TYPE, false,
uno::makeAny(text::SizeType::FIX));
-m_bRowSizeTypeInserted = true;
-insertRowProps(pRowPropMap);
+if (!getCellProps() ||
getCellProps()-find(PropertyDefinition(PROP_VERTICAL_MERGE, false)) ==
getCellProps()-end())
+{
+// Though in case there will be a vertical merge,
don't do this, it hides text that is supposed to be visible.
+TablePropertyMapPtr pRowPropMap( new
TablePropertyMap );
+pRowPropMap-Insert(PROP_SIZE_TYPE, false,
uno::makeAny(text::SizeType::FIX));
+m_bRowSizeTypeInserted = true;
+insertRowProps(pRowPropMap);
+}
+m_bHasBtlrCell = true;
}
break;
case 4: // lrTbV
@@ -720,6 +726,7 @@ void DomainMapperTableManager::endOfRowAction()
m_nGridBefore = m_nGridAfter = 0;
m_bRowSizeTypeInserted = false;
+m_bHasBtlrCell = false;
m_bTableSizeTypeInserted = false;
#ifdef DEBUG_DOMAINMAPPER
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index 6243b61..ea1a953 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -58,6 +58,8 @@ class DomainMapperTableManager : public
DomainMapperTableManager_Base_t
::std::vector IntVectorPtr m_aCellWidths;
/// Remember if a cell already set this, then it should not be set at a
row level.
bool m_bRowSizeTypeInserted;
+/// At least one cell in the current row has the btLr text direction.
+bool m_bHasBtlrCell;
/// Remember if table width was already set, when we lack a w:tblW, it
should be set manually at the end.
bool m_bTableSizeTypeInserted;
/// Table layout algorithm, IOW if we should consider fixed column width
or not.
@@ -133,6 +135,11 @@ public:
return m_bRowSizeTypeInserted;
}
+bool HasBtlrCell() const
+{
+return m_bHasBtlrCell;
+}
+
bool IsTableSizeTypeInserted() const
{
return m_bTableSizeTypeInserted;
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index 4023a21..0b5952c 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -94,12 +94,16 @@ namespace dmapper {
pProperties-resolve(*pMeasureHandler);
TablePropertyMapPtr pPropMap( new TablePropertyMap );
-// In case a cell already wanted fixed size, we should not
overwrite it here.
DomainMapperTableManager* pManager =
[ANNOUNCE] Branch libreoffice-4-2-3 and Tag libreoffice-4.2.3.1 created
Hi all, The tag libreoffice-4.2.3.1 (AKA 4.2.3 RC1) and the corresponding branch libreoffice-4-2-3 have been created. The branch will be used for fine tuning of the 4.2.3 release. (there is one additional RC planned) The following rules apply: + preferably just translation or blocker fixes + only cherry-picking from libreoffice-4-2 branch + 2 additional reviews needed; 2nd reviewer pushes + no regular merges back to anything The 'libreoffice-4-2' branch is still active and will be used for the 4.2.4 bugfix release. Please read more at http://wiki.documentfoundation.org/ReleasePlan/4.2#4.2.3_release http://wiki.documentfoundation.org/Development/Branches http://wiki.documentfoundation.org/Release_Criteria Now, if you want to switch your clone to the branch, please do: ./g pull -r ./g checkout -b libreoffice-4-2-3 origin/libreoffice-4-2-3 To checkout the tag, use ./g fetch --tags ./g checkout -b tag-libreoffice-4.2.3.1 libreoffice-4.2.3.1 Hopefully it will work for you :-) Most probably, you will also want to do (if you haven't done it yet): git config --global push.default tracking When you do git push with this, git will push only the branch you are on; e.g. libreoffice-4-2-3 when you have switched to it. This will save you some git shouting at you. Linux distro packages might find source tarballs at http://dev-builds.libreoffice.org/pre-releases/src/ They will soon be available from the official page together with the builds. Attached is the list of changes against 4.2.2 RC1 (4.2.2 final) Happy hacking, Christian + core + (hopefully) fix crash in SvxRuler::MouseMove() (rhbz#1072607) [Michael Stahl] + add Collabora to wordbook [Andras Timar] + add missing files to gallery bullets makefile [Maxim Monastirsky] + add SVG header when exporting via mtf (fdo#74218) [Tomaž Vajngerl] + adjust external references here too. (fdo#75815) [Kohei Yoshida] + adjust reference update on shift for formula groups. (fdo#75053) [Kohei Yoshida] + always run timeouts as events (fdo#73115) [Jan-Marek Glogowski] + avoid unwanted number detection when placing page field name. (fdo#75962) [Kohei Yoshida] + better loose selection than crashing (fdo#74854) [Bjoern Michaelsen] + branch libreoffice-4-2-3 [Christian Lohmaier] + build fix for OSX. [Kohei Yoshida] + build fix on Windows. [Kohei Yoshida] + bump product version to 4.2.3.1 [Christian Lohmaier] + bump version to 4.2.2.0.0+ [Christian Lohmaier] + bump version to 4.2.3.0.0+ [Christian Lohmaier] + chmod spadmin script executable [Michael Stahl] + compress svg files in ODF (fdo#71622) [Andras Timar] + correctly count the length of trailing empty range. (fdo#75718) [Kohei Yoshida] + correctly draw double lines for both Writer and Calc. (fdo#75260) [Kohei Yoshida] + correctly inspect formula result value for xlsx export. (fdo#74747) [Kohei Yoshida] + cppcheck: duplicateIf [Julien Nabet] + delete ranges that are non-empty before pasting from clipboard. (fdo#74573) [Kohei Yoshida] + dereference after null check (coverity#704633) [Caolán McNamara] + do not add multiple empty strings to the validation list (fdo#61520) [Eike Rathke] + DOC import: don't overwrite WW8Num* character styles (bnc#821208) [Miklos Vajna] + DOC import: ignore symbol charset of the symbol font (cp#139) [Miklos Vajna] + DOCX import: avoid layout problem with automatic spacing (bnc#816593, fdo#74357) [Miklos Vajna] + DOCX import: fix context stack when importing header/footer (rhbz#988516) [Michael Stahl] + DOCX import: fix nested tables anchored inside tables (fdo#74357, bnc#779620) [Miklos Vajna] + don't crash in mixed reference/no reference cases, related (fdo#59853) [Markus Mohrhard] + don't delete the kernel when pre-compiled. [Kohei Yoshida] + don't generate broken XML files, related (i#116460) [Markus Mohrhard] + drawingml import: don't set CharEscapementHeight unconditionally (fdo#70220, fdo#72481) [Björgvin Ragnarsson] + ensure that numeric array storage is aligned to 256-byte boundary. [Kohei Yoshida] + filter: make LibXSLTTransformer init backward compatible [Michael Stahl] + fix fix gcc inline assembler operands usage [Rene Engelhard] + fix a crash from crashtest [Julien Nabet] + fix crash in css rgb color handling. [Jan Holesovsky] + fix crash when importing unsupported macro content, related (fdo#59374) [Markus Mohrhard] + fix deselection problems of template view (rhbz#1072553, fdo#74787) [Zolnai Tamás] + fix docked panels borders (fdo#59329) [Ahmad H. Al Harthi] + fix docked window border lines (fdo#59329) [Ahmad H. Al Harthi] + fix highlight RTL Problem at the StartCenter window. (fdo#73869) [Faisal M. Al-Otaibi] + fix incorrect group calc state check. [Kohei Yoshida] + fix invalid string access, related (i#83611) [Markus Mohrhard] + fix
Re: export validation testing in unit tests
Hey, On Thu, Mar 6, 2014 at 4:51 PM, Markus Mohrhard markus.mohrh...@googlemail.com wrote: Hey, so this is mostly for our tinderbox maintainers and people working on ODF and OOXML export filters. I recently added OOXML export validation to calc's export test and plan to do the same for ODF soon. If you build with --with-export-validation the code for this feature will be enabled. Additionally you need officeotron [1] and a script similar to the one that I attach in your path. The script should just forward the parameter to officeotron and deal with the java parts. It would be nice to enable this feature on some tinderboxes to prevent validation errors in the future. I plan to add the same support for odf validator during the weekend and enable it in writer. Regards, Markus [1] https://code.google.com/p/officeotron/ ODF export validation has been added as well. Mainly for calc right now but is supported in all our export tests. Sadly using it outside of calc still shows that we have a number of validation errors so we need some further work before we can enable it everywhere. We use odf validator [2] right now for the export validation and assume a script similar to the attached one in the path with the name odfvalidator. It would be nice to enable it similar to the OOXML validation on some tinderboxes. Regards, Markus [2] http://incubator.apache.org/odftoolkit/conformance/ODFValidator.html odfvalidator Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
How to generate .POT?
Hello All, I'v followed the process of *Adding new language* ( https://wiki.documentfoundation.org/LibreOffice_Localization_Guide/Adding_a_New_Language_or_Locale) to add one new language and it worked. It:s the time to localise the new language string. Is there any guide online i can follow to regenerate the PO file? I known there is some l10ntools to extract string from src to POT, but i fail to figure out how to get it work. I am now working on the approach of adding new entry manually and want to know the more automatically way to do so. PS. I am on windows platform. Thanks! -- yours sincerely, Jeff ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 40 commits - connectivity/source cui/source dbaccess/source hwpfilter/source lotuswordpro/source sc/source svtools/source svx/source sw/source
connectivity/source/drivers/file/FResultSet.cxx |3 +
cui/source/dialogs/thesdlg.cxx|3 +
cui/source/tabpages/numpages.cxx |4 -
cui/source/tabpages/paragrph.cxx |2
dbaccess/source/ui/querydesign/QueryTableView.cxx |4 -
hwpfilter/source/hwpread.cxx | 51 ++
lotuswordpro/source/filter/lwp9reader.cxx |5 +-
lotuswordpro/source/filter/lwpbulletstylemgr.cxx |9 +++
lotuswordpro/source/filter/lwpdrawobj.cxx |5 +-
sc/source/ui/view/gridwin.cxx | 21 +++--
svtools/source/contnr/contentenumeration.cxx |1
svtools/source/contnr/svlbitm.cxx | 20 +---
svtools/source/control/calendar.cxx | 22 -
svx/source/form/filtnav.cxx |2
sw/source/core/text/porfld.cxx| 31 ++---
sw/source/core/uibase/app/docsh2.cxx |9 ++-
sw/source/core/uibase/uno/unomailmerge.cxx|2
sw/source/core/unocore/unoframe.cxx |3 -
sw/source/core/unocore/unotbl.cxx |7 +--
sw/source/filter/html/htmlgrin.cxx| 19
sw/source/filter/ww8/rtfattributeoutput.cxx |2
sw/source/filter/ww8/wrtww8.cxx |8 ++-
sw/source/filter/ww8/ww8par.hxx |9 +++
sw/source/filter/ww8/ww8par3.cxx | 10 ++--
sw/source/filter/ww8/ww8par6.cxx |2
sw/source/filter/ww8/ww8scan.cxx |6 +-
sw/source/filter/xml/xmltexte.cxx |2
sw/source/ui/chrdlg/numpara.cxx | 11 +++-
28 files changed, 174 insertions(+), 99 deletions(-)
New commits:
commit 72922d8fe70a66ad0ccf2577e354dc4a1cf4fafc
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 13 12:10:29 2014 +
coverity#708786 Unused pointer value
Change-Id: I1ca9a4bfa6b72d836e0143373ff6831dc59a9a7e
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index df84b78..35d76d7 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1481,8 +1481,6 @@ sal_Bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet
rOutSet )
if ( eState != m_pKeepParaBox-GetSavedValue() )
{
-pOld = GetOldItem( rOutSet, SID_ATTR_PARA_KEEP );
-
// if the status has changed, putting is necessary
rOutSet.Put( SvxFmtKeepItem( eState == TRISTATE_TRUE, _nWhich ) );
bModified = sal_True;
commit b532886a20c3e82d0df1d87f6e4d1a35c4d3df3b
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 13 12:06:59 2014 +
coverity#708512 Uninitialized scalar field
Change-Id: I23b0d3ebcbf64ae4705edaa32fb5933161d8e4d7
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 9f7800e..cfe17cb 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -5894,9 +5894,9 @@ rtl_TextEncoding WW8Fib::GetFIBCharset(sal_uInt16 chs)
}
WW8Style::WW8Style(SvStream rStream, WW8Fib rFibPara)
-: rFib(rFibPara), rSt(rStream), cstd(0), cbSTDBaseInFile(0),
-stiMaxWhenSaved(0), istdMaxFixedWhenSaved(0), nVerBuiltInNamesWhenSaved(0),
-ftcAsci(0), ftcFE(0), ftcOther(0), ftcBi(0)
+: rFib(rFibPara), rSt(rStream), cstd(0), cbSTDBaseInFile(0),
fStdStylenamesWritten(0)
+, stiMaxWhenSaved(0), istdMaxFixedWhenSaved(0),
nVerBuiltInNamesWhenSaved(0)
+, ftcAsci(0), ftcFE(0), ftcOther(0), ftcBi(0)
{
if (!checkSeek(rSt, rFib.fcStshf))
return;
commit 5e8f7b8c831a0b403d915cf3f16b860eb5975d64
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 13 12:05:13 2014 +
coverity#708508 Uninitialized scalar field
Change-Id: I91551d8ef7d27c6abc81cd59a6866ee5eb93adcb
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 339c319..e8bb5e4 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -752,7 +752,7 @@ void SwWW8ImplReader::HandleLineNumbering(const wwSection
rSection)
}
wwSection::wwSection(const SwPosition rPos) : maStart(rPos.nNode),
-mpSection(0), mpPage(0), meDir(FRMDIR_HORI_LEFT_TOP),
+mpSection(0), mpPage(0), meDir(FRMDIR_HORI_LEFT_TOP), mLinkId(0),
nPgWidth(SvxPaperInfo::GetPaperSize(PAPER_A4).Width()),
nPgLeft(MM_250), nPgRight(MM_250), mnBorders(0), mbHasFootnote(false)
{
commit 0947dedf8d15fe18824011a7090297072c7d798b
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 13 12:04:03 2014 +
coverity#708507 Uninitialized scalar field
Change-Id: I3e5a4432ae8a4ea455935e4d089f9436ef539851
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 69af98e..83c978a 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1092,10 +1092,13 @@
[Libreoffice-commits] core.git: 2 commits - sc/qa sc/source
sc/qa/unit/ucalc.cxx|6 ++
sc/qa/unit/ucalc.hxx|1 +
sc/qa/unit/ucalc_formula.cxx| 18 +-
sc/source/core/data/dociter.cxx |4 +++-
4 files changed, 27 insertions(+), 2 deletions(-)
New commits:
commit c078d5fef98ba77751b7a9593691d88dfc1c9ba1
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Mar 13 10:22:25 2014 -0400
fdo#75642: Check the high position block correctly.
Change-Id: I25deabf69e78c6e0354e8a528ab88891a30f9aec
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 481796c..3a1e7d9 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -1538,7 +1538,9 @@ public:
// Move to the last position of the previous block.
decBlock(aHiPos);
-if (aHiPos.first == mrCells.begin())
+// Check the row postion of the end of the previous block, and
make sure it's valid.
+SCROW nBlockEndRow = aHiPos.first-position + aHiPos.first-size -
1;
+if (nBlockEndRow nStartRow)
{
mbValid = false;
return;
commit e5802954853a9ec64fb5fec917f8c3b2daba6526
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Mar 13 09:53:23 2014 -0400
fdo#75642: Add test case for this.
Change-Id: I220cc3aeac79325e7664461d3bd5219e9e1f04f7
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 3c809a8..ed5e894 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -5575,6 +5575,12 @@ void Test::clearRange(ScDocument* pDoc, const ScRange
rRange)
rRange.aEnd.Col(), rRange.aEnd.Row(), aMarkData, IDF_CONTENTS);
}
+void Test::clearSheet(ScDocument* pDoc, SCTAB nTab)
+{
+ScRange aRange(0,0,nTab,MAXCOL,MAXROW,nTab);
+clearRange(pDoc, aRange);
+}
+
void Test::copyToClip(ScDocument* pSrcDoc, const ScRange rRange, ScDocument*
pClipDoc)
{
ScClipParam aClipParam(rRange, false);
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index d17c8f5..68f5bc4 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -42,6 +42,7 @@ public:
static bool insertRangeNames(ScDocument* pDoc, const RangeNameDef* p,
const RangeNameDef* pEnd);
static void printRange(ScDocument* pDoc, const ScRange rRange, const
char* pCaption);
static void clearRange(ScDocument* pDoc, const ScRange rRange);
+static void clearSheet(ScDocument* pDoc, SCTAB nTab);
static void copyToClip(ScDocument* pSrcDoc, const ScRange rRange,
ScDocument* pClipDoc);
static void pasteFromClip(ScDocument* pDestDoc, const ScRange rDestRange,
ScDocument* pClipDoc);
static ScUndoPaste* createUndoPaste(ScDocShell rDocSh, const ScRange
rRange, ScDocument* pUndoDoc);
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 3fcc896..8bf8435 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -2458,7 +2458,7 @@ void Test::testFuncVLOOKUP()
}
// Clear the sheet and start over.
-clearRange(m_pDoc, ScRange(0,0,0,MAXCOL,MAXROW,0));
+clearSheet(m_pDoc, 0);
// Lookup on sorted data intersparsed with empty cells.
@@ -2492,6 +2492,22 @@ void Test::testFuncVLOOKUP()
CPPUNIT_ASSERT_EQUAL(OUString(Four),
m_pDoc-GetString(ScAddress(4,3,0)));
CPPUNIT_ASSERT_EQUAL(OUString(Four),
m_pDoc-GetString(ScAddress(4,4,0)));
+// Start over again.
+clearSheet(m_pDoc, 0);
+
+// Set A,B,,G to A1:A7.
+m_pDoc-SetString(ScAddress(0,0,0), A);
+m_pDoc-SetString(ScAddress(0,1,0), B);
+m_pDoc-SetString(ScAddress(0,2,0), C);
+m_pDoc-SetString(ScAddress(0,3,0), D);
+m_pDoc-SetString(ScAddress(0,4,0), E);
+m_pDoc-SetString(ScAddress(0,5,0), F);
+m_pDoc-SetString(ScAddress(0,6,0), G);
+
+// Set the formula in C1.
+m_pDoc-SetString(ScAddress(2,0,0), =VLOOKUP(\C\;A1:A16;1));
+CPPUNIT_ASSERT_EQUAL(OUString(C), m_pDoc-GetString(ScAddress(2,0,0)));
+
m_pDoc-DeleteTab(0);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 66822] refactor HTML export of image bullet list
https://bugs.freedesktop.org/show_bug.cgi?id=66822 --- Comment #3 from darshana darshanapadma...@gmail.com --- Is this issue fixed? If not can I submit a patch for the same? -- 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: svtools/source
svtools/source/contnr/svlbitm.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 20e43b9f88d2ce6fd83b2958d17699af243adc57
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 13 14:31:22 2014 +
-Werror=reorder
Change-Id: I763b2c21f0ba62cf9343582a5a41e0dc0b744b50
diff --git a/svtools/source/contnr/svlbitm.cxx
b/svtools/source/contnr/svlbitm.cxx
index 2d193a4..c0eb5a8 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -305,8 +305,8 @@ SvLBoxButton::SvLBoxButton( SvTreeListEntry* pEntry,
SvLBoxButtonKind eTheKind,
, isVis(true)
, pData(pBData)
, eKind(eTheKind)
-, nBaseOffs(0)
, nItemFlags(0)
+, nBaseOffs(0)
{
SetStateUnchecked();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Fwd: Test suite for Gnumeric
On Thu, 2014-03-13 at 15:26 +1100, Chris Sherlock wrote: The original blog post was here: https://blogs.gnome.org/mortenw/2014/03/11/writing-tests-is-humbling/ FYI, you could swap the word Gnumeric and LibreOffice Calc in Morten's blog and every single word would still make sense. In this blog he says I do hope that LO/OO already have an evil test suite, but I am not optimistic. And I'm afraid his pessimism is correct, though I'm personally working hard to change this situation, and Markus as well. It's a very slow process, and we still have a long road ahead, however. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 66822] refactor HTML export of image bullet list
https://bugs.freedesktop.org/show_bug.cgi?id=66822 --- Comment #4 from Tejas Nikumbh tejasniku...@gmail.com --- I've submitted a patch. Dunno if its accepted or not. On Thu, Mar 13, 2014 at 10:29 AM, bugzilla-dae...@freedesktop.org wrote: *Comment # 3 https://bugs.freedesktop.org/show_bug.cgi?id=66822#c3 on bug 66822 https://bugs.freedesktop.org/show_bug.cgi?id=66822 from darshana darshanapadma...@gmail.com * Is this issue fixed? If not can I submit a patch for the same? -- You are receiving this mail because: - You are the assignee for the bug. -- 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: lotuswordpro/source
lotuswordpro/source/filter/lwpdrawobj.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 05331426023de4714ecabbf8a891061b1880a3c4
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 13 14:34:08 2014 +
-Werror=conversion-null
Change-Id: I61c24a2e207e1b930938780178a61f56e7bda479
diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx
b/lotuswordpro/source/filter/lwpdrawobj.cxx
index ef26f6d..26ecedc 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -566,7 +566,7 @@ XFFrame* LwpDrawPolyLine::CreateStandardDrawObj(const
OUString rStyleName)
*/
LwpDrawPolygon::LwpDrawPolygon(SvStream * pStream, DrawingOffsetAndScale*
pTransData)
: LwpDrawObj(pStream, pTransData)
-, m_nNumPoints(NULL)
+, m_nNumPoints(0)
, m_pVector(NULL)
{
}
___
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 73113, which changed state. Bug 73113 Summary: LOOKUP function results in #N/A https://bugs.freedesktop.org/show_bug.cgi?id=73113 What|Removed |Added Status|REOPENED|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
[Bug 66822] refactor HTML export of image bullet list
https://bugs.freedesktop.org/show_bug.cgi?id=66822 --- Comment #5 from Tor Lillqvist t...@iki.fi --- Tejas: That is not a patch. And it certainly is not difficult enough to make you eligible for GSoC. And surely you should be able to check in git whether the change you intended to submit has gone in or not? darshana: Surely if you intend to be able to submit a patch you should be able to first check if it is already fixed or not, or if Tejas's hack works or not. -- 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: sw/qa sw/source
sw/qa/extras/uiwriter/data/fdo75898.odt |binary
sw/qa/extras/uiwriter/uiwriter.cxx | 17 +
sw/source/core/frmedt/fetab.cxx |8
sw/source/core/uibase/shells/tabsh.cxx |3 ++-
4 files changed, 27 insertions(+), 1 deletion(-)
New commits:
commit f1f9b5b1b73218274ee69cf4e518c2ba926458af
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Mar 13 15:03:33 2014 +0100
fdo#75898 SwFEShell::InsertRow: fix this in case bSelectAll == true
Change-Id: Iaf59db6a55c3f81d11d0196d5d3e52056e31c4b1
diff --git a/sw/qa/extras/uiwriter/data/fdo75898.odt
b/sw/qa/extras/uiwriter/data/fdo75898.odt
new file mode 100644
index 000..81a5062
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/fdo75898.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 8e59941..5aef75b 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -29,6 +29,7 @@ public:
void testImportRTF();
void testExportRTF();
void testFdo75110();
+void testFdo75898();
CPPUNIT_TEST_SUITE(SwUiWriterTest);
CPPUNIT_TEST(testReplaceForward);
@@ -38,6 +39,7 @@ public:
CPPUNIT_TEST(testImportRTF);
CPPUNIT_TEST(testExportRTF);
CPPUNIT_TEST(testFdo75110);
+CPPUNIT_TEST(testFdo75898);
CPPUNIT_TEST_SUITE_END();
private:
@@ -102,6 +104,21 @@ void SwUiWriterTest::testFdo75110()
rUndoManager.Undo();
}
+void SwUiWriterTest::testFdo75898()
+{
+SwDoc* pDoc = createDoc(fdo75898.odt);
+SwWrtShell* pWrtShell = pDoc-GetDocShell()-GetWrtShell();
+pWrtShell-SelAll();
+pWrtShell-InsertRow(1, true);
+pWrtShell-InsertRow(1, true);
+
+// Now check if the table has 3 lines.
+SwShellCrsr* pShellCrsr = pWrtShell-getShellCrsr(false);
+SwTableNode* pTableNode =
pShellCrsr-Start()-nNode.GetNode().FindTableNode();
+// This was 1, when doing the same using the UI, Writer even crashed.
+CPPUNIT_ASSERT_EQUAL(static_castsize_t(3),
pTableNode-GetTable().GetTabLines().size());
+}
+
void SwUiWriterTest::testReplaceBackward()
{
SwDoc* pDoc = createDoc();
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 56a8d75..593d1f2 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -204,6 +204,14 @@ bool SwFEShell::InsertRow( sal_uInt16 nCnt, bool bBehind )
// search boxes via the layout
SwSelBoxes aBoxes;
+bool bSelectAll = StartsWithTable()
ExtendedSelectedAll(/*bFootnotes=*/false);
+if (bSelectAll)
+{
+SwPaM* pPaM = getShellCrsr(false);
+SwNode* pNode =
pPaM-Start()-nNode.GetNode().FindTableNode()-EndOfSectionNode();
+pPaM-End()-nNode = pNode-GetIndex() - 2;
+
pPaM-End()-nContent.Assign(pPaM-End()-nNode.GetNode().GetCntntNode(), 0);
+}
GetTblSel( *this, aBoxes, nsSwTblSearchType::TBLSEARCH_ROW );
TblWait( nCnt, pFrm, *GetDoc()-GetDocShell(), aBoxes.size() );
diff --git a/sw/source/core/uibase/shells/tabsh.cxx
b/sw/source/core/uibase/shells/tabsh.cxx
index 5b60daf..7f47c80 100644
--- a/sw/source/core/uibase/shells/tabsh.cxx
+++ b/sw/source/core/uibase/shells/tabsh.cxx
@@ -167,7 +167,8 @@ static SwTableRep* lcl_TableParamToItemSet( SfxItemSet
rSet, SwWrtShell rSh )
if(rSh.GetBoxDirection( aBoxDirection ))
rSet.Put(aBoxDirection, FN_TABLE_BOX_TEXTORIENTATION);
-sal_Bool bTableSel = rSh.IsTableMode();
+bool bSelectAll = rSh.StartsWithTable()
rSh.ExtendedSelectedAll(/*bFootnotes=*/false);
+sal_Bool bTableSel = rSh.IsTableMode() || bSelectAll;
if(!bTableSel)
{
rSh.StartAllAction();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8773f937559464cbcd7d598cb2a4ffda66019158 Author: Caolán McNamara caol...@redhat.com Date: Thu Mar 13 15:11:37 2014 + Updated core Project: help 02fac10d462f6c3a7a17535e8902d5cccb065d98 diff --git a/helpcontent2 b/helpcontent2 index e1e7161..02fac10 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e1e716143a6d6a38fdfa88f9cb72cb258f2be30e +Subproject commit 02fac10d462f6c3a7a17535e8902d5cccb065d98 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |9 - source/text/shared/explorer/database/02010101.xhp | 21 ++--- source/text/shared/explorer/database/05020100.xhp |6 ++ 3 files changed, 12 insertions(+), 24 deletions(-) New commits: commit 02fac10d462f6c3a7a17535e8902d5cccb065d98 Author: Caolán McNamara caol...@redhat.com Date: Thu Mar 13 15:11:37 2014 + update help ids for join query .ui conversion Change-Id: I2185a45d4f799bf631f78d0d35da5e9e23672cb2 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 30ab995..b8e0dc9 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -1430,13 +1430,6 @@ HID_DLG_NAME,33818, HID_DLG_NEWERVERSIONWARNING,35848, HID_DLG_PASSWD_SECTION,53440, HID_DLG_PASSWORD,38964, -HID_DLG_QRY_HELPTEXT,38860, -HID_DLG_QRY_JOIN,38855, -HID_DLG_QRY_JOINTYPE,38856, -HID_DLG_QRY_JOIN_CONTROL,39150, -HID_DLG_QRY_LEFT_TABLE,38981, -HID_DLG_QRY_RIGHT_TABLE,38982, -HID_DLG_QRY_WINDOW_CONTROL,38980, HID_DLG_REL_CASC_DEL,38983, HID_DLG_REL_CASC_DEL_DEFAULT,38986, HID_DLG_REL_CASC_DEL_NULL,38985, @@ -2855,7 +2848,6 @@ HID_REDLINE_AUTOFMT_ACCEPT,53072, HID_REDLINE_CTRL,53226, HID_RELATIONDIALOG_LEFTFIELDCELL,38922, HID_RELATIONDIALOG_RIGHTFIELDCELL,38923, -HID_RELDLG_KEYFIELDS,38924, HID_REPORTSECTION,64457, HID_REPORT_NAVIGATOR_TREE,64521, HID_RETURN_TO_MAILMERGE,54989, @@ -5412,7 +5404,6 @@ chart2_TabPage_TP_LOCATION,551829504, chart2_TabPage_TP_WIZARD_TITLEANDOBJECTS,551813120, chart2_TabPage_TP_YERRORBAR,551927808, dbaccess_CheckBox_DLG_INDEXDESIGN_CB_UNIQUE,1388626945, -dbaccess_CheckBox_DLG_QRY_JOIN_WND_JOIN_CONTROL_CB_NATURAL,1073759233, dbaccess_CheckBox_PAGE_ADABAS_CB_SHUTDB,851526657, dbaccess_CheckBox_PAGE_CONNECTION_CB_PASSWORD_REQUIRED,851543041, dbaccess_CheckBox_PAGE_MYSQL_NATIVE_CB_PASSWORD_REQUIRED,851837953, diff --git a/source/text/shared/explorer/database/02010101.xhp b/source/text/shared/explorer/database/02010101.xhp index 27686fb..b3c881e 100644 --- a/source/text/shared/explorer/database/02010101.xhp +++ b/source/text/shared/explorer/database/02010101.xhp @@ -40,30 +40,29 @@ section id=howtoget embed href=text/shared/00/0450.xhp#Joins/ /section -bookmark xml-lang=en-US branch=hid/DBACCESS_HID_DLG_QRY_LEFT_TABLE id=bm_id3150749 localize=false/ -bookmark xml-lang=en-US branch=hid/DBACCESS_HID_DLG_QRY_RIGHT_TABLE id=bm_id3150752 localize=false/ +bookmark xml-lang=en-US branch=hid/dbaccess/ui/joindialog/table1 id=bm_id3150749 localize=false/ +bookmark xml-lang=en-US branch=hid/dbaccess/ui/joindialog/table2 id=bm_id3150752 localize=false/ paragraph xml-lang=en-US id=hd_id3155066 role=heading level=2 l10n=U oldref=17Tables involved/paragraph - paragraph xml-lang=en-US id=par_id3153924 role=paragraph l10n=U oldref=16ahelp hid=HID_DLG_QRY_RIGHT_TABLESpecifies two different tables that you want to join./ahelp/paragraph + paragraph xml-lang=en-US id=par_id3153924 role=paragraph l10n=U oldref=16ahelp hid=dbaccess/ui/joindialog/table2Specifies two different tables that you want to join./ahelp/paragraph paragraph xml-lang=en-US id=hd_id3155766 role=heading level=2 l10n=U oldref=15Fields involved/paragraph paragraph xml-lang=en-US id=par_id3148994 role=paragraph l10n=CHG oldref=14ahelp hid=.Specifies two data fields that will be joined by a relation./ahelp/paragraph paragraph xml-lang=en-US id=hd_id3159267 role=heading level=2 l10n=U oldref=3Options/paragraph -bookmark xml-lang=en-US branch=hid/DBACCESS_HID_DLG_QRY_JOINTYPE id=bm_id3147321 localize=false/ +bookmark xml-lang=en-US branch=hid/dbaccess/ui/joindialog/type id=bm_id3147321 localize=false/ paragraph xml-lang=en-US id=hd_id3147340 role=heading level=3 l10n=U oldref=13Type/paragraph - paragraph xml-lang=en-US id=par_id3152482 role=paragraph l10n=CHG oldref=4ahelp hid=HID_DLG_QRY_JOINTYPESpecifies the link type of the selected link./ahelp Some databases support only a subset of the possible types./paragraph + paragraph xml-lang=en-US id=par_id3152482 role=paragraph l10n=CHG oldref=4ahelp hid=dbaccess/ui/joindialog/typeSpecifies the link type of the selected link./ahelp Some databases support only a subset of the possible types./paragraph paragraph xml-lang=en-US id=hd_id3155334 role=heading level=3 l10n=U oldref=5Inner Join/paragraph - paragraph xml-lang=en-US id=par_id3155936 role=paragraph l10n=U oldref=6ahelp hid=HID_DLG_QRY_JOINTYPEWith the internal join, the results table contains only the records for which the content of the linked fields is the same./ahelp In $[officename] SQL this type of link is created by a corresponding WHERE clause./paragraph + paragraph xml-lang=en-US id=par_id3155936 role=paragraph l10n=U oldref=6ahelp hid=dbaccess/ui/joindialog/typeWith the internal join, the results table contains only the records for which the content of the
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/chart2/XChartType.idl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 66db6dd2bebefced1bc7e097710c2bf79f720d82 Author: Andras Timar andras.ti...@collabora.com Date: Thu Mar 13 16:36:22 2014 +0100 typo: mappong - mapping Change-Id: I9c1644afa687ecde47271bbe9bfc8a51fe541cb5 diff --git a/offapi/com/sun/star/chart2/XChartType.idl b/offapi/com/sun/star/chart2/XChartType.idl index 5dfe21f..f1c9a3d 100644 --- a/offapi/com/sun/star/chart2/XChartType.idl +++ b/offapi/com/sun/star/chart2/XChartType.idl @@ -74,7 +74,7 @@ interface XChartType : com::sun::star::uno::XInterface /** Returns a sequence with supported property mapping roles. -pAn example for a property mappong role is FillColor./p +pAn example for a property mapping role is FillColor./p */ sequence string getSupportedPropertyRoles(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/core/data/dociter.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 6293d898c16bafeb703129ed0d33857934ab1dfb
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Mar 13 10:22:25 2014 -0400
fdo#75642: Check the high position block correctly.
Change-Id: I25deabf69e78c6e0354e8a528ab88891a30f9aec
(cherry picked from commit c078d5fef98ba77751b7a9593691d88dfc1c9ba1)
Reviewed-on: https://gerrit.libreoffice.org/8573
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 5758c52..1461472 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -1554,7 +1554,9 @@ public:
// Move to the last position of the previous block.
decBlock(aHiPos);
-if (aHiPos.first == mrCells.begin())
+// Check the row postion of the end of the previous block, and
make sure it's valid.
+SCROW nBlockEndRow = aHiPos.first-position + aHiPos.first-size -
1;
+if (nBlockEndRow nStartRow)
{
mbValid = false;
return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source
sc/inc/column.hxx|3 +-
sc/inc/document.hxx |8 +++--
sc/inc/refupdatecontext.hxx | 14 +
sc/inc/table.hxx |3 +-
sc/inc/tokenarray.hxx| 12
sc/source/core/data/column.cxx | 18 ++--
sc/source/core/data/documen2.cxx |7 +++-
sc/source/core/data/documen3.cxx |8 ++---
sc/source/core/data/document.cxx | 34 --
sc/source/core/data/refupdatecontext.cxx |3 ++
sc/source/core/data/table2.cxx |9 ++
sc/source/core/tool/token.cxx| 46 +++
sc/source/ui/docshell/dbdocimp.cxx |4 ++
sc/source/ui/docshell/docsh.cxx | 14 ++---
sc/source/ui/docshell/docsh5.cxx |5 ++-
sc/source/ui/undo/refundo.cxx| 10 --
sc/source/ui/undo/undotab.cxx|8 ++---
sc/source/ui/view/spelldialog.cxx|8 +++--
sc/source/ui/view/viewfun4.cxx |6 +++-
19 files changed, 174 insertions(+), 46 deletions(-)
New commits:
commit 3da21555accb654a3185bdac5532304ac6ce5b34
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Mar 12 21:53:34 2014 -0400
fdo#75977: Clear sheet deleted flags for affected references when undoing.
This will allow formula cells to restore deleted references when they get
recalculated. With this change, SetDirty() that previosly took no argument
has been renamed to SetAllFormulasDirty(), and it now takes one argument
that
stores context information.
(cherry picked from commit 18909ddb30db7ca9416ee2bfb0503753e877f002)
Conflicts:
sc/inc/document.hxx
sc/source/ui/docshell/docsh5.cxx
sc/source/ui/view/spelldialog.cxx
Change-Id: If0de5dc1737a2722b6d61a87644b10a4f921edc5
Reviewed-on: https://gerrit.libreoffice.org/8564
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 07da1ca..756b4c4 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -57,6 +57,7 @@ class EditTextIterator;
struct NoteEntry;
class DocumentStreamAccess;
class CompileFormulaContext;
+struct SetFormulaDirtyContext;
}
@@ -321,7 +322,7 @@ public:
bool IsFormulaDirty( SCROW nRow ) const;
-voidSetDirty();
+void SetAllFormulasDirty( const sc::SetFormulaDirtyContext rCxt );
voidSetDirty( SCROW nRow1, SCROW nRow2 );
voidSetDirtyVar();
voidSetDirtyAfterLoad();
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index ed2626a..9603ae5 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -73,6 +73,7 @@ struct NoteEntry;
struct FormulaGroupContext;
class DocumentStreamAccess;
class DocumentLinkManager;
+struct SetFormulaDirtyContext;
}
@@ -614,8 +615,9 @@ public:
void SetTabNameOnLoad(SCTAB nTab, const OUString rName);
void InvalidateStreamOnSave();
-SC_DLLPUBLIC bool InsertTab( SCTAB nPos, const OUString rName,
-bool bExternalDocument = false );
+SC_DLLPUBLIC bool InsertTab(
+SCTAB nPos, const OUString rName, bool bExternalDocument = false,
bool bUndoDeleteTab = false );
+
SC_DLLPUBLIC bool InsertTabs( SCTAB nPos, const
std::vectorOUString rNames,
bool bExternalDocument = false, bool
bNamesValid = false );
SC_DLLPUBLIC bool DeleteTabs( SCTAB nTab, SCTAB nSheets );
@@ -975,7 +977,7 @@ public:
voidResetChanged( const ScRange rRange );
-voidSetDirty();
+void SetAllFormulasDirty( const sc::SetFormulaDirtyContext rCxt );
voidSetDirty( const ScRange );
voidSetTableOpDirty( const ScRange ); // for Interpreter
TableOp
voidInterpretDirtyCells( const ScRangeList rRanges );
diff --git a/sc/inc/refupdatecontext.hxx b/sc/inc/refupdatecontext.hxx
index c8e52d8..bd87792 100644
--- a/sc/inc/refupdatecontext.hxx
+++ b/sc/inc/refupdatecontext.hxx
@@ -130,6 +130,20 @@ struct RefUpdateMoveTabContext
SCTAB getNewTab(SCTAB nOldTab) const;
};
+struct SetFormulaDirtyContext
+{
+SCTAB mnTabDeletedStart;
+SCTAB mnTabDeletedEnd;
+
+/**
+ * When true, go through all reference tokens and clears sheet deleted
+ * flag if its corresponding index falls within specified sheet range.
+ */
+bool mbClearTabDeletedFlag;
+
+SetFormulaDirtyContext();
+};
+
}
#endif
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 4aab32e..4f30cae 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -69,6 +69,7 @@ struct RefUpdateMoveTabContext;
struct NoteEntry;
class DocumentStreamAccess;
class CompileFormulaContext;
+struct SetFormulaDirtyContext;
}
@@ -509,7 +510,7
[Libreoffice-commits] core.git: starmath/source sw/qa
starmath/source/ooxmlexport.cxx | 21
sw/qa/extras/inc/swmodeltestbase.hxx|1
sw/qa/extras/ooxmlexport/data/2120112713.docx |binary
sw/qa/extras/ooxmlexport/data/2120112713_OpenBrace.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 18 +
5 files changed, 36 insertions(+), 4 deletions(-)
New commits:
commit ade1641ab632565820ede720b6151435aca4dd78
Author: Dinesh Patil dinesh.pa...@synerzip.com
Date: Wed Mar 12 20:04:16 2014 +0530
fdo#76078: LO Crashes while saving the docx file containing only opening
brace
- System handles an equation having opening brace and closing brace.
- Whereas it fails to handle equations having only opening brace and no
closing
brace, due to which LO crashes with assertion while exporting.
- Fixed this issue and added unit test case for the same.
- Also fixed the same for closing brace alone.
Change-Id: I34a8a635b42bfdfac265fb70b977c0001cd2b4ff
Reviewed-on: https://gerrit.libreoffice.org/8561
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
diff --git a/starmath/source/ooxmlexport.cxx b/starmath/source/ooxmlexport.cxx
index 8d1c808..0a98d98 100644
--- a/starmath/source/ooxmlexport.cxx
+++ b/starmath/source/ooxmlexport.cxx
@@ -453,8 +453,15 @@ void SmOoxmlExport::HandleBrace( const SmBraceNode* pNode,
int nLevel )
{
m_pSerializer-startElementNS( XML_m, XML_d, FSEND );
m_pSerializer-startElementNS( XML_m, XML_dPr, FSEND );
-m_pSerializer-singleElementNS( XML_m, XML_begChr,
-FSNS( XML_m, XML_val ), mathSymbolToString(
pNode-OpeningBrace()).getStr(), FSEND );
+
+//check if the node has an opening brace
+if( TNONE == pNode-GetSubNode(0)-GetToken().eType )
+m_pSerializer-singleElementNS( XML_m, XML_begChr,
+FSNS( XML_m, XML_val ), , FSEND );
+else
+m_pSerializer-singleElementNS( XML_m, XML_begChr,
+FSNS( XML_m, XML_val ), mathSymbolToString(
pNode-OpeningBrace()).getStr(), FSEND );
+
std::vector const SmNode* subnodes;
if( pNode-Body()-GetType() == NBRACEBODY )
{
@@ -479,8 +486,14 @@ void SmOoxmlExport::HandleBrace( const SmBraceNode* pNode,
int nLevel )
}
else
subnodes.push_back( pNode-Body());
-m_pSerializer-singleElementNS( XML_m, XML_endChr,
-FSNS( XML_m, XML_val ), mathSymbolToString(
pNode-ClosingBrace()).getStr(), FSEND );
+
+if( TNONE == pNode-GetSubNode(2)-GetToken().eType )
+m_pSerializer-singleElementNS( XML_m, XML_endChr,
+FSNS( XML_m, XML_val ), , FSEND );
+else
+m_pSerializer-singleElementNS( XML_m, XML_endChr,
+FSNS( XML_m, XML_val ), mathSymbolToString(
pNode-ClosingBrace()).getStr(), FSEND );
+
m_pSerializer-endElementNS( XML_m, XML_dPr );
for( unsigned int i = 0; i subnodes.size(); ++i )
{
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index a3c3dec..d2f3b29 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -551,6 +551,7 @@ protected:
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(pic),
BAD_CAST(http://schemas.openxmlformats.org/drawingml/2006/picture;));
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(rels),
BAD_CAST(http://schemas.openxmlformats.org/package/2006/relationships;));
xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(w14),
BAD_CAST(http://schemas.microsoft.com/office/word/2010/wordml;));
+xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(m),
BAD_CAST(http://schemas.openxmlformats.org/officeDocument/2006/math;));
xmlXPathObjectPtr pXmlXpathObj =
xmlXPathEvalExpression(BAD_CAST(rXPath.getStr()), pXmlXpathCtx);
return pXmlXpathObj-nodesetval;
}
diff --git a/sw/qa/extras/ooxmlexport/data/2120112713.docx
b/sw/qa/extras/ooxmlexport/data/2120112713.docx
new file mode 100644
index 000..5de6378
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/2120112713.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/data/2120112713_OpenBrace.docx
b/sw/qa/extras/ooxmlexport/data/2120112713_OpenBrace.docx
new file mode 100644
index 000..10dfd31
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/2120112713_OpenBrace.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 045d41e..a0ea664 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2710,6 +2710,15 @@ DECLARE_OOXMLEXPORT_TEST(testDateControl,
date-control.docx)
CPPUNIT_ASSERT_EQUAL(sal_Int32(2014), sal_Int32(aDate.Year));
}
+DECLARE_OOXMLEXPORT_TEST(test_OpeningBrace, 2120112713_OpenBrace.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+// Checking for OpeningBrace tag
+assertXPath(pXmlDoc,
minutes of ESC call ...
* Present + Norbert, Bjoern, David, Kohei, Markus, Miklos, Andras, Stephan, Christian, Eike, Michael M, Astron, Caolan, Michael S., Jacobo, Adam * Completed Action Items + run certification script (Kendy) + review HiDPI branch for 4.2 (Kendy, Michael, Caolan) [ mostly pushed to 4.2 should be in 4.2.3 rc1 ] + poke at writer file movement bug (fdo#70422) / gerrit (Miklos) + Announce Gran Canaria (Bjorn) [ no need to book a hotel - making a group booking, poke Bjoern ] [ please poke the wiki if you're coming to avoid ending up on the street: https://wiki.documentfoundation.org/Hackfest/GranCanaria2014 ] + talk with Thorsten wrt. ODF TC representation (Michael S / Andras) [ Andras signing up / paying to join TC for Collabora ] + review / fixup OOXML Strict handling for writer (Miklos) [ 4.2 back-porting done too ] * Pending Action Items: + crashtest box - more research (Moggi/Cloph) [ still trying to dig out which document is causing the grief limited to the writer documents ] + will try filing a lot of small string changes as easy hacks (Astron) + Book Gran Canaria flights (other attendees) * Release Engineering update (Christian) + 4.2.2 announced + distributed at CeBIT already. + 4.2.3 rc1 status + will be ready for public announce tomorrow. + need to encourage marketing not to go over-the-top enterprise-wise for 4.2.3. + Android / iOS remote + problem with laser point patch - needs debugging. + not released yet. * CeBIT update (Michael/Cloph) + lots of interested users at the booth, big noisy trade-show. + a number of translators student contributors too + a number of training people as well. * UX update (Astron) + decision made on the conference logo * GSoC update + applications from March 10th - 21st. + next week! + please consider what you are able to mentor: + https://wiki.documentfoundation.org/Development/GSoC/Ideas + mentors registered on melange * Select All issues their handling (Bjoern / Miklos) + problem with selecting all in the document; but a few basic operations could crash writer: cut, undo, mouse wheel zoom. + tried to work around the latter, and found several others. + most of the issues already fixed by Miklos by now. + concern wrt. other cases: hard to know what is there ? + pointed out 3x bugs (Miklos) + one a non-regression, other 2x already fixed. + happy to handle them as/when. + be a shame to go back to avoiding fixing hard bugs. + we don't allow generic selections, only when the very first item in the document is a table. + if more such problems found, please do let Miklos know. + leave it as-is for now (Bjoern/Miklos) + if reverted, could cause complaints announced as a new feature. + should check / update the assertion too. * Crashtest update (Markus) + kernel bug on the crash-testing VM + still pending on this :-( + partial new data: avoiding writer issues causing crash: http://dev-builds.libreoffice.org/crashtest/f51f03a46102333bac6a7fe06bc8538492f413a5/ + calc is really good; down to ~5 import crashers and ~50 export crashers + hard to see past the duplicates - need to re-run it (Miklos) * Certification update (Stephan/Bjoern) + ran the script; identified a new set of candidates + certification - does it depend on fixing issues in 2x components ? (Kohei) + no, but a competence and community connection test. + seven candidates agreed unanimously. AI: + mail candidates to ask their permission (Stephan) * Gran Canaria hack-fest (Bjoern) + April 24-25, 2014 (Thu-Fri) + add good topic ideas to the wiki page + cf. action items above. * OOXML export validation and ODF validation (Markus) + have support for export validation in our testing framework + tinderebox maintainer need to enable validation, at least on few boxes + Markus will write a mail - wrt. what is necessary to have in your path. + enabled in calc for ODF OOXML now + enabled in chart2 for OOXML + also available in writer - but issues need tackling in the export tests + a chunk is around ordering of elements (Miklos) + these seem to cause no practical problems really. + in Excel element order is important (Markus) + elements are removed if in the wrong order. + hopefully this keeps validation errors under control. + Cloph enabled this on 2x TDF / Linux test-boxes, so they will fail now. + shell wrappers for java validators - can we have them inside the tinderbox script ? (Thorsten) AI: + check them in to save time (Markus) * UX dialog / wiki page to find missing dialogs (Caolan) + very pleased with
[Libreoffice-commits] core.git: 3 commits - chart2/source
chart2/source/view/inc/DummyXShape.hxx |2 ++
chart2/source/view/main/DummyXShape.cxx | 27 ---
2 files changed, 26 insertions(+), 3 deletions(-)
New commits:
commit 60747a3ce2a80ed950f269e1a267754254b6c693
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Thu Mar 13 16:59:35 2014 +0100
fix transparence of bubble color
Change-Id: Ib2edf99ff4f48c12a946878740ad5d64d7deffb2
diff --git a/chart2/source/view/main/DummyXShape.cxx
b/chart2/source/view/main/DummyXShape.cxx
index 39a3553..35716c3 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -547,7 +547,7 @@ void DummyCircle::render()
if(itr != maProperties.end())
{
sal_Int32 nTrans = itr-second.getsal_Int32();
-nAlpha = static_castsal_uInt8(nTrans 0xFF);
+nAlpha = 255 - static_castsal_uInt8(nTrans 0xFF);
}
itr = maProperties.find(FillColor);
commit c219d1b932ae223d7241cac9ad8747f3ec70252a
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Thu Mar 13 15:58:19 2014 +0100
don't reposition several times in complex hierarchies
We moved the object several times if the object was behind several group
shapes.
Change-Id: I984d6e9208f8924a9968820cf6f95fbb663062b6
diff --git a/chart2/source/view/inc/DummyXShape.hxx
b/chart2/source/view/inc/DummyXShape.hxx
index 6021139..cf19ff5 100644
--- a/chart2/source/view/inc/DummyXShape.hxx
+++ b/chart2/source/view/inc/DummyXShape.hxx
@@ -199,6 +199,8 @@ public:
*/
virtual void render();
+const com::sun::star::awt::Point getPos(); // internal API
+
protected:
std::mapOUString, uno::Any maProperties;
diff --git a/chart2/source/view/main/DummyXShape.cxx
b/chart2/source/view/main/DummyXShape.cxx
index 3d24fcd..39a3553 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -182,6 +182,11 @@ awt::Point SAL_CALL DummyXShape::getPosition()
return maPosition;
}
+const awt::Point DummyXShape::getPos()
+{
+return maPosition;
+}
+
void SAL_CALL DummyXShape::setPosition( const awt::Point rPoint )
throw(uno::RuntimeException, std::exception)
{
@@ -1004,8 +1009,8 @@ void SAL_CALL DummyGroup2D::setPosition( const
awt::Point rPos )
for(std::vectorDummyXShape*::const_iterator itr = maShapes.begin(),
itrEnd = maShapes.end(); itr != itrEnd; ++itr)
{
-awt::Point aPos = (*itr)-getPosition();
-awt::Point aNewPos( rPos.X + aPos.X, rPos.Y + aPos.Y);
+const awt::Point rOldPos = (*itr)-getPos();
+awt::Point aNewPos( rPos.X + rOldPos.X, rPos.Y + rOldPos.Y);
(*itr)-setPosition(aNewPos);
}
}
commit 92928f99f83f453a00de4f6c41ca0daa7d37f7d4
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Thu Mar 13 15:57:33 2014 +0100
add some debug helpers
Change-Id: I03d8baab55548fde1e34b55927fd5dcf9cff58a9
diff --git a/chart2/source/view/main/DummyXShape.cxx
b/chart2/source/view/main/DummyXShape.cxx
index 5a817a4..3d24fcd 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -48,6 +48,22 @@ namespace chart {
namespace dummy {
+#if 0
+
+std::ostream operator(std::ostream rStrm, const awt::Point rPoint)
+{
+rStrm rPoint.X , rPoint.Y;
+return rStrm;
+}
+
+std::ostream operator(std::ostream rStrm, const awt::Size rSize)
+{
+rStrm rSize.Width , rSize.Height;
+return rStrm;
+}
+
+#endif
+
bool TextCache::hasEntry(const TextCacheKey rKey)
{
return maCache.find(rKey) != maCache.end();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/salgdilayout.cxx | 76
1 file changed, 38 insertions(+), 38 deletions(-)
New commits:
commit 808721e7c6c60ae47388d0b77af635e617e4df1f
Author: Tor Lillqvist t...@collabora.com
Date: Thu Mar 13 18:01:24 2014 +0200
Cosmetics
How can it be so hard to adhere to uniform spacing inside one source
file?
Change-Id: I582791b244dd83543143b84c3742ab4eba5251c0
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index feb6e59..ccfae5f 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -45,10 +45,8 @@
#include basegfx/polygon/b2dpolygon.hxx
-
// The only common SalFrame method
-
SalFrameGeometry SalFrame::GetGeometry()
{
// mirror frame coordinates at parent
@@ -64,8 +62,6 @@ SalFrameGeometry SalFrame::GetGeometry()
return maGeometry;
}
-
-
SalGraphics::SalGraphics()
: m_nLayout( 0 ),
m_bAntiAliasB2DDraw(false)
@@ -79,8 +75,6 @@ SalGraphics::~SalGraphics()
{
}
-
-
bool SalGraphics::drawTransformedBitmap(
const basegfx::B2DPoint /* rNull */,
const basegfx::B2DPoint /* rX */,
@@ -92,8 +86,6 @@ bool SalGraphics::drawTransformedBitmap(
return false;
}
-
-
void SalGraphics::mirror( long x, const OutputDevice *pOutDev, bool bBack )
const
{
long w;
@@ -376,8 +368,6 @@ basegfx::B2DPolyPolygon SalGraphics::mirror( const
basegfx::B2DPolyPolygon i_rP
return aRet;
}
-
-
bool SalGraphics::SetClipRegion( const Region i_rClip, const OutputDevice
*pOutDev )
{
if( (m_nLayout SAL_LAYOUT_BIDI_RTL) || (pOutDev
pOutDev-IsRTLEnabled()) )
@@ -389,19 +379,21 @@ bool SalGraphics::SetClipRegion( const Region i_rClip,
const OutputDevice *pOut
return setClipRegion( i_rClip );
}
-voidSalGraphics::DrawPixel( long nX, long nY, const OutputDevice *pOutDev )
+void SalGraphics::DrawPixel( long nX, long nY, const OutputDevice *pOutDev )
{
if( (m_nLayout SAL_LAYOUT_BIDI_RTL) || (pOutDev
pOutDev-IsRTLEnabled()) )
mirror( nX, pOutDev );
drawPixel( nX, nY );
}
-voidSalGraphics::DrawPixel( long nX, long nY, SalColor nSalColor, const
OutputDevice *pOutDev )
+
+void SalGraphics::DrawPixel( long nX, long nY, SalColor nSalColor, const
OutputDevice *pOutDev )
{
if( (m_nLayout SAL_LAYOUT_BIDI_RTL) || (pOutDev
pOutDev-IsRTLEnabled()) )
mirror( nX, pOutDev );
drawPixel( nX, nY, nSalColor );
}
-voidSalGraphics::DrawLine( long nX1, long nY1, long nX2, long nY2, const
OutputDevice *pOutDev )
+
+void SalGraphics::DrawLine( long nX1, long nY1, long nX2, long nY2, const
OutputDevice *pOutDev )
{
if( (m_nLayout SAL_LAYOUT_BIDI_RTL) || (pOutDev
pOutDev-IsRTLEnabled()) )
{
@@ -410,7 +402,8 @@ voidSalGraphics::DrawLine( long nX1, long nY1, long
nX2, long nY2, const Out
}
drawLine( nX1, nY1, nX2, nY2 );
}
-voidSalGraphics::DrawRect( long nX, long nY, long nWidth, long nHeight,
const OutputDevice *pOutDev )
+
+void SalGraphics::DrawRect( long nX, long nY, long nWidth, long nHeight, const
OutputDevice *pOutDev )
{
if( (m_nLayout SAL_LAYOUT_BIDI_RTL) || (pOutDev
pOutDev-IsRTLEnabled()) )
mirror( nX, nWidth, pOutDev );
@@ -511,7 +504,7 @@ bool SalGraphics::DrawPolygonBezier( sal_uInt32 nPoints,
const SalPoint* pPtAry,
}
bool SalGraphics::DrawPolyPolygonBezier( sal_uInt32 i_nPoly, const sal_uInt32*
i_pPoints,
- const SalPoint* const*
i_pPtAry, const sal_uInt8* const* i_pFlgAry, const OutputDevice* i_pOutDev )
+ const SalPoint* const* i_pPtAry,
const sal_uInt8* const* i_pFlgAry, const OutputDevice* i_pOutDev )
{
bool bRet = false;
if( (m_nLayout SAL_LAYOUT_BIDI_RTL) || (i_pOutDev
i_pOutDev-IsRTLEnabled()) )
@@ -537,13 +530,12 @@ bool SalGraphics::DrawPolyPolygonBezier( sal_uInt32
i_nPoly, const sal_uInt32* i
return bRet;
}
-bool SalGraphics::DrawPolyLine(
-const basegfx::B2DPolygon i_rPolygon,
-double i_fTransparency,
-const basegfx::B2DVector i_rLineWidth,
-basegfx::B2DLineJoin i_eLineJoin,
-com::sun::star::drawing::LineCap i_eLineCap,
-const OutputDevice* i_pOutDev )
+bool SalGraphics::DrawPolyLine( const basegfx::B2DPolygon i_rPolygon,
+double i_fTransparency,
+const basegfx::B2DVector i_rLineWidth,
+basegfx::B2DLineJoin i_eLineJoin,
+com::sun::star::drawing::LineCap i_eLineCap,
+const OutputDevice* i_pOutDev )
{
bool bRet = false;
if( (m_nLayout SAL_LAYOUT_BIDI_RTL) || (i_pOutDev
i_pOutDev-IsRTLEnabled()) )
@@ -556,10 +548,10 @@ bool SalGraphics::DrawPolyLine(
return bRet;
}
-voidSalGraphics::CopyArea( long nDestX, long nDestY,
- long nSrcX, long nSrcY,
-
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - starmath/source
starmath/source/ooxmlexport.cxx | 21 +
1 file changed, 17 insertions(+), 4 deletions(-)
New commits:
commit cde6d800698522a804dc8f82c158ce7e0c3e05f5
Author: Dinesh Patil dinesh.pa...@synerzip.com
Date: Wed Mar 12 20:04:16 2014 +0530
fdo#76078: LO Crashes while saving the docx file containing only opening
brace
- System handles an equation having opening brace and closing brace.
- Whereas it fails to handle equations having only opening brace and no
closing
brace, due to which LO crashes with assertion while exporting.
- Fixed this issue and added unit test case for the same.
- Also fixed the same for closing brace alone.
Reviewed-on: https://gerrit.libreoffice.org/8561
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
(cherry picked from commit ade1641ab632565820ede720b6151435aca4dd78)
Signed-off-by: Michael Stahl mst...@redhat.com
Conflicts:
sw/qa/extras/inc/swmodeltestbase.hxx
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: I34a8a635b42bfdfac265fb70b977c0001cd2b4ff
diff --git a/starmath/source/ooxmlexport.cxx b/starmath/source/ooxmlexport.cxx
index 8d1c808..0a98d98 100644
--- a/starmath/source/ooxmlexport.cxx
+++ b/starmath/source/ooxmlexport.cxx
@@ -453,8 +453,15 @@ void SmOoxmlExport::HandleBrace( const SmBraceNode* pNode,
int nLevel )
{
m_pSerializer-startElementNS( XML_m, XML_d, FSEND );
m_pSerializer-startElementNS( XML_m, XML_dPr, FSEND );
-m_pSerializer-singleElementNS( XML_m, XML_begChr,
-FSNS( XML_m, XML_val ), mathSymbolToString(
pNode-OpeningBrace()).getStr(), FSEND );
+
+//check if the node has an opening brace
+if( TNONE == pNode-GetSubNode(0)-GetToken().eType )
+m_pSerializer-singleElementNS( XML_m, XML_begChr,
+FSNS( XML_m, XML_val ), , FSEND );
+else
+m_pSerializer-singleElementNS( XML_m, XML_begChr,
+FSNS( XML_m, XML_val ), mathSymbolToString(
pNode-OpeningBrace()).getStr(), FSEND );
+
std::vector const SmNode* subnodes;
if( pNode-Body()-GetType() == NBRACEBODY )
{
@@ -479,8 +486,14 @@ void SmOoxmlExport::HandleBrace( const SmBraceNode* pNode,
int nLevel )
}
else
subnodes.push_back( pNode-Body());
-m_pSerializer-singleElementNS( XML_m, XML_endChr,
-FSNS( XML_m, XML_val ), mathSymbolToString(
pNode-ClosingBrace()).getStr(), FSEND );
+
+if( TNONE == pNode-GetSubNode(2)-GetToken().eType )
+m_pSerializer-singleElementNS( XML_m, XML_endChr,
+FSNS( XML_m, XML_val ), , FSEND );
+else
+m_pSerializer-singleElementNS( XML_m, XML_endChr,
+FSNS( XML_m, XML_val ), mathSymbolToString(
pNode-ClosingBrace()).getStr(), FSEND );
+
m_pSerializer-endElementNS( XML_m, XML_dPr );
for( unsigned int i = 0; i subnodes.size(); ++i )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 077a74cfc6dbea5ee275fd11b65b523cc525e2e4 Author: Caolán McNamara caol...@redhat.com Date: Thu Mar 13 16:18:53 2014 + Updated core Project: help fb92360ede9c82c8534fcbdf625ffa6c2879 diff --git a/helpcontent2 b/helpcontent2 index 02fac10..fb9 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 02fac10d462f6c3a7a17535e8902d5cccb065d98 +Subproject commit fb92360ede9c82c8534fcbdf625ffa6c2879 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |9 -- source/text/shared/explorer/database/05020100.xhp | 32 -- 2 files changed, 12 insertions(+), 29 deletions(-) New commits: commit fb92360ede9c82c8534fcbdf625ffa6c2879 Author: Caolán McNamara caol...@redhat.com Date: Thu Mar 13 16:18:53 2014 + update help ids for relations dialog .ui conversion Change-Id: I391d50c8ec9257a30c05a059ff3a4db7a9137548 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index b8e0dc9..a8190ff 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -1430,14 +1430,6 @@ HID_DLG_NAME,33818, HID_DLG_NEWERVERSIONWARNING,35848, HID_DLG_PASSWD_SECTION,53440, HID_DLG_PASSWORD,38964, -HID_DLG_REL_CASC_DEL,38983, -HID_DLG_REL_CASC_DEL_DEFAULT,38986, -HID_DLG_REL_CASC_DEL_NULL,38985, -HID_DLG_REL_CASC_UPD,38987, -HID_DLG_REL_CASC_UPD_DEFAULT,38990, -HID_DLG_REL_CASC_UPD_NULL,38989, -HID_DLG_REL_NO_CASC_DEL,38984, -HID_DLG_REL_NO_CASC_UPD,38988, HID_DLG_TEXT,38843, HID_DLG_WORDCOUNT,54987, HID_DOCINFO_EDT,33070, @@ -5451,7 +5443,6 @@ dbaccess_ModalDialog_DLG_DOMAINPASSWORD,1388707840, dbaccess_ModalDialog_DLG_INDEXDESIGN,1388625920, dbaccess_ModalDialog_DLG_MACRO_MIGRATION,1388314624, dbaccess_ModalDialog_DLG_PARAMETERS,1388396544, -dbaccess_ModalDialog_DLG_REL_PROPERTIES,1388593152, dbaccess_ModalDialog_DLG_SQLEXCEPTIONCHAIN,1388363776, dbaccess_ModalDialog_DLG_TEXT_CONNECTION_SETTINGS,1388822528, dbaccess_ModalDialog_WIZ_RTFCOPYTABLE,1388576768, diff --git a/source/text/shared/explorer/database/05020100.xhp b/source/text/shared/explorer/database/05020100.xhp index 976b129..fc8d2a0 100644 --- a/source/text/shared/explorer/database/05020100.xhp +++ b/source/text/shared/explorer/database/05020100.xhp @@ -33,6 +33,7 @@ /meta body bookmark xml-lang=en-US branch=hid/.uno:DBAddRelation id=bm_id3155150 localize=false/ +bookmark xml-lang=en-US branch=hid/dbaccess/ui/relationdialog/RelationDialog id=bm_id3155151 localize=false/ bookmark xml-lang=en-US branch=index id=bm_id3150499bookmark_valuerelations; properties (Base)/bookmark_value bookmark_valuekey fields for relations (Base)/bookmark_value bookmark_valuecascading update (Base)/bookmark_value @@ -44,42 +45,33 @@ /section paragraph role=note id=par_id3155136 xml-lang=en-US l10n=U oldref=3The update and delete options are only available if they are supported by the database used./paragraph paragraph role=heading id=hd_id3155341 xml-lang=en-US level=2 l10n=U oldref=27Tables/paragraph -paragraph role=paragraph id=par_id3153880 xml-lang=en-US l10n=U oldref=28ahelp hid=DBACCESS_LISTBOX_DLG_REL_PROPERTIES_LB_RIGHT_TABLE visibility=hiddenThis is where the two related tables are listed./ahelp If you create a new relation, you can select one table from each of the combo boxes in the top part of the dialog./paragraph +paragraph role=paragraph id=par_id3153880 xml-lang=en-US l10n=U oldref=28ahelp hid=dbaccess/ui/relationdialog/table2 visibility=hiddenThis is where the two related tables are listed./ahelp If you create a new relation, you can select one table from each of the combo boxes in the top part of the dialog./paragraph paragraph role=paragraph id=par_id3154047 xml-lang=en-US l10n=U oldref=29If you opened the emphRelations/emph dialog for an existing relation by double-clicking the connection lines in the Relation window, then the tables involved in the relation cannot be modified./paragraph bookmark xml-lang=en-US branch=hid/dbaccess/ui/joindialog/relations id=bm_id3153716 localize=false/ paragraph role=heading id=hd_id3153822 xml-lang=en-US level=2 l10n=U oldref=4Key fields/paragraph paragraph role=paragraph id=par_id3159157 xml-lang=en-US l10n=U oldref=5ahelp hid=dbaccess/ui/joindialog/relationsDefines the key fields for the relation./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/DBACCESS_HID_RELATIONDIALOG_LEFTFIELDCELL id=bm_id3153561 localize=false/ -bookmark xml-lang=en-US branch=hid/DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL id=bm_id3153543 localize=false/ -paragraph role=paragraph id=par_id3149235 xml-lang=en-US l10n=U oldref=30ahelp hid=HID_RELATIONDIALOG_RIGHTFIELDCELLThe names of the tables selected for the link appear here as column names./ahelp If you click a field, you can use the arrow buttons to select a field from the table. Each relation is written in a row./paragraph +bookmark xml-lang=en-US branch=hid/dbaccess/ui/relationdialog/relations id=bm_id3153543 localize=false/ +paragraph role=paragraph id=par_id3149235 xml-lang=en-US l10n=U oldref=30ahelp hid=dbaccess/ui/relationdialog/table2The names of the tables selected for the link appear here as column names./ahelp If you click a field, you can use the arrow buttons to select a field from the table. Each relation is written in a row./paragraph paragraph role=heading id=hd_id3145609 xml-lang=en-US level=2 l10n=U oldref=6Update options/paragraph paragraph role=paragraph id=par_id3153061
[Libreoffice-commits] core.git: rsc/source
rsc/source/parser/rscinit.cxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit f008fe11b7723b9433d208af2b6d9808e3460844 Author: Caolán McNamara caol...@redhat.com Date: Thu Mar 13 14:24:11 2014 + coverity#708798 Unused pointer value Change-Id: Ib27f174b37577a8572fb853a7040de51e95d665e diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index abcc594..60798ab 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -59,7 +59,6 @@ void RscTypCont::Init() RscTupel * pStringLongTupel; RscCont * pStringTupelList; RscCont * pStringLongTupelList; -RscArray * pLangStringTupelList; RscArray * pLangStringLongTupelList; RscTop * pClassMgr; @@ -320,7 +319,7 @@ void RscTypCont::Init() aBaseLst.push_back( pLangStringList = InitLangStringList( pStringList ) ); aBaseLst.push_back( pStringTupel = InitStringTupel() ); aBaseLst.push_back( pStringTupelList = InitStringTupelList( pStringTupel ) ); -aBaseLst.push_back( pLangStringTupelList = InitLangStringTupelList( pStringTupelList ) ); +aBaseLst.push_back( InitLangStringTupelList( pStringTupelList ) ); aBaseLst.push_back( pStringLongTupel = InitStringLongTupel() ); aBaseLst.push_back( pStringLongTupelList = InitStringLongTupelList( pStringLongTupel ) ); aBaseLst.push_back( pLangStringLongTupelList = InitLangStringLongTupelList( pStringLongTupelList ) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - svl/source sw/source
svl/source/items/itemprop.cxx|7 ++-
sw/source/core/doc/docnum.cxx|2 +-
sw/source/core/docnode/ndtbl.cxx |4 +---
3 files changed, 4 insertions(+), 9 deletions(-)
New commits:
commit c503ba54ed70c5c24cc7ed718c5299244845aa95
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 13 16:52:09 2014 +
coverity#708846 Unused pointer value
Change-Id: I3bef9d8fc00fdd0be6ed29a6fbc7af836e5088cb
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 4cd0278..d754d4d 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2746,13 +2746,11 @@ void SwDoc::SetTabCols( const SwTabCols rNew, sal_Bool
bCurRowOnly,
void SwDoc::SetTabRows( const SwTabCols rNew, sal_Bool bCurColOnly, const
SwCursor*,
const SwCellFrm* pBoxFrm )
{
-const SwTableBox* pBox;
SwTabFrm *pTab;
OSL_ENSURE( pBoxFrm, SetTabRows called without pBoxFrm );
pTab = ((SwFrm*)pBoxFrm)-ImplFindTabFrm();
-pBox = pBoxFrm-GetTabBox();
// If the Table is still using relative values (USHRT_MAX)
// we need to switch to absolute ones.
@@ -2828,7 +2826,7 @@ void SwDoc::SetTabRows( const SwTabCols rNew, sal_Bool
bCurColOnly, const SwCur
if ( pCntnt pCntnt-IsTxtFrm() )
{
-pBox = ((SwCellFrm*)pFrm)-GetTabBox();
+const SwTableBox* pBox =
((SwCellFrm*)pFrm)-GetTabBox();
const long nRowSpan = pBox-getRowSpan();
if( nRowSpan 0 ) // Not overlapped
pTxtFrm = (SwTxtFrm*)pCntnt;
commit bc871d7bd6d4f01d8e5dc96ebe8dcbe9d1b5cad4
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 13 16:49:08 2014 +
coverity#708843 Unused pointer value
Change-Id: I6b9d1ef8f6926668c5dbe824b0c900c40f18f8ec
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 05ec96d..7e112f0 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -385,7 +385,7 @@ bool SwDoc::OutlineUpDown( const SwPaM rPam, short nOffset
)
pColl = aCollArr[ aMoveArr[nLevel] ];
if (pColl != NULL)
-pColl = (SwTxtFmtColl*)pTxtNd-ChgFmtColl( pColl );
+(SwTxtFmtColl*)pTxtNd-ChgFmtColl( pColl );
}
}
commit 6b522f0a6d5518807ea78a425ddcef6ebb3dec89
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 13 16:47:23 2014 +
coverity#708824 Unused pointer value
Change-Id: I2993b61d5556abd039f30c39938b6726fd2b1197
diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx
index 3c45186..e2492d3 100644
--- a/svl/source/items/itemprop.cxx
+++ b/svl/source/items/itemprop.cxx
@@ -317,11 +317,8 @@ PropertyState SfxItemPropertySet::getPropertyState(const
OUString rName, cons
}
sal_uInt16 nWhich = pEntry-nWID;
-// item holen
-const SfxPoolItem* pItem = 0;
-SfxItemState eState = rSet.GetItemState( nWhich, false, pItem );
-if(!pItem nWhich != rSet.GetPool()-GetSlotId(nWhich))
-pItem = rSet.GetPool()-GetDefaultItem(nWhich);
+// get item state
+SfxItemState eState = rSet.GetItemState(nWhich, false);
// item-Wert als UnoAny zurueckgeben
if(eState == SFX_ITEM_DEFAULT)
eRet = PropertyState_DEFAULT_VALUE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/lwpcharborderoverride.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 697af552039bc8f843d4a4390297961c6766
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 13 17:14:57 2014 +
coverity#738688 Uninitialized scalar field
Change-Id: Ia161f30e943dfc3bf4ef114f3861817f9b1acb79
diff --git a/lotuswordpro/source/filter/lwpcharborderoverride.cxx
b/lotuswordpro/source/filter/lwpcharborderoverride.cxx
index 9e63be2..a65d7dd 100644
--- a/lotuswordpro/source/filter/lwpcharborderoverride.cxx
+++ b/lotuswordpro/source/filter/lwpcharborderoverride.cxx
@@ -69,8 +69,11 @@
#include lwpborderstuff.hxx
#include lwpmargins.hxx
-LwpCharacterBorderOverride::LwpCharacterBorderOverride() :
-m_pBorderStuff(new LwpBorderStuff), m_pMargins(new LwpMargins)
+LwpCharacterBorderOverride::LwpCharacterBorderOverride()
+: m_pBorderStuff(new LwpBorderStuff)
+, m_pMargins(new LwpMargins)
+, m_nAboveWidth(0)
+, m_nBelowWidth(0)
{
}
___
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 Kohei Yoshida libreoff...@kohei.us changed: What|Removed |Added Depends on|74075 | -- 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
Re: Unity for HiDPI
Hi Keith, On Wed, Feb 19, 2014 at 11:01:51PM -0500, Keith Curtis wrote: Do you know if they will return 192 DPI when on these screens like what Gnome 3.10 does? I could find some Unity alias and ask, but you might know or be able to encourage them ;-) Unfortunately, I can't easily install Unity to test because I'd have to replace a lot of my other core packages. this was discussed in: http://summit.ubuntu.com/uds-1403/meeting/22206/client-1403-unity7-defaults-and-settings/ Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/frmedt/fetab.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit ccd765079ae573d24ded2a07ec434e4e89b619a2
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Mar 13 20:05:16 2014 +0100
SwFEShell::InsertRow: forgot to comment what that -2 does
Change-Id: I1d169939c98b0d155803dd08dd59eabcdfa87354
diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx
index 593d1f2..bbb7b6c 100644
--- a/sw/source/core/frmedt/fetab.cxx
+++ b/sw/source/core/frmedt/fetab.cxx
@@ -207,8 +207,10 @@ bool SwFEShell::InsertRow( sal_uInt16 nCnt, bool bBehind )
bool bSelectAll = StartsWithTable()
ExtendedSelectedAll(/*bFootnotes=*/false);
if (bSelectAll)
{
+// Set the end of the selection to the last paragraph of the last cell
of the table.
SwPaM* pPaM = getShellCrsr(false);
SwNode* pNode =
pPaM-Start()-nNode.GetNode().FindTableNode()-EndOfSectionNode();
+// pNode is the end node of the table, we want the last node before
the end node of the last cell.
pPaM-End()-nNode = pNode-GetIndex() - 2;
pPaM-End()-nContent.Assign(pPaM-End()-nNode.GetNode().GetCntntNode(), 0);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - boost/boost_1_55_0.patch
boost/boost_1_55_0.patch | 27 +++
1 file changed, 27 insertions(+)
New commits:
commit d393e8b05a78eb7479e3c5639cc8653039897a58
Author: Herbert Dürr h...@apache.org
Date: Thu Mar 13 16:40:46 2014 +
#i124395# WaE: fix unused-local-typedef warning in boost/spirit
diff --git a/boost/boost_1_55_0.patch b/boost/boost_1_55_0.patch
index 16865c9..3f7f6f6 100644
--- a/boost/boost_1_55_0.patch
+++ b/boost/boost_1_55_0.patch
@@ -184,8 +184,8 @@
return impl::call(c).head;
}
misc/boost_1_55_0/boost/concept/detail/general.hpp 2010-06-08
21:31:13.0 +0200
-+++ misc/build/boost_1_55_0/boost/concept/detail/general.hpp 2014-03-13
17:20:13.450234546 +0100
+--- misc/boost_1_55_0/boost/concept/detail/general.hpp 2010-06-08 21:31:13
+0200
misc/build/boost_1_55_0/boost/concept/detail/general.hpp 2014-03-13
17:20:13 +0100
@@ -65,10 +65,10 @@
# endif
@@ -201,3 +201,13 @@
}}
+--- misc/boost_1_55_0/boost/spirit/home/classic/core/primitives/primitives.hpp
2014-03-12 14:02:51 +0100
misc/build/boost_1_55_0/boost/spirit/home/classic/core/primitives/primitives.hpp
2008-06-22 17:05:38 +0200
+@@ -47,7 +47,6 @@
+ typename parser_resultself_t, ScannerT::type
+ parse(ScannerT const scan) const
+ {
+-typedef typename parser_resultself_t, ScannerT::type result_t;
+ typedef typename ScannerT::value_t value_t;
+ typedef typename ScannerT::iterator_t iterator_t;
+
commit ace25189a9b9572d8a35aca3e7162f8512b33425
Author: Herbert Dürr h...@apache.org
Date: Thu Mar 13 16:28:10 2014 +
#i124395# WaE: fix unused-local-typedef warning from the
BOOST_CONCEPT_ASSERT_FN macro
diff --git a/boost/boost_1_55_0.patch b/boost/boost_1_55_0.patch
index 706770d..16865c9 100644
--- a/boost/boost_1_55_0.patch
+++ b/boost/boost_1_55_0.patch
@@ -184,3 +184,20 @@
return impl::call(c).head;
}
+--- misc/boost_1_55_0/boost/concept/detail/general.hpp 2010-06-08
21:31:13.0 +0200
misc/build/boost_1_55_0/boost/concept/detail/general.hpp 2014-03-13
17:20:13.450234546 +0100
+@@ -65,10 +65,10 @@
+
+ # endif
+
+-# define BOOST_CONCEPT_ASSERT_FN( ModelFnPtr ) \
+-typedef ::boost::concepts::detail::instantiate \
+-::boost::concepts::requirement_ModelFnPtr::failed\
+- BOOST_PP_CAT(boost_concept_check,__LINE__)
++#define BOOST_CONCEPT_ASSERT_FN( ModelFnPtr ) \
++::boost::concepts::detail::instantiate \
++::boost::concepts::requirement_ModelFnPtr::failed \
++ BOOST_PP_CAT(boost_concept_check,__LINE__)()
+
+ }}
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/qa sc/source
sc/qa/unit/ucalc.cxx| 31 +++
sc/source/core/data/column4.cxx | 35 +--
2 files changed, 56 insertions(+), 10 deletions(-)
New commits:
commit 36bcab7859b7dfa1f1377bb5865c881742f178dd
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Mar 13 16:08:03 2014 -0400
fdo#76132: Don't create a formula group of length 1.
That's asking for trouble.
Change-Id: I6aaa4d1e2aed4f166ee216c3eb02d3b7794c9a8c
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index fa18818..2f21623 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -334,25 +334,40 @@ void ScColumn::CloneFormulaCell( const ScFormulaCell
rSrc, const std::vectorsc
{
SCROW nRow1 = itSpan-mnRow1, nRow2 = itSpan-mnRow2;
size_t nLen = nRow2 - nRow1 + 1;
+assert(nLen 0);
aFormulas.clear();
aFormulas.reserve(nLen);
ScAddress aPos(nCol, nRow1, nTab);
-ScFormulaCellGroupRef xGroup(new ScFormulaCellGroup);
-xGroup-setCode(*rSrc.GetCode());
-xGroup-compileCode(*pDocument, aPos, pDocument-GetGrammar());
-for (size_t i = 0; i nLen; ++i, aPos.IncRow())
+
+if (nLen == 1)
{
-ScFormulaCell* pCell = new ScFormulaCell(pDocument, aPos, xGroup);
-if (i == 0)
-{
-xGroup-mpTopCell = pCell;
-xGroup-mnLength = nLen;
-}
+// Single, ungrouped formula cell.
+ScFormulaCell* pCell =
+new ScFormulaCell(rSrc, *pDocument, aPos,
pDocument-GetGrammar());
pCell-StartListeningTo(aCxt);
pCell-SetDirty();
aFormulas.push_back(pCell);
}
+else
+{
+// Create a group of formula cells.
+ScFormulaCellGroupRef xGroup(new ScFormulaCellGroup);
+xGroup-setCode(*rSrc.GetCode());
+xGroup-compileCode(*pDocument, aPos, pDocument-GetGrammar());
+for (size_t i = 0; i nLen; ++i, aPos.IncRow())
+{
+ScFormulaCell* pCell = new ScFormulaCell(pDocument, aPos,
xGroup);
+if (i == 0)
+{
+xGroup-mpTopCell = pCell;
+xGroup-mnLength = nLen;
+}
+pCell-StartListeningTo(aCxt);
+pCell-SetDirty();
+aFormulas.push_back(pCell);
+}
+}
itPos = maCells.set(itPos, nRow1, aFormulas.begin(), aFormulas.end());
commit ce524556df4bf06cde1229475b9de9822a89f62b
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Mar 13 14:43:06 2014 -0400
fdo#76132: Write test for this first.
The crash is a result of the pasted formula cell (single cell) being marked
shared, which should never happen.
Change-Id: I7b7fa536c520c76b56cce78457e11b6e2eaee76f
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index ed5e894..c903f4f 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -3765,6 +3765,37 @@ void Test::testCopyPasteRelativeFormula()
// B2 references A2, so the value should be 1.
CPPUNIT_ASSERT_EQUAL(1.0, m_pDoc-GetValue(ScAddress(1,1,0)));
+// Clear content and start over.
+clearSheet(m_pDoc, 0);
+clearSheet(aClipDoc, 0);
+
+// Insert a single formula cell in A1.
+m_pDoc-SetString(ScAddress(0,0,0), =ROW());
+const ScFormulaCell* pFC = m_pDoc-GetFormulaCell(ScAddress(0,0,0));
+CPPUNIT_ASSERT(pFC);
+CPPUNIT_ASSERT(!pFC-IsShared()); // single formula cell is never shared.
+
+// Copy A1 to clipboard.
+aClipParam = ScClipParam(ScAddress(0,0,0), false);
+m_pDoc-CopyToClip(aClipParam, aClipDoc, aMark);
+
+pFC = aClipDoc.GetFormulaCell(ScAddress(0,0,0));
+CPPUNIT_ASSERT(pFC);
+CPPUNIT_ASSERT(!pFC-IsShared());
+
+// Paste to A3.
+aDestRange = ScRange(0,2,0,0,2,0);
+aMark.SetMarkArea(aDestRange);
+m_pDoc-CopyFromClip(aDestRange, aMark, nFlags, NULL, aClipDoc);
+
+pFC = m_pDoc-GetFormulaCell(ScAddress(0,2,0));
+CPPUNIT_ASSERT(pFC);
+CPPUNIT_ASSERT(!pFC-IsShared());
+
+// Delete A3 and make sure it doesn't crash (see fdo#76132).
+clearRange(m_pDoc, ScAddress(0,2,0));
+CPPUNIT_ASSERT(m_pDoc-GetCellType(ScAddress(0,2,0)) == CELLTYPE_NONE);
+
m_pDoc-DeleteTab(0);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0a508c70745a9c8074878015a0300763f7265399 Author: Caolán McNamara caol...@redhat.com Date: Thu Mar 13 20:46:30 2014 + Updated core Project: help 52c7f5e3a3bf92ccddb93d3a565eb6f073435793 diff --git a/helpcontent2 b/helpcontent2 index fb9..52c7f5e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit fb92360ede9c82c8534fcbdf625ffa6c2879 +Subproject commit 52c7f5e3a3bf92ccddb93d3a565eb6f073435793 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/AllLangResTarget_pcr.mk extensions/source extensions/uiconfig extensions/UIConfig_spropctrlr.mk
extensions/AllLangResTarget_pcr.mk |1
extensions/UIConfig_spropctrlr.mk |1
extensions/source/propctrlr/formresid.hrc |1
extensions/source/propctrlr/newdatatype.cxx | 21 +--
extensions/source/propctrlr/newdatatype.hrc | 32 -
extensions/source/propctrlr/newdatatype.hxx | 18 +--
extensions/source/propctrlr/newdatatype.src | 69
extensions/uiconfig/spropctrlr/ui/datatypedialog.ui | 110
8 files changed, 125 insertions(+), 128 deletions(-)
New commits:
commit 534425bfcd4c1ac08c780f417b1dd99baeac99b0
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 13 20:41:07 2014 +
convert new data type dialog to .ui
Change-Id: Ia354e003903c20435947e82afa293a34a367773a
diff --git a/extensions/AllLangResTarget_pcr.mk
b/extensions/AllLangResTarget_pcr.mk
index e6d5495..3548617 100644
--- a/extensions/AllLangResTarget_pcr.mk
+++ b/extensions/AllLangResTarget_pcr.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_SrsTarget_add_files,pcr/res,\
extensions/source/propctrlr/pcrmiscres.src \
extensions/source/propctrlr/selectlabeldialog.src \
extensions/source/propctrlr/formlinkdialog.src \
- extensions/source/propctrlr/newdatatype.src \
))
$(eval $(call gb_SrsTarget_add_nonlocalizable_files,pcr/res,\
diff --git a/extensions/UIConfig_spropctrlr.mk
b/extensions/UIConfig_spropctrlr.mk
index 3186668..26c84f1 100644
--- a/extensions/UIConfig_spropctrlr.mk
+++ b/extensions/UIConfig_spropctrlr.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_UIConfig_UIConfig,modules/spropctrlr))
$(eval $(call gb_UIConfig_add_uifiles,modules/spropctrlr,\
extensions/uiconfig/spropctrlr/ui/controlfontdialog \
+ extensions/uiconfig/spropctrlr/ui/datatypedialog \
extensions/uiconfig/spropctrlr/ui/taborder \
))
diff --git a/extensions/source/propctrlr/formresid.hrc
b/extensions/source/propctrlr/formresid.hrc
index e5260bf..befc4fc 100644
--- a/extensions/source/propctrlr/formresid.hrc
+++ b/extensions/source/propctrlr/formresid.hrc
@@ -281,7 +281,6 @@
#define RID_DLG_TABORDER( RID_PROPCONTROLLER_START + 1 )
#define RID_DLG_FORMLINKS ( RID_PROPCONTROLLER_START + 2 )
#define RID_DLG_SELECTION ( RID_PROPCONTROLLER_START + 3 )
-#define RID_DLG_NEW_DATA_TYPE ( RID_PROPCONTROLLER_START + 4 )
// - ImageLists
diff --git a/extensions/source/propctrlr/newdatatype.cxx
b/extensions/source/propctrlr/newdatatype.cxx
index 28c95cb..43638d7f 100644
--- a/extensions/source/propctrlr/newdatatype.cxx
+++ b/extensions/source/propctrlr/newdatatype.cxx
@@ -18,12 +18,9 @@
*/
#include newdatatype.hxx
-#include newdatatype.hrc
-
#include modulepcr.hxx
#include formresid.hrc
-
namespace pcr
{
@@ -33,16 +30,14 @@ namespace pcr
NewDataTypeDialog::NewDataTypeDialog( Window* _pParent, const OUString
_rNameBase, const ::std::vector OUString _rProhibitedNames )
-:ModalDialog( _pParent, PcrRes( RID_DLG_NEW_DATA_TYPE ) )
-,m_aLabel ( this, PcrRes( FT_LABEL ) )
-,m_aName( this, PcrRes( ED_NAME ) )
-,m_aOK ( this, PcrRes( PB_OK ) )
-,m_aCancel ( this, PcrRes( PB_CANCEL ) )
-,m_aProhibitedNames( _rProhibitedNames.begin(),
_rProhibitedNames.end() )
+: ModalDialog( _pParent, DataTypeDialog,
+modules/spropctrlr/ui/datatypedialog.ui )
+, m_aProhibitedNames( _rProhibitedNames.begin(),
_rProhibitedNames.end() )
{
-FreeResource();
+get(m_pName, entry);
+get(m_pOK, ok);
-m_aName.SetModifyHdl( LINK( this, NewDataTypeDialog, OnNameModified )
);
+m_pName-SetModifyHdl( LINK( this, NewDataTypeDialog, OnNameModified )
);
// find an initial name
// for this, first remove trailing digits
@@ -68,7 +63,7 @@ namespace pcr
}
while ( m_aProhibitedNames.find( sInitialName ) !=
m_aProhibitedNames.end() );
-m_aName.SetText( sInitialName );
+m_pName-SetText( sInitialName );
OnNameModified( NULL );
}
@@ -79,7 +74,7 @@ namespace pcr
bool bNameIsOK = ( !sCurrentName.isEmpty() )
( m_aProhibitedNames.find( sCurrentName ) ==
m_aProhibitedNames.end() );
-m_aOK.Enable( bNameIsOK );
+m_pOK-Enable( bNameIsOK );
return 0L;
}
diff --git a/extensions/source/propctrlr/newdatatype.hrc
b/extensions/source/propctrlr/newdatatype.hrc
deleted file mode 100644
index d795822..000
--- a/extensions/source/propctrlr/newdatatype.hrc
+++ /dev/null
@@ -1,32 +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
- *
[Libreoffice-commits] help.git: helpers/help_hid.lst
helpers/help_hid.lst |2 -- 1 file changed, 2 deletions(-) New commits: commit 52c7f5e3a3bf92ccddb93d3a565eb6f073435793 Author: Caolán McNamara caol...@redhat.com Date: Thu Mar 13 20:46:30 2014 + drop help ids that point nowhere Change-Id: Ice76d15ac1a0b13b1e4bb5265816fab79d0bcb85 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index a8190ff..e96d663 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -5517,7 +5517,6 @@ extensions_CheckBox_RID_TP_LICENSE_CB_ACCEPT,55366, extensions_ComboBox_RID_PAGE_FINAL_CBB_LOCATION,860688385, extensions_ComboBox_RID_PAGE_LCW_FIELDLINK_CMB_TABLEFIELD,859787266, extensions_ComboBox_RID_PAGE_LCW_FIELDLINK_CMB_VALUELISTFIELD,859787265, -extensions_Edit_RID_DLG_NEW_DATA_TYPE_ED_NAME,1090193410, extensions_Edit_RID_PAGE_FINAL_ET_DATASOURCENAME,860686337, extensions_Edit_RID_PAGE_GROUPRADIOSELECTION_ET_RADIOLABELS,859670529, extensions_Edit_RID_PAGE_LCW_CONTENTSELECTION_FIELD_ET_DISPLAYEDFIELD,859768836, @@ -5581,7 +5580,6 @@ extensions_ModalDialog_RID_DLG_FORMLINKS,1090158592, extensions_ModalDialog_RID_DLG_GRIDWIZARD,1396555776, extensions_ModalDialog_RID_DLG_GROUPBOXWIZARD,1396523008, extensions_ModalDialog_RID_DLG_LISTCOMBOWIZARD,1396539392, -extensions_ModalDialog_RID_DLG_NEW_DATA_TYPE,1090191360, extensions_ModalDialog_RID_DLG_OEMWIZARD,1090519040, extensions_ModalDialog_RID_DLG_SELECTION,1090174976, extensions_ModalDialog_RID_DLG_SELECTLABELCONTROL,1090125824, ___ 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' - ac/e25189a9b9572d8a35aca3e7162f8512b33425
ac/e25189a9b9572d8a35aca3e7162f8512b33425 |1 + 1 file changed, 1 insertion(+) New commits: commit 0d08fdd46a77a898b4035bb7ac038a36a0d539b0 Author: Caolán McNamara caol...@redhat.com Date: Thu Mar 13 20:49:14 2014 + Notes added by 'git notes add' diff --git a/ac/e25189a9b9572d8a35aca3e7162f8512b33425 b/ac/e25189a9b9572d8a35aca3e7162f8512b33425 new file mode 100644 index 000..8a2345e --- /dev/null +++ b/ac/e25189a9b9572d8a35aca3e7162f8512b33425 @@ -0,0 +1 @@ +ignore: fixed ___ 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' - d3/93e8b05a78eb7479e3c5639cc8653039897a58
d3/93e8b05a78eb7479e3c5639cc8653039897a58 |1 + 1 file changed, 1 insertion(+) New commits: commit bd06f351406b94e4da5e55f811e1978bdae442a9 Author: Caolán McNamara caol...@redhat.com Date: Thu Mar 13 20:49:45 2014 + Notes added by 'git notes add' diff --git a/d3/93e8b05a78eb7479e3c5639cc8653039897a58 b/d3/93e8b05a78eb7479e3c5639cc8653039897a58 new file mode 100644 index 000..8a2345e --- /dev/null +++ b/d3/93e8b05a78eb7479e3c5639cc8653039897a58 @@ -0,0 +1 @@ +ignore: fixed ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
is com.sun.star.comp.framework.License dead ?
Is com.sun.star.comp.framework.License something dead that can be removed ? I don't seem to see any use of it anywhere in our code and I don't see it documented anywhere for use by extensions or anything. (it has a old-school .src dialog in it that I want to get rid of) C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
OfficeMenuBar no longer takes private menu's in StartModule
With 4.2 (Windows) Private Extensions menu's are no longer visible in the StartModule Private Toolbars are still visible in the StartModule node oor:name=OfficeMenuBar node oor:name=MyPrivateMenu.OfficeMenuBar oor:op=replace prop oor:name=Context oor:type=xs:string valuecom.sun.star.frame.StartModule,com.sun.star.text.TextDocument,com.sun.star.sdb.TextReportDesign,com.sun.star.text.WebDocument,com.sun.star.xforms.XMLFormDocument,com.sun.star.text.GlobalDocument,com.sun.star.sdb.FormDesign,com.sun.star.sheet.SpreadsheetDocument,com.sun.star.drawing.DrawingDocument,com.sun.star.presentation.PresentationDocument,com.sun.star.sdb.OfficeDatabaseDocument/value /prop this menu shows in the different modules but com.sun.star.frame.StartModule is sillently ignored node oor:name=MyPrivate Toolbar.OfficeToolBar oor:op=replace node oor:name=m001 oor:op=replace prop oor:name=Context oor:type=xs:string valuecom.sun.star.frame.StartModule,com.sun.star.text.TextDocument,com.sun.star.sdb.TextReportDesign,com.sun.star.text.WebDocument,com.sun.star.xforms.XMLFormDocument,com.sun.star.text.GlobalDocument,com.sun.star.sdb.FormDesign,com.sun.star.sheet.SpreadsheetDocument,com.sun.star.drawing.DrawingDocument,com.sun.star.presentation.PresentationDocument,com.sun.star.sdb.OfficeDatabaseDocument/value /prop here the Menubar is showed in the startModule is it forbidden to show private Menu's in the start Module ? Thanks for any hint ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sc/qa sc/source
sc/qa/unit/data/xlsx/row-index-1-based.xlsx |binary
sc/qa/unit/subsequent_filters-test.cxx | 39
sc/source/filter/inc/sheetdatacontext.hxx |4 +-
sc/source/filter/oox/sheetdatacontext.cxx |4 +-
4 files changed, 43 insertions(+), 4 deletions(-)
New commits:
commit ff56553e34dfed01b9226ce7a516dbeb6da32124
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Mar 13 18:01:21 2014 -0400
fdo#76032: This row index is 1-based whereas our own mnRow is 0-based.
Change-Id: I098d300532bef164bef0d40ebf62a6848bc19cb8
diff --git a/sc/source/filter/inc/sheetdatacontext.hxx
b/sc/source/filter/inc/sheetdatacontext.hxx
index dba7a7e..e352cd0 100644
--- a/sc/source/filter/inc/sheetdatacontext.hxx
+++ b/sc/source/filter/inc/sheetdatacontext.hxx
@@ -129,8 +129,8 @@ private:
boolmbHasFormula; /// True = current cell has
formula data (OOXML only).
boolmbValidRange; /// True = maFmlaData.maFormulaRef
is valid (OOXML only).
-sal_Int32 mnRow;
-sal_Int32 mnCol;
+sal_Int32 mnRow; /// row index (0-based)
+sal_Int32 mnCol; /// column index (0-based)
};
diff --git a/sc/source/filter/oox/sheetdatacontext.cxx
b/sc/source/filter/oox/sheetdatacontext.cxx
index 9628e78..4d2c57a 100644
--- a/sc/source/filter/oox/sheetdatacontext.cxx
+++ b/sc/source/filter/oox/sheetdatacontext.cxx
@@ -279,11 +279,11 @@ ContextHandlerRef
SheetDataContext::onCreateRecordContext( sal_Int32 nRecId, Seq
void SheetDataContext::importRow( const AttributeList rAttribs )
{
RowModel aModel;
-sal_Int32 nRow = rAttribs.getInteger( XML_r, -1 );
+sal_Int32 nRow = rAttribs.getInteger( XML_r, -1 ); // 1-based row index
if(nRow != -1)
{
aModel.mnRow = nRow;
-mnRow = nRow;
+mnRow = nRow-1; // to 0-based row index.
}
else
aModel.mnRow = ++mnRow;
commit a145e8859c5a878110ec1b346f244c51d1e5a80b
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Mar 13 18:00:19 2014 -0400
fdo#76032: Write test for this.
Change-Id: Iec8d32a4e53d2d5d3cdc9767c2ede7654fe2bdd6
diff --git a/sc/qa/unit/data/xlsx/row-index-1-based.xlsx
b/sc/qa/unit/data/xlsx/row-index-1-based.xlsx
new file mode 100644
index 000..1f60c3b
Binary files /dev/null and b/sc/qa/unit/data/xlsx/row-index-1-based.xlsx differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index f22e1e2..66bfb94 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -127,6 +127,12 @@ public:
//change this test file only in excel and not in calc
void testCellValueXLSX();
+/**
+ * Test importing of xlsx document that previously had its row index off
+ * by one. (fdo#76032)
+ */
+void testRowIndex1BasedXLSX();
+
//misc tests unrelated to the import filters
void testPasswordNew();
void testPasswordOld();
@@ -195,6 +201,7 @@ public:
CPPUNIT_TEST(testDataTableMultiTableXLSX);
CPPUNIT_TEST(testBrokenQuotesCSV);
CPPUNIT_TEST(testCellValueXLSX);
+CPPUNIT_TEST(testRowIndex1BasedXLSX);
CPPUNIT_TEST(testControlImport);
CPPUNIT_TEST(testChartImportODS);
@@ -1417,6 +1424,38 @@ void ScFiltersTest::testCellValueXLSX()
xDocSh-DoClose();
}
+void ScFiltersTest::testRowIndex1BasedXLSX()
+{
+ScDocShellRef xDocSh = loadDoc(row-index-1-based., XLSX);
+CPPUNIT_ASSERT(xDocSh.Is());
+ScDocument* pDoc = xDocSh-GetDocument();
+
+// A1
+OUString aStr = pDoc-GetString(ScAddress(0,0,0));
+CPPUNIT_ASSERT_EQUAL(OUString(Action Plan.Name), aStr);
+
+// B1
+aStr = pDoc-GetString(ScAddress(1,0,0));
+CPPUNIT_ASSERT_EQUAL(OUString(Action Plan.Description), aStr);
+
+// A2
+aStr = pDoc-GetString(ScAddress(0,1,0));
+CPPUNIT_ASSERT_EQUAL(OUString(Jerry), aStr);
+
+// B2 - multi-line text.
+const EditTextObject* pText = pDoc-GetEditText(ScAddress(1,1,0));
+CPPUNIT_ASSERT(pText);
+CPPUNIT_ASSERT(pText-GetParagraphCount() == 3);
+aStr = pText-GetText(0);
+CPPUNIT_ASSERT_EQUAL(OUString(This is a longer Text.), aStr);
+aStr = pText-GetText(1);
+CPPUNIT_ASSERT_EQUAL(OUString(Second line.), aStr);
+aStr = pText-GetText(2);
+CPPUNIT_ASSERT_EQUAL(OUString(Third line.), aStr);
+
+xDocSh-DoClose();
+}
+
void ScFiltersTest::testPassword_Impl(const OUString aFileNameBase)
{
OUString aFileExtension(getFileFormats()[0].pName,
strlen(getFileFormats()[0].pName), RTL_TEXTENCODING_UTF8 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/filter/inc/sheetdatacontext.hxx |4 ++--
sc/source/filter/oox/sheetdatacontext.cxx |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit b5b9da46ceae23b25e963087d00b0ae5b4785c93
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Mar 13 18:01:21 2014 -0400
fdo#76032: This row index is 1-based whereas our own mnRow is 0-based.
Change-Id: I098d300532bef164bef0d40ebf62a6848bc19cb8
(cherry picked from commit ff56553e34dfed01b9226ce7a516dbeb6da32124)
Reviewed-on: https://gerrit.libreoffice.org/8577
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/source/filter/inc/sheetdatacontext.hxx
b/sc/source/filter/inc/sheetdatacontext.hxx
index 3f3e377..880c60e 100644
--- a/sc/source/filter/inc/sheetdatacontext.hxx
+++ b/sc/source/filter/inc/sheetdatacontext.hxx
@@ -129,8 +129,8 @@ private:
boolmbHasFormula; /// True = current cell has
formula data (OOXML only).
boolmbValidRange; /// True = maFmlaData.maFormulaRef
is valid (OOXML only).
-sal_Int32 mnRow;
-sal_Int32 mnCol;
+sal_Int32 mnRow; /// row index (0-based)
+sal_Int32 mnCol; /// column index (0-based)
};
//
diff --git a/sc/source/filter/oox/sheetdatacontext.cxx
b/sc/source/filter/oox/sheetdatacontext.cxx
index 4bd841d..bbda959 100644
--- a/sc/source/filter/oox/sheetdatacontext.cxx
+++ b/sc/source/filter/oox/sheetdatacontext.cxx
@@ -279,11 +279,11 @@ ContextHandlerRef
SheetDataContext::onCreateRecordContext( sal_Int32 nRecId, Seq
void SheetDataContext::importRow( const AttributeList rAttribs )
{
RowModel aModel;
-sal_Int32 nRow = rAttribs.getInteger( XML_r, -1 );
+sal_Int32 nRow = rAttribs.getInteger( XML_r, -1 ); // 1-based row index
if(nRow != -1)
{
aModel.mnRow = nRow;
-mnRow = nRow;
+mnRow = nRow-1; // to 0-based row index.
}
else
aModel.mnRow = ++mnRow;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/chart/PropertyMap.hxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 12ae7672f285da1d4c730315e8db23b3396b71cc Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Fri Mar 14 01:13:19 2014 +0100 fix odf validation error New elements must not be exported into the chart namespace. Change-Id: I295d61224e255dff04ea8564b01a5a438876afc1 diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx index b0118a1..81a18dd 100644 --- a/xmloff/source/chart/PropertyMap.hxx +++ b/xmloff/source/chart/PropertyMap.hxx @@ -218,7 +218,8 @@ const XMLPropertyMapEntry aXMLChartPropMap[] = MAP_SPECIAL_ODF12( ErrorBarRangeNegative, CHART, XML_ERROR_LOWER_RANGE, XML_TYPE_STRING, XML_SCH_CONTEXT_SPECIAL_ERRORBAR_RANGE ), // export only // errorbars properties (chart2) -MAP_ENTRY_ODF_EXT( Weight, CHART, XML_ERROR_STANDARD_WEIGHT, XML_TYPE_DOUBLE), +MAP_ENTRY_ODF_EXT( Weight, LO_EXT, XML_ERROR_STANDARD_WEIGHT, XML_TYPE_DOUBLE), +MAP_ENTRY_ODF_EXT_IMPORT( Weight, CHART, XML_ERROR_STANDARD_WEIGHT, XML_TYPE_DOUBLE), // series/data-point properties MAP_SPECIAL( DataCaption, CHART, XML_DATA_LABEL_NUMBER, XML_TYPE_NUMBER | MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_DATA_LABEL_NUMBER ), // convert one constant ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/qa sc/source
sc/inc/document.hxx |2
sc/qa/unit/data/xlsx/sheet-tab-color.xlsx |binary
sc/qa/unit/subsequent_export-test.cxx | 68 ++
sc/source/filter/excel/excdoc.cxx |3 -
sc/source/filter/excel/excrecds.cxx | 24 +++---
sc/source/filter/inc/excrecds.hxx | 24 +++---
6 files changed, 105 insertions(+), 16 deletions(-)
New commits:
commit 90af4f50e8673975e63c928aa47fbc18eb160046
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Mar 13 22:46:18 2014 -0400
fdo#58307: Write export test for this to ensure it won't go away...
Change-Id: I01ebdfab7d6098402e2911713b0eb51e2003047c
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index d8b4d7c..a6af9fb 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -569,7 +569,7 @@ public:
SC_DLLPUBLIC bool SetCodeName( SCTAB nTab, const OUString rName );
SC_DLLPUBLIC bool GetTable( const OUString rName, SCTAB rTab ) const;
-std::vectorOUString GetAllTableNames() const;
+SC_DLLPUBLIC std::vectorOUString GetAllTableNames() const;
OUString GetCopyTabName(SCTAB nTab) const;
diff --git a/sc/qa/unit/data/xlsx/sheet-tab-color.xlsx
b/sc/qa/unit/data/xlsx/sheet-tab-color.xlsx
new file mode 100644
index 000..896bc3b
Binary files /dev/null and b/sc/qa/unit/data/xlsx/sheet-tab-color.xlsx differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 90da87c..defacfb 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -87,6 +87,8 @@ public:
void testCellBordersXLS();
void testCellBordersXLSX();
+void testSheetTabColorsXLSX();
+
void testSharedFormulaExportXLS();
void testSharedFormulaExportXLSX();
void testSharedFormulaStringResultExportXLSX();
@@ -114,6 +116,7 @@ public:
CPPUNIT_TEST(testSheetProtectionXLSX);
CPPUNIT_TEST(testCellBordersXLS);
CPPUNIT_TEST(testCellBordersXLSX);
+CPPUNIT_TEST(testSheetTabColorsXLSX);
CPPUNIT_TEST(testSharedFormulaExportXLS);
CPPUNIT_TEST(testSharedFormulaExportXLSX);
CPPUNIT_TEST(testSharedFormulaStringResultExportXLSX);
@@ -1089,6 +1092,71 @@ void ScExportTest::testCellBordersXLSX()
testExcelCellBorders(XLSX);
}
+void ScExportTest::testSheetTabColorsXLSX()
+{
+struct
+{
+bool checkContent( ScDocument* pDoc )
+{
+
+std::vectorOUString aTabNames = pDoc-GetAllTableNames();
+
+// green, red, blue, yellow (from left to right).
+if (aTabNames.size() != 4)
+{
+cerr There should be exactly 4 sheets. endl;
+return false;
+}
+
+const char* pNames[] = { Green, Red, Blue, Yellow };
+for (size_t i = 0, n = SAL_N_ELEMENTS(pNames); i n; ++i)
+{
+OUString aExpected = OUString::createFromAscii(pNames[i]);
+if (aExpected != aTabNames[i])
+{
+cerr incorrect sheet name: expected=' aExpected
', actual=' aTabNames[i] ' endl;
+return false;
+}
+}
+
+const ColorData aXclColors[] =
+{
+0xB050, // green
+0x00FF, // red
+0x70C0, // blue
+0x0000, // yellow
+};
+
+for (size_t i = 0, n = SAL_N_ELEMENTS(aXclColors); i n; ++i)
+{
+if (aXclColors[i] != pDoc-GetTabBgColor(i).GetColor())
+{
+cerr wrong sheet color for sheet i endl;
+return false;
+}
+}
+
+return true;
+}
+
+} aTest;
+
+ScDocShellRef xDocSh = loadDoc(sheet-tab-color., XLSX);
+CPPUNIT_ASSERT_MESSAGE(Failed to load file., xDocSh.Is());
+ScDocument* pDoc = xDocSh-GetDocument();
+bool bRes = aTest.checkContent(pDoc);
+CPPUNIT_ASSERT_MESSAGE(Failed on the initial content check., bRes);
+
+ScDocShellRef xDocSh2 = saveAndReload(xDocSh, XLSX);
+CPPUNIT_ASSERT_MESSAGE(Failed to reload file., xDocSh2.Is());
+xDocSh-DoClose();
+pDoc = xDocSh2-GetDocument();
+bRes = aTest.checkContent(pDoc);
+CPPUNIT_ASSERT_MESSAGE(Failed on the content check after reload., bRes);
+
+xDocSh2-DoClose();
+}
+
void ScExportTest::testSharedFormulaExportXLS()
{
struct
commit 5063f31c248fd3c16115582a1e3aef182257a225
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Mar 13 21:49:04 2014 -0400
fdo#58307: Export sheet tab colors to xlsx.
And let's not re-use Biff's XclExpWsbool record class to export SheetPr
elements. That was a bit hacky...
Change-Id: Ia585f53d547af3d6840fce1b1244b60bb5076b07
diff --git a/sc/source/filter/excel/excdoc.cxx
b/sc/source/filter/excel/excdoc.cxx
index 9cf433d..87b17aa 100644
[Libreoffice-commits] core.git: vcl/quartz
vcl/quartz/ctlayout.cxx | 200 ++--
1 file changed, 142 insertions(+), 58 deletions(-)
New commits:
commit eb4fb12fdbe14b929cf8fe5d5785fcfae8d96fa4
Author: Herbert Dürr h...@apache.org
Date: Thu Mar 13 21:53:27 2014 -0500
fdo#55142 CoreText handling of trailing whitespace in justified mode
adapted from be899f92ba and 9581d8a5a9 by Herbert Dürr
Change-Id: I24a1e3773764e94bce74c50a83a2cf202b468dda
diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index 1cb8c48..ec75168 100644
--- a/vcl/quartz/ctlayout.cxx
+++ b/vcl/quartz/ctlayout.cxx
@@ -33,8 +33,8 @@ public:
virtual voidDrawText( SalGraphics ) const SAL_OVERRIDE;
virtual int GetNextGlyphs( int nLen, sal_GlyphId* pOutGlyphIds, Point
rPos, int,
-sal_Int32* pGlyphAdvances, int* pCharIndexes,
-const PhysicalFontFace** pFallbackFonts ) const
SAL_OVERRIDE;
+ sal_Int32* pGlyphAdvances, int*
pCharIndexes,
+ const PhysicalFontFace** pFallbackFonts )
const SAL_OVERRIDE;
virtual longGetTextWidth() const SAL_OVERRIDE;
virtual longFillDXArray( sal_Int32* pDXArray ) const SAL_OVERRIDE;
@@ -58,6 +58,8 @@ private:
CTLineRef mpCTLine;
int mnCharCount;// ==mnEndCharPos-mnMinCharPos
+int mnTrailingSpaceCount;
+double mfTrailingSpaceWidth;
// cached details about the resulting layout
// mutable members since these details are all lazy initialized
@@ -69,12 +71,14 @@ private:
};
CTLayout::CTLayout( const CoreTextStyle* pTextStyle )
-: mpTextStyle( pTextStyle )
-, mpAttrString( NULL )
-, mpCTLine( NULL )
-, mnCharCount( 0 )
-, mfCachedWidth( -1 )
-, mfBaseAdv( 0 )
+: mpTextStyle( pTextStyle )
+, mpAttrString( NULL )
+, mpCTLine( NULL )
+, mnCharCount( 0 )
+, mnTrailingSpaceCount( 0 )
+, mfTrailingSpaceWidth( 0.0 )
+, mfCachedWidth( -1 )
+, mfBaseAdv( 0 )
{
}
@@ -103,12 +107,32 @@ bool CTLayout::LayoutText( ImplLayoutArgs rArgs )
return false;
// create the CoreText line layout
-CFStringRef aCFText = CFStringCreateWithCharactersNoCopy( NULL,
rArgs.mpStr + mnMinCharPos, mnCharCount, kCFAllocatorNull );
+CFStringRef aCFText = CFStringCreateWithCharactersNoCopy( NULL,
+ rArgs.mpStr +
mnMinCharPos,
+ mnCharCount,
+ kCFAllocatorNull
);
// CFAttributedStringCreate copies the attribues parameter
mpAttrString = CFAttributedStringCreate( NULL, aCFText,
mpTextStyle-GetStyleDict() );
mpCTLine = CTLineCreateWithAttributedString( mpAttrString );
CFRelease( aCFText);
+mnTrailingSpaceCount = 0;
+// reverse search for first 'non-space'...
+for( int i = mnEndCharPos - 1; i = mnMinCharPos; i--)
+{
+sal_Unicode nChar = rArgs.mpStr[i];
+if ((nChar = 0x0020) || // blank
+(nChar == 0x00A0) || // non breaking space
+(nChar = 0x2000 nChar = 0x200F) || // whitespace
+(nChar == 0x3000)) // ideographic space
+{
+mnTrailingSpaceCount += 1;
+}
+else
+{
+break;
+}
+}
return true;
}
@@ -117,37 +141,66 @@ void CTLayout::AdjustLayout( ImplLayoutArgs rArgs )
if( !mpCTLine)
return;
-int nOrigWidth = GetTextWidth();
-int nPixelWidth = rArgs.mnLayoutWidth;
-if( nPixelWidth )
-{
-if( nPixelWidth = 0)
-return;
-}
-else if( rArgs.mpDXArray )
-{
-// for now we are only interested in the layout width
-// TODO: use all mpDXArray elements for layouting
-nPixelWidth = rArgs.mpDXArray[ mnCharCount - 1 ];
-}
-
-float fTrailingSpace = CTLineGetTrailingWhitespaceWidth( mpCTLine );
-// in RTL-layouts trailing spaces are leftmost
-// TODO: use BiDi-algorithm to thoroughly check this assumption
-if( rArgs.mnFlags SAL_LAYOUT_BIDI_RTL)
-mfBaseAdv = fTrailingSpace;
-
-// return early if there is nothing to do
-if( nPixelWidth = 0 )
+int nPixelWidth = rArgs.mpDXArray ? rArgs.mpDXArray[ mnCharCount - 1 ] :
rArgs.mnLayoutWidth;
+if( nPixelWidth = 0)
return;
// HACK: justification requests which change the width by just one pixel
are probably
// #i86038# introduced by lossy conversions between integer based
coordinate system
-if( (nOrigWidth = nPixelWidth-1) (nOrigWidth = nPixelWidth+1) )
+int fuzz = (nPixelWidth - GetTextWidth()) / 2;
+if (!fuzz)
+{
return;
+}
-CTLineRef pNewCTLine = CTLineCreateJustifiedLine( mpCTLine, 1.0,
nPixelWidth - fTrailingSpace );
-if( !pNewCTLine ) { //
[Libreoffice-commits] core.git: connectivity/source extensions/source reportdesign/source svx/source sw/source ucb/source
connectivity/source/commontools/dbtools2.cxx | 10 ++--
extensions/source/abpilot/datasourcehandling.cxx |6 +-
reportdesign/source/ui/inc/GeometryHandler.hxx|4 -
reportdesign/source/ui/inspection/GeometryHandler.cxx | 40
svx/source/sidebar/nbdtmg.cxx | 29 ---
sw/source/core/edit/autofmt.cxx | 44 +-
ucb/source/ucp/file/shell.cxx |8 +--
7 files changed, 67 insertions(+), 74 deletions(-)
New commits:
commit 8578aabbc45ce3601fc0cfca89d8914c2e2632d3
Author: Tor Lillqvist t...@collabora.com
Date: Thu Mar 13 10:32:14 2014 +0200
prefix and postfix are single words
Change-Id: I32824c614d070cd4649e18da4a0b91b03bccfaba
diff --git a/connectivity/source/commontools/dbtools2.cxx
b/connectivity/source/commontools/dbtools2.cxx
index f6077d25..2dd7676 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -88,7 +88,7 @@ OUString createStandardTypePart(const Reference XPropertySet
xColProp,const
xColProp-getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION))
= sAutoIncrementValue;
// look if we have to use precisions
sal_Bool bUseLiteral = sal_False;
-OUString sPreFix,sPostFix,sCreateParams;
+OUString sPrefix,sPostfix,sCreateParams;
{
ReferenceXResultSet xRes = xMetaData-getTypeInfo();
if(xRes.is())
@@ -98,8 +98,8 @@ OUString createStandardTypePart(const Reference XPropertySet
xColProp,const
{
OUString sTypeName2Cmp = xRow-getString(1);
sal_Int32 nType = xRow-getShort(2);
-sPreFix = xRow-getString (4);
-sPostFix = xRow-getString (5);
+sPrefix = xRow-getString (4);
+sPostfix = xRow-getString (5);
sCreateParams = xRow-getString(6);
// first identical type will be used if typename is empty
if ( sTypeName.isEmpty() nType == nDataType )
@@ -157,9 +157,9 @@ OUString createStandardTypePart(const Reference
XPropertySet xColProp,const
if ( !aDefault.isEmpty() )
{
aSql.append( DEFAULT );
-aSql.append(sPreFix);
+aSql.append(sPrefix);
aSql.append(aDefault);
-aSql.append(sPostFix);
+aSql.append(sPostfix);
} // if ( aDefault.getLength() )
return aSql.makeStringAndClear();
diff --git a/extensions/source/abpilot/datasourcehandling.cxx
b/extensions/source/abpilot/datasourcehandling.cxx
index 5c5cfe9..06f743a 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -215,11 +215,11 @@ namespace abp
OUString sCheck( _rDataSourceName );
StringBag::const_iterator aPos = m_pImpl-aDataSourceNames.find(
sCheck );
-sal_Int32 nPostFix = 1;
-while ( ( m_pImpl-aDataSourceNames.end() != aPos ) ( nPostFix
65535 ) )
+sal_Int32 nPostfix = 1;
+while ( ( m_pImpl-aDataSourceNames.end() != aPos ) ( nPostfix
65535 ) )
{ // there already is a data source with this name
sCheck = _rDataSourceName;
-sCheck += OUString::number( nPostFix++ );
+sCheck += OUString::number( nPostfix++ );
aPos = m_pImpl-aDataSourceNames.find( sCheck );
}
diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx
b/reportdesign/source/ui/inc/GeometryHandler.hxx
index 272d293..de0b379 100644
--- a/reportdesign/source/ui/inc/GeometryHandler.hxx
+++ b/reportdesign/source/ui/inc/GeometryHandler.hxx
@@ -177,10 +177,10 @@ namespace rptui
/** get the functions supplier for the set scope, default is the
surrounding group.
*
-* \param _rsNamePostFix the name post fix which canbe used when the
scope as name part is needed
+* \param _rsNamePostfix the name postfix which can be used when the
scope as name part is needed
* \return the function supplier
*/
-::com::sun::star::uno::Reference
::com::sun::star::report::XFunctionsSupplier fillScope_throw(OUString
_rsNamePostFix);
+::com::sun::star::uno::Reference
::com::sun::star::report::XFunctionsSupplier fillScope_throw(OUString
_rsNamePostfix);
/** checks if the given function is a default function we know.
*
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx
b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index f6b6730..325b3a7 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -555,8 +555,8 @@ void SAL_CALL GeometryHandler::setPropertyValue(const
OUString PropertyName, c
impl_isCounterFunction_throw(sFunction,m_sScope);
else
{
-
[Libreoffice-qa] bug hunting for 4.2.3
Hi all, As 4.2.3 rc1 is not yet there and the bug hunting session has not been announced, may be we should push it to next week? Cheers Sophie -- Sophie Gautier sophie.gaut...@documentfoundation.org Tel:+33683901545 Membership Certification Committee Member - Co-founder The Document Foundation ___ 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-qa] [ANNOUNCE] Branch libreoffice-4-2-3 and Tag libreoffice-4.2.3.1 created
Hi all, The tag libreoffice-4.2.3.1 (AKA 4.2.3 RC1) and the corresponding branch libreoffice-4-2-3 have been created. The branch will be used for fine tuning of the 4.2.3 release. (there is one additional RC planned) The following rules apply: + preferably just translation or blocker fixes + only cherry-picking from libreoffice-4-2 branch + 2 additional reviews needed; 2nd reviewer pushes + no regular merges back to anything The 'libreoffice-4-2' branch is still active and will be used for the 4.2.4 bugfix release. Please read more at http://wiki.documentfoundation.org/ReleasePlan/4.2#4.2.3_release http://wiki.documentfoundation.org/Development/Branches http://wiki.documentfoundation.org/Release_Criteria Now, if you want to switch your clone to the branch, please do: ./g pull -r ./g checkout -b libreoffice-4-2-3 origin/libreoffice-4-2-3 To checkout the tag, use ./g fetch --tags ./g checkout -b tag-libreoffice-4.2.3.1 libreoffice-4.2.3.1 Hopefully it will work for you :-) Most probably, you will also want to do (if you haven't done it yet): git config --global push.default tracking When you do git push with this, git will push only the branch you are on; e.g. libreoffice-4-2-3 when you have switched to it. This will save you some git shouting at you. Linux distro packages might find source tarballs at http://dev-builds.libreoffice.org/pre-releases/src/ They will soon be available from the official page together with the builds. Attached is the list of changes against 4.2.2 RC1 (4.2.2 final) Happy hacking, Christian + core + (hopefully) fix crash in SvxRuler::MouseMove() (rhbz#1072607) [Michael Stahl] + add Collabora to wordbook [Andras Timar] + add missing files to gallery bullets makefile [Maxim Monastirsky] + add SVG header when exporting via mtf (fdo#74218) [Tomaž Vajngerl] + adjust external references here too. (fdo#75815) [Kohei Yoshida] + adjust reference update on shift for formula groups. (fdo#75053) [Kohei Yoshida] + always run timeouts as events (fdo#73115) [Jan-Marek Glogowski] + avoid unwanted number detection when placing page field name. (fdo#75962) [Kohei Yoshida] + better loose selection than crashing (fdo#74854) [Bjoern Michaelsen] + branch libreoffice-4-2-3 [Christian Lohmaier] + build fix for OSX. [Kohei Yoshida] + build fix on Windows. [Kohei Yoshida] + bump product version to 4.2.3.1 [Christian Lohmaier] + bump version to 4.2.2.0.0+ [Christian Lohmaier] + bump version to 4.2.3.0.0+ [Christian Lohmaier] + chmod spadmin script executable [Michael Stahl] + compress svg files in ODF (fdo#71622) [Andras Timar] + correctly count the length of trailing empty range. (fdo#75718) [Kohei Yoshida] + correctly draw double lines for both Writer and Calc. (fdo#75260) [Kohei Yoshida] + correctly inspect formula result value for xlsx export. (fdo#74747) [Kohei Yoshida] + cppcheck: duplicateIf [Julien Nabet] + delete ranges that are non-empty before pasting from clipboard. (fdo#74573) [Kohei Yoshida] + dereference after null check (coverity#704633) [Caolán McNamara] + do not add multiple empty strings to the validation list (fdo#61520) [Eike Rathke] + DOC import: don't overwrite WW8Num* character styles (bnc#821208) [Miklos Vajna] + DOC import: ignore symbol charset of the symbol font (cp#139) [Miklos Vajna] + DOCX import: avoid layout problem with automatic spacing (bnc#816593, fdo#74357) [Miklos Vajna] + DOCX import: fix context stack when importing header/footer (rhbz#988516) [Michael Stahl] + DOCX import: fix nested tables anchored inside tables (fdo#74357, bnc#779620) [Miklos Vajna] + don't crash in mixed reference/no reference cases, related (fdo#59853) [Markus Mohrhard] + don't delete the kernel when pre-compiled. [Kohei Yoshida] + don't generate broken XML files, related (i#116460) [Markus Mohrhard] + drawingml import: don't set CharEscapementHeight unconditionally (fdo#70220, fdo#72481) [Björgvin Ragnarsson] + ensure that numeric array storage is aligned to 256-byte boundary. [Kohei Yoshida] + filter: make LibXSLTTransformer init backward compatible [Michael Stahl] + fix fix gcc inline assembler operands usage [Rene Engelhard] + fix a crash from crashtest [Julien Nabet] + fix crash in css rgb color handling. [Jan Holesovsky] + fix crash when importing unsupported macro content, related (fdo#59374) [Markus Mohrhard] + fix deselection problems of template view (rhbz#1072553, fdo#74787) [Zolnai Tamás] + fix docked panels borders (fdo#59329) [Ahmad H. Al Harthi] + fix docked window border lines (fdo#59329) [Ahmad H. Al Harthi] + fix highlight RTL Problem at the StartCenter window. (fdo#73869) [Faisal M. Al-Otaibi] + fix incorrect group calc state check. [Kohei Yoshida] + fix invalid string access, related (i#83611) [Markus Mohrhard] + fix
[Libreoffice-qa] QA Call Reminder
Hi All - Public QA call details: *Date*: Monday, March 17, 2014 *Time*: 1830 UTC -- _note the change from previous calls _Looking forward to talking. Warm Regards, Joel ___ 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-qa] minutes of ESC call ...
* Present + Norbert, Bjoern, David, Kohei, Markus, Miklos, Andras, Stephan, Christian, Eike, Michael M, Astron, Caolan, Michael S., Jacobo, Adam * Completed Action Items + run certification script (Kendy) + review HiDPI branch for 4.2 (Kendy, Michael, Caolan) [ mostly pushed to 4.2 should be in 4.2.3 rc1 ] + poke at writer file movement bug (fdo#70422) / gerrit (Miklos) + Announce Gran Canaria (Bjorn) [ no need to book a hotel - making a group booking, poke Bjoern ] [ please poke the wiki if you're coming to avoid ending up on the street: https://wiki.documentfoundation.org/Hackfest/GranCanaria2014 ] + talk with Thorsten wrt. ODF TC representation (Michael S / Andras) [ Andras signing up / paying to join TC for Collabora ] + review / fixup OOXML Strict handling for writer (Miklos) [ 4.2 back-porting done too ] * Pending Action Items: + crashtest box - more research (Moggi/Cloph) [ still trying to dig out which document is causing the grief limited to the writer documents ] + will try filing a lot of small string changes as easy hacks (Astron) + Book Gran Canaria flights (other attendees) * Release Engineering update (Christian) + 4.2.2 announced + distributed at CeBIT already. + 4.2.3 rc1 status + will be ready for public announce tomorrow. + need to encourage marketing not to go over-the-top enterprise-wise for 4.2.3. + Android / iOS remote + problem with laser point patch - needs debugging. + not released yet. * CeBIT update (Michael/Cloph) + lots of interested users at the booth, big noisy trade-show. + a number of translators student contributors too + a number of training people as well. * UX update (Astron) + decision made on the conference logo * GSoC update + applications from March 10th - 21st. + next week! + please consider what you are able to mentor: + https://wiki.documentfoundation.org/Development/GSoC/Ideas + mentors registered on melange * Select All issues their handling (Bjoern / Miklos) + problem with selecting all in the document; but a few basic operations could crash writer: cut, undo, mouse wheel zoom. + tried to work around the latter, and found several others. + most of the issues already fixed by Miklos by now. + concern wrt. other cases: hard to know what is there ? + pointed out 3x bugs (Miklos) + one a non-regression, other 2x already fixed. + happy to handle them as/when. + be a shame to go back to avoiding fixing hard bugs. + we don't allow generic selections, only when the very first item in the document is a table. + if more such problems found, please do let Miklos know. + leave it as-is for now (Bjoern/Miklos) + if reverted, could cause complaints announced as a new feature. + should check / update the assertion too. * Crashtest update (Markus) + kernel bug on the crash-testing VM + still pending on this :-( + partial new data: avoiding writer issues causing crash: http://dev-builds.libreoffice.org/crashtest/f51f03a46102333bac6a7fe06bc8538492f413a5/ + calc is really good; down to ~5 import crashers and ~50 export crashers + hard to see past the duplicates - need to re-run it (Miklos) * Certification update (Stephan/Bjoern) + ran the script; identified a new set of candidates + certification - does it depend on fixing issues in 2x components ? (Kohei) + no, but a competence and community connection test. + seven candidates agreed unanimously. AI: + mail candidates to ask their permission (Stephan) * Gran Canaria hack-fest (Bjoern) + April 24-25, 2014 (Thu-Fri) + add good topic ideas to the wiki page + cf. action items above. * OOXML export validation and ODF validation (Markus) + have support for export validation in our testing framework + tinderebox maintainer need to enable validation, at least on few boxes + Markus will write a mail - wrt. what is necessary to have in your path. + enabled in calc for ODF OOXML now + enabled in chart2 for OOXML + also available in writer - but issues need tackling in the export tests + a chunk is around ordering of elements (Miklos) + these seem to cause no practical problems really. + in Excel element order is important (Markus) + elements are removed if in the wrong order. + hopefully this keeps validation errors under control. + Cloph enabled this on 2x TDF / Linux test-boxes, so they will fail now. + shell wrappers for java validators - can we have them inside the tinderbox script ? (Thorsten) AI: + check them in to save time (Markus) * UX dialog / wiki page to find missing dialogs (Caolan) + very pleased with
[Libreoffice-qa] [ANN] LibreOffice 4.2.3 RC1 test builds available
Hi *, for the upcoming new version 4.2.3, the builds for rc1 are now available on pre-releases. As with the previous builds, there are also 64bit builds for Mac available. See https://wiki.documentfoundation.org/ReleasePlan/4.2#4.2.3_release for the complete schedule. (one additional rc is planned for 4.2.3) Grab the builds from here here: http://dev-builds.libreoffice.org/pre-releases/ If you've a bit of time, please give them a try report any severe bugs not yet in bugzilla here, so we can incorporate them into the release notes. Please note that it takes approximately 24 hours to populate the mirrors, so that's about the time we have to collect feedback. The list of fixed bugs relative to 4.2.2 final (rc1) is here: http://dev-builds.libreoffice.org/pre-releases/src/bugs-libreoffice-4-2-3-release-4.2.3.1.log So playing with the areas touched there also greatly appreciated - and validation that those bugs are really fixed. Thanks a lot for your help, 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/
Re: [Libreoffice-qa] Disallow REOPEN on ancient bugs
Hi there, I'm just wondering whether it's possible to disallow reopening of bugs if they are at least more than a year old (or whatever some arbitrary time period)? I've seen people re-opening bugs that were closed more than 2-3 years ago. This happens quite often. Currently no, but we can add it to our wishlist when we port over to our own infra. We have a running list of to do's as soon as we get stuff set up on our side including locking out the top stuff, making it much harder to move version to a newer version, me too button where it just tallies users who click it, and now maybe a 3-6 month freeze on REOPENED after a bug has been set to FIX - that seems reasonable. Best, Joel ___ 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 31481] [RFE] Split pane in same window for side-by-side proof reading/ translating of 2 different files
https://bugs.freedesktop.org/show_bug.cgi?id=31481 --- Comment #44 from hwtan hwt...@yahoo.com.sg --- Well, with the wide screen that we have today, the split screen feature is better when the splitter is vertical, that is, the two parts of a same document are placed left and right of the screen/windows. -- 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 76099] New: Segfault in ScColumn::GetNeededSize (probably related to Conditional Formats)
https://bugs.freedesktop.org/show_bug.cgi?id=76099 Priority: medium Bug ID: 76099 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Segfault in ScColumn::GetNeededSize (probably related to Conditional Formats) Severity: major Classification: Unclassified OS: Linux (All) Reporter: james_av...@yahoo.com Hardware: x86-64 (AMD64) Status: UNCONFIRMED Version: 4.3.0.0.alpha0+ Master Component: Spreadsheet Product: LibreOffice Created attachment 95686 -- https://bugs.freedesktop.org/attachment.cgi?id=95686action=edit tickers.csv data file needed by the spreadsheet macros Attached is a .ods spreadsheet which uses Conditional Formats. After recently using Conditional Format-Manage to tweak settings, I'm now getting random crashes (segfaults). By random I mean it happens while executing my Basic macro code, but not always at the same place. In fact, inserting MsgBox statements to narrow down the statement causing the crash makes the crash shift to somewhere else (i.e. I put in two MsgBox stmts and it crashed after the first but before the second; then reloaded and inserted additional MsgBox stmts inbetween, and now it runs past all of them and crashes somethere further on). The shifting location of the crash implies memory corruption, e.g. buffer overrun which causes unrelated code to crash. This can be reproduced at will (just can't nail down a particular Basic statement). I will attach a gdb traceback and also a demo spreadsheet and a data file needed by the demo. INSTRUCTIONS FOR REPRODUCING: 1. Download crasher.ods and tickers.csv files. Place the tickers.csv file in /tmp (the path is hard-coded). 2. Open crasher.ods, with macros enabled, and press the dark-yellow Fresh Load button at the top. It will crash immediately. (This button runs the macro Standard.LoadCSV.Reoad_IB_CSV_file but as previouly noted, the location of the crash shifts when MsgBox statements are inserted) -- 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 76099] Segfault in ScColumn::GetNeededSize (probably related to Conditional Formats)
https://bugs.freedesktop.org/show_bug.cgi?id=76099 --- Comment #2 from Jim Avera james_av...@yahoo.com --- Created attachment 95688 -- https://bugs.freedesktop.org/attachment.cgi?id=95688action=edit gdbtrace.log showing SEGFAULT traceback -- 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 76099] Segfault in ScColumn::GetNeededSize (probably related to Conditional Formats)
https://bugs.freedesktop.org/show_bug.cgi?id=76099 --- Comment #1 from Jim Avera james_av...@yahoo.com --- Created attachment 95687 -- https://bugs.freedesktop.org/attachment.cgi?id=95687action=edit crasher.ods - demos the crash -- 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 76078] LO Crash: LO Crashes while saving the docx file containing only opening brace
https://bugs.freedesktop.org/show_bug.cgi?id=76078 --- Comment #5 from tommy27 ba...@quipo.it --- Created attachment 95689 -- https://bugs.freedesktop.org/attachment.cgi?id=95689action=edit error dialog on Win7x64 test file crashes LibO 4.3 alpha under Win7x64 and shows the attached error dialog window Build ID: a53577e6ff3629c4e9219616960d89eea9463593 TinderBox: Win-x86@39, Branch:master, Time: 2014-02-24_01:49:31 -- 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 76078] FILESAVE: crash while saving .docx file containing only opening brace
https://bugs.freedesktop.org/show_bug.cgi?id=76078 tommy27 ba...@quipo.it changed: What|Removed |Added Status|UNCONFIRMED |NEW CC||ba...@quipo.it Summary|LO Crash: LO Crashes while |FILESAVE: crash while |saving the docx file|saving .docx file |containing only opening |containing only opening |brace |brace Keywords||regression Ever confirmed|0 |1 --- Comment #6 from tommy27 ba...@quipo.it --- no crash with 4.1.5.3 and 4.2.1.1 regression -- 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 72558] print preview garbled
https://bugs.freedesktop.org/show_bug.cgi?id=72558 --- Comment #5 from Dmitry Karasik dmi...@karasik.eu.org --- No, I can't upgrade unfortunately because OO is bound to Ubuntu's own upgrade mechanism, and even though I could download and upgrade OO manually, it's against the policy of the organisation. -- 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 76100] New: Other: Connected Arrow Problem
https://bugs.freedesktop.org/show_bug.cgi?id=76100 Priority: medium Bug ID: 76100 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Other: Connected Arrow Problem Severity: normal Classification: Unclassified OS: Mac OS X (All) Reporter: neo...@blake-dair.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.1.2.3 release Component: Drawing Product: LibreOffice Created attachment 95690 -- https://bugs.freedesktop.org/attachment.cgi?id=95690action=edit Screenshot of problem I found that 1. when I create connected arrow from LibreDrawing after close program and open again connected arrow will move from current position. 2.When I save in pdf format color will had change(darker than original) Operating System: Mac OS X Version: 4.1.2.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
[Libreoffice-bugs] [Bug 75757] remove inheritance to std::map and std::vector
https://bugs.freedesktop.org/show_bug.cgi?id=75757 --- Comment #5 from Vasek vaek...@gmail.com --- My mistake, I didn't understand. Now it is ok. I will work on it. Thanks -- 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 76101] New: FILESAVE DOCX : LO exports corrupt document.
https://bugs.freedesktop.org/show_bug.cgi?id=76101 Priority: medium Bug ID: 76101 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FILESAVE DOCX : LO exports corrupt document. Severity: normal Classification: Unclassified OS: All Reporter: sushil.shi...@synerzip.com Hardware: Other Status: UNCONFIRMED Version: 4.2.0.0.alpha0+ Master Component: Writer Product: LibreOffice Created attachment 95692 -- https://bugs.freedesktop.org/attachment.cgi?id=95692action=edit Original file. Open attached file on LO latest master build. Save file as docx. Open saved file on MS Office, it shows file corrupt dialog. -- 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 76104] New: VBA: set font color in cell
https://bugs.freedesktop.org/show_bug.cgi?id=76104 Priority: medium Bug ID: 76104 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: VBA: set font color in cell Severity: normal Classification: Unclassified OS: Linux (All) Reporter: roman.la...@centrum.cz Hardware: Other Status: UNCONFIRMED Version: 4.2.2.1 rc Component: BASIC Product: LibreOffice Created attachment 95695 -- https://bugs.freedesktop.org/attachment.cgi?id=95695action=edit VBA macro with assignment and font color setting Hello, in attached XLS file there is simple VBA macro which (after pressing CZ button) copies cells from list Src to list Dest and sets font color of 2 cells to white: Sub copy_to_CZ1() Sheets(Dest).Range(A2) = Sheets(Src).Range(A3) Sheets(Dest).Range(B2) = Sheets(Src).Range(B3) Sheets(Dest).Range(C2) = Sheets(Src).Range(C3) Sheets(Dest).Range(B2:C2).Font.Color = RGB(255, 255, 255) Sheets(Dest).Range(D2) = Sheets(Src).Range(D3) Sheets(Dest).Range(E2) = Sheets(Src).Range(E3) Sheets(Dest).Select Range(D2).Select End Sub But after pressing CZ button last two assignments aren't executed (but Sheets(Dest).Select and Range(D2).Select is executed). If you delete row with font color setting. All assignments are executed properly. I cannot confirm this bug in other LibreOffice versions but it was working in OpenOffice 3.2.1... Sincerely Laube Roman -- 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 76106] New: File Corruption: RT gets corrupt since the target for hyperlink is exported incorrectly.
https://bugs.freedesktop.org/show_bug.cgi?id=76106 Priority: medium Bug ID: 76106 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: File Corruption: RT gets corrupt since the target for hyperlink is exported incorrectly. Severity: major Classification: Unclassified OS: All Reporter: rajashri.udh...@synerzip.com Hardware: Other Status: UNCONFIRMED Version: unspecified Component: Libreoffice Product: LibreOffice Created attachment 95699 -- https://bugs.freedesktop.org/attachment.cgi?id=95699action=edit Original file File is getting corrupt because the hyperlink is being exported incorrectly. The target in the relationship Id 2 in document.xml.rels is incorrect. -- 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 76106] File Corruption: RT gets corrupt since the target for hyperlink is exported incorrectly.
https://bugs.freedesktop.org/show_bug.cgi?id=76106 Rajashri rajashri.udh...@synerzip.com changed: What|Removed |Added Status|UNCONFIRMED |ASSIGNED Assignee|libreoffice-b...@lists.free |rajashri.udh...@synerzip.co |desktop.org |m Ever confirmed|0 |1 -- 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 74847] UI: add laserpointer feature to android remote
https://bugs.freedesktop.org/show_bug.cgi?id=74847 Faisal Menawer fmalota...@kacst.edu.sa changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |fmalota...@kacst.edu.sa |desktop.org | -- 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 76107] New: File Corruption: RT file gets corrupt due to mismatch in the reference id's in document.xml and comment.xml
https://bugs.freedesktop.org/show_bug.cgi?id=76107 Priority: medium Bug ID: 76107 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: File Corruption: RT file gets corrupt due to mismatch in the reference id's in document.xml and comment.xml Severity: normal Classification: Unclassified OS: All Reporter: umesh.ka...@synerzip.com Hardware: Other Status: UNCONFIRMED Version: 4.3.0.0.alpha0+ Master Component: Writer Product: LibreOffice Issue Simulation: - 1) open the file in LO. 2) save as docx. 3) open the round tripped file in MSO. Expected behavior: The round-tripped file should open without any corruption. Actual: The roundtrip file is resulting in corruption. -- 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 76107] File Corruption: RT file gets corrupt due to mismatch in the reference id's in document.xml and comment.xml
https://bugs.freedesktop.org/show_bug.cgi?id=76107 --- Comment #1 from Umesh Kadam umesh.ka...@synerzip.com --- Created attachment 95700 -- https://bugs.freedesktop.org/attachment.cgi?id=95700action=edit File has comments for paragraphs. -- 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 76100] Other: Connected Arrow Problem
https://bugs.freedesktop.org/show_bug.cgi?id=76100 Dominique Boutry dominique.bout...@laposte.net changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #1 from Dominique Boutry dominique.bout...@laposte.net --- Hi. With LibO 4.2.1.1 on Win7 : - not reproduced in LibO DRAW, - in a drawing into LibO WRITER, impossible because there are no connectors, - if you copy a drawing (with 2 connected images, for instance) from LibO DRAW to LibO WRITER, the line shows a strange behavior : it behaves like a connector (even if there are no connectors in WRITER drawing), but it moves impredictably during any move. Does that look like what you experimented ? Please limit to one bug per file. Thanks. -- 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 76108] New: File Corruption - issue with complex field character end tag [ w:fldChar w:fldCharType=end
https://bugs.freedesktop.org/show_bug.cgi?id=76108 Priority: medium Bug ID: 76108 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: File Corruption - issue with complex field character end tag [ w:fldChar w:fldCharType=end Severity: normal Classification: Unclassified OS: All Reporter: sourav.maha...@synerzip.com Hardware: All Status: UNCONFIRMED Version: 4.3.0.0.alpha0+ Master Component: Writer Product: LibreOffice Created attachment 95702 -- https://bugs.freedesktop.org/attachment.cgi?id=95702action=edit The original file Simulation: 1) Open the attached document in LO. 2) Do Save as docx Expected : The RT file should get opened successfully in MSWord. Actual: The RT file does not open up.It gets corrupted. -- 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 76108] File Corruption - issue with complex field character end tag [ w:fldChar w:fldCharType=end
https://bugs.freedesktop.org/show_bug.cgi?id=76108 --- Comment #1 from Sourav sourav.maha...@synerzip.com --- Created attachment 95703 -- https://bugs.freedesktop.org/attachment.cgi?id=95703action=edit The RT 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 72157] LibreOffice does not release WebDAV file lock on document close (Windows only)
https://bugs.freedesktop.org/show_bug.cgi?id=72157 --- Comment #9 from a.plast...@ads.it --- I have a similar problem opening multiple documents, starting with Ubuntu 11.10 and LO 4.1.3.2. When you open a document on the shared directory (using java EXEC) and a second document on the local file system, the block (on the first, closed just before) remains until the second file is closed. This is a very annoying problem because it forces a user to close any other document before it will be able to edit the remote one. -- 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 76109] New: LO is getting crash on MAC OS X for 'Fields' file
https://bugs.freedesktop.org/show_bug.cgi?id=76109 Priority: medium Bug ID: 76109 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: LO is getting crash on MAC OS X for 'Fields' file Severity: normal Classification: Unclassified OS: All Reporter: dinesh.pa...@synerzip.com Hardware: All Status: UNCONFIRMED Version: 4.3.0.0.alpha0+ Master Component: Writer Product: LibreOffice Created attachment 95704 -- https://bugs.freedesktop.org/attachment.cgi?id=95704action=edit LO crashes while opening docx file because of field issue LO is getting crash while opening docx file on MAC OS X and also on Linux machine. Issue is in CloseFieldCommand function which throws an exception. Steps to reproduce: Open the file in LibreOffice Expected: File should open without any crash. Actual: LO crashes while opening the 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 73113, which changed state. Bug 73113 Summary: LOOKUP function results in #N/A https://bugs.freedesktop.org/show_bug.cgi?id=73113 What|Removed |Added Status|RESOLVED|REOPENED 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
