[Libreoffice-commits] core.git: 12 commits - basctl/source basic/source connectivity/source cui/source editeng/source filter/source forms/source fpicker/source idl/inc include/basic include/editeng sc
basctl/source/basicide/baside2b.cxx |4 basctl/source/basicide/basobj2.cxx |2 basic/source/basmgr/basicmanagerrepository.cxx |2 basic/source/basmgr/basmgr.cxx | 22 - basic/source/classes/eventatt.cxx |8 basic/source/classes/propacc.cxx|2 basic/source/classes/sb.cxx | 354 basic/source/classes/sb.src | 240 basic/source/classes/sbunoobj.cxx | 52 +-- basic/source/classes/sbxmod.cxx | 64 ++-- basic/source/comp/buffer.cxx|4 basic/source/comp/codegen.cxx | 14 basic/source/comp/dim.cxx | 92 +++--- basic/source/comp/exprgen.cxx |4 basic/source/comp/exprnode.cxx | 14 basic/source/comp/exprtree.cxx | 44 +- basic/source/comp/io.cxx| 16 - basic/source/comp/loops.cxx | 36 +- basic/source/comp/parser.cxx| 66 ++-- basic/source/comp/sbcomp.cxx| 12 basic/source/comp/scanner.cxx | 26 - basic/source/comp/symtbl.cxx|8 basic/source/comp/token.cxx |2 basic/source/inc/runtime.hxx|2 basic/source/runtime/ddectrl.cxx| 54 +-- basic/source/runtime/dllmgr-x64.cxx |4 basic/source/runtime/dllmgr-x86.cxx |4 basic/source/runtime/inputbox.cxx |4 basic/source/runtime/iosys.cxx | 38 +- basic/source/runtime/methods.cxx| 346 +++ basic/source/runtime/methods1.cxx | 220 +++--- basic/source/runtime/runtime.cxx| 226 +++ basic/source/runtime/stdobj.cxx |4 basic/source/runtime/stdobj1.cxx| 52 +-- basic/source/sbx/sbxarray.cxx | 70 ++-- basic/source/sbx/sbxbase.cxx| 28 - basic/source/sbx/sbxbool.cxx| 14 basic/source/sbx/sbxbyte.cxx| 44 +- basic/source/sbx/sbxchar.cxx| 38 +- basic/source/sbx/sbxcoll.cxx| 34 +- basic/source/sbx/sbxcurr.cxx| 48 +-- basic/source/sbx/sbxdate.cxx| 46 +-- basic/source/sbx/sbxdbl.cxx | 58 +-- basic/source/sbx/sbxdec.cxx | 42 +- basic/source/sbx/sbxexec.cxx| 16 - basic/source/sbx/sbxint.cxx | 142 - basic/source/sbx/sbxlng.cxx | 48 +-- basic/source/sbx/sbxobj.cxx | 32 +- basic/source/sbx/sbxscan.cxx| 16 - basic/source/sbx/sbxsng.cxx | 54 +-- basic/source/sbx/sbxstr.cxx | 12 basic/source/sbx/sbxuint.cxx| 46 +-- basic/source/sbx/sbxulng.cxx| 38 +- basic/source/sbx/sbxvalue.cxx | 132 basic/source/sbx/sbxvar.cxx | 20 - connectivity/source/inc/propertyids.hxx | 20 - cui/source/customize/cfgutil.cxx| 42 +- cui/source/dialogs/scriptdlg.cxx| 14 cui/source/inc/cfgutil.hxx | 19 - cui/source/inc/scriptdlg.hxx| 12 editeng/source/editeng/editeng.cxx |3 editeng/source/editeng/editview.cxx |2 editeng/source/editeng/impedit.cxx | 18 - editeng/source/editeng/impedit.hxx |3 filter/source/graphicfilter/icgm/chart.hxx |7 forms/source/richtext/richtextimplcontrol.cxx |4 fpicker/source/office/OfficeFilePicker.cxx |3 fpicker/source/office/fpdialogbase.hxx |1 idl/inc/bastype.hxx |3 include/basic/sberrors.hxx | 130 include/basic/sbx.hxx |2 include/basic/sbxcore.hxx | 14 include/basic/sbxdef.hxx| 95 +- include/editeng/editdata.hxx| 18 - include/editeng/editview.hxx| 10 sc/source/ui/docshell/docsh4.cxx|6 sc/source/ui/vba/vbaapplication.cxx |6 sc/source/ui/vba/vbaaxes.cxx|4 sc/source/ui/vba/vbaaxis.cxx| 50 +-- sc/source/ui/vba/vbachart.cxx | 32 +- sc/source/ui/vba/vbachartobject.cxx |6 sc/source/ui/vba/vbachartobjects.cxx|2 sc/source/ui/vba/vbacondition.cxx |2 sc/source/ui/vba/vbaformat.cxx | 54 +-- sc/
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - libreofficekit/qa sc/inc sc/source
libreofficekit/qa/data/calc_sheetnames.ods |binary
libreofficekit/qa/unit/tiledrendering.cxx | 24 +---
sc/inc/docuno.hxx |3 +++
sc/source/ui/unoobj/docuno.cxx |8
4 files changed, 32 insertions(+), 3 deletions(-)
New commits:
commit ba1b1a8a1a2def94b7a0d1cbb16792fc17de4f94
Author: Mihai Varga
Date: Wed Jul 22 16:21:08 2015 +0300
tiledrendering: added getPartName method for calc
This method is used to get the sheet's name and to display it
in the tabs (sheet selector)
I've also added an unit test for it and uncommented a similar one
Change-Id: Ia866815c594a873812c71a6c86e303c869e1f093
Reviewed-on: https://gerrit.libreoffice.org/17294
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
(cherry picked from commit 50fe21c7807afb9650c048e1a82bd97a7fc1d226)
Reviewed-on: https://gerrit.libreoffice.org/17368
diff --git a/libreofficekit/qa/data/calc_sheetnames.ods
b/libreofficekit/qa/data/calc_sheetnames.ods
new file mode 100644
index 000..f6627a0
Binary files /dev/null and b/libreofficekit/qa/data/calc_sheetnames.ods differ
diff --git a/libreofficekit/qa/unit/tiledrendering.cxx
b/libreofficekit/qa/unit/tiledrendering.cxx
index 63eb756..fb2f741 100644
--- a/libreofficekit/qa/unit/tiledrendering.cxx
+++ b/libreofficekit/qa/unit/tiledrendering.cxx
@@ -65,8 +65,9 @@ public:
void testDocumentLoadFail( Office* pOffice );
void testDocumentTypes( Office* pOffice );
-#if 0
void testImpressSlideNames( Office* pOffice );
+void testCalcSheetNames( Office* pOffice );
+#if 0
void testOverlay( Office* pOffice );
#endif
@@ -90,8 +91,9 @@ void TiledRenderingTest::runAllTests()
testDocumentLoadFail( pOffice.get() );
testDocumentTypes( pOffice.get() );
-#if 0
testImpressSlideNames( pOffice.get() );
+testCalcSheetNames( pOffice.get() );
+#if 0
testOverlay( pOffice.get() );
#endif
}
@@ -142,7 +144,6 @@ void TiledRenderingTest::testDocumentTypes( Office* pOffice
)
// TODO: do this for all supported document types
}
-#if 0
void TiledRenderingTest::testImpressSlideNames( Office* pOffice )
{
const string sDocPath = m_sSrcRoot +
"/libreofficekit/qa/data/impress_slidenames.odp";
@@ -164,6 +165,23 @@ void TiledRenderingTest::testImpressSlideNames( Office*
pOffice )
// have a localised version of "Slide 3".
}
+void TiledRenderingTest::testCalcSheetNames( Office* pOffice )
+{
+const string sDocPath = m_sSrcRoot +
"/libreofficekit/qa/data/calc_sheetnames.ods";
+const string sLockFile = m_sSrcRoot
+"/libreofficekit/qa/data/.~lock.calc_sheetnames.ods#";
+
+// FIXME: LOK will fail when trying to open a locked file
+remove( sLockFile.c_str() );
+
+scoped_ptr< Document> pDocument( pOffice->documentLoad( sDocPath.c_str() )
);
+
+CPPUNIT_ASSERT( pDocument->getParts() == 3 );
+CPPUNIT_ASSERT( strcmp( pDocument->getPartName( 0 ), "TestText1" ) == 0 );
+CPPUNIT_ASSERT( strcmp( pDocument->getPartName( 1 ), "TestText2" ) == 0 );
+CPPUNIT_ASSERT( strcmp( pDocument->getPartName( 2 ), "Sheet3" ) == 0 );
+}
+
+#if 0
static void dumpRGBABitmap( const OUString& rPath, const unsigned char*
pBuffer,
const int nWidth, const int nHeight )
{
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index a7e9af5..cd68885 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -388,6 +388,9 @@ public:
/// @see vcl::ITiledRenderable::getParts().
virtual int getParts() SAL_OVERRIDE;
+/// @see vcl::ITiledRenderable::getPartName().
+virtual OUString getPartName(int nPart) SAL_OVERRIDE;
+
/// @see vcl::ITiledRenderable::initializeForTiledRendering().
virtual void initializeForTiledRendering() SAL_OVERRIDE;
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 6d148da..e1235b9 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -510,6 +510,14 @@ int ScModelObj::getPart()
return pViewData->GetTabNo();
}
+OUString ScModelObj::getPartName( int nPart )
+{
+OUString sTabName;
+ScViewData* pViewData = ScDocShell::GetViewData();
+pViewData->GetDocument()->GetName(nPart, sTabName);
+return sTabName;
+}
+
Size ScModelObj::getDocumentSize()
{
Size aSize(10, 10); // minimum size
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'private/hcvcastro/forking' - loolwsd/LOOLBroker.cpp
loolwsd/LOOLBroker.cpp |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit a7f1418cf8d0f0321060e6345b2068b9a66b98ea
Author: Henry Castro
Date: Mon Jul 27 23:53:24 2015 -0400
loolwsd: fix library handle
diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index 9af12cf..c0a09f0 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -407,21 +407,21 @@ int main(int argc, char** argv)
}
void* dlSC = dlopen(Path("/"+ loSubPath + "/program",
LIB_SCLO).toString().c_str(), RTLD_NOW);
-if ( !dlOffice )
+if ( !dlSC )
{
std::cout << Util::logPrefix() << " Failed to load library :" <<
LIB_SCLO << std::endl;
exit(-1);
}
void* dlSW = dlopen(Path("/"+ loSubPath + "/program",
LIB_SWLO).toString().c_str(), RTLD_NOW);
-if ( !dlOffice )
+if ( !dlSW )
{
std::cout << Util::logPrefix() << " Failed to load library :" <<
LIB_SWLO << std::endl;
exit(-1);
}
void* dlSD = dlopen(Path("/"+ loSubPath + "/program",
LIB_SDLO).toString().c_str(), RTLD_NOW);
-if ( !dlOffice )
+if ( !dlSD )
{
std::cout << Util::logPrefix() << " Failed to load library :" <<
LIB_SDLO << std::endl;
exit(-1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'private/hcvcastro/forking' - loolwsd/LOOLBroker.cpp
loolwsd/LOOLBroker.cpp | 39 +++
1 file changed, 39 insertions(+)
New commits:
commit 5a1ca4269064a1cc5c8c2b2e70fec6ac0238ab52
Author: Henry Castro
Date: Mon Jul 27 23:48:47 2015 -0400
loolwsd: preload soffice, sc, sw, sd shared ...
library
diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index 4145d7a..9af12cf 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -5,6 +5,7 @@
#include
#include
#include
+#include
#include
#include
@@ -26,6 +27,11 @@
#define INTERVAL_PROBES 10
#define MAINTENANCE_INTERVAL 1
+#define LIB_SOFFICEAPP "lib" "sofficeapp" ".so"
+#define LIB_SCLO"lib" "sclo" ".so"
+#define LIB_SWLO"lib" "swlo" ".so"
+#define LIB_SDLO"lib" "sdlo" ".so"
+
using Poco::Path;
using Poco::File;
using Poco::ThreadLocal;
@@ -393,6 +399,34 @@ int main(int argc, char** argv)
Thread::sleep(std::stoul(std::getenv("SLEEPFORDEBUGGER")) * 1000);
}
+void* dlOffice = dlopen(Path("/"+ loSubPath + "/program",
LIB_SOFFICEAPP).toString().c_str(), RTLD_NOW);
+if ( !dlOffice )
+{
+std::cout << Util::logPrefix() << " Failed to load library :" <<
LIB_SOFFICEAPP << std::endl;
+exit(-1);
+}
+
+void* dlSC = dlopen(Path("/"+ loSubPath + "/program",
LIB_SCLO).toString().c_str(), RTLD_NOW);
+if ( !dlOffice )
+{
+std::cout << Util::logPrefix() << " Failed to load library :" <<
LIB_SCLO << std::endl;
+exit(-1);
+}
+
+void* dlSW = dlopen(Path("/"+ loSubPath + "/program",
LIB_SWLO).toString().c_str(), RTLD_NOW);
+if ( !dlOffice )
+{
+std::cout << Util::logPrefix() << " Failed to load library :" <<
LIB_SWLO << std::endl;
+exit(-1);
+}
+
+void* dlSD = dlopen(Path("/"+ loSubPath + "/program",
LIB_SDLO).toString().c_str(), RTLD_NOW);
+if ( !dlOffice )
+{
+std::cout << Util::logPrefix() << " Failed to load library :" <<
LIB_SDLO << std::endl;
+exit(-1);
+}
+
startupLibreOfficeKit(_numPreSpawnedChildren, loSubPath, _childId);
while (_childProcesses.size() > 0)
@@ -452,6 +486,11 @@ int main(int argc, char** argv)
Process::requestTermination(i.first);
}
+dlclose(dlOffice);
+dlclose(dlSC);
+dlclose(dlSW);
+dlclose(dlSD);
+
std::cout << Util::logPrefix() << "loolbroker finished OK!" << std::endl;
return 0;
}
___
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/model/main/DataPoint.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 19ae187b328bad9197d5241bd585f9101116ab12
Author: Takeshi Abe
Date: Tue Jul 28 11:22:13 2015 +0900
chart2: fix duplicate entries at index 0
... introduced at 6949629e35f308ce7efc890319ecf9a46a5f154c.
Change-Id: Ifc5c2f92584aabe668eb8c87abdc5085d4a7b075
Reviewed-on: https://gerrit.libreoffice.org/17377
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
diff --git a/chart2/source/model/main/DataPoint.cxx
b/chart2/source/model/main/DataPoint.cxx
index c7876fd..c775c5c 100644
--- a/chart2/source/model/main/DataPoint.cxx
+++ b/chart2/source/model/main/DataPoint.cxx
@@ -284,12 +284,12 @@ void DataPoint::fireModifyEvent()
Sequence< OUString > DataPoint::getSupportedServiceNames_Static()
{
-Sequence< OUString > aServices( 4 );
-aServices[ 0 ] = "com.sun.star.drawing.FillProperties";
-aServices[ 0 ] = "com.sun.star.chart2.DataPoint";
-aServices[ 1 ] = "com.sun.star.chart2.DataPointProperties";
-aServices[ 2 ] = "com.sun.star.beans.PropertySet";
-return aServices;
+return Sequence< OUString >{
+"com.sun.star.drawing.FillProperties",
+"com.sun.star.chart2.DataPoint",
+"com.sun.star.chart2.DataPointProperties",
+"com.sun.star.beans.PropertySet"
+};
}
// needed by MSC compiler
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Firebird broke my build
I'm unable to build LO with the latest Firebird update on Windows. Namely, after this: commit 288e005ef7ed5b931935da2e1266b95fc9f16cdf Author: Caolán McNamara Date: Mon Jul 13 11:32:17 2015 +0100 Revert "Revert "Update firebird to version 2.5.4"" This reverts commit 69632c9c3291a7bb9d465495943aa1dbe12c5af2. Change-Id: I4704c30ade878b9e62ac829b03648f301534b51c Reviewed-on: https://gerrit.libreoffice.org/16986 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara I bisected to this commit, and can see that Jenkins was able to build it. However, I see important differences between my build log and on Jenkins. Specifically, this is what I have: [snip Firebird configure output] The Firebird2 package has been configured with the following options: Architecture : ClassicServer Debug : enabled Raw devices : disabled Service name : gds_db Service port : 3050 Pipe name : interbas GPRE modules : c_cxx.cpp Install Dir : /usr/local/firebird make64_41[2]: Entering directory 'C:/prj/libro/libo/workdir/UnpackedTarball/firebird' C:/Bin/cygwin64/opt/lo/bin/make64_41 -C gen firebird_embedded make64_41[3]: Entering directory 'C:/prj/libro/libo/workdir/UnpackedTarball/firebird/gen' C:/Bin/cygwin64/opt/lo/bin/make64_41 -C ../extern/btyacc make64_41[4]: Entering directory 'C:/prj/libro/libo/workdir/UnpackedTarball/firebird/extern/btyacc' C:/prj/libro/libo/workdir/LinkTarget/Executable/*gcc-wrapper.exe -o btyacc.exe closure.o error.o lalr.o lr0.o main.o mkpar.o output.o mstring.o reader.o readskel.o skeleton.o symtab.o verbose.o warshall.o* cl : Command line warning D9024 : unrecognized source file type 'closure.o', object file assumed cl : Command line warning D9024 : unrecognized source file type 'error.o', object file assumed cl : Command line warning D9024 : unrecognized source file type 'lalr.o', object file assumed cl : Command line warning D9024 : unrecognized source file type 'lr0.o', object file assumed ... ... I can't find "Firebird2" in the Jenkins output. I can't find Firebird configure output either. My build shows a clearly incorrect invocation of gcc-wrapper, which goes downhill thereafter. I also have a bunch of "find: `FC:': No such file or directory" lines. I'm *not* using LODE. I'm building the 32-bit version, with debug-utils. Clean builds didn't help. *Any ideas what's going on, and what I'm missing?* Thanks in advance! ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - comphelper/source
comphelper/source/misc/syntaxhighlight.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit a45fbb192a51c6bdf5d273dfad2eab8c1f85ccc4
Author: Marek Doležel
Date: Sat Jul 25 20:52:37 2015 +0200
tdf#92130 fix DoEvents to be recognized as keyword
Change-Id: I24868acec66a72abbb52b8026ed3a092dbd97632
Reviewed-on: https://gerrit.libreoffice.org/17347
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
(cherry picked from commit 11f24bc2f032b31095663cb09ef948eee2c61f49)
Signed-off-by: Adolfo Jayme Barrientos
diff --git a/comphelper/source/misc/syntaxhighlight.cxx
b/comphelper/source/misc/syntaxhighlight.cxx
index 41dd9f2..ecd4ced 100644
--- a/comphelper/source/misc/syntaxhighlight.cxx
+++ b/comphelper/source/misc/syntaxhighlight.cxx
@@ -78,6 +78,7 @@ static const char* strListBasicKeyWords[] = {
"defvar",
"dim",
"do",
+"doevents",
"double",
"each",
"else",
___
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/sidebar/ChartAreaPanel.cxx | 36 ++--
1 file changed, 26 insertions(+), 10 deletions(-)
New commits:
commit 2d8f1faa97a3dfd38c540e0cd0b73a2e9d621d53
Author: Markus Mohrhard
Date: Tue Jul 28 02:50:59 2015 +0200
fix the last transparency gradient issues in the chart area panel
So apparently I was looking up the gradient in the wrong table.
Change-Id: I26de6f9bb5f9baf65a7856682a327da611da3ae7
diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
index 640404a..233371a 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
@@ -90,6 +90,8 @@ DrawModelWrapper*
getDrawModelWrapper(css::uno::Reference xM
XGradient getXGradientForName(css::uno::Reference xModel,
const OUString& rName)
{
+
+
try
{
ViewElementListProvider aProvider = getViewElementListProvider(xModel);
@@ -113,6 +115,28 @@ XGradient
getXGradientForName(css::uno::Reference xModel,
return XGradient();
}
+XFillFloatTransparenceItem
getXTransparencyGradientForName(css::uno::Reference xModel,
+const OUString& rName)
+{
+css::uno::Reference xFact(xModel,
css::uno::UNO_QUERY);
+css::uno::Reference xNameAccess(
+
xFact->createInstance("com.sun.star.drawing.TransparencyGradientTable"),
css::uno::UNO_QUERY);
+if (!xNameAccess.is())
+return XFillFloatTransparenceItem();
+
+if (!xNameAccess->hasByName(rName))
+return XFillFloatTransparenceItem();
+
+css::uno::Any aAny = xNameAccess->getByName(rName);
+
+XFillFloatTransparenceItem aItem;
+aItem.SetName(rName);
+aItem.PutValue(aAny, MID_FILLGRADIENT);
+aItem.SetEnabled(true);
+
+return aItem;
+}
+
XHatch getXHatchFromName(css::uno::Reference xModel,
OUString& rName)
{
@@ -393,16 +417,8 @@ void ChartAreaPanel::updateData()
OUString aFillFloatTransparenceName;
xPropSet->getPropertyValue("FillTransparenceGradientName") >>=
aFillFloatTransparenceName;
-XFillFloatTransparenceItem aFillFloatTransparenceItem;
-if (!aFillFloatTransparenceName.isEmpty())
-aFillFloatTransparenceItem.SetEnabled(true);
-
-aFillFloatTransparenceItem.SetName(aFillFloatTransparenceName);
-XFillFloatTransparenceItem* pCorrectFloatTransparenceItem =
aFillFloatTransparenceItem.checkForUniqueItem(&pModelWrapper->getSdrModel());
-XFillFloatTransparenceItem* pFillFloatTransparenceItem =
pCorrectFloatTransparenceItem ? pCorrectFloatTransparenceItem :
&aFillFloatTransparenceItem;
-pFillFloatTransparenceItem->SetGradientValue(getXGradientForName(mxModel,
pFillFloatTransparenceItem->GetName()));
-updateFillFloatTransparence(false, true, pFillFloatTransparenceItem);
-delete pCorrectFloatTransparenceItem;
+XFillFloatTransparenceItem aFillFloatTransparenceItem =
getXTransparencyGradientForName(mxModel, aFillFloatTransparenceName);
+updateFillFloatTransparence(false, true, &aFillFloatTransparenceItem);
}
void ChartAreaPanel::modelInvalid()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - solenv/gdb
solenv/gdb/libreoffice/sw.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fa7ed011cdcd7030c4c84afcdf166b90faf60afa Author: Michael Stahl Date: Fri Jul 24 18:23:22 2015 +0200 gdb pretty printer for SwNodes fails on Python 3 due to "unicode" Change-Id: I8e4983a91d4f97a2a20fbeed89d4e0f186c35fad (cherry picked from commit f29ac1d91b12ab2f55d7ab7afce62238a59b8cba) Reviewed-on: https://gerrit.libreoffice.org/17372 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/solenv/gdb/libreoffice/sw.py b/solenv/gdb/libreoffice/sw.py index 71445d5..eba82a8 100644 --- a/solenv/gdb/libreoffice/sw.py +++ b/solenv/gdb/libreoffice/sw.py @@ -213,7 +213,7 @@ class BigPtrArrayPrinter(object): # accessing this is completely non-obvious... # also, node.dynamic_cast(node.dynamic_type) is null? value = "TextNode " + \ - unicode(node.cast(node.dynamic_type).dereference()['m_Text']) + six.text_type(node.cast(node.dynamic_type).dereference()['m_Text']) elif str(node.dynamic_type.target()) == "SwOLENode": value = " OLENode " elif str(node.dynamic_type.target()) == "SwGrfNode": ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - solenv/gdb
solenv/gdb/libreoffice/sw.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8129116d00b2060863a540d902507acea106d000 Author: Michael Stahl Date: Fri Jul 24 18:23:22 2015 +0200 gdb pretty printer for SwNodes fails on Python 3 due to "unicode" Change-Id: I8e4983a91d4f97a2a20fbeed89d4e0f186c35fad (cherry picked from commit f29ac1d91b12ab2f55d7ab7afce62238a59b8cba) Reviewed-on: https://gerrit.libreoffice.org/17373 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/solenv/gdb/libreoffice/sw.py b/solenv/gdb/libreoffice/sw.py index fa73759..19c1a75 100644 --- a/solenv/gdb/libreoffice/sw.py +++ b/solenv/gdb/libreoffice/sw.py @@ -213,7 +213,7 @@ class BigPtrArrayPrinter(object): # accessing this is completely non-obvious... # also, node.dynamic_cast(node.dynamic_type) is null? value = "TextNode " + \ - unicode(node.cast(node.dynamic_type).dereference()['m_Text']) + six.text_type(node.cast(node.dynamic_type).dereference()['m_Text']) elif str(node.dynamic_type.target()) == "SwOLENode": value = " OLENode " elif str(node.dynamic_type.target()) == "SwGrfNode": ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 92965] support some of the optional css::drawing::FillProperties properties in chart2
https://bugs.documentfoundation.org/show_bug.cgi?id=92965 Markus Mohrhard (retired) changed: What|Removed |Added Summary|use awt::XGradient instead |support some of the |of gradient name in fill|optional |properties |css::drawing::FillPropertie ||s properties in chart2 --- Comment #1 from Markus Mohrhard (retired) --- Let us make it more generic. So the properties: FillTransparenceGradient FillGradient FillHatch FillBitmap are defined as optional in css::drawing::FillProperties. We should implement them in chart2/source/tools/FillProperties.cxx and make sure that the non-optional name property is handled correctly. The name and the new property always need to be in sync. See the first post for some more details. -- 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: chart2/source offapi/com
chart2/source/model/main/DataPoint.cxx |3 ++-
offapi/com/sun/star/chart2/DataPointProperties.idl | 10 ++
2 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 6949629e35f308ce7efc890319ecf9a46a5f154c
Author: Markus Mohrhard
Date: Tue Jul 28 01:09:10 2015 +0200
reflect the property name changes also in the idl files
DataPoints now support the whole css::drawing::FillProperties properties
which makes handling fill properties in chart2 a lot easier. The new
names are just aliases for the old property names.
Change-Id: I5b85010fe2557eeb5376de71ff3605b3abbcd488
diff --git a/chart2/source/model/main/DataPoint.cxx
b/chart2/source/model/main/DataPoint.cxx
index 8f9ea9c..c7876fd 100644
--- a/chart2/source/model/main/DataPoint.cxx
+++ b/chart2/source/model/main/DataPoint.cxx
@@ -284,7 +284,8 @@ void DataPoint::fireModifyEvent()
Sequence< OUString > DataPoint::getSupportedServiceNames_Static()
{
-Sequence< OUString > aServices( 3 );
+Sequence< OUString > aServices( 4 );
+aServices[ 0 ] = "com.sun.star.drawing.FillProperties";
aServices[ 0 ] = "com.sun.star.chart2.DataPoint";
aServices[ 1 ] = "com.sun.star.chart2.DataPointProperties";
aServices[ 2 ] = "com.sun.star.beans.PropertySet";
diff --git a/offapi/com/sun/star/chart2/DataPointProperties.idl
b/offapi/com/sun/star/chart2/DataPointProperties.idl
index da45def..647d4ed 100644
--- a/offapi/com/sun/star/chart2/DataPointProperties.idl
+++ b/offapi/com/sun/star/chart2/DataPointProperties.idl
@@ -20,6 +20,7 @@
#define com_sun_star_chart2_DataPointProperties_idl
#include
+#include
#include
#include
#include
@@ -46,6 +47,15 @@ service DataPointProperties
*/
service ::com::sun::star::beans::PropertySet;
+/** to give access to the fill properties
+
+Note that there is access for some of them
+through some alias.
+
+@since LibreOffice 5.1
+*/
+service ::com::sun::star::drawing::FillProperties;
+
/** points to a style that also supports this service (but not
this property) that is used as default, if the PropertyState
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - chart2/source
chart2/source/controller/sidebar/ChartAreaPanel.cxx | 44 ++
chart2/source/model/main/DataPointProperties.cxx| 47
chart2/source/tools/FillProperties.cxx | 31 -
3 files changed, 82 insertions(+), 40 deletions(-)
New commits:
commit 88f5d4ce866f6d574a34d706d2d71dc71aaa66e8
Author: Markus Mohrhard
Date: Tue Jul 28 00:56:04 2015 +0200
use common fill property names in chart2
Change-Id: I9445344efc70d872fdb9c9a8cc49838210861a7b
diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
index f002a31..640404a 100644
--- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx
@@ -255,7 +255,7 @@ void ChartAreaPanel::setFillTransparence(const
XFillTransparenceItem& rItem)
if (!xPropSet.is())
return;
-xPropSet->setPropertyValue("Transparency",
css::uno::makeAny(rItem.GetValue()));
+xPropSet->setPropertyValue("FillTransparence",
css::uno::makeAny(rItem.GetValue()));
}
void ChartAreaPanel::setFillFloatTransparence(
@@ -268,7 +268,7 @@ void ChartAreaPanel::setFillFloatTransparence(
if (!rItem.IsEnabled())
{
-xPropSet->setPropertyValue("TransparencyGradientName",
css::uno::makeAny(OUString()));
+xPropSet->setPropertyValue("FillTransparenceGradientName",
css::uno::makeAny(OUString()));
return;
}
@@ -276,7 +276,7 @@ void ChartAreaPanel::setFillFloatTransparence(
css::uno::Any aGradientVal;
rItem.QueryValue(aGradientVal, MID_FILLGRADIENT);
OUString aNewName =
PropertyHelper::addTransparencyGradientUniqueNameToTable(aGradientVal,
css::uno::Reference(mxModel,
css::uno::UNO_QUERY_THROW), aName);
-xPropSet->setPropertyValue("TransparencyGradientName",
css::uno::makeAny(aNewName));
+xPropSet->setPropertyValue("FillTransparenceGradientName",
css::uno::makeAny(aNewName));
}
void ChartAreaPanel::setFillStyle(const XFillStyleItem& rItem)
@@ -298,7 +298,7 @@ void ChartAreaPanel::setFillStyleAndColor(const
XFillStyleItem* pStyleItem,
if (pStyleItem)
xPropSet->setPropertyValue("FillStyle",
css::uno::makeAny(pStyleItem->GetValue()));
-xPropSet->setPropertyValue("Color",
css::uno::makeAny(rColorItem.GetValue()));
+xPropSet->setPropertyValue("FillColor",
css::uno::makeAny(rColorItem.GetValue()));
}
void ChartAreaPanel::setFillStyleAndGradient(const XFillStyleItem* pStyleItem,
@@ -311,7 +311,7 @@ void ChartAreaPanel::setFillStyleAndGradient(const
XFillStyleItem* pStyleItem,
if (pStyleItem)
xPropSet->setPropertyValue("FillStyle",
css::uno::makeAny(pStyleItem->GetValue()));
-xPropSet->setPropertyValue("GradientName",
css::uno::makeAny(rGradientItem.GetValue()));
+xPropSet->setPropertyValue("FillGradientName",
css::uno::makeAny(rGradientItem.GetValue()));
}
void ChartAreaPanel::setFillStyleAndHatch(const XFillStyleItem* pStyleItem,
@@ -324,7 +324,7 @@ void ChartAreaPanel::setFillStyleAndHatch(const
XFillStyleItem* pStyleItem,
if (pStyleItem)
xPropSet->setPropertyValue("FillStyle",
css::uno::makeAny(pStyleItem->GetValue()));
-xPropSet->setPropertyValue("HatchName",
css::uno::makeAny(rHatchItem.GetValue()));
+xPropSet->setPropertyValue("FillHatchName",
css::uno::makeAny(rHatchItem.GetValue()));
}
void ChartAreaPanel::setFillStyleAndBitmap(const XFillStyleItem* pStyleItem,
@@ -355,18 +355,18 @@ void ChartAreaPanel::updateData()
updateFillStyle(false, true, &aFillStyleItem);
sal_uInt16 nFillTransparence = 0;
-xPropSet->getPropertyValue("Transparency") >>= nFillTransparence;
+xPropSet->getPropertyValue("FillTransparence") >>= nFillTransparence;
SfxUInt16Item aTransparenceItem(0, nFillTransparence);
updateFillTransparence(false, true, &aTransparenceItem);
OUString aGradientName;
-xPropSet->getPropertyValue("GradientName") >>= aGradientName;
+xPropSet->getPropertyValue("FillGradientName") >>= aGradientName;
XGradient xGradient = getXGradientForName(mxModel, aGradientName);
XFillGradientItem aGradientItem(aGradientName, xGradient);
updateFillGradient(false, true, &aGradientItem);
OUString aHatchName;
-xPropSet->getPropertyValue("HatchName") >>= aHatchName;
+xPropSet->getPropertyValue("FillHatchName") >>= aHatchName;
XHatch xHatch = getXHatchFromName(mxModel, aHatchName);
XFillHatchItem aHatchItem(aHatchName, xHatch);
updateFillHatch(false, true, &aHatchItem);
@@ -392,7 +392,7 @@ void ChartAreaPanel::updateData()
delete pBitmapItem;
OUString aFillFloatTransparenceName;
-xPropSet->getPropertyValue("TransparencyGradientName") >>=
aFillFloatTransparenceName;
+xPropSet->getPropertyValue("FillTransparenceGradientName") >>=
aFillFloatTransparenceName;
XFillFloatTransparenceItem aFillFloatTransparenceItem;
if (!aFillFloatTranspa
[Libreoffice-commits] core.git: framework/source
framework/source/uielement/toolbarmanager.cxx | 41 ++
1 file changed, 16 insertions(+), 25 deletions(-)
New commits:
commit 180a5fe0a2c72408e2322f8155415b4639131096
Author: Maxim Monastirsky
Date: Wed Jul 22 21:21:40 2015 +0300
Simplify
Every button has a controller, so it should be enough to
just iterate the controllers map.
Change-Id: I9e3d269a00ddd9362164a45000a90d9dc6220cab
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index a6c0efd..11192ed 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -327,33 +327,24 @@ void ToolBarManager::RefreshImages()
bool bBigImages( SvtMiscOptions().AreCurrentSymbolsLarge() );
m_pToolBar->SetToolboxButtonSize( bBigImages ? TOOLBOX_BUTTONSIZE_LARGE :
TOOLBOX_BUTTONSIZE_SMALL );
-for ( sal_uInt16 nPos = 0; nPos < m_pToolBar->GetItemCount(); nPos++ )
+for ( auto const& it : m_aControllerMap )
{
-sal_uInt16 nId( m_pToolBar->GetItemId( nPos ) );
-
-if ( nId > 0 )
+Reference< XSubToolbarController > xController( it.second, UNO_QUERY );
+if ( xController.is() && xController->opensSubToolbar() )
{
-ToolBarControllerMap::const_iterator pIter =
m_aControllerMap.find( nId );
-if ( pIter != m_aControllerMap.end() )
-{
-Reference< XSubToolbarController > xController( pIter->second,
UNO_QUERY );
-if ( xController.is() && xController->opensSubToolbar() )
-{
-// The button should show the last function that was
selected from the
-// dropdown. The controller should know better than us
what it was.
-xController->updateImage();
-}
-else
-{
-OUString aCommandURL = m_pToolBar->GetItemCommand( nId );
-Image aImage = GetImageFromURL( m_xFrame, aCommandURL,
bBigImages );
-// Try also to query for add-on images before giving up
and use an
-// empty image.
-if ( !aImage )
-aImage = QueryAddonsImage( aCommandURL, bBigImages );
-m_pToolBar->SetItemImage( nId, aImage );
-}
-}
+// The button should show the last function that was selected from
the
+// dropdown. The controller should know better than us what it was.
+xController->updateImage();
+}
+else
+{
+OUString aCommandURL = m_pToolBar->GetItemCommand( it.first );
+Image aImage = GetImageFromURL( m_xFrame, aCommandURL, bBigImages
);
+// Try also to query for add-on images before giving up and use an
+// empty image.
+if ( !aImage )
+aImage = QueryAddonsImage( aCommandURL, bBigImages );
+m_pToolBar->SetItemImage( it.first, aImage );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[GSoC] Reuse Mozilla's rolling update mechanism for LibreOffice - Weekly Report 9
This is the week 9 progress report of the GSoC bug "Reuse Mozilla's rolling update mechanism for LibreOffice". Last week: - created a "partial" mar file containing the differences between two versions of LibreOffice - started debugging the updater executable in order to use it with partial mar files Goals for this week: - finish debugging the updater executable and get it to work with partial mar files -- Nathan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 92965] use awt::XGradient instead of gradient name in fill properties
https://bugs.documentfoundation.org/show_bug.cgi?id=92965 Markus Mohrhard (retired) changed: What|Removed |Added Status|UNCONFIRMED |NEW CC||libreoffice@lists.freedeskt ||op.org Ever confirmed|0 |1 Whiteboard||easyHack difficultyBeginner ||skillCpp -- 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: external/firebird
external/firebird/ExternalProject_firebird.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f58f10fc89e19d182b5a415bb69af5ecc7de080a Author: Michael Stahl Date: Mon Jul 27 23:52:44 2015 +0200 firebird: --enable-debug breaks the build with MSVC With the 2.5.4 upgrade somehow this fails to link fbintl.lib with unresolved symbols. Debugging is overrated anyway, let's just disable that for now. Change-Id: I265c705c10ca7c70baa18232f6f740120d6b397e diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index f1dbb2f..f24d0f7 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -50,7 +50,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build): --without-editline \ --disable-superserver \ --with-system-icu --without-fbsample --without-fbsample-db \ - $(if $(ENABLE_DEBUG),--enable-debug) \ + $(if $(filter-out MSC,$(COM)),$(if $(ENABLE_DEBUG),--enable-debug)) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(DISABLE_DYNLOADING), \ --enable-static --disable-shared \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/vba-export'
New branch 'feature/vba-export' available with the following commits: commit faa3075a158dab875ab9d02571dad839f0f1c4a4 Author: Markus Mohrhard Date: Mon Jul 27 22:30:35 2015 +0200 structure for vba export Change-Id: I8094b64185ef8730355841e9b6f9d4ba412568dc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/5c7b7b5c7a75cde9a21da277d3b20f1f83f95e86/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: comphelper/source desktop/source include/comphelper
comphelper/source/misc/interaction.cxx |6 +++
desktop/source/deployment/misc/dp_interact.cxx | 41 ++---
include/comphelper/interaction.hxx |2 +
3 files changed, 12 insertions(+), 37 deletions(-)
New commits:
commit 18110ca3bdc9542e28480d5719f33c429b325402
Author: Michael Stahl
Date: Mon Jul 27 20:43:53 2015 +0200
comphelper, desktop: fix MSVC mergedlib link failure
Duplicate symbols are easily avoided by removing duplicate code.
Change-Id: I9b598a44156d6ff71b0691e69ab8163b15e2e26f
diff --git a/comphelper/source/misc/interaction.cxx
b/comphelper/source/misc/interaction.cxx
index 9c96c3e..d16aed7 100644
--- a/comphelper/source/misc/interaction.cxx
+++ b/comphelper/source/misc/interaction.cxx
@@ -44,6 +44,12 @@ namespace comphelper
{
}
+OInteractionRequest::OInteractionRequest(const Any& rRequestDescription,
+Sequence> const&
rContinuations)
+: m_aRequest(rRequestDescription)
+, m_aContinuations(rContinuations)
+{
+}
void OInteractionRequest::addContinuation(const Reference<
XInteractionContinuation >& _rxContinuation)
{
diff --git a/desktop/source/deployment/misc/dp_interact.cxx
b/desktop/source/deployment/misc/dp_interact.cxx
index 8407c50..69f8558 100644
--- a/desktop/source/deployment/misc/dp_interact.cxx
+++ b/desktop/source/deployment/misc/dp_interact.cxx
@@ -19,6 +19,9 @@
#include "dp_interact.h"
+
+#include
+
#include
#include
#include
@@ -88,42 +91,6 @@ void InteractionContinuationImpl::select() throw
(RuntimeException, std::excepti
*m_pselect = true;
}
-
-class InteractionRequest :
-public ::cppu::WeakImplHelper
-{
-Any m_request;
-Sequence< Reference > m_conts;
-
-public:
-inline InteractionRequest(
-Any const & request,
-Sequence< Reference > const & conts )
-: m_request( request ),
- m_conts( conts )
-{}
-
-// XInteractionRequest
-virtual Any SAL_CALL getRequest()
-throw (RuntimeException, std::exception) SAL_OVERRIDE;
-virtual Sequence< Reference >
-SAL_CALL getContinuations() throw (RuntimeException, std::exception)
SAL_OVERRIDE;
-};
-
-// XInteractionRequest
-
-Any InteractionRequest::getRequest() throw (RuntimeException, std::exception)
-{
-return m_request;
-}
-
-
-Sequence< Reference< task::XInteractionContinuation > >
-InteractionRequest::getContinuations() throw (RuntimeException, std::exception)
-{
-return m_conts;
-}
-
} // anon namespace
@@ -147,7 +114,7 @@ bool interactContinuation( Any const & request,
conts[ 1 ] = new InteractionContinuationImpl(
cppu::UnoType::get(), &abort );
xInteractionHandler->handle(
-new InteractionRequest( request, conts ) );
+new ::comphelper::OInteractionRequest( request, conts ) );
if (cont || abort) {
if (pcont != 0)
*pcont = cont;
diff --git a/include/comphelper/interaction.hxx
b/include/comphelper/interaction.hxx
index c845213..7135d99 100644
--- a/include/comphelper/interaction.hxx
+++ b/include/comphelper/interaction.hxx
@@ -140,6 +140,8 @@ namespace comphelper
public:
OInteractionRequest(const ::com::sun::star::uno::Any&
_rRequestDescription);
+OInteractionRequest(const ::com::sun::star::uno::Any&
rRequestDescription,
+
css::uno::Sequence>
const& rContinuations);
/// add a new continuation
void addContinuation(const ::com::sun::star::uno::Reference<
::com::sun::star::task::XInteractionContinuation >& _rxContinuation);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - formula/source sc/inc sc/qa sc/source
formula/source/ui/dlg/formula.cxx | 50 +++---
formula/source/ui/dlg/structpg.hxx|2 +
sc/inc/simpleformulacalc.hxx |3 +
sc/qa/unit/ucalc.cxx | 29 +
sc/source/core/data/simpleformulacalc.cxx | 23 +
sc/source/ui/formdlg/formula.cxx |2 +
6 files changed, 92 insertions(+), 17 deletions(-)
New commits:
commit 774085dbe5c332f2be757f5f6a0324280dd72651
Author: Benjamin Ni
Date: Mon Jul 27 19:59:28 2015 +0200
tdf#92548, limit number of characters shown in formula wizard
Change-Id: I5c322140d40e1ec31e8664a6f731e57b9b3defdb
diff --git a/formula/source/ui/dlg/formula.cxx
b/formula/source/ui/dlg/formula.cxx
index 90dfb5b..7399e06 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -723,7 +723,7 @@ void FormulaDlg_Impl::MakeTree(IStructHelper*
_pTree,SvTreeListEntry* pParent,Fo
const IFunctionDescription* pDesc
=pFuncPage->GetFuncDesc( pFuncPage->GetFunction() );
if(pDesc==pFuncDesc || !pFuncPage->IsVisible())
{
-// EditNextFunc(false);
+EditNextFunc(false);
}
}
diff --git a/sc/inc/simpleformulacalc.hxx b/sc/inc/simpleformulacalc.hxx
index 2d20f6d..f12e261 100644
--- a/sc/inc/simpleformulacalc.hxx
+++ b/sc/inc/simpleformulacalc.hxx
@@ -33,6 +33,7 @@ private:
formula::FormulaGrammar::Grammar maGram;
bool bIsMatrix;
OUString maMatrixFormulaResult;
+bool mbLimitString;
public:
ScSimpleFormulaCalculator(ScDocument* pDoc, const ScAddress& rAddr,
@@ -50,6 +51,8 @@ public:
bool HasColRowName();
ScTokenArray* GetCode();
+
+void SetLimitString(bool bLimitString);
};
#endif
diff --git a/sc/source/core/data/simpleformulacalc.cxx
b/sc/source/core/data/simpleformulacalc.cxx
index d359667..a931551 100644
--- a/sc/source/core/data/simpleformulacalc.cxx
+++ b/sc/source/core/data/simpleformulacalc.cxx
@@ -13,6 +13,8 @@
#include "interpre.hxx"
#include "compiler.hxx"
+#define DISPLAY_LEN 15
+
ScSimpleFormulaCalculator::ScSimpleFormulaCalculator( ScDocument* pDoc, const
ScAddress& rAddr,
const OUString& rFormula, formula::FormulaGrammar::Grammar eGram )
: mnFormatType(0)
@@ -22,6 +24,7 @@ ScSimpleFormulaCalculator::ScSimpleFormulaCalculator(
ScDocument* pDoc, const Sc
, mpDoc(pDoc)
, maGram(eGram)
, bIsMatrix(false)
+, mbLimitString(false)
{
// compile already here
ScCompiler aComp(mpDoc, maAddr);
@@ -53,6 +56,21 @@ void ScSimpleFormulaCalculator::Calculate()
aComp.CreateStringFromToken(aStr, aInt.GetResultToken().get(), false);
bIsMatrix = true;
+
+if (mbLimitString)
+{
+size_t n = aStr.getLength();
+for (size_t i = DISPLAY_LEN; i < n; ++i)
+{
+if (aStr[i] == ',' || aStr[i] == ';')
+{
+aStr.truncate(i);
+aStr.append("...");
+break;
+}
+}
+}
+
maMatrixFormulaResult = aStr.makeStringAndClear();
}
mnFormatType = aInt.GetRetFormatType();
@@ -121,4 +139,9 @@ ScTokenArray* ScSimpleFormulaCalculator::GetCode()
return mpCode.get();
}
+void ScSimpleFormulaCalculator::SetLimitString(bool bLimitString)
+{
+mbLimitString = bLimitString;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 4160619..d6c1b17 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -308,6 +308,7 @@ bool ScFormulaDlg::Close()
bool ScFormulaDlg::calculateValue( const OUString& rStrExp, OUString&
rStrResult )
{
boost::scoped_ptr pFCell( new
ScSimpleFormulaCalculator( pDoc, aCursorPos, rStrExp ) );
+pFCell->SetLimitString(true);
// HACK! to avoid neither #REF! from ColRowNames
// if a name is added as actually range in the overall formula,
@@ -324,6 +325,7 @@ bool ScFormulaDlg::calculateValue( const OUString& rStrExp,
OUString& rStrResult
aBraced.append(rStrExp);
aBraced.append(')');
pFCell.reset( new ScSimpleFormulaCalculator( pDoc, aCursorPos,
aBraced.makeStringAndClear() ) );
+pFCell->SetLimitString(true);
}
else
bColRowName = false;
commit f82d89f35207fc1cfc00ad5cd914b74c55c3e3d2
Author: Benjamin Ni
Date: Sun Jul 12 15:41:55 2015 +0100
tdf#92546 show results for sub-expressions in formula wizard
Change-Id: I1d5ba707d8dce69abc15ec1de7bec4728bd93adb
diff --git a/formula/source/ui/dlg/formula.cxx
b/formula/source/ui/dlg/formula.cxx
index 8581e8f..90dfb5b 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/ucalc.hxx |2
sc/qa/unit/ucalc_formula.cxx | 126 +++
2 files changed, 128 insertions(+)
New commits:
commit 96aecd7ff882e96ecf8db1f649037ad011a17899
Author: Eike Rathke
Date: Mon Jul 27 19:48:54 2015 +0200
TableRef: add unit tests
Change-Id: Ic635188f9ebefcfd49f71c3d61405e5f4765d940
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 3b24c85..759d65d 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -182,6 +182,7 @@ public:
void testMatrixOp();
void testFuncRangeOp();
void testFuncFORMULA();
+void testFuncTableRef();
void testExternalRef();
void testExternalRefFunctions();
@@ -510,6 +511,7 @@ public:
CPPUNIT_TEST(testMatrixOp);
CPPUNIT_TEST(testFuncRangeOp);
CPPUNIT_TEST(testFuncFORMULA);
+CPPUNIT_TEST(testFuncTableRef);
CPPUNIT_TEST(testExternalRef);
CPPUNIT_TEST(testExternalRefFunctions);
CPPUNIT_TEST(testCopyToDocument);
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index b6a6933..38ac04a 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -5366,4 +5366,130 @@ void Test::testFuncFORMULA()
m_pDoc->DeleteTab(0);
}
+void Test::testFuncTableRef()
+{
+sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn on auto calc.
+
+m_pDoc->InsertTab(0, "Sheet1");
+
+{
+ScDBCollection* pDBs = m_pDoc->GetDBCollection();
+CPPUNIT_ASSERT_MESSAGE("Failed to fetch DB collection object.", pDBs);
+
+// Insert "table" database range definition for A1:B4, with default
+// HasHeader=true and HasTotals=false.
+ScDBData* pData = new ScDBData( "table", 0,0,0, 1,3);
+bool bInserted = pDBs->getNamedDBs().insert(pData);
+CPPUNIT_ASSERT_MESSAGE( "Failed to insert \"table\" database range.",
bInserted);
+}
+
+{
+// Populate "table" database range with headers and data in A1:B4
+const char* aData[][2] = {
+{ "Header1", "Header2" },
+{ "1", "2" },
+{ "4", "8" },
+{ "16", "32" }
+};
+ScAddress aPos(0,0,0);
+ScRange aRange = insertRangeData(m_pDoc, aPos, aData,
SAL_N_ELEMENTS(aData));
+CPPUNIT_ASSERT(aRange.aStart == aPos);
+}
+
+// Named expressions that use Table structured references.
+/* TODO: should the item/header separator really be equal to the parameter
+ * separator, thus be locale dependent and ';' semicolon here, or should it
+ * be a fixed ',' comma instead? */
+struct {
+const char* pName;
+const char* pExpr;
+const char* pCounta; // expected result when used in row 2 (first data
row) as argument to COUNTA()
+const char* pSum3; // expected result when used in row 3 (second
data row) as argument to SUM().
+const char* pSum4; // expected result when used in row 4 (third data
row) as argument to SUM().
+const char* pSumX; // expected result when used in row 5
(non-intersecting) as argument to SUM().
+} aNames[] = {
+{ "all","table[[#All]]",
"8", "63", "63", "63" },
+{ "data_implicit", "table[]",
"6", "63", "63", "63" },
+{ "data", "table[[#Data]]",
"6", "63", "63", "63" },
+{ "headers","table[[#Headers]]",
"2", "0", "0", "0" },
+{ "header1","table[[Header1]]",
"3", "21", "21", "21" },
+{ "header2","table[[Header2]]",
"3", "42", "42", "42" },
+{ "data_header1", "table[[#Data];[Header1]]",
"3", "21", "21", "21" },
+{ "data_header2", "table[[#Data];[Header2]]",
"3", "42", "42", "42" },
+{ "this_row", "table[[#This Row]]",
"2", "12", "48", "#VALUE!" },
+{ "this_row_header1", "table[[#This Row];[Header1]]",
"1", "4", "16", "#VALUE!" },
+{ "this_row_header2", "table[[#This Row];[Header2]]",
"1", "8", "32", "#VALUE!" },
+{ "this_row_range_header_1_to_2", "table[[#This
Row];[Header1]:[Header2]]", "2", "12", "48", "#VALUE!" }
+};
+
+{
+// Insert named expressions.
+ScRangeName* pGlobalNames = m_pDoc->GetRangeName();
+CPPUNIT_ASSERT_MESSAGE("Failed to obtain global named expression
object.", pGlobalNames);
+
+for (size_t i = 0, n = SAL_N_ELEMENTS(aNames); i < n; ++i)
+{
+// Choose base position that does not intersect with the database
+// range definition to test later use of [#This Row] results in
+
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/toolbox/tbxitem.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit e2281331b1ab40288494ab3659d9c66e13d3e905 Author: Maxim Monastirsky Date: Mon Jul 27 20:11:17 2015 +0300 Fix mismerge Change-Id: I48971707410c05e0af1ffa80ed50e5f43615795b diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 2906100..8119b26 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -1142,7 +1142,7 @@ VclPtr SfxRecentFilesToolBoxControl::CreatePopupWindow() sal_uInt16 nItemId = GetId(); ::Rectangle aRect( rBox.GetItemRect( nItemId ) ); -Sequence< Any > aArgs( 2 ); +Sequence< Any > aArgs( 3 ); PropertyValue aPropValue; aPropValue.Name = "CommandURL"; @@ -1195,7 +1195,7 @@ VclPtr SfxSaveAsToolBoxControl::CreatePopupWindow() sal_uInt16 nItemId = GetId(); ::Rectangle aRect( rBox.GetItemRect( nItemId ) ); -Sequence< Any > aArgs( 3 ); +Sequence< Any > aArgs( 2 ); PropertyValue aPropValue; aPropValue.Name = "CommandURL"; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-tiled-rendering' - libreofficekit/source
Rebased ref, commits from common ancestor:
commit 0f90e2f689eb4b9414f29f6ee9b2e6f4125f7790
Author: Pranav Kant
Date: Mon Jul 27 22:13:39 2015 +0530
lokdocview: post_command arguments are not supposed to be const
Change-Id: Ibc22d03d9eee9fd151ecf5773e36c2519141a5eb
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index a548261..7ce2764 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1947,7 +1947,7 @@ lok_doc_view_post_command (LOKDocView* pDocView,
GTask* task = g_task_new(pDocView, NULL, NULL, NULL);
LOEvent* pLOEvent = new LOEvent(LOK_POST_COMMAND);
pLOEvent->m_pCommand = pCommand;
-pLOEvent->m_pArguments = pArguments;
+pLOEvent->m_pArguments = g_strdup(pArguments);
g_task_set_task_data(task, pLOEvent, g_free);
g_thread_pool_push(lokThreadPool, g_object_ref(task), NULL);
diff --git a/libreofficekit/source/gtk/tilebuffer.hxx
b/libreofficekit/source/gtk/tilebuffer.hxx
index d2451b6..dabf72f 100644
--- a/libreofficekit/source/gtk/tilebuffer.hxx
+++ b/libreofficekit/source/gtk/tilebuffer.hxx
@@ -158,7 +158,7 @@ struct LOEvent
/// @name post_command parameters
///@{
const gchar* m_pCommand;
-const gchar* m_pArguments;
+gchar* m_pArguments;
///@}
/// @name open_document parameter
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/CppunitTest_sw_odfexport.mk sw/qa
sw/CppunitTest_sw_odfexport.mk |6
sw/qa/extras/odfexport/data/oooxml_embedded.sxw |binary
sw/qa/extras/odfexport/odfexport.cxx| 36
3 files changed, 42 insertions(+)
New commits:
commit e6ff477536ce64631ee10f769a69cc73ae7b456a
Author: Varun
Date: Mon Jul 27 21:15:50 2015 +0530
Added Test for tdf#78159 OOoXML embedded objects should be converted to ODF
Change-Id: I84990fb07f1423b4365c428e6676271b045b2565
Reviewed-on: https://gerrit.libreoffice.org/17375
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/sw/CppunitTest_sw_odfexport.mk b/sw/CppunitTest_sw_odfexport.mk
index 7bc7ed8..5edd9b5 100644
--- a/sw/CppunitTest_sw_odfexport.mk
+++ b/sw/CppunitTest_sw_odfexport.mk
@@ -78,6 +78,12 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfexport,\
writerfilter/util/writerfilter \
$(if $(filter DESKTOP,$(BUILD_TYPE)),xmlhelp/util/ucpchelp1) \
xmloff/util/xo \
+chart2/source/chartcore \
+chart2/source/controller/chartcontroller \
+sc/util/sc \
+sd/util/sd \
+svx/util/svxcore \
+xmloff/source/transform/xof \
))
$(eval $(call gb_CppunitTest_use_custom_headers,sw_odfexport,\
diff --git a/sw/qa/extras/odfexport/data/oooxml_embedded.sxw
b/sw/qa/extras/odfexport/data/oooxml_embedded.sxw
new file mode 100644
index 000..e4fe14a
Binary files /dev/null and b/sw/qa/extras/odfexport/data/oooxml_embedded.sxw
differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx
b/sw/qa/extras/odfexport/odfexport.cxx
index 9de166c..85a4c01 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -22,6 +22,10 @@
#include
#include
#include
+#include
+#include
+#include
+#include
class Test : public SwModelTestBase
{
@@ -197,6 +201,38 @@ DECLARE_ODFEXPORT_TEST(testFramebackgrounds,
"framebackgrounds.odt")
}
}
+DECLARE_ODFEXPORT_TEST(testOOoxmlEmbedded, "oooxml_embedded.sxw")
+{
+uno::Reference
xTEOSupplier(mxComponent, uno::UNO_QUERY);
+uno::Reference
xAccess(xTEOSupplier->getEmbeddedObjects());
+uno::Sequence aSeq(xAccess->getElementNames());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aSeq.getLength());
+uno::Reference
xEOSupplier1(xAccess->getByName("Object1"), uno::UNO_QUERY);
+uno::Reference xObj1(xEOSupplier1->getEmbeddedObject());
+uno::Reference
xEOSupplier2(xAccess->getByName("Object2"), uno::UNO_QUERY);
+uno::Reference xObj2(xEOSupplier2->getEmbeddedObject());
+uno::Reference
xEOSupplier3(xAccess->getByName("Object3"), uno::UNO_QUERY);
+uno::Reference xObj3(xEOSupplier3->getEmbeddedObject());
+uno::Reference
xEOSupplier4(xAccess->getByName("Object4"), uno::UNO_QUERY);
+uno::Reference xObj4(xEOSupplier4->getEmbeddedObject());
+//checking first object
+uno::Reference xSBDoc1(xObj1,
uno::UNO_QUERY);
+uno::Reference xStorage1(xSBDoc1->getDocumentStorage());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(SOFFICE_FILEFORMAT_8),
comphelper::OStorageHelper::GetXStorageFormat(xStorage1));
+//checking second object
+uno::Reference xSBDoc2(xObj2,
uno::UNO_QUERY);
+uno::Reference xStorage2(xSBDoc2->getDocumentStorage());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(SOFFICE_FILEFORMAT_8),
comphelper::OStorageHelper::GetXStorageFormat(xStorage2));
+//checking third object
+uno::Reference xSBDoc3(xObj3,
uno::UNO_QUERY);
+uno::Reference xStorage3(xSBDoc3->getDocumentStorage());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(SOFFICE_FILEFORMAT_8),
comphelper::OStorageHelper::GetXStorageFormat(xStorage3));
+//checking fourth object
+uno::Reference xSBDoc4(xObj4,
uno::UNO_QUERY);
+uno::Reference xStorage4(xSBDoc4->getDocumentStorage());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(SOFFICE_FILEFORMAT_8),
comphelper::OStorageHelper::GetXStorageFormat(xStorage4));
+}
+
DECLARE_ODFEXPORT_TEST(testredlineTextFrame, "redlineTextFrame.odt")
{
//Note this is for a crash test
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[GSoC] Integrating LO with GNOME - WR#9
Stuff I did this week : - Moved all (except one) LOK call to separate thread. - Good amount of code polish. - Fixed some bugs that Miklos and I reproduced. - Studied a bit about sysui/ module, and how we should plan to distribute the introspection files in the distributions. Coming up: - Callgrind because of the paintTile() lag. - Play more with the sysui/ module and 'register' the widget. - Fix some more bugs that we have found. -- Regards, Pranav Kant http://pranavk.me ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - 3 commits - include/editeng include/svx svx/source
include/editeng/unoprnms.hxx |1 +
include/svx/svddef.hxx|3 ++-
include/svx/svdstr.hrc|2 ++
include/svx/unoshprp.hxx |1 +
svx/source/svdraw/svdattr.cxx |3 ++-
svx/source/svdraw/svdstr.src |5 +
6 files changed, 13 insertions(+), 2 deletions(-)
New commits:
commit ce156079eb91050a3e83efb38f93c0f7bbeceaf9
Author: matteocam
Date: Mon Jul 27 17:54:08 2015 +0200
Fix last value in defs
Change-Id: I49cf99ac116f10f14ab21d2a3e738bdece659cb8
diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx
index 1cdacb7..5b3e5e9 100644
--- a/include/svx/svddef.hxx
+++ b/include/svx/svddef.hxx
@@ -113,7 +113,7 @@
#define SDRATTR_TEXT_WORDWRAP (SDRATTR_MISC_FIRST +25) /* 1122
*/ /* 1122 */ /* 1105 */ /* Pool V2 */
#define SDRATTR_TEXT_AUTOGROWSIZE (SDRATTR_MISC_FIRST +26) /* 1123
*/ /* 1123 */ /* 1106 */ /* Pool V2 */
#define SDRATTR_TEXT_CHAINNEXTNAME (SDRATTR_MISC_FIRST + 27) /* 1124
*/ /* 11124 */
-#define SDRATTR_MISC_LAST (SDRATTR_TEXT_AUTOGROWSIZE)/*
1125 */ /* 1125 */ /* 1108 */ /* Pool V1: 1056 */
+#define SDRATTR_MISC_LAST (SDRATTR_TEXT_CHAINNEXTNAME)/*
1125 */ /* 1125 */ /* 1108 */ /* Pool V1: 1056 */
#define SDRATTR_EDGE_FIRST (SDRATTR_MISC_LAST + 1) /* 1127
*/ /* Pool V4 */
#define SDRATTR_EDGEKIND(SDRATTR_EDGE_FIRST + 0) /* 1127
*/ /* Pool V4 */
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 83583be..a108063 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -498,7 +498,6 @@ void SdrItemPool::TakeItemName(sal_uInt16 nWhich, OUString&
rItemName)
case SDRATTR_TEXT_WORDWRAP : nResId = SIP_SA_WORDWRAP;break;
case SDRATTR_TEXT_CHAINNEXTNAME : nResId =
SIP_SA_CHAINNEXTNAME;break;
case SDRATTR_TEXT_AUTOGROWSIZE : nResId =
SIP_SA_AUTOGROWSIZE;break;
-
case SDRATTR_EDGEKIND : nResId = SIP_SA_EDGEKIND;break;
case SDRATTR_EDGENODE1HORZDIST : nResId =
SIP_SA_EDGENODE1HORZDIST;break;
case SDRATTR_EDGENODE1VERTDIST : nResId =
SIP_SA_EDGENODE1VERTDIST;break;
commit 21078f833967f5d4b3bb4bcb2599b8aad08eb0d1
Author: matteocam
Date: Mon Jul 27 17:49:43 2015 +0200
Added attributes for chaining around
Change-Id: I41f498ae1778a487fefd7c48f00dc514180c0683
diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index 0566288..498d417 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -113,6 +113,7 @@
#define UNO_NAME_TEXT_WRITINGMODE "TextWritingMode"
#define UNO_NAME_TEXT_FONTINDEPENDENTLINESPACING "FontIndependentLineSpacing"
#define UNO_NAME_TEXT_WORDWRAP "TextWordWrap"
+#define UNO_NAME_TEXT_CHAINNEXTNAME "TextChainNextName"
#define UNO_NAME_MEASUREKIND"MeasureKind"
#define UNO_NAME_MEASURETEXTHPOS"MeasureTextHorizontalPosition"
diff --git a/include/svx/svdstr.hrc b/include/svx/svdstr.hrc
index 36e8719..8a94938 100644
--- a/include/svx/svdstr.hrc
+++ b/include/svx/svdstr.hrc
@@ -714,4 +714,6 @@
#define STR_TABLE_STYLE_SETTINGS(SIP_Begin + 275)
#define SIP_SA_CROP_MARKERS (SIP_Begin + 276)
+#define SIP_SA_CHAINNEXTNAME(SIP_Begin + 277)
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index b7a95be..2f8e35e 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -291,6 +291,7 @@
{
OUString(UNO_NAME_TEXT_FONTINDEPENDENTLINESPACING),SDRATTR_TEXT_USEFIXEDCELLHEIGHT,cppu::UnoType::get(),
0, 0}, \
{ OUString(UNO_NAME_TEXT_VERTADJUST), SDRATTR_TEXT_VERTADJUST,
cppu::UnoType::get(),0, 0},\
{ OUString(UNO_NAME_TEXT_WORDWRAP), SDRATTR_TEXT_WORDWRAP,
cppu::UnoType::get(),0, 0}, \
+{ OUString(UNO_NAME_TEXT_CHAINNEXTNAME),SDRATTR_TEXT_CHAINNEXTNAME,
::cppu::UnoType::get(),0, 0}, \
SVX_UNOEDIT_CHAR_PROPERTIES, \
SVX_UNOEDIT_PARA_PROPERTIES,
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 18368c5..83583be 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -164,6 +164,7 @@ SdrItemPool::SdrItemPool(
mppLocalPoolDefaults[SDRATTR_XMLATTRIBUTES -SDRATTR_START]=new
SvXMLAttrContainerItem( SDRATTR_XMLATTRIBUTES );
mppLocalPoolDefaults[SDRATTR_TEXT_USEFIXEDCELLHEIGHT -SDRATTR_START]=new
SdrTextFixedCellHeightItem;
mppLocalPoolDefaults[SDRATTR_TEXT_WORDWRAP -SDRATTR_START]=new
SdrOnOffItem(SDRATTR_TEXT_WORDWRAP, true);
+mppLocalPoolDefaults[SDRATTR_TEXT_CHAINNEXTNAME-SDRATTR_START]=new
SfxStringItem(SDRATTR_TEXT_CHAINNEXTNAME, "");
Re: Help Authoring Extension
Le 27/07/2015 15:37, Christian Lohmaier a écrit : Hi Christian, > Not true - it links to http://... (not https - that is your browser's > plugin at work) > Indeed, I'm so used to forcing https everywhere, I kind of forget that its not... > > That domain is not setup for https - you http to access it. > Thanks, will correct in my browser. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac
configure.ac |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) New commits: commit e83499ad82bee4c2255b47c16f877ec09eff5c35 Author: Tor Lillqvist Date: Mon Jul 27 18:25:51 2015 +0300 Mention that --enable-lto is broken for MSVC I don't have the inspiration to fix it. I get unresolved symbols "__declspec(dllimport) public: virtual class com::sun::star::uno::Any __cdecl cppu::WeakImplHelper:: queryInterface(class com::sun::star::uno::Type const &)" etc when linking the fwk library in framework. Also, surely we require GCC to be >= 4.6 now, no need to mention that. Change-Id: I6502a4acc200f4d94c8c6e0577eee4282375db0d diff --git a/configure.ac b/configure.ac index 8d3b906..ed35010 100644 --- a/configure.ac +++ b/configure.ac @@ -1091,10 +1091,9 @@ AC_ARG_ENABLE(ooenv, AC_ARG_ENABLE(lto, AS_HELP_STRING([--enable-lto], [Enable link-time optimization. Suitable for (optimised) product builds. Building might take - longer but libraries and executables are optimized for speed. (For GCC, best to use GCC 4.6 - or later and 'gold' linker. Works fine (and is turned on automatically in an optimising - build) for MSVC, otherwise experimental work in progress that shouldn't be used unless you - are working on it.)])) + longer but libraries and executables are optimized for speed. For GCC, best to use the 'gold' + linker. For MSVC, this option is broken at the moment. This is experimental work + in progress that shouldn't be used unless you are working on it.)])) AC_ARG_ENABLE(crashdump, AS_HELP_STRING([--enable-crashdump], ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - xmloff/source
xmloff/source/text/txtexppr.cxx | 43 +++-
1 file changed, 25 insertions(+), 18 deletions(-)
New commits:
commit 1ad69bbaa5bc356a553738fa52664b53343cd1f4
Author: Caolán McNamara
Date: Fri Jul 24 15:48:25 2015 +0100
Resolves: tdf#91950 optional entries may not be present
here we appear to check if the preceding optional entries are of certain
types. Presumably if they are optional then its legal for them not to
exist at all, just that if they are there they should be in the right
order.
Change-Id: Id147b91d7d375d7985d901cda112c7757dc3fb19
Reviewed-on: https://gerrit.libreoffice.org/17353
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index dfb3594..bd0ed88 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -71,35 +71,42 @@ void XMLTextExportPropertySetMapper::handleElementItem(
case CTF_BACKGROUND_URL:
{
-assert(pProperties && nIdx >= 3);
const Any *pPos = 0, *pFilter = 0, *pTrans = 0;
sal_uInt32 nPropIndex = rProperty.mnIndex;
// these are all optional, so have to check them in order
// note: this index order dependency is a steaming pile of manure
-sal_uInt32 nIndex(nIdx - 1);
-const XMLPropertyState& rFilter = (*pProperties)[nIndex];
-if (CTF_BACKGROUND_FILTER == getPropertySetMapper()
-->GetEntryContextId(rFilter.mnIndex))
+if (nIdx)
{
-pFilter = &rFilter.maValue;
---nIndex;
+const XMLPropertyState& rFilter = (*pProperties)[nIdx - 1];
+if (CTF_BACKGROUND_FILTER == getPropertySetMapper()
+->GetEntryContextId(rFilter.mnIndex))
+{
+pFilter = &rFilter.maValue;
+--nIdx;
+}
}
-const XMLPropertyState& rPos = (*pProperties)[nIndex];
-if (CTF_BACKGROUND_POS == getPropertySetMapper()
-->GetEntryContextId(rPos.mnIndex))
+if (nIdx)
{
-pPos = &rPos.maValue;
---nIndex;
+const XMLPropertyState& rPos = (*pProperties)[nIdx - 1];
+if (CTF_BACKGROUND_POS == getPropertySetMapper()
+->GetEntryContextId(rPos.mnIndex))
+{
+pPos = &rPos.maValue;
+--nIdx;
+}
}
-const XMLPropertyState& rTrans = (*pProperties)[nIndex];
-// #99657# transparency may be there, but doesn't have to be.
-// If it's there, it must be in the right position.
-if( CTF_BACKGROUND_TRANSPARENCY == getPropertySetMapper()
- ->GetEntryContextId( rTrans.mnIndex ) )
-pTrans = &rTrans.maValue;
+if (nIdx)
+{
+const XMLPropertyState& rTrans = (*pProperties)[nIdx - 1];
+// #99657# transparency may be there, but doesn't have to be.
+// If it's there, it must be in the right position.
+if( CTF_BACKGROUND_TRANSPARENCY == getPropertySetMapper()
+ ->GetEntryContextId( rTrans.mnIndex ) )
+pTrans = &rTrans.maValue;
+}
pThis->maBackgroundImageExport.exportXML(
rProperty.maValue, pPos, pFilter, pTrans,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 6 commits - configure.ac solenv/gdb sw/inc sw/source
configure.ac |3 ++
solenv/gdb/libreoffice/sw.py |2 -
sw/inc/pch/precompiled_sw.hxx |1
sw/source/core/doc/docsort.cxx | 14 -
sw/source/core/inc/blink.hxx | 17 +--
sw/source/core/text/blink.cxx | 41 +---
sw/source/filter/html/htmlatr.cxx | 54 ++---
sw/source/filter/html/wrthtml.cxx |8 ++---
sw/source/filter/html/wrthtml.hxx | 18 +---
sw/source/ui/dialog/uiregionsw.cxx | 10 --
sw/source/uibase/inc/regionsw.hxx |7 ++--
11 files changed, 99 insertions(+), 76 deletions(-)
New commits:
commit bd50d025fe5acf974f690e3388b8a429b8443139
Author: Michael Stahl
Date: Mon Jul 27 15:49:49 2015 +0200
sw: replace boost::ptr_multiset with std::multiset
Change-Id: I0b1743bd23844c46572af24e8fbdd0a61676d840
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 1540a5e..e740d22 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -48,7 +48,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index a4fdcaa..a7e5f41 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include
-
#include
#include
#include
@@ -50,6 +48,8 @@
#include
#include
+#include
+
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star;
@@ -63,8 +63,8 @@ LocaleDataWrapper* SwSortElement::pLclData = 0;
// List of all sorted elements
-typedef ::boost::ptr_multiset SwSortTextElements;
-typedef ::boost::ptr_multiset SwSortBoxElements;
+typedef ::std::multiset SwSortTextElements;
+typedef ::std::multiset SwSortBoxElements;
/// Construct a SortElement for the Sort
void SwSortElement::Init( SwDoc* pD, const SwSortOptions& rOpt,
@@ -379,8 +379,7 @@ bool SwDoc::SortText(const SwPaM& rPaM, const
SwSortOptions& rOpt)
while( aStart <= pEnd->nNode )
{
// Iterate over a selected range
-SwSortTextElement* pSE = new SwSortTextElement( aStart );
-aSortSet.insert(pSE);
+aSortSet.insert(SwSortTextElement(aStart));
++aStart;
}
@@ -562,8 +561,7 @@ bool SwDoc::SortTable(const SwSelBoxes& rBoxes, const
SwSortOptions& rOpt)
// When sorting, do not include the first row if the HeaderLine is repeated
for( sal_uInt16 i = static_cast(nStart); i < nCount; ++i)
{
-SwSortBoxElement* pEle = new SwSortBoxElement( i );
-aSortList.insert(pEle);
+aSortList.insert(SwSortBoxElement(i));
}
// Move after Sorting
commit abf56d46be1b11973fce1fa48e40b82820d66e58
Author: Michael Stahl
Date: Mon Jul 27 15:14:49 2015 +0200
sw: replace boost::ptr_set with std::map
Change-Id: I2af80c8223ec3074058c013be7302ebf8edad95c
diff --git a/sw/source/ui/dialog/uiregionsw.cxx
b/sw/source/ui/dialog/uiregionsw.cxx
index 711462e..601be95 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -142,7 +142,7 @@ private:
SwFormatNoBalancedColumns m_Balance;
SvxFrameDirectionItem m_FrmDirItem;
SvxLRSpaceItem m_LRSpaceItem;
-size_t m_nArrPos;
+const size_tm_nArrPos;
// shows, if maybe textcontent is in the region
boolm_bContent : 1;
// for multiselection, mark at first, then work with TreeListBox!
@@ -816,9 +816,10 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl)
pEntry = m_pTree->Next( pEntry );
}
-for (SectReprArr::reverse_iterator aI = aSectReprArr.rbegin(), aEnd =
aSectReprArr.rend(); aI != aEnd; ++aI)
+for (SectReprs_t::reverse_iterator it = m_SectReprs.rbegin(), aEnd =
m_SectReprs.rend(); it != aEnd; ++it)
{
-SwSectionFormat* pFormat = aOrigArray[ aI->GetArrPos() ];
+assert(it->first == it->second->GetArrPos());
+SwSectionFormat* pFormat = aOrigArray[ it->second->GetArrPos() ];
const size_t nNewPos = rDocFormats.GetPos( pFormat );
if( SIZE_MAX != nNewPos )
rSh.DelSectionFormat( nNewPos );
@@ -930,7 +931,8 @@ IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl)
bool bRestart = false;
if(pSectRepr->IsSelected())
{
-aSectReprArr.insert( pSectRepr );
+m_SectReprs.insert(std::make_pair(pSectRepr->GetArrPos(),
+std::unique_ptr(pSectRepr)));
while( (pChild = m_pTree->FirstChild(pEntry) )!= 0 )
{
// because of the repositioning we have to start at the
beginning again
diff --git a/sw/source/uibase/inc/regionsw.hxx
b/sw/source/uibase/inc/regionsw.hxx
index d74e06a..7b4d1de 100644
--- a/sw/source/uibase/inc/regionsw.hxx
+++ b/sw/source/uibase/inc/regionsw.hx
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - xmloff/source
xmloff/source/draw/sdpropls.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 0f3c304253d545807a942e908a9d0a886bc21013 Author: matteocam Date: Mon Jul 27 17:09:40 2015 +0200 Add TextChainNextName to the set of mapped properties Change-Id: Ie7b11d56bc2ace27110abd0a2d0e034e54c1c2f7 diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 45920d9..e6764ec 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -146,6 +146,7 @@ const XMLPropertyMapEntry aXMLSDProperties[] = GMAP( "NumberingRules", XML_NAMESPACE_TEXT, XML_LIST_STYLE, XML_SD_TYPE_NUMBULLET|MID_FLAG_ELEMENT_ITEM, CTF_NUMBERINGRULES ), GMAP( "NumberingRules", XML_NAMESPACE_TEXT, XML_LIST_STYLE_NAME,XML_TYPE_STRING, CTF_SD_NUMBERINGRULES_NAME ), GMAP( "TextWordWrap", XML_NAMESPACE_FO, XML_WRAP_OPTION,XML_TYPE_WRAP_OPTION, 0 ), +GMAP( "TextChainNextName", XML_NAMESPACE_DRAW, XML_CHAIN_NEXT_NAME, XML_TYPE_STRING, 0 ), // shadow attributes GMAP( "Shadow", XML_NAMESPACE_DRAW, XML_SHADOW, XML_SD_TYPE_SHADOW, 0 ), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/misc/num.cxx |1 -
sw/source/uibase/inc/swvset.hxx | 32
2 files changed, 33 deletions(-)
New commits:
commit 8f4242e3798d40580135466156cf30cace64824d
Author: Maxim Monastirsky
Date: Wed Jul 22 22:03:01 2015 +0300
Remove the unused swvset.hxx
Change-Id: I7d89c2cdd4f0e2f082674d954273229a16d3a745
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 783cdf2..98792e2 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -25,7 +25,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/sw/source/uibase/inc/swvset.hxx b/sw/source/uibase/inc/swvset.hxx
deleted file mode 100644
index f27ecdd..000
--- a/sw/source/uibase/inc/swvset.hxx
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWVSET_HXX
-#define INCLUDED_SW_SOURCE_UIBASE_INC_SWVSET_HXX
-#include
-
-class SwRulerValueSet : public SvxBmpNumValueSet
-{
-public:
-SwRulerValueSet(vcl::Window* pParent, WinBits nWinStyle);
-virtual ~SwRulerValueSet();
-virtual voidUserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE;
-};
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 2 commits - loleaflet/spec loleaflet/src
loleaflet/spec/tilebench/TileBenchSpec.js | 337 +-
loleaflet/src/core/Log.js |6
2 files changed, 338 insertions(+), 5 deletions(-)
New commits:
commit 1f88357aa8917918a1a5fde10b5aa787be2fb6d9
Author: Mihai Varga
Date: Mon Jul 27 17:53:18 2015 +0300
loleaflet: tilebench - replay an editing session
Sends recorded key input commands to the server over a period
about 20 seconds and then requests and empty tile so that the
'alltilesloaded' event is fired in the end, letting us know that the
editing session finished.
diff --git a/loleaflet/spec/tilebench/TileBenchSpec.js
b/loleaflet/spec/tilebench/TileBenchSpec.js
index 6cb137a..28ac2b0 100644
--- a/loleaflet/spec/tilebench/TileBenchSpec.js
+++ b/loleaflet/spec/tilebench/TileBenchSpec.js
@@ -1,6 +1,6 @@
describe('TileBench', function () {
- // 20 s timeout
- this.timeout(2);
+ // 25 s timeout
+ this.timeout(25000);
var map;
var loadCount = 0;
@@ -30,6 +30,21 @@ describe('TileBench', function () {
edit: false,
readOnly: false
});
+
+ // add a timestamp to tile messages so we can identify
+ // the response
+ docLayer.sendMessage = L.bind(function (msg, coords) {
+ var now = Date.now();
+ if (msg.startsWith('tile')) {
+ msg += ' timestamp=' + now;
+ }
+ L.Log.log(msg, L.OUTGOING, coords, now);
+ this._map.socket.send(msg);
+ }, docLayer);
+
+ // don't pre-fetch tiles
+ docLayer._preFetchTiles = L.Util.falseFn;
+
map.addLayer(docLayer);
map.addControl(L.control.scroll());
});
@@ -48,12 +63,48 @@ describe('TileBench', function () {
it('Load all new tiles', function (done) {
map.on('alltilesloaded', L.bind(function () {
loadCount += 1;
- console.log(loadCount);
done();
}, done));
});
+ it('Edit the document', function (done) {
+ L.Log.clear();
+
+ // allow 2 seconds to pass after the last key input
+ var aproxTime = keyInput[keyInput.length - 1][0] + 2000;
+
+ setTimeout(L.bind(function () {
+ map.on('alltilesloaded', L.bind(function () {
+ loadCount += 1;
+ getTimes(done);
+ }, done));
+
+
+ // request an empty tile and when it arrives we
know that the
+ // server has finished processing all other
messages
+ var docLayer = map._docLayer;
+ var x = Math.floor(docLayer._docWidthTwips /
docLayer._tileWidthTwips);
+ var y = Math.floor(docLayer._docHeightTwips /
docLayer._tileHeightTwips);
+ var coords = new L.Point(x, y);
+ coords.z = map.getZoom();
+ coords.part = docLayer._currentPart;
+ var key = docLayer._tileCoordsToKey(coords);
+ if (docLayer._tiles[key]) {
+ // the tile is already here, the whole
document is loaded
+ getTimes(done);
+ }
+ var fragment =
document.createDocumentFragment();
+ docLayer._addTile(coords, fragment);
+ }, done), aproxTime);
+
+ for (var i = 0; i < keyInput.length; i++) {
+ setTimeout(L.bind(function () {
+
map._docLayer.sendMessage(keyInput[this][1]);
+ }, i), keyInput[i][0]);
+ }
+ });
+
it('Scroll to the bottom', function (done) {
$('.scroll-container').mCustomScrollbar('scrollTo',
'bottom', {scrollInertia: 3000});
// check how we're doing 200ms after the scroll has
ended
@@ -73,4 +124,284 @@ describe('TileBench', function () {
}, done), 3200);
});
});
+
+ var getTimes = function (done) {
+ var incoming = [];
+ var outgoing = [];
+ var logs = L.Log._logs;
+ for (var i = 0; i < logs.length; i++) {
+ if (logs[i].coords !== undefined) {
+
[Libreoffice-commits] core.git: framework/source
framework/source/uielement/subtoolbarcontroller.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4b35bffa0ec7295718fa59280b495972d86d7af8
Author: Maxim Monastirsky
Date: Mon Jul 27 17:48:47 2015 +0300
Fix image update of DROPDOWNONLY buttons
Change-Id: I787878d6ac02d15286a405ccfcc1f09f04c39501
diff --git a/framework/source/uielement/subtoolbarcontroller.cxx
b/framework/source/uielement/subtoolbarcontroller.cxx
index 3a06a10..755b43b 100644
--- a/framework/source/uielement/subtoolbarcontroller.cxx
+++ b/framework/source/uielement/subtoolbarcontroller.cxx
@@ -260,7 +260,7 @@ css::uno::Reference< css::awt::XWindow >
SubToolBarController::createPopupWindow
sal_Bool SubToolBarController::opensSubToolbar()
throw ( css::uno::RuntimeException, std::exception )
{
-return sal_True;
+return !m_aLastCommand.isEmpty();
}
OUString SubToolBarController::getSubToolbarName()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Have serf layer in webdav built again: need new lib vers in d-www
On 07/27/2015 04:16 PM, Miklos Vajna wrote: Hi, On Mon, Jul 27, 2015 at 04:02:41PM +0200, Giuseppe Castagno wrote: I need someone add them to the dev-www repository; without removing the old one, of course :-). If you provide e.g. the wget commands on exactly what you want to have downloaded and what should be the output name, then it's easy to help you. :-) Hoping I got you right, here they are: apr: wget http://mirror.nohup.it/apache/apr/apr-1.5.2.tar.gz output name: apr-1.5.2.tar.gz apr-util: wget http://mirror.nohup.it/apache/apr/apr-util-1.5.4.tar.gz output name: apr-util-1.5.4.tar.gz serf: http://serf.googlecode.com/svn/src_releases/serf-1.3.8.tar.bz2 output name: serf-1.3.8.tar.bz2 -- Kind Regards, Giuseppe Castagno aka beppec56 Acca Esse http://www.acca-esse.eu giuseppe.castagno at acca-esse.eu ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Have serf layer in webdav built again: need new lib vers in d-www
Hi, On Mon, Jul 27, 2015 at 04:02:41PM +0200, Giuseppe Castagno wrote: > I need someone add them to the dev-www repository; without removing > the old one, of course :-). If you provide e.g. the wget commands on exactly what you want to have downloaded and what should be the output name, then it's easy to help you. :-) Regards, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Have serf layer in webdav built again: need new lib vers in d-www
Hi all, trying to have the switch --with-webdav=serf working, by building serf in place of neon. Currently it doesn't work. What I'd like to do at the same time is to upgrade the external library used to the latest stable version: apr [1] to 1.5.2 apr-util [1] to 1.5.4 serf [2] to 1.3.8 Modifying download.lst is not enough, since they are downloaded from dev-www.libreoffice.org. I need someone add them to the dev-www repository; without removing the old one, of course :-). The reason for the upgrade before anything else stems from the fact that serf version 1.2.1 doesn't support Windows authentication, normally needed when you login to SharePoint or to another WebDAV server requiring it. Serf version 1.3.8 does have Windows authentication, but in this installment suffers a problem of memory deallocation when closing the application, that should be investigated, so it's better if apr is upgraded since the memory allocation is carried out by apr. -- Kind Regards, Giuseppe Castagno aka beppec56 Acca Esse http://www.acca-esse.eu giuseppe.castagno at acca-esse.eu [1] https://apr.apache.org/ [2] https://code.google.com/p/serf/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/ucalc.hxx |2 ++
sc/qa/unit/ucalc_formula.cxx | 41 +
2 files changed, 43 insertions(+)
New commits:
commit 1abc8c1608eca18d5b4a010d8a43fbbe87a6b933
Author: Eike Rathke
Date: Mon Jul 27 15:43:22 2015 +0200
unit test for FORMULA() with and without array context
Change-Id: Ic8e0f5dfad6e9b9a70e6dca89a970c131efc53d9
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 4a3e462..3b24c85 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -181,6 +181,7 @@ public:
void testFuncGETPIVOTDATALeafAccess();
void testMatrixOp();
void testFuncRangeOp();
+void testFuncFORMULA();
void testExternalRef();
void testExternalRefFunctions();
@@ -508,6 +509,7 @@ public:
CPPUNIT_TEST(testFuncGETPIVOTDATALeafAccess);
CPPUNIT_TEST(testMatrixOp);
CPPUNIT_TEST(testFuncRangeOp);
+CPPUNIT_TEST(testFuncFORMULA);
CPPUNIT_TEST(testExternalRef);
CPPUNIT_TEST(testExternalRefFunctions);
CPPUNIT_TEST(testCopyToDocument);
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index b7c4fd7..b6a6933 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -5325,4 +5325,45 @@ void Test::testFuncRangeOp()
m_pDoc->DeleteTab(0);
}
+void Test::testFuncFORMULA()
+{
+sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn on auto calc.
+
+m_pDoc->InsertTab(0, "Sheet1");
+
+// Data in B1:D3
+const char* aData[][3] = {
+{ "=A1", "=FORMULA(B1)", "=FORMULA(B1:B3)" },
+{ 0, "=FORMULA(B2)", "=FORMULA(B1:B3)" },
+{ "=A3", "=FORMULA(B3)", "=FORMULA(B1:B3)" },
+};
+
+ScAddress aPos(1,0,0);
+ScRange aRange = insertRangeData(m_pDoc, aPos, aData,
SAL_N_ELEMENTS(aData));
+CPPUNIT_ASSERT(aRange.aStart == aPos);
+
+// Checks of C1:D3, where Cy==Dy, and D4:D6
+const char* aChecks[] = {
+"=A1",
+"#N/A",
+"=A3",
+};
+for (size_t i=0; i < SAL_N_ELEMENTS(aChecks); ++i)
+{
+CPPUNIT_ASSERT_EQUAL( OUString::createFromAscii( aChecks[i]),
m_pDoc->GetString(2,i,0));
+CPPUNIT_ASSERT_EQUAL( OUString::createFromAscii( aChecks[i]),
m_pDoc->GetString(3,i,0));
+}
+
+// Matrix in D4:D6, no intersection with B1:B3
+ScMarkData aMark;
+aMark.SelectOneTable(0);
+m_pDoc->InsertMatrixFormula(3, 3, 3, 5, aMark, "=FORMULA(B1:B3)");
+for (size_t i=0; i < SAL_N_ELEMENTS(aChecks); ++i)
+{
+CPPUNIT_ASSERT_EQUAL( OUString::createFromAscii( aChecks[i]),
m_pDoc->GetString(3,i+3,0));
+}
+
+m_pDoc->DeleteTab(0);
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Help Authoring Extension
Hi Alex, *, On Mon, Jul 27, 2015 at 9:34 AM, Alex Thurgood wrote: > Le 24/07/2015 23:06, Jan Holesovsky a écrit : >> [...] >> https://wiki.documentfoundation.org/Documentation/Help >> > > When I go to that page, there is a link to the extension: > > https://dev-www.libreoffice.org/helpauthoring/ Not true - it links to http://... (not https - that is your browser's plugin at work) > which leads to an error message in Firefox that the page can not be loaded. That domain is not setup for https - you http to access it. ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: bin/gbuild-to-ide
bin/gbuild-to-ide | 23 +--
1 file changed, 13 insertions(+), 10 deletions(-)
New commits:
commit dcec162ea083b3604ff82c4dc3ca43d2b5054ea7
Author: Michel Renon
Date: Tue Jul 14 23:40:04 2015 +0200
tdf#92561 : QtCreator doesn't find any generated c++ headers.
Use lib.include to list :
- all include paths (with generated c++ headers),
- header files for each lib/module.
Change-Id: I44f20ddbcaf2ffa844ec02977dea10f32fe9d92f
Reviewed-on: https://gerrit.libreoffice.org/17055
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
Tested-by: Maxim Monastirsky
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index af1b20a..82d1634 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -1298,8 +1298,13 @@ class
QtCreatorIntegrationGenerator(IdeIntegrationGenerator):
return os.path.relpath(path, lib.location)
sources_list = []
-headers_list = []
includepath_list = []
+# The explicit headers list is not mandatory :
+# QtCreator just needs 'include_path_list' to find all headers
files.
+# But files listed in 'header_list' will be shown
+# in a specific "Headers" folder in QtCreator's Project panel.
+# We will list here only headers files of current lib.
+headers_list = []
for file_ in lib.cxxobjects:
# the file has no extension : search it
# self._log("\nfile : %s" % file_)
@@ -1312,21 +1317,19 @@ class
QtCreatorIntegrationGenerator(IdeIntegrationGenerator):
if ext:
headers_list.append(lopath(file_+ext))
-# List all headers
+# List all include paths
for hdir in lib.include:
-# except from "workdir" folder
-if "workdir" not in hdir:
+hf_lopath = lopath(hdir)
+includepath_list.append(hf_lopath)
+
+# List headers files from current lib
+for hdir in lib.include:
+if hdir.startswith(lib.location):
for hf in os.listdir(hdir):
if hf.endswith(('.h', '.hxx', '.hpp', '.hrc')):
hf_lopath = lopath(os.path.join(hdir, hf))
headers_list.append(hf_lopath)
-# We also need to have a list of include paths
-for header in headers_list:
-header_path = os.path.dirname(header)
-if header_path not in includepath_list:
-includepath_list.append(header_path)
-
# All datas are prepared, store them for the lib.
if lib_folder in self.data_libs:
self.data_libs[lib_folder]['sources'] |= set(sources_list)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Docker container for building LibreOffice
Thanks Eike, your explanation makes sense. On Mon, Jul 27, 2015 at 2:55 PM, Eike Rathke wrote: > > > Building LibreOffice needs more RAM. At least 4GB, when building with debug or dbgutil even more. Using swap instead of real RAM is an option, > but it will result in much increased compile times. The cc1plus abort > you experienced is quite likely related to memory being exhausted. I will try to confirm this by running the compilation in a machine with 4GB RAM. By the way, this seems to me like another not-so-well-documented requirement. It also seems to me a bit like bloatware, however I am not familiar with compiling programs, maybe this is something normal. I also wonder how did they compile LO 10 years ago, when a laptop with 4GB RAM was not so common. Anyway, I hope that things will improve and become more efficient in the future. Best, Dashamir ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Docker container for building LibreOffice
Hi Dashamir, On Monday, 2015-07-27 12:43:16 +0200, Dashamir Hoxha wrote: > It can be that it runs into resource limits, because this docker container > is running > inside a VPS with 1.7GB RAM Building LibreOffice needs more RAM. At least 4GB, when building with debug or dbgutil even more. Using swap instead of real RAM is an option, but it will result in much increased compile times. The cc1plus abort you experienced is quite likely related to memory being exhausted. > I am running it with `nice`. Maybe `nice` and `boost` are a bit conflicting > to each-other. That one made me laugh.. 'nice' lowers priority of processes, while 'boost' is a template library used by LibreOffice, which can generate quite some huge interim preprocessed code before being compiled, hence the cc1plus got aborted when out of memory. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ Care about Free Software, support the FSFE https://fsfe.org/support/?erack pgpGS9ICgf_Um.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source
svx/source/svdraw/svdotext.cxx | 24
1 file changed, 12 insertions(+), 12 deletions(-)
New commits:
commit b15d415316b012886ae2d0aff44f9f667263d498
Author: matteocam
Date: Mon Jul 27 14:07:58 2015 +0200
Make linking only for chainable boxes
Change-Id: Ia8ed6ae90abba5a0c3092c5a1d781443ea611fc9
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index d9b16b8..1aa6e73 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1986,7 +1986,17 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus*
pEditStatus )
bool SdrTextObj::IsChainable() const
{
-// XXX: Hack to have links together
+// XXX
+if (!GetName().startsWith("Chainable")) {
+//fprintf(stderr, "[CHAINABLE?] %p is _not_ chainable\n", this);
+return false;
+}
+
+// Check that no overflow is going on
+if (!GetTextChain() || GetTextChain()->GetNilChainingEvent(this))
+return false;
+
+ // XXX: Hack to have links together
static bool bHasDoneTheLinking = false;
SdrTextObj *pTxtObj0 = dynamic_cast< SdrTextObj * >( pPage->GetObj( 0 ) );
@@ -1998,19 +2008,9 @@ bool SdrTextObj::IsChainable() const
bHasDoneTheLinking = true;
}
+// end hack
-
-// XXX
-if (!GetName().startsWith("Chainable")) {
-//fprintf(stderr, "[CHAINABLE?] %p is _not_ chainable\n", this);
-return false;
-}
-
-// Check that no overflow is going on
-if (!GetTextChain() || GetTextChain()->GetNilChainingEvent(this))
-return false;
-
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [GSoC15] Chained Text Boxes - Report Week 9
Matteo Campanelli wrote: > Progress from last week: > - Overflow handling is triggered after pasting again (and cursor motion is > handled too); > - Left arrow, Backspace and Del key inputs are handled; > - Refactoring of cursor motion code. > Hi Matteo, nice progress there again! As said earlier, let's now start getting bits and pieces of that into master. Depending on your risk profile, as an experimental feature, or w/o UI but enabled by default. ;) Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source
svx/source/svdraw/svdotext.cxx | 16
1 file changed, 16 insertions(+)
New commits:
commit 07b44f63ee70ed57eabc33a34713c856719b19ad
Author: matteocam
Date: Mon Jul 27 13:49:38 2015 +0200
Add hack to link first two boxes in IsChainable
Change-Id: I2903096b48f06e086e5589d88d9147664a868660
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 5f4f2f5..d9b16b8 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1986,6 +1986,22 @@ void SdrTextObj::onEditOutlinerStatusEvent( EditStatus*
pEditStatus )
bool SdrTextObj::IsChainable() const
{
+// XXX: Hack to have links together
+static bool bHasDoneTheLinking = false;
+
+SdrTextObj *pTxtObj0 = dynamic_cast< SdrTextObj * >( pPage->GetObj( 0 ) );
+
+if (!bHasDoneTheLinking && pPage && pPage->GetObjCount() > 1 && this ==
pTxtObj0)
+{
+SdrTextObj *pTxtObj1 = dynamic_cast< SdrTextObj * >( pPage->GetObj( 1
) );
+const_cast(this)->SetNextLinkInChain(pTxtObj1);
+
+bHasDoneTheLinking = true;
+}
+
+
+
+// XXX
if (!GetName().startsWith("Chainable")) {
//fprintf(stderr, "[CHAINABLE?] %p is _not_ chainable\n", this);
return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: libreofficekit/qa sc/inc sc/source
libreofficekit/qa/data/calc_sheetnames.ods |binary
libreofficekit/qa/unit/tiledrendering.cxx | 24 +---
sc/inc/docuno.hxx |3 +++
sc/source/ui/unoobj/docuno.cxx |8
4 files changed, 32 insertions(+), 3 deletions(-)
New commits:
commit 50fe21c7807afb9650c048e1a82bd97a7fc1d226
Author: Mihai Varga
Date: Wed Jul 22 16:21:08 2015 +0300
tiledrendering: added getPartName method for calc
This method is used to get the sheet's name and to display it
in the tabs (sheet selector)
I've also added an unit test for it and uncommented a similar one
Change-Id: Ia866815c594a873812c71a6c86e303c869e1f093
Reviewed-on: https://gerrit.libreoffice.org/17294
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
diff --git a/libreofficekit/qa/data/calc_sheetnames.ods
b/libreofficekit/qa/data/calc_sheetnames.ods
new file mode 100644
index 000..f6627a0
Binary files /dev/null and b/libreofficekit/qa/data/calc_sheetnames.ods differ
diff --git a/libreofficekit/qa/unit/tiledrendering.cxx
b/libreofficekit/qa/unit/tiledrendering.cxx
index 2499fc5..0ebbc6a 100644
--- a/libreofficekit/qa/unit/tiledrendering.cxx
+++ b/libreofficekit/qa/unit/tiledrendering.cxx
@@ -65,8 +65,9 @@ public:
void testDocumentLoadFail( Office* pOffice );
void testDocumentTypes( Office* pOffice );
-#if 0
void testImpressSlideNames( Office* pOffice );
+void testCalcSheetNames( Office* pOffice );
+#if 0
void testOverlay( Office* pOffice );
#endif
@@ -90,8 +91,9 @@ void TiledRenderingTest::runAllTests()
testDocumentLoadFail( pOffice.get() );
testDocumentTypes( pOffice.get() );
-#if 0
testImpressSlideNames( pOffice.get() );
+testCalcSheetNames( pOffice.get() );
+#if 0
testOverlay( pOffice.get() );
#endif
}
@@ -142,7 +144,6 @@ void TiledRenderingTest::testDocumentTypes( Office* pOffice
)
// TODO: do this for all supported document types
}
-#if 0
void TiledRenderingTest::testImpressSlideNames( Office* pOffice )
{
const string sDocPath = m_sSrcRoot +
"/libreofficekit/qa/data/impress_slidenames.odp";
@@ -164,6 +165,23 @@ void TiledRenderingTest::testImpressSlideNames( Office*
pOffice )
// have a localised version of "Slide 3".
}
+void TiledRenderingTest::testCalcSheetNames( Office* pOffice )
+{
+const string sDocPath = m_sSrcRoot +
"/libreofficekit/qa/data/calc_sheetnames.ods";
+const string sLockFile = m_sSrcRoot
+"/libreofficekit/qa/data/.~lock.calc_sheetnames.ods#";
+
+// FIXME: LOK will fail when trying to open a locked file
+remove( sLockFile.c_str() );
+
+scoped_ptr< Document> pDocument( pOffice->documentLoad( sDocPath.c_str() )
);
+
+CPPUNIT_ASSERT( pDocument->getParts() == 3 );
+CPPUNIT_ASSERT( strcmp( pDocument->getPartName( 0 ), "TestText1" ) == 0 );
+CPPUNIT_ASSERT( strcmp( pDocument->getPartName( 1 ), "TestText2" ) == 0 );
+CPPUNIT_ASSERT( strcmp( pDocument->getPartName( 2 ), "Sheet3" ) == 0 );
+}
+
+#if 0
static void dumpRGBABitmap( const OUString& rPath, const unsigned char*
pBuffer,
const int nWidth, const int nHeight )
{
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index a7e9af5..cd68885 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -388,6 +388,9 @@ public:
/// @see vcl::ITiledRenderable::getParts().
virtual int getParts() SAL_OVERRIDE;
+/// @see vcl::ITiledRenderable::getPartName().
+virtual OUString getPartName(int nPart) SAL_OVERRIDE;
+
/// @see vcl::ITiledRenderable::initializeForTiledRendering().
virtual void initializeForTiledRendering() SAL_OVERRIDE;
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index a1bf527..fd9cb63 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -510,6 +510,14 @@ int ScModelObj::getPart()
return pViewData->GetTabNo();
}
+OUString ScModelObj::getPartName( int nPart )
+{
+OUString sTabName;
+ScViewData* pViewData = ScDocShell::GetViewData();
+pViewData->GetDocument()->GetName(nPart, sTabName);
+return sTabName;
+}
+
Size ScModelObj::getDocumentSize()
{
Size aSize(10, 10); // minimum size
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: comphelper/source
comphelper/source/compare/AnyCompareFactory.cxx |6
comphelper/source/container/IndexedPropertyValuesContainer.cxx| 74 +++---
comphelper/source/container/NamedPropertyValuesContainer.cxx | 80
+++
comphelper/source/container/container.cxx | 22 -
comphelper/source/container/embeddedobjectcontainer.cxx | 14 -
comphelper/source/container/enumerablemap.cxx |8
comphelper/source/container/namecontainer.cxx | 44 +--
comphelper/source/eventattachermgr/eventattachermgr.cxx |6
comphelper/source/misc/accessibletexthelper.cxx |4
comphelper/source/misc/anycompare.cxx | 12 -
comphelper/source/misc/componentmodule.cxx|2
comphelper/source/misc/configuration.cxx |4
comphelper/source/misc/docpasswordhelper.cxx |6
comphelper/source/misc/documentinfo.cxx |4
comphelper/source/misc/documentiologring.hxx | 30 +-
comphelper/source/misc/evtlistenerhlp.cxx |6
comphelper/source/misc/instancelocker.hxx | 59 ++---
comphelper/source/misc/logging.cxx|2
comphelper/source/misc/namedvaluecollection.cxx |2
comphelper/source/misc/officerestartmanager.hxx | 28 +-
comphelper/source/misc/scopeguard.cxx |2
comphelper/source/misc/serviceinfohelper.cxx |8
comphelper/source/misc/stillreadwriteinteraction.cxx |2
comphelper/source/misc/storagehelper.cxx |2
comphelper/source/officeinstdir/officeinstallationdirectories.hxx | 32 +-
comphelper/source/property/ChainablePropertySet.cxx |4
comphelper/source/property/ChainablePropertySetInfo.cxx |6
comphelper/source/property/MasterPropertySet.cxx |4
comphelper/source/property/MasterPropertySetInfo.cxx |6
comphelper/source/property/genericpropertyset.cxx |6
comphelper/source/property/opropertybag.hxx | 108
-
comphelper/source/property/propagg.cxx| 114
+-
comphelper/source/property/propertysetinfo.cxx|6
comphelper/source/property/propstate.cxx | 36 +--
comphelper/source/streaming/memorystream.cxx |4
comphelper/source/streaming/seqinputstreamserv.cxx| 18 -
comphelper/source/streaming/seqoutputstreamserv.cxx | 10
comphelper/source/streaming/seqstream.cxx |2
comphelper/source/streaming/streamsection.cxx |4
comphelper/source/xml/attributelist.cxx | 12 -
40 files changed, 398 insertions(+), 401 deletions(-)
New commits:
commit d74436fb8681f18c1a4097a8b13c5a138cc73e79
Author: Noel Grandin
Date: Mon Jul 27 10:34:56 2015 +0200
com::sun::star->css in comphelper
Change-Id: I4aa0b2d15f2a06cbbbf63a363f403ca6435ffbcd
Reviewed-on: https://gerrit.libreoffice.org/17365
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/comphelper/source/compare/AnyCompareFactory.cxx
b/comphelper/source/compare/AnyCompareFactory.cxx
index 7596207..cbc72b9 100644
--- a/comphelper/source/compare/AnyCompareFactory.cxx
+++ b/comphelper/source/compare/AnyCompareFactory.cxx
@@ -64,7 +64,7 @@ public:
{}
// XAnyCompareFactory
-virtual Reference< XAnyCompare > SAL_CALL createAnyCompareByName ( const
OUString& aPropertyName ) throw(::com::sun::star::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
+virtual Reference< XAnyCompare > SAL_CALL createAnyCompareByName ( const
OUString& aPropertyName ) throw(css::uno::RuntimeException, std::exception)
SAL_OVERRIDE;
// XInitialization
virtual void SAL_CALL initialize( const Sequence< Any >& aArguments )
@@ -81,7 +81,7 @@ public:
static Reference< XInterface > SAL_CALL Create( const Reference<
XComponentContext >& );
};
-sal_Int16 SAL_CALL AnyCompare::compare( const Any& any1, const Any& any2 )
throw(::com::sun::star::uno::RuntimeException, std::exception)
+sal_Int16 SAL_CALL AnyCompare::compare( const Any& any1, const Any& any2 )
throw(css::uno::RuntimeException, std::exception)
{
sal_Int16 aResult = 0;
@@ -96,7 +96,7 @@ sal_Int16 SAL_CALL AnyCompare::compare( const Any& any1,
const Any& any2 ) throw
return aResult;
}
-Reference< XAnyCompare > SAL_CALL AnyCompareFactory::createAnyCompareByName(
const OUString& aPropertyName ) throw(::com::sun::star::uno::RuntimeException,
std::exception)
+Reference< XAnyCompare > SAL_CALL AnyCompareFactory::crea
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - include/svx
include/svx/textchain.hxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 17a29e7572ff251acd5ccbe073dba26e1e2a0137
Author: matteocam
Date: Mon Jul 27 12:46:41 2015 +0200
Make TextChain creatable only by SdrModel
Change-Id: I5385885a9b2c72c6ce359745d74e396083de8489
diff --git a/include/svx/textchain.hxx b/include/svx/textchain.hxx
index b39cc04..631f646 100644
--- a/include/svx/textchain.hxx
+++ b/include/svx/textchain.hxx
@@ -72,6 +72,7 @@
class ImpChainLinkProperties;
class SdrTextObj;
+class SdrModel;
namespace rtl {
class OUString;
@@ -134,7 +135,7 @@ class ImpChainLinkProperties
class TextChain {
public:
-TextChain();
+
~TextChain();
//void AppendLink(SdrTextObj *);
@@ -157,9 +158,11 @@ class TextChain {
protected:
+TextChain();
LinkPropertiesMap maLinkPropertiesMap;
private:
+friend class SdrModel;
//SdrTextObj *impGetNextLink(const SdrTextObj *) const;
//SdrTextObj *impGetPrevLink(const SdrTextObj *) const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Docker container for building LibreOffice
On Mon, Jul 27, 2015 at 11:58 AM, Bjoern Michaelsen < bjoern.michael...@canonical.com> wrote: > > > g++: internal compiler error: Killed (program cc1plus) > > Your compiler is broken and the question is why. Does this work outside the > docker container? If so, you are likely hitting some limits of docker. As > the > failure is happening while compiling boost::spirit stuff, let me venture > some > guesses: > - boost is rather widely deployed -- in general no version of gcc should > choke on it > - boost spirit is a true compiler torture test > => maybe you run into ressource limits set by docker (e.g. process stack > size etc.) > It can be that it runs into resource limits, because this docker container is running inside a VPS with 1.7GB RAM (in Google Cloud), which also runs 2-3 other docker containers. When I did `git clone` I also ran into memory limits, and I had to reduce the number of running containers, so that it could succeed. I am running it with `nice`. Maybe `nice` and `boost` are a bit conflicting to each-other. Is it possible to disable boost? I don't mind if it takes 15h instead of 10h. Anyway I will try to run it in a more powerful machine (again in a docker container), to see whether this makes any difference. I don't like the option of using a dedicated machine just for compiling LO, and the other option is to use a virtual machine (like VirtualBox) which in general is more demanding on resources than docker. > > Note this is a problem with gcc and docker, _NOT_ one with LibreOffice > itself. > I just want to make it work, I am not interested in who is to blame. By the way, maybe it is my fault, maybe I am doing something stupidly wrong in the steps that I am following. Can you please have a look at this script: https://github.com/FreeSoft-AL/libreoffice-compile/blob/master/compile/compile.sh Best, Dashamir ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - include/svx svx/source
include/svx/svdmodel.hxx|1 +
include/svx/svdotext.hxx|2 ++
include/svx/textchain.hxx | 12 ++--
svx/source/svdraw/svdmodel.cxx |6 ++
svx/source/svdraw/svdotext.cxx | 32
svx/source/svdraw/textchain.cxx |2 ++
6 files changed, 49 insertions(+), 6 deletions(-)
New commits:
commit c6987ebc1dc98d0d9807ff3c9b683ade341eb8fe
Author: matteocam
Date: Mon Jul 27 12:00:21 2015 +0200
Implement text chain as doubly linked list in SdrTextObj
Change-Id: Id755e129b9f0dc820eae0c47b21d247ce7c4504c
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 815ab1c..4b5c462 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -338,6 +338,7 @@ public:
SdrOutliner& GetChainingOutliner(const SdrTextObj* pObj=NULL)
const;
TextChain *GetTextChain() const;
+void SetNextLinkInTextChain(SdrTextObj *pPrev, SdrTextObj *pNext);
SdrOutliner& GetHitTestOutliner() const { return
*pHitTestOutliner; }
const SdrTextObj*GetFormattingTextObj() const;
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 6dc4ed4..17a542c 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -230,6 +230,7 @@ protected:
//FIXME(matteocam)
// the successor in a chain
SdrTextObj *mpNextInChain = NULL;
+SdrTextObj *mpPrevInChain = NULL;
// indicating the for its text to be chained to another text box
bool mbToBeChained : 1;
@@ -367,6 +368,7 @@ public:
// Chaining // XXX: how are we using IsToBeChained at the moment?
bool IsToBeChained() const;
SdrTextObj *GetNextLinkInChain() const;
+void SetNextLinkInChain(SdrTextObj *);
SdrTextObj *GetPrevLinkInChain() const;
bool IsChainable() const;
void SetPreventChainable();
diff --git a/include/svx/textchain.hxx b/include/svx/textchain.hxx
index 41f0fc8..b39cc04 100644
--- a/include/svx/textchain.hxx
+++ b/include/svx/textchain.hxx
@@ -137,11 +137,11 @@ class TextChain {
TextChain();
~TextChain();
-void AppendLink(SdrTextObj *);
-bool IsLinkInChain(SdrTextObj *) const;
+//void AppendLink(SdrTextObj *);
+//bool IsLinkInChain(SdrTextObj *) const;
-SdrTextObj *GetNextLink(const SdrTextObj *) const;
-SdrTextObj *GetPrevLink(const SdrTextObj *) const;
+//SdrTextObj *GetNextLink(const SdrTextObj *) const;
+//SdrTextObj *GetPrevLink(const SdrTextObj *) const;
ChainLinkId GetId(const SdrTextObj *) const;
ImpChainLinkProperties *GetLinkProperties(const SdrTextObj *);
@@ -160,8 +160,8 @@ class TextChain {
LinkPropertiesMap maLinkPropertiesMap;
private:
-SdrTextObj *impGetNextLink(const SdrTextObj *) const;
-SdrTextObj *impGetPrevLink(const SdrTextObj *) const;
+//SdrTextObj *impGetNextLink(const SdrTextObj *) const;
+//SdrTextObj *impGetPrevLink(const SdrTextObj *) const;
};
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 2260188..cd9b764 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -2013,6 +2013,12 @@ TextChain *SdrModel::GetTextChain() const
return pTextChain;
}
+void SdrModel::SetNextLinkInTextChain(SdrTextObj *pPrev, SdrTextObj *pNext)
+{
+// Delegate to SdrTextObj
+pPrev->SetNextLinkInChain(pNext);
+}
+
const SdrPage* SdrModel::GetMasterPage(sal_uInt16 nPgNum) const
{
DBG_ASSERT(nPgNum < maMaPag.size(), "SdrModel::GetMasterPage: Access out
of range (!)");
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 83bd15d..5f4f2f5 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -2082,18 +2082,50 @@ void SdrTextObj::SetObjectItemNoBroadcast(const
SfxPoolItem& rItem)
SdrTextObj* SdrTextObj::GetNextLinkInChain() const
{
+/*
if (GetTextChain())
return GetTextChain()->GetNextLink(this);
return NULL;
+*/
+
+return mpNextInChain;
+}
+
+void SdrTextObj::SetNextLinkInChain(SdrTextObj *pNextObj)
+{
+// Basically a doubly linked list implementation
+
+SdrTextObj *pOldNextObj = mpNextInChain;
+
+// Replace next link
+mpNextInChain = pNextObj;
+// Deal with old next link's prev link
+if (pOldNextObj) {
+pOldNextObj->mpPrevInChain = NULL;
+}
+
+// Deal with new next link's prev link
+if (mpNextInChain) {
+if (mpNextInChain->mpPrevInChain)
+mpNextInChain->mpPrevInChain->mpNextInChain = NULL;
+mpNextInChain->mpPrevInChain = this;
+}
+
+// TODO: Introduce check for circular chains
+
}
SdrTextObj* SdrTextObj::GetPrevLinkInChain() const
{
+/*
if (GetTextChain())
return GetTextChain()->GetPrevLink(this);
return NULL;
+*/
+
+return mpPrevInChain;
}
void SdrTextObj::SetPreventChainable()
diff --git a/svx/source/svdraw/textchain.cxx b/svx/source/svdraw/textchain.cxx
Re: Docker container for building LibreOffice
Hi, On Mon, Jul 27, 2015 at 11:27:38AM +0200, Dashamir Hoxha wrote: > The third try, this time using `./g` and the branch 'libreoffice-5-0-0', > failed with the same error message > (see the logs at: > https://drive.google.com/open?id=0B7H_DCc2DjNGMkNvSWtJWjZJcGM) That is to be expected as ./g and the branch shouldnt change anything about an internal compiler error. > g++: internal compiler error: Killed (program cc1plus) Your compiler is broken and the question is why. Does this work outside the docker container? If so, you are likely hitting some limits of docker. As the failure is happening while compiling boost::spirit stuff, let me venture some guesses: - boost is rather widely deployed -- in general no version of gcc should choke on it - boost spirit is a true compiler torture test => maybe you run into ressource limits set by docker (e.g. process stack size etc.) Note this is a problem with gcc and docker, _NOT_ one with LibreOffice itself. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Somebody has broken --with-webdav=serf, please fix
On 07/27/2015 08:55 AM, Noel Grandin wrote: fixed with http://cgit.freedesktop.org/libreoffice/core/commit/?id=16f3ef520cafaef42694f5e63a60167e3c41081c tnx Noel. I recently worked on serf in AOO. Currently there is still a problem building with serf in LibO, apr library, needed by serf, doesn't build due to link issue. I can have a look at this, but I'll need a hand on adding the build system what is needed to build apr, apr-util, serf at their most recent available versions. -- Kind Regards, Giuseppe Castagno aka beppec56 Acca Esse http://www.acca-esse.eu giuseppe.castagno at acca-esse.eu ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: pushing patches despite requests for a test
Hi Kendy, On Mon, Jul 27, 2015 at 11:29:29AM +0200, Jan Holesovsky wrote: > https://wiki.documentfoundation.org/Development/Unit_Tests > > with two things: > > * list of areas that have "No fix without a unit test" rule (Miklos, I > believe you have the same rule in the import/export filters - can you > please specify there)? I don't remember I actually reverted any such change, but yes, if my input is asked during a gerrit review, the first thing I usually check is if there is a matching unit test (when the area is a Writer filter change) and if the test fails without the fix. I've linked the relevant README from the wiki now, I hope that helps. Regards, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/GridLayer.js |7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
New commits:
commit 8d2afb39df09d5f71b8a1b146bf6c76559e1f1ac
Author: Mihai Varga
Date: Mon Jul 27 12:34:11 2015 +0300
loleaflet: update max bounds when the document has a new size
diff --git a/loleaflet/src/layer/tile/GridLayer.js
b/loleaflet/src/layer/tile/GridLayer.js
index 7b4f7b6..b8c5e53 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -369,15 +369,10 @@ L.GridLayer = L.Layer.extend({
var bottomRight = new L.Point(docPixelLimits.x,
docPixelLimits.y);
bottomRight = this._map.unproject(bottomRight);
- if (this._documentInfo === '') {
+ if (this._documentInfo === '' || sizeChanged) {
// we just got the first status so we need to center
the document
this._map.setMaxBounds(new L.LatLngBounds(topLeft,
bottomRight));
}
- else if (sizeChanged) {
- // we just update the bounds without panning into the
new bounds,
- // the scrollbars should handle that
- this._map.options.maxBounds = new
L.LatLngBounds(topLeft, bottomRight);
- }
var scrollPixelLimits = new L.Point(this._docWidthTwips /
this._tileWidthTwips,
this._docHeightTwips / this._tileHeightTwips);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: pushing patches despite requests for a test
Hi Moggi, all, Markus Mohrhard píše v So 25. 07. 2015 v 02:10 +0200: > Additionally I consider the "it's insane to rejecting this on the > grounds of unit tests" a quite direct personal attack. Normally I > would have tried to talk directly with someone who pushes such a patch > but after such a statement which is clearly targeted at me I prefer > that the conversation happens in the open. I see - sorry about that :-( I don't think Tomaž really meant it the way it sounded in the end; probably best if you both can join the ESC this week? > I stand by my decision not to accept any chart patches that have no > unit test (currently pure dialog code is excluded as there is no sane > way to test it). Actually I believe we have more areas that have this rule, just we don't have them listed anywhere; so I've extended the https://wiki.documentfoundation.org/Development/Unit_Tests with two things: * list of areas that have "No fix without a unit test" rule (Miklos, I believe you have the same rule in the import/export filters - can you please specify there)? Everyone - please add more as you see fit + feel responsible for * explanation of how to actually unit-test stuff I've added many types I was able to think of, but if you know more, please do add too. > The correct thing would have been to talk to me. I would have helped > with the XShape tests as I did for anyone else who has needed some > help with tests. The author of the patch apparently asked for help there, but I'm afraid he did not get the "do this and that" kind of info that he needed there :-( I've now extended the wiki page with various test scenarios, hopefully that could be used as a reference in such cases going forward; please extend it as you see fit. The unfortunate part was that a casual contributor got in the way between two experienced developers, and his patch was reverted because of things that he could not really influence. I am concerned that he was not even notified that his patch was reverted - the revert was not done via gerrit which would notify him; but hopefully there was some personal mail I (obviously) don't know about. So - in addition to re-iterating the areas that always need unit tests, I'd also like to re-iterate that no revert should be done without notifying the author. Either way - I hope we have some great outcomes in the end: * the new getXShapeDumpXmlDoc() / assertXPath() way of testing the XShapes results (would be great to move it to a more general place so that it can be used in Impress too) * extended Unit Tests wiki page to be more usable * some rules to re-iterate / re-check in the ESC Let's discuss on Thursday - but I hope all this will improve the strive for quality even further. All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Docker container for building LibreOffice
On Sun, Jul 26, 2015 at 8:28 PM, Bjoern Michaelsen < bjoern.michael...@canonical.com> wrote: > Hi, > > On Sun, Jul 26, 2015 at 08:04:57PM +0200, Dashamir Hoxha wrote: > > It is not mentioned here: https://wiki.ubuntu.com/BuildingLibreOffice > > But you are right because it is mentioned here: > > > https://wiki.documentfoundation.org/Development/BuildingOnLinux#Checking_out_a_release_branch > > However, since I missed it, this is an indicator that documentation lacks > > something (because I am not a novice user). > > For the described build scenario that documentation is fine, as the > --without-help --without-myspell-dicts switches ensure, you dont need any > of > the submodules. If you build help etc. of course, ./g is indeed needed. > > > g++: internal compiler error: Killed (program cc1plus) > > Please submit a full bug report, > > with preprocessed source if appropriate. > > See for instructions. > > That is gcc suiciding itself. Whatever we do to the compiler, it shouldnt > kill > itself. Maybe that gcc 4.8 doesnt handle the boost libs we bundle too well? > Havent seen that before though: Curious. > The third try, this time using `./g` and the branch 'libreoffice-5-0-0', failed with the same error message (see the logs at: https://drive.google.com/open?id=0B7H_DCc2DjNGMkNvSWtJWjZJcGM) -- IWORKFormula.cpp:301:42: required from here ../../../boost/boost/spirit/home/qi/operator/sequence.hpp:40:9: warning: declaration of 'elements' shadows a member of 'this' [-Wshadow] g++: internal compiler error: Killed (program cc1plus) Please submit a full bug report, with preprocessed source if appropriate. See for instructions. make[6]: *** [IWORKFormula.lo] Error 1 make[5]: *** [all] Error 2 make[4]: *** [all-recursive] Error 1 make[3]: *** [all-recursive] Error 1 make[2]: *** [all] Error 2 make[1]: *** [/compile/libreoffice-5-0-0/workdir/ExternalProject/libetonyek/build] Error 1 make: *** [build] Error 2 -- Is this strange? Best, Dashamir ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/GridLayer.js |2 +-
loleaflet/src/layer/tile/TileLayer.js |1 +
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 04be35fa39664202091cd97fea3b614c151e3f3f
Author: Mihai Varga
Date: Mon Jul 27 12:26:08 2015 +0300
loleaflet: prefetch tiles when all empty tiles have loaded
diff --git a/loleaflet/src/layer/tile/GridLayer.js
b/loleaflet/src/layer/tile/GridLayer.js
index 515964f..7b4f7b6 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -751,7 +751,7 @@ L.GridLayer = L.Layer.extend({
},
_preFetchTiles: function () {
- if (this._permission === 'edit') {
+ if (this._permission === 'edit' || this._emptyTilesCount > 0) {
return;
}
var center = this._map.getCenter();
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index f8ddb5e..423a1c2 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -106,6 +106,7 @@ L.TileLayer = L.GridLayer.extend({
this._map.on('zoomstart zoomend', this._onZoom, this);
this._map.on('clearselection', this._clearSelections, this);
this._map.on('copy', this._onCopy, this);
+ this._map.on('alltilesloaded', this._preFetchTiles, this);
this._startMarker.on('drag dragend',
this._onSelectionHandleDrag, this);
this._endMarker.on('drag dragend', this._onSelectionHandleDrag,
this);
this._textArea = this._map._textArea;
___
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' - svx/source
svx/source/svdraw/textchaincursor.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 1f2fe5b38c95e88775d4807d0f06fd78ac56c174
Author: matteocam
Date: Mon Jul 27 10:35:30 2015 +0200
Minor changes
Change-Id: Ibdf1c035a110eb2f95e430fe02d5e01f4ab90247
diff --git a/svx/source/svdraw/textchaincursor.cxx
b/svx/source/svdraw/textchaincursor.cxx
index 9f4e000..6daf59b 100644
--- a/svx/source/svdraw/textchaincursor.cxx
+++ b/svx/source/svdraw/textchaincursor.cxx
@@ -77,6 +77,8 @@ void TextChainCursorManager::impDetectEvent(const KeyEvent&
rKEvt,
sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
ESelection aCurSel = pOLV->GetSelection();
+ESelection aEndSelPrevBox(10, 10);
+
sal_Int32 nLastPara = pOutl->GetParagraphCount()-1;
OUString aLastParaText = pOutl->GetText(pOutl->GetParagraph(nLastPara));
sal_Int32 nLastParaLen = aLastParaText.getLength();
@@ -110,7 +112,7 @@ void TextChainCursorManager::impDetectEvent(const KeyEvent&
rKEvt,
if (nCode == KEY_LEFT && bAtStartOfTextContent && pPrevLink)
{
*pOutCursorEvt = CursorChainingEvent::TO_PREV_LINK;
-*pOutSel = ESelection(10, 10); // Set at end of selection
+*pOutSel = aEndSelPrevBox; // Set at end of selection
*bOutHandled = true; // Nothing more to do than move cursor
return;
}
@@ -119,7 +121,7 @@ void TextChainCursorManager::impDetectEvent(const KeyEvent&
rKEvt,
if (nCode == KEY_BACKSPACE && bAtStartOfTextContent && pPrevLink)
{
*pOutCursorEvt = CursorChainingEvent::TO_PREV_LINK;
-*pOutSel = ESelection(10, 10); // Set at end of selection
+*pOutSel = aEndSelPrevBox; // Set at end of selection
*bOutHandled = false; // We need to delete characters after moving
cursor
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[GSoC15] Chained Text Boxes - Report Week 9
Progress from last week: - Overflow handling is triggered after pasting again (and cursor motion is handled too); - Left arrow, Backspace and Del key inputs are handled; - Refactoring of cursor motion code. Cheers, Matteo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: pushing patches despite requests for a test
Markus Mohrhard wrote: > I'd appreciate if it is discussed in the ESC as I think that no > patch should be pushed if a core developer likes to see a test or > some more discussion. > Quite. And there was a -1 from me as well & an (unanswered, open) question. On the other hand, we do seem to have a collective problem giving useful & timely feedback on gerrit, which possibly was one of the reasons Tomaž thought this patch was sitting there for too long. TDF is aware of that, and trying to address one part of that issue with the dev mentoring role: https://blog.documentfoundation.org/2015/07/15/tdf-freelance-job-opening-201507-01-development-mentoring-lead/ Please consider applying, and/or referring friends & colleagues! Cheers, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - toolkit/source
toolkit/source/awt/vclxfont.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 950c5ad52c489f78d2bf55c5f4232273491a4e9c
Author: Caolán McNamara
Date: Fri Jul 24 13:09:28 2015 +0100
Resolves: tdf#90609 SolarMutex assert on threaded load
Change-Id: I81a784ab506d0d3ae266d7341b8ff7a163dcd8d2
(cherry picked from commit 442b788bc80e20783bdb881aa0cbbc253f1a47b0)
Reviewed-on: https://gerrit.libreoffice.org/17327
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx
index 9aece8b..a4b0c73 100644
--- a/toolkit/source/awt/vclxfont.cxx
+++ b/toolkit/source/awt/vclxfont.cxx
@@ -29,6 +29,7 @@
#include
#include
+#include
// class VCLXFont
@@ -200,6 +201,7 @@ sal_Bool VCLXFont::hasGlyphs( const OUString& aText )
throw(::com::sun::star::uno::RuntimeException, std::exception)
{
::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+SolarMutexGuard aSolarGuard;
OutputDevice* pOutDev = VCLUnoHelper::GetOutputDevice( mxDevice );
if ( pOutDev )
___
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/sidebar/ChartAreaPanel.hxx | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit e5440e415a0dba7f67324162306635e9c7b98078 Author: Noel Grandin Date: Mon Jul 27 09:06:19 2015 +0200 -Werror,-Winconsistent-missing-override Change-Id: I6975b340e42b113650a6c6ba51fdb558af493132 diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.hxx b/chart2/source/controller/sidebar/ChartAreaPanel.hxx index ccd9acc..2d2920e 100644 --- a/chart2/source/controller/sidebar/ChartAreaPanel.hxx +++ b/chart2/source/controller/sidebar/ChartAreaPanel.hxx @@ -64,13 +64,13 @@ public: virtual ~ChartAreaPanel(); -virtual void setFillTransparence(const XFillTransparenceItem& rItem); -virtual void setFillFloatTransparence(const XFillFloatTransparenceItem& rItem); -virtual void setFillStyle(const XFillStyleItem& rItem); -virtual void setFillStyleAndColor(const XFillStyleItem* pStyleItem, const XFillColorItem& rColorItem); -virtual void setFillStyleAndGradient(const XFillStyleItem* pStyleItem, const XFillGradientItem& rGradientItem); -virtual void setFillStyleAndHatch(const XFillStyleItem* pStyleItem, const XFillHatchItem& rHatchItem); -virtual void setFillStyleAndBitmap(const XFillStyleItem* pStyleItem, const XFillBitmapItem& rBitmapItem); +virtual void setFillTransparence(const XFillTransparenceItem& rItem) SAL_OVERRIDE; +virtual void setFillFloatTransparence(const XFillFloatTransparenceItem& rItem) SAL_OVERRIDE; +virtual void setFillStyle(const XFillStyleItem& rItem) SAL_OVERRIDE; +virtual void setFillStyleAndColor(const XFillStyleItem* pStyleItem, const XFillColorItem& rColorItem) SAL_OVERRIDE; +virtual void setFillStyleAndGradient(const XFillStyleItem* pStyleItem, const XFillGradientItem& rGradientItem) SAL_OVERRIDE; +virtual void setFillStyleAndHatch(const XFillStyleItem* pStyleItem, const XFillHatchItem& rHatchItem) SAL_OVERRIDE; +virtual void setFillStyleAndBitmap(const XFillStyleItem* pStyleItem, const XFillBitmapItem& rBitmapItem) SAL_OVERRIDE; virtual void updateData() SAL_OVERRIDE; virtual void modelInvalid() SAL_OVERRIDE; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: pyuno/source stoc/source
pyuno/source/module/pyuno.cxx | 95 +++-
pyuno/source/module/pyuno_adapter.cxx | 27
pyuno/source/module/pyuno_impl.hxx|9 -
pyuno/source/module/pyuno_module.cxx |4
pyuno/source/module/pyuno_runtime.cxx | 22 +--
stoc/source/inspect/introspection.cxx | 193 --
stoc/source/invocation/invocation.cxx | 50 +++-
7 files changed, 288 insertions(+), 112 deletions(-)
New commits:
commit 9c5a217681935d661aad4d5667a775319382d22a
Author: Matthew J. Francis
Date: Thu Jul 23 11:36:38 2015 +0800
Tweak introspection/invocation to be more useful to PyUNO
- Make introspection/invocation handle XNameReplace and
XIndexReplace
- Make introspection handle XUnoTunnel
- Adapt PyUNO to take advantage of the additionally handled
interfaces
Change-Id: Ie848d10fd2c31cad76fcc3a746262a490a2c9ae1
Reviewed-on: https://gerrit.libreoffice.org/17314
Reviewed-by: Matthew Francis
Tested-by: Matthew Francis
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index f068961..ccab344 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -60,6 +60,7 @@ using com::sun::star::uno::XComponentContext;
using com::sun::star::lang::XSingleServiceFactory;
using com::sun::star::lang::XServiceInfo;
using com::sun::star::lang::XTypeProvider;
+using com::sun::star::lang::XUnoTunnel;
using com::sun::star::script::XTypeConverter;
using com::sun::star::script::XInvocation2;
using com::sun::star::beans::XMaterialHolder;
@@ -563,7 +564,7 @@ sal_Int32 lcl_detach_getLength( PyUNO *me )
// returned by getElementNames(), or the user may be surprised.
// For XIndexContainer
-Reference< XIndexAccess > xIndexAccess( me->members->wrappedObject,
UNO_QUERY );
+Reference< XIndexAccess > xIndexAccess( me->members->xInvocation,
UNO_QUERY );
if ( xIndexAccess.is() )
{
return xIndexAccess->getCount();
@@ -571,7 +572,7 @@ sal_Int32 lcl_detach_getLength( PyUNO *me )
// For XNameContainer
// Not terribly efficient - get the count of all the names
-Reference< XNameAccess > xNameAccess( me->members->wrappedObject,
UNO_QUERY );
+Reference< XNameAccess > xNameAccess( me->members->xInvocation, UNO_QUERY
);
if ( xNameAccess.is() )
{
return xNameAccess->getElementNames().getLength();
@@ -782,7 +783,7 @@ PyObject* lcl_getitem_index( PyUNO *me, PyObject *pKey,
Runtime& runtime )
{
PyThreadDetach antiguard;
-Reference< XIndexAccess > xIndexAccess( me->members->wrappedObject,
UNO_QUERY );
+Reference< XIndexAccess > xIndexAccess( me->members->xInvocation,
UNO_QUERY );
if ( xIndexAccess.is() )
{
if (nIndex < 0)
@@ -809,7 +810,7 @@ PyObject* lcl_getitem_slice( PyUNO *me, PyObject *pKey )
{
PyThreadDetach antiguard;
-xIndexAccess.set( me->members->wrappedObject, UNO_QUERY );
+xIndexAccess.set( me->members->xInvocation, UNO_QUERY );
if ( xIndexAccess.is() )
nLen = xIndexAccess->getCount();
}
@@ -850,7 +851,7 @@ PyObject* lcl_getitem_string( PyUNO *me, PyObject *pKey,
Runtime& runtime )
{
PyThreadDetach antiguard;
-Reference< XNameAccess > xNameAccess( me->members->wrappedObject,
UNO_QUERY );
+Reference< XNameAccess > xNameAccess( me->members->xInvocation,
UNO_QUERY );
if ( xNameAccess.is() )
{
aRet = xNameAccess->getByName( sKey );
@@ -914,8 +915,8 @@ PyObject* PyUNO_getitem( PyObject *self, PyObject *pKey )
// If the object is an XIndexAccess and/or XNameAccess, but the
// key passed wasn't suitable, give a TypeError which specifically
// describes this
-Reference< XIndexAccess > xIndexAccess( me->members->wrappedObject,
UNO_QUERY );
-Reference< XNameAccess > xNameAccess( me->members->wrappedObject,
UNO_QUERY );
+Reference< XIndexAccess > xIndexAccess( me->members->xInvocation,
UNO_QUERY );
+Reference< XNameAccess > xNameAccess( me->members->xInvocation,
UNO_QUERY );
if ( xIndexAccess.is() || xNameAccess.is() )
{
PyErr_SetString( PyExc_TypeError, "subscription with invalid type"
);
@@ -985,11 +986,11 @@ int lcl_setitem_index( PyUNO *me, PyObject *pKey,
PyObject *pValue )
{
PyThreadDetach antiguard;
-xIndexContainer.set( me->members->wrappedObject, UNO_QUERY );
+xIndexContainer.set( me->members->xInvocation, UNO_QUERY );
if ( xIndexContainer.is() )
xIndexReplace.set( xIndexContainer, UNO_QUERY );
else
-xIndexReplace.set( me->members->wrappedObject, UNO_QUERY );
+xIndexReplace.set( me->members->xInvocation, UNO_QUERY );
if ( xIndexReplace.is() && nIndex < 0 )
nIndex += xIndexReplace->getCount();
@@ -1032,11 +1033,11 @@ int l
Re: pushing patches despite requests for a test
On Sat, 2015-07-25 at 12:15 +0200, Markus Mohrhard wrote: > would be required for the tests ? [ if it is easy to test > then ... worse style I guess ]. > > Writing a XShape test only requires to create a test document that > shows the changed code. Hopefully everyone fixing a bug has created > such a document as part of the manual testing after fixing the bug. I > made it clear on this list several times that I can and will help > integrate the test but can't generate the files myself. Sounds problematic indeed; surely one for the ESC; I won't be there - but no doubt Kendy can put it on the agenda. ATB, Michael. -- michael.me...@collabora.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[GSoC] Rework the Expert Configuration dialog Week 9
Hello, Last two weeks I was on holiday. In the 9th week I fixed the alternating row colors in SvTreeListBox class. Here is the commit: http://cgit.freedesktop.org/libreoffice/core/commit/?id=af162f1c37e8c909386e72e5d8b4ff6bccfd529b Best regards, Mihály Palenik ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Help Authoring Extension
Le 24/07/2015 23:06, Jan Holesovsky a écrit : Hi Kendy, This sounds like a really nice move forward for help content authoring. > I've spent some time today fixing the HelpAuthoring extension, and > together with the Regina's fix (thank you, Regina!), I think it got to a > usable state :-) > > https://wiki.documentfoundation.org/Documentation/Help > When I go to that page, there is a link to the extension: https://dev-www.libreoffice.org/helpauthoring/ which leads to an error message in Firefox that the page can not be loaded. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loleaflet/spec
loleaflet/spec/tilebench.html |6 ++ loleaflet/spec/tilebench/TileBenchSpec.js | 23 +++ 2 files changed, 5 insertions(+), 24 deletions(-) New commits: commit 746c3cb747545ec68a54b9a7d5ae7391322cbcea Author: Mihai Varga Date: Mon Jul 27 10:34:07 2015 +0300 loleaflet: updated the test to work with the new scrollbar control diff --git a/loleaflet/spec/tilebench.html b/loleaflet/spec/tilebench.html index c4eccc4..4cf5f50 100644 --- a/loleaflet/spec/tilebench.html +++ b/loleaflet/spec/tilebench.html @@ -36,12 +36,10 @@ + + - - - -
[Libreoffice-commits] core.git: 5 commits - ucb/source
ucb/source/ucp/webdav/DAVResourceAccess.hxx|2 -
ucb/source/ucp/webdav/DateTimeHelper.cxx | 26 -
ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx |2 -
ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx |2 -
ucb/source/ucp/webdav/SerfRequestProcessor.cxx | 16 +++
ucb/source/ucp/webdav/SerfSession.cxx | 16 ---
ucb/source/ucp/webdav/SerfSession.hxx |4 +--
ucb/source/ucp/webdav/SerfUri.cxx |2 -
ucb/source/ucp/webdav/webdavcontent.cxx|6 ++---
ucb/source/ucp/webdav/webdavdatasupplier.cxx |2 -
ucb/source/ucp/webdav/webdavprovider.cxx |2 -
ucb/source/ucp/webdav/webdavresponseparser.cxx |7 +++---
ucb/source/ucp/webdav/webdavservices.cxx |3 --
13 files changed, 42 insertions(+), 48 deletions(-)
New commits:
commit 165c939818b18d68216864600097b99e5d8c2266
Author: Noel Grandin
Date: Mon Jul 27 09:21:05 2015 +0200
loplugin:cstylecast
Change-Id: I21fd75b3c891d98f6ad1e4c8af985c2cd21c7db4
diff --git a/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx
b/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx
index 30b1628..8c9ee4a 100644
--- a/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx
@@ -102,7 +102,7 @@ void SerfGetReqProcImpl::processChunkOfResponseData( const
char* data,
}
else if ( xOutputStream.is() )
{
-const uno::Sequence< sal_Int8 > aDataSeq( (sal_Int8 *)data, len );
+const uno::Sequence< sal_Int8 > aDataSeq( reinterpret_cast(data), len );
xOutputStream->writeBytes( aDataSeq );
}
}
diff --git a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
index 1938fcb..89d4e2f 100644
--- a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
@@ -111,7 +111,7 @@ void SerfPostReqProcImpl::processChunkOfResponseData( const
char* data,
}
else if ( xOutputStream.is() )
{
-const uno::Sequence< sal_Int8 > aDataSeq( (sal_Int8 *)data, len );
+const uno::Sequence< sal_Int8 > aDataSeq( reinterpret_cast(data), len );
xOutputStream->writeBytes( aDataSeq );
}
}
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx
b/ucb/source/ucp/webdav/SerfSession.cxx
index c3d890f..9cb54ad 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -462,7 +462,7 @@ apr_status_t SerfSession::verifySerfCertificateChain (
{
uno::Reference< security::XCertificateExtension >element =
extensions[i];
-const rtl::OString aId ( (const sal_Char
*)element->getExtensionId().getArray(), element->getExtensionId().getLength());
+const rtl::OString aId ( reinterpret_cast(const_cast(element->getExtensionId().getArray())),
element->getExtensionId().getLength());
if ( aId.equals( OID_SUBJECT_ALTERNATIVE_NAME ) )
{
uno::Reference< security::XSanExtension > sanExtension (
element, uno::UNO_QUERY );
@@ -1423,9 +1423,7 @@ SerfSession::getDataFromInputStream(
rData.realloc( nPos + nRead );
aBuffer.realloc( nRead );
-memcpy( (void*)( rData.getArray() + nPos ),
-(const void*)aBuffer.getConstArray(),
-nRead );
+memcpy( rData.getArray() + nPos, aBuffer.getConstArray(),
nRead );
nPos += nRead;
aBuffer.realloc( 0 );
diff --git a/ucb/source/ucp/webdav/webdavservices.cxx
b/ucb/source/ucp/webdav/webdavservices.cxx
index 47509dd..6516603 100644
--- a/ucb/source/ucp/webdav/webdavservices.cxx
+++ b/ucb/source/ucp/webdav/webdavservices.cxx
@@ -31,8 +31,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL
ucpdav1_component_getFactory(
void * pRet = 0;
uno::Reference< lang::XMultiServiceFactory > xSMgr(
-reinterpret_cast< lang::XMultiServiceFactory * >(
-pServiceManager ) );
+static_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
uno::Reference< lang::XSingleServiceFactory > xFactory;
commit 58cb14239267d6ab1b0be20bc8aa8f6895e15cb7
Author: Noel Grandin
Date: Mon Jul 27 09:10:46 2015 +0200
loplugin:staticmethods
Change-Id: Iab1eda788690366bfc03ba7c4f085cb474fef1b8
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.hxx
b/ucb/source/ucp/webdav/DAVResourceAccess.hxx
index 52a337b..6e51a42 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.hxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.hxx
@@ -219,7 +219,7 @@ public:
throw ( DAVException );
void
-abort()
+static abort()
throw ( DAVException );
// helper
diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
index 06088d2..cb3ab
[Libreoffice-commits] core.git: 2 commits - sw/qa sw/source writerfilter/source
sw/qa/extras/uiwriter/uiwriter.cxx| 42 ++
sw/source/core/doc/DocumentLinksAdministrationManager.cxx |3 -
writerfilter/source/dmapper/DomainMapper.cxx |8 +-
writerfilter/source/dmapper/DomainMapper.hxx |6 +-
4 files changed, 49 insertions(+), 10 deletions(-)
New commits:
commit 6d77d7db8704327071b3d46508310c8453cf1cd1
Author: Miklos Vajna
Date: Mon Jul 27 09:22:10 2015 +0200
writerfilter: use std::unique_ptr<> in DomainMapper
Change-Id: I569add9792d533bd3bcda5d5cb4023b37bd3f1ed
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 6a4a85a..25c3cd5 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -189,8 +189,6 @@ DomainMapper::~DomainMapper()
(void)rEx;
}
-delete m_pImpl;
-
#ifdef DEBUG_WRITERFILTER
TagLogger::getInstance().endDocument();
#endif
@@ -1092,7 +1090,7 @@ sal_Int32 lcl_getCurrentNumberingProperty(
}
// In rtl-paragraphs the meaning of left/right are to be exchanged
-static bool ExchangeLeftRight(const PropertyMapPtr& rContext,
DomainMapper_Impl* m_pImpl)
+static bool ExchangeLeftRight(const PropertyMapPtr& rContext,
DomainMapper_Impl& rImpl)
{
bool bExchangeLeftRight = false;
boost::optional aPropPara =
rContext->getProperty(PROP_WRITING_MODE);
@@ -1105,7 +1103,7 @@ static bool ExchangeLeftRight(const PropertyMapPtr&
rContext, DomainMapper_Impl*
else
{
// check if there RTL in default style for the paragraph
-StyleSheetEntryPtr pTable =
m_pImpl->GetStyleSheetTable()->FindDefaultParaStyle();
+StyleSheetEntryPtr pTable =
rImpl.GetStyleSheetTable()->FindDefaultParaStyle();
if ( pTable )
{
boost::optional aPropStyle =
pTable->pProperties->getProperty(PROP_WRITING_MODE);
@@ -1170,7 +1168,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext )
switch(nSprmId)
{
case NS_ooxml::LN_CT_PPrBase_jc:
-handleParaJustification(nIntValue, rContext, ExchangeLeftRight(
rContext, m_pImpl ));
+handleParaJustification(nIntValue, rContext, ExchangeLeftRight(
rContext, *m_pImpl ));
break;
case NS_ooxml::LN_CT_PPrBase_keepLines:
rContext->Insert(PROP_PARA_SPLIT, uno::makeAny(nIntValue == 0));
diff --git a/writerfilter/source/dmapper/DomainMapper.hxx
b/writerfilter/source/dmapper/DomainMapper.hxx
index 0e30f22..0cd2878 100644
--- a/writerfilter/source/dmapper/DomainMapper.hxx
+++ b/writerfilter/source/dmapper/DomainMapper.hxx
@@ -26,7 +26,7 @@
#include
#include
-#include
+#include
namespace com{ namespace sun {namespace star{
namespace beans{
@@ -72,7 +72,7 @@ enum SprmType
class DomainMapper : public LoggedProperties, public LoggedTable,
public BinaryObj, public LoggedStream
{
-DomainMapper_Impl *m_pImpl;
+std::unique_ptr m_pImpl;
public:
DomainMapper(const css::uno::Reference&
xContext,
@@ -169,7 +169,7 @@ private:
static css::style::TabAlign getTabAlignFromValue(const sal_Int32
nIntValue);
static sal_Unicode getFillCharFromValue(const sal_Int32 nIntValue);
bool mbIsSplitPara;
-boost::scoped_ptr< GraphicZOrderHelper > zOrderHelper;
+std::unique_ptr< GraphicZOrderHelper > zOrderHelper;
};
} // namespace dmapper
commit e06e2cb18874987d2dafd4faa0a8b71fc0aa6453
Author: Miklos Vajna
Date: Mon Jul 27 09:16:16 2015 +0200
tdf#90575 sw: fix pasting DDE links
Regression from commit 0761f81643a6890457e9ef7d913ab5c88c2593a4 (123792:
complete annotations on text ranges feature, 2013-12-19), the problem
was that the added additional IDocumentMarkAccess::GetType() check in
lcl_FindDdeBookmark(), which means that the function no longer finds
bookmarks with the matching name, only real DDE marks. This is a
problem, as SwTrnsfrDdeLink::WriteData() depends on the fact that
sw::mark::Bookmark inherits from sw::mark::DdeBookmark. As a result, the
fast IDocumentMarkAccess::GetType() (that intentionally doesn't handle
inheritance for performance reasons) can't be used here.
Change-Id: I2b7a07c18b641ac991f3227812a609dedc960e08
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 16bd01f..ebac88b 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -10,6 +10,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -66,6 +67,7 @@
#include "com/sun/star/text/XTextField.hpp"
#include "com/sun/star/text/TextMarkupType.hpp"
#include
+#include
static const char* DATA_DIRECTORY = "/sw/qa/extras/uiwriter/data/";
@@ -133,6 +135,7 @@ public:
void testUnoCursorPointer();
void testTextTableCellNames();
void testShapeAnchorUndo();
+void testDde();
CPPUNIT_TEST_S
