[Libreoffice-commits] core.git: 5 commits - bean/com chart2/qa connectivity/qa desktop/test extensions/qa forms/qa framework/qa javaunohelper/com nlpsolver/src odk/examples qadevOOo/runner qadevOOo/te
bean/com/sun/star/comp/beans/LocalOfficeConnection.java |2 bean/com/sun/star/comp/beans/OOoBean.java | 32 chart2/qa/TestCaseOldAPI.java |2 connectivity/qa/complex/connectivity/dbase/DBaseDateFunctions.java |2 connectivity/qa/complex/connectivity/dbase/DBaseNumericFunctions.java |2 desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java |2 extensions/qa/integration/extensions/ObjectInspector.java |2 forms/qa/integration/forms/FormControlTest.java | 14 +-- forms/qa/integration/forms/ListBox.java |2 framework/qa/complex/XUserInputInterception/EventTest.java |2 javaunohelper/com/sun/star/lib/uno/helper/ComponentBase.java |2 javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java |2 nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/EvolutionarySolverStatusUno.java |2 odk/examples/DevelopersGuide/Charts/CalcHelper.java |4 - odk/examples/DevelopersGuide/Charts/ChartHelper.java |2 odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java |6 - odk/examples/DevelopersGuide/OfficeDev/Clipboard/TextTransferable.java |2 odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java |2 odk/examples/java/NotesAccess/NotesAccess.java |8 +- qadevOOo/runner/convwatch/ConvWatch.java |4 - qadevOOo/runner/convwatch/INIOutputter.java |6 - qadevOOo/runner/convwatch/OfficePrint.java |2 qadevOOo/runner/convwatch/PRNCompare.java |4 - qadevOOo/runner/convwatch/PerformanceContainer.java | 10 +- qadevOOo/runner/convwatch/StatusHelper.java |4 - qadevOOo/runner/convwatch/TimeHelper.java |2 qadevOOo/runner/graphical/JPEGComparator.java |6 - qadevOOo/runner/graphical/JPEGCreator.java |4 - qadevOOo/runner/graphical/OpenOfficePostscriptCreator.java |2 qadevOOo/runner/graphical/PerformanceContainer.java | 14 +-- qadevOOo/runner/graphical/TimeHelper.java |2 qadevOOo/runner/util/BasicMacroTools.java | 11 -- qadevOOo/tests/java/ifc/beans/_XPropertyWithState.java |3 qadevOOo/tests/java/ifc/document/_XActionLockable.java |2 qadevOOo/tests/java/ifc/frame/_XModuleManager.java |6 - qadevOOo/tests/java/ifc/script/_XEventAttacherManager.java |2 qadevOOo/tests/java/ifc/sheet/_XDatabaseRange.java |6 - qadevOOo/tests/java/ifc/sheet/_XViewSplitable.java |2 qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java |2 qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java |3 qadevOOo/tests/java/mod/_xmloff/Draw/XMLStylesImporter.java |2 reportbuilder/java/org/libreoffice/report/pentaho/SOFormulaOpCodeMapper.java |4 - scripting/java/com/sun/star/script/framework/provider/beanshell/PlainSourceView.java |2 scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java |6 - scripting/java/com/sun/star/script/framework/provider/java/StrictResolver.java | 34 +--- sot/
[Libreoffice-commits] core.git: writerfilter/inc writerfilter/Library_writerfilter.mk writerfilter/source
writerfilter/Library_writerfilter.mk |2
writerfilter/inc/resourcemodel/LoggedResources.hxx |8 -
writerfilter/inc/resourcemodel/TableManager.hxx | 50 ++--
writerfilter/inc/resourcemodel/TagLogger.hxx |6 -
writerfilter/inc/resourcemodel/WW8ResourceModel.hxx |6 -
writerfilter/source/dmapper/DomainMapper.cxx |4
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 54 ++---
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 30 +++
writerfilter/source/dmapper/DomainMapper_Impl.cxx| 26 +++---
writerfilter/source/dmapper/FFDataHandler.cxx|4
writerfilter/source/dmapper/GraphicHelpers.cxx |2
writerfilter/source/dmapper/GraphicImport.cxx|2
writerfilter/source/dmapper/LatentStyleHandler.cxx |2
writerfilter/source/dmapper/NumberingManager.cxx |4
writerfilter/source/dmapper/PropertyMap.cxx | 14 +--
writerfilter/source/dmapper/PropertyMap.hxx |2
writerfilter/source/dmapper/PropertyMapHelper.cxx|8 -
writerfilter/source/dmapper/PropertyMapHelper.hxx|4
writerfilter/source/dmapper/SettingsTable.cxx|4
writerfilter/source/dmapper/StyleSheetTable.cxx |4
writerfilter/source/dmapper/TablePositionHandler.cxx |2
writerfilter/source/dmapper/TablePropertiesHandler.cxx |6 -
writerfilter/source/dmapper/TblStylePrHandler.cxx|6 -
writerfilter/source/dmapper/ThemeTable.cxx | 18 ++--
writerfilter/source/filter/ImportFilter.cxx |6 -
writerfilter/source/filter/RtfFilter.cxx |4
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx|8 -
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx|4
writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx | 30 +++
writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx |2
writerfilter/source/ooxml/OOXMLParserState.cxx |2
writerfilter/source/ooxml/OOXMLParserState.hxx |4
writerfilter/source/ooxml/OOXMLPropertySet.hxx |4
writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx | 28 +++---
writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx | 26 +++---
writerfilter/source/ooxml/factoryimpl.py |2
writerfilter/source/ooxml/qnametostr.py |2
writerfilter/source/resourcemodel/LoggedResources.cxx| 62 +++
writerfilter/source/resourcemodel/TagLogger.cxx |6 -
writerfilter/source/resourcemodel/qnametostrcore.cxx |2
writerfilter/source/resourcemodel/util.cxx |2
writerfilter/source/rtftok/rtfsprm.cxx |4
writerfilter/source/rtftok/rtfsprm.hxx |2
writerfilter/source/rtftok/rtfvalue.cxx |2
writerfilter/source/rtftok/rtfvalue.hxx |2
45 files changed, 236 insertions(+), 236 deletions(-)
New commits:
commit 3beae0f05d1c8c976dfcebe02c8830752d708c74
Author: Miklos Vajna
Date: Fri Oct 17 08:10:02 2014 +0200
DEBUG_DOMAINMAPPER -> DEBUG_WRITERFILTER
As it's used in the tokenizers as well.
Change-Id: I7a78cad0414c724f33b50315a45a5ff2c941f4db
diff --git a/writerfilter/Library_writerfilter.mk
b/writerfilter/Library_writerfilter.mk
index f4c2c9e..3ce1dd7 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -29,7 +29,7 @@ $(eval $(call
gb_Library_set_componentfile,writerfilter,writerfilter/util/writer
$(eval $(call gb_Library_add_defs,writerfilter,\
$(if $(filter-out 0,$(gb_DEBUGLEVEL)), \
- -DDEBUG_DOMAINMAPPER \
+ -DDEBUG_WRITERFILTER \
) \
))
diff --git a/writerfilter/inc/resourcemodel/LoggedResources.hxx
b/writerfilter/inc/resourcemodel/LoggedResources.hxx
index a914ec3..ccb3363 100644
--- a/writerfilter/inc/resourcemodel/LoggedResources.hxx
+++ b/writerfilter/inc/resourcemodel/LoggedResources.hxx
@@ -27,7 +27,7 @@
namespace writerfilter
{
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
class LoggedResourcesHelper
{
public:
@@ -86,7 +86,7 @@ protected:
virtual void lcl_substream(Id name,
writerfilter::Reference::Pointer_t ref) = 0;
virtual void lcl_info(const std::string & info) = 0;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
LoggedResourcesHelper mHelper;
#endif
};
@@ -104,7 +104,7 @@ protected:
virtual void lcl_attribute(Id name, Value & val) = 0;
virtual void lcl_sprm(Sprm & sprm) = 0;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
LoggedResourcesHelper mHelper;
#endif
};
@@ -120,7 +120,7 @@ public:
protected:
virtual void lcl_entry(int pos,
writerfilter::Reference::Pointer_t ref) = 0;
-#ifdef DEBUG_DOMAINMAPPER
+#ifdef DEBUG_WRITERFILTER
LibreOffice Gerrit News for core on 2014-10-17
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + Increase assert coverage of OUStringBuffer arguments in https://gerrit.libreoffice.org/12002 from Matthew Francis about module include + java: prevent overflow by using 'long int' arithmetic in multiplication in https://gerrit.libreoffice.org/12001 from Robert Antoni Buj i Gelonch about module bean, connectivity, qadevOOo + java: loss of precission in https://gerrit.libreoffice.org/12000 from Robert Antoni Buj i Gelonch about module qadevOOo, reportbuilder + accessibility: use String.format in https://gerrit.libreoffice.org/11999 from Robert Antoni Buj i Gelonch about module toolkit + xmerge: use Long.reverseBytes (JDK 1.5+) in https://gerrit.libreoffice.org/11998 from Robert Antoni Buj i Gelonch about module xmerge + javaunohelper: remove unused import in https://gerrit.libreoffice.org/11997 from Robert Antoni Buj i Gelonch about module javaunohelper End of freshness + unify perfcheck and subsequentcheck tests in https://gerrit.libreoffice.org/11982 from Laurent Godard about module include, sc, test + fdo#74441 [Accessiblity] Don't expose 0 for empty cells in Calc in https://gerrit.libreoffice.org/11996 from Niklas Johansson about module winaccessibility * Merged changes on master for project core changed in the last 25 hours: + fdo#85050 - MENU: change related menu items shouldnt be separated find it in https://gerrit.libreoffice.org/11984 from Yousuf Philips + Resolves fdo#84961: zh_CN date separator should be "/" rather than "／" in https://gerrit.libreoffice.org/11958 from Julien Nabet + xmerge: use String.format in https://gerrit.libreoffice.org/11995 from Robert Antoni Buj i Gelonch + java: ensure that the stream is cleaned up before the method returns in https://gerrit.libreoffice.org/11991 from Robert Antoni Buj i Gelonch + runner: if .. else if .. else in https://gerrit.libreoffice.org/11990 from Robert Antoni Buj i Gelonch * Abandoned changes on master for project core changed in the last 25 hours: + fdo#77716 : Paragraph spacing is not preserved after RT. in https://gerrit.libreoffice.org/9197 from Tushar Bende * Open changes needing tweaks, but being untouched for more than a week: + fdo#58194 - export DOCX Automatic indent as firstLine indent in https://gerrit.libreoffice.org/10425 from Joren De Cuyper + WIP (do not merge): remove custom impl of bidirectional list in https://gerrit.libreoffice.org/11001 from Chris Laplante + fdo#83003 Startcenter: No method for returnin Recent Docs in https://gerrit.libreoffice.org/11525 from Efe Gürkan Yalaman + fdo#82335. in https://gerrit.libreoffice.org/11555 from Sudarshan Rao + Perftest for loading autocorrect dictionaries (fdo#79761) in https://gerrit.libreoffice.org/11296 from Matúš Kukan + fdo#81956 : Rendering of vml group shape was wrong. in https://gerrit.libreoffice.org/11013 from sushil_shinde + fdo#79018: LO hangs while opening file. in https://gerrit.libreoffice.org/9564 from Yogesh Bharate + fdo#81426 : Data from header and footer is getting lost. in https://gerrit.libreoffice.org/10531 from Rajashri Udhoji + fdo#79541 :Corrupt: Shape enclosed within a floating table in https://gerrit.libreoffice.org/9914 from Rajashri Udhoji + fdo#80996:Fix for DataLabel not preserved for ColumnChart after RT in https://gerrit.libreoffice.org/10169 from Dushyant Bhalgami + fdo#77121 Header / Footer positions not preserved after RT in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/inc writerfilter/source
writerfilter/inc/ooxml/OOXMLDocument.hxx |2 --
writerfilter/inc/resourcemodel/util.hxx |2 --
writerfilter/source/dmapper/PropertyMap.cxx |4 ++--
writerfilter/source/dmapper/PropertyMap.hxx |2 +-
writerfilter/source/dmapper/PropertyMapHelper.cxx|6 --
writerfilter/source/dmapper/PropertyMapHelper.hxx|4 ++--
writerfilter/source/ooxml/factoryimpl.py |4 ++--
writerfilter/source/resourcemodel/qnametostrcore.cxx |4 ++--
writerfilter/source/resourcemodel/util.cxx |4 ++--
9 files changed, 15 insertions(+), 17 deletions(-)
New commits:
commit 585fea6e3e92a312921bb1bff119f731ca0e87cb
Author: Miklos Vajna
Date: Fri Oct 17 07:47:02 2014 +0200
fix incremental build
Change-Id: I28dd6c72c665abd95be6d14dc629296850e03e1d
diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx
b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index ab932c6..8032f60 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -273,9 +273,7 @@ public:
void ooxmlidsToXML(::std::iostream & out);
-#ifdef DEBUG_DOMAINMAPPER
std::string fastTokenToId(sal_uInt32 nToken);
-#endif
}}
#endif // INCLUDED_WRITERFILTER_INC_OOXML_OOXMLDOCUMENT_HXX
diff --git a/writerfilter/inc/resourcemodel/util.hxx
b/writerfilter/inc/resourcemodel/util.hxx
index b176cd82..18e424f 100644
--- a/writerfilter/inc/resourcemodel/util.hxx
+++ b/writerfilter/inc/resourcemodel/util.hxx
@@ -26,9 +26,7 @@
namespace writerfilter
{
-#ifdef DEBUG_DOMAINMAPPER
std::string toString(css::uno::Reference< css::text::XTextRange >
textRange);
-#endif
}
#endif // INCLUDED_WRITERFILTER_INC_RESOURCEMODEL_UTIL_HXX
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx
b/writerfilter/source/dmapper/PropertyMap.cxx
index 8f3594c..2d9c77d 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -368,9 +368,9 @@ void PropertyMap::insertTableProperties( const PropertyMap*
)
#endif
}
-#ifdef DEBUG_DOMAINMAPPER
void PropertyMap::printProperties()
{
+#ifdef DEBUG_DOMAINMAPPER
dmapper_logger->startElement("properties");
MapIterator aMapIter = m_vMap.begin();
@@ -399,8 +399,8 @@ void PropertyMap::printProperties()
}
dmapper_logger->endElement();
-}
#endif
+}
SectionPropertyMap::SectionPropertyMap(bool bIsFirstSection) :
m_bIsFirstSection( bIsFirstSection )
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx
b/writerfilter/source/dmapper/PropertyMap.hxx
index c496f97..2369cf3 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -170,8 +170,8 @@ public:
const std::vector< RedlineParamsPtr >& Redlines() const { return
m_aRedlines; }
std::vector< RedlineParamsPtr >& Redlines() { return m_aRedlines; }
-#ifdef DEBUG_DOMAINMAPPER
void printProperties();
+#ifdef DEBUG_DOMAINMAPPER
virtual void dumpXml( const TagLogger::Pointer_t pLogger ) const;
#endif
static com::sun::star::table::ShadowFormat
getShadowFromBorder(com::sun::star::table::BorderLine2 aBorder);
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.cxx
b/writerfilter/source/dmapper/PropertyMapHelper.cxx
index b35145b..0c22146 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.cxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.cxx
@@ -21,7 +21,6 @@
#include
#include "PropertyMapHelper.hxx"
-#ifdef DEBUG_DOMAINMAPPER
namespace writerfilter
{
namespace dmapper
@@ -31,6 +30,7 @@ using namespace ::com::sun::star;
void lcl_DumpTableColumnSeparators(const TagLogger::Pointer_t pLogger, const
uno::Any & rTableColumnSeparators)
{
+#ifdef DEBUG_DOMAINMAPPER
uno::Sequence aSeq;
rTableColumnSeparators >>= aSeq;
@@ -48,8 +48,10 @@ void lcl_DumpTableColumnSeparators(const
TagLogger::Pointer_t pLogger, const uno
}
pLogger->endElement();
+#endif // DEBUG_DOMAINMAPPER
}
+#ifdef DEBUG_DOMAINMAPPER
void lcl_DumpPropertyValues(const TagLogger::Pointer_t pLogger,
beans::PropertyValues & rValues)
{
pLogger->startElement("propertyValues");
@@ -109,9 +111,9 @@ void lcl_DumpPropertyValueSeqSeq(const TagLogger::Pointer_t
pLogger, PropertyVal
pLogger->endElement();
}
+#endif // DEBUG_DOMAINMAPPER
}
}
-#endif // DEBUG_DOMAINMAPPER
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.hxx
b/writerfilter/source/dmapper/PropertyMapHelper.hxx
index a92bc10..fe22298 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.hxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_PROPERTYMAPHELPER_HXX
#define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_PROPERTYMAPHELPER_HXX
-#ifdef DEBUG_DOMAINMAPPER
#include "PropertyMap.hxx"
#include
@@ -31,6 +30,7 @@ namespace dmapper
void lcl_DumpTableCol
[Bug 60664] Adapt thesaurus dialog to HIG
https://bugs.freedesktop.org/show_bug.cgi?id=60664 Adolfo Jayme changed: What|Removed |Added Status|NEW |ASSIGNED Assignee|libreoffice-b...@lists.free |f...@libreoffice.org |desktop.org | -- 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: 2 commits - sc/qa sc/source
sc/qa/unit/ucalc_formula.cxx | 21 ++
sc/source/core/tool/interpr1.cxx | 55 +++
2 files changed, 54 insertions(+), 22 deletions(-)
New commits:
commit 51b215902d8e1f415b5fef49fc50c7167f0c7787
Author: Kohei Yoshida
Date: Thu Oct 16 20:49:42 2014 -0400
fdo#73080: Fix the single cell reference cases as well.
Change-Id: Ib9a8ae04733c5bcb982ef4d337112eb8249d0ee0
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 44c3ea6..d5dcb8e 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -4510,12 +4510,39 @@ void ScInterpreter::ScMatch()
}
}
+namespace {
+
+bool isCellContentEmpty( const ScRefCellValue& rCell )
+{
+switch (rCell.meType)
+{
+case CELLTYPE_VALUE:
+case CELLTYPE_STRING:
+case CELLTYPE_EDIT:
+return false;
+case CELLTYPE_FORMULA:
+{
+sc::FormulaResultValue aRes = rCell.mpFormula->GetResult();
+if (aRes.meType != sc::FormulaResultValue::String)
+return false;
+if (!aRes.maString.isEmpty())
+return false;
+}
+break;
+default:
+;
+}
+
+return true;
+}
+
+}
+
void ScInterpreter::ScCountEmptyCells()
{
if ( MustHaveParamCount( GetByte(), 1 ) )
{
sal_uLong nMaxCount = 0, nCount = 0;
-CellType eCellType;
switch (GetStackType())
{
case svSingleRef :
@@ -4523,8 +4550,9 @@ void ScInterpreter::ScCountEmptyCells()
nMaxCount = 1;
ScAddress aAdr;
PopSingleRef( aAdr );
-eCellType = pDok->GetCellType(aAdr);
-if (eCellType != CELLTYPE_NONE)
+ScRefCellValue aCell;
+aCell.assign(*pDok, aAdr);
+if (!isCellContentEmpty(aCell))
nCount = 1;
}
break;
@@ -4546,25 +4574,8 @@ void ScInterpreter::ScCountEmptyCells()
for (bool bHas = aIter.first(); bHas; bHas = aIter.next())
{
const ScRefCellValue& rCell = aIter.getRefCellValue();
-switch (rCell.meType)
-{
-case CELLTYPE_VALUE:
-case CELLTYPE_STRING:
-case CELLTYPE_EDIT:
-++nCount;
-break;
-case CELLTYPE_FORMULA:
-{
-sc::FormulaResultValue aRes =
rCell.mpFormula->GetResult();
-if (aRes.meType !=
sc::FormulaResultValue::String)
-++nCount;
-else if (!aRes.maString.isEmpty())
-++nCount;
-}
-break;
-default:
-;
-}
+if (!isCellContentEmpty(rCell))
+++nCount;
}
}
}
commit 9d8f1795836f58cb275eae19818eb25ee80901a0
Author: Kohei Yoshida
Date: Thu Oct 16 20:49:07 2014 -0400
fdo#73080: Write another test case for single cell reference cases.
Change-Id: I8dff6850c7088b483d1ad669867da6cef454d9a2
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 5c5d6b0..afa1261 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -2538,6 +2538,27 @@ void Test::testFuncCOUNTBLANK()
CPPUNIT_ASSERT_EQUAL(0.0, m_pDoc->GetValue(ScAddress(2,5,0)));
CPPUNIT_ASSERT_EQUAL(5.0, m_pDoc->GetValue(ScAddress(3,5,0)));
+// Test single cell reference cases.
+
+clearSheet(m_pDoc, 0);
+
+const char* aData2[][2] = {
+{ "1", "=COUNTBLANK(A1)" },
+{ "A", "=COUNTBLANK(A2)" },
+{ 0, "=COUNTBLANK(A3)" },
+{ "=\"\"", "=COUNTBLANK(A4)" },
+{ "=A4" , "=COUNTBLANK(A5)" },
+};
+
+aRange = insertRangeData(m_pDoc, aPos, aData2, SAL_N_ELEMENTS(aData2));
+CPPUNIT_ASSERT(aRange.aStart == aPos);
+
+CPPUNIT_ASSERT_EQUAL(0.0, m_pDoc->GetValue(ScAddress(1,0,0)));
+CPPUNIT_ASSERT_EQUAL(0.0, m_pDoc->GetValue(ScAddress(1,1,0)));
+CPPUNIT_ASSERT_EQUAL(1.0, m_pDoc->GetValue(ScAddress(1,2,0)));
+CPPUNIT_ASSERT_EQUAL(1.0, m_pDoc->GetValue(ScAddress(1,3,0)));
+CPPUNIT_ASSERT_EQUAL(1.0, m_pDoc->GetValue(ScAddress(1,4,0)));
+
m_pDoc->DeleteTab(0);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ANNOUNCE] Tag libreoffice-4.2.7.2 (on branch libreoffice-4-2-7) created
Hi all, The tag libreoffice-4.2.7.2 (AKA 4.2.7 RC2) has been created on the libreoffice-4-2-7 branch. The branch will be used for fine tuning of the 4.2.7 release. (It is the last scheduled RC) The following rules apply to the branch: + preferably just translation or blocker fixes + only cherry-picking from libreoffice-4-2 branch + 2 additional reviews needed; 2nd reviewer pushes + no regular merges back to anything LibreOffice 4.2.7 is the last scheduled release for the LibreOffice 4.2 codeline. See also http://wiki.documentfoundation.org/ReleasePlan/4.2#4.2.7_release http://wiki.documentfoundation.org/Development/Branches http://wiki.documentfoundation.org/Release_Criteria To checkout the tag, use ./g fetch --tags ./g checkout -b tag-libreoffice-4.2.7.2 libreoffice-4.2.7.2 Linux distro packages might find source tarballs at http://dev-builds.libreoffice.org/pre-releases/src/ They will soon be available from the official page together with the builds. Attached is the list of changes against 4.2.7 RC1 Happy hacking, Christian + fix ODF import of style:footer-first (fdo#79269) [Michael Stahl] fdo#79269 fix ODF import of style:footer-first [Michael Stahl] + core + avoid use of ref. to possibly deleted object [David Tardon] + bump nss from 3.15.3 to 3.16.5 [Caolán McNamara] + bump product version to 4.2.7.1.0+ [Christian Lohmaier] + bump product version to 4.2.7.2 [Christian Lohmaier] + disable sdremote by default, and improve flow control. [Michael Meeks] + fix ODF import of style:footer-first (fdo#79269) [Michael Stahl] + shared_ptr is too smart to accept NULL [Christian Lohmaier] + update credits [Christian Lohmaier] + updated core [Christian Lohmaier] + version 4.2.7.2, tag libreoffice-4.2.7.2 [Christian Lohmaier] + dictionaries + version 4.2.7.2, tag libreoffice-4.2.7.2 [Christian Lohmaier] + help + version 4.2.7.2, tag libreoffice-4.2.7.2 [Christian Lohmaier] + translations + update translations for 4.2.7 rc2 [Christian Lohmaier] ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/uiconfig sw/uiconfig
sc/uiconfig/scalc/menubar/menubar.xml|7 --- sw/uiconfig/sglobal/menubar/menubar.xml |7 --- sw/uiconfig/swform/menubar/menubar.xml |7 --- sw/uiconfig/swreport/menubar/menubar.xml |7 --- sw/uiconfig/swriter/menubar/menubar.xml |7 --- sw/uiconfig/swxform/menubar/menubar.xml |7 --- 6 files changed, 24 insertions(+), 18 deletions(-) New commits: commit 15c944513b935d6a38be6487f14687627815696d Author: Yousuf Philips Date: Wed Oct 15 13:57:11 2014 +0400 fdo#85050 - MENU: change related menu items shouldnt be separated find items Change-Id: I5921cbeadbfb6fdfd6e4a89e39a616d25954bc51 Reviewed-on: https://gerrit.libreoffice.org/11984 Reviewed-by: Cor Nouws Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index 728f702..0816450 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -81,6 +81,10 @@ + + + + @@ -94,9 +98,6 @@ - - - diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml index ee9c264..f5357b7 100644 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/menubar/menubar.xml @@ -92,6 +92,10 @@ + + + + @@ -107,9 +111,6 @@ - - - diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml index 1483922..3721bb4 100644 --- a/sw/uiconfig/swform/menubar/menubar.xml +++ b/sw/uiconfig/swform/menubar/menubar.xml @@ -91,6 +91,10 @@ + + + + @@ -106,9 +110,6 @@ - - - diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml index 82a565c..e74cef4 100644 --- a/sw/uiconfig/swreport/menubar/menubar.xml +++ b/sw/uiconfig/swreport/menubar/menubar.xml @@ -92,6 +92,10 @@ + + + + @@ -107,9 +111,6 @@ - - - diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index 0cba0c5..a05a8a8 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -96,6 +96,10 @@ + + + + @@ -111,9 +115,6 @@ - - - diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml index 5644d36..33eeea7 100644 --- a/sw/uiconfig/swxform/menubar/menubar.xml +++ b/sw/uiconfig/swxform/menubar/menubar.xml @@ -93,6 +93,10 @@ + + + + @@ -108,9 +112,6 @@ - - - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Paul Barberi license statement
Hi all, All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Best regards, Paul Barberi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/Library_writerfilter.mk writerfilter/README writerfilter/source
writerfilter/Library_writerfilter.mk |2 -
writerfilter/README |3 ++
writerfilter/source/dmapper/DomainMapperTableHandler.cxx |3 +-
writerfilter/source/filter/ImportFilter.cxx |3 +-
writerfilter/source/filter/RtfFilter.cxx |3 +-
writerfilter/source/resourcemodel/TagLogger.cxx | 16 +++
6 files changed, 26 insertions(+), 4 deletions(-)
New commits:
commit 9401b1be3480037f2dfcb7b6daf069137ccd7c42
Author: Miklos Vajna
Date: Thu Oct 16 21:12:34 2014 +0200
writerfilter: make dmapper logging a runtime decision, not a buildtime one
It's still only enabled in debug builds, but it now requires an
environment variable, not rebuilding with dbglevel=2.
Change-Id: I970c7bfe0b3f547429ef37f37406a095a60c34ff
diff --git a/writerfilter/Library_writerfilter.mk
b/writerfilter/Library_writerfilter.mk
index 4a7e3fb..f4c2c9e 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -28,7 +28,7 @@ $(eval $(call gb_Library_use_sdk_api,writerfilter))
$(eval $(call
gb_Library_set_componentfile,writerfilter,writerfilter/util/writerfilter))
$(eval $(call gb_Library_add_defs,writerfilter,\
- $(if $(filter-out 0 1,$(gb_DEBUGLEVEL)), \
+ $(if $(filter-out 0,$(gb_DEBUGLEVEL)), \
-DDEBUG_DOMAINMAPPER \
) \
))
diff --git a/writerfilter/README b/writerfilter/README
index 0e8d1dc..0d492e4 100644
--- a/writerfilter/README
+++ b/writerfilter/README
@@ -11,6 +11,9 @@ Import filter for docx, doc and rtf.
== Source contents ==
* dmapper: the domain mapper, hiding UNO from the tokenizers, used by DOCX
and RTF import
+ * The incoming traffic of dmapper can be dumped into an XML file in /tmp in
+ debug builds, start soffice with the
+ `SW_DEBUG_WRITERFILTER=1` environment variable if you want that.
* filter: the UNO filter service implementations, invoked by UNO and calling
the dmapper + one of the tokenizers
* ooxml: the docx tokenizer
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 3b99048..0aa4be1 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -415,7 +415,8 @@ TableStyleSheetEntry *
DomainMapperTableHandler::endTableGetTableStyle(TableInfo
#ifdef DEBUG_DOMAINMAPPER
dmapper_logger->startElement("mergedProps");
-pMergedProperties->dumpXml( dmapper_logger );
+if (pMergedProperties)
+pMergedProperties->dumpXml( dmapper_logger );
dmapper_logger->endElement();
#endif
diff --git a/writerfilter/source/filter/ImportFilter.cxx
b/writerfilter/source/filter/ImportFilter.cxx
index 3740b3b..1eb2670 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -83,7 +83,8 @@ sal_Bool WriterFilter::filter( const uno::Sequence<
beans::PropertyValue >& aDes
writerfilter::TagLogger::Pointer_t dmapper_logger
(writerfilter::TagLogger::getInstance("DOMAINMAPPER"));
-dmapper_logger->setFileName(sURLc);
+if (getenv("SW_DEBUG_WRITERFILTER"))
+dmapper_logger->setFileName(sURLc);
dmapper_logger->startDocument();
#endif
diff --git a/writerfilter/source/filter/RtfFilter.cxx
b/writerfilter/source/filter/RtfFilter.cxx
index 3a7e6c4..01a5895 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -78,7 +78,8 @@ sal_Bool RtfFilter::filter(const uno::Sequence<
beans::PropertyValue >& aDescrip
writerfilter::TagLogger::Pointer_t dmapper_logger
(writerfilter::TagLogger::getInstance("DOMAINMAPPER"));
-dmapper_logger->setFileName(sURLc);
+if (getenv("SW_DEBUG_WRITERFILTER"))
+dmapper_logger->setFileName(sURLc);
dmapper_logger->startDocument();
#endif
uno::Reference< io::XInputStream > xInputStream;
diff --git a/writerfilter/source/resourcemodel/TagLogger.cxx
b/writerfilter/source/resourcemodel/TagLogger.cxx
index 58a904e..d65566d 100644
--- a/writerfilter/source/resourcemodel/TagLogger.cxx
+++ b/writerfilter/source/resourcemodel/TagLogger.cxx
@@ -74,12 +74,16 @@ namespace writerfilter
void TagLogger::startDocument()
{
+if (!pWriter)
+return;
xmlTextWriterStartDocument( pWriter, NULL, NULL, NULL );
xmlTextWriterStartElement( pWriter, BAD_CAST( "root" ) );
}
void TagLogger::endDocument()
{
+if (!pWriter)
+return;
xmlTextWriterEndDocument( pWriter );
xmlFreeTextWriter( pWriter );
pWriter = NULL;
@@ -149,6 +153,8 @@ namespace writerfilter
void TagLogger::startElement(const std::string & name)
{
+if (!pWr
[Libreoffice-commits] core.git: external/libmwaw
external/libmwaw/ExternalPackage_libmwaw.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8bc1ee9b4cd46d645e8aca0f9ea6844c702a64c0 Author: Miklos Vajna Date: Thu Oct 16 21:10:25 2014 +0200 file libmwaw-0.3.so.3.0.1 does not exist in the tarball Change-Id: I6b1592af199fcd79ac16827332014ea703a48a1e diff --git a/external/libmwaw/ExternalPackage_libmwaw.mk b/external/libmwaw/ExternalPackage_libmwaw.mk index 9f8ad1e..3b3bcb6 100644 --- a/external/libmwaw/ExternalPackage_libmwaw.mk +++ b/external/libmwaw/ExternalPackage_libmwaw.mk @@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3 else ifeq ($(OS),WNT) $(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.dll,src/lib/.libs/libmwaw-0.3.dll)) else ifeq ($(filter IOS ANDROID,$(OS)),) -$(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.so.3,src/lib/.libs/libmwaw-0.3.so.3.0.1)) +$(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.so.3,src/lib/.libs/libmwaw-0.3.so.3.0.3)) endif # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: About fdo#56963 (bt + Valgrind)
On 16/10/2014 10:33, Caolán McNamara wrote: On Wed, 2014-10-15 at 14:36 -0700, julien2412 wrote: ... Perhaps all of these are already known (I think have already read about "layout management problem"?), I wondered if someone might be interested. In this case, I can provide the file (the reporter is ok, he just wants the file not to be too present in Internet), Is this bibisectable ? I must recognize I don't know at all, I never bibisected a bug, just retrieved bt or Valgrind traces sometimes. I just hoped that traces would be sufficient to tackle at least some of the related bugs. Julien ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - basctl/source basic/source chart2/source configure.ac cui/source dbaccess/source download.lst drawinglayer/source editeng/source external/libmwaw filter/Con
basctl/source/dlged/dlged.cxx |2 basctl/source/dlged/dlgedobj.cxx |4 basctl/source/inc/dlgedobj.hxx |4 basic/source/runtime/methods1.cxx |4 chart2/source/controller/main/ChartController_Window.cxx |4 chart2/source/view/main/DrawModelWrapper.cxx |2 configure.ac |2 cui/source/tabpages/grfpage.cxx|4 cui/source/tabpages/transfrm.cxx | 10 dbaccess/source/ui/inc/JoinController.hxx |2 download.lst |4 drawinglayer/source/primitive2d/metafileprimitive2d.cxx|2 editeng/source/editeng/impedit3.cxx|2 external/libmwaw/Library_mwaw.mk |2 external/libmwaw/UnpackedTarball_libmwaw.mk|8 filter/Configuration_filter.mk |6 filter/source/config/fragments/filters/MacDrawPro_Draw.xcu | 30 ++ filter/source/config/fragments/filters/MacDraw_Draw.xcu| 30 ++ filter/source/config/fragments/filters/Mac_RagTime.xcu | 29 ++ filter/source/config/fragments/types/draw_MacDraw.xcu | 29 ++ filter/source/config/fragments/types/draw_MacDrawPro.xcu | 29 ++ filter/source/config/fragments/types/writer_Mac_RagTime.xcu| 29 ++ filter/source/graphicfilter/eos2met/eos2met.cxx|4 filter/source/graphicfilter/epict/epict.cxx|6 filter/source/graphicfilter/ios2met/ios2met.cxx|4 filter/source/graphicfilter/ipict/ipict.cxx|6 filter/source/graphicfilter/ipsd/ipsd.cxx |4 filter/source/graphicfilter/itiff/itiff.cxx|2 filter/source/msfilter/eschesdo.cxx|2 filter/source/msfilter/msdffimp.cxx| 18 - filter/source/msfilter/svdfppt.cxx |2 filter/source/svg/svgwriter.cxx|8 forms/source/richtext/richtextimplcontrol.cxx |2 include/oox/export/chartexport.hxx |2 include/oox/export/shapes.hxx |2 include/sfx2/ipclient.hxx |8 include/sfx2/objsh.hxx |4 include/sfx2/viewfrm.hxx |2 include/sfx2/viewsh.hxx|2 include/svtools/imap.hxx |2 include/svtools/imapcirc.hxx |2 include/svtools/imappoly.hxx |2 include/svtools/imaprect.hxx |2 include/svtools/ruler.hxx |6 include/svx/obj3d.hxx |2 include/svx/scene3d.hxx|4 include/svx/sdr/properties/defaultproperties.hxx |2 include/svx/sdr/properties/properties.hxx |2 include/svx/svddrag.hxx|4 include/svx/svddrgmt.hxx |4 include/svx/svdedtv.hxx|6 include/svx/svdetc.hxx |6 include/svx/svdglev.hxx|2 include/svx/svdmodel.hxx | 22 - include/svx/svdoashp.hxx |4 include/svx/svdobj.hxx |4 include/svx/svdocapt.hxx |2 include/svx/svdocirc.hxx |2 include/svx/svdoedge.hxx |2 include/svx/svdograf.hxx |2 include/svx/svdogrp.hxx|4 include/svx/svdomeas.hxx |2 include/svx/svdoole2.hxx |4 include/svx/svdopath.hxx |2 include/svx/svdorect.hxx |2 include/svx/svdotable.hxx |2 include/svx/svdotext.hxx |6 include/svx/svdouno.hxx|2 include/svx/svdovirt.hxx |4 include/svx/svdp
enhancing perfcheck - Proof of concept & proposals
Hi all
First, i must warn that i have little experience in c++ development; So
my wording may be strange and inacurate. Feel free to request for
rewording if something is not clear
manys thanks to all the devs who helped me on this (matus, mst)
i'll present in the comming line the approach i've tested regarding make
perfcheck
The initial work has been pointing by Matus
The idea is to use valgrind while running tests
my starting point has been https://gerrit.libreoffice.org/#/c/11296
My goal was to enhance this with in mind that make perfcheck is only
launched on demand as it is a costly process
Here are the adressed points; I present them in the order of which i
developped them, may be inapropriate
1- percheck tests not restricted at class level
2- exploiting results
3- re use of existing tests for percheck
I'll point the gerrit commits in each of these points
They are first shoots and may need some (a lot of) polish
at least it builds and do what expected
Any comments welcome
my code is far from being perfect
let me know if it needs something to be done before being pushed to master
Thanks again to all of the dev that helped me
Laurent
==
1- percheck tests not restricted at class level
---
The problem being at classe level is that some tests may be very long
and hide problems on other performed tests. Time can be doubled without
noticing it
The goal here is to be able to DUMP callgrind each time we want it
Instead of using
CALLGRIND_DUMP_STATS
one can use
CALLGRIND_DUMP_STATS_AT(message);
--> this will create a callgrind.out file at each call
--> then we can separate the different part of a test
--> note the (message) that will be used in part 2
a first approach of a "big" test, with 3 dumps is here
https://gerrit.libreoffice.org/#/c/11949/
2- exploiting results
-
The dumps are stored in workdir/CppunitTest/
Each dump file starting with callgrind.out contains
- the message of step 1
- the total of cycles
here is a python script that walk through workdir/CppunitTest/ and
retreive these 2 information for each dump file
It also retreives the currently last commit
it append these results in a csv file
TODO: use this csv file to monitor or detect problems
https://gerrit.libreoffice.org/#/c/11962/
output example
$ cat perfcheckResult.csv
lastCommit test name filedatetimedump commentcount
741c661ece19ccb4e94bb20ceb75d89a29b1b2a8sc_perf_searchobj
10/14/2014 09:54:52 testSheetFindAll - Search value 11403647297
741c661ece19ccb4e94bb20ceb75d89a29b1b2a8sc_perf_searchobj
10/14/2014 09:54:53 testSheetFindAll - Search style 767867
741c661ece19ccb4e94bb20ceb75d89a29b1b2a8sc_perf_searchobj
10/14/2014 09:52:06 Load Big File 17078422628
3- re use of existing tests for percheck
i tried this approach because monitoring perfs would lead to write
duplicate tests
the naive question was : why not reuse existing tests that would start
callgrind instrumentation only if we are in a perfcheck context ?
it would then be transparent for subsequentcheck and enhance perftest
coverage
as we saw at step 1, one can start callgrind instrumentation for only
few chosen lines
the basic idea, in an existing test, would be to write something like
startPerfInstrumentation();
uno::Reference< container::XIndexAccess > xIndex =
xSearchable->findAll(xSearchDescr);
endPerfInstrumentation("testSheetFindAll - Search value");
where startPerfInstrumentation and endPerfInstrumentation do nothing if
not in a perfcheck context
see whole code example at
https://gerrit.libreoffice.org/#/c/11982/
this context is set using$(eval $(call
gb_CppunitTest_add_defs,sc_perf_searchobj,\
-DIS_PERFCHECK \
))
see then
https://gerrit.libreoffice.org/#/c/11982/2/sc/qa/perf/perf_instrumentation.cxx,cm
the idea is to have 2 make files
- one for subsequent test
- one for perfcheck (that sets IS_PERFCHECK)
that point to the same source test but lets perf_instrumentation.cxx be
re-build each time
globally seems to work with some tricky parts
(thanks mst for your help)
https://gerrit.libreoffice.org/#/c/11982/2/sc/qa/perf/scperfsearch.cxx,cm
i don't know if it can lead to some problems
ok, i stop here, ask me if something is not clear
--
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/uiconfig vcl/source
svx/uiconfig/ui/colorwindow.ui |6 --
svx/uiconfig/ui/floatingundoredo.ui |1 -
vcl/source/window/builder.cxx | 16 +++-
3 files changed, 19 insertions(+), 4 deletions(-)
New commits:
commit 39428437d5ed9893007c915175f54c21dd03f95f
Author: Caolán McNamara
Date: Thu Oct 16 15:26:20 2014 +0100
Related: fdo#84676 try to give floating windows their original stylebits
as they were before becoming .ui components to see if that makes
a difference here
Change-Id: I1699e19f14b18579f6b8c973d64f069b206b7cb8
diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui
index 0cbeaad..66ac451 100644
--- a/svx/uiconfig/ui/colorwindow.ui
+++ b/svx/uiconfig/ui/colorwindow.ui
@@ -1,9 +1,10 @@
-
+
-
+
+True
False
True
True
@@ -12,6 +13,7 @@
True
popup-menu
True
+False
False
diff --git a/svx/uiconfig/ui/floatingundoredo.ui
b/svx/uiconfig/ui/floatingundoredo.ui
index 66f30a6..2c48f82 100644
--- a/svx/uiconfig/ui/floatingundoredo.ui
+++ b/svx/uiconfig/ui/floatingundoredo.ui
@@ -11,7 +11,6 @@
True
popup-menu
True
-False
False
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index faffecc..4f7202f 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -604,6 +604,18 @@ namespace
return bResizable;
}
+bool extractDecorated(VclBuilder::stringmap &rMap)
+{
+bool bDecorated = true;
+VclBuilder::stringmap::iterator aFind =
rMap.find(OString("decorated"));
+if (aFind != rMap.end())
+{
+bDecorated = toBool(aFind->second);
+rMap.erase(aFind);
+}
+return bDecorated;
+}
+
bool extractCloseable(VclBuilder::stringmap &rMap)
{
bool bCloseable = true;
@@ -973,11 +985,13 @@ namespace
OString sBorder = VclBuilder::extractCustomProperty(rMap);
if (!sBorder.isEmpty())
nBits |= WB_BORDER;
+if (!extractDecorated(rMap))
+nBits |= WB_OWNERDRAWDECORATION;
OString sType(extractTypeHint(rMap));
if (sType == "utility")
nBits |= WB_SYSTEMWINDOW | WB_DIALOGCONTROL | WB_MOVEABLE;
else if (sType == "popup-menu")
-nBits |= WB_SYSTEMWINDOW | WB_DIALOGCONTROL | WB_POPUP |
WB_OWNERDRAWDECORATION;
+nBits |= WB_SYSTEMWINDOW | WB_DIALOGCONTROL | WB_POPUP;
else
nBits |= WB_MOVEABLE;
return nBits;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/perfwork4' - 5 commits - vcl/source
vcl/source/bitmap/bitmapscalesuper.cxx | 603 +++--
1 file changed, 291 insertions(+), 312 deletions(-)
New commits:
commit 00c56138f11597bb16bbe9e80746d0b1bee34786
Author: Michael Meeks
Date: Thu Oct 16 08:46:11 2014 -0300
vcl: parallelize image scaling.
Change-Id: Ia452487c0c8c66a35c4b9fba225348bdef1a27f7
diff --git a/vcl/source/bitmap/bitmapscalesuper.cxx
b/vcl/source/bitmap/bitmapscalesuper.cxx
index 29819c9..4e734c4 100644
--- a/vcl/source/bitmap/bitmapscalesuper.cxx
+++ b/vcl/source/bitmap/bitmapscalesuper.cxx
@@ -20,6 +20,9 @@
#include
#include
+#include
+#include
+#include
#include
namespace {
@@ -71,11 +74,38 @@ struct ScaleContext {
}
};
+#define SCALE_THREAD_STRIP 32
+struct ScaleRangeContext {
+ScaleContext &mrCtx;
+long mnStartY, mnEndY;
+ScaleRangeContext( ScaleContext &rCtx, long nStartY )
+: mrCtx( rCtx ), mnStartY( nStartY ),
+ mnEndY( nStartY + SCALE_THREAD_STRIP ) {}
+};
+
+typedef void (*ScaleRangeFn)(ScaleContext &rCtx, long nStartY, long nEndY);
+
+// FIXME: should really be pooled & managed intelligently etc.
+class ScaleThread : public osl::Thread
+{
+ScaleRangeFn mpFn;
+std::vector< ScaleRangeContext > maStrips;
+public:
+ScaleThread( ScaleRangeFn pFn ) : mpFn( pFn ) {}
+void push( ScaleRangeContext &aRC ) { maStrips.push_back( aRC ); }
+virtual void SAL_CALL run() SAL_OVERRIDE
+{
+std::vector< ScaleRangeContext >::iterator it;
+for (it = maStrips.begin(); it != maStrips.end(); ++it)
+mpFn( it->mrCtx, it->mnStartY, it->mnEndY );
+}
+};
+
void scalePallete8bit(ScaleContext &rCtx, long nStartY, long nEndY)
{
const long nStartX = 0, nEndX = rCtx.mnDestW - 1L;
-for( long nY = nStartY, nYDst = 0L; nY <= nEndY; nY++, nYDst++ )
+for( long nY = nStartY; nY <= nEndY; nY++ )
{
long nTempY = rCtx.mpMapIY[ nY ];
long nTempFY = rCtx.mpMapFY[ nY ];
@@ -103,7 +133,7 @@ void scalePallete8bit(ScaleContext &rCtx, long nStartY,
long nEndY)
BitmapColor aColRes( MAP( cR0, cR1, nTempFY ),
MAP( cG0, cG1, nTempFY ),
MAP( cB0, cB1, nTempFY ) );
-rCtx.mpDest->SetPixel( nYDst, nXDst++, aColRes );
+rCtx.mpDest->SetPixel( nY, nXDst++, aColRes );
}
}
}
@@ -112,7 +142,7 @@ void scalePalleteGeneral(ScaleContext &rCtx, long nStartY,
long nEndY)
{
const long nStartX = 0, nEndX = rCtx.mnDestW - 1L;
-for( long nY = nStartY, nYDst = 0L; nY <= nEndY; nY++, nYDst++ )
+for( long nY = nStartY; nY <= nEndY; nY++ )
{
long nTempY = rCtx.mpMapIY[ nY ];
long nTempFY = rCtx.mpMapFY[ nY ];
@@ -137,7 +167,7 @@ void scalePalleteGeneral(ScaleContext &rCtx, long nStartY,
long nEndY)
BitmapColor aColRes( MAP( cR0, cR1, nTempFY ),
MAP( cG0, cG1, nTempFY ),
MAP( cB0, cB1, nTempFY ) );
-rCtx.mpDest->SetPixel( nYDst, nXDst++, aColRes );
+rCtx.mpDest->SetPixel( nY, nXDst++, aColRes );
}
}
}
@@ -146,7 +176,7 @@ void scale24bitBGR(ScaleContext &rCtx, long nStartY, long
nEndY)
{
const long nStartX = 0, nEndX = rCtx.mnDestW - 1L;
-for( long nY = nStartY, nYDst = 0L; nY <= nEndY; nY++, nYDst++ )
+for( long nY = nStartY; nY <= nEndY; nY++ )
{
long nTempY = rCtx.mpMapIY[ nY ];
long nTempFY = rCtx.mpMapFY[ nY ];
@@ -176,7 +206,7 @@ void scale24bitBGR(ScaleContext &rCtx, long nStartY, long
nEndY)
BitmapColor aColRes( MAP( cR0, cR1, nTempFY ),
MAP( cG0, cG1, nTempFY ),
MAP( cB0, cB1, nTempFY ) );
-rCtx.mpDest->SetPixel( nYDst, nXDst++, aColRes );
+rCtx.mpDest->SetPixel( nY, nXDst++, aColRes );
}
}
}
@@ -185,7 +215,7 @@ void scale24bitRGB(ScaleContext &rCtx, long nStartY, long
nEndY)
{
const long nStartX = 0, nEndX = rCtx.mnDestW - 1L;
-for( long nY = nStartY, nYDst = 0L; nY <= nEndY; nY++, nYDst++ )
+for( long nY = nStartY; nY <= nEndY; nY++ )
{
long nTempY = rCtx.mpMapIY[ nY ];
long nTempFY = rCtx.mpMapFY[ nY ];
@@ -215,7 +245,7 @@ void scale24bitRGB(ScaleContext &rCtx, long nStartY, long
nEndY)
BitmapColor aColRes( MAP( cR0, cR1, nTempFY ),
MAP( cG0, cG1, nTempFY ),
MAP( cB0, cB1, nTempFY ) );
-rCtx.mpDest->SetPixel( nYDst, nXDst++, aColRes );
+rCtx.mpDest->SetPixel( nY, nXDst++, aColRes );
}
}
}
@@ -224,7 +254,7 @@ void scaleNonPalleteGeneral(ScaleContext &rCtx, long
nStartY, long nEndY)
{
const long nStartX = 0, nEndX = rCtx.mnDestW - 1L;
-for( long nY = nStartY, nYDst = 0L; nY <= nEndY; nY++, nYDst++ )
+for( long nY = nStartY; nY <= nEndY; nY++ )
{
long nTempY = rCtx.mpMapIY[ nY ];
long nTempFY = rCtx.mpMapFY[ nY ];
@@ -
[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress3' - desktop/source
desktop/source/lib/lokandroid.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 74a6f3ca1f4889405ab098c684f88b4cd30c5c06
Author: Tor Lillqvist
Date: Thu Oct 16 13:01:35 2014 +0300
android: Stopgap: _exit() is better than a hang
Change-Id: Iaada020e85a8d2557e270f7d1514f2260ffb2af0
diff --git a/desktop/source/lib/lokandroid.cxx
b/desktop/source/lib/lokandroid.cxx
index 6a0ba2a..15c41c4 100644
--- a/desktop/source/lib/lokandroid.cxx
+++ b/desktop/source/lib/lokandroid.cxx
@@ -7,6 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include
#include
#include
@@ -68,6 +69,9 @@ extern "C" SAL_JNI_EXPORT void JNICALL
Java_org_libreoffice_kit_Office_destroy(J
{
LibreOfficeKit* pLibreOfficeKit = getHandle(pEnv, aObject);
pLibreOfficeKit->pClass->destroy(pLibreOfficeKit);
+// Stopgap fix: _exit() to force the OS to restart the LO activity.
+// Better than to hang.
+_exit(0);
}
extern "C" SAL_JNI_EXPORT jlong JNICALL
Java_org_libreoffice_kit_Office_documentLoadNative(JNIEnv* pEnv, jobject
aObject, jstring documentPath)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 79641] LibreOffice 4.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=79641 Bug 79641 depends on bug 85076, which changed state. Bug 85076 Summary: F11 "Styles and Formatting" not working when sidebar hidden https://bugs.freedesktop.org/show_bug.cgi?id=85076 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE -- 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: i18npool/source
i18npool/source/localedata/data/zh_CN.xml | 16 1 file changed, 8 insertions(+), 8 deletions(-) New commits: commit 71969c8b6a62253353acba548fc6f62ccf75fd23 Author: Julien Nabet Date: Mon Oct 13 19:18:02 2014 +0200 Resolves fdo#84961: zh_CN date separator should be "/" rather than "ï¼" Thanks to the patch from Kevin Suo, see https://bugs.freedesktop.org/attachment.cgi?id=107768 Signed-off-by: Eike Rathke With additional change to the DateAcceptancePattern. Change-Id: I80695028d51c6b91e9e9418e2d1ce33d76d23893 Reviewed-on: https://gerrit.libreoffice.org/11958 Reviewed-by: Eike Rathke Tested-by: Eike Rathke diff --git a/i18npool/source/localedata/data/zh_CN.xml b/i18npool/source/localedata/data/zh_CN.xml index e58c59a..d6e839e 100644 --- a/i18npool/source/localedata/data/zh_CN.xml +++ b/i18npool/source/localedata/data/zh_CN.xml @@ -30,7 +30,7 @@ - ï¼ + / , . : @@ -56,7 +56,7 @@ M/D Mï¼D Y.M.D -Y/M/D +Yï¼Mï¼D Yå¹´MæDæ¥ MæDæ¥ @@ -119,10 +119,10 @@ "å¹´"M"æ"D"æ¥"ã - YYï¼Mï¼D + YY/M/D - ï¼Mï¼D + /M/D "å¹´"M"æ" @@ -143,10 +143,10 @@ YY"å¹´"M"æ"D"æ¥" - YYï¼Mï¼D + YY/M/D - ï¼Mï¼D + /M/D "å¹´"M"æ"D"æ¥" @@ -228,10 +228,10 @@ YY"å¹´"M"æ"D"æ¥"HH"æ¶"MM"å" - Mï¼Dï¼YY HH:MM + M/D/YY HH:MM - MMï¼DDï¼ HH:MM:SS + MM/DD/ HH:MM:SS ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress3' - basebmp/source include/basebmp vcl/headless
basebmp/source/bitmapdevice.cxx | 27 +++
include/basebmp/bitmapdevice.hxx |4
vcl/headless/svpgdi.cxx |3 +--
3 files changed, 28 insertions(+), 6 deletions(-)
New commits:
commit 6443e8f88e07c35ff839dc72c0f012a2322a81a6
Author: Michael Meeks
Date: Tue Oct 14 11:59:04 2014 -0300
basebmp: accelerated method to create a clipping device.
This was some staggering proportion of tiled rendering documents
with complex clipping; it seems 'clear' is not what memset is for
1bit clip masks.
Change-Id: I9142ffb7d7016603feb7782d6f03b9992b9494e3
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index 4104c18..d79afd5 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -1944,7 +1944,8 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const
basegfx::B2IVector&
boost::shared_array<
sal_uInt8 > pMem,
PaletteMemorySharedVector
pPal,
const basegfx::B2IBox*
pSubset,
- const
IBitmapDeviceDamageTrackerSharedPtr& rDamage )
+ const
IBitmapDeviceDamageTrackerSharedPtr& rDamage,
+ bool bBlack = true)
{
OSL_ASSERT(rSize.getX() > 0 && rSize.getY() > 0);
@@ -1990,7 +1991,10 @@ BitmapDeviceSharedPtr createBitmapDeviceImplInner( const
basegfx::B2IVector&
&rtl_freeMemory );
if (pMem.get() == 0 && nMemSize != 0)
return BitmapDeviceSharedPtr();
-memset(pMem.get(), 0, nMemSize);
+if (bBlack)
+memset(pMem.get(), 0, nMemSize);
+else
+memset(pMem.get(), 0xFF, nMemSize);
}
sal_uInt8* pFirstScanline = nScanlineStride < 0 ?
@@ -2129,9 +2133,10 @@ BitmapDeviceSharedPtr createBitmapDeviceImpl( const
basegfx::B2IVector&
boost::shared_array< sal_uInt8 >
pMem,
PaletteMemorySharedVector
pPal,
const basegfx::B2IBox*
pSubset,
- const
IBitmapDeviceDamageTrackerSharedPtr& rDamage )
+ const
IBitmapDeviceDamageTrackerSharedPtr& rDamage,
+ bool bBlack = true)
{
-BitmapDeviceSharedPtr result( createBitmapDeviceImplInner( rSize,
bTopDown, nScanlineFormat, pMem, pPal, pSubset, rDamage ) );
+BitmapDeviceSharedPtr result( createBitmapDeviceImplInner( rSize,
bTopDown, nScanlineFormat, pMem, pPal, pSubset, rDamage, bBlack ) );
#ifdef SAL_LOG_INFO
std::ostringstream subset;
@@ -2194,6 +2199,20 @@ BitmapDeviceSharedPtr createBitmapDevice( const
basegfx::B2IVector&rSize
IBitmapDeviceDamageTrackerSharedPtr() );
}
+BitmapDeviceSharedPtr createClipDevice( const basegfx::B2IVector&rSize
)
+{
+BitmapDeviceSharedPtr xClip(
+ createBitmapDeviceImpl( rSize,
+ false, /* bTopDown */
+ basebmp::FORMAT_ONE_BIT_MSB_GREY,
+ boost::shared_array< sal_uInt8 >(),
+ PaletteMemorySharedVector(),
+ NULL,
+ IBitmapDeviceDamageTrackerSharedPtr(),
+ false /* white */) );
+return xClip;
+}
+
BitmapDeviceSharedPtr subsetBitmapDevice( const BitmapDeviceSharedPtr& rProto,
const basegfx::B2IBox& rSubset
)
{
diff --git a/include/basebmp/bitmapdevice.hxx b/include/basebmp/bitmapdevice.hxx
index 1a81514..a4c38e8 100644
--- a/include/basebmp/bitmapdevice.hxx
+++ b/include/basebmp/bitmapdevice.hxx
@@ -690,6 +690,10 @@ BitmapDeviceSharedPtr BASEBMP_DLLPUBLIC
createBitmapDevice( const basegfx::B2IVe
const
PaletteMemorySharedVector& rPalette );
+/** Function to create a 1 bit grey clipping mask initialized to white.
+ */
+BitmapDeviceSharedPtr BASEBMP_DLLPUBLIC createClipDevice( const
basegfx::B2IVector&rSize );
+
/** Function to retrieve a subsetted BitmapDevice to the same
memory.
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 945f335..8547158 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -168,8 +168,7 @@ void SvpSalGraphics::ensureClip()
m_aDevice = m_aOrigDevice;
basegfx::B2IVector aSize = m_aDevice->getSize();
-m_aClipMap = basebmp::creat
[Libreoffice-commits] core.git: 5 commits - bean/com bridges/source connectivity/com connectivity/qa desktop/test filter/qa forms/qa framework/qa javaunohelper/com jurt/com odk/examples qadevOOo/runne
bean/com/sun/star/comp/beans/LocalOfficeConnection.java | 12 - bean/com/sun/star/comp/beans/NoConnectionException.java |5 bean/com/sun/star/comp/beans/OOoBean.java | 99 + bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java |2 connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java |6 connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java |6 connectivity/qa/complex/connectivity/HsqlDriverTest.java |2 connectivity/qa/connectivity/tools/RowSet.java |3 desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java | 12 - filter/qa/complex/filter/detection/typeDetection/Helper.java |8 forms/qa/org/openoffice/xforms/XMLDocument.java |2 framework/qa/complex/framework/autosave/ConfigHelper.java |2 framework/qa/complex/loadAllDocuments/StreamSimulator.java |3 javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java | 10 javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java |8 javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java |2 javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin.java | 63 +- javaunohelper/com/sun/star/lib/uno/helper/UnoUrl.java |4 jurt/com/sun/star/comp/loader/JavaLoader.java | 26 +- jurt/com/sun/star/comp/urlresolver/UrlResolver.java |6 jurt/com/sun/star/lib/connections/pipe/PipeConnection.java | 10 jurt/com/sun/star/lib/connections/pipe/pipeConnector.java |2 jurt/com/sun/star/lib/connections/socket/ConnectionDescriptor.java |6 jurt/com/sun/star/lib/connections/socket/SocketConnection.java |6 odk/examples/DevelopersGuide/GUI/DialogDocument.java |6 odk/examples/DevelopersGuide/GUI/ImageControlSample.java |2 odk/examples/DevelopersGuide/GUI/UnoDialogSample.java |2 odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java |2 odk/examples/DevelopersGuide/GUI/UnoMenu.java |4 odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/ConnectionAwareClient.java |3 qadevOOo/runner/complexlib/Assurance.java |3 qadevOOo/runner/convwatch/ConvWatchCancelException.java |5 qadevOOo/runner/convwatch/ConvWatchException.java |5 qadevOOo/runner/convwatch/GraphicalDifferenceCheck.java |2 qadevOOo/runner/convwatch/MSOfficePrint.java |2 qadevOOo/runner/convwatch/OfficePrint.java |5 qadevOOo/runner/convwatch/ReportDesignerTest.java |2 qadevOOo/runner/graphical/MSOfficePostscriptCreator.java |7 qadevOOo/runner/graphical/OfficeException.java |5 qadevOOo/runner/graphical/WrongEnvironmentException.java |4 qadevOOo/runner/helper/ConfigHelper.java | 26 +- qadevOOo/runner/helper/StreamSimulator.java |2 qadevOOo/runner/util/BasicMacroTools.java | 101 +++--- qadevOOo/runner/util/CalcTools.java | 77 ++- qadevOOo/runner/util/DesktopTools.java |6 qadevOOo
[Libreoffice-commits] core.git: xmerge/source
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
| 26 ++
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
| 26 ++
2 files changed, 14 insertions(+), 38 deletions(-)
New commits:
commit 96e3718e5ae4e74084f537ae64a2999eb93fa8fb
Author: Robert Antoni Buj i Gelonch
Date: Thu Oct 16 10:47:34 2014 +0200
xmerge: use String.format
http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html#format(java.lang.String,
java.lang.Object...)
Change-Id: I98b7fca9dee870c9a1d0f9842cbb009a13537967
Reviewed-on: https://gerrit.libreoffice.org/11995
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
index 0d61b1a..20ccd6e 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
@@ -151,19 +151,18 @@ public class TextStyle extends Style implements Cloneable
{
* @return The {@code Color} associated the value.
*/
private Color parseColorString(String value) {
-// Assume color value is of form #rrggbb
-String r = value.substring(1, 3);
-String g = value.substring(3, 5);
-String b = value.substring(5, 7);
int red = 0;
int green = 0;
int blue = 0;
try {
-red = Integer.parseInt(r, 16);
-green = Integer.parseInt(g, 16);
-blue = Integer.parseInt(b, 16);
+// Assume color value is of form #rrggbb
+red = Integer.parseInt(value.substring(1, 3), 16);
+green = Integer.parseInt(value.substring(3, 5), 16);
+blue = Integer.parseInt(value.substring(5, 7), 16);
} catch (NumberFormatException e) {
Debug.log(Debug.ERROR, "Problem parsing a color string", e);
+} catch (IndexOutOfBoundsException e) {
+Debug.log(Debug.ERROR, "Problem parsing a color string", e);
}
return new Color(red, green, blue);
}
@@ -545,18 +544,7 @@ public class TextStyle extends Style implements Cloneable {
* @return The {@code Color} value in the form {@literal #rrggbb}.
*/
private String buildColorString(Color c) {
-int v[] = new int[3];
-v[0] = c.getRed();
-v[1] = c.getGreen();
-v[2] = c.getBlue();
-String colorString = "#";
-for (int i = 0; i <= 2; i++) {
-String xx = Integer.toHexString(v[i]);
-if (xx.length() < 2)
-xx = "0" + xx;
-colorString += xx;
-}
-return colorString;
+return String.format("#%06X", c.getRGB() & 0x00FF);
}
private static String[] ignored = {
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
index 644d91e..1628f19 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
@@ -118,19 +118,18 @@ public class CellStyle extends Style implements Cloneable
{
* @return The {@code Color} associated the value.
*/
private Color parseColorString(String value) {
-// Assume color value is of form #rrggbb
-String r = value.substring(1, 3);
-String g = value.substring(3, 5);
-String b = value.substring(5, 7);
int red = 0;
int green = 0;
int blue = 0;
try {
-red = Integer.parseInt(r, 16);
-green = Integer.parseInt(g, 16);
-blue = Integer.parseInt(b, 16);
+// Assume color value is of form #rrggbb
+red = Integer.parseInt(value.substring(1, 3), 16);
+green = Integer.parseInt(value.substring(3, 5), 16);
+blue = Integer.parseInt(value.substring(5, 7), 16);
} catch (NumberFormatException e) {
Debug.log(Debug.ERROR, "Problem parsing a color string", e);
+} catch (IndexOutOfBoundsException e) {
+Debug.log(Debug.ERROR, "Problem parsing a color string", e);
}
return new Color(red, green, blue, 0);
}
@@ -438,18 +437,7 @@ public class CellStyle extends Style implements Cloneable {
* @return The {@code Color} value in the form {@literal #rrggbb}.
*/
private String buildColorString(Color c) {
-int v[] = new int[3];
-v[0] = c.getRed();
-v[1] = c.getGreen();
-v[2] = c.getBlue();
-String colorString = "#";
-for (int i = 0; i <= 2; i++) {
-String xx = Integer.toHexString(v[i]);
-if (xx.length() < 2)
-xx = "0" + xx;
[Libreoffice-commits] core.git: forms/qa xmerge/source
forms/qa/integration/forms/FormControlTest.java|
14 +-
xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java |
61 +-
xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java|
48 ---
3 files changed, 70 insertions(+), 53 deletions(-)
New commits:
commit bbd5a304112c57ac1b1357c93ba7bd8ed8973cfa
Author: Robert Antoni Buj i Gelonch
Date: Wed Oct 15 21:48:19 2014 +0200
java: ensure that the stream is cleaned up before the method returns
Change-Id: Id3efeda2fd66173ba2f5662eaacb3629da54573d
Reviewed-on: https://gerrit.libreoffice.org/11991
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/forms/qa/integration/forms/FormControlTest.java
b/forms/qa/integration/forms/FormControlTest.java
index d574640..b7dacb7 100644
--- a/forms/qa/integration/forms/FormControlTest.java
+++ b/forms/qa/integration/forms/FormControlTest.java
@@ -868,9 +868,17 @@ public class FormControlTest extends
complexlib.ComplexTestCase implements XSQLE
{
m_sImageURL = util.utils.getOfficeTempDir( m_orb ) + "image.gif";
-FileOutputStream aFile = new FileOutputStream( m_sImageURL );
-aFile.write( getSamplePicture() );
-aFile.close();
+FileOutputStream aFile = null;
+try
+{
+aFile = new FileOutputStream( m_sImageURL );
+aFile.write( getSamplePicture() );
+}
+finally
+{
+if ( aFile != null )
+aFile.close();
+}
log.println( "created temporary image file: " + m_sImageURL );
// for later setting the url at the imaghe control, we need a real
URL, no system path
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java
index e10702a..8299632 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ActiveSyncDriver.java
@@ -21,11 +21,15 @@ package org.openoffice.xmerge.util;
import java.io.File;
import java.io.FileOutputStream;
import java.io.FileInputStream;
+import java.io.IOException;
+
import java.util.StringTokenizer;
+import java.util.NoSuchElementException;
import org.openoffice.xmerge.Convert;
import org.openoffice.xmerge.Document;
import org.openoffice.xmerge.ConvertData;
+import org.openoffice.xmerge.ConvertException;
import org.openoffice.xmerge.ConverterFactory;
import org.openoffice.xmerge.util.registry.ConverterInfoMgr;
import org.openoffice.xmerge.util.registry.ConverterInfoReader;
@@ -103,36 +107,37 @@ public class ActiveSyncDriver {
}
// Everything is registered so do the conversion
-FileInputStream fis = new FileInputStream(srcFile);
-FileOutputStream fos = new FileOutputStream(dstFile);
-
-conv.addInputStream(srcFile, fis);
-
-ConvertData dataOut;
+boolean bOK = true;
+FileInputStream fis = null;
+FileOutputStream fos = null;
try {
-dataOut = conv.convert();
-}
-catch (Exception e) {
-fos.close();
-return false;
-}
-
-if (dataOut == null) {
-fos.close();
-return false;
-}
-
-// Get the document and write it out.
-Document doc = (Document)dataOut.getDocumentEnumeration().next();
-if (doc == null) {
-fos.close();
-return false;
+fis = new FileInputStream(srcFile);
+conv.addInputStream(srcFile, fis);
+try {
+fos = new FileOutputStream(dstFile);
+ConvertData dataOut = conv.convert();
+
+// Get the document and write it out.
+Document doc =
(Document)dataOut.getDocumentEnumeration().next();
+doc.write(fos);
+fos.flush();
+} finally {
+if (fos != null)
+fos.close();
+}
+} catch (IOException e) {
+bOK = false;
+} catch (NullPointerException e) {
+bOK = false;
+} catch (ConvertException e) {
+bOK = false;
+} catch (NoSuchElementException e) {
+bOK = false;
+} finally {
+if (fis != null)
+fis.close();
}
-doc.write(fos);
-fos.flush();
-fos.close();
-
-return true;
+return bOK;
}
}
\ No newline at end of file
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
index fe0429e..50a34b2 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/Debug.java
@@ -53,38 +53,42 @@ public final
[Libreoffice-commits] core.git: sd/source
sd/source/ui/app/sdxfer.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit d49eabcc56677553a6d5d9fe7cecc5a5eee1f9b6 Author: Caolán McNamara Date: Thu Oct 16 11:11:54 2014 +0100 ensure UserData dtors are done while SolarMutex is locked otherwise I can't even reorder two slides in the slide pane with dbgutil enabled without a SolarMutex assert in RemoveListener (and we have two SolarMutexes here for some reason, one should be enough) Change-Id: If224568f1b90d62c17bde65a896534aa10f8a661 diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 3d89c61..e967d18 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -118,8 +118,6 @@ SdTransferable::~SdTransferable() if( mpSdView ) EndListening( *const_cast< sd::View *>( mpSdView) ); -SolarMutexGuard aSolarGuard; - ObjectReleased(); if( mbOwnView ) @@ -146,6 +144,8 @@ SdTransferable::~SdTransferable() delete mpVDev; delete mpObjDesc; +//call explicitly at end of dtor to be covered by above SolarMutex +maUserData.clear(); } void SdTransferable::CreateObjectReplacement( SdrObject* pObj ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Minutes of the Design Hangout: 2014-10-15
* Present: Heiko, Hillar, Jay, Kendy, Samuel, Steve * Completed Action Items: + 'More Options' for insert table, 'More Fields' for insert field and 'More Styles' for styles drop down * Pending Action Items: + Samuel: Create an easy hack - describe what tables should be striped, and how to do that in the code + Kendy: Find somebody to transfer articles from redmine wiki to TDF * UI changes integrated the last week (Samuel): + [last week] Changed the Insert Field button to dropdown-only: https://bugs.freedesktop.org/show_bug.cgi?id=84550 + Do we want a split button? + originally opened the dialog + then changed that the default action inserted the page number + comes from the Insert toolbar update - where he was creating group buttons (Jay) + probably the situation is here a bit different - the functionality more distributed (Samuel) + stats: insert page number 50%, date 15%, More... 15%, page count 10%, time 5% + now similar to the table - changed to just drop down only + like that it is similar to the table (Kendy) + problem with the icon + not descriptive (Jay) + not an issue to have the Page icon, if that's the most used functionality anyway, and then have it first in the list (Kendy) AI + Conclusion: Update the icon, and keep the dropdown (Jay) + [last week] Styles dropdown + Previews the background color too now + Changes font color when it's too close to the background color + Flat menu button - just the triangle is shown, button on mouse-over + should styles also show text alignment, as it would be useful when the drop down is added to the sidebar? (Jay) + tricky question :-) + it is a small dropdown - so wouldn't be much visible (Samuel) + punt after it's in the sidebar? (Jay) + sounds it could be usable (Heiko) + Conclusion: Will not block a patch for that if somebody implements this - but not a priority for the moment + [last week] Styles+Formatting floating dialog removed, will now always open in the Sidebar (as the Gallery) + what happens when when the sidebar is not visible? (Kendy) + it will open the sidebar (Samuel) + there's a small bug if you hide the sidebar a special way, then it will not show up (Samuel) + but bug filed (Jay) + [this week] hiding of paragraph level background color button in formatting toolbar (Jay) + Jay hid it in http://cgit.freedesktop.org/libreoffice/core/commit/?id=affe79b5a920a2aa0bc284e918c96aa0379c5efb and Kendy enabled it in http://cgit.freedesktop.org/libreoffice/core/commit/?id=bb29c5723a6053476b6f398c8550b2a839aa07fc + reasoning for its hiding + most users do not set paragraph level background color, as it colors more than the space taken up by characters + users will be confused between character background color (aka highlight) and paragraph background color (aka background color) + other word processors that dont have paragraph color in toolbar/sidebar - iwork pages, abiword, wps/kingsoft writer, calligra words, wordperfect, ms word 2003, google docs + most S/W don't have the func to set the paragraph color that anyway (Jay) + confusing - 3 buttons; what each of them does? (Jay) + it is wrongly labeled - it's a paragraph color (Jay) + the highlighting is confusing too - it is not what Word has as the 'Highlight' feature (Kendy) + concern about hiding functionality - if it is used, we'll get fire ;-) (Kendy) + it aligns better with the 1st row of buttons when hidden (Jay) + looks better + http://i.imgur.com/keUX5SK.png vs. http://i.imgur.com/8IMHRzp.png AI + Conclusion: Kendy will try to see how hard it is to turn the 3 spacing buttons to 1 dropdown, keep the background color for now, and measure. + there is a drop-down already in the sidebar (Samuel) + good, will try to re-use that (Kendy) AI + Heiko: File a bug about better description of tooltip (sidebar - spacing). + "Increase Spacing" should be "Increase Paragraph Spacing", same for decrease * Removal of cut, copy, paste buttons from writer's standard toolbar (Jay) + https://www.libreoffice.org/bugzilla/show_bug.cgi?id=84909 + No way before we measure this ;-) (Kendy) + in MSO, Paste is
[Libreoffice-commits] core.git: qadevOOo/runner
qadevOOo/runner/convwatch/GraphicalTestArguments.java |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3a6987beaf85876e1061d553cdc134d40c54597e
Author: Robert Antoni Buj i Gelonch
Date: Wed Oct 15 18:34:53 2014 +0200
runner: if .. else if .. else
Change-Id: If9c07074b60b14d0f4e947754d4bf34e4f2f9676
Reviewed-on: https://gerrit.libreoffice.org/11990
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/qadevOOo/runner/convwatch/GraphicalTestArguments.java
b/qadevOOo/runner/convwatch/GraphicalTestArguments.java
index 5fc4bed..e4dd7c0 100644
--- a/qadevOOo/runner/convwatch/GraphicalTestArguments.java
+++ b/qadevOOo/runner/convwatch/GraphicalTestArguments.java
@@ -218,7 +218,7 @@ public class GraphicalTestArguments
// m_tWithBorderMove = TriState.UNSET;
m_tWithBorderMove = TriState.FALSE;
}
-if (sWithBorderMove.equalsIgnoreCase("yes") ||
+else if (sWithBorderMove.equalsIgnoreCase("yes") ||
sWithBorderMove.equalsIgnoreCase("true"))
{
m_tWithBorderMove = TriState.TRUE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/fdo77716.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx|8 ++
writerfilter/source/dmapper/StyleSheetTable.cxx | 28
3 files changed, 32 insertions(+), 4 deletions(-)
New commits:
commit 3be8ff052f8aa67919343730d675493308759ffc
Author: Miklos Vajna
Date: Thu Oct 16 11:05:03 2014 +0200
fdo#77716 DOCX import: fix handling of user-defined Standard style
Change-Id: I2cbd9cc0848bfb302bfa0c463a810e7f8231e47b
diff --git a/sw/qa/extras/ooxmlexport/data/fdo77716.docx
b/sw/qa/extras/ooxmlexport/data/fdo77716.docx
new file mode 100644
index 000..f706791
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo77716.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 1101e2d..3d5d727 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -469,6 +469,14 @@ DECLARE_OOXMLEXPORT_TEST(testEm, "em.docx")
CPPUNIT_ASSERT_EQUAL(text::FontEmphasis::DOT_BELOW,
getProperty(getRun(getParagraph(1), 5), "CharEmphasis"));
}
+DECLARE_OOXMLEXPORT_TEST(testFdo77716, "fdo77716.docx")
+{
+// The problem was that there should be 200 twips spacing between the two
paragraphs, but there wasn't any.
+uno::Reference
xStyle(getStyles("ParagraphStyles")->getByName("Standard"), uno::UNO_QUERY);
+// This was 0.
+CPPUNIT_ASSERT_EQUAL(static_cast(convertTwipToMm100(200)),
getProperty(xStyle, "ParaBottomMargin"));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index bd40814..9b3782c 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -38,6 +38,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -293,6 +294,8 @@ struct StyleSheetTable_Impl
PropertyMapPtr m_pDefaultParaProps,
m_pDefaultCharProps;
PropertyMapPtr m_pCurrentProps;
StringPairMap_t m_aStyleNameMap;
+/// Style names which should not be used without a " (user)" suffix.
+std::set m_aReservedStyleNames;
ListCharStylePropertyVector_t m_aListCharStylePropertyVector;
boolm_bIsNewDoc;
@@ -1482,14 +1485,31 @@ OUString StyleSheetTable::ConvertStyleName( const
OUString& rWWName, bool bExten
{
for( sal_uInt32 nPair = 0; nPair < sizeof(aStyleNamePairs) / sizeof(
sal_Char*) / 2; ++nPair)
{
-m_pImpl->m_aStyleNameMap.insert( StringPairMap_t::value_type(
-OUString::createFromAscii(aStyleNamePairs[2 * nPair]),
-OUString::createFromAscii(aStyleNamePairs[2 * nPair + 1])
));
+OUString aFrom = OUString::createFromAscii(aStyleNamePairs[2 *
nPair]);
+OUString aTo = OUString::createFromAscii(aStyleNamePairs[2 * nPair
+ 1]);
+if (!aTo.isEmpty())
+{
+m_pImpl->m_aStyleNameMap.insert(
StringPairMap_t::value_type(aFrom, aTo));
+m_pImpl->m_aReservedStyleNames.insert(aTo);
+}
}
}
StringPairMap_t::iterator aIt = m_pImpl->m_aStyleNameMap.find( sRet );
-if(aIt != m_pImpl->m_aStyleNameMap.end() && !aIt->second.isEmpty())
+bool bConverted = false;
+if (aIt != m_pImpl->m_aStyleNameMap.end())
+{
+bConverted = true;
sRet = aIt->second;
+}
+
+if (!bConverted)
+{
+// SwStyleNameMapper doc says: If the UI style name equals a
+// programmatic name, then it must append " (user)" to the end.
+std::set::iterator aReservedIt =
m_pImpl->m_aReservedStyleNames.find(sRet);
+if (aReservedIt != m_pImpl->m_aReservedStyleNames.end())
+sRet += " (user)";
+}
return sRet;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig officecfg/registry sfx2/source
cui/source/options/optgdlg.cxx | 14 +++
cui/source/options/optgdlg.hxx |2
cui/uiconfig/ui/optgeneralpage.ui | 57 +++--
officecfg/registry/schema/org/openoffice/Office/Common.xcs |8 +
sfx2/source/control/unoctitm.cxx |6 +
5 files changed, 79 insertions(+), 8 deletions(-)
New commits:
commit 9c9831f79cf0413c0cd947449bf8253fe09a224f
Author: Jan Holesovsky
Date: Thu Oct 16 10:53:52 2014 +0200
usage info: Checkbox to turn it on and off (Tools -> Options... -> General).
Change-Id: I67143e604314f5553026c369bbed3fdd683c39a6
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 79688cc..ef1ae96 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -67,6 +67,7 @@
#include
#include
#include
+#include
#include
#include
@@ -206,6 +207,7 @@ OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const
SfxItemSet& rSet)
get(m_pYearFrame, "yearframe");
get(m_pYearValueField, "year");
get(m_pToYearFT, "toyear");
+get(m_pCollectUsageInfo, "collectusageinfo");
if (m_pFileDlgCB->IsVisible() &&
SvtMiscOptions().IsUseSystemFileDialogReadOnly())
{
@@ -246,6 +248,7 @@ SfxTabPage* OfaMiscTabPage::Create( vcl::Window* pParent,
const SfxItemSet* rAtt
bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
{
bool bModified = false;
+boost::shared_ptr
batch(comphelper::ConfigurationChanges::create());
SvtHelpOptions aHelpOptions;
if ( m_pToolTipsCB->IsValueChangedFromSaved() )
@@ -291,6 +294,14 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
rSet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, nNum ) );
}
+if (m_pCollectUsageInfo->IsValueChangedFromSaved())
+{
+
officecfg::Office::Common::Misc::CollectUsageInformation::set(m_pCollectUsageInfo->IsChecked(),
batch);
+bModified = true;
+}
+
+batch->commit();
+
return bModified;
}
@@ -327,6 +338,9 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
{
m_pYearFrame->Enable(false);
}
+
+
m_pCollectUsageInfo->Check(officecfg::Office::Common::Misc::CollectUsageInformation::get());
+m_pCollectUsageInfo->SaveValue();
}
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index f559a0c..3353457 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -55,6 +55,8 @@ private:
OUString m_aStrDateInfo;
+CheckBox* m_pCollectUsageInfo;
+
DECL_LINK( TwoFigureHdl, NumericField* );
DECL_LINK( TwoFigureConfigHdl, NumericField* );
DECL_LINK(HelpCheckHdl_Impl, void *);
diff --git a/cui/uiconfig/ui/optgeneralpage.ui
b/cui/uiconfig/ui/optgeneralpage.ui
index 83bc114..943c366 100644
--- a/cui/uiconfig/ui/optgeneralpage.ui
+++ b/cui/uiconfig/ui/optgeneralpage.ui
@@ -1,6 +1,13 @@
+
+1583
+9857
+1930
+1
+10
+
True
False
@@ -351,12 +358,48 @@
1
-
-
-1583
-9857
-1930
-1
-10
+
+
+True
+False
+0
+none
+
+
+True
+False
+6
+12
+
+
+Allow collecting
usage information, and sending it to TDF servers
+True
+True
+False
+True
+0
+True
+
+
+
+
+
+
+True
+False
+Privacy
+
+
+
+
+
+
+
+0
+5
+1
+1
+
+
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 09a9b18..9e72795 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5600,6 +5600,14 @@
false
+
+
+ Determines whether the usage information (like what actions
+ the user has performed) can be collected, and potentially sent for
+ examination.
+
+false
+
Determines if the limited, and awkward code producing
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 752a2f7..b371e7a 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -44,6 +44,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -644,6 +645,9 @@ void UsageInfo::load()
void UsageInfo::save()
{
+if (!officecfg::Office::Common::Misc::CollectUsageInformation::get())
+return;
+
// TODO - do a real saving here, not onl
Re: allow ASSERT_ALWAYS_ABORT for debug builds on windows to be true or false
Hi Bjoern, On Wed, Oct 15, 2014 at 10:36:23AM +0200, Bjoern Michaelsen wrote: > Hi, > > On Wed, Oct 15, 2014 at 09:34:13AM +0200, Miklos Vajna wrote: > > My new builds now have a commit message like "2014-10-15: > > source-hash-defa080e585fb351bc4049b2f280d2e7e5256f6e" in the dbgutil > > repo, hope that keeps everyone happy. :-) > > Thats lovely, but still doesnt show up in "git bisect log", doesnt it? It does, e.g.: $ git bisect log # bad: [29d24957395afa48f63fa078c1a3786cb471232e] 2014-10-16: source-hash-3e2bd1e4022e25b77bcc8eba5e02c1adc57008a1 ... # bad: [671ac8dc45cb809092bcabfe76006eb0948ee081] 2014-10-15: source-hash-defa080e585fb351bc4049b2f280d2e7e5256f6e git bisect bad 671ac8dc45cb809092bcabfe76006eb0948ee081 # first bad commit: [671ac8dc45cb809092bcabfe76006eb0948ee081] 2014-10-15: source-hash-defa080e585fb351bc4049b2f280d2e7e5256f6e > FWIW, tagging existing commits doesnt really touch/change them, so no rebase > or > other complex tweaking needed. Otherwise we might need some script that > extracts that from the repo, so we have useful infomation in the stuff that > people paste on bugzilla. OTOG that might be somewhat useful in general, as it > might even show the commits in the bibisect range. Yes, such a script would be useful -- maybe file an EasyHack to create one? Regards, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - external/curl external/nss external/python3 fpicker/source lingucomponent/source sal/osl vcl/inc vcl/osx vcl/quartz
external/curl/ExternalProject_curl.mk |2 external/nss/ExternalPackage_nss.mk |1 external/nss/ExternalProject_nss.mk |2 external/python3/ExternalProject_python3.mk |4 fpicker/source/aqua/FilterHelper.mm |4 fpicker/source/aqua/NSURL_OOoAdditions.mm | 20 fpicker/source/aqua/SalAquaFilePicker.mm|8 - fpicker/source/aqua/SalAquaPicker.mm| 29 -- lingucomponent/source/spellcheck/macosxspell/macspellimp.mm |4 sal/osl/unx/memory.c| 11 -- sal/osl/unx/system.c| 51 --- sal/osl/unx/uunxapi.cxx |4 vcl/inc/osx/salframe.h |4 vcl/inc/osx/salframeview.h | 12 -- vcl/inc/quartz/salgdi.h |9 -- vcl/osx/DropTarget.cxx |8 - vcl/osx/salframe.cxx| 38 vcl/osx/salframeview.mm | 53 vcl/osx/salinst.cxx |5 - vcl/osx/salmenu.cxx |4 vcl/osx/salprn.cxx |4 vcl/quartz/ctfonts.cxx |6 - vcl/quartz/ctlayout.cxx | 20 vcl/quartz/salgdi.cxx | 16 --- 24 files changed, 10 insertions(+), 309 deletions(-) New commits: commit fe25090e992eefd0c43ca73b656632a650793b1a Author: Tor Lillqvist Date: Thu Oct 16 10:38:48 2014 +0300 MAC_OS_X_VERSION_MIN_REQUIRED is always >= 1080 now Change-Id: I40d03ab9acb67ab72b9047017452f069ce88fd4b diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index e8e1345..1a0a0a3 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -45,7 +45,7 @@ $(call gb_ExternalProject_get_state_target,curl,build): $(if $(filter IOS MACOSX,$(OS)),,--with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")) \ $(if $(filter IOS,$(OS)),--with-darwinssl) \ $(if $(filter MACOSX,$(OS)),\ - $(if $(filter 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),,--with-darwinssl)) \ + --with-darwinssl) \ --without-ssl \ --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher \ --disable-file --disable-ldap --disable-telnet --disable-dict --without-libssh2 \ diff --git a/external/nss/ExternalPackage_nss.mk b/external/nss/ExternalPackage_nss.mk index 5dbe1d0..c6d8953fd 100644 --- a/external/nss/ExternalPackage_nss.mk +++ b/external/nss/ExternalPackage_nss.mk @@ -26,7 +26,6 @@ $(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\ dist/out/lib/libsmime3.dylib \ dist/out/lib/libsoftokn3.dylib \ dist/out/lib/libssl3.dylib \ - $(if $(filter 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),dist/out/lib/libsqlite3.dylib) \ )) else ifeq ($(OS),WNT) $(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\ diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index c12c24a..6d2ab45 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -65,7 +65,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject $(if $(filter arm64,$(CC)),USE_64=1)) \ $(if $(filter MACOSX,$(OS)),\ $(if $(filter-out POWERPC,$(CPUNAME)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH)) \ - $(if $(filter-out 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),NSS_USE_SYSTEM_SQLITE=1)) \ + NSS_USE_SYSTEM_SQLITE=1) \ $(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \ $(if $(CROSS_COMPILING),\ $(if $(filter MACOSXPOWERPC,$(OS)$(CPUNAME)),CPU_ARCH=ppc) \ diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index 70b12f0..045892e 100644 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -69,8 +69,8 @@ $(call gb_ExternalProject_get_state_target,python3,build) : $(if $(filter WNT-GCC,$(OS)-$(COM)),--with-threads ac_cv_printf_zd_format=no) \ $(if $(filter MACOSX,$(OS)), \ $(if $(filter INTEL,$(CPUNAME)),--enable-universalsdk=$
Re: About fdo#56963 (bt + Valgrind)
On Wed, 2014-10-15 at 14:36 -0700, julien2412 wrote: > Hello, > > After having been in contact with the reporter of fdo#56963, he gave me a > link to retrieve his file. Even if he declared having moved from LO to OOo, > I thought it could be useful to give a try to the file (400 pages, about 154 > MB in size). > So, on pc Debian x86-64 and master sources updated today, I just try to > scroll the file entirely to see what it could trigger. > I retrieved a backtrace > (https://bugs.freedesktop.org/attachment.cgi?id=107898)+ some Valgrind > traces with a lot of console warnings/errors > (https://bugs.freedesktop.org/attachment.cgi?id=107900) > > Perhaps all of these are already known (I think have already read about > "layout management problem"?), I wondered if someone might be interested. In > this case, I can provide the file (the reporter is ok, he just wants the > file not to be too present in Internet), Is this bibisectable ? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'feature/perfwork4'
New branch 'feature/perfwork4' available with the following commits: commit d72801ee81efc9a58be4be787ec62b31ef7e55bd Author: Kohei Yoshida Date: Wed Oct 15 17:27:01 2014 -0400 Delete old VCoordinateSystem objects right before creating new ones. Later I'll convert them into resetting rather than deleting old and creating new. Change-Id: I4e68979feda1dedc2465b873bf6ac3307df4d7de commit 9649e58287041a6dfeafea971e766d76c2573c7d Author: Kohei Yoshida Date: Wed Oct 15 14:26:02 2014 -0400 Reduce scopes and add some whitespaces. Change-Id: Ie1c94a4c241352c580d2509529919806f01ed6c0 commit b705b31bdcb7175265b1aa5b75382281bdedf0cd Author: Kohei Yoshida Date: Wed Oct 15 14:06:53 2014 -0400 Describe text animation types. Change-Id: I4f878eff707e318fa80b7d3c19833bf724e4bcef commit c0b5ef4a480f8c0104c5935802e3265732b6c098 Author: Kohei Yoshida Date: Wed Oct 15 10:04:51 2014 -0400 SetObjectItemSet() eventually calls NbcAdjustTextFrameWidthAndHeight(). No need to call this (rather expensive) method twice. Change-Id: I4c0a54acd1da0b8504ae7eb96beda4a8531943c7 commit 83e132e07c74742ca18a6d41c0a20291442b1b2f Author: Matúš Kukan Date: Mon Oct 13 12:37:13 2014 +0200 Move ZipPackageStream::saveChild to proper source file Change-Id: Icd108215874e830e5c9587f7dbb38a7f11ee27c8 commit 59b9cf441e5781a986cdf76598ab97d80578ef90 Author: Matúš Kukan Date: Mon Oct 13 09:54:28 2014 +0200 package: Add pure virtual ZipPackageEntry::saveChild() ..and adapt what needs to be changed. So that, we can kill at least some usages of horrible ContentInfo struct. Change-Id: I32d41f3b8ce2dfb65f0d1df18a540a3f67dcab6d commit 07b3b27817e2748a545369f244b63641c22de89f Author: Matúš Kukan Date: Wed Oct 15 10:19:56 2014 +0200 package: ZipPackageStream: prefix members Change-Id: I02a1c3189c6b52f4f539b0eaa8878985cae8b321 commit 764f0611a8146994edb04e464d459a3748ffd1aa Author: Kohei Yoshida Date: Tue Oct 14 17:40:40 2014 -0400 AdoptTextMinSize() calls NbcAdjustTextFrameWidthAndHeight() at the end. No need to call this again in the caller. Change-Id: Ib36853cf5a0720082275e0490b4443cd9e0bd007 commit 11fa18a2be4b5c0e86f8f18e7e80dca7aae8a167 Author: Kohei Yoshida Date: Tue Oct 14 17:19:56 2014 -0400 Reduce scope level & Annotate the code a bit. Change-Id: I6ebf849243000920b1c1f7e67d2dc81fcee9e16b commit 7a24cfe533f4802c7b7c2d4186156ac9b33803c3 Author: Kohei Yoshida Date: Tue Oct 14 16:29:04 2014 -0400 Remove local variables that are no longer used. Armin removed their uses in 120e469d176026ceb59abbf74d2ad255323cbc9a. Change-Id: Id620466929ca3a66dd1c261e81aacd533a44cd76 commit d82f3fcba92cbd323b70c921bbfb5c6aaf7d7f87 Author: Kohei Yoshida Date: Tue Oct 14 16:14:41 2014 -0400 Method descriptions. Change-Id: Iece61424e09fc36768889fde2c848ed2b0722701 commit 15160d246b389477ce91509df8fd50c1fb2b0a07 Author: Kohei Yoshida Date: Tue Oct 14 15:37:14 2014 -0400 Explain what these are. Change-Id: Ibb7b830c4216967a5877224c702ad4b3e1fe0b34 commit f283a1b09e9392621dbdc34bd110db768d3d0148 Author: Kohei Yoshida Date: Tue Oct 14 11:35:29 2014 -0400 Take the current axis alignment state. Change-Id: I02c28f44af0a1510bdb780d1e6c70561b7ba24e5 commit 9d818b03f2a647709a094043f9636b4ce21a291b Author: Kohei Yoshida Date: Mon Oct 13 19:32:15 2014 -0400 More on documenting the methods. Change-Id: Ibdbc1b26521e56de5dcba1b9572bb0221fc0fff5 commit 59596a64c65e66acadadb32c660fdba5dc7e54cb Author: Kohei Yoshida Date: Mon Oct 13 15:24:33 2014 -0400 Scope level reduction & explain what the max axis index really is. The concept of axis index and dimension index is quite confusing in the chart2 code Change-Id: I035af0a225396bd5394089d6f584f78dcaf0ad31 commit 32d99618c949e208dbe9625edf4e83fffa4578c0 Author: Kohei Yoshida Date: Mon Oct 13 15:11:51 2014 -0400 Explain what doAutoScaling() does. Change-Id: I15ca9ca0c3a22094f0a969adf2b3f1145d116052 commit 7189cb24ba5ca99701666c76009d15e618c1c5ae Author: Kohei Yoshida Date: Mon Oct 13 21:57:39 2014 -0400 Make VCartesianAxis::get2DAxisMainLine() truly const method. No internal state gets modified by this method now. Change-Id: I10475ad3483cb3a92e41208e1a55a6b925c10223 commit ca13a9377e4a36436e4c82bb33648d0f3b6db6f5 Author: Matúš Kukan Date: Thu Oct 9 15:22:54 2014 +0200 package: Add ZipOutputEntry to isolate deflating of streams. Preparation commit for deflating streams in parallel. We still use the same single XOutputStream (ByteChucker :-) for sequential writing but this can now be changed more easily. Change-Id: Idf26cc2187461660e31ac2e12c4708e761596fb2 commit 827879a0d18b817aa985e7d7039ae60f728ccabb Author: Kohei Yoshida Date: Fri Oct
[Bug 79641] LibreOffice 4.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=79641 Bug 79641 depends on bug 81496, which changed state. Bug 81496 Summary: FORMATTING: Crash in Format Page https://bugs.freedesktop.org/show_bug.cgi?id=81496 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source svl/source
sc/source/core/data/documen9.cxx |9 +
svl/source/items/itempool.cxx|5 -
2 files changed, 5 insertions(+), 9 deletions(-)
New commits:
commit f9aa686432c0ba62c6f440302d5a35856496a786
Author: Caolán McNamara
Date: Wed Oct 15 17:00:57 2014 +0100
Resolves: fdo#81496 crash in calc format page
Change-Id: Ic70f6f605e13a5c95b504f1bf0322e11313a21e7
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index c296cfd..629313d 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -133,7 +133,7 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell )
sfx2::LinkManager* pMgr =
GetDocLinkManager().getLinkManager(bAutoCalc);
if (pMgr)
pDrawLayer->SetLinkManager(pMgr);
-#if 1
+
// set DrawingLayer's SfxItemPool at Calc's SfxItemPool as
// secondary pool to support DrawingLayer FillStyle ranges (and
similar)
// in SfxItemSets using the Calc SfxItemPool. This is e.g. needed when
@@ -146,13 +146,9 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell )
if(pLocalPool)
{
OSL_ENSURE(!pLocalPool->GetSecondaryPool(), "OOps, already a
secondary pool set where the DrawingLayer ItemPool is to be placed (!)");
-#if 0
-// FIXME apparently this is disabled because it breaks tests
pLocalPool->SetSecondaryPool(&pDrawLayer->GetItemPool());
-#endif
}
}
-#endif
// Drawing pages are accessed by table number, so they must also be
present
// for preceding table numbers, even if the tables aren't allocated
@@ -252,10 +248,7 @@ void ScDocument::DeleteDrawLayer()
if(pLocalPool && pLocalPool->GetSecondaryPool())
{
-#if 0
-// FIXME apparently this is disabled because it breaks tests
pLocalPool->SetSecondaryPool(0);
-#endif
}
}
delete pDrawLayer;
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index 32a20b3..129622b 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -46,7 +46,10 @@ lcl_CheckSlots2(std::map & rSlotMap,
sal_uInt16 const nSlotId(pInfos[n]._nSID);
if (nSlotId != 0
&& nSlotId != 10883 // preexisting duplicate SID_ATTR_GRAF_CROP
-&& nSlotId != 10024) // preexisting duplicate SID_ATTR_BORDER_OUTER
+&& nSlotId != 10023 // preexisting duplicate SID_ATTR_BORDER_INNER
+&& nSlotId != 10024 // preexisting duplicate SID_ATTR_BORDER_OUTER
+&& nSlotId != 11013 // preexisting duplicate
SID_ATTR_BORDER_DIAG_TLBR
+&& nSlotId != 11014) // preexisting duplicate
SID_ATTR_BORDER_DIAG_BLTR
{ // check for duplicate slot-id mapping
std::map::const_iterator const iter(
rSlotMap.find(nSlotId));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: idl/inc idl/source
idl/inc/basobj.hxx | 26 --
idl/inc/bastype.hxx| 29 --
idl/inc/module.hxx |5
idl/inc/object.hxx |7
idl/inc/slot.hxx |3
idl/inc/types.hxx | 34 --
idl/source/objects/basobj.cxx | 108
idl/source/objects/bastype.cxx | 38 ---
idl/source/objects/module.cxx | 38 ---
idl/source/objects/object.cxx | 18 -
idl/source/objects/slot.cxx| 24 -
idl/source/objects/types.cxx | 506 -
12 files changed, 836 deletions(-)
New commits:
commit 4aaa4ceee75de7a0fbb552039d39567ab10c6d4b
Author: Stephan Bergmann
Date: Thu Oct 16 09:16:44 2014 +0200
Remove more unused idl parts
Change-Id: Id78de487b36a1c939dc3a4a5b38ab0b77999478c
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 5c0ac11..e35cc45 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -36,18 +36,6 @@ typedef SvMetaObject * (*CreateMetaObjectType)();
#define C_PREF "C_"
-enum WriteType
-{
-WRITE_C_HEADER, WRITE_C_SOURCE
-};
-
-enum
-{
-WA_METHOD = 0x1,WA_VARIABLE = 0x2, WA_ARGUMENT = 0x4,
-WA_STRUCT = 0x8,WA_READONLY = 0x10
-};
-typedef int WriteAttribute;
-
class SvMetaObject : public SvRttiBase
{
public:
@@ -61,9 +49,6 @@ public:
virtual boolReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
-virtual voidWrite( SvIdlDataBase & rBase, SvStream & rOutStm,
sal_uInt16 nTab,
-WriteType, WriteAttribute = 0 );
-
protected:
virtual ~SvMetaObject() {}
};
@@ -108,10 +93,6 @@ protected:
virtual void ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
virtual void ReadAttributesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm );
-virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm,
sal_uInt16 nTab,
-WriteType, WriteAttribute = 0);
-virtual void WriteContext( SvIdlDataBase & rBase, SvStream & rOutStm,
sal_uInt16 nTab,
-WriteType, WriteAttribute = 0);
public:
TYPEINFO_OVERRIDE();
SvMetaName();
@@ -127,9 +108,6 @@ public:
virtual boolTest( SvIdlDataBase &, SvTokenStream & rInStm );
virtual boolReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
SAL_OVERRIDE;
-virtual voidWrite( SvIdlDataBase & rBase, SvStream & rOutStm,
sal_uInt16 nTab,
- WriteType, WriteAttribute = 0)
SAL_OVERRIDE;
-voidWriteDescription( SvStream& rOutStm );
};
typedef tools::SvRef SvMetaNameRef;
@@ -204,12 +182,8 @@ public:
voidSetModule( SvIdlDataBase & rBase );
virtual boolReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
SAL_OVERRIDE;
-virtual voidWrite( SvIdlDataBase & rBase, SvStream & rOutStm,
sal_uInt16 nTab,
- WriteType, WriteAttribute = 0) SAL_OVERRIDE;
protected:
virtual voidReadAttributesSvIdl( SvIdlDataBase &, SvTokenStream &
rInStm ) SAL_OVERRIDE;
-virtual voidWriteAttributes( SvIdlDataBase & rBase, SvStream &
rOutStm, sal_uInt16 nTab,
- WriteType, WriteAttribute = 0)
SAL_OVERRIDE;
};
typedef tools::SvRef SvMetaExternRef;
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 1d86284..e8da2c4 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -29,26 +29,6 @@ class SvStringHashEntry;
class SvIdlDataBase;
class SvTokenStream;
-class SvUINT32
-{
-sal_uInt32 nVal;
-public:
-SvUINT32() { nVal = 0; }
-SvUINT32( sal_uInt32 n ) : nVal( n ) {}
-SvUINT32 & operator = ( sal_uInt32 n ) { nVal = n; return *this; }
-
-operatorsal_uInt32 &() { return nVal; }
-
-static sal_uInt32 Read( SvStream & rStm );
-static voidWrite( SvStream & rStm, sal_uInt32 nVal );
-
-friend SvStream& WriteSvUINT32(SvStream & rStm, const SvUINT32 & r )
-{ SvUINT32::Write( rStm, r.nVal ); return rStm; }
-friend SvStream& operator >> (SvStream & rStm, SvUINT32 & r )
-{ r.nVal = SvUINT32::Read( rStm ); return rStm; }
-};
-
-
class Svint
{
int nVal;
@@ -61,11 +41,6 @@ public:
operatorint ()const { return nVal; }
boolIsSet() const { return bSet; }
-
-friend SvStream& WriteSvint(SvStream & rStm, const Svint & r )
-{ SvUINT32::Write( rStm, (sal_uInt32)r.nVal );
rStm.WriteUInt8( r.bSet ); return rStm; }
-friend SvStream& operator >> (SvStream & rStm, Svint & r )
-{ r.nVal = (int)SvUINT32::Read( rStm ); rStm.ReadCharAsBool(
r.bSet ); return rStm; }
};
@@ -110,8 +85,6 @@ public:
{
return m_aStr;
}
-friend SvStream& WriteSvIdentifier(SvStream &, const SvIdentifier &);
[Libreoffice-commits] core.git: 3 commits - writerfilter/inc writerfilter/source
writerfilter/inc/resourcemodel/TagLogger.hxx |8 +---
writerfilter/source/dmapper/NumberingManager.cxx |4 ++--
writerfilter/source/dmapper/PropertyMap.cxx |2 +-
writerfilter/source/dmapper/PropertyMap.hxx |3 ---
writerfilter/source/dmapper/PropertyMapHelper.cxx |4 ++--
writerfilter/source/dmapper/PropertyMapHelper.hxx |4 ++--
writerfilter/source/dmapper/WrapPolygonHandler.cxx|8 ++--
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |5 ++---
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |4 ++--
writerfilter/source/ooxml/OOXMLParserState.cxx|2 +-
writerfilter/source/ooxml/OOXMLParserState.hxx|4 ++--
writerfilter/source/ooxml/factoryinc.py |6 +++---
writerfilter/source/resourcemodel/TagLogger.cxx |7 +--
writerfilter/source/rtftok/rtftokenizer.cxx |2 --
14 files changed, 21 insertions(+), 42 deletions(-)
New commits:
commit 7f71e99e3f35e7b94aa426f588276d05bf86bf09
Author: Miklos Vajna
Date: Thu Oct 16 09:25:06 2014 +0200
writerfilter: check for DEBUG_DOMAINMAPPER, not OSL_DEBUG_LEVEL explicitly
Previously code only built if DEBUG_DOMAINMAPPER was exactly defined
with OSL_DEBUG_LEVEL was > 1, as they these conditions were used for the
same purpose. Change all this dmapper XML dumping code to consistently
use DEBUG_DOMAINMAPPER, so later it'll be possible to change when it's
defined without breaking the build.
Change-Id: I32442cf098162c7d7c9eb7c454094685ab654b74
diff --git a/writerfilter/inc/resourcemodel/TagLogger.hxx
b/writerfilter/inc/resourcemodel/TagLogger.hxx
index 94fc67a..37a9078 100644
--- a/writerfilter/inc/resourcemodel/TagLogger.hxx
+++ b/writerfilter/inc/resourcemodel/TagLogger.hxx
@@ -61,26 +61,20 @@ namespace writerfilter
void setFileName(const std::string & filename);
void startDocument();
void endDocument();
-#endif
-#ifdef DEBUG_DOMAINMAPPER
void element(const std::string & name);
void unoPropertySet(css::uno::Reference
rPropSet);
-#endif
-#if OSL_DEBUG_LEVEL > 1
void startElement(const std::string & name);
#endif
void attribute(const std::string & name, const std::string & value);
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DEBUG_DOMAINMAPPER
void attribute(const std::string & name, const OUString & value);
void attribute(const std::string & name, sal_uInt32 value);
void attribute(const std::string & name, const css::uno::Any aAny);
void chars(const std::string & chars);
void chars(const OUString & chars);
void endElement();
-#endif
-#ifdef DEBUG_DOMAINMAPPER
void propertySet(writerfilter::Reference::Pointer_t props,
IdToString::Pointer_t pIdToString);
#endif
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index 63c44e2..eb420b7 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -48,7 +48,7 @@ namespace dmapper {
//--- Utility functions
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DEBUG_DOMAINMAPPER
void lcl_printProperties( uno::Sequence< beans::PropertyValue > aProps )
{
sal_Int32 nLen = aProps.getLength( );
@@ -578,7 +578,7 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper,
// Get the merged level properties
uno::Sequence< beans::PropertyValue > aLvlProps =
aProps[sal_Int32( nLevel )];
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DEBUG_DOMAINMAPPER
lcl_printProperties( aLvlProps );
#endif
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx
b/writerfilter/source/dmapper/PropertyMap.cxx
index 90c7fd0..8f3594c 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -293,7 +293,7 @@ bool PropertyMap::isSet( PropertyIds eId) const
return m_vMap.find(eId)!=m_vMap.end();
}
-#if OSL_DEBUG_LEVEL > 1
+#ifdef DEBUG_DOMAINMAPPER
void PropertyMap::dumpXml( const TagLogger::Pointer_t pLogger ) const
{
pLogger->startElement("PropertyMap");
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx
b/writerfilter/source/dmapper/PropertyMap.hxx
index 339f740..c496f97 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -172,9 +172,6 @@ public:
#ifdef DEBUG_DOMAINMAPPER
void printProperties();
-#endif
-
-#if OSL_DEBUG_LEVEL > 1
virtual void dumpXml( const TagLogger::Pointer_t pLogger ) const;
#endif
static com::sun::star::table::ShadowFormat
getShadowFromBorder(com::sun::star::table::BorderLine2 aBorder);
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.cxx
b/writerfilter/source/dmapper/PropertyMapHelper.cxx
index 5021922..b35145b 100644
--- a/writer
