[Libreoffice-commits] core.git: 2 commits - libreofficekit/README
libreofficekit/README | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit eddd7646d672ea9b0561dacb09da224d098e531e Author: Khaled Hosny Date: Fri Jul 18 08:09:31 2014 +0200 Try to make some sense out of that sentence Change-Id: Ibe9fedb3602d6c8ddbc007b214969c9960ba10b1 diff --git a/libreofficekit/README b/libreofficekit/README index 624d67c..3242ae0 100644 --- a/libreofficekit/README +++ b/libreofficekit/README @@ -2,7 +2,7 @@ LibreOfficeKit ** LibreOfficeKit can be used for accessing LibreOffice functionality -without LibreOffice, through C/C++, without any need to use UNO. +through C/C++, without any need to use UNO. For now it only offers document conversion (in addition to an experimental tiled rendering API). commit 8f082e212de92348a3373cb5c6a1b32590fec418 Author: Khaled Hosny Date: Fri Jul 18 08:05:43 2014 +0200 Typos Change-Id: If91ed85a56c597f9aecbd5e469af4af83d256cfb diff --git a/libreofficekit/README b/libreofficekit/README index 267b20b..624d67c 100644 --- a/libreofficekit/README +++ b/libreofficekit/README @@ -2,7 +2,7 @@ LibreOfficeKit ** LibreOfficeKit can be used for accessing LibreOffice functionality -outwith LibreOffice, through C/C++, without any need to use UNO. +without LibreOffice, through C/C++, without any need to use UNO. For now it only offers document conversion (in addition to an experimental tiled rendering API). @@ -15,7 +15,7 @@ in order to be able to use LOK. You will then be able to access LOK via the functions in LibreOfficeKit.h[xx]. (LibreOfficeKit.hxx is a simple and fully inlined C++ wrapper for the same - functionality as in LibreOfficeKit.h.) +functionality as in LibreOfficeKit.h.) An example program can be seen on: https://github.com/ojwb/lloconv @@ -23,7 +23,7 @@ https://github.com/ojwb/lloconv Tiled Rendering --- -To use LOK Tiled Rendering you will need the follwing before the LOK includes: +To use LOK Tiled Rendering you will need the following before the LOK includes: #define LOK_USE_UNSTABLE_API Currently only bitmap-buffer rendering is supported, with a 32-bit RGBA @@ -34,8 +34,8 @@ to bottom-up). LibreOfficeKitGtk * -Currently consists of only a very basic gtk+ document viewer widget. +Currently consists of only a very basic GTK+ document viewer widget. Currently this simply renders the entire document as one large tile (for -writer) and/or entire sheet for calc, which can be somewhat slow with +Writer) and/or entire sheet for Calc, which can be somewhat slow with larger documents. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice Gerrit News for core on 2014-07-18
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#76754 Speed up registration of new listeners to SfxBroadcaster in https://gerrit.libreoffice.org/10344 from Tobias Lippert about module include, svl + Add unittests for SfxBroadcaster in https://gerrit.libreoffice.org/10343 from Tobias Lippert about module include, svl + fdo#80996:Fix for DataLabel not preserved for ColumnChart after RT in https://gerrit.libreoffice.org/10169 from Dushyant Bhalgami about module chart2, oox + fdo#60712 - Inherits cell styles in inserting rows/columns in https://gerrit.libreoffice.org/10373 from Hideki Ikeda about module svx + fdo#79541 :Corrupt: Shape enclosed within a floating table in https://gerrit.libreoffice.org/9914 from Rajashri Udhoji about module sw, writerfilter + fdo#79343 When searching in Draw or Impress, leave focus in search bar in https://gerrit.libreoffice.org/10362 from Alex Henrie about module sd End of freshness + CppunitTest_sw_ooxmlfieldexport: enable on OS X in https://gerrit.libreoffice.org/10372 from Miklos Vajna about module sw + fdo#63756 build libxml2 with ICU support in https://gerrit.libreoffice.org/10369 from David Tardon about module external + create clang plugin to warn about C-style casts in https://gerrit.libreoffice.org/10367 from Noel Grandin about module compilerplugins, include * Merged changes on master for project core changed in the last 25 hours: + fdo#75757: remove inheritance to std::vector in https://gerrit.libreoffice.org/10363 from Takeshi Abe + add comment in https://gerrit.libreoffice.org/10366 from Noel Grandin + scrolling very slow in calc in https://gerrit.libreoffice.org/10350 from Caolán McNamara + rename the Weak stuff in tools/ref.hxx to WeakRef in https://gerrit.libreoffice.org/10283 from Noel Grandin + Fix FTBFS with TDE support enabled in https://gerrit.libreoffice.org/10348 from Timothy Pearson + fdo#8 Package formula ui files in https://gerrit.libreoffice.org/10365 from Maxim Monastirsky + Renamed brdcst.[hc]xx to SfxBroadcaster.[hc]xx in https://gerrit.libreoffice.org/10342 from Tobias Lippert + fdo#80894 : Rotation value for textframe was missing after RT. in https://gerrit.libreoffice.org/10190 from sushil_shinde * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + VS2013: Make 64 bit shell extensions optional in https://gerrit.libreoffice.org/10163 from David Ostrovsky + fdo#57950 Replace chained append( with operator+) in https://gerrit.libreoffice.org/10149 from Petr Vorel + fdo#79018: LO hangs while opening file. in https://gerrit.libreoffice.org/9564 from Yogesh Bharate + Use assert instead of OSL_ASSERT in sal/ in https://gerrit.libreoffice.org/10113 from Arnaud Versini + fdo#45286: Fix for saving a file as.xlsx destroys link to linked contents in https://gerrit.libreoffice.org/10104 from Robin Kumar + __arm and __arm64 don't exist when building for the simulator. in https://gerrit.libreoffice.org/10103 from Andrzej Hunt + attempt in https://gerrit.libreoffice.org/9939 from Michael Stahl + fdo#78947 : The File gets corrupted when saved in LO in https://gerrit.libreoffice.org/9775 from BisalNayal + move OpenGLContext to SAL in https://gerrit.libreoffice.org/9429 from David Tardon + Changes for Wordml in https://gerrit.libreoffice.org/9013 from Michel Messak + fdo#64945 Remove inconvenient localized symbol code. in https://gerrit.libreoffice.org/8696 from Darshana Padmadas + fdo#77716 : Paragraph spacing is not preserved after RT. in https://gerrit.libreoffice.org/9197 from Tushar Bende + Lots of changes to Tango icons in https://gerrit.libreoffice.org/7987 from Miroslav Mazel + fdo#77121 Header / Footer positions not preserved after RT in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad 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
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/core/data/table1.cxx | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
New commits:
commit 0e4ec4059371826c1742206e2ff6509df19e2cd1
Author: Eike Rathke
Date: Fri Jul 18 00:45:44 2014 +0200
resolved fdo#81294 store correct sheet number during range names update
Change-Id: Ic4c858efa6e7c1a65357ac79f01e6c08f464ae3f
(cherry picked from commit 4011b74eb7650a0eeb99d3acebb9ef60b0fcaab9)
Reviewed-on: https://gerrit.libreoffice.org/10376
Reviewed-by: Kohei Yoshida
Tested-by: Kohei Yoshida
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index e0eb3eb..834dfe1 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -1603,6 +1603,12 @@ void ScTable::UpdateGrow( const ScRange& rArea, SCCOL
nGrowX, SCROW nGrowY )
void ScTable::UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt )
{
+// Store the old tab number in sc::UpdatedRangeNames for
+// ScTokenArray::AdjustReferenceOnInsertedTab() to check with
+// isNameModified()
+if (mpRangeName)
+mpRangeName->UpdateInsertTab(rCxt, nTab);
+
if (nTab >= rCxt.mnInsertPos)
{
nTab += rCxt.mnSheets;
@@ -1610,9 +1616,6 @@ void ScTable::UpdateInsertTab(
sc::RefUpdateInsertTabContext& rCxt )
pDBDataNoName->UpdateMoveTab(nTab - 1 ,nTab);
}
-if (mpRangeName)
-mpRangeName->UpdateInsertTab(rCxt, nTab);
-
if (mpCondFormatList)
mpCondFormatList->UpdateInsertTab(rCxt);
@@ -1624,6 +1627,12 @@ void ScTable::UpdateInsertTab(
sc::RefUpdateInsertTabContext& rCxt )
void ScTable::UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt )
{
+// Store the old tab number in sc::UpdatedRangeNames for
+// ScTokenArray::AdjustReferenceOnDeletedTab() to check with
+// isNameModified()
+if (mpRangeName)
+mpRangeName->UpdateDeleteTab(rCxt, nTab);
+
if (nTab > rCxt.mnDeletePos)
{
nTab -= rCxt.mnSheets;
@@ -1631,9 +1640,6 @@ void ScTable::UpdateDeleteTab(
sc::RefUpdateDeleteTabContext& rCxt )
pDBDataNoName->UpdateMoveTab(nTab + 1,nTab);
}
-if (mpRangeName)
-mpRangeName->UpdateDeleteTab(rCxt, nTab);
-
if (mpCondFormatList)
mpCondFormatList->UpdateDeleteTab(rCxt);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/core/data/table1.cxx | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
New commits:
commit 76a4eee58830b7faf4fa0a89e82df36e352d5b06
Author: Eike Rathke
Date: Fri Jul 18 00:45:44 2014 +0200
resolved fdo#81294 store correct sheet number during range names update
Change-Id: Ic4c858efa6e7c1a65357ac79f01e6c08f464ae3f
(cherry picked from commit 4011b74eb7650a0eeb99d3acebb9ef60b0fcaab9)
Reviewed-on: https://gerrit.libreoffice.org/10374
Reviewed-by: Kohei Yoshida
Tested-by: Kohei Yoshida
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index b7e020f..94cf672 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -1597,6 +1597,12 @@ void ScTable::UpdateGrow( const ScRange& rArea, SCCOL
nGrowX, SCROW nGrowY )
void ScTable::UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt )
{
+// Store the old tab number in sc::UpdatedRangeNames for
+// ScTokenArray::AdjustReferenceOnInsertedTab() to check with
+// isNameModified()
+if (mpRangeName)
+mpRangeName->UpdateInsertTab(rCxt, nTab);
+
if (nTab >= rCxt.mnInsertPos)
{
nTab += rCxt.mnSheets;
@@ -1604,9 +1610,6 @@ void ScTable::UpdateInsertTab(
sc::RefUpdateInsertTabContext& rCxt )
pDBDataNoName->UpdateMoveTab(nTab - 1 ,nTab);
}
-if (mpRangeName)
-mpRangeName->UpdateInsertTab(rCxt, nTab);
-
if (mpCondFormatList)
mpCondFormatList->UpdateInsertTab(rCxt);
@@ -1624,6 +1627,12 @@ void ScTable::UpdateInsertTab(
sc::RefUpdateInsertTabContext& rCxt )
void ScTable::UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt )
{
+// Store the old tab number in sc::UpdatedRangeNames for
+// ScTokenArray::AdjustReferenceOnDeletedTab() to check with
+// isNameModified()
+if (mpRangeName)
+mpRangeName->UpdateDeleteTab(rCxt, nTab);
+
if (nTab > rCxt.mnDeletePos)
{
nTab -= rCxt.mnSheets;
@@ -1631,9 +1640,6 @@ void ScTable::UpdateDeleteTab(
sc::RefUpdateDeleteTabContext& rCxt )
pDBDataNoName->UpdateMoveTab(nTab + 1,nTab);
}
-if (mpRangeName)
-mpRangeName->UpdateDeleteTab(rCxt, nTab);
-
if (mpCondFormatList)
mpCondFormatList->UpdateDeleteTab(rCxt);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source include/svx svx/source
editeng/source/editeng/impedit3.cxx |4 +--
include/svx/svdotext.hxx|1
svx/source/svdraw/svdotext.cxx | 35 +++-
svx/source/svdraw/svdotextdecomposition.cxx | 27 -
4 files changed, 37 insertions(+), 30 deletions(-)
New commits:
commit 9e06714013f1c1f3f66dd14eac15d51d48d07e4a
Author: matteocam
Date: Fri Jul 18 02:16:45 2014 +0200
SdrTextObj::ImpChainText makes a copy of text
Change-Id: Ic44fa0198759fc811c06035d306b91aec7670061
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 48c2450..8d9e41b 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -355,8 +355,8 @@ void ImpEditEngine::FormatFullDoc()
bool ImpEditEngine::IsPageOverflow( const Size aCurPaperSize, const Size
aPrevPaperSize ) const
{
-const bool bTextGrowX=(aStatus & EE_STAT_TEXTWIDTHCHANGED) !=0;
-const bool bTextGrowY=(aStatus & EE_STAT_TEXTHEIGHTCHANGED) !=0;
+const bool bTextGrowX=(aStatus.GetControlWord() &
EE_STAT_TEXTWIDTHCHANGED) !=0;
+const bool bTextGrowY=(aStatus.GetControlWord() &
EE_STAT_TEXTHEIGHTCHANGED) !=0;
const bool bPageExpansionX = ( aPrevPaperSize.Width() != 0 ) && // XXX
( aCurPaperSize.Width() > aPrevPaperSize.Width() );
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 22fced9..93a48cb 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -269,6 +269,7 @@ private:
Rectangle& rPaintRect,
Fraction&aFitXKorreg ) const;
void ImpAutoFitText( SdrOutliner& rOutliner ) const;
+void ImpChainText() const;
static void ImpAutoFitText( SdrOutliner& rOutliner, const Size&
rShapeSize, bool bIsVerticalWriting );
SVX_DLLPRIVATE SdrObject* ImpConvertContainedTextToSdrPathObjs(bool
bToPoly) const;
SVX_DLLPRIVATE void ImpLinkAnmeldung();
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index b24d90d..008ebcf 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1925,13 +1925,46 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus*
pEditStatus )
ImpAutoFitText(*pEdtOutl);
mbInDownScale = false;
}
-else if (IsChained() && pEditStatus->IsOverflow())
+else if (/* TODO: IsChained() && */ pEditStatus->IsPageOverflow())
{
}
}
}
+
+void SdrTextObj::ImpChainText() const
+{
+/* BEGIN Experiments */
+// FIXME(matteocam)
+
+// we use (text) object 0 and 1 for these experiments:
+// copying text from one to the other.
+
+SdrTextObj *pNextTextObj;
+if ( pPage && pPage->GetObjCount() > 1) {
+pNextTextObj = dynamic_cast< SdrTextObj * >(
+pPage->GetObj(1) );
+if ( pNextTextObj == NULL)
+return;
+} else {
+fprintf(stderr, "Make New Object please\n");
+return;
+}
+
+// for debugging purposes:
+// carry out experiments only when setting b=false from gdb
+//bool b = true;
+//if (!b) {
+impCopyTextInTextObj(pNextTextObj); // just do it
+//return;
+//}
+
+/* END Experiments */
+}
+
+
+
/** returns the currently active text. */
SdrText* SdrTextObj::getActiveText() const
{
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx
b/svx/source/svdraw/svdotextdecomposition.cxx
index 59f5acc..9253a9a 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -809,32 +809,6 @@ void SdrTextObj::impDecomposeAutoFitTextPrimitive(
const drawinglayer::primitive2d::SdrAutoFitTextPrimitive2D&
rSdrAutofitTextPrimitive,
const drawinglayer::geometry::ViewInformation2D& aViewInformation) const
{
-/* BEGIN Experiments */
-// FIXME(matteocam)
-
-// we use (text) object 0 and 1 for these experiments:
-// copying text from one to the other.
-
-SdrTextObj *pNextTextObj;
-if ( pPage && pPage->GetObjCount() > 1) {
-pNextTextObj = dynamic_cast< SdrTextObj * >(
-pPage->GetObj(1) );
-if ( pNextTextObj == NULL)
-return;
-} else {
-fprintf(stderr, "Make New Object please\n");
-return;
-}
-
-// for debugging purposes:
-// carry out experiments only when setting b=false from gdb
-//bool b = true;
-//if (!b) {
-impCopyTextInTextObj(pNextTextObj); // just do it
-//return;
-//}
-
-/* END Experiments */
// decompose matrix to have position and size of text
basegfx::B2DVector aScale, aTranslate;
@@ -1523,5 +1497,4 @@ void
SdrTextObj::impGetScrollTextTiming(drawinglayer::animation::AnimationEntryL
}
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab:
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - 2 commits - editeng/source include/editeng svx/source
editeng/source/editeng/impedit.hxx |2 ++
editeng/source/editeng/impedit3.cxx | 18 +++---
include/editeng/editstat.hxx|7 ++-
svx/source/svdraw/svdotext.cxx |4
4 files changed, 19 insertions(+), 12 deletions(-)
New commits:
commit 8f2cfe1d868a43ce293528a09cd44f4e018be755
Author: matteocam
Date: Fri Jul 18 02:03:21 2014 +0200
IsPageOverflow in ImpEditEngine. PageOverflow in EditStatus.
Change-Id: I3f2bba42b1f59278db43990c48cfa600ff739d2f
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index 9252bd0..506d597 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -260,8 +260,6 @@ protected:
throw (::com::sun::star::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
-bool IsPageOverflow( const Size aCurPaperSize, const Size aPrevPaperSize )
const;
-
void ShowDDCursor( const Rectangle& rRect );
void HideDDCursor();
@@ -727,6 +725,8 @@ public:
const Size& GetMaxAutoPaperSize() const { return
aMaxAutoPaperSize; }
voidSetMaxAutoPaperSize( const Size& rSz ) {
aMaxAutoPaperSize = rSz; }
+bool IsPageOverflow( const Size aCurPaperSize, const Size aPrevPaperSize )
const;
+
voidFormatDoc();
voidFormatFullDoc();
voidUpdateViews( EditView* pCurView = 0 );
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index bef5162..48c2450 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -542,11 +542,8 @@ void ImpEditEngine::CheckAutoPageSize()
SetValidPaperSize( aPaperSize );// consider Min, Max
// FIXME(matteocam)
-fprintf( stderr, IsPageOverflow( aStatus.GetStatusWord(),
-IsVertical(),
-aPrevPaperSize,
-aPaperSize)
- ? "YES Overflow!\n" : "NO Overflow!\n" );
+fprintf( stderr, IsPageOverflow(aPaperSize, aPrevPaperSize)
+? "YES Overflow!\n" : "NO Overflow!\n" );
if ( aPaperSize != aPrevPaperSize )
{
diff --git a/include/editeng/editstat.hxx b/include/editeng/editstat.hxx
index 8fd9f40..e62ef82 100644
--- a/include/editeng/editstat.hxx
+++ b/include/editeng/editstat.hxx
@@ -92,8 +92,11 @@ protected:
sal_uLong nControlBits;
sal_Int32 nPrevPara; // for EE_STAT_CRSRLEFTPARA
+boolbIsPageOverflow;
+
public:
-EditStatus(){ nStatusBits = 0; nControlBits = 0;
nPrevPara = -1; }
+EditStatus(){ nStatusBits = 0; nControlBits = 0;
+ nPrevPara = -1; bIsPageOverflow =
false; }
voidClear() { nStatusBits = 0; }
voidSetControlBits( sal_uLong nMask, bool bOn )
@@ -107,6 +110,8 @@ public:
sal_Int32 GetPrevParagraph() const{ return nPrevPara; }
sal_Int32& GetPrevParagraph() { return nPrevPara; }
+
+boolIsPageOverflow() const { return bIsPageOverflow; }
};
#define SPELLCMD_IGNOREWORD 0x0001
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 5d113a9..b24d90d 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1925,6 +1925,10 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus*
pEditStatus )
ImpAutoFitText(*pEdtOutl);
mbInDownScale = false;
}
+else if (IsChained() && pEditStatus->IsOverflow())
+{
+
+}
}
}
commit 02ee8c2b17c8c96ad89a79c8c8c5e419c7161552
Author: matteocam
Date: Thu Jul 17 23:20:07 2014 +0200
IsPageOverflow in ImpEditEngine
Change-Id: If6f7641de8e182df6231db7895d4809a7ddb3acb
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index b225ac6..9252bd0 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -260,6 +260,8 @@ protected:
throw (::com::sun::star::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
+bool IsPageOverflow( const Size aCurPaperSize, const Size aPrevPaperSize )
const;
+
void ShowDDCursor( const Rectangle& rRect );
void HideDDCursor();
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index b291967..bef5162 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -353,19 +353,18 @@ void ImpEditEngine::FormatFullDoc()
FormatDoc();
}
-bool IsPageOverflow(const sal_uInt32 aStatus, bool isVertical,
-const Size aPrevPaperSize, const Size aPaperSize)
+bool ImpEditEngine::IsPageOverflow( const Size aCurPaperSize, const Size
aPrevPape
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 81294, which changed state. Bug 81294 Summary: Insertion of a sheet changes values in other sheets https://bugs.freedesktop.org/show_bug.cgi?id=81294 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/table1.cxx | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
New commits:
commit 4011b74eb7650a0eeb99d3acebb9ef60b0fcaab9
Author: Eike Rathke
Date: Fri Jul 18 00:45:44 2014 +0200
resolved fdo#81294 store correct sheet number during range names update
Change-Id: Ic4c858efa6e7c1a65357ac79f01e6c08f464ae3f
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index daaaf8b..88631d5 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -1591,6 +1591,12 @@ void ScTable::UpdateGrow( const ScRange& rArea, SCCOL
nGrowX, SCROW nGrowY )
void ScTable::UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt )
{
+// Store the old tab number in sc::UpdatedRangeNames for
+// ScTokenArray::AdjustReferenceOnInsertedTab() to check with
+// isNameModified()
+if (mpRangeName)
+mpRangeName->UpdateInsertTab(rCxt, nTab);
+
if (nTab >= rCxt.mnInsertPos)
{
nTab += rCxt.mnSheets;
@@ -1598,9 +1604,6 @@ void ScTable::UpdateInsertTab(
sc::RefUpdateInsertTabContext& rCxt )
pDBDataNoName->UpdateMoveTab(nTab - 1 ,nTab);
}
-if (mpRangeName)
-mpRangeName->UpdateInsertTab(rCxt, nTab);
-
if (mpCondFormatList)
mpCondFormatList->UpdateInsertTab(rCxt);
@@ -1618,6 +1621,12 @@ void ScTable::UpdateInsertTab(
sc::RefUpdateInsertTabContext& rCxt )
void ScTable::UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt )
{
+// Store the old tab number in sc::UpdatedRangeNames for
+// ScTokenArray::AdjustReferenceOnDeletedTab() to check with
+// isNameModified()
+if (mpRangeName)
+mpRangeName->UpdateDeleteTab(rCxt, nTab);
+
if (nTab > rCxt.mnDeletePos)
{
nTab -= rCxt.mnSheets;
@@ -1625,9 +1634,6 @@ void ScTable::UpdateDeleteTab(
sc::RefUpdateDeleteTabContext& rCxt )
pDBDataNoName->UpdateMoveTab(nTab + 1,nTab);
}
-if (mpRangeName)
-mpRangeName->UpdateDeleteTab(rCxt, nTab);
-
if (mpCondFormatList)
mpCondFormatList->UpdateDeleteTab(rCxt);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sc/source
sc/source/filter/xcl97/XclExpChangeTrack.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 0bb67e725d2e323bd6a9fa71e0094c21eb019c80
Author: Kohei Yoshida
Date: Thu Jul 17 15:52:52 2014 -0400
fdo#81470: Fix a crasher during xlsx export with revisions.
Calling Undo() here removes revision entries which also removes formula
cell instances stored in the entries. The problem is that the
XclExpChTrCellContent instances store pointers to these formula instances
for later use, and removing the entries at this location causes deleted
formula instances to get accessed which in turn causes segfault.
Since all revision entries get deleted when the temp change track instance
gets deleted at the end of the revision export, not deleting the entries
here will not cause memory leaks.
Change-Id: I85f8064945a841b684e4fc4a97c3f9bb6a2de353
(cherry picked from commit 3bce16799c34d0b28704c43eae77501c0f6aec1e)
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index 9682964..3a3655d 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -1454,7 +1454,6 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot&
rRoot ) :
{
PushActionRecord( *pScAction );
const ScChangeAction* pPrevAction = pScAction->GetPrev();
-pTempChangeTrack->Undo( pScAction->GetActionNumber(),
pScAction->GetActionNumber() );
pScAction = pPrevAction;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/xcl97/XclExpChangeTrack.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 380855c3588092dc6d7472afb265c2457b163d10
Author: Kohei Yoshida
Date: Thu Jul 17 17:32:12 2014 -0400
Let's use this macro since it's there.
Change-Id: I9b1736bea65a582fb5214521472028835aec28ee
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index 2cd80cc..3aa2a74 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -403,7 +403,7 @@ void XclExpChTrInfo::SaveXml( XclExpXmlStream&
rRevisionHeadersStrm )
XclXmlUtils::GetStreamName( NULL, "revisionLog", mnLogNumber ),
rRevisionHeadersStrm.GetCurrentStream()->getOutputStream(),
"application/vnd.openxmlformats-officedocument.spreadsheetml.revisionLog+xml",
-
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/revisionLog";,
+CREATE_OFFICEDOC_RELATION_TYPE("revisionLog"),
&sRelationshipId );
rRevisionHeadersStrm.WriteAttributes(
@@ -1579,7 +1579,7 @@ static void lcl_WriteUserNamesXml( XclExpXmlStream&
rWorkbookStrm )
OUString( "revisions/userNames.xml" ),
rWorkbookStrm.GetCurrentStream()->getOutputStream(),
"application/vnd.openxmlformats-officedocument.spreadsheetml.userNames+xml",
-
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/usernames";
);
+CREATE_OFFICEDOC_RELATION_TYPE("usernames"));
pUserNames->startElement( XML_users,
XML_xmlns,
"http://schemas.openxmlformats.org/spreadsheetml/2006/main";,
FSNS( XML_xmlns, XML_r ),
"http://schemas.openxmlformats.org/officeDocument/2006/relationships";,
@@ -1603,7 +1603,7 @@ void XclExpChangeTrack::WriteXml( XclExpXmlStream&
rWorkbookStrm )
OUString( "revisions/revisionHeaders.xml" ),
rWorkbookStrm.GetCurrentStream()->getOutputStream(),
"application/vnd.openxmlformats-officedocument.spreadsheetml.revisionHeaders+xml",
-
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/revisionHeaders";
);
+CREATE_OFFICEDOC_RELATION_TYPE("revisionHeaders"));
// OOXTODO: XML_userinfo elements for each user editing the file
// Doesn't seem to be supported by .xls output either (based on
// contents of XclExpChangeTrack::WriteUserNamesStream()).
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - extensions.lst
extensions.lst |8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) New commits: commit d1a02c7ceb2803c3df253b3b4a16993483cd28c3 Author: Andrea Pescetti Date: Thu Jul 17 20:46:17 2014 + #i125272# Bundle dictionaries in Catalan version. diff --git a/extensions.lst b/extensions.lst index f6a91c8..1645c87 100644 --- a/extensions.lst +++ b/extensions.lst @@ -54,7 +54,7 @@ 5c0de383ef649cffefc128cfb36b4d43 http://sourceforge.net/projects/aoo-extensions/files/1456/6/nl-dict-v2.00g.oxt/download "nl-dict-v2.00g.oxt" # French dictionary. -[ language=fr || language=nl || language=de || language=de_DE ] +[ language=fr || language=nl || language=de || language=de_DE || language=ca ] 8f7ca241048c70bd7893995ac4bcca3b http://sourceforge.net/projects/aoo-extensions/files/17340/1/dict411.oxt/download "dict411.oxt" # Italian dictionary. @@ -62,7 +62,7 @@ 67eb02751dda7b2d312a66bcb0505fd2 http://sourceforge.net/projects/aoo-extensions/files/1204/13/dict-it.oxt/download "dict-it.oxt" # Spanish dictionary. -[ language=es ] +[ language=es || language=ca ] 59dd45e6785ed644adbbd73f4f126182 http://sourceforge.net/projects/aoo-extensions/files/1657/3/es_es.oxt/download "es_es.oxt" # Danish dictionary. @@ -139,4 +139,6 @@ [ language=pt || language=pt_PT ] ad882aa5fcd1b48ebc2421b0d25ee178 http://sourceforge.net/projects/aoo-extensions/files/1196/27/oo3x-pt-pt-14.1.1.1.oxt/download "dict-pt.oxt" - +# Catalan. +[ language=ca ] +ed1c612a462490b541297a8522f667d0 http://sourceforge.net/projects/aoo-extensions/files/1205/3/catalan.oxt/download "dict-ca.oxt" ___ 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 #10 from Commit Notification --- Takeshi Abe committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=fffc9b2f262a54a163ff43ceb769c95fa41344ff fdo#75757: remove inheritance to std::vector The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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: basic/source
basic/source/comp/symtbl.cxx | 41 -
basic/source/inc/symtbl.hxx | 13 +
2 files changed, 21 insertions(+), 33 deletions(-)
New commits:
commit fffc9b2f262a54a163ff43ceb769c95fa41344ff
Author: Takeshi Abe
Date: Thu Jul 17 14:19:37 2014 +0900
fdo#75757: remove inheritance to std::vector
... which was introduced at 2110397670695991b3a5cd28a15ba0ffd2a3a611.
Change-Id: If0f634b29e1891574267edf8cc07b24d07a9406c
Reviewed-on: https://gerrit.libreoffice.org/10363
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index b47583e..a8ae8b4 100644
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -110,7 +110,7 @@ SbiSymDef* SbiSymPool::Next()
if( ++nCur >= aData.size() )
return NULL;
else
-return aData[ nCur ];
+return &aData[ nCur ];
}
@@ -177,16 +177,16 @@ void SbiSymPool::Add( SbiSymDef* pDef )
}
-SbiSymDef* SbiSymPool::Find( const OUString& rName ) const
+SbiSymDef* SbiSymPool::Find( const OUString& rName )
{
sal_uInt16 nCount = aData.size();
for( sal_uInt16 i = 0; i < nCount; i++ )
{
-SbiSymDef* p = aData[ nCount - i - 1 ];
-if( ( !p->nProcId || ( p->nProcId == nProcId)) &&
-( p->aName.equalsIgnoreAsciiCase(rName)))
+SbiSymDef &r = aData[ nCount - i - 1 ];
+if( ( !r.nProcId || ( r.nProcId == nProcId)) &&
+( r.aName.equalsIgnoreAsciiCase(rName)))
{
-return p;
+return &r;
}
}
if( pParent )
@@ -200,14 +200,14 @@ SbiSymDef* SbiSymPool::Find( const OUString& rName ) const
}
-SbiSymDef* SbiSymPool::FindId( sal_uInt16 n ) const
+const SbiSymDef* SbiSymPool::FindId( sal_uInt16 n ) const
{
for( sal_uInt16 i = 0; i < aData.size(); i++ )
{
-SbiSymDef* p = aData[ i ];
-if( p->nId == n && ( !p->nProcId || ( p->nProcId == nProcId ) ) )
+const SbiSymDef &r = aData[ i ];
+if( r.nId == n && ( !r.nProcId || ( r.nProcId == nProcId ) ) )
{
-return p;
+return &r;
}
}
if( pParent )
@@ -222,7 +222,7 @@ SbiSymDef* SbiSymPool::FindId( sal_uInt16 n ) const
// find via position (from 0)
-SbiSymDef* SbiSymPool::Get( sal_uInt16 n ) const
+SbiSymDef* SbiSymPool::Get( sal_uInt16 n )
{
if( n >= aData.size() )
{
@@ -230,7 +230,7 @@ SbiSymDef* SbiSymPool::Get( sal_uInt16 n ) const
}
else
{
-return aData[ n ];
+return &aData[ n ];
}
}
@@ -268,10 +268,10 @@ void SbiSymPool::CheckRefs()
{
for( sal_uInt16 i = 0; i < aData.size(); i++ )
{
-SbiSymDef* p = aData[ i ];
-if( !p->IsDefined() )
+SbiSymDef &r = aData[ i ];
+if( !r.IsDefined() )
{
-pParser->Error( SbERR_UNDEF_LABEL, p->GetName() );
+pParser->Error( SbERR_UNDEF_LABEL, r.GetName() );
}
}
}
@@ -479,10 +479,10 @@ void SbiProcDef::Match( SbiProcDef* pOld )
if( !pIn && pOld->pIn )
{
// Replace old entry with the new one
-pOld->pIn->aData[ pOld->nPos ] = this;
nPos = pOld->nPos;
nId = pOld->nId;
pIn = pOld->pIn;
+pIn->aData.replace( nPos, this ).release();
}
delete pOld;
}
@@ -536,13 +536,4 @@ SbiConstDef* SbiConstDef::GetConstDef()
return this;
}
-SbiSymbols::~SbiSymbols()
-{
-for( const_iterator it = begin(); it != end(); ++it )
-{
-delete *it;
-}
-};
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index c2bc4f0..69f0d84 100644
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_BASIC_SOURCE_INC_SYMTBL_HXX
#include
+#include
class SbiConstDef;
class SbiParser;
@@ -50,11 +51,7 @@ public:
};
-class SbiSymbols : public std::vector
-{
-public:
-~SbiSymbols();
-};
+typedef boost::ptr_vector SbiSymbols;
class SbiSymPool {
friend class SbiSymDef;
@@ -81,9 +78,9 @@ public:
SbiSymDef* AddSym( const OUString& );
SbiProcDef* AddProc( const OUString& );
void Add( SbiSymDef* );
-SbiSymDef* Find( const OUString& ) const; // variable name
-SbiSymDef* FindId( sal_uInt16 ) const;
-SbiSymDef* Get( sal_uInt16 ) const; // find variable per position
+SbiSymDef* Find( const OUString& ); // variable name
+const SbiSymDef* FindId( sal_uInt16 ) const;
+SbiSymDef* Get( sal_uInt16 ); // find variable per position
SbiSymDef* First(), *Next();// iterators
sal_uInt32 Define( const OUString& );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/filter/xcl97/XclExpChangeTrack.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 0db60837932a5f2f09dc88eb977c1bbf31b911e8
Author: Kohei Yoshida
Date: Thu Jul 17 15:52:52 2014 -0400
fdo#81470: Fix a crasher during xlsx export with revisions.
Calling Undo() here removes revision entries which also removes formula
cell instances stored in the entries. The problem is that the
XclExpChTrCellContent instances store pointers to these formula instances
for later use, and removing the entries at this location causes deleted
formula instances to get accessed which in turn causes segfault.
Since all revision entries get deleted when the temp change track instance
gets deleted at the end of the revision export, not deleting the entries
here will not cause memory leaks.
Change-Id: I85f8064945a841b684e4fc4a97c3f9bb6a2de353
(cherry picked from commit 3bce16799c34d0b28704c43eae77501c0f6aec1e)
Reviewed-on: https://gerrit.libreoffice.org/10370
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index cf43455..4546a1d 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -1408,7 +1408,6 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot&
rRoot ) :
{
PushActionRecord( *pScAction );
const ScChangeAction* pPrevAction = pScAction->GetPrev();
-pTempChangeTrack->Undo( pScAction->GetActionNumber(),
pScAction->GetActionNumber() );
pScAction = pPrevAction;
}
___
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/xcl97/XclExpChangeTrack.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit c7727b1c1682a1373668c898a2de1b1627a09d8c
Author: Kohei Yoshida
Date: Thu Jul 17 15:52:52 2014 -0400
fdo#81470: Fix a crasher during xlsx export with revisions.
Calling Undo() here removes revision entries which also removes formula
cell instances stored in the entries. The problem is that the
XclExpChTrCellContent instances store pointers to these formula instances
for later use, and removing the entries at this location causes deleted
formula instances to get accessed which in turn causes segfault.
Since all revision entries get deleted when the temp change track instance
gets deleted at the end of the revision export, not deleting the entries
here will not cause memory leaks.
Change-Id: I85f8064945a841b684e4fc4a97c3f9bb6a2de353
(cherry picked from commit 3bce16799c34d0b28704c43eae77501c0f6aec1e)
Reviewed-on: https://gerrit.libreoffice.org/10371
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index 7033b3e..4589aea 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -1443,7 +1443,6 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot&
rRoot ) :
{
PushActionRecord( *pScAction );
const ScChangeAction* pPrevAction = pScAction->GetPrev();
-pTempChangeTrack->Undo( pScAction->GetActionNumber(),
pScAction->GetActionNumber() );
pScAction = pPrevAction;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/dialogs/res_ErrorBar.cxx | 20
chart2/source/controller/inc/res_ErrorBar.hxx |2 ++
2 files changed, 14 insertions(+), 8 deletions(-)
New commits:
commit 1e2107e76b9dbd1213b811960c86f8eae57457e5
Author: Katarina Behrens
Date: Thu Jul 17 22:35:46 2014 +0200
fdo#77319: set spinbox value AFTER adjusting no. of decimal places
Doing it the other way round truncates the values
Change-Id: Ieb14c9d1b9dde496eac24737aced7c8da8ce1346
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx
b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 60b4987..8157301 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -93,6 +93,8 @@ ErrorBarResources::ErrorBarResources( VclBuilderContainer*
pParent, Dialog * pPa
m_eErrorBarType( eType ),
m_nConstDecimalDigits( 1 ),
m_nConstSpinSize( 1 ),
+m_fPlusValue(0.0),
+m_fMinusValue(0.0),
m_pParentDialog( pParentDialog ),
m_pCurrentRangeChoosingField( 0 ),
m_bHasInternalDataProvider( true ),
@@ -271,6 +273,13 @@ void ErrorBarResources::UpdateControlStates()
m_pMfNegative->SetDecimalDigits( m_nConstDecimalDigits );
m_pMfNegative->SetSpinSize( m_nConstSpinSize );
}
+
+sal_Int32 nPlusValue = static_cast< sal_Int32 >( m_fPlusValue *
pow(10.0,m_pMfPositive->GetDecimalDigits()) );
+sal_Int32 nMinusValue = static_cast< sal_Int32 >( m_fMinusValue *
pow(10.0,m_pMfNegative->GetDecimalDigits()) );
+
+m_pMfPositive->SetValue( nPlusValue );
+m_pMfNegative->SetValue( nMinusValue );
+
m_pMfPositive->SetCustomUnitText( aCustomUnit );
m_pMfNegative->SetCustomUnitText( aCustomUnit );
@@ -530,24 +539,19 @@ void ErrorBarResources::Reset(const SfxItemSet& rInAttrs)
// parameters
aState = rInAttrs.GetItemState( SCHATTR_STAT_CONSTPLUS, true, &pPoolItem );
m_bPlusUnique = ( aState != SFX_ITEM_DONTCARE );
-double fPlusValue = 0.0;
if( aState == SFX_ITEM_SET )
{
-fPlusValue = ((const SvxDoubleItem*) pPoolItem)->GetValue();
-sal_Int32 nPlusValue = static_cast< sal_Int32 >( fPlusValue *
pow(10.0,m_pMfPositive->GetDecimalDigits()) );
-m_pMfPositive->SetValue( nPlusValue );
+m_fPlusValue = ((const SvxDoubleItem*) pPoolItem)->GetValue();
}
aState = rInAttrs.GetItemState( SCHATTR_STAT_CONSTMINUS, true, &pPoolItem
);
m_bMinusUnique = ( aState != SFX_ITEM_DONTCARE );
if( aState == SFX_ITEM_SET )
{
-double fMinusValue = ((const SvxDoubleItem*) pPoolItem)->GetValue();
-sal_Int32 nMinusValue = static_cast< sal_Int32 >( fMinusValue *
pow(10.0,m_pMfNegative->GetDecimalDigits()) );
-m_pMfNegative->SetValue( nMinusValue );
+m_fMinusValue = ((const SvxDoubleItem*) pPoolItem)->GetValue();
if( m_eErrorKind != CHERROR_RANGE &&
-fPlusValue == fMinusValue )
+m_fPlusValue == m_fMinusValue )
m_pCbSyncPosNeg->Check();
}
diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx
b/chart2/source/controller/inc/res_ErrorBar.hxx
index b69f766..0ad485c 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -113,6 +113,8 @@ private:
tErrorBarTypem_eErrorBarType;
sal_uInt16 m_nConstDecimalDigits;
sal_Int64m_nConstSpinSize;
+double m_fPlusValue;
+double m_fMinusValue;
Dialog * m_pParentDialog;
boost::scoped_ptr< RangeSelectionHelper > m_apRangeSelectionHelper;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/xcl97/XclExpChangeTrack.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 3bce16799c34d0b28704c43eae77501c0f6aec1e
Author: Kohei Yoshida
Date: Thu Jul 17 15:52:52 2014 -0400
fdo#81470: Fix a crasher during xlsx export with revisions.
Calling Undo() here removes revision entries which also removes formula
cell instances stored in the entries. The problem is that the
XclExpChTrCellContent instances store pointers to these formula instances
for later use, and removing the entries at this location causes deleted
formula instances to get accessed which in turn causes segfault.
Since all revision entries get deleted when the temp change track instance
gets deleted at the end of the revision export, not deleting the entries
here will not cause memory leaks.
Change-Id: I85f8064945a841b684e4fc4a97c3f9bb6a2de353
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index 9b4d5d0..2cd80cc 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -1402,7 +1402,6 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot&
rRoot ) :
{
PushActionRecord( *pScAction );
const ScChangeAction* pPrevAction = pScAction->GetPrev();
-pTempChangeTrack->Undo( pScAction->GetActionNumber(),
pScAction->GetActionNumber() );
pScAction = pPrevAction;
}
___
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/source
sc/inc/chgtrack.hxx |2
sc/source/core/tool/chgtrack.cxx | 106 ---
2 files changed, 57 insertions(+), 51 deletions(-)
New commits:
commit ebd8d28361a3c0f420346fcafcecadef09efbda5
Author: Kohei Yoshida
Date: Thu Jul 17 15:25:12 2014 -0400
Scope reduction.
Change-Id: I4caeaf3565255ab141fc4951f1bd149a7af6bb8f
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 8373605..48e4f7f 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -3163,65 +3163,64 @@ void ScChangeTrack::Undo( sal_uLong nStartAction,
sal_uLong nEndAction, bool bMe
// Deletes are in right order
ScChangeAction* pAct = IsLastAction(j) ? pLast : GetAction(j);
-if ( pAct )
+if (!pAct)
+continue;
+
+if ( pAct->IsDeleteType() )
{
-if ( pAct->IsDeleteType() )
+if (j == nEndAction || (pAct != pLast &&
((ScChangeActionDel*)pAct)->IsTopDelete()))
{
-if ( j == nEndAction || (pAct != pLast &&
-((ScChangeActionDel*)pAct)->IsTopDelete()) )
-{
-SetInDeleteTop( true );
-SetInDeleteRange( ((ScChangeActionDel*)pAct)->
-GetOverAllRange().MakeRange() );
-}
+SetInDeleteTop( true );
+SetInDeleteRange(
((ScChangeActionDel*)pAct)->GetOverAllRange().MakeRange() );
}
-UpdateReference( pAct, true );
-SetInDeleteTop( false );
-Remove( pAct );
-if ( IsInPasteCut() )
-aPasteCutMap.insert( ::std::make_pair(
pAct->GetActionNumber(), pAct ) );
-else
-{
-if ( j == nStartAction && pAct->GetType() == SC_CAT_MOVE )
+}
+UpdateReference( pAct, true );
+SetInDeleteTop( false );
+Remove( pAct );
+if ( IsInPasteCut() )
+{
+aPasteCutMap.insert( ::std::make_pair(
pAct->GetActionNumber(), pAct ) );
+continue;
+}
+
+if ( j == nStartAction && pAct->GetType() == SC_CAT_MOVE )
+{
+ScChangeActionMove* pMove = (ScChangeActionMove*) pAct;
+sal_uLong nStart = pMove->GetStartLastCut();
+sal_uLong nEnd = pMove->GetEndLastCut();
+if ( nStart && nStart <= nEnd )
+{ // Recover LastCut
+//! Break Links before Cut Append
+pMove->RemoveAllLinks();
+StartBlockModify( SC_CTM_APPEND, nStart );
+for ( sal_uLong nCut = nStart; nCut <= nEnd; nCut++ )
{
-ScChangeActionMove* pMove = (ScChangeActionMove*) pAct;
-sal_uLong nStart = pMove->GetStartLastCut();
-sal_uLong nEnd = pMove->GetEndLastCut();
-if ( nStart && nStart <= nEnd )
-{ // Recover LastCut
-//! Break Links before Cut Append
-pMove->RemoveAllLinks();
-StartBlockModify( SC_CTM_APPEND, nStart );
-for ( sal_uLong nCut = nStart; nCut <= nEnd;
nCut++ )
-{
-ScChangeActionMap::iterator itCut =
aPasteCutMap.find( nCut );
+ScChangeActionMap::iterator itCut = aPasteCutMap.find(
nCut );
-if ( itCut != aPasteCutMap.end() )
-{
-OSL_ENSURE( aMap.find( nCut ) ==
aMap.end(), "ScChangeTrack::Undo: nCut dup" );
-Append( itCut->second, nCut );
-aPasteCutMap.erase( itCut );
-}
-else
-{
-OSL_FAIL( "ScChangeTrack::Undo: nCut not
found" );
-}
-}
-EndBlockModify( nEnd );
-ResetLastCut();
-nStartLastCut = nStart;
-nEndLastCut = nEnd;
-pLastCutMove = pMove;
-SetLastCutMoveRange(
-pMove->GetFromRange().MakeRange(), pDoc );
+if ( itCut != aPasteCutMap.end() )
+{
+OSL_ENSURE( aMap.find( nCut ) == aMap.end(),
"ScChangeTrack::Undo: nCut dup" );
+Append( i
[Libreoffice-commits] core.git: Branch 'feature/calctiledrendering4' - 8 commits - desktop/Library_sofficeapp.mk desktop/source libreofficekit/qa libreofficekit/source sd/source
desktop/Library_sofficeapp.mk |8
desktop/source/app/app.cxx | 12 +++---
desktop/source/app/sofficemain.cxx | 14 +++
desktop/source/lib/init.cxx | 30 ++-
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |9
libreofficekit/qa/unit/tiledrendering.cxx | 19 +
libreofficekit/source/shim.c| 39 +---
sd/source/ui/inc/DrawViewShell.hxx |2 -
sd/source/ui/unoidl/unomodel.cxx|9 +++-
9 files changed, 112 insertions(+), 30 deletions(-)
New commits:
commit 4118724dd506269b836d08fbe42207b76632eac8
Author: Andrzej Hunt
Date: Thu Jul 17 20:20:24 2014 +0200
libreofficekit_tiledrendering test: force lock file removal
If the lock file still exists when running this test, LOK will fail
resulting in "documentLoad failed: unknown load failure"
(the actual error is that the lock file dialog cannot be confirmed
by the user in headless mode, resulting in loading failure, however
this is then hidden by multiple layers of exception redirection
in sfx2).
Change-Id: I025ea6187c3d17805f25ab6f756eae9646f2c7c8
diff --git a/libreofficekit/qa/unit/tiledrendering.cxx
b/libreofficekit/qa/unit/tiledrendering.cxx
index dbe5b52..cec35ed 100644
--- a/libreofficekit/qa/unit/tiledrendering.cxx
+++ b/libreofficekit/qa/unit/tiledrendering.cxx
@@ -14,6 +14,7 @@
#include
#include
#include
+#include
#include
#include
@@ -66,6 +67,13 @@ void TiledRenderingTest::testOverlay()
const string sInstDir = getenv( "INSTDIR" );
const string sLOPath = sInstDir + "/program";
const string sDocPath = sSrcRoot +
"/odk/examples/java/DocumentHandling/test/test1.odt";
+const string sLockFile = sSrcRoot +
"/odk/examples/java/DocumentHandling/test/.~lock.test1.odt#";
+
+// FIXME: this is a temporary hack: LOK will fail when trying to open a
+// locked file, and since we're reusing the file for a different unit
+// test it's entirely possible that an unwanted lock file will remain.
+// Hence forcefully remove it here.
+remove( sLockFile.c_str() );
scoped_ptr< Office > pOffice( lok_cpp_init(
sLOPath.c_str() ) );
commit f2720469cc16727ccc616d56466d79af21690b7b
Author: Matúš Kukan
Date: Thu Jul 17 10:35:49 2014 +0200
Fix some CppunitTest_libreofficekit_tiledrendering related problems
Change-Id: Icdcde0af1b3d5744ef2842e4b4d2b85a094ac686
diff --git a/libreofficekit/qa/unit/tiledrendering.cxx
b/libreofficekit/qa/unit/tiledrendering.cxx
index d0e9f34..dbe5b52 100644
--- a/libreofficekit/qa/unit/tiledrendering.cxx
+++ b/libreofficekit/qa/unit/tiledrendering.cxx
@@ -63,7 +63,8 @@ static void dumpRGBABitmap( const OUString& rPath, const
unsigned char* pBuffer,
void TiledRenderingTest::testOverlay()
{
const string sSrcRoot = getenv( "SRC_ROOT" );
-const string sLOPath = sSrcRoot + "/instdir/program";
+const string sInstDir = getenv( "INSTDIR" );
+const string sLOPath = sInstDir + "/program";
const string sDocPath = sSrcRoot +
"/odk/examples/java/DocumentHandling/test/test1.odt";
scoped_ptr< Office > pOffice( lok_cpp_init(
diff --git a/libreofficekit/source/shim.c b/libreofficekit/source/shim.c
index ac272e8..b533a61 100644
--- a/libreofficekit/source/shim.c
+++ b/libreofficekit/source/shim.c
@@ -22,7 +22,7 @@
#endif
#define TARGET_LIB"lib" "sofficeapp" ".so"
-#define TARGET_MERGED_LIB "lib" "libmergedlo" ".so"
+#define TARGET_MERGED_LIB "lib" "mergedlo" ".so"
typedef LibreOfficeKit *(HookFunction)( const char *install_path);
commit ea7dc5f61722cd9459127762daa473c6659d5e35
Author: Jan Holesovsky
Date: Wed Jul 16 19:36:53 2014 +0200
LibreOfficeKit: Check for libmerged too.
And avoid some strcat's when at it.
Change-Id: I0c70ee2a1abf0c9e2914f756b06bedc3a16df19b
diff --git a/libreofficekit/source/shim.c b/libreofficekit/source/shim.c
index 6a3f9a7..ac272e8 100644
--- a/libreofficekit/source/shim.c
+++ b/libreofficekit/source/shim.c
@@ -10,9 +10,9 @@
#ifdef LINUX
#include
+#include
#include
-#include
#include
#include
@@ -21,37 +21,52 @@
# include
#endif
-#define TARGET_LIB SAL_MODULENAME( "sofficeapp" )
+#define TARGET_LIB"lib" "sofficeapp" ".so"
+#define TARGET_MERGED_LIB "lib" "libmergedlo" ".so"
typedef LibreOfficeKit *(HookFunction)( const char *install_path);
SAL_DLLPUBLIC_EXPORT LibreOfficeKit *lok_init( const char *install_path )
{
char *imp_lib;
+size_t partial_length;
void *dlhandle;
HookFunction *pSym;
-if( !install_path )
+if (!install_path)
return NULL;
-if( !( imp_lib = (char *) malloc( strlen (install_path) + sizeof(
TARGET_LIB ) + 2 ) ) )
+
+// allocate large enough buffer
+partial_length = strlen(ins
[Libreoffice-commits] core.git: 2 commits - libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk libreofficekit/qa
libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk |3 -
libreofficekit/qa/unit/tiledrendering.cxx | 33
2 files changed, 35 insertions(+), 1 deletion(-)
New commits:
commit 8ab7cbe751a1b643a2a72f06da2c8d7b9a3a3b31
Author: Andrzej Hunt
Date: Thu Jul 17 20:20:24 2014 +0200
libreofficekit_tiledrendering test: force lock file removal
If the lock file still exists when running this test, LOK will fail
resulting in "documentLoad failed: unknown load failure"
(the actual error is that the lock file dialog cannot be confirmed
by the user in headless mode, resulting in loading failure, however
this is then hidden by multiple layers of exception redirection
in sfx2).
Change-Id: I025ea6187c3d17805f25ab6f756eae9646f2c7c8
diff --git a/libreofficekit/qa/unit/tiledrendering.cxx
b/libreofficekit/qa/unit/tiledrendering.cxx
index dbe5b52..cec35ed 100644
--- a/libreofficekit/qa/unit/tiledrendering.cxx
+++ b/libreofficekit/qa/unit/tiledrendering.cxx
@@ -14,6 +14,7 @@
#include
#include
#include
+#include
#include
#include
@@ -66,6 +67,13 @@ void TiledRenderingTest::testOverlay()
const string sInstDir = getenv( "INSTDIR" );
const string sLOPath = sInstDir + "/program";
const string sDocPath = sSrcRoot +
"/odk/examples/java/DocumentHandling/test/test1.odt";
+const string sLockFile = sSrcRoot +
"/odk/examples/java/DocumentHandling/test/.~lock.test1.odt#";
+
+// FIXME: this is a temporary hack: LOK will fail when trying to open a
+// locked file, and since we're reusing the file for a different unit
+// test it's entirely possible that an unwanted lock file will remain.
+// Hence forcefully remove it here.
+remove( sLockFile.c_str() );
scoped_ptr< Office > pOffice( lok_cpp_init(
sLOPath.c_str() ) );
commit 74eb70f957c28aa3fd3de0f215f31310608ab562
Author: Andrzej Hunt
Date: Fri Jul 11 10:23:15 2014 +0200
Add png dumping to LOK tiled rendering test.
This allows for easier visual comparisons (i.e. currently the test
would be failing for some tiles).
Change-Id: I5b174375b57ffe0edd2700fdec411a83669e4a34
diff --git a/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk
b/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk
index 3c41c0a..4b77fbf 100644
--- a/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk
+++ b/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk
@@ -21,9 +21,10 @@ $(eval $(call
gb_CppunitTest_use_external,libreofficekit_tiledrendering,boost_he
# our test specifically tests LOK only functionality which would otherwise not
# require any normal LO api/libraries.
$(eval $(call gb_CppunitTest_use_libraries,libreofficekit_tiledrendering, \
- test \
cppu \
sal \
+ tl \
+ test \
vcl \
$(gb_UWINAPI) \
))
diff --git a/libreofficekit/qa/unit/tiledrendering.cxx
b/libreofficekit/qa/unit/tiledrendering.cxx
index 67fa62e..dbe5b52 100644
--- a/libreofficekit/qa/unit/tiledrendering.cxx
+++ b/libreofficekit/qa/unit/tiledrendering.cxx
@@ -16,6 +16,10 @@
#include
#include
+#include
+#include
+#include
+#include
#define LOK_USE_UNSTABLE_API
#include
@@ -39,6 +43,23 @@ public:
CPPUNIT_TEST_SUITE_END();
};
+// Our dumped .png files end up in
+// workdir/CppunitTest/libreofficekit_tiledrendering.test.core
+
+static void dumpRGBABitmap( const OUString& rPath, const unsigned char*
pBuffer,
+const int nWidth, const int nHeight )
+{
+Bitmap aBitmap( Size( nWidth, nHeight ), 32 );
+Bitmap::ScopedWriteAccess pWriteAccess( aBitmap );
+memcpy( pWriteAccess->GetBuffer(), pBuffer, 4*nWidth*nHeight );
+
+BitmapEx aBitmapEx( aBitmap );
+vcl::PNGWriter aWriter( aBitmapEx );
+SvFileStream sOutput( rPath, STREAM_WRITE );
+aWriter.Write( sOutput );
+sOutput.Close();
+}
+
void TiledRenderingTest::testOverlay()
{
const string sSrcRoot = getenv( "SRC_ROOT" );
@@ -82,6 +103,8 @@ void TiledRenderingTest::testOverlay()
pDocument->paintTile( pLarge.get(), nTotalWidthPix, nTotalHeightPix,
&nRowStride,
0, 0,
nTotalWidthDoc, nTotalHeightDoc );
+dumpRGBABitmap( "large.png", pLarge.get(), nTotalWidthPix, nTotalHeightPix
);
+
scoped_array< unsigned char > pSmall[4];
for ( int i = 0; i < 4; i++ )
{
@@ -90,6 +113,8 @@ void TiledRenderingTest::testOverlay()
// Tile 0/2: left. Tile 1/3: right. Tile 0/1:
top. Tile 2/3: bottom
((i%2 == 0) ? 0 : nTotalWidthDoc / 2), ((i < 2
) ? 0 : nTotalHeightDoc / 2),
nTotalWidthDoc / 2, nTotalHeightDoc / 2);
+dumpRGBABitmap( "small_" + OUString::number(i) + ".png",
+pSmall[i].get(), nTotalWidthPix/2, nTotalHeightPix/2 );
}
[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/filter/inc/XclExpChangeTrack.hxx |9 +++-
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 54 +++
2 files changed, 29 insertions(+), 34 deletions(-)
New commits:
commit c003fca9f077958f4c73a80f56634e08c454b4e7
Author: Kohei Yoshida
Date: Thu Jul 17 13:39:17 2014 -0400
And this too.
Change-Id: Ie8772de1d5b56b994c951ada09ee54afffceeb4f
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx
b/sc/source/filter/inc/XclExpChangeTrack.hxx
index c650d36..2ef29b7 100644
--- a/sc/source/filter/inc/XclExpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclExpChangeTrack.hxx
@@ -570,10 +570,11 @@ public:
class XclExpChangeTrack : protected XclExpRoot
{
typedef boost::ptr_vector RecListType;
+typedef boost::ptr_vector TabIdBufferType;
RecListType maRecList; // list of "Revision Log" stream records
std::stack aActionStack;
XclExpChTrTabIdBuffer*pTabIdBuffer;
-std::vector maBuffers;
+TabIdBufferType maBuffers;
ScDocument* pTempDoc; // empty document
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index c96169a..9b4d5d0 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -1459,10 +1459,6 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot&
rRoot ) :
XclExpChangeTrack::~XclExpChangeTrack()
{
-std::vector::iterator pIter;
-for ( pIter = maBuffers.begin(); pIter != maBuffers.end(); ++pIter )
-delete *pIter;
-
while( !aActionStack.empty() )
{
delete aActionStack.top();
commit 1409c9b703530beaa2bf4118f1501d675f8a535e
Author: Kohei Yoshida
Date: Thu Jul 17 13:36:41 2014 -0400
We can use ptr_vector for this.
Change-Id: I3972fb23557f61ce3dbe0e671ed4c3f434a98f8b
diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx
b/sc/source/filter/inc/XclExpChangeTrack.hxx
index 2bfa1bb..c650d36 100644
--- a/sc/source/filter/inc/XclExpChangeTrack.hxx
+++ b/sc/source/filter/inc/XclExpChangeTrack.hxx
@@ -29,6 +29,8 @@
#include "ftools.hxx"
#include "excrecds.hxx"
+#include
+
// XclExpUserBView - one UserBView record for each user
class XclExpUserBView : public ExcRecord
@@ -567,8 +569,8 @@ public:
class XclExpChangeTrack : protected XclExpRoot
{
-private:
-std::vector aRecList; // list of "Revision
Log" stream records
+typedef boost::ptr_vector RecListType;
+RecListType maRecList; // list of "Revision Log" stream records
std::stack aActionStack;
XclExpChTrTabIdBuffer*pTabIdBuffer;
std::vector maBuffers;
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index 8cc504f..c96169a 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -1408,10 +1408,10 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot&
rRoot ) :
// build record list
pHeader = new XclExpChTrHeader;
-aRecList.push_back( new StartXmlElement( XML_headers,
StartXmlElement::WRITE_NAMESPACES ) );
-aRecList.push_back( pHeader );
-aRecList.push_back( new XclExpChTr0x0195 );
-aRecList.push_back( new XclExpChTr0x0194( *pTempChangeTrack ) );
+maRecList.push_back( new StartXmlElement( XML_headers,
StartXmlElement::WRITE_NAMESPACES ) );
+maRecList.push_back( pHeader );
+maRecList.push_back( new XclExpChTr0x0195 );
+maRecList.push_back( new XclExpChTr0x0194( *pTempChangeTrack ) );
OUString sLastUsername;
DateTime aLastDateTime( DateTime::EMPTY );
@@ -1428,41 +1428,37 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot&
rRoot ) :
{
if( nIndex != 1 )
{
-aRecList.push_back( new EndXmlElement( XML_revisions ) );
-aRecList.push_back( new EndHeaderElement() );
+maRecList.push_back( new EndXmlElement( XML_revisions ) );
+maRecList.push_back( new EndHeaderElement() );
}
lcl_GenerateGUID( aGUID, bValidGUID );
sLastUsername = pAction->GetUsername();
aLastDateTime = pAction->GetDateTime();
-aRecList.push_back( new StartXmlElement( XML_header, 0 ) );
-aRecList.push_back( new XclExpChTrInfo( sLastUsername,
aLastDateTime, aGUID, nLogNumber++ ) );
-aRecList.push_back( new XclExpChTrTabId(
pAction->GetTabIdBuffer(), true ) );
-aRecList.push_back( new StartXmlElement( XML_revisions,
StartXmlElement::WRITE_NAMESPACES | StartXmlElement::CLOSE_ELEMENT ) );
+maRecList.push_back( new StartXmlElement( XML_header, 0 ) );
+maRecList.push_back( new XclExpChTrInfo( sLastUsername,
aLastDateTime, aGUID, nLogNumber++ ) );
+maRecList.push_back( new XclExpChTrTabId(
pAction->GetTabIdBuffer(), true ) );
+
[Libreoffice-commits] core.git: sc/source
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 12
1 file changed, 4 insertions(+), 8 deletions(-)
New commits:
commit 226fcd045455d49fa88f19117b83a9953274ff04
Author: Kohei Yoshida
Date: Thu Jul 17 13:30:05 2014 -0400
No need to check for NULL value before deleting.
Change-Id: Ic1e6ecea3ba3ba4ed07760557b04bc07bd963532
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index a307382..8cc504f 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -593,8 +593,7 @@ XclExpChTrAction::XclExpChTrAction(
XclExpChTrAction::~XclExpChTrAction()
{
-if( pAddAction )
-delete pAddAction;
+delete pAddAction;
}
void XclExpChTrAction::SetAddAction( XclExpChTrAction* pAction )
@@ -749,10 +748,8 @@ XclExpChTrCellContent::XclExpChTrCellContent(
XclExpChTrCellContent::~XclExpChTrCellContent()
{
-if( pOldData )
-delete pOldData;
-if( pNewData )
-delete pNewData;
+delete pOldData;
+delete pNewData;
}
void XclExpChTrCellContent::MakeEmptyChTrData( XclExpChTrData*& rpData )
@@ -1476,8 +1473,7 @@ XclExpChangeTrack::~XclExpChangeTrack()
aActionStack.pop();
}
-if( pTempDoc )
-delete pTempDoc;
+delete pTempDoc;
}
ScChangeTrack* XclExpChangeTrack::CreateTempChangeTrack()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/unbalanced-columns-compat.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |8
writerfilter/source/dmapper/PropertyMap.cxx |9 +
writerfilter/source/dmapper/PropertyMap.hxx |2 +-
writerfilter/source/dmapper/SettingsTable.cxx| 10 ++
writerfilter/source/dmapper/SettingsTable.hxx|1 +
6 files changed, 25 insertions(+), 5 deletions(-)
New commits:
commit 9da4fe80c81b3464b2f6834052a24ce57c2fd07e
Author: Miklos Vajna
Date: Thu Jul 17 18:05:47 2014 +0200
DOCX import: handle compat setting
Change-Id: Ieffd1fe52d6167d84ada5ebb11686f20d6dce8fa
diff --git a/sw/qa/extras/ooxmlimport/data/unbalanced-columns-compat.docx
b/sw/qa/extras/ooxmlimport/data/unbalanced-columns-compat.docx
new file mode 100755
index 000..da980c8
Binary files /dev/null and
b/sw/qa/extras/ooxmlimport/data/unbalanced-columns-compat.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 9de6c29..061c393 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2282,6 +2282,14 @@ DECLARE_OOXMLIMPORT_TEST(testUnbalancedColumns,
"unbalanced-columns.docx")
CPPUNIT_ASSERT_EQUAL(true, getProperty(xTextSections->getByIndex(2),
"DontBalanceTextColumns"));
}
+DECLARE_OOXMLIMPORT_TEST(testUnbalancedColumnsCompat,
"unbalanced-columns-compat.docx")
+{
+uno::Reference
xTextSectionsSupplier(mxComponent, uno::UNO_QUERY);
+uno::Reference
xTextSections(xTextSectionsSupplier->getTextSections(), uno::UNO_QUERY);
+// This was false, we ignored the relevant compat setting to make this
non-last section unbalanced.
+CPPUNIT_ASSERT_EQUAL(true, getProperty(xTextSections->getByIndex(0),
"DontBalanceTextColumns"));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx
b/writerfilter/source/dmapper/PropertyMap.cxx
index 44a8168..3ec36cd 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -607,7 +607,7 @@ void SectionPropertyMap::SetBorderDistance( uno::Reference<
beans::XPropertySet
uno::Reference< text::XTextColumns > SectionPropertyMap::ApplyColumnProperties(
-uno::Reference< beans::XPropertySet >
xColumnContainer, bool bLast )
+uno::Reference< beans::XPropertySet >
xColumnContainer, DomainMapper_Impl& rDM_Impl )
{
uno::Reference< text::XTextColumns > xColumns;
try
@@ -659,7 +659,8 @@ uno::Reference< text::XTextColumns >
SectionPropertyMap::ApplyColumnProperties(
rPropNameSupplier.GetName( PROP_SEPARATOR_LINE_IS_ON ),
uno::makeAny( m_bSeparatorLineIsOn ));
xColumnContainer->setPropertyValue( sTextColumns, uno::makeAny(
xColumns ) );
-if (bLast)
+// Set the columns to be unbalanced if that compatability option is
set or this is the last section.
+if (rDM_Impl.GetSettingsTable()->GetNoColumnBalance() ||
rDM_Impl.GetIsLastSectionGroup())
xColumnContainer->setPropertyValue("DontBalanceTextColumns",
uno::makeAny(true));
}
catch( const uno::Exception& )
@@ -956,7 +957,7 @@ void SectionPropertyMap::CloseSectionGroup(
DomainMapper_Impl& rDM_Impl )
uno::Reference< beans::XPropertySet > xSection =
rDM_Impl.appendTextSectionAfter(
m_xStartingRange );
if( m_nColumnCount > 0 && xSection.is())
-ApplyColumnProperties( xSection, rDM_Impl.GetIsLastSectionGroup()
);
+ApplyColumnProperties( xSection, rDM_Impl );
uno::Reference
xRangeProperties(lcl_GetRangeProperties(m_bIsFirstSection, rDM_Impl,
m_xStartingRange));
if (xRangeProperties.is())
{
@@ -1012,7 +1013,7 @@ void SectionPropertyMap::CloseSectionGroup(
DomainMapper_Impl& rDM_Impl )
}
uno::Reference< text::XTextColumns > xColumns;
if( m_nColumnCount > 0 )
-xColumns = ApplyColumnProperties( xFollowPageStyle,
rDM_Impl.GetIsLastSectionGroup() );
+xColumns = ApplyColumnProperties( xFollowPageStyle, rDM_Impl );
//prepare text grid properties
sal_Int32 nHeight = 1;
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx
b/writerfilter/source/dmapper/PropertyMap.hxx
index 59a6559..98e4a1f 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -203,7 +203,7 @@ class SectionPropertyMap : public PropertyMap
void _ApplyProperties( ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > xStyle );
::com::sun::star::uno::Reference< com::sun::star::text::XTextColumns >
ApplyColumnProperties(
-::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > xFollowPag
[Libreoffice-commits] core.git: sw/CppunitTest_sw_ooxmlfieldexport.mk
sw/CppunitTest_sw_ooxmlfieldexport.mk | 53 ++ 1 file changed, 53 insertions(+) New commits: commit 5748a5abbebe5fd9c39f19b9c7235609d6667a0b Author: Miklos Vajna Date: Thu Jul 17 17:35:22 2014 +0200 Add CppunitTest_sw_ooxmlfieldexport.mk Change-Id: Ib3c26cf90a26db31a3d145beeecc877ef57ab249 diff --git a/sw/CppunitTest_sw_ooxmlfieldexport.mk b/sw/CppunitTest_sw_ooxmlfieldexport.mk new file mode 100644 index 000..9e0171e --- /dev/null +++ b/sw/CppunitTest_sw_ooxmlfieldexport.mk @@ -0,0 +1,53 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#* + +include $(SRCDIR)/sw/ooxmlexport_setup.mk + +$(eval $(call gb_CppunitTest_CppunitTest,sw_ooxmlfieldexport)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sw_ooxmlfieldexport, \ +sw/qa/extras/ooxmlexport/ooxmlfieldexport \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sw_ooxmlfieldexport, \ + $(sw_ooxmlexport_libraries) \ +)) + +$(eval $(call gb_CppunitTest_use_externals,sw_ooxmlfieldexport,\ + boost_headers \ +libxml2 \ +)) + +$(eval $(call gb_CppunitTest_set_include,sw_ooxmlfieldexport,\ +-I$(SRCDIR)/sw/inc \ +-I$(SRCDIR)/sw/source/core/inc \ + -I$(SRCDIR)/sw/qa/extras/inc \ +$$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_api,sw_ooxmlfieldexport,\ +offapi \ +udkapi \ +)) + +$(eval $(call gb_CppunitTest_use_ure,sw_ooxmlfieldexport)) +$(eval $(call gb_CppunitTest_use_vcl,sw_ooxmlfieldexport)) + +$(eval $(call gb_CppunitTest_use_components,sw_ooxmlfieldexport,\ + $(sw_ooxmlexport_components) \ + filter/source/storagefilterdetect/storagefd \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,sw_ooxmlfieldexport)) + +$(eval $(call gb_CppunitTest_use_unittest_configuration,sw_ooxmlfieldexport)) + +# vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/Module_sw.mk sw/qa
sw/Module_sw.mk |1
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 441 --
sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx | 517 ++
3 files changed, 518 insertions(+), 441 deletions(-)
New commits:
commit 6ff22ec2a61a17c2c75da6f6ff84476922392dbb
Author: Miklos Vajna
Date: Thu Jul 17 15:53:26 2014 +0200
extract CppunitTest_sw_ooxmlfieldexport from CppunitTest_sw_ooxmlimport
before:
$ time make -sr CppunitTest_sw_ooxmlexport
real4m5.728s
after:
$ time make -sr CppunitTest_sw_ooxmlexport
real3m24.446s
and the new CppunitTest_sw_ooxmlfieldexport can run in parallel.
Change-Id: I5a1d121f51e2d09a1c2126a33484e956c5c706a8
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 7e71e2c..27ca49f 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
CppunitTest_sw_htmlexport \
CppunitTest_sw_macros_test \
CppunitTest_sw_ooxmlexport \
+CppunitTest_sw_ooxmlfieldexport \
CppunitTest_sw_ooxmlsdrexport \
CppunitTest_sw_ooxmlw14export \
CppunitTest_sw_ooxmlimport \
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index a5aa50d..eb81a06 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -377,18 +377,6 @@ DECLARE_OOXMLEXPORT_TEST(testTablePosition,
"table-position.docx")
}
}
-DECLARE_OOXMLEXPORT_TEST(testFdo47669, "fdo47669.docx")
-{
-/*
- * Problem: we created imbalance which shouldn't be there,
- * resulting in loading error: missing last character of hyperlink text
- * and content after it wasn't loaded.
- */
-getParagraph(1, "This is a hyperlink with anchor. Also, this sentence
should be seen.");
-getRun(getParagraph(1), 2, "hyperlink with anchor");
-CPPUNIT_ASSERT_EQUAL(OUString("http://www.google.com/#a";),
getProperty(getRun(getParagraph(1), 2), "HyperLinkURL"));
-}
-
struct SingleLineBorders {
sal_Int16 top, bottom, left, right;
SingleLineBorders(int t=0, int b=0, int l=0, int r=0)
@@ -466,24 +454,6 @@ DECLARE_OOXMLEXPORT_TEST(testFdo51550, "fdo51550.odt")
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDraws->getCount());
}
-DECLARE_OOXMLEXPORT_TEST(testN789482, "n789482.docx")
-{
-// The problem was that w:del was exported before w:hyperlink, resulting
in an invalid XML.
-uno::Reference xParagraph = getParagraph(1);
-getRun(xParagraph, 1, "Before. ");
-
-CPPUNIT_ASSERT_EQUAL(OUString("Delete"),
getProperty(getRun(xParagraph, 2), "RedlineType"));
-CPPUNIT_ASSERT_EQUAL(sal_True, getProperty(getRun(xParagraph,
2), "IsStart"));
-
-getRun(xParagraph, 3, "www.test.com");
-CPPUNIT_ASSERT_EQUAL(OUString("http://www.test.com/";),
getProperty(getRun(xParagraph, 3), "HyperLinkURL"));
-
-CPPUNIT_ASSERT_EQUAL(OUString("Delete"),
getProperty(getRun(xParagraph, 4), "RedlineType"));
-CPPUNIT_ASSERT_EQUAL(sal_False, getProperty(getRun(xParagraph,
4), "IsStart"));
-
-getRun(xParagraph, 5, " After.");
-}
-
/*
* doesn't work on openSUSE12.2 at least
DECLARE_OOXMLEXPORT_TEST(test1Table1Page, "1-table-1-page.docx")
@@ -1115,17 +1085,6 @@ DECLARE_OOXMLEXPORT_TEST(testTransparentShadow,
"transparent-shadow.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int16(50), nShadowTransparence);
}
-DECLARE_OOXMLEXPORT_TEST(testBnc834035, "bnc834035.odt")
-{
-// Illustration index had wrong hyperlinks: anchor was using Writer's
-// !|sequence syntax, not a bookmark name.
-xmlDocPtr pXmlDoc = parseExport();
-if (!pXmlDoc)
-return;
-// This was Figure!1|sequence.
-assertXPath(pXmlDoc, "/w:document/w:body/w:p[10]/w:hyperlink", "anchor",
"_Toc363553908");
-}
-
DECLARE_OOXMLEXPORT_TEST(testBnc837302, "bnc837302.docx")
{
// The problem was that text with empty author was not inserted as a
redline
@@ -1689,13 +1648,6 @@ DECLARE_OOXMLEXPORT_TEST(testFdo69644, "fdo69644.docx")
assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tblGrid/w:gridCol", 5);
}
-DECLARE_OOXMLEXPORT_TEST(testCp115, "cp115.odt")
-{
-// Redline and hyperlink end got exported in an incorrect order.
-getParagraph(1, "Hello.");
-getParagraph(2, "http://www.google.com/";);
-}
-
DECLARE_OOXMLEXPORT_TEST(testFdo70812, "fdo70812.docx")
{
// Import just crashed.
@@ -1746,18 +1698,6 @@ DECLARE_OOXMLEXPORT_TEST(testLineSpacingexport,
"test_line_spacing.docx")
#endif
}
-DECLARE_OOXMLEXPORT_TEST(testHyperlineIsEnd, "hyperlink.docx")
-{
-// Check that the document.xml contents all the tag properly closed.
-xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-if (!pXmlDoc)
-return;
-// If document.xml miss any ending tag then parseExport() returns NULL
which fail the test case.
-CPPUNIT_ASSERT(pXmlDoc) ;
-// Check hyperlink is properly open.
-ass
minutes of ESC call ... (2014-07-17)
* Present: Muthu, Bjoern, Eike, Mirek, Miklos, David, Norbert, Cloph, Andras, Caolan, Jacobo, Moggi, Kohei * Completed Action Items: + try to add per-process resource limits for crashtest (Markus) + eg. bash's builtin ulimit [-SHacdflmnpstuv [limit]] etc. + switch a windows tinderbox to mst-make post 4.3 (Cloph) + master tinderbox (51) does this, impressive improvement (delta 30 minutes, release build 90 minutes now) + disable the new colors of formatting marks for Mac if this causes it (Quikee) * Pending Action Items: + ask UX advise wrt. wrench icons (revert or not ?) (Astron) + blog about the sad realities of web plugins (Bjoern) + setup some VM's that can be created on-demand (Cloph) + in progress + open-source newer Synezip tests / speak at the conference (Umesh) + Ask for 1-2 more dev-list moderators & re-visit next-week (Michael) + contact Michael / the list when students show up (Jan Marek) * GSOC Update (Cedric) + at least 6 students will be at the conference in Bern + a student presentation slot has been created: + thus students can prepare a 5-6 minute lightning talk on their project * Release Engineering update (Christian) + 4.2.6 status + four open changes on gerrit for libreoffice-4-2-6, rc2 next week https://gerrit.libreoffice.org/#/q/status:open+project:core+branch:libreoffice-4-2-6,n,z + 4.3.0 RC3 status + builds done + QA announce done + RC announce on libreoffice.org tonight + no open changes on gerrit for libreoffice-4-3-0 + all on track (Cloph) * Crashtest update (Markus) + crashes more frequently with 8 cores (moggi) + crash test machine reset to Mageia instead of Fedora, no reboots so far (Cloph) * Certification Committee (Stephan/Bjoern/Kendy) + waiting until ~September * Hackfests (Bjoern) + Boston Hackfest: + July 26-27th + https://wiki.documentfoundation.org/Events/2014/US_Summer_Hackfest + Tough to line-up mentoring devs + would appreciate developers via Google Hangout etc. + QA is happy to recruit programmers for our internal projects, but would like to share w/the dev team. + poke potential hosters again (Michael) + (possible) Seattle + Oct 25-27 + Straw poll: Who could make these dates? + prolly better to ping people individually (Michael) + Munich hack-fest (Jan-Marek): + will have a BSP come-together; if someone says they're coming just show up etc. + November 21st-23rd, 2014 https://wiki.debian.org/BSP/2014/11/de/Munich + we should drop by with 2 or 3 developers, if possible + Toulouse Hackfest ... + Confirmed for Nov. 15-16th + more details: https://wiki.documentfoundation.org/Hackfest/Toulouse2014 + Be great to have -really- easy easy hacks for devs (Bjoern) * 4.3 cycle Bugzilla stats (Bjoern) 4.2 4.3 Delta Change BIBISECTTOTAL 176 296 120 68.18% UNRESOLVED 60 100 40 66.67% RESOLVED 116 196 80 68.97% DUPLICATES 3725 4573 848 22.77% FIXED ALL 5320 6464 1144 21.50% ENHANCEMENTS 324 394 70 21.60% NON-ENHANCEMENTS 4996 6070 1074 21.50% enhancement fix ratio 6.12% UNCONFIRMED 790 977 187 23.67% Goal: <0% QA NEW ALL 6473 7235 762 11.77% ENHANCEMENTS 1503 1745 242 16.10% NON-ENHANCEMENTS 4970 5490 520 10.46% REGRESSIONS TOTAL2206 2837 631 28.60% UNRESOLVED349 408 59 16.91% Goal: <0% Development RESOLVED 1857 2429 572 30.80% bibisect ratio 17.19%24.51% 7.32% 42.57% Goal: >0% QA bibisect resolution ratio 13.99% of fixed regressions were bibisected this cycl
[Libreoffice-commits] core.git: avmedia/source
avmedia/source/opengl/oglwindow.cxx | 31 +--
1 file changed, 29 insertions(+), 2 deletions(-)
New commits:
commit 9e8dbd37c4dda5d07c22c66a5a2b08cce4d175f5
Author: Zolnai Tamás
Date: Thu Jul 17 16:21:02 2014 +0200
glTF: allow to move camera also by keyboard in orbit mode.
Change-Id: Ibf16b9651988358c30d649dd937813329d0f64ec
diff --git a/avmedia/source/opengl/oglwindow.cxx
b/avmedia/source/opengl/oglwindow.cxx
index d082aa9..ce8f462 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -260,15 +260,18 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*,
pEvent)
vMup = glm::normalize(vMup);
vMup *= 25.0f;
-if(nCode == KEY_W)vMoveBy += vMove*(0.0005f*fModelSize);
-if(nCode == KEY_S)vMoveBy -= vMove*(0.0005f*fModelSize);
if( !m_bIsOrbitMode )
{
+if(nCode == KEY_W)vMoveBy +=
vMove*(0.0005f*fModelSize);
+if(nCode == KEY_S)vMoveBy -=
vMove*(0.0005f*fModelSize);
if(nCode == KEY_A)vMoveBy -=
vStrafe*(0.0005f*fModelSize);
if(nCode == KEY_D)vMoveBy +=
vStrafe*(0.0005f*fModelSize);
}
else
{
+if(nCode == KEY_E)vMoveBy +=
vMove*(0.0005f*fModelSize);
+if(nCode == KEY_Q)vMoveBy -=
vMove*(0.0005f*fModelSize);
+
// Limit zooming in orbit mode
m_fCameraDistance += vMoveBy.z;
if ((m_fCameraDistance < 0.5 * fModelSize && vMoveBy.z
< 0.0 ) ||
@@ -280,6 +283,30 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*,
pEvent)
}
}
gltf_renderer_move_camera(&m_rHandle, vMoveBy.x, vMoveBy.y,
vMoveBy.z, 0.0);
+
+if( m_bIsOrbitMode )
+{
+long nDeltaX = 0;
+long nDeltaY = 0;
+if (nCode == KEY_W)
+{
+nDeltaY -= 1;
+}
+if (nCode == KEY_S)
+{
+nDeltaY += 1;
+}
+if (nCode == KEY_A)
+{
+nDeltaX -= 1;
+}
+if (nCode == KEY_D)
+{
+nDeltaX += 1;
+}
+float fSensitivity = 50.0;
+gltf_renderer_rotate_model(&m_rHandle,
nDeltaX*fSensitivity, nDeltaY*fSensitivity, 0.0);
+}
}
else if(nCode == KEY_M)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/qa
sd/qa/unit/import-tests.cxx|2 +-
sd/qa/unit/sdmodeltestbase.hxx |1 -
2 files changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 472e34d22f845734b886142bfcaadc69d6749e39
Author: Markus Mohrhard
Date: Thu Jul 17 15:45:33 2014 +0200
fix build failure
Change-Id: I95af4c2750c01e3e48f6708306b25f774c29e592
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 6567f3d..51b5fcc 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -555,7 +555,7 @@ void SdFiltersTest::testBnc870237()
void SdFiltersTest::testBnc887225()
{
-::sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/pptx/bnc887225.pptx") );
+::sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/pptx/bnc887225.pptx"), PPTX );
// In the document, lastRow and lastCol table properties are used.
// Make sure styles are set properly for individual cells.
diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx
index c78c980..20cdacc 100644
--- a/sd/qa/unit/sdmodeltestbase.hxx
+++ b/sd/qa/unit/sdmodeltestbase.hxx
@@ -168,7 +168,6 @@ protected:
sd::DrawDocShellRef saveAndReload(sd::DrawDocShell *pShell, sal_Int32
nExportType)
{
FileFormat* pFormat = getFormat(nExportType);
-OUString aExt = OUString( "." ) +
OUString::createFromAscii(pFormat->pName);
utl::TempFile aTempFile;
aTempFile.EnableKillingFile();
save(pShell, pFormat, aTempFile);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx
include/svx/sdr/animation/scheduler.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1885ebdff687c11725941da48034aa9c1bcb161f Author: Noel Grandin Date: Thu Jul 17 14:04:47 2014 +0200 add comment Change-Id: I1566a20166e77ac1e00db9ba19b92c68ad14e2df Reviewed-on: https://gerrit.libreoffice.org/10366 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/include/svx/sdr/animation/scheduler.hxx b/include/svx/sdr/animation/scheduler.hxx index 9e3a33d..b9b8ab0 100644 --- a/include/svx/sdr/animation/scheduler.hxx +++ b/include/svx/sdr/animation/scheduler.hxx @@ -36,7 +36,7 @@ namespace sdr // time of event in ms sal_uInt32 mnTime; -// pointer for simply linked list +// pointer for linked list sorted by mnTime Event* mpNext; public: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] cppunit.git: NEWS
NEWS |7 +++ 1 file changed, 7 insertions(+) New commits: commit 2599d56470a331fb943a1afabfd053ddf7548e6a Author: Markus Mohrhard Date: Thu Jul 17 15:31:53 2014 +0200 add fix for fdo381433 to News diff --git a/NEWS b/NEWS index f85f037..c76d1fb 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ + New in CppUnit 1.14.0: + - + +* Test Plug-in Runner: + - Fixed crash on Win64 in test runner (fdo#81433) + + New in CppUnit 1.13.2: - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - oox/source
oox/source/drawingml/table/tablecell.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit d6063cf9fd93b630a0065dfbe51c66228a704b1f
Author: Matúš Kukan
Date: Tue Jul 15 11:28:30 2014 +0200
Do not prefer bandRow over firstCol/lastCol, nor the same with bandCol.
Change-Id: I0c573d721212c870e9ecc99ba5e8494073e09aaf
(cherry picked from commit 5d2f12a44d2af3e42e0c3a17ff556f5ada27b1b8)
Reviewed-on: https://gerrit.libreoffice.org/10332
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/oox/source/drawingml/table/tablecell.cxx
b/oox/source/drawingml/table/tablecell.cxx
index 53d8b42..baa1556 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -228,7 +228,9 @@ void TableCell::pushToXCell( const
::oox::core::XmlFilterBase& rFilterBase, ::oo
if ( rProperties.isBandRow() )
{
if ( ( !rProperties.isFirstRow() || ( nRow != 0 ) ) &&
-( !rProperties.isLastRow() || ( nRow != nMaxRow ) ) )
+( !rProperties.isLastRow() || ( nRow != nMaxRow ) ) &&
+( !rProperties.isFirstCol() || ( nColumn != 0 ) ) &&
+( !rProperties.isLastCol() || ( nColumn != nMaxColumn ) ) )
{
sal_Int32 nBand = nRow;
if ( rProperties.isFirstRow() )
@@ -303,7 +305,9 @@ void TableCell::pushToXCell( const
::oox::core::XmlFilterBase& rFilterBase, ::oo
}
if ( rProperties.isBandCol() )
{
-if ( ( !rProperties.isFirstCol() || ( nColumn != 0 ) ) &&
+if ( ( !rProperties.isFirstRow() || ( nRow != 0 ) ) &&
+( !rProperties.isLastRow() || ( nRow != nMaxRow ) ) &&
+( !rProperties.isFirstCol() || ( nColumn != 0 ) ) &&
( !rProperties.isLastCol() || ( nColumn != nMaxColumn ) ) )
{
sal_Int32 nBand = nColumn;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] cppunit.git: Branch 'cppunit-1-13' - src/msvc6
src/msvc6/testrunner/TreeHierarchyDlg.cpp |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit fbe10799cfbd765b5081443bf81b5e9ee3a3cbff
Author: Markus Mohrhard
Date: Thu Jul 17 15:28:57 2014 +0200
fix crash with WIN64 in testrunner
Reported by: Peter Tax
(cherry picked from commit d44643d07a61ee9efc100f23c47ab3969efda998)
diff --git a/src/msvc6/testrunner/TreeHierarchyDlg.cpp
b/src/msvc6/testrunner/TreeHierarchyDlg.cpp
index 1c0b671..068a13e 100644
--- a/src/msvc6/testrunner/TreeHierarchyDlg.cpp
+++ b/src/msvc6/testrunner/TreeHierarchyDlg.cpp
@@ -103,7 +103,7 @@ TreeHierarchyDlg::addTest( CPPUNIT_NS::Test *test,
hParent );
if ( hItem != NULL )
{
-VERIFY( m_treeTests.SetItemData( hItem, (DWORD)test ) );
+VERIFY( m_treeTests.SetItemData( hItem, (DWORD_PTR)test ) );
if ( isSuite( test ) )
addTestSuiteChildrenTo( test, hItem );
}
@@ -185,7 +185,7 @@ TreeHierarchyDlg::findSelectedTest()
HTREEITEM hItem = m_treeTests.GetSelectedItem();
if ( hItem != NULL )
{
-DWORD data;
+DWORD_PTR data;
VERIFY( data = m_treeTests.GetItemData( hItem ) );
return reinterpret_cast( data );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - oox/source
oox/source/drawingml/table/tableproperties.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8c148bd93ec2fe1aaccbbc583d93784f392edeb8 Author: Matúš Kukan Date: Tue Jul 15 10:58:51 2014 +0200 bnc#887225: OOXML import: Correctly apply table style for lastRow. nMaxColumn and nMaxRow are indexes, so use size() - 1. Change-Id: I20055e55cf2464710fe553fb8067bad13a339084 (cherry picked from commit 47645734c350f244b4a5642a709132ca1b7dc75d) Reviewed-on: https://gerrit.libreoffice.org/10331 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/oox/source/drawingml/table/tableproperties.cxx b/oox/source/drawingml/table/tableproperties.cxx index e7f5799..db55c67 100644 --- a/oox/source/drawingml/table/tableproperties.cxx +++ b/oox/source/drawingml/table/tableproperties.cxx @@ -288,7 +288,7 @@ void TableProperties::pushToPropSet( const ::oox::core::XmlFilterBase& rFilterBa Reference< XCellRange > xCellRange( xTable, UNO_QUERY_THROW ); rTableCell.pushToXCell( rFilterBase, pMasterTextListStyle, xCellRange->getCellByPosition( nColumn, nRow ), *this, rTableStyle, -nColumn, aTableRowIter->getTableCells().size(), nRow, mvTableRows.size() ); +nColumn, aTableRowIter->getTableCells().size()-1, nRow, mvTableRows.size()-1 ); } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] cppunit.git: src/msvc6
src/msvc6/testrunner/TreeHierarchyDlg.cpp |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d44643d07a61ee9efc100f23c47ab3969efda998
Author: Markus Mohrhard
Date: Thu Jul 17 15:28:57 2014 +0200
fix crash with WIN64 in testrunner
Reported by: Peter Tax
diff --git a/src/msvc6/testrunner/TreeHierarchyDlg.cpp
b/src/msvc6/testrunner/TreeHierarchyDlg.cpp
index 1c0b671..068a13e 100644
--- a/src/msvc6/testrunner/TreeHierarchyDlg.cpp
+++ b/src/msvc6/testrunner/TreeHierarchyDlg.cpp
@@ -103,7 +103,7 @@ TreeHierarchyDlg::addTest( CPPUNIT_NS::Test *test,
hParent );
if ( hItem != NULL )
{
-VERIFY( m_treeTests.SetItemData( hItem, (DWORD)test ) );
+VERIFY( m_treeTests.SetItemData( hItem, (DWORD_PTR)test ) );
if ( isSuite( test ) )
addTestSuiteChildrenTo( test, hItem );
}
@@ -185,7 +185,7 @@ TreeHierarchyDlg::findSelectedTest()
HTREEITEM hItem = m_treeTests.GetSelectedItem();
if ( hItem != NULL )
{
-DWORD data;
+DWORD_PTR data;
VERIFY( data = m_treeTests.GetItemData( hItem ) );
return reinterpret_cast( data );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sw/inc sw/qa writerfilter/inc writerfilter/source
sw/inc/fmtclbl.hxx|1 +
sw/qa/extras/inc/swmodeltestbase.hxx |3 +++
sw/qa/extras/ooxmlimport/data/unbalanced-columns.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 10 --
writerfilter/inc/dmapper/DomainMapper.hxx |1 +
writerfilter/inc/resourcemodel/WW8ResourceModel.hxx |3 +++
writerfilter/source/dmapper/DomainMapper.cxx |5 +
writerfilter/source/dmapper/DomainMapper_Impl.cxx |6 ++
writerfilter/source/dmapper/DomainMapper_Impl.hxx |3 +++
writerfilter/source/dmapper/PropertyMap.cxx |9 ++---
writerfilter/source/dmapper/PropertyMap.hxx |2 +-
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |5 +
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |1 +
writerfilter/source/ooxml/model.xml |1 +
14 files changed, 44 insertions(+), 6 deletions(-)
New commits:
commit 5f7bba13a7bd35f3861f9c6ed75e7b1c539c7367
Author: Miklos Vajna
Date: Thu Jul 17 15:17:08 2014 +0200
CppunitTest_sw_ooxmlimport: allow running a single test
Change-Id: I494cc676f384edbac9f64c1bc02b14cf7973d0d8
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 8ede21a..43e6d7e 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -79,15 +79,18 @@ using namespace css;
void TestName::verify()
#if 1
+#define DECLARE_OOXMLIMPORT_TEST(TestName, filename)
DECLARE_SW_IMPORT_TEST(TestName, filename, Test)
#define DECLARE_OOXMLEXPORT_TEST(TestName, filename)
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
// For testing during development of a test, you want to use
// DECLARE_OOXMLEXPORT_TEST_ONLY, and change the above to #if 0
// Of course, don't forget to set back to #if 1 when you are done :-)
#else
+#define DECLARE_OOXMLIMPORT_TEST_ONLY(TestName, filename)
DECLARE_SW_IMPORT_TEST(TestName, filename, Test)
#define DECLARE_OOXMLEXPORT_TEST_ONLY(TestName, filename)
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, Test)
#undef DECLARE_OOXMLEXPORT_TEST
+#define DECLARE_OOXMLIMPORT_TEST(TestName, filename) class disabled##TestName
: public Test { void disabled(); }; void disabled##TestName::disabled()
#define DECLARE_OOXMLEXPORT_TEST(TestName, filename) class disabled##TestName
: public Test { void disabled(); }; void disabled##TestName::disabled()
#endif
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 4f63183..9de6c29 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -83,8 +83,6 @@ public:
}
};
-#define DECLARE_OOXMLIMPORT_TEST(TestName, filename)
DECLARE_SW_IMPORT_TEST(TestName, filename, Test)
-
DECLARE_OOXMLIMPORT_TEST(testN751054, "n751054.docx")
{
text::TextContentAnchorType eValue =
getProperty(getShape(1), "AnchorType");
commit d185204737031955c56a24356ed003d342548434
Author: Miklos Vajna
Date: Thu Jul 17 14:59:19 2014 +0200
DOCX import: set DontBalanceTextColumns=true for the last section ...
... if it has multiple columns.
See wwSectionManager::InsertSegments() for the related binary import
code which already did this.
Change-Id: I919f585bd864db748cd349e01789ec7805f031a1
diff --git a/sw/qa/extras/ooxmlimport/data/unbalanced-columns.docx
b/sw/qa/extras/ooxmlimport/data/unbalanced-columns.docx
new file mode 100755
index 000..da6f93f
Binary files /dev/null and
b/sw/qa/extras/ooxmlimport/data/unbalanced-columns.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index efbfebb..4f63183 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2276,6 +2276,14 @@ DECLARE_OOXMLIMPORT_TEST(testFdo76803, "fdo76803.docx")
CPPUNIT_ASSERT_EQUAL(double(0), aPolygon.getB2DPoint(3).getY());
}
+DECLARE_OOXMLIMPORT_TEST(testUnbalancedColumns, "unbalanced-columns.docx")
+{
+uno::Reference
xTextSectionsSupplier(mxComponent, uno::UNO_QUERY);
+uno::Reference
xTextSections(xTextSectionsSupplier->getTextSections(), uno::UNO_QUERY);
+// This was false, last section was balanced, but it's unbalanced in Word.
+CPPUNIT_ASSERT_EQUAL(true, getProperty(xTextSections->getByIndex(2),
"DontBalanceTextColumns"));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx
b/writerfilter/inc/dmapper/DomainMapper.hxx
index 9266f08..7143219 100644
--- a/writerfilter/inc/dmapper/DomainMapper.hxx
+++ b/writerfilter/inc/dmapper/DomainMapper.hxx
@@ -87,6 +87,7 @@ public:
// Stream
virtual void markLastParagraphInSection() SAL_OVERRIDE;
+virtual void markLastSectionGroup() SAL_OVERRIDE;
// BinaryObj
virtual void data(const sal_uInt8* buf, size_t len,
diff --git a/write
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - oox/source
oox/source/drawingml/table/tablecell.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 087eb8031b444d62a10d744e7b5983f97c59883c
Author: Matúš Kukan
Date: Tue Jul 15 11:28:30 2014 +0200
Do not prefer bandRow over firstCol/lastCol, nor the same with bandCol.
Change-Id: I0c573d721212c870e9ecc99ba5e8494073e09aaf
(cherry picked from commit 5d2f12a44d2af3e42e0c3a17ff556f5ada27b1b8)
Reviewed-on: https://gerrit.libreoffice.org/10330
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/oox/source/drawingml/table/tablecell.cxx
b/oox/source/drawingml/table/tablecell.cxx
index c3c4f49..1bb6241 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -228,7 +228,9 @@ void TableCell::pushToXCell( const
::oox::core::XmlFilterBase& rFilterBase, ::oo
if ( rProperties.isBandRow() )
{
if ( ( !rProperties.isFirstRow() || ( nRow != 0 ) ) &&
-( !rProperties.isLastRow() || ( nRow != nMaxRow ) ) )
+( !rProperties.isLastRow() || ( nRow != nMaxRow ) ) &&
+( !rProperties.isFirstCol() || ( nColumn != 0 ) ) &&
+( !rProperties.isLastCol() || ( nColumn != nMaxColumn ) ) )
{
sal_Int32 nBand = nRow;
if ( rProperties.isFirstRow() )
@@ -303,7 +305,9 @@ void TableCell::pushToXCell( const
::oox::core::XmlFilterBase& rFilterBase, ::oo
}
if ( rProperties.isBandCol() )
{
-if ( ( !rProperties.isFirstCol() || ( nColumn != 0 ) ) &&
+if ( ( !rProperties.isFirstRow() || ( nRow != 0 ) ) &&
+( !rProperties.isLastRow() || ( nRow != nMaxRow ) ) &&
+( !rProperties.isFirstCol() || ( nColumn != 0 ) ) &&
( !rProperties.isLastCol() || ( nColumn != nMaxColumn ) ) )
{
sal_Int32 nBand = nColumn;
___
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' - oox/source
oox/source/drawingml/table/tableproperties.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ed4cbd4f6726dcae80bf8b42bee97e5bcf465502 Author: Matúš Kukan Date: Tue Jul 15 10:58:51 2014 +0200 bnc#887225: OOXML import: Correctly apply table style for lastRow. nMaxColumn and nMaxRow are indexes, so use size() - 1. Change-Id: I20055e55cf2464710fe553fb8067bad13a339084 (cherry picked from commit 47645734c350f244b4a5642a709132ca1b7dc75d) Reviewed-on: https://gerrit.libreoffice.org/10329 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/oox/source/drawingml/table/tableproperties.cxx b/oox/source/drawingml/table/tableproperties.cxx index 74b0b91..43e4b1f 100644 --- a/oox/source/drawingml/table/tableproperties.cxx +++ b/oox/source/drawingml/table/tableproperties.cxx @@ -288,7 +288,7 @@ void TableProperties::pushToPropSet( const ::oox::core::XmlFilterBase& rFilterBa Reference< XCellRange > xCellRange( xTable, UNO_QUERY_THROW ); rTableCell.pushToXCell( rFilterBase, pMasterTextListStyle, xCellRange->getCellByPosition( nColumn, nRow ), *this, rTableStyle, -nColumn, aTableRowIter->getTableCells().size(), nRow, mvTableRows.size() ); +nColumn, aTableRowIter->getTableCells().size()-1, nRow, mvTableRows.size()-1 ); } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/inc/tabview.hxx |6 --
sc/source/ui/view/gridwin4.cxx |2 ++
sc/source/ui/view/tabview.cxx |4
sc/source/ui/view/tabview3.cxx | 10 --
sc/source/ui/view/tabview4.cxx |7 ++-
5 files changed, 8 insertions(+), 21 deletions(-)
New commits:
commit 642d64d8fe54b7577fb4184f1ad6e0e8b3f809c4
Author: Caolán McNamara
Date: Tue Jul 15 16:42:42 2014 +0100
scrolling very slow in calc
even on a short spreadsheet scrolling up and down leaves
the first/last row (depending on the direction of scroll)
unchanged until the scrolling stops.
http://people.freedesktop.org/~mst/calc_4.2_scrolling.webm
On larger document there are rendering artifacts during scrolling which go
away
after scrolling for me and mstahl, but a bunch of people can show us piles
of
horribly broken spreadsheets after scrolling, esp wheel scrolling
Revert "fdo#75026: Sometimes we need to update grid view...
while not being active."
This reverts commit 52cc88d6191ba0c4b6477e5c4b9c5d0f0228030d.
Revert "fdo#68961: Check visible range during scrolling, and re-paint if
necessary."
This reverts commit e36c8a674845ab19577fc06d44b780549757e1e7.
Revert "Repaint grid view when the visible area changes."
This reverts commit b54c1a53b4d400b1c2d282c186af1fa8f151894e.
Conflicts:
sc/source/ui/app/scmod.cxx
Revert "Update visible ranges when updating the scroll bars."
This reverts commit 391a57ef65687f2e373bac8d410e551aafa780ec.
Change-Id: Ie170308cba18a9a74c7c72daf07dfa0a4ef7bd13
Reviewed-on: https://gerrit.libreoffice.org/10350
Tested-by: Michael Stahl
Reviewed-by: Kohei Yoshida
Tested-by: Kohei Yoshida
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index a5d7392..891af9e 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -204,12 +204,6 @@ private:
voidPaintRangeFinderEntry (ScRangeFindData* pData, SCTAB nTab);
-/**
- * Check the visible grid area to see if the visible range has changed. If
- * so, update the stored visible range, and re-paint the grid area.
- */
-void UpdateGrid();
-
protected:
voidUpdateHeaderWidth( const ScVSplitPos* pWhich = NULL,
const SCROW* pPosY = NULL );
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index fa697ee5..a60fb82 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -390,6 +390,8 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2,
SCROW nY2, ScUpdateMod
OSL_ENSURE( ValidCol(nX2) && ValidRow(nY2), "GridWin Draw Bereich zu
gross" );
+UpdateVisibleRange();
+
if (nX2 < maVisibleRange.mnCol1 || nY2 < maVisibleRange.mnRow1)
return;
// unsichtbar
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index aafd114..02b99b9 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -1198,8 +1198,6 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos
eWhich, bool bUpdBars )
if (pColOutline[eWhich]) pColOutline[eWhich]->ScrollPixel( nDiff );
if (bUpdBars)
UpdateScrollBars();
-else
-UpdateGrid();
}
if (nDeltaX==1 || nDeltaX==-1)
@@ -1285,8 +1283,6 @@ void ScTabView::ScrollY( long nDeltaY, ScVSplitPos
eWhich, bool bUpdBars )
if (pRowOutline[eWhich]) pRowOutline[eWhich]->ScrollPixel( nDiff );
if (bUpdBars)
UpdateScrollBars();
-else
-UpdateGrid();
}
if (nDeltaY==1 || nDeltaY==-1)
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 7053037..50066ba 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -2089,16 +2089,6 @@ void ScTabView::PaintRangeFinderEntry (ScRangeFindData*
pData, const SCTAB nTab)
}
}
-void ScTabView::UpdateGrid()
-{
-if (!UpdateVisibleRange())
-// Visible range hasn't changed. No need to re-paint.
-return;
-
-SC_MOD()->AnythingChanged();// if visible area has changed
-PaintGrid();
-}
-
void ScTabView::PaintRangeFinder( long nNumber )
{
ScInputHandler* pHdl = SC_MOD()->GetInputHdl( aViewData.GetViewShell() );
diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx
index 2f72a20..8528431 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -421,7 +421,12 @@ void ScTabView::UpdateScrollBars()
}
// set visible area for online spelling
-UpdateGrid();
+
+if ( aViewData.IsActive() )
+{
+if (UpdateVisibleRange())
+SC_MOD()->AnythingChanged();// if visible area has
changed
+}
}
#ifndef HDR_SLIDERSIZE
___
[Libreoffice-commits] core.git: oox/source
oox/source/ole/olehelper.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 7bfee546dcd199c0325ec7c7edd5799ce0df79cf
Author: Caolán McNamara
Date: Thu Jul 17 13:37:47 2014 +0100
coverity#735310 Unchecked return value
Change-Id: I1a35da4b23b9ff8efa8f500eaf18e4c259cc0177
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index 420a80d..1be5d6f 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -397,8 +397,7 @@ OleFormCtrlExportHelper::OleFormCtrlExportHelper( const
Reference< XComponentCo
else if ( nClassId == FormComponentType::COMMANDBUTTON )
{
bool bToggle = false;
-aPropSet.getProperty( bToggle, PROP_Toggle );
-if ( bToggle )
+if ( aPropSet.getProperty( bToggle, PROP_Toggle ) && bToggle )
nClassId = TOGGLEBUTTON;
}
else if ( nClassId == FormComponentType::CONTROL )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source sd/source
editeng/source/outliner/outliner.cxx |3 +--
sd/source/ui/view/outlnvsh.cxx |5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
New commits:
commit fdb1d62a09f7320ee5c2828aa4ce84248a6e3e4e
Author: Caolán McNamara
Date: Thu Jul 17 13:48:30 2014 +0100
Related: rhbz#1117853 nStartPara of EE_PARA_NOT_FOUND
we know that nStartPara is EE_PARA_NOT_FOUND so rOutliner.GetAbsPos must
have
returned that, but we don't know the circumstances that lead to that yet.
Change-Id: I53a488317d154b4a3c050248b8737da0a611ca43
diff --git a/editeng/source/outliner/outliner.cxx
b/editeng/source/outliner/outliner.cxx
index 4d7214b..aaa843d 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -384,7 +384,6 @@ sal_Int32 Outliner::GetBulletsNumberingStatus() const
OutlinerParaObject* Outliner::CreateParaObject( sal_Int32 nStartPara,
sal_Int32 nCount ) const
{
-
if ( static_cast(nStartPara) + nCount >
static_cast(pParaList->GetParagraphCount()) )
nCount = pParaList->GetParagraphCount() - nStartPara;
@@ -394,7 +393,7 @@ OutlinerParaObject* Outliner::CreateParaObject( sal_Int32
nStartPara, sal_Int32
if ( ( nStartPara + nCount ) > pEditEngine->GetParagraphCount() )
nCount = pEditEngine->GetParagraphCount() - nStartPara;
-if( !nCount )
+if (nCount <= 0)
return NULL;
EditTextObject* pText = pEditEngine->CreateTextObject( nStartPara, nCount
);
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 03e899d..e3b4aa7 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -1658,7 +1658,6 @@ bool OutlineViewShell::UpdateTitleObject( SdPage* pPage,
Paragraph* pPara )
::Outliner& rOutliner = pOlView->GetOutliner();
SdrTextObj* pTO = pOlView->GetTitleTextObject( pPage );
-OutlinerParaObject* pOPO = NULL;
OUString aTest = rOutliner.GetText(pPara);
boolbText = !aTest.isEmpty();
@@ -1675,9 +1674,9 @@ bool OutlineViewShell::UpdateTitleObject( SdPage* pPage,
Paragraph* pPara )
}
// if we have a title object and a text, set the text
-if( pTO )
+OutlinerParaObject* pOPO = pTO ?
rOutliner.CreateParaObject(rOutliner.GetAbsPos(pPara), 1) : NULL;
+if (pOPO)
{
-pOPO = rOutliner.CreateParaObject( rOutliner.GetAbsPos( pPara ), 1
);
pOPO->SetOutlinerMode( OUTLINERMODE_TITLEOBJECT );
pOPO->SetVertical( pTO->IsVerticalWriting() );
if( pTO->GetOutlinerParaObject() && (pOPO->GetTextObject() ==
pTO->GetOutlinerParaObject()->GetTextObject()) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source include/cppuhelper include/rtl sfx2/source sw/source
desktop/source/deployment/registry/configuration/dp_configuration.cxx |2 +-
include/cppuhelper/interfacecontainer.h |2 +-
include/rtl/locale.h |2 +-
include/rtl/strbuf.hxx|2 +-
include/rtl/ustrbuf.hxx |2 +-
sfx2/source/control/request.cxx |2 +-
sfx2/source/dialog/tabdlg.cxx |2 +-
sw/source/core/inc/laycache.hxx |2 +-
sw/source/core/text/pormulti.cxx |2 +-
sw/source/core/text/pormulti.hxx |6
+++---
sw/source/filter/ww8/wrtw8nds.cxx |2 +-
11 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 8416a65af18b7b030dece09f532235b8bb195a2b
Author: Noel Grandin
Date: Thu Jul 17 14:49:41 2014 +0200
fix spelling structur -> structure
Change-Id: I7aa4a9bf72732db95a67cee368f3a83a0d71bb9c
diff --git
a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index 1f1b084..af5fb70 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -754,7 +754,7 @@ void BackendImpl::PackageImpl::processPackage_(
{
//If the xcu file was installed before the configmgr was chaned
//to use the configmgr.ini, one needed to rebuild to whole
directory
-//structur containing the xcu, xcs files from all extensions.
Now,
+//structure containing the xcu, xcs files from all extensions.
Now,
//we just add all other xcu/xcs files to the configmgr.ini
instead of
//rebuilding the directory structure.
OUString url2(
diff --git a/include/cppuhelper/interfacecontainer.h
b/include/cppuhelper/interfacecontainer.h
index 56805f0..4b52c55 100644
--- a/include/cppuhelper/interfacecontainer.h
+++ b/include/cppuhelper/interfacecontainer.h
@@ -433,7 +433,7 @@ struct OBroadcastHelperVar
sal_BoolbInDispose;
/**
- Initialize the structur. bDispose and bInDispose are set to false.
+ Initialize the structure. bDispose and bInDispose are set to false.
@param rMutex_ the mutex reference.
*/
OBroadcastHelperVar( ::osl::Mutex & rMutex_ )
diff --git a/include/rtl/locale.h b/include/rtl/locale.h
index e410e02..3e49976b 100644
--- a/include/rtl/locale.h
+++ b/include/rtl/locale.h
@@ -34,7 +34,7 @@ extern "C" {
#endif
/**
-The implementation structur of a locale. Do not create this structure
+The implementation structure of a locale. Do not create this structure
direct. Only use the functions rtl_locale_register and
rtl_locale_setDefault. The strings Language, Country and Variant
are constants, so it is not necessary to acquire and release them.
diff --git a/include/rtl/strbuf.hxx b/include/rtl/strbuf.hxx
index 1a59f0e..b8d1d9d 100644
--- a/include/rtl/strbuf.hxx
+++ b/include/rtl/strbuf.hxx
@@ -932,7 +932,7 @@ public:
private:
/**
-A pointer to the data structur which contains the data.
+A pointer to the data structure which contains the data.
*/
rtl_String * pData;
diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx
index 9d304b6..b3cee75 100644
--- a/include/rtl/ustrbuf.hxx
+++ b/include/rtl/ustrbuf.hxx
@@ -1386,7 +1386,7 @@ private:
}
/**
-A pointer to the data structur which contains the data.
+A pointer to the data structure which contains the data.
*/
rtl_uString * pData;
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index 5675454..083d5ea 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -49,7 +49,7 @@ struct SfxRequest_Impl: public SfxListener
/* [Description]
-Implementation structur of the class.
+Implementation structure of the class.
*/
{
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 6039cda..5abd6f6 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -1267,7 +1267,7 @@ IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *,
pTabCtrl )
return sal_False;
#ifdef DBG_UTIL
Data_Impl* pDataObject = Find( pImpl->aData, pTabCtrl->GetCurPageId() );
-DBG_ASSERT( pDataObject, "no Data structur for current page" );
+DBG_ASSERT( pDataObject, "no Data structure for current page" );
if ( pPage->HasExchangeSupport() && pDataObject->bOnDemand )
{
DBG_WARNING( "Data exchange in ItemsOnDemand is not
[Libreoffice-commits] core.git: 3 commits - libreofficekit/README sd/source
libreofficekit/README | 41 +
sd/source/ui/inc/DrawViewShell.hxx |2 -
sd/source/ui/unoidl/unomodel.cxx |9 ++--
3 files changed, 49 insertions(+), 3 deletions(-)
New commits:
commit a39f690a2ac9bf8a04d3371cc837ca81bd85f22c
Author: Andrzej Hunt
Date: Tue Jul 15 09:50:47 2014 +0200
Render slides by default.
We should probably introduce an API to allow selecting notes instead,
however
the default mode is to open whichever view we had open last for a given
document -- whereas for nowwe probably always want to render the slides.
Change-Id: I26540613d1a510f23e5abfc8fee2ad743c180f34
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index f86e9cb..498c0c1 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2225,8 +2225,6 @@ void SdXImpressDocument::paintTile( VirtualDevice&
rDevice,
Region(
Rectangle( Point( nTilePosX, nTilePosY ),
Size( nTileWidth, nTileHeight ) ) ) );
-
-// TODO: Set page kind in frameview?
}
void SdXImpressDocument::setPart( int nPart )
@@ -2234,6 +2232,13 @@ void SdXImpressDocument::setPart( int nPart )
DrawViewShell* pViewSh = dynamic_cast< DrawViewShell* >(
mpDoc->GetDocSh()->GetViewShell() );
if (pViewSh)
{
+// TODO: have an API to allow selecting between PK_STANDARD (just
slide)
+// and PK_NOTES (which shows the combined slide above notes). There is
alo
+// a PK_HANDOUT -- that however just shows multiple empty pages (it's
also
+// only possible to select page 0 in this mode, I have no idea how you
+// then actually select what is on the handout page, which defaults to
+// a 4x4 grid of empty pages).
+pViewSh->SetPageKind( PK_STANDARD );
pViewSh->SwitchPage( nPart );
}
}
commit 0618c5b854af8d1cb3dc19f7babbdfb45e8f4504
Author: Andrzej Hunt
Date: Tue Jul 15 09:49:24 2014 +0200
Allow setting DrawViewShell PageKind directly.
Currently the only way to change the PageKind is via the UI controls
(i.e. via ExecCtrl) -- however for tiled rendering we want to select
the PageKind directly.
Change-Id: I3a3fa8f8cefaa0e0212832aef4026433fc596263
diff --git a/sd/source/ui/inc/DrawViewShell.hxx
b/sd/source/ui/inc/DrawViewShell.hxx
index 125d007..37c2ec3 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -240,7 +240,7 @@ public:
virtual boolPrepareClose( bool bUI = true ) SAL_OVERRIDE;
PageKindGetPageKind() { return mePageKind; }
-
+voidSetPageKind( PageKind ePageKind ) { mePageKind =
ePageKind; }
Point GetMousePos() { return maMousePos; }
boolIsMousePosFreezed() { return mbMousePosFreezed; }
voidSetMousePosFreezed( bool bIn ) { mbMousePosFreezed = bIn; }
commit 97a38b1bd337bab301bde20a408a1fc7b7a3cbbf
Author: Andrzej Hunt
Date: Tue Jul 15 14:53:07 2014 +0200
Add LOK Readme.
diff --git a/libreofficekit/README b/libreofficekit/README
new file mode 100644
index 000..267b20b
--- /dev/null
+++ b/libreofficekit/README
@@ -0,0 +1,41 @@
+LibreOfficeKit
+**
+
+LibreOfficeKit can be used for accessing LibreOffice functionality
+outwith LibreOffice, through C/C++, without any need to use UNO.
+
+For now it only offers document conversion (in addition to an experimental
+tiled rendering API).
+
+Integrating LOK into other software
+---
+
+You will need to integrate shim.c into your program, e.g. as a static library,
+in order to be able to use LOK. You will then be able to access LOK via
+the functions in LibreOfficeKit.h[xx].
+
+(LibreOfficeKit.hxx is a simple and fully inlined C++ wrapper for the same
+ functionality as in LibreOfficeKit.h.)
+
+An example program can be seen on:
+https://github.com/ojwb/lloconv
+
+Tiled Rendering
+---
+
+To use LOK Tiled Rendering you will need the follwing before the LOK includes:
+#define LOK_USE_UNSTABLE_API
+
+Currently only bitmap-buffer rendering is supported, with a 32-bit RGBA
+colourspace (further alternatives could feasibly be implemented as needed).
+Scanlines are ordered top-down (whereas LibreOffice will internally default
+to bottom-up).
+
+LibreOfficeKitGtk
+*
+
+Currently consists of only a very basic gtk+ document viewer widget.
+
+Currently this simply renders the entire document as one large tile (for
+writer) and/or entire sheet for calc, which can be somewhat slow with
+larger documents.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 include/tools sfx2/source
include/sfx2/frame.hxx |4 ++--
include/tools/ref.hxx| 10 +-
sfx2/source/doc/docfile.cxx |2 +-
sfx2/source/doc/sfxbasemodel.cxx |4 ++--
sfx2/source/view/frame.cxx |2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 490d30281726052bf4c36d4b79136ec7e7fd8395
Author: Noel Grandin
Date: Thu Jul 10 15:49:31 2014 +0200
rename the Weak stuff in tools/ref.hxx to WeakRef
.. which more accurately reflects it's purpose
Change-Id: Ibb87a47a3d1f3e35ac2820f14c71adf3b227c961
Reviewed-on: https://gerrit.libreoffice.org/10283
Reviewed-by: Thomas Arnhold
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index 8730dbd..18bf6cd 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -209,7 +209,7 @@ private:
SAL_DLLPRIVATE void Construct_Impl();
};
-SV_DECL_COMPAT_WEAK( SfxFrame )
+SV_DECL_COMPAT_WEAK_REF( SfxFrame )
class SfxFrameIterator
{
@@ -229,7 +229,7 @@ public:
class SFX2_DLLPUBLIC SfxFrameItem: public SfxPoolItem
{
SfxFrame* pFrame;
-SfxFrameWeakwFrame;
+SfxFrameWeakRef wFrame;
SAL_DLLPRIVATE void SetFramePtr_Impl( SfxFrame* /*pFrameP*/ ) { pFrame =
wFrame; }
public:
diff --git a/include/tools/ref.hxx b/include/tools/ref.hxx
index 1cd1474..1d5a37a 100644
--- a/include/tools/ref.hxx
+++ b/include/tools/ref.hxx
@@ -221,16 +221,16 @@ public:
SvCompatWeakHdl* GetHdl() { return _xHdl; }
};
-#define SV_DECL_COMPAT_WEAK( ClassName )\
-class ClassName##Weak \
+#define SV_DECL_COMPAT_WEAK_REF( ClassName )\
+class ClassName##WeakRef\
{ \
tools::SvRef _xHdl;\
public: \
-inline ClassName##Weak( ) {} \
-inline ClassName##Weak( ClassName* pObj ) { \
+inline ClassName##WeakRef( ) {} \
+inline ClassName##WeakRef( ClassName* pObj ) {\
if( pObj ) _xHdl = pObj->GetHdl(); }\
inline void Clear() { _xHdl.Clear(); } \
-inline ClassName##Weak& operator = ( ClassName * pObj ) { \
+inline ClassName##WeakRef& operator = ( ClassName * pObj ) {\
_xHdl = pObj ? pObj->GetHdl() : 0; return *this; } \
inline boolIs() const { \
return _xHdl.Is() && _xHdl->GetObj(); } \
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 4cb807d..67e7d10 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -207,7 +207,7 @@ public:
const SfxFilter* pOrigFilter;
OUStringaOrigURL;
DateTime aExpireTime;
-SfxFrameWeak wLoadTargetFrame;
+SfxFrameWeakRef wLoadTargetFrame;
SvKeyValueIteratorRef xAttributes;
svtools::AsynchronLink aDoneLink;
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index eb50885..eac066e 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -4193,8 +4193,8 @@ namespace sfx { namespace intern {
}
private:
-boolm_bSuccess;
-SfxFrameWeakm_aWeakFrame;
+bool m_bSuccess;
+SfxFrameWeakRef m_aWeakFrame;
};
} }
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 1c2d447..63a82c8 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -310,7 +310,7 @@ void SfxFrame::CancelTransfers( bool /*bCancelLoadEnv*/ )
GetChildFrame( n )->CancelTransfers();
// Check if StarOne-Loader should be canceled
-SfxFrameWeak wFrame( this );
+SfxFrameWeakRef wFrame( this );
if (wFrame.Is())
pImp->bInCancelTransfers = false;
}
___
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-6' - writerfilter/qa writerfilter/source
writerfilter/qa/cppunittests/rtftok/data/pass/abi3623.rtf |7 +++
writerfilter/source/dmapper/DomainMapper.cxx |2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit b0dae2115364ae1644203c046765f10ccfe9a8ac
Author: Miklos Vajna
Date: Mon Feb 17 17:50:57 2014 +0100
fdo#81173 abi#3623 RTF import: missing null pointer check
(cherry picked from commit 08fb25ab7941c52d4eed0435a45a38b03aff588c)
Signed-off-by: Michael Stahl
Change-Id: I5861e5fec0d822f42dfeb994500a818a968e69fb
(cherry picked from commit 50df6263ccde24874191812950dcccd8f839754b)
Reviewed-on: https://gerrit.libreoffice.org/10358
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
Reviewed-by: Andras Timar
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/abi3623.rtf
b/writerfilter/qa/cppunittests/rtftok/data/pass/abi3623.rtf
new file mode 100644
index 000..a47161a
--- /dev/null
+++ b/writerfilter/qa/cppunittests/rtftok/data/pass/abi3623.rtf
@@ -0,0 +1,7 @@
+{\rtf1
+{\stylesheet
+{\s2\ls1\sbasedon0 heading 2;}
+}
+\s2
+foo\par
+}
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index ff8428f..b9b1adf 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3261,7 +3261,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
{
const StyleSheetEntryPtr pParent =
pStyleTable->FindStyleSheetByISTD(pEntry->sBaseStyleIdentifier);
const StyleSheetPropertyMap* pParentProperties =
dynamic_cast(pParent ? pParent->pProperties.get()
: 0);
-if (pParentProperties->find(PROP_PARA_RIGHT_MARGIN) !=
pParentProperties->end())
+if (pParentProperties &&
pParentProperties->find(PROP_PARA_RIGHT_MARGIN) != pParentProperties->end())
nParaRightMargin =
pParentProperties->find(PROP_PARA_RIGHT_MARGIN)->second.getValue().get();
}
if (nParaRightMargin != 0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/qa
sd/qa/unit/HtmlExportTest.cxx |2 -
sd/qa/unit/export-tests.cxx| 20 +++
sd/qa/unit/import-tests.cxx| 54 -
sd/qa/unit/sdmodeltestbase.hxx | 21 +--
4 files changed, 45 insertions(+), 52 deletions(-)
New commits:
commit 461cb8fb430bfab2f67ae22d40852c3ca42841a2
Author: Markus Mohrhard
Date: Thu Jul 17 13:20:13 2014 +0200
make the temp file names random in sd tests
All the temp files got the same names for the temp files which might
conflict when two tests try to get teh same temp file at the same time.
Additionally it makes the dbgutil check by Norbert for finding leaked
temp files useless.
Change-Id: I692107f7705787c360247785b8d95daf4199c2a6
diff --git a/sd/qa/unit/HtmlExportTest.cxx b/sd/qa/unit/HtmlExportTest.cxx
index 81a62b4..779 100644
--- a/sd/qa/unit/HtmlExportTest.cxx
+++ b/sd/qa/unit/HtmlExportTest.cxx
@@ -32,7 +32,7 @@ public:
void testHTMLExport()
{
-sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/HtmlExportTestDocument.odp"));
+sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/HtmlExportTestDocument.odp"), ODP);
htmlDocPtr htmlDoc = exportAndParseHtml(xDocShRef);
assertXPath(htmlDoc, "/html", 1);
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 44c5c9a..3a939d7 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -82,7 +82,7 @@ public:
void SdFiltersTest::testN821567()
{
OUString bgImage;
-::sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/pptx/n821567.pptx") );
+::sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/pptx/n821567.pptx"), PPTX );
xDocShRef = saveAndReload( xDocShRef, ODP );
uno::Reference< drawing::XDrawPagesSupplier > xDoc(
@@ -147,7 +147,7 @@ void checkFontAttributes(const SdrTextObj* pObj, sal_uInt32
nColor,
void SdFiltersTest::testBnc870233_1()
{
-::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc870233_1.pptx"));
+::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc870233_1.pptx"), PPTX);
xDocShRef = saveAndReload( xDocShRef, PPTX );
SdDrawDocument *pDoc = xDocShRef->GetDoc();
@@ -176,7 +176,7 @@ void SdFiltersTest::testBnc870233_1()
void SdFiltersTest::testBnc870233_2()
{
-::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc870233_2.pptx"));
+::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc870233_2.pptx"), PPTX);
xDocShRef = saveAndReload( xDocShRef, PPTX );
SdDrawDocument *pDoc = xDocShRef->GetDoc();
@@ -213,7 +213,7 @@ void SdFiltersTest::testBnc870233_2()
void SdFiltersTest::testN828390_4()
{
bool bPassed = false;
-::sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/n828390_4.odp") );
+::sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/n828390_4.odp"), ODP );
xDocShRef = saveAndReload( xDocShRef, PPTX );
@@ -251,7 +251,7 @@ void SdFiltersTest::testN828390_4()
void SdFiltersTest::testN828390_5()
{
-::sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/n828390_5.odp") );
+::sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/n828390_5.odp"), ODP );
xDocShRef = saveAndReload( xDocShRef, PPTX );
@@ -274,7 +274,7 @@ void SdFiltersTest::testN828390_5()
void SdFiltersTest::testMediaEmbedding()
{
-::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/media_embedding.odp"));
+::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/media_embedding.odp"), ODP);
#if HAVE_FEATURE_GLTF
xDocShRef = saveAndReload( xDocShRef, ODP );
@@ -309,7 +309,7 @@ void SdFiltersTest::testMediaEmbedding()
void SdFiltersTest::testFdo71961()
{
-::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/fdo71961.odp"));
+::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/fdo71961.odp"), ODP);
xDocShRef = saveAndReload( xDocShRef, PPTX );
@@ -341,7 +341,7 @@ void SdFiltersTest::testFdo71961()
void SdFiltersTest::testN828390()
{
bool bPassed = false;
-::sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/pptx/n828390.pptx") );
+::sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/pptx/n828390.pptx"), PPTX );
xDocShRef = saveAndReload( xDocShRef, PPTX );
@@ -377,7 +377,7 @@ void SdFiltersTest::testN828390()
void SdFiltersTest::testBnc880763()
{
-::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc880763.pptx"));
+::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc880763.pptx"), PPTX);
x
[Libreoffice-commits] core.git: 2 commits - external/boost unoxml/source
external/boost/UnpackedTarball_boost.mk |1
external/boost/boost.date_time.Wshadow.warnings.patch.1 | 117
unoxml/source/dom/elementlist.cxx | 65 +++-
unoxml/source/dom/elementlist.hxx | 50 ++
4 files changed, 222 insertions(+), 11 deletions(-)
New commits:
commit a4928075958fd911d751a74b3a06e6730b557272
Author: Caolán McNamara
Date: Thu Jul 17 10:29:36 2014 +0100
fix memleak circular dependency of CElementList and CElement
launching impress leaks 70+k
==1458== 78,741 (152 direct, 78,589 indirect) bytes in 1 blocks are
definitely lost in loss record 24,296 of 24,315
==1458==at 0x4A0645D: malloc (in
/usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==1458==by 0x4C3895D: rtl_allocateMemory_SYSTEM(unsigned long)
(alloc_global.cxx:270)
==1458==by 0x4C38A64: rtl_allocateMemory (alloc_global.cxx:303)
==1458==by 0x2DCC0B67: cppu::OWeakObject::operator new(unsigned long)
(weak.hxx:85)
==1458==by 0x2DCCB3D3:
DOM::CDocument::getElementsByTagName(rtl::OUString const&) (document.cxx:714)
==1458==by 0x25DC99D6: SdDrawDocument::InitLayoutVector()
(drawdoc.cxx:1008)
because the CElementList owns the CElement via m_pElement and
m_pElement owns the CElementList via the addEventListener.
Use a WeakEventListener pattern to let the CElement own
that helper which itself doesn't own the CElementList but is
owned by it instead, and forwards the events to the CElementList
In order to use that pattern the CElementList must be have a m_refCount
of 1 when the addEventListener is called, i.e. post ctor, so rename
the original CElementList as CElementListImpl and call its registerListener
from a wrapper CElementList
Change-Id: Ibd4f19b619543a4ef580366c69efb61b526696ab
diff --git a/unoxml/source/dom/elementlist.cxx
b/unoxml/source/dom/elementlist.cxx
index 98d150b..9230917 100644
--- a/unoxml/source/dom/elementlist.cxx
+++ b/unoxml/source/dom/elementlist.cxx
@@ -28,6 +28,34 @@ using namespace css::uno;
using namespace css::xml::dom;
using namespace css::xml::dom::events;
+namespace
+{
+class WeakEventListener : public
::cppu::WeakImplHelper1
+{
+private:
+css::uno::WeakReference mxOwner;
+
+public:
+WeakEventListener(const
css::uno::Reference& rOwner)
+: mxOwner(rOwner)
+{
+}
+
+virtual ~WeakEventListener()
+{
+}
+
+virtual void SAL_CALL handleEvent(const
css::uno::Reference& rEvent)
+throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+{
+css::uno::Reference
xOwner(mxOwner.get(),
+css::uno::UNO_QUERY);
+if (xOwner.is())
+xOwner->handleEvent(rEvent);
+}
+};
+}
+
namespace DOM
{
@@ -43,25 +71,46 @@ namespace DOM
CElementList::CElementList(::rtl::Reference const& pElement,
::osl::Mutex & rMutex,
OUString const& rName, OUString const*const pURI)
+: m_xImpl(new CElementListImpl(pElement, rMutex, rName, pURI))
+{
+if (pElement.is()) {
+m_xImpl->registerListener(*pElement);
+}
+}
+
+CElementListImpl::CElementListImpl(::rtl::Reference const&
pElement,
+::osl::Mutex & rMutex,
+OUString const& rName, OUString const*const pURI)
: m_pElement(pElement)
, m_rMutex(rMutex)
, m_pName(lcl_initXmlString(rName))
, m_pURI((pURI) ? lcl_initXmlString(*pURI) : 0)
, m_bRebuild(true)
{
-if (m_pElement.is()) {
-registerListener(*m_pElement);
+}
+
+CElementListImpl::~CElementListImpl()
+{
+if (m_xEventListener.is() && m_pElement.is())
+{
+Reference< XEventTarget >
xTarget(static_cast(m_pElement.get()), UNO_QUERY);
+assert(xTarget.is());
+if (!xTarget.is())
+return;
+bool capture = false;
+xTarget->removeEventListener("DOMSubtreeModified",
m_xEventListener, capture);
}
}
-void CElementList::registerListener(CElement & rElement)
+void CElementListImpl::registerListener(CElement & rElement)
{
try {
Reference< XEventTarget > const xTarget(
static_cast(& rElement), UNO_QUERY_THROW);
bool capture = false;
+m_xEventListener = new WeakEventListener(this);
xTarget->addEventListener("DOMSubtreeModified",
-Reference< XEventListener >(this), capture);
+m_xEventListener, capture);
} catch (const Exception &e){
OString aMsg("Exception caught while registering NodeList as
listener:\n");
aMsg += OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US);
@@ -69,7 +118,7 @@ namespac
Re: Suggestion for Calc
Hi, Test schrieb: Hi everyone, I hope I’m on the right place to write my suggestion / feature request. No, it is the wrong place. This list would be suitable, if you are going to implement the feature yourself and need some code pointers. For discussion whether the feature is useful and to learn about alternative and perhaps better ways in LibreOffice, use the mailinglist us...@global.libreoffice.org or disc...@global.libreoffice.org or a forum. After the request has matured in the discussions, submit an enhancement request in our Issuetracker. Kind regards Regina There are some versions ago, MS Excel™©® had a very useful feature to manage lists. You started a list table by writing column labels. In the second line, you added fonctions and formats you need for each cell. Then you selected the two lines and “list mode” in a menu. Then it creates a third line starting with *. This line, still at the bottom of the table, is for adding datas in the table. You fill all the cells and validate so the line is automatically added in the table and the table automatically sorted. You could add auto or manual sorting and subtotals to the table. This was very useful for managing lists when not knowing how many lines needed. I don’t know why Excel dit stop this great feature but I would be greater if LO Calc had it… Thanks for reading and for your answers. JLuc Barts Andreetto ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: connectivity/Library_tdeab1.mk connectivity/Library_tdeabdrv1.mk shell/Library_tdebe.mk vcl/Executable_tdefilepicker.mk vcl/Library_vclplug_tde.mk
connectivity/Library_tdeab1.mk|1 + connectivity/Library_tdeabdrv1.mk |1 + shell/Library_tdebe.mk|5 + vcl/Executable_tdefilepicker.mk |2 +- vcl/Library_vclplug_tde.mk|3 ++- 5 files changed, 10 insertions(+), 2 deletions(-) New commits: commit 38e2ef81204529691b3888076e33218342825801 Author: Timothy Pearson Date: Wed Jul 16 02:04:39 2014 + Fix FTBFS with TDE support enabled Change-Id: Ib85371542c5d79ef69bc76f6aa388acdfd9dd849 Reviewed-on: https://gerrit.libreoffice.org/10348 Reviewed-by: Timothy Pearson Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk index 298ed4c..8243280 100644 --- a/connectivity/Library_tdeab1.mk +++ b/connectivity/Library_tdeab1.mk @@ -18,6 +18,7 @@ $(eval $(call gb_Library_set_componentfile,tdeab1,connectivity/source/drivers/ka $(eval $(call gb_Library_set_include,tdeab1,\ -I$(SRCDIR)/connectivity/source/inc \ +-I$(SRCDIR)/include/shell \ $$(INCLUDE) \ )) diff --git a/connectivity/Library_tdeabdrv1.mk b/connectivity/Library_tdeabdrv1.mk index 8301e5f..1398d9f 100644 --- a/connectivity/Library_tdeabdrv1.mk +++ b/connectivity/Library_tdeabdrv1.mk @@ -12,6 +12,7 @@ $(eval $(call gb_Library_Library,tdeabdrv1)) $(eval $(call gb_Library_set_include,tdeabdrv1,\ -I$(SRCDIR)/connectivity/source/inc \ + -I$(SRCDIR)/include/shell \ $$(INCLUDE) \ -I$(WORKDIR)/YaccTarget/connectivity/source/parse \ )) diff --git a/shell/Library_tdebe.mk b/shell/Library_tdebe.mk index dc5b735..3b516d8 100644 --- a/shell/Library_tdebe.mk +++ b/shell/Library_tdebe.mk @@ -9,6 +9,11 @@ $(eval $(call gb_Library_Library,tdebe1)) +$(eval $(call gb_Library_set_include,tdebe1,\ +$$(INCLUDE) \ +-I$(SRCDIR)/include/shell \ +)) + $(eval $(call gb_Library_use_sdk_api,tdebe1)) $(eval $(call gb_Library_use_externals,tdebe1,\ diff --git a/vcl/Executable_tdefilepicker.mk b/vcl/Executable_tdefilepicker.mk index 6a39235..9811e6d 100644 --- a/vcl/Executable_tdefilepicker.mk +++ b/vcl/Executable_tdefilepicker.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Executable_set_include,tdefilepicker,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ -I$(SRCDIR)/solenv/inc \ --I$(SRCDIR)/vcl/inc/unx/tde \ +-I$(SRCDIR)/vcl/inc/unx/kde \ )) $(eval $(call gb_Executable_use_libraries,tdefilepicker,\ diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk index 74551bd..d05780b 100644 --- a/vcl/Library_vclplug_tde.mk +++ b/vcl/Library_vclplug_tde.mk @@ -15,7 +15,8 @@ $(eval $(call gb_Library_set_include,vclplug_tde,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ -I$(SRCDIR)/solenv/inc \ --I$(SRCDIR)/vcl/inc/unx/tde \ +-I$(SRCDIR)/vcl/inc/unx/kde \ +-I$(SRCDIR)/include/shell \ )) $(eval $(call gb_Library_set_include,vclplug_tde,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - writerperfect/source
writerperfect/source/impress/KeynoteImportFilter.cxx | 36 +--
1 file changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 7e68478edc0ad24c11657d12ed4f8289393ce1d2
Author: David Tardon
Date: Wed Jul 16 15:13:36 2014 +0200
fdo#81113 always run the actual detection
The old code only run detection if an UCBContent property was passed.
That means that any time the function got only InputStream, it claimed
that it was a Keynote presentation.
Change-Id: I377828229e7e95384257bde247612d7768307581
(cherry picked from commit c10390a681a4d4696d45a6d38f7d01829f368daa)
Reviewed-on: https://gerrit.libreoffice.org/10357
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/writerperfect/source/impress/KeynoteImportFilter.cxx
b/writerperfect/source/impress/KeynoteImportFilter.cxx
index 5edbfa9..4b7b029 100644
--- a/writerperfect/source/impress/KeynoteImportFilter.cxx
+++ b/writerperfect/source/impress/KeynoteImportFilter.cxx
@@ -247,29 +247,29 @@ throw( com::sun::star::uno::RuntimeException,
std::exception )
{
return OUString();
}
+}
-libetonyek::EtonyekDocument::Type type =
libetonyek::EtonyekDocument::TYPE_UNKNOWN;
-const libetonyek::EtonyekDocument::Confidence confidence =
libetonyek::EtonyekDocument::isSupported( input.get(), &type );
-if ((libetonyek::EtonyekDocument::CONFIDENCE_NONE == confidence) ||
(libetonyek::EtonyekDocument::TYPE_KEYNOTE != type))
-return OUString();
+libetonyek::EtonyekDocument::Type type =
libetonyek::EtonyekDocument::TYPE_UNKNOWN;
+const libetonyek::EtonyekDocument::Confidence confidence =
libetonyek::EtonyekDocument::isSupported( input.get(), &type );
+if ((libetonyek::EtonyekDocument::CONFIDENCE_NONE == confidence) ||
(libetonyek::EtonyekDocument::TYPE_KEYNOTE != type))
+return OUString();
-if ( confidence ==
libetonyek::EtonyekDocument::CONFIDENCE_SUPPORTED_PART )
-{
-assert( !bIsPackage );
+if ( confidence == libetonyek::EtonyekDocument::CONFIDENCE_SUPPORTED_PART )
+{
+ assert( !bIsPackage );
-const Reference < container::XChild > xChild( xContent, UNO_QUERY
);
-if ( xChild.is() )
+const Reference < container::XChild > xChild( xContent, UNO_QUERY );
+if ( xChild.is() )
+{
+const Reference < ucb::XContent > xPackageContent(
xChild->getParent(), UNO_QUERY );
+if ( xPackageContent.is() )
{
-const Reference < ucb::XContent > xPackageContent(
xChild->getParent(), UNO_QUERY );
-if ( xPackageContent.is() )
+input.reset( new writerperfect::DirectoryStream(
xPackageContent ) );
+if ( libetonyek::EtonyekDocument::CONFIDENCE_EXCELLENT ==
libetonyek::EtonyekDocument::isSupported( input.get() ) )
{
-input.reset( new writerperfect::DirectoryStream(
xPackageContent ) );
-if ( libetonyek::EtonyekDocument::CONFIDENCE_EXCELLENT ==
libetonyek::EtonyekDocument::isSupported( input.get() ) )
-{
-xContent = xPackageContent;
-bUCBContentChanged = true;
-bIsPackage = true;
-}
+xContent = xPackageContent;
+bUCBContentChanged = true;
+bIsPackage = true;
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/source
scp2/source/ooo/file_ooo.scp |2 ++ scp2/source/ooo/module_hidden_ooo.scp|1 + scp2/source/ooo/module_lang_template.scp |1 + 3 files changed, 4 insertions(+) New commits: commit b875362cd576b29aee4da899335b8d8f6c74d192 Author: Maxim Monastirsky Date: Thu Jul 17 11:54:33 2014 +0300 fdo#8 Package formula ui files Change-Id: Ie73f3ea4eff4dc8400d2ba3736c162d728c277d3 Reviewed-on: https://gerrit.libreoffice.org/10365 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 811071e..6c75c79 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -498,6 +498,7 @@ UI_FILELIST(dbtdata, "UIConfig/modules/dbtdata.filelist") #endif UI_FILELIST(desktop, "UIConfig/desktop.filelist") UI_FILELIST(filter, "UIConfig/filter.filelist") +UI_FILELIST(formula, "UIConfig/formula.filelist") UI_FILELIST(sabpilot, "UIConfig/modules/sabpilot.filelist") UI_FILELIST(scanner, "UIConfig/modules/scanner.filelist") #ifdef DBCONNECTIVITY @@ -536,6 +537,7 @@ UI_FILELIST_ALL_LANG(spropctrlr, modules/spropctrlr) #endif UI_FILELIST_ALL_LANG(desktop, desktop) UI_FILELIST_ALL_LANG(filter, filter) +UI_FILELIST_ALL_LANG(formula, formula) UI_FILELIST_ALL_LANG(sabpilot, modules/sabpilot) UI_FILELIST_ALL_LANG(scalc, modules/scalc) UI_FILELIST_ALL_LANG(schart, modules/schart) diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index d7dd6e0..e3d2bb7 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -239,6 +239,7 @@ Module gid_Module_Root_Files_6 #endif gid_File_Share_Config_Sofficecfg_uiconfig_desktop, gid_File_Share_Config_Sofficecfg_uiconfig_filter, +gid_File_Share_Config_Sofficecfg_uiconfig_formula, #ifdef DBCONNECTIVITY gid_File_Share_Config_Sofficecfg_uiconfig_sbibliography, #endif diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp index 5390a2e..58c8e54 100644 --- a/scp2/source/ooo/module_lang_template.scp +++ b/scp2/source/ooo/module_lang_template.scp @@ -32,6 +32,7 @@ Module gid_Module_Langpack_Basis_Template #endif gid_File_Share_Config_Sofficecfg_uiconfig_desktop_Lang, gid_File_Share_Config_Sofficecfg_uiconfig_filter_Lang, + gid_File_Share_Config_Sofficecfg_uiconfig_formula_Lang, gid_File_Share_Config_Sofficecfg_uiconfig_sabpilot_Lang, gid_File_Share_Config_Sofficecfg_uiconfig_scalc_Lang, gid_File_Share_Config_Sofficecfg_uiconfig_schart_Lang, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Suggestion for Calc
Hi everyone, I hope I’m on the right place to write my suggestion / feature request. There are some versions ago, MS Excel™©® had a very useful feature to manage lists. You started a list table by writing column labels. In the second line, you added fonctions and formats you need for each cell. Then you selected the two lines and “list mode” in a menu. Then it creates a third line starting with *. This line, still at the bottom of the table, is for adding datas in the table. You fill all the cells and validate so the line is automatically added in the table and the table automatically sorted. You could add auto or manual sorting and subtotals to the table. This was very useful for managing lists when not knowing how many lines needed. I don’t know why Excel dit stop this great feature but I would be greater if LO Calc had it… Thanks for reading and for your answers. JLuc Barts Andreetto ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-libcmis' - external/nss RepositoryExternal.mk ucb/source
RepositoryExternal.mk |3 +++
external/nss/ExternalPackage_nss.mk | 16
external/nss/UnpackedTarball_nss.mk |7 +++
ucb/source/ucp/cmis/cmis_content.cxx | 24
ucb/source/ucp/cmis/cmis_repo_content.cxx | 10 --
5 files changed, 58 insertions(+), 2 deletions(-)
New commits:
commit f2bcba7dfcb9a9bdc257bf4fb2434b2ec4d080b5
Author: Cédric Bosdonnat
Date: Wed Jul 16 17:02:01 2014 +0200
fdo#72277: don't build and use nsspem when building against system curl
System CURL will know how to get the CA bundle from the system openSSL.
There is no need to have internal NSS CA database support.
Change-Id: Ie5074c78f7d78b2c2f452d4d4e11c98222529883
Conflicts:
ucb/source/ucp/cmis/cmis_content.cxx
ucb/source/ucp/cmis/cmis_repo_content.cxx
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index fc8c8f7..c0dbb78 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2426,6 +2426,9 @@ endif # !SYSTEM_LIBPNG
ifneq ($(SYSTEM_CURL),)
define gb_LinkTarget__use_curl
+$(call gb_LinkTarget_add_defs,$(1),\
+ -DSYSTEM_CURL \
+)
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(CURL_CFLAGS) \
diff --git a/external/nss/ExternalPackage_nss.mk
b/external/nss/ExternalPackage_nss.mk
index e7e9e8a..26f9239 100644
--- a/external/nss/ExternalPackage_nss.mk
+++ b/external/nss/ExternalPackage_nss.mk
@@ -58,4 +58,20 @@ $(eval $(call
gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
))
endif
+ifeq ($(SYSTEM_CURL),)
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
+ dist/out/lib/libnsspem.dylib \
+))
+else ifeq ($(OS),WNT)
+$(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
+ dist/out/lib/nsspem.dll \
+))
+else # OS!=WNT/MACOSX
+$(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
+ dist/out/lib/libnsspem.so \
+))
+endif
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/external/nss/UnpackedTarball_nss.mk
b/external/nss/UnpackedTarball_nss.mk
index 56f9430..3ccd7d3 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -24,6 +24,13 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.mingw.patch.3) \
))
+# nss-pem is only needed for internal curl to read the NSS CA database
+ifeq ($(SYSTEM_CURL),)
+$(eval $(call gb_UnpackedTarball_add_patches,nss,\
+ external/nss/nss-pem.patch \
+))
+endif
+
ifeq ($(COM_GCC_IS_CLANG)$(filter
-fsanitize=address,$(CC)),TRUE-fsanitize=address)
$(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/asan.patch.1 \
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx
b/ucb/source/ucp/cmis/cmis_content.cxx
index 4b874e2..181a67b 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -32,6 +32,15 @@
#include
#include
#include
+<<< HEAD
+===
+#ifndef SYSTEM_CURL
+#include
+#include
+#include
+#include
+#endif
+>>> 89361fa... fdo#72277: don't build and use nsspem when building against
system curl
#include
#include
@@ -272,6 +281,21 @@ namespace cmis
if ( NULL == m_pSession )
{
+<<< HEAD
+===
+#ifndef SYSTEM_CURL
+// Initialize NSS library to make sure libcmis (and curl) can
access CACERTs using NSS
+// when using internal libcurl.
+uno::Reference< com::sun::star::xml::crypto::XNSSInitializer >
+xNSSInitializer =
com::sun::star::xml::crypto::NSSInitializer::create( m_xContext );
+
+uno::Reference< com::sun::star::xml::crypto::XDigestContext >
xDigestContext(
+xNSSInitializer->getDigestContext(
com::sun::star::xml::crypto::DigestID::SHA256,
+ uno::Sequence<
beans::NamedValue >() ),
+
uno::UNO_SET_THROW );
+#endif
+
+>>> 89361fa... fdo#72277: don't build and use nsspem when building against
system curl
// Set the SSL Validation handler
libcmis::CertValidationHandlerPtr certHandler(
new CertValidationHandler( xEnv, m_xContext,
aBindingUrl.GetHost( ) ) );
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx
b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index 52068da..6cc2b71 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -16,10 +16,12 @@
#include
#include
#include
+#ifndef SYSTEM_CURL
#include
#include
#include
#include
+#endif
#include
#include
@@ -125,8 +127,11 @@ namespace cmis
void RepoContent::getRepositories( const uno::Reference<
ucb::XCommandEnvironment > & xEnv )
{
-const uno::Reference< com::sun::star::uno::XComponentContext >&
-
[Libreoffice-commits] core.git: basctl/source basic/inc basic/source editeng/inc editeng/source include/basic include/editeng include/sfx2 include/svl include/svtools include/svx include/vcl reportdes
basctl/source/inc/dlged.hxx|2 basctl/source/inc/propbrw.hxx |2 basic/inc/pch/precompiled_sb.hxx |2 basic/source/classes/sbxmod.cxx|2 basic/source/sbx/sbxobj.cxx|2 basic/source/sbx/sbxvar.cxx|2 editeng/inc/pch/precompiled_editeng.hxx|2 editeng/source/uno/unoedsrc.cxx|2 editeng/source/xml/xmltxtexp.cxx |1 include/basic/basmgr.hxx |2 include/editeng/outliner.hxx |2 include/editeng/unoedprx.hxx |2 include/sfx2/shell.hxx |2 include/svl/SfxBroadcaster.hxx | 68 +++ include/svl/brdcst.hxx | 68 --- include/svl/inethist.hxx |2 include/svl/style.hxx |2 include/svtools/extcolorcfg.hxx|2 include/svx/gallery1.hxx |2 include/svx/galtheme.hxx |2 include/svx/svdmodel.hxx |2 include/svx/svdpntv.hxx|2 include/vcl/texteng.hxx|2 reportdesign/source/ui/inc/DesignView.hxx |2 reportdesign/source/ui/inc/propbrw.hxx |2 sc/source/ui/inc/AccessibleText.hxx|2 sd/inc/pch/precompiled_sd.hxx |2 sd/source/ui/inc/AccessibleOutlineEditSource.hxx |2 sd/source/ui/view/outlview.cxx |1 starmath/inc/config.hxx|2 starmath/inc/format.hxx|2 starmath/source/accessibility.hxx |2 svl/Library_svl.mk |2 svl/source/inc/poolio.hxx |2 svl/source/items/itempool.cxx |2 svl/source/items/poolio.cxx|2 svl/source/notify/SfxBroadcaster.cxx | 150 + svl/source/notify/brdcst.cxx | 150 - svl/source/notify/lstner.cxx |2 svx/inc/pch/precompiled_svxcore.hxx|2 svx/source/accessibility/AccessibleEmptyEditSource.hxx |2 svx/source/inc/filtnav.hxx |2 svx/source/inc/fmexpl.hxx |2 svx/source/svdraw/svdmark.cxx |2 svx/source/svdraw/svdviter.cxx |1 sw/inc/fmtfld.hxx |2 sw/inc/pch/precompiled_sw.hxx |2 sw/source/core/inc/frame.hxx |2 sw/source/uibase/docvw/SidebarTxtControlAcc.cxx|2 vcl/inc/pch/precompiled_vcl.hxx|2 vcl/source/edit/vclmedit.cxx |1 51 files changed, 261 insertions(+), 265 deletions(-) New commits: commit 6a873638fa0cc66f95832d46a5cea81a0dc76ecc Author: Tobias Lippert Date: Wed Jul 16 21:22:34 2014 +0200 Renamed brdcst.[hc]xx to SfxBroadcaster.[hc]xx - Remove includes from files where they are not needed. - Update pch files Change-Id: I0188e3934ef429008c1ef495ab1d5b27f38664d5 Reviewed-on: https://gerrit.libreoffice.org/10342 Reviewed-by: Thomas Arnhold Tested-by: Thomas Arnhold diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx index 028e1c9..8c75e5e 100644 --- a/basctl/source/inc/dlged.hxx +++ b/basctl/source/inc/dlged.hxx @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/basctl/source/inc/propbrw.hxx b/basctl/source/inc/propbrw.hxx index 8081a8c..8469624 100644 --- a/basctl/source/inc/propbrw.hxx +++ b/basctl/source/inc/propbrw.hxx @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include "bastypes.hxx" diff --git a/basic/inc/pch/precompiled_sb.hxx b/basic/inc/pch/precompiled_sb.hxx index a7cd16b..7da956f 100644 --- a/basic/inc/pch/precompiled_sb.hxx +++ b/basic/inc/pch/precompiled_sb.hxx @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index c8b20902..b76f9fbd 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/basic/source/sbx/sbxob
[Libreoffice-commits] core.git: external/nss RepositoryExternal.mk ucb/source
RepositoryExternal.mk |3 +++
external/nss/ExternalPackage_nss.mk | 19 ---
external/nss/UnpackedTarball_nss.mk |8 +++-
ucb/source/ucp/cmis/cmis_content.cxx |4
ucb/source/ucp/cmis/cmis_repo_content.cxx |4
5 files changed, 34 insertions(+), 4 deletions(-)
New commits:
commit 89361fa68af9a6854dc3a07711279f27561ea8fb
Author: Cédric Bosdonnat
Date: Wed Jul 16 17:02:01 2014 +0200
fdo#72277: don't build and use nsspem when building against system curl
System CURL will know how to get the CA bundle from the system openSSL.
There is no need to have internal NSS CA database support.
Change-Id: Ie5074c78f7d78b2c2f452d4d4e11c98222529883
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 39ca2d85..b0747f1 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2472,6 +2472,9 @@ endif # !SYSTEM_LIBPNG
ifneq ($(SYSTEM_CURL),)
define gb_LinkTarget__use_curl
+$(call gb_LinkTarget_add_defs,$(1),\
+ -DSYSTEM_CURL \
+)
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
$(CURL_CFLAGS) \
diff --git a/external/nss/ExternalPackage_nss.mk
b/external/nss/ExternalPackage_nss.mk
index fcbca81..26f9239 100644
--- a/external/nss/ExternalPackage_nss.mk
+++ b/external/nss/ExternalPackage_nss.mk
@@ -18,7 +18,6 @@ $(eval $(call
gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
dist/out/lib/libnss3.dylib \
dist/out/lib/libnssckbi.dylib \
dist/out/lib/libnssdbm3.dylib \
- dist/out/lib/libnsspem.dylib \
dist/out/lib/libnssutil3.dylib \
dist/out/lib/libplc4.dylib \
dist/out/lib/libplds4.dylib \
@@ -34,7 +33,6 @@ $(eval $(call
gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
dist/out/lib/nss3.dll \
dist/out/lib/nssckbi.dll \
dist/out/lib/nssdbm3.dll \
- dist/out/lib/nsspem.dll \
dist/out/lib/nssutil3.dll \
dist/out/lib/plc4.dll \
dist/out/lib/plds4.dll \
@@ -50,7 +48,6 @@ $(eval $(call
gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
dist/out/lib/libnss3.so \
dist/out/lib/libnssckbi.so \
dist/out/lib/libnssdbm3.so \
- dist/out/lib/libnsspem.so \
dist/out/lib/libnssutil3.so \
dist/out/lib/libplc4.so \
dist/out/lib/libplds4.so \
@@ -61,4 +58,20 @@ $(eval $(call
gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
))
endif
+ifeq ($(SYSTEM_CURL),)
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
+ dist/out/lib/libnsspem.dylib \
+))
+else ifeq ($(OS),WNT)
+$(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
+ dist/out/lib/nsspem.dll \
+))
+else # OS!=WNT/MACOSX
+$(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
+ dist/out/lib/libnsspem.so \
+))
+endif
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/external/nss/UnpackedTarball_nss.mk
b/external/nss/UnpackedTarball_nss.mk
index bafe3b5..11839c4 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss_macosx.patch \
external/nss/nss-linux-x86.patch.0 \
external/nss/nss-win32-make.patch.1 \
- external/nss/nss-pem.patch \
$(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss.windows.patch) \
$(if $(filter WNTGCC,$(OS)$(COM)),external/nss/nspr-4.9-build.patch.3 \
external/nss/nss-3.13.3-build.patch.3 \
@@ -26,6 +25,13 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nspr-build-config.patch \
))
+# nss-pem is only needed for internal curl to read the NSS CA database
+ifeq ($(SYSTEM_CURL),)
+$(eval $(call gb_UnpackedTarball_add_patches,nss,\
+ external/nss/nss-pem.patch \
+))
+endif
+
ifeq ($(COM_GCC_IS_CLANG)$(filter
-fsanitize=address,$(CC)),TRUE-fsanitize=address)
$(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/asan.patch.1 \
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx
b/ucb/source/ucp/cmis/cmis_content.cxx
index 5b81748..7cd9d3e 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -32,10 +32,12 @@
#include
#include
#include
+#ifndef SYSTEM_CURL
#include
#include
#include
#include
+#endif
#include
#include
@@ -276,6 +278,7 @@ namespace cmis
if ( NULL == m_pSession )
{
+#ifndef SYSTEM_CURL
// Initialize NSS library to make sure libcmis (and curl) can
access CACERTs using NSS
// when using internal libcurl.
uno::Reference< com::sun::star::xml::crypto::XNSSInitializer >
@@ -285,6 +288,7 @@ namespace cm
[Libreoffice-commits] core.git: libreofficekit/qa libreofficekit/source
libreofficekit/qa/unit/tiledrendering.cxx |3 ++-
libreofficekit/source/shim.c |2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit a95934d8dbd91e3c6250578171483859cb11f3c2
Author: Matúš Kukan
Date: Thu Jul 17 10:35:49 2014 +0200
Fix some CppunitTest_libreofficekit_tiledrendering related problems
Change-Id: Icdcde0af1b3d5744ef2842e4b4d2b85a094ac686
diff --git a/libreofficekit/qa/unit/tiledrendering.cxx
b/libreofficekit/qa/unit/tiledrendering.cxx
index d48e304..67fa62e 100644
--- a/libreofficekit/qa/unit/tiledrendering.cxx
+++ b/libreofficekit/qa/unit/tiledrendering.cxx
@@ -42,7 +42,8 @@ public:
void TiledRenderingTest::testOverlay()
{
const string sSrcRoot = getenv( "SRC_ROOT" );
-const string sLOPath = sSrcRoot + "/instdir/program";
+const string sInstDir = getenv( "INSTDIR" );
+const string sLOPath = sInstDir + "/program";
const string sDocPath = sSrcRoot +
"/odk/examples/java/DocumentHandling/test/test1.odt";
scoped_ptr< Office > pOffice( lok_cpp_init(
diff --git a/libreofficekit/source/shim.c b/libreofficekit/source/shim.c
index ac272e8..b533a61 100644
--- a/libreofficekit/source/shim.c
+++ b/libreofficekit/source/shim.c
@@ -22,7 +22,7 @@
#endif
#define TARGET_LIB"lib" "sofficeapp" ".so"
-#define TARGET_MERGED_LIB "lib" "libmergedlo" ".so"
+#define TARGET_MERGED_LIB "lib" "mergedlo" ".so"
typedef LibreOfficeKit *(HookFunction)( const char *install_path);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/qa sw/source
sw/qa/extras/ooxmlexport/ooxmlexport.cxx| 11 ---
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx | 11 +++
sw/source/filter/ww8/docxsdrexport.cxx | 20 +++-
sw/source/filter/ww8/docxsdrexport.hxx |2 --
4 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 461e46904ffa29820be1ccb64cdb9cb6d4469b6c
Author: Miklos Vajna
Date: Thu Jul 17 09:48:18 2014 +0200
DocxSdrExport: move member to impl class
Change-Id: I37aef651cf6424e7935ea3584b8f493f6f24c484
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index 363b5b9..da9dc23 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -164,6 +164,8 @@ struct DocxSdrExport::Impl
bool m_bDMLAndVMLDrawingOpen;
/// List of TextBoxes in this document: they are exported as part of their
shape, never alone.
std::set m_aTextBoxes;
+/// Preserved rotation for TextFrames.
+sal_Int32 m_nDMLandVMLTextFrameRotation;
Impl(DocxSdrExport& rSdrExport, DocxExport& rExport,
sax_fastparser::FSHelperPtr pSerializer, oox::drawingml::DrawingML* pDrawingML)
: m_rSdrExport(rSdrExport),
@@ -186,7 +188,8 @@ struct DocxSdrExport::Impl
m_nId(0),
m_nSeq(0),
m_bDMLAndVMLDrawingOpen(false),
- m_aTextBoxes(SwTextBoxHelper::findTextBoxes(m_rExport.pDoc))
+ m_aTextBoxes(SwTextBoxHelper::findTextBoxes(m_rExport.pDoc)),
+ m_nDMLandVMLTextFrameRotation(0)
{
}
@@ -203,8 +206,7 @@ struct DocxSdrExport::Impl
};
DocxSdrExport::DocxSdrExport(DocxExport& rExport, sax_fastparser::FSHelperPtr
pSerializer, oox::drawingml::DrawingML* pDrawingML)
-: m_pImpl(new Impl(*this, rExport, pSerializer, pDrawingML)),
- DMLandVMLTextFrameRotation(0)
+: m_pImpl(new Impl(*this, rExport, pSerializer, pDrawingML))
{
}
@@ -1273,7 +1275,7 @@ void DocxSdrExport::writeDMLTextFrame(sw::Frame*
pParentFrame, int nAnchorId, bo
FSEND);
uno::Any aRotation ;
-DMLandVMLTextFrameRotation = 0;
+m_pImpl->m_nDMLandVMLTextFrameRotation = 0;
if (xPropSetInfo.is() &&
xPropSetInfo->hasPropertyByName("FrameInteropGrabBag"))
{
uno::Sequence< beans::PropertyValue > propList;
@@ -1288,11 +1290,11 @@ void DocxSdrExport::writeDMLTextFrame(sw::Frame*
pParentFrame, int nAnchorId, bo
}
}
}
-aRotation >>= DMLandVMLTextFrameRotation ;
-OString
sRotation(OString::number((OOX_DRAWINGML_EXPORT_ROTATE_CLOCKWISIFY(DMLandVMLTextFrameRotation;
+aRotation >>= m_pImpl->m_nDMLandVMLTextFrameRotation ;
+OString
sRotation(OString::number((OOX_DRAWINGML_EXPORT_ROTATE_CLOCKWISIFY(m_pImpl->m_nDMLandVMLTextFrameRotation;
// Shape properties
pFS->startElementNS(XML_wps, XML_spPr, FSEND);
-if (DMLandVMLTextFrameRotation)
+if (m_pImpl->m_nDMLandVMLTextFrameRotation)
{
pFS->startElementNS(XML_a, XML_xfrm,
XML_rot, sRotation.getStr(),
@@ -1466,9 +1468,9 @@ void DocxSdrExport::writeVMLTextFrame(sw::Frame*
pParentFrame, bool bTextBoxOnly
m_pImpl->m_pFlyAttrList = pFS->createAttrList();
m_pImpl->m_pTextboxAttrList = pFS->createAttrList();
m_pImpl->m_aTextFrameStyle = "position:absolute";
-if(!bTextBoxOnly)
+if (!bTextBoxOnly)
{
-OString sRotation(OString::number(DMLandVMLTextFrameRotation / -100));
+OString
sRotation(OString::number(m_pImpl->m_nDMLandVMLTextFrameRotation / -100));
m_pImpl->m_rExport.SdrExporter().getTextFrameStyle().append(";rotation:").append(sRotation);
}
m_pImpl->m_rExport.OutputFormat(pParentFrame->GetFrmFmt(), false, false,
true);
diff --git a/sw/source/filter/ww8/docxsdrexport.hxx
b/sw/source/filter/ww8/docxsdrexport.hxx
index 1b8954d..5c98a42 100644
--- a/sw/source/filter/ww8/docxsdrexport.hxx
+++ b/sw/source/filter/ww8/docxsdrexport.hxx
@@ -101,8 +101,6 @@ public:
bool isTextBox(const SwFrmFmt& rFrmFmt);
/// Writes text from Textbox for
void writeOnlyTextOfFrame(sw::Frame* pParentFrame);
-
-sal_Int32 DMLandVMLTextFrameRotation;
};
#endif // INCLUDED_SW_SOURCE_FILTER_WW8_DOCXSDREXPORT_HXX
commit c9227b26683ae960a79d60725caf70ac2515a4d0
Author: Miklos Vajna
Date: Thu Jul 17 09:44:35 2014 +0200
sw: move testcase to the right suite
Change-Id: Ieb89836facb28ef1432b48810532f6f0b4b00a89
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index afc8242..a5aa50d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3741,17 +3741,6 @@ DECLARE_OOXMLEXPORT_TEST(testfdo80898, "fdo80898.docx")
"/word/embeddings/oleObject1.doc");
}
-DECLARE_OOXMLEXPORT_TEST(testFdo80894, "TextFrameRotation
[Libreoffice-commits] core.git: include/oox oox/source sw/qa sw/source
include/oox/export/drawingml.hxx |4 ++--
oox/source/export/drawingml.cxx |2 +-
oox/source/vml/vmlshape.cxx |6 ++
sw/qa/extras/ooxmlexport/data/TextFrameRotation.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 11 +++
sw/source/filter/ww8/docxsdrexport.cxx | 17 +++--
sw/source/filter/ww8/docxsdrexport.hxx |2 ++
7 files changed, 33 insertions(+), 9 deletions(-)
New commits:
commit 1bdd6d2129eecda564478d494fd46d14a54b6ac5
Author: sushil_shinde
Date: Thu Jul 10 11:46:22 2014 +0530
fdo#80894 : Rotation value for textframe was missing after RT.
- Rotation property is not available for TextFrame in LO.
- Hence grabbaged this value.
- Roundtripped rotation value by converting it properly for both dml and
vml textbox.
- Added UT for it.
Change-Id: Ia040d55dc2ea79500df76877ba44a02971c872a8
Reviewed-on: https://gerrit.libreoffice.org/10190
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 6f64fcf..bf46326 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -29,10 +29,10 @@
#include
#include
#include "oox/drawingml/drawingmltypes.hxx"
-#ifndef PPTX_EXPORT_ROTATE_CLOCKWISIFY
+#ifndef OOX_DRAWINGML_EXPORT_ROTATE_CLOCKWISIFY
// Our rotation is counter-clockwise and is in 100ths of a degree.
// drawingML rotation is clockwise and is in 6ths of a degree.
-#define PPTX_EXPORT_ROTATE_CLOCKWISIFY(input) ((2160-input*600)%2160)
+#define OOX_DRAWINGML_EXPORT_ROTATE_CLOCKWISIFY(input)
((2160-input*600)%2160)
#endif
class Graphic;
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 274453e..75b6cfe 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1102,7 +1102,7 @@ void DrawingML::WriteShapeTransformation( Reference<
XShape > rXShape, sal_Int32
{
if (bFlipV) {nRotation=(nRotation+18000)%36000;}
}
-WriteTransformation( Rectangle( Point( aPos.X, aPos.Y ), Size(
aSize.Width, aSize.Height ) ), nXmlNamespace, bFlipH, bFlipV,
PPTX_EXPORT_ROTATE_CLOCKWISIFY(nRotation) );
+WriteTransformation( Rectangle( Point( aPos.X, aPos.Y ), Size(
aSize.Width, aSize.Height ) ), nXmlNamespace, bFlipH, bFlipV,
OOX_DRAWINGML_EXPORT_ROTATE_CLOCKWISIFY(nRotation) );
}
void DrawingML::WriteRunProperties( Reference< XPropertySet > rRun, bool
bIsField )
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 879b462..f98c717 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -319,6 +319,12 @@ Reference< XShape > ShapeBase::convertAndInsert( const
Reference< XShapes >& rxS
aGrabBag.realloc( length+1 );
aGrabBag[length].Name = "VML-Z-ORDER";
aGrabBag[length].Value = uno::makeAny(
maTypeModel.maZIndex.toInt32() );
+if(!(maTypeModel.maRotation).isEmpty())
+{
+aGrabBag.realloc( length+2 );
+aGrabBag[length+1].Name = "mso-rotation-angle";
+aGrabBag[length+1].Value =
uno::makeAny(sal_Int32(NormAngle360((maTypeModel.maRotation.toInt32()) *
-100)));
+}
propertySet->setPropertyValue( "FrameInteropGrabBag",
uno::makeAny(aGrabBag) );
}
else
diff --git a/sw/qa/extras/ooxmlexport/data/TextFrameRotation.docx
b/sw/qa/extras/ooxmlexport/data/TextFrameRotation.docx
new file mode 100644
index 000..fde69c5
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/TextFrameRotation.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index a5aa50d..afc8242 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3741,6 +3741,17 @@ DECLARE_OOXMLEXPORT_TEST(testfdo80898, "fdo80898.docx")
"/word/embeddings/oleObject1.doc");
}
+DECLARE_OOXMLEXPORT_TEST(testFdo80894, "TextFrameRotation.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+ return;
+
+// Rotation value was not roundtripped for textframe.
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[1]/w:r[2]/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:xfrm",
+"rot","1620");
+}
+
DECLARE_OOXMLEXPORT_TEST(test2colHeader, "2col-header.docx")
{
// Header was lost on export when the document had multiple columns.
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index bb923aa..363b5b9 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexp
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-0' - sw/source
sw/source/core/draw/dflyobj.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit e52d26fda8df76c47bc90db592adc564227e6dfb
Author: Michael Stahl
Date: Mon May 19 13:29:25 2014 +0200
SwVirtFlyDrawObj: suppress unused parameter warnings (it's used by assert)
Change-Id: I2f5b530e011bf1bb95ca5e0421f6e03c0885872a
(cherry picked from commit 39669d3244e3859471e665cf6afc754b6aca634e)
Signed-off-by: Eike Rathke
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 80f09d7..bc043ed 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -468,6 +468,7 @@ void SwVirtFlyDrawObj::wrap_DoPaintObject(
{
// if there's no viewport set, all fly-frames will be painted,
// which is slow, wastes memory, and can cause other trouble.
+(void) rViewInformation; // suppress "unused parameter" warning
assert(!rViewInformation.getViewport().isEmpty());
if ( !pFlyFrm->IsFlyInCntFrm() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source
sw/source/core/draw/dflyobj.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit c0af71d4f195dd374c688e4548dcc440519e1883
Author: Michael Stahl
Date: Mon May 19 13:29:25 2014 +0200
SwVirtFlyDrawObj: suppress unused parameter warnings (it's used by assert)
Change-Id: I2f5b530e011bf1bb95ca5e0421f6e03c0885872a
(cherry picked from commit 39669d3244e3859471e665cf6afc754b6aca634e)
Signed-off-by: Eike Rathke
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 80f09d7..bc043ed 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -468,6 +468,7 @@ void SwVirtFlyDrawObj::wrap_DoPaintObject(
{
// if there's no viewport set, all fly-frames will be painted,
// which is slow, wastes memory, and can cause other trouble.
+(void) rViewInformation; // suppress "unused parameter" warning
assert(!rViewInformation.getViewport().isEmpty());
if ( !pFlyFrm->IsFlyInCntFrm() )
{
___
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/tool/chgtrack.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 61aabb7d814b634e29003d8b555938f40b6f6fb4
Author: Kohei Yoshida
Date: Wed Jul 16 19:00:51 2014 -0400
fdo#81445: Display correct label for empty cell.
Change-Id: I4f3e99b2231f7cd87daa27ef2dc47d3bf37cea57
(cherry picked from commit 2202bda95c76127dffcc9c7460e462a877344b9c)
Reviewed-on: https://gerrit.libreoffice.org/10361
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 87d0cdb..1ebb30d 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -1806,10 +1806,9 @@ void ScChangeActionContent::GetValueString(
case CELLTYPE_FORMULA :
GetFormulaString(rStr, rCell.mpFormula);
break;
+case CELLTYPE_NONE:
default:
-{
-// added to avoid warnings
-}
+rStr = OUString();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/core/tool/chgtrack.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 86fbaaecbc30b1d541c1c341e454d3052a0ebe8b
Author: Kohei Yoshida
Date: Wed Jul 16 19:00:51 2014 -0400
fdo#81445: Display correct label for empty cell.
Change-Id: I4f3e99b2231f7cd87daa27ef2dc47d3bf37cea57
(cherry picked from commit 2202bda95c76127dffcc9c7460e462a877344b9c)
Reviewed-on: https://gerrit.libreoffice.org/10360
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 56866e2..f08272e 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -1815,10 +1815,9 @@ void ScChangeActionContent::GetValueString(
case CELLTYPE_FORMULA :
GetFormulaString(rStr, rCell.mpFormula);
break;
+case CELLTYPE_NONE:
default:
-{
-// added to avoid warnings
-}
+rStr = OUString();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Bugzilla Whiteboard: Let's use wimpyCaps consistently
Hi all, At the QA meeting today we discussed the importance of consistency in the tags that we use in the Whiteboard on our bug reports. We decided that to make things simple for both old and new contributors, it would be best for QA to use 'wimpyCaps' for all of our tags. Examples: bibisectRequest confirmed:4.1.3.2:ubuntu needAdvice perf possibleRegression I know that the Design Team, and Dev Team (and perhaps some other) have created specific tags for the whiteboard. If possible, we'd like to standardize the format of all of these to use wimpyCaps. We'd also like to be consistent when using tags referring to particular file formats, replacing tags such as 'rtf_filter', 'odf', and 'ooxml' with 'filter:xxx': Examples: filter:ooxml filter:odf filter:docx filter:rtf Thoughts? Thanks, --R -- Robinson Tryon LibreOffice Community Outreach Herald Senior QA Bug Wrangler The Document Foundation qu...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
QA Meeting Minutes - 2014-07-16
Hi all, The QA Meeting got off to a slow start today when Google Hangouts decided to go crazy and drop meeting participants the second they tried to join the room. Thankfully, Freenode was much more stable, and we had a great meeting over IRC. Minutes are here: https://wiki.documentfoundation.org/QA/Meetings/2014/July_16 Our next meeting will be on July 30th. Agenda is here: https://wiki.documentfoundation.org/QA/Meetings/2014/July_30 Big thanks to everyone who showed up and participated in the discussion about Whiteboard naming conventions. I'll send out a separate email about that to QA/Dev lists. Best, --R -- Robinson Tryon LibreOffice Community Outreach Herald Senior QA Bug Wrangler The Document Foundation qu...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
