LibreOffice Gerrit News for core on 2014-10-11
Moin!
* Open changes on master for project core changed in the last 25 hours:
First time contributors doing great things!
+ Sane configure GStreamer handling
in https://gerrit.libreoffice.org/11912 from Jan-Marek Glogowski
about module build
+ fdo#39625 Make existing CppUnittests work
in https://gerrit.libreoffice.org/11605 from Tobias Madl
about module sal
+ accessibility: The if statement is redundant
in https://gerrit.libreoffice.org/11890 from Robert Antoni Buj i Gelonch
about module toolkit
End of freshness
+ kill OUTPATH
in https://gerrit.libreoffice.org/11908 from Norbert Thiebaud
about module build, instsetoo_native, solenv
+ Work around IsNesting() of SwTxtAttrNesting vs. SwTxtInputFld confusion
in https://gerrit.libreoffice.org/11909 from Stephan Bergmann
about module sw
+ convert vcl StateChangedType to enum class
in https://gerrit.libreoffice.org/11843 from Noel Grandin
about module avmedia, cui, dbaccess, extensions, forms, framework, include,
sc, sd, sfx2, starmath, svtools, svx, sw, vcl
+ fdo#84647 : Fixed default value for TickLableSkip value.
in https://gerrit.libreoffice.org/11901 from sushil_shinde
about module chart2, oox
+ fdo#75757: remove inheritance to std::map
in https://gerrit.libreoffice.org/11899 from Takeshi Abe
about module include, oox, sc
* Merged changes on master for project core changed in the last 25 hours:
+ installer: populate installer::globals::[os,com,cpuname]
in https://gerrit.libreoffice.org/11907 from Norbert Thiebaud
+ remove unused $variables{'os'}
in https://gerrit.libreoffice.org/11906 from Norbert Thiebaud
+ fdo#65864: dont't traverse defs-nodes when in shape writing mode
in https://gerrit.libreoffice.org/11793 from Christina Roßmanith
+ Fix fdo#84795 Menu, DropDown-List not disappears with right mouse click
in https://gerrit.libreoffice.org/11881 from juegen funk
+ Scripting: Remove org package
in https://gerrit.libreoffice.org/11868 from David Ostrovsky
+ xmerge: The if statement is redundant
in https://gerrit.libreoffice.org/11894 from Robert Antoni Buj i Gelonch
+ runner: The if statement is redundant
in https://gerrit.libreoffice.org/11895 from Robert Antoni Buj i Gelonch
+ unchecked call to getDeclaredMethod(String,Class...)
in https://gerrit.libreoffice.org/11882 from Robert Antoni Buj i Gelonch
+ jurt: use new exception constructors
in https://gerrit.libreoffice.org/11892 from Robert Antoni Buj i Gelonch
+ bean: Use com.sun.star.uno.RuntimeException(Throwable thrwbl)
in https://gerrit.libreoffice.org/11889 from Robert Antoni Buj i Gelonch
+ move TRANSPARENT #define from windows.h out of global namespace
in https://gerrit.libreoffice.org/11880 from Noel Grandin
* Abandoned changes on master for project core changed in the last 25 hours:
None
* Open changes needing tweaks, but being untouched for more than a week:
+ 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
+ HIG-ification of GSoC Color Picker dialog
in https://gerrit.libreoffice.org/11494 from Olivier Hallot
+ 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#77716 : Paragraph spacing is not preserved after RT.
in https://gerrit.libreoffice.org/9197 from Tushar Bende
+ 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
Windows TB 39 & 42 builds of master need some help
Thorsten, Kendy, * TB42 dumped core and the libo-master~2014-10-10_23.17.23_LibreOfficeDev_4.4.0.0.alpha0_Win_x86.msi is only a partial installer package at 93MB. Not much in the build log--guess it got truncated. Nor has Kendy's TB39 spun a build since Monday the 6th--and of course corresponding debug symbols are not being updated. Not sure if yesterdays TB42 issues with Calc (fdo#84854-- https://bugs.freedesktop.org/show_bug.cgi?id=84854 ) were the tinderbox getting wobbly, or is a real issue with drawing the elements. Was hopping to review with todays build(s) of master. Anyhow, if you get a moment hope you can visit with your Tinderboxes to give them a poke. Thanks! Stuart F. San Antonio, Texas -- View this message in context: http://nabble.documentfoundation.org/Windows-TB-39-42-builds-of-master-need-some-help-tp4125400.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/ui/docshell/docfunc.cxx | 72 +-
sc/source/ui/inc/docfunc.hxx |8 ++-
sc/source/ui/view/viewfunc.cxx| 79 +-
3 files changed, 79 insertions(+), 80 deletions(-)
New commits:
commit ab58a180bdf08b38517e5ff603614c69e07bbbf2
Author: Kohei Yoshida
Date: Fri Oct 10 20:07:54 2014 -0400
Have ScViewFunc::DeleteContents() to call ScDocFunc's.
If bSimple = true, call DeleteCell(), otherwise call DeleteContents().
Change-Id: Ic08d9501797b537430bef0b6f3d920c3b497104b
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 3ed06d2..4f89e13 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -1766,8 +1766,6 @@ void ScViewFunc::DeleteContents( InsertDeleteFlags
nFlags, bool bRecord )
if (bRecord && !pDoc->IsUndoEnabled())
bRecord = false;
-ScDocShellModificator aModificator( *pDocSh );
-
if ( !aFuncMark.IsMarked() && !aFuncMark.IsMultiMarked() )
{
aMarkRange.aStart.SetCol(GetViewData().GetCurX());
@@ -1782,81 +1780,13 @@ void ScViewFunc::DeleteContents( InsertDeleteFlags
nFlags, bool bRecord )
bSimple = true;
}
-aFuncMark.SetMarking(false);// for MarkToMulti
-aFuncMark.MarkToSimple(); // before bMulti test below
-
-OSL_ENSURE( aFuncMark.IsMarked() || aFuncMark.IsMultiMarked() || bSimple,
"delete what?" );
-
-ScDocument* pUndoDoc = NULL;
-bool bMulti = !bSimple && aFuncMark.IsMultiMarked();
-if (!bSimple)
-{
-aFuncMark.MarkToMulti();
-aFuncMark.GetMultiMarkArea( aMarkRange );
-}
-ScRange aExtendedRange(aMarkRange);
-if (!bSimple)
-{
-if ( pDoc->ExtendMerge( aExtendedRange, true ) )
-bMulti = false;
-}
-
-// no objects on protected tabs
-bool bObjects = (nFlags & IDF_OBJECTS) &&
!sc::DocFuncUtil::hasProtectedTab(*pDoc, aFuncMark);
-
-sal_uInt16 nExtFlags = 0; // extra flags are needed only if
attributes are deleted
-if ( nFlags & IDF_ATTRIB )
-pDocSh->UpdatePaintExt( nExtFlags, aMarkRange );
-
-// order op opeeration:
-// 1) BeginDrawUndo
-// 2) delete objects (DrawUndo is filled)
-// 3) copy contents for undo
-// 4) delete contents
-// 5) add undo-action
-
-bool bDrawUndo = bObjects || ( nFlags & IDF_NOTE ); // needed for
shown notes
-if ( bDrawUndo && bRecord )
-pDoc->BeginDrawUndo();
-
-if (bObjects)
-{
-if (bMulti)
-pDoc->DeleteObjectsInSelection( aFuncMark );
-else
-pDoc->DeleteObjectsInArea( aMarkRange.aStart.Col(),
aMarkRange.aStart.Row(),
-/*!*/ aMarkRange.aEnd.Col(),
aMarkRange.aEnd.Row(),
- aFuncMark );
-}
-
-// To keep track of all non-empty cells within the deleted area.
-boost::shared_ptr pDataSpans;
-
-if ( bRecord )
-{
-pUndoDoc = sc::DocFuncUtil::createDeleteContentsUndoDoc(*pDoc,
aFuncMark, aExtendedRange, nFlags, bMulti);
-pDataSpans.reset(sc::DocFuncUtil::getNonEmptyCellSpans(*pDoc,
aFuncMark, aExtendedRange));
-}
-
HideAllCursors(); // for if summary is cancelled
+
+ScDocFunc& rDocFunc = pDocSh->GetDocFunc();
if (bSimple)
-pDoc->DeleteArea( aMarkRange.aStart.Col(), aMarkRange.aStart.Row(),
- aMarkRange.aEnd.Col(), aMarkRange.aEnd.Row(),
- aFuncMark, nFlags );
+rDocFunc.DeleteCell(aMarkRange.aStart, aFuncMark, nFlags, bRecord,
false);
else
-{
-pDoc->DeleteSelection( nFlags, aFuncMark );
-}
-
-if ( bRecord )
-{
-sc::DocFuncUtil::addDeleteContentsUndo(
-pDocSh->GetUndoManager(), pDocSh, aFuncMark, aExtendedRange,
pUndoDoc,
-nFlags, pDataSpans, bMulti, bDrawUndo);
-}
-
-if (!AdjustRowHeight( aExtendedRange.aStart.Row(),
aExtendedRange.aEnd.Row() ))
-pDocSh->PostPaint( aExtendedRange, PAINT_GRID, nExtFlags );
+rDocFunc.DeleteContents(aFuncMark, nFlags, bRecord, false);
pDocSh->UpdateOle(&GetViewData());
@@ -1874,7 +1804,6 @@ void ScViewFunc::DeleteContents( InsertDeleteFlags
nFlags, bool bRecord )
HelperNotifyChanges::Notify(*pModelObj, aChangeRanges);
}
-aModificator.SetDocumentModified();
CellContentChanged();
ShowAllCursors();
commit 7168096fdf35ee8b2afd330e3d9b3aab09772807
Author: Kohei Yoshida
Date: Fri Oct 10 19:59:57 2014 -0400
Add DeleteCell to ScDocFunc, which is a variant of DeleteContents ...
for a single cell case. This is equivalent of ScViewFunc::DeleteConents
with bSimple = true.
Change-Id: I5eccce21843f4cb21b29f96b0360617a180aebee
diff --git a/sc/source/ui/docshell/docfunc.cxx
b/sc/source/ui/docshell/docfunc.cxx
index 03a3a9d..b308544 100644
--- a/sc/source/ui/docshel
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/modules/installer/control.pm |3 +++
solenv/bin/modules/installer/environment.pm |3 +++
solenv/bin/modules/installer/globals.pm |3 +++
3 files changed, 9 insertions(+)
New commits:
commit 06c1844485f1d9fc4f3eb156ec7b871eebea8402
Author: Norbert Thiebaud
Date: Fri Oct 10 04:24:12 2014 -0500
installer: populate installer::globals::[os,com,cpuname]
with there respective env variable OS,COM,CPUNAME
this is a first step to get rid of OUTPATH
Change-Id: Idab4dd7b19deba5252390cbd2cb74dfff9efe64e
Reviewed-on: https://gerrit.libreoffice.org/11907
Reviewed-by: Norbert Thiebaud
Tested-by: Norbert Thiebaud
diff --git a/solenv/bin/modules/installer/control.pm
b/solenv/bin/modules/installer/control.pm
index 3b77433..0cdb532 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -267,6 +267,9 @@ sub check_system_environment
my @environmentvariables = qw(
LIBO_VERSION_MAJOR
LIBO_VERSION_MINOR
+CPUNAME
+OS
+COM
OUTPATH
LOCAL_OUT
LOCAL_COMMON_OUT
diff --git a/solenv/bin/modules/installer/environment.pm
b/solenv/bin/modules/installer/environment.pm
index 9347b9b..5e106b21 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -107,6 +107,9 @@ sub set_global_environment_variables
$installer::globals::build =
$environment->{'LIBO_VERSION_MAJOR'}.$environment->{'LIBO_VERSION_MINOR'}."0";
$installer::globals::compiler = $environment->{'OUTPATH'};
+$installer::globals::os = $environment->{'OS'};
+$installer::globals::com = $environment->{'COM'};
+$installer::globals::cpuname = $environment->{'CPUNAME};
if ( $ENV{'LAST_MINOR'} ) { $installer::globals::lastminor =
$ENV{'LAST_MINOR'}; }
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index 2076e8b..8ceb563 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -40,6 +40,9 @@ BEGIN
$minor = "";
$lastminor = "";
$compiler = "";
+$os = "";
+$cpuname = "";
+$com = "";
$pro = 0;
$dounzip = 1;
$languages_defined_in_productlist = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/modules/installer/environment.pm |2 --
1 file changed, 2 deletions(-)
New commits:
commit d9b325f6b53db502e197feb4e50f59bf57682bbd
Author: Norbert Thiebaud
Date: Fri Oct 10 04:22:36 2014 -0500
remove unused $variables{'os'}
Change-Id: Idaf0b0e9fc38dc05f24c111304ef5189b4ba111c
Reviewed-on: https://gerrit.libreoffice.org/11906
Reviewed-by: Norbert Thiebaud
Tested-by: Norbert Thiebaud
diff --git a/solenv/bin/modules/installer/environment.pm
b/solenv/bin/modules/installer/environment.pm
index efa93b4..9347b9b 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -33,8 +33,6 @@ sub create_pathvariables
# The following variables are needed in the path file list
# solarenvpath, os, pmiscpath
-$variables{'os'} = $installer::globals::compiler;
-
my $solarenvpath = "";
if ( $ENV{'SO_PACK'} ) { $solarenvpath = $ENV{'SO_PACK'}; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 7 commits - connectivity/source desktop/source filter/qa include/unotools sd/qa starmath/qa unotools/source
connectivity/source/drivers/firebird/Driver.cxx | 14 +-
connectivity/source/drivers/firebird/Driver.hxx |1
desktop/source/app/app.cxx | 54 ---
filter/qa/cppunit/xslt-test.cxx |4 +
include/unotools/localfilehelper.hxx|3 +
sd/qa/unit/export-tests.cxx | 31 ++---
sd/qa/unit/import-tests.cxx | 56
starmath/qa/cppunit/test_starmath.cxx |1
unotools/source/ucbhelper/localfilehelper.cxx | 51 +
unotools/source/ucbhelper/tempfile.cxx |6 +-
10 files changed, 121 insertions(+), 100 deletions(-)
New commits:
commit 99b6fc7b72452660f59ebeec8596cba375c02f9d
Author: Michael Stahl
Date: Sat Oct 11 00:24:32 2014 +0200
sd: another temp-file leak
Change-Id: Idcd31ea07c460aaecff3ea56072cf65e26040bda
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index df1db00..61aead3 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -474,6 +474,7 @@ void SdExportTest::testFdo83751()
OUString propValue;
xUDProps->getPropertyValue(OUString("Testing")) >>= propValue;
CPPUNIT_ASSERT_EQUAL(OUString("Document"), propValue);
+xDocShRef->DoClose();
}
CPPUNIT_TEST_SUITE_REGISTRATION(SdExportTest);
commit 8a74ad7f242dda910abec22fb6106a70651c8b5e
Author: Michael Stahl
Date: Fri Oct 10 21:23:08 2014 +0200
sd: rename test classes to be unique
Change-Id: I18d4f6af97fcfb9341711751a8d550e421f7a381
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 7aa1e26..df1db00 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -56,7 +56,7 @@
using namespace ::com::sun::star;
-class SdFiltersTest : public SdModelTestBase
+class SdExportTest : public SdModelTestBase
{
public:
void testN821567();
@@ -72,7 +72,7 @@ public:
void testBnc822347_EmptyBullet();
void testFdo83751();
-CPPUNIT_TEST_SUITE(SdFiltersTest);
+CPPUNIT_TEST_SUITE(SdExportTest);
CPPUNIT_TEST(testN821567);
CPPUNIT_TEST(testBnc870233_1);
CPPUNIT_TEST(testBnc870233_2);
@@ -88,7 +88,7 @@ public:
CPPUNIT_TEST_SUITE_END();
};
-void SdFiltersTest::testN821567()
+void SdExportTest::testN821567()
{
OUString bgImage;
::sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/pptx/n821567.pptx"), PPTX );
@@ -154,7 +154,7 @@ void checkFontAttributes(const SdrTextObj* pObj, sal_uInt32
nColor,
}
-void SdFiltersTest::testBnc870233_1()
+void SdExportTest::testBnc870233_1()
{
::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc870233_1.pptx"), PPTX);
xDocShRef = saveAndReload( xDocShRef, PPTX );
@@ -183,7 +183,7 @@ void SdFiltersTest::testBnc870233_1()
xDocShRef->DoClose();
}
-void SdFiltersTest::testBnc870233_2()
+void SdExportTest::testBnc870233_2()
{
::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc870233_2.pptx"), PPTX);
xDocShRef = saveAndReload( xDocShRef, PPTX );
@@ -219,7 +219,7 @@ void SdFiltersTest::testBnc870233_2()
xDocShRef->DoClose();
}
-void SdFiltersTest::testN828390_4()
+void SdExportTest::testN828390_4()
{
bool bPassed = false;
::sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/n828390_4.odp"), ODP );
@@ -258,7 +258,7 @@ void SdFiltersTest::testN828390_4()
xDocShRef->DoClose();
}
-void SdFiltersTest::testN828390_5()
+void SdExportTest::testN828390_5()
{
::sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/n828390_5.odp"), ODP );
@@ -281,7 +281,7 @@ void SdFiltersTest::testN828390_5()
xDocShRef->DoClose();
}
-void SdFiltersTest::testMediaEmbedding()
+void SdExportTest::testMediaEmbedding()
{
::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/media_embedding.odp"), ODP);
@@ -316,7 +316,7 @@ void SdFiltersTest::testMediaEmbedding()
xDocShRef->DoClose();
}
-void SdFiltersTest::testFdo71961()
+void SdExportTest::testFdo71961()
{
::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/fdo71961.odp"), ODP);
@@ -347,7 +347,7 @@ void SdFiltersTest::testFdo71961()
xDocShRef->DoClose();
}
-void SdFiltersTest::testN828390()
+void SdExportTest::testN828390()
{
bool bPassed = false;
::sd::DrawDocShellRef xDocShRef = loadURL(
getURLFromSrc("/sd/qa/unit/data/pptx/n828390.pptx"), PPTX );
@@ -384,7 +384,7 @@ void SdFiltersTest::testN828390()
xDocShRef->DoClose();
}
-void SdFiltersTest::testBnc880763()
+void SdExportTest::testBnc880763()
{
::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc880763.pptx"), PPTX);
xDocShRef = saveAndReload( xDocShRef, PPTX );
@@ -408,7 +408,7 @@ void SdFiltersTest::testBnc880763()
xDocShRef->DoClose
[Libreoffice-commits] core.git: filter/source
filter/source/svg/svgreader.cxx | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
New commits:
commit 5e27d23d7e665cc0aeac8fc9ea2236bf8bc088ff
Author: Chr. Rossmanith
Date: Fri Oct 3 13:51:00 2014 +0200
fdo#65864: dont't traverse defs-nodes when in shape writing mode
Relevant for opening svg images via File->Open:
Children of the element should be interpreted only during the
style collecting step. Collecting elements from clip paths
during the shape writing step leads to unwanted black polygons.
Change-Id: I73598134c9be2877e975a7e756541ec3026fe768
Reviewed-on: https://gerrit.libreoffice.org/11793
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index da2ae3d..44df957 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -53,6 +53,7 @@ using namespace ::com::sun::star;
namespace svgi
{
+enum SvgiVisitorCaller {STYLE_ANNOTATOR, SHAPE_WRITER, STYLE_WRITER};
namespace
{
@@ -78,7 +79,8 @@ template void visitChildren(const Func& rFunc,
element's attributes, if any
*/
template void visitElements(Func& rFunc,
- const
uno::Reference xElem)
+ const
uno::Reference xElem,
+ SvgiVisitorCaller eCaller)
{
if( xElem->hasAttributes() )
rFunc(xElem,xElem->getAttributes());
@@ -89,6 +91,9 @@ template void visitElements(Func& rFunc,
rFunc.push();
// recurse over children
+if (eCaller == SHAPE_WRITER && xElem->getTagName() == "defs") {
+return;
+}
uno::Reference xChildren( xElem->getChildNodes() );
const sal_Int32 nNumNodes( xChildren->getLength() );
for( sal_Int32 i=0; i void visitElements(Func& rFunc,
visitElements( rFunc,
uno::Reference(
xChildren->item(i),
- uno::UNO_QUERY_THROW) );
+ uno::UNO_QUERY_THROW),
+ eCaller );
}
// children processing done
@@ -1170,7 +1176,7 @@ static void annotateStyles( StatePool&
rS
const uno::Reference&
xDocHdl )
{
AnnotatingVisitor aVisitor(rStatePool,rStateMap,rInitialState,xDocHdl);
-visitElements(aVisitor, xElem);
+visitElements(aVisitor, xElem, STYLE_ANNOTATOR);
}
struct ShapeWritingVisitor
@@ -1706,7 +1712,7 @@ static void writeShapes( StatePool&
rStat
const uno::Reference&
xDocHdl )
{
ShapeWritingVisitor aVisitor(rStatePool,rStateMap,xDocHdl);
-visitElements(aVisitor, xElem);
+visitElements(aVisitor, xElem, SHAPE_WRITER);
}
} // namespace
@@ -1822,7 +1828,7 @@ static void writeOfficeStyles( StateMap&
const
uno::Reference& xDocHdl )
{
OfficeStylesWritingVisitor aVisitor( rStateMap, xDocHdl );
-visitElements( aVisitor, xElem );
+visitElements( aVisitor, xElem, STYLE_WRITER );
}
#if OSL_DEBUG_LEVEL > 2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: ESC call Thursday 16:00 central European time ...
Le Wed, 08 Oct 2014 14:10:53 +0200, Bjoern Michaelsen a écrit: [1] E.g. someone volunteering to tweak the daily gerrit digest to: - work on release branches - do a weekly? digest - sorted by the source code module (so some could watch Writer, some Calc, etc.) Could allow QA/supporter guys to have more early visibility of what is happening. Then again, this would need people to actually _read_ that regularly. If anyone volunteers to invest (both in writing/setting up the tooling and creating a group using it) here, it might be worth a few experiments. Well, I could do the technical part, but will do iff someone would deliver the last update to production machine (so we have a real update for newcomer names) :-P And seeing the small part that read the current digest, I doubt it will be useful unless some QA people take the point on spying the release digest. My 2 cents Mat ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/workben
vcl/workben/icontest.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 96adec2fd56d1ca09d679c0966567c674d812dfb
Author: Tor Lillqvist
Date: Fri Oct 10 22:50:44 2014 +0300
Print out the timing results unconditionally
Because that is after all what we are after here, and we want them even in a
non-debug build.
Change-Id: I4770f6b0420b2a65ccc813f0e400cbb39b0d44fe
diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx
index 10253c7..87f3897 100644
--- a/vcl/workben/icontest.cxx
+++ b/vcl/workben/icontest.cxx
@@ -96,7 +96,7 @@ MyWorkWindow::MyWorkWindow( vcl::Window* pParent, WinBits
nWinStyle ) :
void MyWorkWindow::Paint( const Rectangle& rRect )
{
-SAL_INFO("vcl.icontest", "==> Paint! " << nPaintCount++ << " (vcl) " <<
GetSizePixel() << " " << getTimeNow() - nStartTime);
+std::cerr << "==> Paint! " << nPaintCount++ << " (vcl) " << GetSizePixel()
<< " " << getTimeNow() - nStartTime << std::endl;
WorkWindow::Paint( rRect );
Invalidate( INVALIDATE_CHILDREN );
}
@@ -199,7 +199,7 @@ void MyOpenGLWorkWindow::LoadTexture()
void MyOpenGLWorkWindow::Paint( const Rectangle& )
{
-SAL_INFO("vcl.icontest", "==> Paint! "<< nPaintCount++ << " (OpenGL) " <<
GetSizePixel() << " " << getTimeNow() - nStartTime);
+std::cerr << "==> Paint! "<< nPaintCount++ << " (OpenGL) " <<
GetSizePixel() << " " << getTimeNow() - nStartTime << std::endl;
OpenGLContext& aCtx = mpOpenGLWindow->getContext();
aCtx.requestLegacyContext();
CHECK_GL_ERROR();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 6 commits - chart2/source
chart2/source/view/axes/VCoordinateSystem.cxx | 40 ++--
chart2/source/view/inc/VCoordinateSystem.hxx |9
chart2/source/view/main/ChartView.cxx | 255 +-
3 files changed, 166 insertions(+), 138 deletions(-)
New commits:
commit ecf648b3a5881a5f24f5b26d51fb4823b225aed4
Author: Kohei Yoshida
Date: Fri Oct 10 14:12:04 2014 -0400
Make the variable name shorter and sweeter...
Change-Id: Ibea26f3c99b50f2011050960794d9736566ee7ce
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx
b/chart2/source/view/axes/VCoordinateSystem.cxx
index 1f1fe68..7e88097 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -77,7 +77,7 @@ VCoordinateSystem::VCoordinateSystem( const Reference<
XCoordinateSystem >& xCoo
, m_eLeftWallPos(CuboidPlanePosition_Left)
, m_eBackWallPos(CuboidPlanePosition_Back)
, m_eBottomPos(CuboidPlanePosition_Bottom)
-, m_aMergedMinimumAndMaximumSupplier()
+, m_aMergedMinMaxSupplier()
, m_aExplicitScales(3)
, m_aExplicitIncrements(3)
, m_apExplicitCategoriesProvider(NULL)
@@ -360,13 +360,14 @@ void VCoordinateSystem::prepareAutomaticAxisScaling(
ScaleAutomatism& rScaleAuto
{
if( rScaleAutomatism.getScale().AxisType==AxisType::DATE && nDimIndex==0 )
{
+// This is a date X dimension. Determine proper time resolution.
sal_Int32 nTimeResolution = ::com::sun::star::chart::TimeUnit::MONTH;
if( !(rScaleAutomatism.getScale().TimeIncrement.TimeResolution >>=
nTimeResolution) )
{
-nTimeResolution =
m_aMergedMinimumAndMaximumSupplier.calculateTimeResolutionOnXAxis();
+nTimeResolution =
m_aMergedMinMaxSupplier.calculateTimeResolutionOnXAxis();
rScaleAutomatism.setAutomaticTimeResolution( nTimeResolution );
}
-m_aMergedMinimumAndMaximumSupplier.setTimeResolutionOnXAxis(
nTimeResolution, rScaleAutomatism.getNullDate() );
+m_aMergedMinMaxSupplier.setTimeResolutionOnXAxis( nTimeResolution,
rScaleAutomatism.getNullDate() );
}
double fMin = 0.0;
@@ -375,31 +376,34 @@ void VCoordinateSystem::prepareAutomaticAxisScaling(
ScaleAutomatism& rScaleAuto
::rtl::math::setInf(&fMax, true);
if( 0 == nDimIndex )
{
-fMin = m_aMergedMinimumAndMaximumSupplier.getMinimumX();
-fMax = m_aMergedMinimumAndMaximumSupplier.getMaximumX();
+// x dimension
+fMin = m_aMergedMinMaxSupplier.getMinimumX();
+fMax = m_aMergedMinMaxSupplier.getMaximumX();
}
else if( 1 == nDimIndex )
{
+// y dimension
ExplicitScaleData aScale = getExplicitScale( 0, 0 );
-fMin =
m_aMergedMinimumAndMaximumSupplier.getMinimumYInRange(aScale.Minimum,aScale.Maximum,
nAxisIndex);
-fMax =
m_aMergedMinimumAndMaximumSupplier.getMaximumYInRange(aScale.Minimum,aScale.Maximum,
nAxisIndex);
+fMin =
m_aMergedMinMaxSupplier.getMinimumYInRange(aScale.Minimum,aScale.Maximum,
nAxisIndex);
+fMax =
m_aMergedMinMaxSupplier.getMaximumYInRange(aScale.Minimum,aScale.Maximum,
nAxisIndex);
}
else if( 2 == nDimIndex )
{
-fMin = m_aMergedMinimumAndMaximumSupplier.getMinimumZ();
-fMax = m_aMergedMinimumAndMaximumSupplier.getMaximumZ();
+// z dimension
+fMin = m_aMergedMinMaxSupplier.getMinimumZ();
+fMax = m_aMergedMinMaxSupplier.getMaximumZ();
}
//merge our values with those already contained in rScaleAutomatism
rScaleAutomatism.expandValueRange( fMin, fMax );
rScaleAutomatism.setAutoScalingOptions(
-m_aMergedMinimumAndMaximumSupplier.isExpandBorderToIncrementRhythm(
nDimIndex ),
-m_aMergedMinimumAndMaximumSupplier.isExpandIfValuesCloseToBorder(
nDimIndex ),
-m_aMergedMinimumAndMaximumSupplier.isExpandWideValuesToZero( nDimIndex
),
-m_aMergedMinimumAndMaximumSupplier.isExpandNarrowValuesTowardZero(
nDimIndex ) );
+m_aMergedMinMaxSupplier.isExpandBorderToIncrementRhythm( nDimIndex ),
+m_aMergedMinMaxSupplier.isExpandIfValuesCloseToBorder( nDimIndex ),
+m_aMergedMinMaxSupplier.isExpandWideValuesToZero( nDimIndex ),
+m_aMergedMinMaxSupplier.isExpandNarrowValuesTowardZero( nDimIndex ) );
-VAxisBase* pVAxis( this->getVAxis( nDimIndex, nAxisIndex ) );
+VAxisBase* pVAxis = getVAxis(nDimIndex, nAxisIndex);
if( pVAxis )
rScaleAutomatism.setMaximumAutoMainIncrementCount(
pVAxis->estimateMaximumAutoMainIncrementCount() );
}
@@ -530,17 +534,17 @@ void VCoordinateSystem::createGridShapes()
}
void VCoordinateSystem::addMinimumAndMaximumSupplier(
MinimumAndMaximumSupplier* pMinimumAndMaximumSupplier )
{
-
m_aMergedMinimumAndMaximumSupplier.addMinimumAndMaximumSupplier(pMinimumAndMaximumSupplier);
+
m_aMergedMinMaxSupplier.addMinimumAndMaximumSupplier(pMinimumAndMaximumSupplier);
}
bool VCoordinateSystem::hasMinimumAn
[Libreoffice-commits] core.git: Branch 'feature/perfwork' - 6 commits - chart2/source
chart2/source/view/axes/VCoordinateSystem.cxx | 40 ++--
chart2/source/view/inc/VCoordinateSystem.hxx |9
chart2/source/view/main/ChartView.cxx | 255 +-
3 files changed, 166 insertions(+), 138 deletions(-)
New commits:
commit f55f733f5c3102ec08961e7a66e4502af898662b
Author: Kohei Yoshida
Date: Fri Oct 10 14:12:04 2014 -0400
Make the variable name shorter and sweeter...
Change-Id: Ibea26f3c99b50f2011050960794d9736566ee7ce
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx
b/chart2/source/view/axes/VCoordinateSystem.cxx
index 0200f15..2a3f5b1 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -77,7 +77,7 @@ VCoordinateSystem::VCoordinateSystem( const Reference<
XCoordinateSystem >& xCoo
, m_eLeftWallPos(CuboidPlanePosition_Left)
, m_eBackWallPos(CuboidPlanePosition_Back)
, m_eBottomPos(CuboidPlanePosition_Bottom)
-, m_aMergedMinimumAndMaximumSupplier()
+, m_aMergedMinMaxSupplier()
, m_aExplicitScales(3)
, m_aExplicitIncrements(3)
, m_apExplicitCategoriesProvider(NULL)
@@ -360,13 +360,14 @@ void VCoordinateSystem::prepareAutomaticAxisScaling(
ScaleAutomatism& rScaleAuto
{
if( rScaleAutomatism.getScale().AxisType==AxisType::DATE && nDimIndex==0 )
{
+// This is a date X dimension. Determine proper time resolution.
sal_Int32 nTimeResolution = ::com::sun::star::chart::TimeUnit::MONTH;
if( !(rScaleAutomatism.getScale().TimeIncrement.TimeResolution >>=
nTimeResolution) )
{
-nTimeResolution =
m_aMergedMinimumAndMaximumSupplier.calculateTimeResolutionOnXAxis();
+nTimeResolution =
m_aMergedMinMaxSupplier.calculateTimeResolutionOnXAxis();
rScaleAutomatism.setAutomaticTimeResolution( nTimeResolution );
}
-m_aMergedMinimumAndMaximumSupplier.setTimeResolutionOnXAxis(
nTimeResolution, rScaleAutomatism.getNullDate() );
+m_aMergedMinMaxSupplier.setTimeResolutionOnXAxis( nTimeResolution,
rScaleAutomatism.getNullDate() );
}
double fMin = 0.0;
@@ -375,31 +376,34 @@ void VCoordinateSystem::prepareAutomaticAxisScaling(
ScaleAutomatism& rScaleAuto
::rtl::math::setInf(&fMax, true);
if( 0 == nDimIndex )
{
-fMin = m_aMergedMinimumAndMaximumSupplier.getMinimumX();
-fMax = m_aMergedMinimumAndMaximumSupplier.getMaximumX();
+// x dimension
+fMin = m_aMergedMinMaxSupplier.getMinimumX();
+fMax = m_aMergedMinMaxSupplier.getMaximumX();
}
else if( 1 == nDimIndex )
{
+// y dimension
ExplicitScaleData aScale = getExplicitScale( 0, 0 );
-fMin =
m_aMergedMinimumAndMaximumSupplier.getMinimumYInRange(aScale.Minimum,aScale.Maximum,
nAxisIndex);
-fMax =
m_aMergedMinimumAndMaximumSupplier.getMaximumYInRange(aScale.Minimum,aScale.Maximum,
nAxisIndex);
+fMin =
m_aMergedMinMaxSupplier.getMinimumYInRange(aScale.Minimum,aScale.Maximum,
nAxisIndex);
+fMax =
m_aMergedMinMaxSupplier.getMaximumYInRange(aScale.Minimum,aScale.Maximum,
nAxisIndex);
}
else if( 2 == nDimIndex )
{
-fMin = m_aMergedMinimumAndMaximumSupplier.getMinimumZ();
-fMax = m_aMergedMinimumAndMaximumSupplier.getMaximumZ();
+// z dimension
+fMin = m_aMergedMinMaxSupplier.getMinimumZ();
+fMax = m_aMergedMinMaxSupplier.getMaximumZ();
}
//merge our values with those already contained in rScaleAutomatism
rScaleAutomatism.expandValueRange( fMin, fMax );
rScaleAutomatism.setAutoScalingOptions(
-m_aMergedMinimumAndMaximumSupplier.isExpandBorderToIncrementRhythm(
nDimIndex ),
-m_aMergedMinimumAndMaximumSupplier.isExpandIfValuesCloseToBorder(
nDimIndex ),
-m_aMergedMinimumAndMaximumSupplier.isExpandWideValuesToZero( nDimIndex
),
-m_aMergedMinimumAndMaximumSupplier.isExpandNarrowValuesTowardZero(
nDimIndex ) );
+m_aMergedMinMaxSupplier.isExpandBorderToIncrementRhythm( nDimIndex ),
+m_aMergedMinMaxSupplier.isExpandIfValuesCloseToBorder( nDimIndex ),
+m_aMergedMinMaxSupplier.isExpandWideValuesToZero( nDimIndex ),
+m_aMergedMinMaxSupplier.isExpandNarrowValuesTowardZero( nDimIndex ) );
-VAxisBase* pVAxis( this->getVAxis( nDimIndex, nAxisIndex ) );
+VAxisBase* pVAxis = getVAxis(nDimIndex, nAxisIndex);
if( pVAxis )
rScaleAutomatism.setMaximumAutoMainIncrementCount(
pVAxis->estimateMaximumAutoMainIncrementCount() );
}
@@ -530,17 +534,17 @@ void VCoordinateSystem::createGridShapes()
}
void VCoordinateSystem::addMinimumAndMaximumSupplier(
MinimumAndMaximumSupplier* pMinimumAndMaximumSupplier )
{
-
m_aMergedMinimumAndMaximumSupplier.addMinimumAndMaximumSupplier(pMinimumAndMaximumSupplier);
+
m_aMergedMinMaxSupplier.addMinimumAndMaximumSupplier(pMinimumAndMaximumSupplier);
}
bool VCoordinateSystem::hasMinimumAn
[Libreoffice-commits] core.git: vcl/workben
vcl/workben/icontest.cxx | 31 ---
1 file changed, 28 insertions(+), 3 deletions(-)
New commits:
commit 4fd547e61ef97ca15fb5474044ee91cffda6e389
Author: Tor Lillqvist
Date: Fri Oct 10 21:16:24 2014 +0300
Add some silly looping and timing
Change-Id: Ibfb77e7d5fb32c317e773851536444679e5b65fa
diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx
index 6e8bd7e..10253c7 100644
--- a/vcl/workben/icontest.cxx
+++ b/vcl/workben/icontest.cxx
@@ -10,7 +10,8 @@
/*
* ===
*
- * This is a quick hack to test some stuff. Work in progress. Don't touch.
+ * This is a quick hack to test some stuff. Work in progress. Don't touch
+ * and don't bother inspecting too closely.
*
* ===
*/
@@ -45,13 +46,27 @@ using namespace com::sun::star;
namespace {
const int WIDTH = 1000, HEIGHT = 800;
+
+double getTimeNow()
+{
+TimeValue aValue;
+osl_getSystemTime(&aValue);
+return (double)aValue.Seconds +
+(double)aValue.Nanosec / (1000*1000*1000);
+}
+
}
class MyWorkWindow : public WorkWindow
{
+protected:
+double nStartTime;
+int nPaintCount;
+
public:
MyWorkWindow( vcl::Window* pParent, WinBits nWinStyle );
+virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
virtual void Resize() SAL_OVERRIDE;
};
@@ -69,15 +84,23 @@ public:
MyOpenGLWorkWindow( vcl::Window* pParent, WinBits nWinStyle );
virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
-
};
MyWorkWindow::MyWorkWindow( vcl::Window* pParent, WinBits nWinStyle ) :
WorkWindow( pParent, nWinStyle )
{
+nPaintCount = 0;
+nStartTime = getTimeNow();
EnableInput();
}
+void MyWorkWindow::Paint( const Rectangle& rRect )
+{
+SAL_INFO("vcl.icontest", "==> Paint! " << nPaintCount++ << " (vcl) " <<
GetSizePixel() << " " << getTimeNow() - nStartTime);
+WorkWindow::Paint( rRect );
+Invalidate( INVALIDATE_CHILDREN );
+}
+
MyOpenGLWorkWindow::MyOpenGLWorkWindow( vcl::Window* pParent, WinBits
nWinStyle ) :
MyWorkWindow( pParent, nWinStyle )
{
@@ -176,7 +199,7 @@ void MyOpenGLWorkWindow::LoadTexture()
void MyOpenGLWorkWindow::Paint( const Rectangle& )
{
-SAL_INFO("vcl.icontest", "==> Paint! (OpenGL) " << GetSizePixel());
+SAL_INFO("vcl.icontest", "==> Paint! "<< nPaintCount++ << " (OpenGL) " <<
GetSizePixel() << " " << getTimeNow() - nStartTime);
OpenGLContext& aCtx = mpOpenGLWindow->getContext();
aCtx.requestLegacyContext();
CHECK_GL_ERROR();
@@ -228,6 +251,8 @@ void MyOpenGLWorkWindow::Paint( const Rectangle& )
aCtx.swapBuffers();
CHECK_GL_ERROR();
+
+Invalidate( INVALIDATE_CHILDREN );
}
void MyWorkWindow::Resize()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/source sw/source writerfilter/source
starmath/source/wordexportbase.cxx |2 +-
sw/source/filter/ww8/docxsdrexport.cxx |2 +-
sw/source/filter/ww8/rtfattributeoutput.cxx| 20 ++--
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 10 +-
writerfilter/source/rtftok/rtfsdrimport.cxx|2 +-
5 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 510c3586460f234a5ba6f9da16eea0dd5768656c
Author: Miklos Vajna
Date: Fri Oct 10 20:14:52 2014 +0200
indentation fixes
Change-Id: I56664b455383f69137399e4c5fb28521ef813287
diff --git a/starmath/source/wordexportbase.cxx
b/starmath/source/wordexportbase.cxx
index 26af5a9..885ca72 100644
--- a/starmath/source/wordexportbase.cxx
+++ b/starmath/source/wordexportbase.cxx
@@ -172,7 +172,7 @@ void SmWordExportBase::HandleMath(const SmNode* pNode, int
nLevel)
case TDIVIDEBY:
case TACUTE:
OSL_ASSERT(false);
-// the above are handled elsewhere, e.g. when handling BINHOR
+// the above are handled elsewhere, e.g. when handling BINHOR
default:
HandleText(pNode, nLevel);
break;
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index d834c70..b371b8e 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -626,7 +626,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt*
pFrmFmt, const Size& rS
break;
}
}
-else if(const SdrObject* pObject = pFrmFmt->FindRealSdrObject())
+else if (const SdrObject* pObject = pFrmFmt->FindRealSdrObject())
{
// No shadow, but we have an idea what was the original effectExtent.
uno::Any aAny;
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 89ba42c..a576ddc 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3187,10 +3187,10 @@ void RtfAttributeOutput::WriteExpand(const SwField*
pFld)
OUString sCmd;// for optional Parameters
switch (pFld->GetTyp()->Which())
{
-//#i119803# Export user field and DB field for RTF filter
+//#i119803# Export user field and DB field for RTF filter
case RES_DBFLD:
sCmd = FieldString(ww::eMERGEFIELD);
-// no break !!
+// no break !!
case RES_USERFLD:
sCmd += pFld->GetTyp()->GetName();
m_rExport.OutputField(pFld, ww::eNONE, sCmd);
@@ -3640,14 +3640,14 @@ void RtfAttributeOutput::FlyFrameGraphic(const
SwFlyFrmFmt* pFlyFrmFmt, const Sw
pGraphicAry = aGraphicLink.GetData();
switch (aGraphicLink.GetType())
{
-// #i15508# trying to add BMP type for better exports, need to
check if this works
-// checked, does not work. Also need to reset pGraphicAry to NULL
to force conversion
-// to PNG, else the BMP array will be used.
-// It may work using direct DIB data, but that needs to be checked
eventually
-//
-// #i15508# before GFX_LINK_TYPE_NATIVE_BMP was added the graphic
data
-// (to be hold in pGraphicAry) was not available; thus for now to
stay
-// compatible, keep it that way by assigning NULL value to
pGraphicAry
+// #i15508# trying to add BMP type for better exports, need to check
if this works
+// checked, does not work. Also need to reset pGraphicAry to NULL to
force conversion
+// to PNG, else the BMP array will be used.
+// It may work using direct DIB data, but that needs to be checked
eventually
+//
+// #i15508# before GFX_LINK_TYPE_NATIVE_BMP was added the graphic data
+// (to be hold in pGraphicAry) was not available; thus for now to stay
+// compatible, keep it that way by assigning NULL value to pGraphicAry
case GFX_LINK_TYPE_NATIVE_BMP:
//pBLIPType = OOO_STRING_SVTOOLS_RTF_WBITMAP;
pGraphicAry = 0;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 83084d3..d266183 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1152,8 +1152,8 @@ void RTFDocumentImpl::text(OUString& rString)
bool bRet = true;
switch (m_aStates.top().nDestinationState)
{
-// Note: in fonttbl there may or may not be groups; in stylesheet
-// and revtbl groups are mandatory
+// Note: in fonttbl there may or may not be groups; in stylesheet
+// and revtbl groups are mandatory
case DESTINATION_FONTTABLE:
case DESTINATION_FONTENTRY:
case DESTINATION_STYLEENTRY:
@@ -1876,7 +1876,7 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword
nKeyword)
m_aStates.top().nDestinationState = DESTINATION_FLYMAINCONTENT;
break;
case RTF_LISTTEXT:
-
[Libreoffice-commits] core.git: 8 commits - chart2/source comphelper/source connectivity/source offapi/com ucb/source unoxml/source vcl/source
chart2/source/controller/dialogs/res_Trendline.cxx |4 +--
comphelper/source/property/opropertybag.cxx|2 -
comphelper/source/property/propertybag.cxx | 19 ---
connectivity/source/drivers/dbase/DTable.cxx | 15 ++--
connectivity/source/inc/resource/dbase_res.hrc |1
connectivity/source/resource/conn_shared_res.src |6
offapi/com/sun/star/rdf/XDocumentRepository.idl|1
ucb/source/ucp/gio/gio_content.cxx | 26 +
ucb/source/ucp/gio/gio_content.hxx |3 ++
ucb/source/ucp/gio/gio_inputstream.cxx |4 +--
ucb/source/ucp/gio/gio_outputstream.cxx|4 +--
ucb/source/ucp/gio/gio_seekable.cxx|6 ++--
unoxml/source/rdf/librdf_repository.cxx|2 +
vcl/source/filter/jpeg/Exif.cxx|2 -
vcl/source/gdi/cvtsvm.cxx |3 ++
15 files changed, 81 insertions(+), 17 deletions(-)
New commits:
commit ccaaa544350156ed4cd113634ceb66ad8cc5af23
Author: Caolán McNamara
Date: Fri Oct 10 17:24:03 2014 +0100
coverity#707458 Uncaught exception
Change-Id: Ia446cc0b8b26bb158b36ca64cbf45bf172f37bdf
diff --git a/offapi/com/sun/star/rdf/XDocumentRepository.idl
b/offapi/com/sun/star/rdf/XDocumentRepository.idl
index 039e376..ff1ee9b 100644
--- a/offapi/com/sun/star/rdf/XDocumentRepository.idl
+++ b/offapi/com/sun/star/rdf/XDocumentRepository.idl
@@ -169,6 +169,7 @@ interface XDocumentRepository : XRepository
com::sun::star::beans::Pair< sequence, boolean >
getStatementRDFa([in] XMetadatable Element)
raises( com::sun::star::lang::IllegalArgumentException,
+com::sun::star::container::NoSuchElementException,
RepositoryException );
/** gets matching RDFa statements from the repository.
diff --git a/unoxml/source/rdf/librdf_repository.cxx
b/unoxml/source/rdf/librdf_repository.cxx
index 2cdcdaa..dd0dec6 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -359,6 +359,7 @@ public:
virtual beans::Pair< uno::Sequence, sal_Bool > SAL_CALL
getStatementRDFa(uno::Reference< rdf::XMetadatable > const& i_xElement)
throw (uno::RuntimeException, lang::IllegalArgumentException,
+container::NoSuchElementException,
rdf::RepositoryException, std::exception) SAL_OVERRIDE;
virtual uno::Reference< container::XEnumeration > SAL_CALL
getStatementsRDFa(
@@ -1646,6 +1647,7 @@ beans::Pair< uno::Sequence, sal_Bool >
SAL_CALL
librdf_Repository::getStatementRDFa(
const uno::Reference< rdf::XMetadatable > & i_xElement)
throw (uno::RuntimeException, lang::IllegalArgumentException,
+container::NoSuchElementException,
rdf::RepositoryException, std::exception)
{
if (!i_xElement.is()) {
commit cd86543fd4b81b03762e24d81be6c7671d5188a5
Author: Caolán McNamara
Date: Fri Oct 10 17:12:35 2014 +0100
coverity#1242714 Untrusted value as argument
Change-Id: I1524722feae3ad9f67627cb34dec83632edefec4
diff --git a/vcl/source/filter/jpeg/Exif.cxx b/vcl/source/filter/jpeg/Exif.cxx
index 01f0592..1a0f05b 100644
--- a/vcl/source/filter/jpeg/Exif.cxx
+++ b/vcl/source/filter/jpeg/Exif.cxx
@@ -124,7 +124,7 @@ bool Exif::processJpeg(SvStream& rStream, bool bSetValue)
rStream.ReadUInt16( aLength );
-if (aLength < 8)
+if (aLength < 8 || aLength > rStream.remainingSize())
{
return false;
}
commit 6ec9b3a6301a73d5a5df038a39e7319e9ac43907
Author: Caolán McNamara
Date: Fri Oct 10 16:58:14 2014 +0100
coverity#1244944 experiment to silence Untrusted loop bound
there's a warning for nPolygonCount but none for nPointCount. I wonder
what happens if I tweak the code like this
Change-Id: I7e1b02c4790f6b2d1c59e38de1a6a0b17a0485b1
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index 2667f23..38a9b52 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -397,6 +397,9 @@ void ImplReadExtendedPolyPolygonAction(SvStream& rIStm,
tools::PolyPolygon& rPol
sal_uInt16 nPolygonCount(0);
rIStm.ReadUInt16( nPolygonCount );
+if (!nPolygonCount)
+return;
+
for(sal_uInt16 a(0); a < nPolygonCount; a++)
{
sal_uInt16 nPointCount(0);
commit d1217a95ef16e662586b88c9f3c9a447eba41e46
Author: Caolán McNamara
Date: Fri Oct 10 16:37:37 2014 +0100
coverity#1223085 Unchecked return value
there were three of these, not just one
i.e. see also
commit 276a051ef5dc144a202633779259a4ecd43c81a8
Date: Sun Oct 5 13:05:04 2014 -0500
coverity#1223085 Unchecked return value
Change-Id: I07ee033ae31a346a08f68a6edfa480505fe6c11a
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx
b/chart2/source/controller/dialogs/res_Trend
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 63ec7252a4c64b98a07408106d6d8054dde8710d Author: Arkadiusz MiÅkiewicz Date: Thu Oct 9 23:40:29 2014 +0200 Avoid bashizm in AbsolutePath() function &> is another bashizm. Avoid that since configure is run using POSIX shell. Some POSIX compatible shells like mksh do not understand bash syntax. "cd - &> /dev/null" was causing "cd -" command to go into background which means we never changed back to original directory thus fooling configure script later: config.status: error: cannot find input file: `config_host.mk.in' "&>" was also redirecting stderr which we don't want to do anymore since it hides real and interesting errors. Change-Id: I286a32e6a200afca883b159d9196f606e0fe7063 Reviewed-on: https://gerrit.libreoffice.org/11896 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt (cherry picked from commit d5b0697cebd7d66ee90d12f7b893c193ae36eaa6) Reviewed-on: https://gerrit.libreoffice.org/11897 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/configure.ac b/configure.ac index 331a1ee..74211a8 100644 --- a/configure.ac +++ b/configure.ac @@ -72,7 +72,7 @@ AbsolutePath() if test -d "$rel" ; then cd "$rel" || AC_MSG_ERROR([absolute path resolution failed for "$rel".]) absolute_path="$(pwd)" -cd - &> /dev/null +cd - > /dev/null else AC_MSG_ERROR([Failed to resolve absolute path. "$rel" does not exist or is not a directory.]) fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-4-3' - pt_PT/description.xml pt_PT/pt_PT.dic
pt_PT/description.xml |2 +- pt_PT/pt_PT.dic | 49 +++-- 2 files changed, 28 insertions(+), 23 deletions(-) New commits: commit 706999791a7a54725beb0341c250b3735fbb4bd7 Author: Andras Timar Date: Fri Oct 10 15:35:51 2014 +0200 updated pt_PT dictionary to version 14.10.2.1 Change-Id: I9fa84bf75361a08d6141bae7ce74d407014c57ef Reviewed-on: https://gerrit.libreoffice.org/11905 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/pt_PT/description.xml b/pt_PT/description.xml index e6b0ae2..1a3149b 100644 --- a/pt_PT/description.xml +++ b/pt_PT/description.xml @@ -1,6 +1,6 @@ http://openoffice.org/extensions/description/2006"; xmlns:d="http://openoffice.org/extensions/description/2006"; xmlns:xlink="http://www.w3.org/1999/xlink";> - + European Portuguese spelling dictionary, hyphenation rules, and thesaurus diff --git a/pt_PT/pt_PT.dic b/pt_PT/pt_PT.dic index 20934c9..097ea87 100644 --- a/pt_PT/pt_PT.dic +++ b/pt_PT/pt_PT.dic @@ -1,4 +1,4 @@ - 44078 + 44083 , [CAT=punct1a] ; [CAT=punct1b] : [CAT=punct1c] @@ -1047,7 +1047,7 @@ alarmante/p [CAT=adj,N=s,G=_] alarmar/XYPLn [CAT=v,T=inf,TR=t] alarme/tip [CAT=nc,G=m,N=s] alarvado [CAT=adj,N=s,G=m] -alarve/G [CAT=a_nc,G=2,N=s] +alarve/Gp [CAT=a_nc,G=2,N=s] alar/XYPL [CAT=v,T=inf,TR=t] alastradeira [CAT=a_nc,G=f,N=s] alastrar/XYPLMD[CAT=v,T=inf,TR=t] @@ -1956,7 +1956,7 @@ anorexia [CAT=nc,G=f,N=s] anormal/pmd[CAT=adj,N=s,G=_] anormalidade/p [CAT=nc,G=f,N=s] anortear/ZYPL [CAT=v,T=inf,TR=t] -anos-luz [$ano-luz$N=p] +anos-luz [$ano-luz$CAT=nc,G=m,N=s$N=p] anoso/fp [CAT=adj,N=s,G=m] anotação/p [CAT=nc,G=f,N=s] anotador/p [CAT=nc,G=m,N=s] @@ -2993,7 +2993,7 @@ arribanceirado[CAT=adj,N=s,G=m] arriba/p [CAT=nc,G=f,N=s] arribar/XYLc [CAT=v,T=inf,TR=i] arribas[CAT=nc,G=f,N=s,N=p] -arriscar/XYPLB [CAT=v,T=inf,TR=t] +arriscar/XYPLBN[CAT=v,T=inf,TR=t] arritmia/p [CAT=nc,G=f,N=s] arrÃtmico [CAT=adj,N=s,G=m] arritmo[CAT=adj,N=s,G=m] @@ -7442,14 +7442,15 @@ chispar/XY [CAT=v,T=inf,TR=i] chispe/p [CAT=nc,G=m,N=s] chiste/p [CAT=nc,G=m,N=s] chita/p[CAT=nc,G=f,N=s] +choca/p[CAT=nc,G=f,N=s] +choça/p [CAT=nc,G=f,N=s] chocadeira/p [CAT=nc,G=f,N=s] chocalhada [CAT=nc,G=f,N=s] chocalhar/XYPL [CAT=v,T=inf,TR=_] chocalheiro/p [CAT=adj,N=s,G=m] chocalho/Gp[CAT=nc,G=m,N=s] -choca/p[CAT=nc,G=f,N=s] -choça/p [CAT=nc,G=f,N=s] chocar/XYPLnB [CAT=v,T=inf,TR=t] +chocarrice/p [CAT=nc,G=f,N=s] chochar/XYL[CAT=v,T=inf,TR=i] chocho/fpG [CAT=a_nc,G=m,N=s] choco/fpG [CAT=a_nc,G=m,N=s] @@ -11429,7 +11430,7 @@ desrespeitoso/pmf [CAT=adj,N=s,G=m] desrolhamento [CAT=nc,G=m,N=s] desse/fp [CAT=cp,Prep=de,Pdem=esse,G=m,N=s] desselecionar/XYP [PREAO90=desseleccionar,CAT=v,T=inf,TR=t] -destacar/XYPLMvB [CAT=v,T=inf,TR=t] +destacar/XYPLMvBN [CAT=v,T=inf,TR=t] destaque/p [CAT=nc,G=m,N=s] deste/fp [CAT=cp,Prep=de,Pdem=este,G=m,N=s] destemido/mp [CAT=adj,N=s,G=m] @@ -13389,6 +13390,7 @@ envolta [CAT=nc,G=f,N=s] envolto/fp [CAT=adj,N=s,G=m] envoltório[CAT=nc,G=m,N=s] envoltura [CAT=nc,G=f,N=s] +envolvência/p [CAT=nc,G=f,N=s] envolvente [CAT=adj,N=s,G=_] envolver/XYPLMn[CAT=v,T=inf,TR=t] enxabido [CAT=adj,N=s,G=m] @@ -14937,7 +14939,7 @@ extraterrestre/p[CAT=adj,N=s,G=_] extraterritorial/d [CAT=adj,N=s,G=_] extraterritorialidade/p[CAT=nc,G=f,N=s] extrassensorial/p [PREAO90=extra-sensorial,CAT=adj,N=s,G=m] -extrassolar/CAT=adj,N=s,G=m[PREAO90=extra-solar] +extrassolar[PREAO90=extra-solar,CAT=adj,N=s,G=m] extrauterino/p [PREAO90=extra-uterino,CAT=adj,N=s,G=m] extravagância/p [CAT=nc,G=f,N=s] extravaganciar/XYPL[CAT=v,T=inf,TR=_] @@ -16265,6 +16267,7 @@ fumaça/p [CAT=nc,G=f,N=s] fumaceira [CAT=nc,G=f,N=s] fumacento/fp [CAT=adj,N=s,G=m] fumada [CAT=nc,G=f,N=s] +fumagem/p [CAT=nc,G=f,N=s] fumão [CAT=nc,G=m,N=s] fumarada/p [CAT=nc,G=f,N=s] fumarento [CAT=adj,N=s,G=m] @@ -16390,7 +16393,7 @@ gadanhar/XYPL [CAT=v,T=inf,TR=t] gadanheiro/p [CAT=nc,G=m,N=s] gadanho/p [CAT=nc,G=m,N=s] gado/p [CAT=nc,G=m,N=s] -gafanhotada[CAT=nc,G=f,N=s] +gafanhotada/p [CAT=nc,G=f,N=s] gafanhoto/p[CAT=nc,G=m,N=s] gafa [CAT=nc,G=f,N=s] gafo [CAT=adj,N=s,G=_] @@ -16510,8 +16513,7 @@ ganchar/XYPL[CAT=v,T=inf,TR=t] gancheta [CAT=nc,G=f,N=s] gancho/pl [CAT=nc,G=m,N=s] ganchoso [CAT=adj,N=s,G=m] -gandula[CAT=nc,G=m,N=s] -gandulo/f [CAT=a_nc,G=m,N=s] +gandulo/fp [CAT=a_nc,G=m,N=s] ganês/fp [CAT=adj,N=s,G=m] ganga/p[CAT=nc,G=f,N=s] ganglioma [CAT=nc,G=m,N=s] @@ -19363,7 +19365,7 @@ intelectual/pidtm [CAT=a_
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 71f16d92df4458a8130ad526545b795313821e33 Author: Andras Timar Date: Fri Oct 10 15:35:51 2014 +0200 Updated core Project: dictionaries 706999791a7a54725beb0341c250b3735fbb4bd7 updated pt_PT dictionary to version 14.10.2.1 Change-Id: I9fa84bf75361a08d6141bae7ce74d407014c57ef Reviewed-on: https://gerrit.libreoffice.org/11905 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/dictionaries b/dictionaries index 263a052..7069997 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 263a052f82c085b480a1518ab4e6ef0c4c566044 +Subproject commit 706999791a7a54725beb0341c250b3735fbb4bd7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 30732] Character formatting not retained in entries of TOC, table lists, etc.
https://bugs.freedesktop.org/show_bug.cgi?id=30732 --- Comment #32 from Tobias Lippert --- Hello Harry, I have explicitly included only a few selected character formats. There might be users who would rather not have the highlights in the table of contents. Unfortunately, I do not know who decides which formats should be applied in the table. If you find out, and get a positive feedback, I can help to add the functionality. :-) Tobias -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo84679.rtf | 12
sw/qa/extras/rtfimport/rtfimport.cxx | 11 +++
writerfilter/source/rtftok/rtfdocumentimpl.cxx |9 +
3 files changed, 28 insertions(+), 4 deletions(-)
New commits:
commit e34906d20c9febc420b115fa2a8b171826dea0be
Author: Miklos Vajna
Date: Fri Oct 10 16:21:29 2014 +0200
fdo#84679 RTF import: fix paragraph spacing handling in tables
Regression from commit 1be0a3fa9ebb22b607c54b47739d4467acfed259
(n#825305: writerfilter RTF import: override style properties like Word,
2014-06-17), we failed to do the proper deduplication in buffered
content, like tables. Fix this by adapting
RTFDocumentImpl::replayBuffer() to RTFDocumentImpl::checkNeedPap(),
which already did the proper deduplication.
To be fair, the inconsistency was there earlier since
9f5263c477b82fef5aa9c3e79fb6af92aa049e24 (fdo#44736 RTF import: ignore
direct formatting which equals to style, 2012-11-25), but it caused no
real harm earlier.
Change-Id: I0673408088d9d83768f0780ea92ece87913d03f3
diff --git a/sw/qa/extras/rtfimport/data/fdo84679.rtf
b/sw/qa/extras/rtfimport/data/fdo84679.rtf
new file mode 100644
index 000..64611be
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo84679.rtf
@@ -0,0 +1,12 @@
+{\rtf1
+{\stylesheet
+{\ql
\sa160\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0
\rtlch\fcs1
+\af31507\afs28\alang1054 \ltrch\fcs0
\fs22\lang1033\langfe2052\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp2052
\snext0 \sqformat \spriority0 Normal;}
+}
+\pard\plain\par
+\trowd
+\clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10
\clbrdrr\brdrs\brdrw10\cellx3121
+\clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10
\clbrdrr\brdrs\brdrw10\cellx6238
+A1\cell A2\cell \row
+\pard\plain\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index a61d62f..57717b7 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1952,6 +1952,17 @@ DECLARE_RTFIMPORT_TEST(testFdo44984, "fdo44984.rtf")
CPPUNIT_ASSERT_EQUAL(OUString("TextFieldStartEnd"),
getProperty(getRun(getParagraphOfText(1, xCell->getText()), 1),
"TextPortionType"));
}
+DECLARE_RTFIMPORT_TEST(testFdo84679, "fdo84679.rtf")
+{
+// The problem was that the paragraph in A1 had some bottom margin, but it
should not.
+uno::Reference xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
+uno::Reference xCell(xTable->getCellByName("A1"),
uno::UNO_QUERY);
+// This was 282.
+CPPUNIT_ASSERT_EQUAL(static_cast(0),
getProperty(getParagraphOfText(1, xCell->getText()),
"ParaBottomMargin"));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 2fbf983..83084d3 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -440,7 +440,9 @@ void RTFDocumentImpl::setNeedSect(bool bNeedSect)
writerfilter::Reference::Pointer_t
RTFDocumentImpl::getProperties(RTFSprms& rAttributes, RTFSprms& rSprms)
{
-int nStyle = m_aStates.top().nCurrentStyleIndex;
+int nStyle = 0;
+if (!m_aStates.empty())
+nStyle = m_aStates.top().nCurrentStyleIndex;
RTFReferenceTable::Entries_t::iterator it =
m_aStyleTableEntries.find(nStyle);
if (it != m_aStyleTableEntries.end())
{
@@ -1434,10 +1436,9 @@ void RTFDocumentImpl::replayBuffer(RTFBuffer_t& rBuffer,
rBuffer.pop_front();
if (boost::get<0>(aTuple) == BUFFER_PROPS)
{
+// Construct properties via getProperties() and not directly, to
take care of deduplication.
writerfilter::Reference::Pointer_t const pProp(
-new RTFReferenceProperties(
-boost::get<1>(aTuple)->getAttributes(),
-boost::get<1>(aTuple)->getSprms())
+getProperties(boost::get<1>(aTuple)->getAttributes(),
boost::get<1>(aTuple)->getSprms())
);
Mapper().props(pProp);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/shells/textsh1.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2862dcf7dd8a6f9cde9df2cc2b785df65e814f0c
Author: Stephan Bergmann
Date: Fri Oct 10 16:56:59 2014 +0200
UBSan: SvxColorItem vs. SvxBrushItem confusion
Assume RES_CHRATR_BACKGROUND shall indeed be an SvxBrushItem while
SID_ATTR_CHAR_COLOR_BACKGROUND shall indeed be an SvxColorItem. (This
probably
never caused trouble in practice as the member vars of SvxColorItem happen
to be
a prefix of the member vars of SvxBrushItem.)
Change-Id: Ifb2a137ad89de6e03da3b61dd17bcd8882cce2d7
diff --git a/sw/source/uibase/shells/textsh1.cxx
b/sw/source/uibase/shells/textsh1.cxx
index e9edc6c..024c15c 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1574,8 +1574,8 @@ void SwTextShell::GetState( SfxItemSet &rSet )
{
SfxItemSet aSet( GetPool() );
rSh.GetCurAttr( aSet );
-const SvxColorItem& aColorItem = static_cast< const
SvxColorItem& >( aSet.Get(RES_CHRATR_BACKGROUND) );
-rSet.Put( aColorItem, SID_ATTR_CHAR_COLOR_BACKGROUND );
+const SvxBrushItem& aBrushItem = static_cast< const
SvxBrushItem& >( aSet.Get(RES_CHRATR_BACKGROUND) );
+rSet.Put( SvxColorItem(aBrushItem.GetColor(), nWhich) );
}
break;
case SID_ATTR_CHAR_COLOR_BACKGROUND_EXT:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Unittest fails building on OS X 10.9
Hi Stephan, I've added a subsection which explains how to install multiple copies of MacPorts. Regards, Robert On Fri, Oct 10, 2014 at 10:04 AM, Stephan Bergmann wrote: > On 10/10/2014 09:35 AM, Tor Lillqvist wrote: > >> >> I've added the section "Minimal Setup with MacPorts for external >> dependencies" [1] which can be very helpful to build LO easily. >> >> >> So that is then now our documented and thus "official" way to build on >> Mac? If it works, I don't oppose... even if it totally contrary to what >> has been the collective wisdom so far. >> > > I assume the sanity of a MacPorts-in-PATH based build env depends on what > other stuff you have installed in your MacPorts installation, so I would > not generally suggest that route to the uninitiated. > > Stephan > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice > -- http://about.me/rbuj ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: chart2/qa
chart2/qa/extras/chart2import.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 890d0254db133b746c8562133da8241816acc13d
Author: Stephan Bergmann
Date: Fri Oct 10 16:38:11 2014 +0200
loplugin:passstuffbyref
Change-Id: If17bfdfdb51d5b9b8db563fccf09bb7608fcd0f8
diff --git a/chart2/qa/extras/chart2import.cxx
b/chart2/qa/extras/chart2import.cxx
index f8c545a..b853466 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -55,7 +55,7 @@ public:
void testAutoBackgroundXLSX();
void testNumberFormatsXLSX();
-void testTransparentBackground(OUString filename);
+void testTransparentBackground(OUString const & filename);
CPPUNIT_TEST_SUITE(Chart2ImportTest);
CPPUNIT_TEST(Fdo60083);
@@ -595,7 +595,7 @@ void Chart2ImportTest::testFdo78080()
CPPUNIT_ASSERT(!xTitle.is());
}
-void Chart2ImportTest::testTransparentBackground(OUString filename)
+void Chart2ImportTest::testTransparentBackground(OUString const & filename)
{
load("/chart2/qa/extras/data/xlsx/", filename);
uno::Reference< chart2::XChartDocument > xChartDoc =
getChartDocFromSheet(0, mxComponent);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Minutes of the Design Hangout: 2014-10-08
* Present: Cor, Heiko, Hillar, Jay, Kendy, Samuel, Steve + [I think Mirek joined later, but not 100% sure it was him :-)] * Completed Action Items: + Kendy: Provide Jay with pointers to .ui for the sidebar + Samuel: Switch on the alternating lines in list boxes generally; and also check what the other platforms are doing (like, if this way of highlighting is known/standard there) + Jay: create bugs for the rest of new Color picker bugs in bugzilla, and ping Krisztian + Kendy: Create an Easy Hack to conform the sidebar icons size to the general icon size setting - https://bugs.freedesktop.org/show_bug.cgi?id=66876 + Kendy: Check the how much info is in the redmine wiki * Pending Action Items: + none * Striped Rows (Samuel) + Seems to be generally a good idea for tables, makes it easier for the eye to follow the row + but not for simple lists + OSX: Finder and iTunes have striped Rows: + http://tinyurl.com/putu5ap http://tinyurl.com/p4czpdp + Windows: Seems to be not common + Linux: Not seen in Gnome, only KDE: + http://www.datamation.com/img/2008/07/kde-4.1-dolphin.jpg + Conclusion: Let's not enable by default everywhere, we should look for places where it could be enabled manually AI + Samuel: Create an easy hack - describe what tables should get this, and how to do that in the code. * Redmine wiki (Kendy) + not backed up!!! + the info from there should be moved to the TDF wiki, and only pointers from redmine to TDF should stay + luckily not much there - any taker to transfer that, please? AI + Kendy: Find somebody to transfer that... * 'Insert Table' button + Changed the Insert Table button to dropdown-only: + https://bugs.freedesktop.org/show_bug.cgi?id=84551 + reason for the change + concern about the default action - the main functionality in the arrow, not so common func in the main button + Some QA people want this reverted + concern about buttons that can be used 3x ways (Cor) maybe we break consistency? So if the decision is to change the behavior, it must be a normal button, not a split one + which is the case! (Kendy) + How to express positive feedback, actually? (Steve) + hard... + Need a measurable way... (Kendy) + hacked up counting of .uno: actions during user's work to have data + Comparative analysis + MS Word (2003 toolbar & 2007+ ribbon), WPS Writer (toolbar & ribbon), WordPerfect (toolbar), and Calligra Words (sidebar) all show it this way + iWork Pages has a toolbar drop down, but only allows selecting the table theme, as it automatically inserts a 4 column and 5 row table - http://youtu.be/1RyUYMhpXMw?t=12m16s + gdocs - no dialog to insert table at all, only choosing in the grid (from the menu, though) + Nice analysis: + http://user-prompt.com/de/libreoffice-user-research-results-vol-4/ (see the part "Interaction") + Better description of the button needed, 'More...' seems not to be descriptive enough + 'More Options' is used in the sidebar with drop downs like bullets, underline, page size, etc + 'More...' is used in the style drop down, while other buttons have used 'Other...' (insert field) + or 'Custom...' (3d-settings toolbar's depth, fontwork toolbar's characer spacing) (Jay) + 'Insert Table...' maybe? (Kendy) + 'More Details...' ? (Kendy) AI + Jay: Pick something + see how we can make it more consistent overall. + Conclusion: Competitive analysis and http://user-prompt.com/de/libreoffice-user-research-results-vol-4/ (see the part "Interaction") supports that for Table button, it is better to have the graphical selection as the default for the entire button, provided that we improve the wording of the "More..." button. Nevertheless, we will measure that (will be possible shortly), and see how much is that used. + Update from the post-meeting chat: Re-measurement not necessary, the change is accepted, part of this was a misunderstanding. * UI changes integrated the last week (Samuel): + discussed only the 'Insert table', we have run out of time + the following were integrated - we'll go through that the next time: + Changed the Insert Field button to dropdown-only: https://bugs.freedesktop.org/show_bug.cgi?id=84550 + 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 + Styles+Formatting floating dialog removed, will now a
[Libreoffice-commits] core.git: external/glm
external/glm/UnpackedTarball_glm.mk |1 + external/glm/Wsign-compare.patch.0 | 20 2 files changed, 21 insertions(+) New commits: commit 7f545208e8108be84cd880e026294e11aa15c65b Author: Stephan Bergmann Date: Fri Oct 10 16:31:09 2014 +0200 external/glm: -Werror,-Wsign-compare Change-Id: I5acb672ea8387cdbf68677a2b46d21785148a735 diff --git a/external/glm/UnpackedTarball_glm.mk b/external/glm/UnpackedTarball_glm.mk index ff9c998..86e9d16 100644 --- a/external/glm/UnpackedTarball_glm.mk +++ b/external/glm/UnpackedTarball_glm.mk @@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,glm,1)) $(eval $(call gb_UnpackedTarball_add_patches,glm, \ external/glm/Wshadow-patch-fix.patch \ +external/glm/Wsign-compare.patch.0 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/glm/Wsign-compare.patch.0 b/external/glm/Wsign-compare.patch.0 new file mode 100644 index 000..ef97121 --- /dev/null +++ b/external/glm/Wsign-compare.patch.0 @@ -0,0 +1,20 @@ +--- glm/gtx/bit.inl glm/gtx/bit.inl +@@ -576,7 +576,7 @@ + assert(ToBit <= sizeof(genIUType) * std::size_t(8)); + + genIUType Result = Value; +- for(std::size_t i = 0; i <= ToBit; ++i) ++ for(int i = 0; i <= ToBit; ++i) + Result |= (1 << i); + return Result; + } +@@ -593,7 +593,7 @@ + assert(ToBit <= sizeof(genIUType) * std::size_t(8)); + + genIUType Result = Value; +- for(std::size_t i = 0; i <= ToBit; ++i) ++ for(int i = 0; i <= ToBit; ++i) + Result &= ~(1 << i); + return Result; + } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svgio/source
svgio/source/svgreader/svgdocumenthandler.cxx | 18 +-
1 file changed, 17 insertions(+), 1 deletion(-)
New commits:
commit bb72d5b3ecbe6a03d3d3dfe101ad67ff4650a9f9
Author: Armin Le Grand
Date: Fri Oct 10 12:50:29 2014 +
i125326 accept CssStyles with missing type attribute
diff --git a/svgio/source/svgreader/svgdocumenthandler.cxx
b/svgio/source/svgreader/svgdocumenthandler.cxx
index 3e7e5ca..4378f20 100644
--- a/svgio/source/svgreader/svgdocumenthandler.cxx
+++ b/svgio/source/svgreader/svgdocumenthandler.cxx
@@ -330,10 +330,26 @@ namespace svgio
{
SvgStyleNode* pNew = new SvgStyleNode(maDocument,
mpTarget);
mpTarget = pNew;
-mpTarget->parseAttributes(xAttribs);
+const sal_uInt32 nAttributes(xAttribs->getLength());
+
+if(0 == nAttributes)
+{
+// #125326# no attributes, thus also no
type="text/css". This is allowed to be missing,
+// thus do mark this style as CssStyle. This is
required to read the contained
+// text (which defines the css style)
+pNew->setTextCss(true);
+}
+else
+{
+// #125326# there are attributes, read them. This
will set isTextCss to true if
+// a type="text/css" is contained as exact match,
else not
+mpTarget->parseAttributes(xAttribs);
+}
if(pNew->isTextCss())
{
+// if it is a Css style, allow reading text
between the start and end tag (see
+// SvgDocHdl::characters for details)
maCssContents.push_back(rtl::OUString());
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - chart2/qa oox/source
chart2/qa/extras/chart2import.cxx | 11 +--
chart2/qa/extras/data/xlsx/fdo54361-1.xlsx |binary
oox/source/drawingml/chart/objectformatter.cxx | 17 ++---
3 files changed, 19 insertions(+), 9 deletions(-)
New commits:
commit e60183503e0cefd567f20b300d674fcbd75f1fb5
Author: Muthu Subramanian
Date: Fri Oct 10 19:01:03 2014 +0530
fdo#54361: Add additional unit test case.
Change-Id: Ifa3fd6f074d1957a468a1dad5dc2c223d38d24d4
diff --git a/chart2/qa/extras/chart2import.cxx
b/chart2/qa/extras/chart2import.cxx
index 302d2b5..f8c545a 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -55,6 +55,8 @@ public:
void testAutoBackgroundXLSX();
void testNumberFormatsXLSX();
+void testTransparentBackground(OUString filename);
+
CPPUNIT_TEST_SUITE(Chart2ImportTest);
CPPUNIT_TEST(Fdo60083);
CPPUNIT_TEST(testSteppedLines);
@@ -593,9 +595,9 @@ void Chart2ImportTest::testFdo78080()
CPPUNIT_ASSERT(!xTitle.is());
}
-void Chart2ImportTest::testFdo54361()
+void Chart2ImportTest::testTransparentBackground(OUString filename)
{
-load("/chart2/qa/extras/data/xlsx/", "fdo54361.xlsx");
+load("/chart2/qa/extras/data/xlsx/", filename);
uno::Reference< chart2::XChartDocument > xChartDoc =
getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -610,6 +612,11 @@ void Chart2ImportTest::testFdo54361()
CPPUNIT_ASSERT_MESSAGE("Background needs to be with solid fill style",
aStyle == 1);
}
+void Chart2ImportTest::testFdo54361()
+{
+testTransparentBackground("fdo54361.xlsx");
+testTransparentBackground("fdo54361-1.xlsx");
+}
void Chart2ImportTest::testAutoBackgroundXLSX()
{
diff --git a/chart2/qa/extras/data/xlsx/fdo54361-1.xlsx
b/chart2/qa/extras/data/xlsx/fdo54361-1.xlsx
new file mode 100644
index 000..dba79ef
Binary files /dev/null and b/chart2/qa/extras/data/xlsx/fdo54361-1.xlsx differ
commit aad90e18cd00ac8af6bcddf14e4e19c9475dedbf
Author: Muthu Subramanian
Date: Fri Oct 10 18:59:46 2014 +0530
fdo#54361: Chart background in XLSX is transparent instead of white.
Change-Id: I116e7e8c9046009cfcadc04b5367a6fe25f88d96
diff --git a/oox/source/drawingml/chart/objectformatter.cxx
b/oox/source/drawingml/chart/objectformatter.cxx
index d0ab4c0..dd53dde 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -623,7 +623,8 @@ class FillFormatter : public DetailFormatterBase
public:
explicitFillFormatter(
ObjectFormatterData& rData,
-const AutoFormatEntry* pAutoFormatEntry );
+const AutoFormatEntry* pAutoFormatEntry,
+const ObjectType eObjType );
/** Converts area formatting to the passed property set. */
voidconvertFormatting(
@@ -678,7 +679,8 @@ public:
explicitObjectTypeFormatter(
ObjectFormatterData& rData,
const ObjectTypeFormatEntry& rEntry,
-const ChartSpaceModel& rChartSpace );
+const ChartSpaceModel& rChartSpace,
+const ObjectType eObjType );
/** Sets frame formatting properties to the passed property set. */
voidconvertFrameFormatting(
@@ -854,13 +856,14 @@ void LineFormatter::convertFormatting( ShapePropertyMap&
rPropMap, const ModelRe
aLineProps.pushToPropMap( rPropMap, mrData.mrFilter.getGraphicHelper(),
getPhColor( nSeriesIdx ) );
}
-FillFormatter::FillFormatter( ObjectFormatterData& rData, const
AutoFormatEntry* pAutoFormatEntry ) :
+FillFormatter::FillFormatter( ObjectFormatterData& rData, const
AutoFormatEntry* pAutoFormatEntry, const ObjectType eObjType ) :
DetailFormatterBase( rData, pAutoFormatEntry )
{
if( pAutoFormatEntry )
{
mxAutoFill.reset( new FillProperties );
-mxAutoFill->moFillType = XML_noFill;
+if( eObjType != OBJECTTYPE_CHARTSPACE )
+mxAutoFill->moFillType = XML_noFill;
if( const Theme* pTheme = mrData.mrFilter.getCurrentTheme() )
if( const FillProperties* pFillProps = pTheme->getFillStyle(
pAutoFormatEntry->mnThemedIdx ) )
*mxAutoFill = *pFillProps;
@@ -937,9 +940,9 @@ void TextFormatter::convertFormatting( PropertySet&
rPropSet, const ModelRef< Te
convertFormatting( rPropSet, lclGetTextProperties( rxTextProp ) );
}
-ObjectTypeFormatter::ObjectTypeFormatter( ObjectFormatterData& rData, const
ObjectTypeFormatEntry& rEntry, const ChartSpaceModel& rChartSpace ) :
+ObjectTypeFormatter::ObjectTypeFormatter( ObjectFormatterData& rData, const
ObjectTypeFormatEntry& rEntry, const ChartSpaceModel& rChartSpace, const
ObjectType eObjType ) :
maLineFormatter( rData,
[Bug 30732] Character formatting not retained in entries of TOC, table lists, etc.
https://bugs.freedesktop.org/show_bug.cgi?id=30732 Cor Nouws changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=84700 -- 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: svx/source
svx/source/tbxctrls/tbcontrl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d8a23406a563913235d7ef75cff0d1506d398b0f
Author: Stephan Bergmann
Date: Fri Oct 10 15:32:31 2014 +0200
UBSan: SfxBoolItem vs. SfxTemplateItem confusion
Change-Id: I277481734ae260109a6a9446b0d7769324a40aaf
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index edf9eec..7d59ac0 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2228,7 +2228,7 @@ void SvxStyleToolBoxControl::StateChanged(
switch ( eState )
{
case SfxItemState::DEFAULT:
-eTri = ((const SfxBoolItem*)pState)->GetValue()
+eTri = ((const SfxTemplateItem*)pState)->GetValue()
? TRISTATE_TRUE
: TRISTATE_FALSE;
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: pt_PT/description.xml pt_PT/pt_PT.dic
pt_PT/description.xml |2 +- pt_PT/pt_PT.dic | 49 +++-- 2 files changed, 28 insertions(+), 23 deletions(-) New commits: commit caf64fa3559fe1e0273e449faa176b1312e1066d Author: Andras Timar Date: Fri Oct 10 15:35:51 2014 +0200 updated pt_PT dictionary to version 14.10.2.1 Change-Id: I9fa84bf75361a08d6141bae7ce74d407014c57ef diff --git a/pt_PT/description.xml b/pt_PT/description.xml index e6b0ae2..1a3149b 100644 --- a/pt_PT/description.xml +++ b/pt_PT/description.xml @@ -1,6 +1,6 @@ http://openoffice.org/extensions/description/2006"; xmlns:d="http://openoffice.org/extensions/description/2006"; xmlns:xlink="http://www.w3.org/1999/xlink";> - + European Portuguese spelling dictionary, hyphenation rules, and thesaurus diff --git a/pt_PT/pt_PT.dic b/pt_PT/pt_PT.dic index 20934c9..097ea87 100644 --- a/pt_PT/pt_PT.dic +++ b/pt_PT/pt_PT.dic @@ -1,4 +1,4 @@ - 44078 + 44083 , [CAT=punct1a] ; [CAT=punct1b] : [CAT=punct1c] @@ -1047,7 +1047,7 @@ alarmante/p [CAT=adj,N=s,G=_] alarmar/XYPLn [CAT=v,T=inf,TR=t] alarme/tip [CAT=nc,G=m,N=s] alarvado [CAT=adj,N=s,G=m] -alarve/G [CAT=a_nc,G=2,N=s] +alarve/Gp [CAT=a_nc,G=2,N=s] alar/XYPL [CAT=v,T=inf,TR=t] alastradeira [CAT=a_nc,G=f,N=s] alastrar/XYPLMD[CAT=v,T=inf,TR=t] @@ -1956,7 +1956,7 @@ anorexia [CAT=nc,G=f,N=s] anormal/pmd[CAT=adj,N=s,G=_] anormalidade/p [CAT=nc,G=f,N=s] anortear/ZYPL [CAT=v,T=inf,TR=t] -anos-luz [$ano-luz$N=p] +anos-luz [$ano-luz$CAT=nc,G=m,N=s$N=p] anoso/fp [CAT=adj,N=s,G=m] anotação/p [CAT=nc,G=f,N=s] anotador/p [CAT=nc,G=m,N=s] @@ -2993,7 +2993,7 @@ arribanceirado[CAT=adj,N=s,G=m] arriba/p [CAT=nc,G=f,N=s] arribar/XYLc [CAT=v,T=inf,TR=i] arribas[CAT=nc,G=f,N=s,N=p] -arriscar/XYPLB [CAT=v,T=inf,TR=t] +arriscar/XYPLBN[CAT=v,T=inf,TR=t] arritmia/p [CAT=nc,G=f,N=s] arrÃtmico [CAT=adj,N=s,G=m] arritmo[CAT=adj,N=s,G=m] @@ -7442,14 +7442,15 @@ chispar/XY [CAT=v,T=inf,TR=i] chispe/p [CAT=nc,G=m,N=s] chiste/p [CAT=nc,G=m,N=s] chita/p[CAT=nc,G=f,N=s] +choca/p[CAT=nc,G=f,N=s] +choça/p [CAT=nc,G=f,N=s] chocadeira/p [CAT=nc,G=f,N=s] chocalhada [CAT=nc,G=f,N=s] chocalhar/XYPL [CAT=v,T=inf,TR=_] chocalheiro/p [CAT=adj,N=s,G=m] chocalho/Gp[CAT=nc,G=m,N=s] -choca/p[CAT=nc,G=f,N=s] -choça/p [CAT=nc,G=f,N=s] chocar/XYPLnB [CAT=v,T=inf,TR=t] +chocarrice/p [CAT=nc,G=f,N=s] chochar/XYL[CAT=v,T=inf,TR=i] chocho/fpG [CAT=a_nc,G=m,N=s] choco/fpG [CAT=a_nc,G=m,N=s] @@ -11429,7 +11430,7 @@ desrespeitoso/pmf [CAT=adj,N=s,G=m] desrolhamento [CAT=nc,G=m,N=s] desse/fp [CAT=cp,Prep=de,Pdem=esse,G=m,N=s] desselecionar/XYP [PREAO90=desseleccionar,CAT=v,T=inf,TR=t] -destacar/XYPLMvB [CAT=v,T=inf,TR=t] +destacar/XYPLMvBN [CAT=v,T=inf,TR=t] destaque/p [CAT=nc,G=m,N=s] deste/fp [CAT=cp,Prep=de,Pdem=este,G=m,N=s] destemido/mp [CAT=adj,N=s,G=m] @@ -13389,6 +13390,7 @@ envolta [CAT=nc,G=f,N=s] envolto/fp [CAT=adj,N=s,G=m] envoltório[CAT=nc,G=m,N=s] envoltura [CAT=nc,G=f,N=s] +envolvência/p [CAT=nc,G=f,N=s] envolvente [CAT=adj,N=s,G=_] envolver/XYPLMn[CAT=v,T=inf,TR=t] enxabido [CAT=adj,N=s,G=m] @@ -14937,7 +14939,7 @@ extraterrestre/p[CAT=adj,N=s,G=_] extraterritorial/d [CAT=adj,N=s,G=_] extraterritorialidade/p[CAT=nc,G=f,N=s] extrassensorial/p [PREAO90=extra-sensorial,CAT=adj,N=s,G=m] -extrassolar/CAT=adj,N=s,G=m[PREAO90=extra-solar] +extrassolar[PREAO90=extra-solar,CAT=adj,N=s,G=m] extrauterino/p [PREAO90=extra-uterino,CAT=adj,N=s,G=m] extravagância/p [CAT=nc,G=f,N=s] extravaganciar/XYPL[CAT=v,T=inf,TR=_] @@ -16265,6 +16267,7 @@ fumaça/p [CAT=nc,G=f,N=s] fumaceira [CAT=nc,G=f,N=s] fumacento/fp [CAT=adj,N=s,G=m] fumada [CAT=nc,G=f,N=s] +fumagem/p [CAT=nc,G=f,N=s] fumão [CAT=nc,G=m,N=s] fumarada/p [CAT=nc,G=f,N=s] fumarento [CAT=adj,N=s,G=m] @@ -16390,7 +16393,7 @@ gadanhar/XYPL [CAT=v,T=inf,TR=t] gadanheiro/p [CAT=nc,G=m,N=s] gadanho/p [CAT=nc,G=m,N=s] gado/p [CAT=nc,G=m,N=s] -gafanhotada[CAT=nc,G=f,N=s] +gafanhotada/p [CAT=nc,G=f,N=s] gafanhoto/p[CAT=nc,G=m,N=s] gafa [CAT=nc,G=f,N=s] gafo [CAT=adj,N=s,G=_] @@ -16510,8 +16513,7 @@ ganchar/XYPL[CAT=v,T=inf,TR=t] gancheta [CAT=nc,G=f,N=s] gancho/pl [CAT=nc,G=m,N=s] ganchoso [CAT=adj,N=s,G=m] -gandula[CAT=nc,G=m,N=s] -gandulo/f [CAT=a_nc,G=m,N=s] +gandulo/fp [CAT=a_nc,G=m,N=s] ganês/fp [CAT=adj,N=s,G=m] ganga/p[CAT=nc,G=f,N=s] ganglioma [CAT=nc,G=m,N=s] @@ -19363,7 +19365,7 @@ intelectual/pidtm [CAT=a_nc,N=s,G=_] intelectualidade/p [CAT=nc,G=f,N=s] intelectualizar/XYPLc [CAT=v,T=inf,TR=t] inteligência/p[C
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d655872356bb1197435b4b3cf3b9673aff4e66b1 Author: Andras Timar Date: Fri Oct 10 15:35:51 2014 +0200 Updated core Project: dictionaries caf64fa3559fe1e0273e449faa176b1312e1066d diff --git a/dictionaries b/dictionaries index 5f3f060..caf64fa 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 5f3f060c4c6c21ee7fe8a3ad32781630a9c1099c +Subproject commit caf64fa3559fe1e0273e449faa176b1312e1066d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2
include/sfx2/stbitem.hxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 10e8e78d0b8fb02e975ddbf888215b0e100a82e3 Author: Stephan Bergmann Date: Fri Oct 10 15:23:53 2014 +0200 Avoid incomplete type in fn sig to keep ubsan's RTTI-based checks happy Change-Id: I4add22edf2bcfe9c1d5ef1641eabee08d402191d diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx index 32aed7e..c931a88 100644 --- a/include/sfx2/stbitem.hxx +++ b/include/sfx2/stbitem.hxx @@ -23,11 +23,10 @@ #include #include #include - +#include class SfxModule; -class StatusBar; class SfxStatusBarControl; class SfxBindings; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] minutes of ESC call ...
On Thu, 2014-10-09 at 15:59 +0100, Michael Meeks wrote: > + xlsx issues seem lower with threading fix. FWIW Finally got a cleanish bt from the crashing threaded .xlsb and it's at https://bugs.freedesktop.org/show_bug.cgi?id=84872 AFAICS there are multiple threads, each with a different SheetDataContexts, but each SheetDataContexts is using the same FormulaParser which, while having methods that claim constness in a way which suggests that it's threadsafe, is implemented by forwarding everything through a non-const pointer to a pImpl to matching non-const stateful method. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/platform/MACOSX_INTEL_GCC.mk | 16 1 file changed, 16 deletions(-) New commits: commit 6f30c1970f5c2e140421fd2a846dbcc9d14ebdf5 Author: Stephan Bergmann Date: Fri Oct 10 15:18:41 2014 +0200 MACOSX_INTEL_GCC is dead ...since f49ff3f5769e231c08781a7598e85dca5fb8dbc9 "We always build 64-bit OS X code" Change-Id: Ie2e2534bbef0014c81cc96f67572d39db21650fc diff --git a/solenv/gbuild/platform/MACOSX_INTEL_GCC.mk b/solenv/gbuild/platform/MACOSX_INTEL_GCC.mk deleted file mode 100644 index 3e36b51..000 --- a/solenv/gbuild/platform/MACOSX_INTEL_GCC.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -#* - -gb_CPUDEFS := -DX86 - -include $(GBUILDDIR)/platform/macosx.mk - - -# vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 84352, which changed state. Bug 84352 Summary: Code signing broken by OSX 10.9.5 https://bugs.freedesktop.org/show_bug.cgi?id=84352 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: include/sfx2
include/sfx2/msg.hxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 61b6ab6424cd54dc5297013931e7d06568bcd782 Author: Stephan Bergmann Date: Fri Oct 10 15:02:11 2014 +0200 Avoid incomplete type in fn sig to keep ubsan's RTTI-based checks happy Change-Id: Id535824a9429576a469cf88d9bdbb6b53c5e314b diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx index 46963b2..fe9248e 100644 --- a/include/sfx2/msg.hxx +++ b/include/sfx2/msg.hxx @@ -24,7 +24,7 @@ #include #include #include - +#include #define SFX_SLOT_CACHABLE 0x0001L // exclusiv to VOLATILE, default @@ -76,7 +76,6 @@ class SfxRequest; -class SfxItemSet; #define SFX_EXEC_STUB( aShellClass, aExecMethod) \ void SfxStub##aShellClass##aExecMethod( \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source sc/source solenv/bin vcl/inc xmloff/inc
filter/source/msfilter/msdffimp.cxx |2 +-
filter/source/xslt/export/wordml/ooo2wordml_draw.xsl |2 +-
sc/source/ui/navipi/navipi.cxx |2 +-
solenv/bin/modules/installer/windows/file.pm |2 +-
vcl/inc/osx/salframe.h |2 +-
xmloff/inc/MultiPropertySetHelper.hxx|2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit c1a7e72110e48fa5d7ca38af2d36505b647a11e4
Author: Andras Timar
Date: Fri Oct 10 14:11:21 2014 +0200
typo: follwing -> following
Change-Id: Ia201473c84dc0923e8f4bee6329ad926cd6addd6
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 26db18f..96b5554 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -3545,7 +3545,7 @@ void SvxMSDffManager::ReadObjText( SvStream& rStream,
SdrObject* pObj )
}
// sj: I just want to set a string for a text object that may contain multiple
-// paragraphs. If I now take a look at the follwing code I get the impression
that
+// paragraphs. If I now take a look at the following code I get the impression
that
// our outliner is too complicate to be used properly,
void SvxMSDffManager::ReadObjText( const OUString& rText, SdrObject* pObj )
{
diff --git a/filter/source/xslt/export/wordml/ooo2wordml_draw.xsl
b/filter/source/xslt/export/wordml/ooo2wordml_draw.xsl
index f1d17b9..160e769 100644
--- a/filter/source/xslt/export/wordml/ooo2wordml_draw.xsl
+++ b/filter/source/xslt/export/wordml/ooo2wordml_draw.xsl
@@ -320,7 +320,7 @@
-
+
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 6dde76c..1f5c137 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -527,7 +527,7 @@ ScNavigatorDialogWrapper::ScNavigatorDialogWrapper(
{
case NAV_LMODE_SCENARIOS: nCmdId = IID_SCENARIOS; break;
case NAV_LMODE_AREAS: nCmdId = IID_AREAS; break;
-// The follwing case can never be reach due to how eNavMode is set-up
+// The following case can never be reach due to how eNavMode is set-up
//case NAV_LMODE_DOCS:nCmdId = IID_DOCS; break;
//case NAV_LMODE_DBAREAS: nCmdId = IID_DBAREAS; break;
default:nCmdId = 0;
diff --git a/solenv/bin/modules/installer/windows/file.pm
b/solenv/bin/modules/installer/windows/file.pm
index ce34592..457b31a 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -621,7 +621,7 @@ sub get_sequence_for_file
# my $sequence = $number + 1;
# Idea: Each component is packed into a cab file.
-# This requires that all files in one cab file have sequences directly
follwing each other,
+# This requires that all files in one cab file have sequences directly
following each other,
# for instance from 1456 to 1466. Then in the media table the
LastSequence for this cab file
# is 1466.
# Because all files belonging to one component are directly behind
each other in the file
diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h
index 905b089..82bd117 100644
--- a/vcl/inc/osx/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -180,7 +180,7 @@ public:
void getResolution( sal_Int32& o_rDPIX, sal_Int32& o_rDPIY );
-// actually the follwing methods do the same thing: flipping y coordinates
+// actually the following methods do the same thing: flipping y coordinates
// but having two of them makes clearer what the coordinate system
// is supposed to be before and after
void VCLToCocoa( NSRect& io_rRect, bool bRelativeToScreen = true );
diff --git a/xmloff/inc/MultiPropertySetHelper.hxx
b/xmloff/inc/MultiPropertySetHelper.hxx
index c467bba..8467c16 100644
--- a/xmloff/inc/MultiPropertySetHelper.hxx
+++ b/xmloff/inc/MultiPropertySetHelper.hxx
@@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star {
/**
- * The MultiPropertySetHelper performs the follwing functions:
+ * The MultiPropertySetHelper performs the following functions:
*
* Given a list of property names (as sal_Char** or OUString*), it can
* query an XMultiPropertySet (or XPropertySet) which of these properties
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/platform/ANDROID_AARCH64_GCC.mk |2 +- solenv/gbuild/platform/ANDROID_ARM_GCC.mk |2 +- solenv/gbuild/platform/ANDROID_GODSON_GCC.mk |2 +- solenv/gbuild/platform/ANDROID_INTEL_GCC.mk|2 +- solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk |1 - solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk |2 -- solenv/gbuild/platform/FREEBSD_INTEL_GCC.mk|1 - solenv/gbuild/platform/FREEBSD_X86_64_GCC.mk |2 -- solenv/gbuild/platform/IOS_ARM_GCC.mk |2 +- solenv/gbuild/platform/LINUX_AARCH64_GCC.mk|2 +- solenv/gbuild/platform/LINUX_ARM_GCC.mk|2 +- solenv/gbuild/platform/LINUX_AXP_GCC.mk|2 +- solenv/gbuild/platform/LINUX_GODSON_GCC.mk |2 +- solenv/gbuild/platform/LINUX_HPPA_GCC.mk |1 - solenv/gbuild/platform/LINUX_IA64_GCC.mk |1 - solenv/gbuild/platform/LINUX_INTEL_GCC.mk |2 +- solenv/gbuild/platform/LINUX_M68K_GCC.mk |2 +- solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk |1 - solenv/gbuild/platform/LINUX_POWERPC_GCC.mk|1 - solenv/gbuild/platform/LINUX_S390X_GCC.mk |1 - solenv/gbuild/platform/LINUX_S390_GCC.mk |1 - solenv/gbuild/platform/LINUX_SPARC_GCC.mk |2 +- solenv/gbuild/platform/LINUX_X86_64_GCC.mk |1 - solenv/gbuild/platform/MACOSX_INTEL_GCC.mk |1 - solenv/gbuild/platform/MACOSX_X86_64_GCC.mk|2 -- solenv/gbuild/platform/NETBSD_INTEL_GCC.mk |2 +- solenv/gbuild/platform/NETBSD_X86_64_GCC.mk|2 +- solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk|1 - solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk |1 - solenv/gbuild/platform/WNT_INTEL_GCC.mk|2 +- solenv/gbuild/platform/WNT_X86_64_GCC.mk |2 +- solenv/gbuild/platform/com_GCC_defs.mk |7 +++ 32 files changed, 19 insertions(+), 38 deletions(-) New commits: commit 8541943b8d08f62217e99c9d47a5f222e1fba86e Author: Stephan Bergmann Date: Fri Oct 10 14:40:37 2014 +0200 Drop unnecessary gb_COMPILERDEFAULTOPTFLAGS Change-Id: I9e4c39c24fff8345f25729734a702667277e5dc3 diff --git a/solenv/gbuild/platform/ANDROID_AARCH64_GCC.mk b/solenv/gbuild/platform/ANDROID_AARCH64_GCC.mk index e8d2c25..d5379ae 100644 --- a/solenv/gbuild/platform/ANDROID_AARCH64_GCC.mk +++ b/solenv/gbuild/platform/ANDROID_AARCH64_GCC.mk @@ -9,7 +9,7 @@ # please make generic modifications to unxgcc.mk or android.mk gb_CPUDEFS += -DARM32 -gb_COMPILERDEFAULTOPTFLAGS := -Os +gb_COMPILEROPTFLAGS := -Os gb_CXXFLAGS += -fno-omit-frame-pointer gb_CFLAGS += -fno-omit-frame-pointer diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk index e8d2c25..d5379ae 100644 --- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk +++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk @@ -9,7 +9,7 @@ # please make generic modifications to unxgcc.mk or android.mk gb_CPUDEFS += -DARM32 -gb_COMPILERDEFAULTOPTFLAGS := -Os +gb_COMPILEROPTFLAGS := -Os gb_CXXFLAGS += -fno-omit-frame-pointer gb_CFLAGS += -fno-omit-frame-pointer diff --git a/solenv/gbuild/platform/ANDROID_GODSON_GCC.mk b/solenv/gbuild/platform/ANDROID_GODSON_GCC.mk index 614fa03..0eb4f0a 100644 --- a/solenv/gbuild/platform/ANDROID_GODSON_GCC.mk +++ b/solenv/gbuild/platform/ANDROID_GODSON_GCC.mk @@ -9,7 +9,7 @@ # please make generic modifications to unxgcc.mk or android.mk gb_CPUDEFS += -DMIPS -gb_COMPILERDEFAULTOPTFLAGS := -Os +gb_COMPILEROPTFLAGS := -Os include $(GBUILDDIR)/platform/unxgcc.mk include $(GBUILDDIR)/platform/android.mk diff --git a/solenv/gbuild/platform/ANDROID_INTEL_GCC.mk b/solenv/gbuild/platform/ANDROID_INTEL_GCC.mk index 7ccf388..04307ab 100644 --- a/solenv/gbuild/platform/ANDROID_INTEL_GCC.mk +++ b/solenv/gbuild/platform/ANDROID_INTEL_GCC.mk @@ -9,7 +9,7 @@ # please make generic modifications to unxgcc.mk or android.mk gb_CPUDEFS += -DX86 -gb_COMPILERDEFAULTOPTFLAGS := -Os +gb_COMPILEROPTFLAGS := -Os gb_CXXFLAGS += -fno-omit-frame-pointer gb_CFLAGS += -fno-omit-frame-pointer diff --git a/solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk b/solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk index 8251bc7..00ccf8a 100644 --- a/solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk +++ b/solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk @@ -10,7 +10,6 @@ #please make generic modifications to unxgcc.mk gb_CPUDEFS := -DX86 -gb_COMPILERDEFAULTOPTFLAGS := -O2 include $(GBUILDDIR)/platform/unxgcc.mk diff --git a/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk b/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk index ef2d970..71b53d5 100644 --- a/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk +++ b/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk @@ -9,8 +9,6 @@ #please make generic modifications to unxgcc.mk -gb_COMPILERDEFAULTOPTFLAGS := -O2 - include $(GBUILDDIR)/platform/unxgcc.mk gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs:/usr/pkg/l
[Libreoffice-commits] core.git: include/sfx2
include/sfx2/msg.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit afb1fb14dca30f09efd96092c282f2d85f6d078d
Author: Stephan Bergmann
Date: Fri Oct 10 14:39:47 2014 +0200
Use better casts
Change-Id: Ibcf2d715ac306bd4bedae716ad82c614f136d1bc
diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx
index 120005e..46963b2 100644
--- a/include/sfx2/msg.hxx
+++ b/include/sfx2/msg.hxx
@@ -82,14 +82,14 @@ class SfxItemSet;
void SfxStub##aShellClass##aExecMethod( \
SfxShell *pShell, SfxRequest& rReq) \
{ \
-(( aShellClass* ) pShell )->aExecMethod( rReq ); \
+ static_cast(pShell)->aExecMethod( rReq ); \
}
#define SFX_STATE_STUB( aShellClass, aStateMethod) \
void SfxStub##aShellClass##aStateMethod( \
SfxShell *pShell, SfxItemSet& rSet) \
{ \
-(( aShellClass* ) pShell )->aStateMethod( rSet ); \
+ static_cast(pShell)->aStateMethod( rSet ); \
}
#define SFX_STUB_PTR( aShellClass, aMethod ) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - android/experimental
android/experimental/LOAndroid3/res/values/strings.xml
|4 ++--
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
|9 +
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
|8
3 files changed, 19 insertions(+), 2 deletions(-)
New commits:
commit e147c5785f60506c58ba80455614bdbcdad18e61
Author: Jan Holesovsky
Date: Fri Oct 10 14:27:23 2014 +0200
android: Repaint when the orientation changes.
Change-Id: I150b22b7b1179c1adc7995a8547c7644ac25be28
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index e5765e6..4c91542 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -26,6 +26,11 @@ public class LOKitThread extends Thread {
}
private boolean draw() {
+if (mTileProvider == null || mApplication == null) {
+// called too early...
+return false;
+}
+
RectF rect = new RectF(0, 0, mTileProvider.getPageWidth(),
mTileProvider.getPageHeight());
DisplayMetrics displayMetrics =
LibreOfficeMainActivity.mAppContext.getResources().getDisplayMetrics();
mViewportMetrics = new ImmutableViewportMetrics(displayMetrics);
@@ -114,6 +119,8 @@ public class LOKitThread extends Thread {
draw();
break;
case LOEvent.SIZE_CHANGED:
+// re-draw when the size has changed
+draw();
break;
case LOEvent.CHANGE_PART:
changePart(event.getPartIndex());
@@ -130,3 +137,5 @@ public class LOKitThread extends Thread {
mEventQueue.clear();
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
index 2a52d91..863157a 100644
---
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
+++
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
@@ -341,6 +341,14 @@ public class LayerView extends FrameLayout {
}
}
+@Override
+protected void onLayout(boolean changed, int left, int top, int right, int
bottom) {
+super.onLayout(changed, left, top, right, bottom);
+if (changed) {
+setViewportSize(new IntSize(right - left, bottom - top));
+}
+}
+
private class SurfaceTextureListener implements
TextureView.SurfaceTextureListener {
public void onSurfaceTextureAvailable(SurfaceTexture surface, int
width, int height) {
// We don't do this for surfaceCreated above because it is always
followed by a surfaceChanged,
commit 84949ba280287a284cd01c0da1d9041f390a38a8
Author: Jan Holesovsky
Date: Fri Oct 10 12:56:57 2014 +0200
android: Improve the button descriptions.
Change-Id: I770065f7cb9aef3413cf8ebf860991147b6e14eb
diff --git a/android/experimental/LOAndroid3/res/values/strings.xml
b/android/experimental/LOAndroid3/res/values/strings.xml
index c98c0cd..857b00c 100644
--- a/android/experimental/LOAndroid3/res/values/strings.xml
+++ b/android/experimental/LOAndroid3/res/values/strings.xml
@@ -7,8 +7,8 @@
LibreOffice Viewer is a document viewer
based on LibreOffice.
http://www.libreoffice.org
-License
-Notice
+Show License
+Show Notice
LibreOffice Browser
Search
___
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' - 2 commits - android/experimental
android/experimental/LOAndroid3/res/values/strings.xml
|4 ++--
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
|9 +
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
|8
3 files changed, 19 insertions(+), 2 deletions(-)
New commits:
commit 3724d3aedcd507f32514a759fa1457b8e001fc9f
Author: Jan Holesovsky
Date: Fri Oct 10 14:27:23 2014 +0200
android: Repaint when the orientation changes.
Change-Id: I150b22b7b1179c1adc7995a8547c7644ac25be28
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index e5765e6..4c91542 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -26,6 +26,11 @@ public class LOKitThread extends Thread {
}
private boolean draw() {
+if (mTileProvider == null || mApplication == null) {
+// called too early...
+return false;
+}
+
RectF rect = new RectF(0, 0, mTileProvider.getPageWidth(),
mTileProvider.getPageHeight());
DisplayMetrics displayMetrics =
LibreOfficeMainActivity.mAppContext.getResources().getDisplayMetrics();
mViewportMetrics = new ImmutableViewportMetrics(displayMetrics);
@@ -114,6 +119,8 @@ public class LOKitThread extends Thread {
draw();
break;
case LOEvent.SIZE_CHANGED:
+// re-draw when the size has changed
+draw();
break;
case LOEvent.CHANGE_PART:
changePart(event.getPartIndex());
@@ -130,3 +137,5 @@ public class LOKitThread extends Thread {
mEventQueue.clear();
}
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
index 2a52d91..863157a 100644
---
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
+++
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/LayerView.java
@@ -341,6 +341,14 @@ public class LayerView extends FrameLayout {
}
}
+@Override
+protected void onLayout(boolean changed, int left, int top, int right, int
bottom) {
+super.onLayout(changed, left, top, right, bottom);
+if (changed) {
+setViewportSize(new IntSize(right - left, bottom - top));
+}
+}
+
private class SurfaceTextureListener implements
TextureView.SurfaceTextureListener {
public void onSurfaceTextureAvailable(SurfaceTexture surface, int
width, int height) {
// We don't do this for surfaceCreated above because it is always
followed by a surfaceChanged,
commit 89c8deab3d2e4f95c5731dfd80dbd2de0096a6b8
Author: Jan Holesovsky
Date: Fri Oct 10 12:56:57 2014 +0200
android: Improve the button descriptions.
Change-Id: I770065f7cb9aef3413cf8ebf860991147b6e14eb
diff --git a/android/experimental/LOAndroid3/res/values/strings.xml
b/android/experimental/LOAndroid3/res/values/strings.xml
index c98c0cd..857b00c 100644
--- a/android/experimental/LOAndroid3/res/values/strings.xml
+++ b/android/experimental/LOAndroid3/res/values/strings.xml
@@ -7,8 +7,8 @@
LibreOffice Viewer is a document viewer
based on LibreOffice.
http://www.libreoffice.org
-License
-Notice
+Show License
+Show Notice
LibreOffice Browser
Search
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sc/Library_scqahelper.mk sc/qa sw/qa sw/source writerfilter/source
sc/Library_scqahelper.mk |2
sc/qa/unit/helper/sorthelper.hxx | 55 +++
sc/qa/unit/ucalc_sort.cxx| 26 --
sw/qa/extras/ooxmlexport/data/effect-extent.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |9 +++
sw/source/filter/ww8/docxsdrexport.cxx | 23 +
writerfilter/source/dmapper/GraphicImport.cxx| 41 ++---
7 files changed, 142 insertions(+), 14 deletions(-)
New commits:
commit dd1490db9acea339c8af74d62362109efdb404f8
Author: Miklos Vajna
Date: Fri Oct 10 13:42:06 2014 +0200
DOCX export: improve handling
Change-Id: If8838529817c72f6e6a3730135a00312fe5c2ad3
diff --git a/sw/qa/extras/ooxmlexport/data/effect-extent.docx
b/sw/qa/extras/ooxmlexport/data/effect-extent.docx
new file mode 100644
index 000..f35fc3a
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/effect-extent.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index cf2c5c0..1277f7b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -447,6 +447,15 @@ DECLARE_OOXMLEXPORT_TEST(testCropPixel, "crop-pixel.docx")
}
}
+DECLARE_OOXMLEXPORT_TEST(testEffectExtent, "effect-extent.docx")
+{
+// The problem was that in case there were no shadows on the picture, we
+// wrote a full or zeros.
+if (xmlDocPtr pXmlDoc = parseExport("word/document.xml"))
+// E.g. this was 0.
+assertXPath(pXmlDoc, "//wp:effectExtent", "l", "114300");
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index e92a2c7..d834c70 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -626,6 +626,29 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt*
pFrmFmt, const Size& rS
break;
}
}
+else if(const SdrObject* pObject = pFrmFmt->FindRealSdrObject())
+{
+// No shadow, but we have an idea what was the original effectExtent.
+uno::Any aAny;
+pObject->GetGrabBagItem(aAny);
+comphelper::SequenceAsHashMap aGrabBag(aAny);
+comphelper::SequenceAsHashMap::iterator it =
aGrabBag.find("CT_EffectExtent");
+if (it != aGrabBag.end())
+{
+comphelper::SequenceAsHashMap aEffectExtent(it->second);
+for (std::pair& rDirection :
aEffectExtent)
+{
+if (rDirection.first == "l" &&
rDirection.second.has())
+aLeftExt =
OString::number(rDirection.second.get());
+else if (rDirection.first == "t" &&
rDirection.second.has())
+aTopExt =
OString::number(rDirection.second.get());
+else if (rDirection.first == "r" &&
rDirection.second.has())
+aRightExt =
OString::number(rDirection.second.get());
+else if (rDirection.first == "b" &&
rDirection.second.has())
+aBottomExt =
OString::number(rDirection.second.get());
+}
+}
+}
m_pImpl->m_pSerializer->singleElementNS(XML_wp, XML_effectExtent,
XML_l, aLeftExt,
commit 95c45bc25dbcb64919334c9f9a59c1132bee6d72
Author: Miklos Vajna
Date: Fri Oct 10 12:54:22 2014 +0200
DOCX import: map
Change-Id: Ibdfdca37009df3f518133e85d1daef3a4fea9073
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index ce2b764..c44ac41 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -258,6 +258,10 @@ public:
std::queue& m_rPositivePercentages;
OUString sAnchorId;
comphelper::SequenceAsHashMap m_aInteropGrabBag;
+boost::optional m_oEffectExtentLeft;
+boost::optional m_oEffectExtentTop;
+boost::optional m_oEffectExtentRight;
+boost::optional m_oEffectExtentBottom;
GraphicImport_Impl(GraphicImportType eImportType, DomainMapper&
rDMapper, std::queue& rPositivePercentages) :
nXSize(0)
@@ -411,6 +415,23 @@ public:
SAL_WARN("writerfilter", "failed. Message :" << e.Message);
}
}
+
+/// Getter for m_aInteropGrabBag, but also merges in the values from other
members if they are set.
+comphelper::SequenceAsHashMap getInteropGrabBag()
+{
+comphelper::SequenceAsHashMap aEffectExtent;
+if (m_oEffectExtentLeft)
+aEffectExtent["l"] <<= *m_oEffectExtentLeft;
+if (m_oEffectExtentTop)
+aEffectExtent["t"] <<= *m_oEffectExtentTop;
+if (m_oEffectExtentRight)
+aEffectExtent["r"] <<= *m_oEffectExtentRight;
+if (m_oEffectExtentBottom)
+aEffectExtent["b"]
[Libreoffice-commits] core.git: sax/source
sax/source/tools/fastserializer.cxx |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit dccc707da6bdb52a479923e8cfb0d048d7baaec1
Author: Stephan Bergmann
Date: Fri Oct 10 14:11:03 2014 +0200
Revert "This was OString already; use it that way"
This reverts commit 9a25d12534f91c13400a63e265fb5aa14c6aca66,
there's another use of DebugAttributes.find(rAttrName) in that
function where rAttrName is of type OUString.
diff --git a/sax/source/tools/fastserializer.cxx
b/sax/source/tools/fastserializer.cxx
index 4466623..fbce18a 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -225,7 +225,7 @@ namespace sax_fastparser {
void FastSaxSerializer::writeFastAttributeList( const Reference<
XFastAttributeList >& Attribs )
{
#ifdef DBG_UTIL
-::std::set DebugAttributes;
+::std::set DebugAttributes;
#endif
Sequence< Attribute > aAttrSeq = Attribs->getUnknownAttributes();
const Attribute *pAttr = aAttrSeq.getConstArray();
@@ -258,9 +258,10 @@ namespace sax_fastparser {
#ifdef DBG_UTIL
// Well-formedness constraint: Unique Att Spec
-OString const nameId(getId(nToken));
-assert(DebugAttributes.find(nameId) == DebugAttributes.end());
-DebugAttributes.insert(nameId);
+OUString const name(OStringToOUString(getId(nToken),
+ RTL_TEXTENCODING_UTF8));
+assert(DebugAttributes.find(name) == DebugAttributes.end());
+DebugAttributes.insert(name);
#endif
writeBytes(toUnoSequence(maEqualSignAndQuote));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'private/jmux/libreoffice-4-1-6+backports+unit'
New branch 'private/jmux/libreoffice-4-1-6+backports+unit' available with the following commits: commit 12cb3f789293d009b11a65103923cbfb31bfc7b7 Author: Jan-Marek Glogowski Date: Fri Oct 10 14:04:22 2014 +0200 fixup Change-Id: Ie94d61058ddd6adf9fb1407e379188c651b3ea1f commit f00869e5be0bb7584892495f33d55d5f4a088e0f Author: Noel Grandin Date: Wed Oct 1 13:02:57 2014 +0200 blind fix for windows build Change-Id: I8c3d8b039bc82b23d74b41ca4254f50d5c84 (cherry picked from commit 99bb7d664ef6c809ff6478fe2335c8a4a00e141b) commit ea6412391b571e66be5de03107ee0d1f75ba54a0 Author: Stephan Bergmann Date: Wed Oct 1 11:31:35 2014 +0200 loplugin:implicitboolconversion Change-Id: Ia63460949a3ba58f0394f5b94e0d906ca7849710 (cherry picked from commit a5824fa97c7300faca3b09fe0922c9f319b3c49b) commit 97d1c684af5f05cd6fc5add35709885239b1fbad Author: Jan-Marek Glogowski Date: Tue Sep 23 10:00:13 2014 +0200 MM: first unit test and infrastructure Extendes SwModelTestBase with mail merge functions and a declaration of the DECLARE_MAILMERGE_TEST macro and uses it in a first test. As most tests it's registered as a slow test run by 'make check'. The broken MM used to drop the leading empty pages, which resulted in a document with 4 pages and the two page bound draws merged per single page. Tests the MM result for page count (eight) and each draw anchor to be on a different page. (cherry picked from commit d10f6d49b77dcf955629901937d8d5e3a2976a6c) Conflicts: sw/Module_sw.mk sw/qa/extras/inc/swmodeltestbase.hxx Change-Id: Iab17f5844e68221d48cb89863323bcfe4c8ae0d2 commit 2f3db8081c56cd91e5837978ddeae62788f34e0b Author: Jan-Marek Glogowski Date: Mon Sep 15 00:48:59 2014 +0200 MM: add non-UI LoadAndRegisterDataSource function For the mail merge unit test we need a function to register new database sources without any UI interaction. This refactors and introduces new versions of LoadAndRegisterDataSource, which gets all previously interactive values as arguments. (cherry picked from commit 5187ce45b93e5e841e541eac98da3fa2110fe632) Conflicts: sw/source/uibase/dbui/dbmgr.cxx Change-Id: I1601b4112ddc800a0935950133d386ce349b9087 commit bf07857ff32d887bd215745430cfb6552577ff28 Author: Jan-Marek Glogowski Date: Mon Sep 15 00:13:06 2014 +0200 MM: export the SwDocShell mail merge via UNO This saves the loading time for large document. Use it if you want to present the generated document to the user or write a mail merge unit tests. This includes: * renaming "only" to "shell" at multiple occurences * dropping the DBMGR_MERGE_SINGLE_FILE special type for the mail merge wizard in favour of an additional SwMergeDescriptor boolean * cleanup and renaming of the internal merge type enums, so these actually match the diffferent merge targets: printer, email, file and shell (cherry picked from commit 9835bb562cfe3a5d386c24d86176ba7bb5ab26d2) Conflicts: offapi/type_reference/offapi.idl sw/inc/dbmgr.hxx sw/source/ui/dialog/swdlgfact.cxx sw/source/ui/dialog/swdlgfact.hxx sw/source/ui/envelp/mailmrge.cxx sw/source/uibase/dbui/dbmgr.cxx sw/source/uibase/inc/mailmrge.hxx sw/source/uibase/uno/unomailmerge.cxx Change-Id: I33c6773972195193687ba9c3e12b562310d330c1 commit 12052969b6edf9119f60d685a170f2fd442f2e67 Author: Jan-Marek Glogowski Date: Mon Sep 15 00:00:03 2014 +0200 MM: dump debug documents based on environment var Introduce SW_DEBUG_MAILMERGE_DOCS= to dump n mail merge debug documents (partly merged and working copies). This will speed up mail merge unit tests and allows dumping of an arbitrary amount of intermediate mail merge documents. (cherry picked from commit 0a5cd87e591d7f87bfab92716079af719259f143) Conflicts: sw/source/uibase/dbui/dbmgr.cxx Change-Id: Idb9fc19f99ccafe5574897bd1e687d439c52ebe5 commit 4896a4984473857d5b12df69a287c44c485105b7 Author: Michael Stahl Date: Fri Sep 12 21:50:36 2014 +0200 :sw: rename SwDoc::Append to something unique (cherry picked from commit 3b11057b75434526f67e678ddc1deb9ebd61c752) Conflicts: sw/source/uibase/dbui/dbmgr.cxx Change-Id: Ibb9db5ecdea6439df20fc1ee609267dcdd864405 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/Executable_icontest.mk
vcl/Executable_icontest.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 2f10386ce577f52e139aa23d41bc787d8e0b4d59 Author: Tor Lillqvist Date: Fri Oct 10 14:43:06 2014 +0300 Use gb_Executable_use_system_win32_libs for MinGW's sake Change-Id: I9a8ead19e6caa33d7941f11d0d9b5a1ad98ed661 diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk index d786386..dd5ee95 100644 --- a/vcl/Executable_icontest.mk +++ b/vcl/Executable_icontest.mk @@ -29,8 +29,8 @@ $(eval $(call gb_Executable_add_libs,icontest,\ else ifeq ($(OS),WNT) -$(eval $(call gb_Executable_add_libs,icontest,\ -opengl32.lib \ +$(eval $(call gb_Executable_use_system_win32_libs,icontest,\ +opengl32 \ )) else ifeq ($(OS),MACOSX) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 23 commits - chart2/source comphelper/source desktop/unx filter/source include/comphelper sal/osl sc/qa sc/source sd/source svx/source sw/qa sw/source tools/source vcl/
chart2/source/tools/MediaDescriptorHelper.cxx |1
comphelper/source/eventattachermgr/eventattachermgr.cxx | 17 +--
comphelper/source/misc/syntaxhighlight.cxx |2
desktop/unx/source/splashx.c| 30 -
filter/source/graphicfilter/icgm/class5.cxx |8 ++-
include/comphelper/propertysethelper.hxx|2
sal/osl/unx/file.cxx| 35
sc/qa/unit/ucalc.cxx|1
sc/source/ui/navipi/navipi.cxx |4 -
sd/source/filter/ppt/pptin.cxx |4 -
sd/source/ui/func/fudraw.cxx|1
sd/source/ui/unoidl/UnoDocumentSettings.cxx |4 -
sd/source/ui/view/drviews1.cxx |5 --
svx/source/table/tablecontroller.cxx|2
sw/qa/extras/inc/swmodeltestbase.hxx|3 -
sw/source/core/layout/fly.cxx | 16 +--
sw/source/core/layout/flycnt.cxx|2
sw/source/ui/index/cnttab.cxx |1
tools/source/generic/config.cxx |2
vcl/generic/fontmanager/fontmanager.cxx |4 -
vcl/generic/glyphs/gcach_ftyp.cxx |5 +-
vcl/qa/cppunit/fontcharmap.cxx | 10 ++--
vcl/source/gdi/bmpfast.cxx | 35 ++--
writerperfect/source/common/WPXSvInputStream.cxx|4 -
24 files changed, 84 insertions(+), 114 deletions(-)
New commits:
commit 91b65e0a73b35a745921831b73f5f4589bb889b7
Author: Caolán McNamara
Date: Fri Oct 10 09:58:04 2014 +0100
coverity#1242395 Don't call random
Change-Id: Idd4adac71222e03d85446c86f1c086ce32528bd6
mmeeks: just chop that else {} block out in splashx and good riddance
diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index 71cde42..a300a02 100644
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -354,36 +354,6 @@ static void create_pixmap(struct splash* splash)
XPutImage( splash->display, pixmap, pixmap_gc, image, 0, 0, 0, 0,
splash->width, splash->height );
XDestroyImage( image );
}
-else //if ( depth == 1 || visual->class == DirectColor )
-{
-// FIXME Something like the following, but faster ;-) - XDrawPoint is
not
-// a good idea...
-int x, y;
-for ( y = 0; y < splash->height; ++y )
-{
-color_t* color = (color_t *)&(splash->bitmap_rows[y]);
-
-int delta = 0;
-for ( x = 0; x < splash->width; ++x, ++color )
-{
-int rnd = (int)( ( (long)( random() - RAND_MAX/2 ) * 32000
)/RAND_MAX );
-int luminance = delta + rnd + 299 * (int)color->r + 587 *
(int)color->g + 114 * (int)color->b;
-
-if ( luminance < 128000 )
-{
-XSetForeground( splash->display, pixmap_gc, BlackPixel(
splash->display, splash->screen ) );
-delta = luminance;
-}
-else
-{
-XSetForeground( splash->display, pixmap_gc, WhitePixel(
splash->display, splash->screen ) );
-delta = luminance - 255000;
-}
-
-XDrawPoint( splash->display, pixmap, pixmap_gc, x, y );
-}
-}
-}
XSetWindowBackgroundPixmap( splash->display, splash->win, pixmap );
commit cb02551714ca65145d4476f3525c0c7ad1d04f66
Author: Caolán McNamara
Date: Fri Oct 10 10:03:06 2014 +0100
coverity#1242472 gold, Identical code for different branches
Change-Id: Ibdba24ef03ee4732e216b32b3f9e665706e96e4a
diff --git a/filter/source/graphicfilter/icgm/class5.cxx
b/filter/source/graphicfilter/icgm/class5.cxx
index 99c2a81..a1a9bfb 100644
--- a/filter/source/graphicfilter/icgm/class5.cxx
+++ b/filter/source/graphicfilter/icgm/class5.cxx
@@ -55,7 +55,9 @@ void CGM::ImplDoClass5()
else
nWidth = (sal_uInt32)ImplGetFloat( pElement->eRealPrecision,
pElement->nRealSize ) * 25; // scaling in 1/4 mm
-pElement->aLineBundle.nLineWidth = nWidth;
+( pElement->nAspectSourceFlags & ASF_LINEWIDTH )
+? pElement->pLineBundle->nLineWidth = nWidth
+: pElement->aLineBundle.nLineWidth = nWidth;
}
break;
case 0x04 : /*Line Color*/
@@ -91,7 +93,7 @@ void CGM::ImplDoClass5()
else
nWidth = (sal_uInt32)ImplGetFloat( pElement->eRealPrecision,
pElement->nRealSize ) * 25;
( pElement->nAspectSourceFlags & ASF_MARKERSIZE )
-? pElement->aMarkerBundle.nMarkerSize = nWidth
+? pElement->pMarkerBundle->nMarkerSize = nW
[Libreoffice-commits] core.git: 6 commits - package/inc package/source sax/source sd/source
package/inc/ZipOutputStream.hxx| 27 -
package/inc/ZipPackageEntry.hxx| 12
package/inc/ZipPackageFolder.hxx | 11
package/source/zipapi/ZipOutputStream.cxx | 241 -
package/source/zippackage/ZipPackage.cxx |3
package/source/zippackage/ZipPackageEntry.cxx | 24
package/source/zippackage/ZipPackageFolder.cxx | 627 +
package/source/zippackage/ZipPackageStream.cxx | 16
sax/source/tools/fastserializer.cxx|9
sd/source/filter/eppt/epptooxml.hxx|1
sd/source/filter/eppt/pptx-epptooxml.cxx |3
11 files changed, 496 insertions(+), 478 deletions(-)
New commits:
commit ae0756d8266bb92dfe04473a6b15cbb3fb7a0b69
Author: Matúš Kukan
Date: Thu Oct 9 13:15:22 2014 +0200
ZipOutputStream: No need to explicitly set default values
Change-Id: Ia3a20e0692e658d847e1b825fc97e32ac8a1854b
diff --git a/package/inc/ZipOutputStream.hxx b/package/inc/ZipOutputStream.hxx
index a8d106b..146e642 100644
--- a/package/inc/ZipOutputStream.hxx
+++ b/package/inc/ZipOutputStream.hxx
@@ -52,7 +52,7 @@ protected:
CRC32 m_aCRC;
ByteChucker m_aChucker;
ZipEntry*m_pCurrentEntry;
-sal_Int16 m_nMethod, m_nLevel, m_nDigested;
+sal_Int16 m_nDigested;
boolm_bFinished, m_bEncryptCurrentEntry;
ZipPackageStream* m_pCurrentStream;
@@ -69,10 +69,6 @@ public:
throw(::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
// XZipOutputStream interfaces
-void SAL_CALL setMethod( sal_Int32 nNewMethod )
-throw(::com::sun::star::uno::RuntimeException);
-void SAL_CALL setLevel( sal_Int32 nNewLevel )
-throw(::com::sun::star::uno::RuntimeException);
void SAL_CALL putNextEntry( ZipEntry& rEntry,
ZipPackageStream* pStream,
bool bEncrypt = false )
diff --git a/package/source/zipapi/ZipOutputStream.cxx
b/package/source/zipapi/ZipOutputStream.cxx
index 0a64d09..34f0979 100644
--- a/package/source/zipapi/ZipOutputStream.cxx
+++ b/package/source/zipapi/ZipOutputStream.cxx
@@ -45,8 +45,6 @@ ZipOutputStream::ZipOutputStream( const uno::Reference<
uno::XComponentContext >
, m_aDeflater(DEFAULT_COMPRESSION, true)
, m_aChucker(xOStream)
, m_pCurrentEntry(NULL)
-, m_nMethod(DEFLATED)
-, m_nLevel(0)
, m_nDigested(0)
, m_bFinished(false)
, m_bEncryptCurrentEntry(false)
@@ -60,17 +58,6 @@ ZipOutputStream::~ZipOutputStream( void )
delete m_aZipList[i];
}
-void SAL_CALL ZipOutputStream::setMethod( sal_Int32 nNewMethod )
-throw(RuntimeException)
-{
-m_nMethod = static_cast < sal_Int16 > (nNewMethod);
-}
-void SAL_CALL ZipOutputStream::setLevel( sal_Int32 nNewLevel )
-throw(RuntimeException)
-{
-m_aDeflater.setLevel( nNewLevel);
-}
-
void SAL_CALL ZipOutputStream::putNextEntry( ZipEntry& rEntry,
ZipPackageStream* pStream,
bool bEncrypt)
@@ -81,7 +68,7 @@ void SAL_CALL ZipOutputStream::putNextEntry( ZipEntry& rEntry,
if (rEntry.nTime == -1)
rEntry.nTime = getCurrentDosTime();
if (rEntry.nMethod == -1)
-rEntry.nMethod = m_nMethod;
+rEntry.nMethod = DEFLATED;
rEntry.nVersion = 20;
rEntry.nFlag = 1 << 11;
if (rEntry.nSize == -1 || rEntry.nCompressedSize == -1 ||
diff --git a/package/source/zippackage/ZipPackage.cxx
b/package/source/zippackage/ZipPackage.cxx
index 6dd1e82..3bc0627 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -1139,9 +1139,6 @@ uno::Reference< io::XInputStream >
ZipPackage::writeTempFile()
// Hand it to the ZipOutputStream:
ZipOutputStream aZipOut( m_xContext, xTempOut );
-aZipOut.setMethod( DEFLATED );
-aZipOut.setLevel( DEFAULT_COMPRESSION );
-
try
{
if ( m_nFormat == embed::StorageFormats::PACKAGE )
commit 9f495d128e9e1cc05b2e1f56f11f1ac4055d738d
Author: Matúš Kukan
Date: Tue Oct 7 16:04:13 2014 +0200
Split ZipPackageFolder::saveChild into two functions
And make them static. Probably would be better to kill ContentInfo and
add saveChild as pure virtual into ZipPackageEntry, from which are both
ZipPackageFolder and ZipPackageStream inheriting.
This will also create a bit more sensible call graph when profiling.
Change-Id: If8151332cfa6359e8736c912b7a5633a9162ab36
diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx
index 81eddd7..6053b48 100644
--- a/package/inc/ZipPackageFolder.hxx
+++ b/package/inc/ZipPackageFolder.hxx
@@ -79,10 +79,13 @@ public:
void setPackageFormat_Impl( sal_Int32 nFormat ) { m_nFormat = nFormat; }
void setRemoveOnInsertMode_Impl( bool bRemove ) {
this->mbAllowRemoveOnInsert = bRemove; }
-bool saveChild(const OUString &rShortName, const
com::sun::star::packa
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/chart/SchXMLExport.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit a636217f1fed882ef820540833d9283796b00380 Author: Stephan Bergmann Date: Fri Oct 10 13:30:52 2014 +0200 UBSan runtime error: division by zero ...triggered by CppunitTest_sw_ooxmlexport. Though it iss unclear to me what is the best fix in this case, emit a style:legend-expansion-aspect-ratio value of 1, emit a style:legend-expansion value of "custom" without an accompanying style:legend-expansion-aspect-ratio (if that is even valid), emit another style:legend-expansion value, or emit no style:legend-expansion attribute (if that is even valid)? Change-Id: I36afe35082a841974bb2480fe11a7a3dd815ddf0 diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index db5fc9e..1ccc56c 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -1434,7 +1434,9 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& OUStringBuffer aAspectRatioString; ::sax::Converter::convertDouble( aAspectRatioString, -double(aSize.Width)/double(aSize.Height)); +(aSize.Height == 0 + ? 1.0 + : double(aSize.Width)/double(aSize.Height))); mrExport.AddAttribute( XML_NAMESPACE_STYLE, XML_LEGEND_EXPANSION_ASPECT_RATIO, aAspectRatioString.makeStringAndClear() ); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/ilstbox.cxx |5 -
vcl/source/window/menu.cxx |5 +++--
vcl/source/window/winproc.cxx | 21 -
3 files changed, 19 insertions(+), 12 deletions(-)
New commits:
commit 53c836701e22b1babd3702b502facd76236df7ff
Author: Juergen Funk
Date: Thu Oct 9 15:44:29 2014 +0200
Fix fdo#84795 Menu, DropDown-List not disappears with right mouse click
Set for menu and float-list-box the PopupModeFlags to
FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK +
FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE
Improving the comments
Change-Id: I313e4ec38637fa3d46567e08bdb9560ce8475b6a
Reviewed-on: https://gerrit.libreoffice.org/11881
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index a1dea0d..d936d3b 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -3073,7 +3073,10 @@ void ImplListBoxFloatingWindow::StartFloat( bool
bStartTracking )
if( pGrandparent->ImplIsAntiparallel() )
pGrandparentOutDev->ReMirror( aRect );
-StartPopupMode( aRect, FLOATWIN_POPUPMODE_DOWN );
+// mouse-button right: close the List-Box-Float-win and don't stop the
handling fdo#84795
+const sal_uLong nFlags = FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK |
FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE;
+
+StartPopupMode( aRect, FLOATWIN_POPUPMODE_DOWN | nFlags );
if( nPos != LISTBOX_ENTRY_NOTFOUND )
mpImplLB->ShowProminentEntry( nPos );
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 582fdcb..cc34a1f 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2816,8 +2816,9 @@ sal_uInt16 PopupMenu::ImplExecute( vcl::Window* pW, const
Rectangle& rRect, sal_
WinBits nStyle = WB_BORDER;
if (bRealExecute)
nPopupModeFlags |= FLOATWIN_POPUPMODE_NEWLEVEL;
-if (!pStartedFrom || !pStartedFrom->IsMenuBar())
-nPopupModeFlags |= FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK |
FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE;
+
+// mouse-button right: close the sub-menu (float-win) and don't stop the
handling fdo#84795
+nPopupModeFlags |= FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK |
FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE;
nPopupModeFlags |= FLOATWIN_POPUPMODE_NOKEYCLOSE;
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index a677af1..18e2f45 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -101,7 +101,7 @@ static bool ImplHandleMouseFloatMode( vcl::Window* pChild,
const Point& rMousePo
pLastLevelFloat =
pSVData->maWinData.mpFirstFloat->ImplFindLastLevelFloat();
nPopupFlags = pLastLevelFloat->GetPopupModeFlags();
pLastLevelFloat->EndPopupMode(
FLOATWIN_POPUPMODEEND_CANCEL | FLOATWIN_POPUPMODEEND_CLOSEALL );
-return true;
+return false; // don't stop the handling fdo#84795
}
else if ( nHitTest == HITTEST_RECT )
{
@@ -381,7 +381,7 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, sal_uInt16
nSVEvent, bool bMous
// #106845# if the window was disabed during capturing we have to pass
the mouse events to release capturing
if ( pSVData->maWinData.mpCaptureWin != pChild &&
(!pChild->IsEnabled() || !pChild->IsInputEnabled() ||
pChild->IsInModalNonRefMode() ) )
{
-ImplHandleMouseFloatMode( pChild, aMousePos, nCode, nSVEvent,
bMouseLeave );
+bool bStopHdl = ImplHandleMouseFloatMode( pChild, aMousePos,
nCode, nSVEvent, bMouseLeave );
if ( nSVEvent == EVENT_MOUSEMOVE )
{
ImplHandleMouseHelpRequest( pChild, aMousePos );
@@ -401,15 +401,18 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow,
sal_uInt16 nSVEvent, bool bMous
pChild->ImplNotifyKeyMouseCommandEventListeners( aNEvt );
}
-if ( nSVEvent == EVENT_MOUSEBUTTONDOWN )
-return true;
-else
+if(bStopHdl) // mouse-button left: don't stop the handling for the
click fdo#84795
{
-// Set normal MousePointer for disabled windows
-if ( nSVEvent == EVENT_MOUSEMOVE )
-ImplSetMousePointer( pChild );
+if ( nSVEvent == EVENT_MOUSEBUTTONDOWN )
+return true;
+else
+{
+// Set normal MousePointer for disabled windows
+if ( nSVEvent == EVENT_MOUSEMOVE )
+ImplSetMousePointer( pChild );
-return false;
+return false;
+}
}
}
___
Libreoffice-commits mailing list
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/dbase/dindexnode.cxx | 13 +
connectivity/source/inc/dbase/dindexnode.hxx |2 ++
2 files changed, 15 insertions(+)
New commits:
commit faa6455995966e41653204779d055b885b27fc4c
Author: Noel Grandin
Date: Fri Oct 10 12:02:32 2014 +0200
add copy constructor for ONDXPagePtr class
which I forgot in commit a0a919d2b541c415ad9b81d2ee91895bf106e9bb
"remove SvRefBase::QueryDelete"
Change-Id: Ib52b9cb58451abd62f75d7376b069bf6aef550b2
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx
b/connectivity/source/drivers/dbase/dindexnode.cxx
index fe20627..f1fb068 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -835,6 +835,19 @@ ONDXPagePtr::ONDXPagePtr(ONDXPage* pRefPage)
nPagePos = pRefPage->GetPagePos();
}
+ONDXPagePtr& ONDXPagePtr::operator=(ONDXPagePtr const & rOther)
+{
+if (rOther.mpPage != 0) {
+rOther.mpPage->AddNextRef();
+}
+ONDXPage * pOldObj = mpPage;
+mpPage = rOther.mpPage;
+if (pOldObj != 0) {
+pOldObj->ReleaseRef();
+}
+return *this;
+}
+
static sal_uInt32 nValue;
SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPage& rPage)
diff --git a/connectivity/source/inc/dbase/dindexnode.hxx
b/connectivity/source/inc/dbase/dindexnode.hxx
index 791df02..b321635 100644
--- a/connectivity/source/inc/dbase/dindexnode.hxx
+++ b/connectivity/source/inc/dbase/dindexnode.hxx
@@ -94,6 +94,7 @@ namespace connectivity
ONDXPage* mpPage;
sal_uInt32 nPagePos; // Position in the index file
+
public:
ONDXPagePtr(sal_uInt32 nPos = 0) : mpPage(0), nPagePos(nPos) {}
ONDXPagePtr(const ONDXPagePtr& rRef);
@@ -107,6 +108,7 @@ namespace connectivity
ONDXPage * operator ->() const { assert(mpPage != 0); return
mpPage; }
bool Is() const { return mpPage != 0; }
inline void Clear();
+ONDXPagePtr& operator=(const ONDXPagePtr& rRef);
};
// Index Page
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/ooxml/model.xml |4 1 file changed, 4 insertions(+) New commits: commit 315693688d2ccc6f922fd552f2dd72f2ecc45913 Author: Miklos Vajna Date: Fri Oct 10 11:42:43 2014 +0200 writerfilter: tokenize attributes Change-Id: Ie4f4182e92dfd06b283dc86f5bfd611d7842a504 diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 447658f..925d7ac 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -6676,6 +6676,9 @@ + + + @@ -7014,6 +7017,7 @@ + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Lightproof] "Binary URP bridge disposed during call"
O Venres, 10 de Outubro de 2014 09:46:07 Stephan Bergmann escribiu:
> Another angle of attack could be to instead use "unopkg add" to install
> the extension, and see if its output gives more of a clue.
Great to know about unopkg, however the output is the same:
$ unopkg add -v --log-file log.txt lightproof_hu-1.5.oxt
ERROR: Binary URP bridge disposed during call
Exception details:
(com.sun.star.lang.DisposedException) { { { Message = "Binary URP
bridge
disposed during call", Context = (com.sun.star.uno.XInterface) @178aa80
}
} }
unopkg failed.
And the log is empty:
## Progress log entry 2014-10-10 11:33:52 ##
I failed to build LibreOffice on my laptop, some tests failed but I think that
it was due to a lack of enough memory. In a couple of days I’ll be home and
test on my desktop. Otherwise, I will use the Chakra build servers.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Repository.mk vcl/Executable_icontest.mk vcl/Module_vcl.mk
Repository.mk |2 +- vcl/Executable_icontest.mk |6 ++ vcl/Module_vcl.mk |2 +- 3 files changed, 8 insertions(+), 2 deletions(-) New commits: commit 1a261bd0a5f86189215617e70a8e921a8b2751c3 Author: Tor Lillqvist Date: Fri Oct 10 12:31:12 2014 +0300 Build icontest for OS X, too. Does not work at all, though Change-Id: Id1c82638f12514f55f297ec5e4a07444849175ce diff --git a/Repository.mk b/Repository.mk index beb2c68..b521ef6 100644 --- a/Repository.mk +++ b/Repository.mk @@ -99,7 +99,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \ ) \ uri-encode \ ui-previewer \ - $(if $(filter LINUX WNT,$(OS)), \ + $(if $(filter LINUX MACOSX WNT,$(OS)), \ icontest) \ vcldemo \ tiledrendering \ diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk index 83ba648..d786386 100644 --- a/vcl/Executable_icontest.mk +++ b/vcl/Executable_icontest.mk @@ -33,6 +33,12 @@ $(eval $(call gb_Executable_add_libs,icontest,\ opengl32.lib \ )) +else ifeq ($(OS),MACOSX) + +$(eval $(call gb_Executable_add_libs,icontest,\ +-framework OpenGL \ +)) + endif $(eval $(call gb_Executable_use_static_libraries,icontest,\ diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index fa827d3..51c5d3f 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -25,7 +25,7 @@ $(eval $(call gb_Module_add_targets,vcl,\ $(if $(filter DESKTOP,$(BUILD_TYPE)), \ StaticLibrary_vclmain \ Executable_ui-previewer \ - $(if $(filter LINUX WNT,$(OS)), \ + $(if $(filter LINUX MACOSX WNT,$(OS)), \ Executable_icontest)) \ $(if $(filter-out ANDROID IOS WNT,$(OS)), \ Executable_svdemo \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Repository.mk vcl/Executable_icontest.mk vcl/Module_vcl.mk vcl/workben
Repository.mk |2 +- vcl/Executable_icontest.mk |6 ++ vcl/Module_vcl.mk |2 +- vcl/workben/icontest.cxx |8 4 files changed, 12 insertions(+), 6 deletions(-) New commits: commit e21f6e3838a64f6c2517479d021e943e2ffcab94 Author: Tor Lillqvist Date: Fri Oct 10 11:58:30 2014 +0300 Build icontest for Windows, too Change-Id: I7c23d9a41c9b517bf8dcdd3e1de2ab24a8a1d0d0 diff --git a/Repository.mk b/Repository.mk index 706bf7a..beb2c68 100644 --- a/Repository.mk +++ b/Repository.mk @@ -99,7 +99,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \ ) \ uri-encode \ ui-previewer \ - $(if $(filter LINUX,$(OS)), \ + $(if $(filter LINUX WNT,$(OS)), \ icontest) \ vcldemo \ tiledrendering \ diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk index 76390c8..83ba648 100644 --- a/vcl/Executable_icontest.mk +++ b/vcl/Executable_icontest.mk @@ -27,6 +27,12 @@ $(eval $(call gb_Executable_add_libs,icontest,\ -lGL \ )) +else ifeq ($(OS),WNT) + +$(eval $(call gb_Executable_add_libs,icontest,\ +opengl32.lib \ +)) + endif $(eval $(call gb_Executable_use_static_libraries,icontest,\ diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 6c087e6..fa827d3 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -25,7 +25,7 @@ $(eval $(call gb_Module_add_targets,vcl,\ $(if $(filter DESKTOP,$(BUILD_TYPE)), \ StaticLibrary_vclmain \ Executable_ui-previewer \ - $(if $(filter LINUX,$(OS)), \ + $(if $(filter LINUX WNT,$(OS)), \ Executable_icontest)) \ $(if $(filter-out ANDROID IOS WNT,$(OS)), \ Executable_svdemo \ diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx index 42634ff..477be4c 100644 --- a/vcl/workben/icontest.cxx +++ b/vcl/workben/icontest.cxx @@ -98,11 +98,11 @@ void MyOpenGLWorkWindow::Paint( const Rectangle& ) glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); CHECK_GL_ERROR(); -float nThumbWidth = 2.0 / (WIDTH / 100.0); -float nThumbHeight = 2.0 / (HEIGHT / 100.0); +float nThumbWidth = 2.0f / (WIDTH / 100.0f); +float nThumbHeight = 2.0f / (HEIGHT / 100.0f); -float nStepX = 2.0 / (WIDTH / (100.0 + 10)); -float nStepY = 2.0 / (HEIGHT / (100.0 + 10)); +float nStepX = 2.0f / (WIDTH / (100.0f + 10)); +float nStepY = 2.0f / (HEIGHT / (100.0f + 10)); float nX = -1, nY = -1; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeWin32.conf
distro-configs/LibreOfficeLinux.conf |1 - distro-configs/LibreOfficeWin32.conf |1 - 2 files changed, 2 deletions(-) New commits: commit 89b44792d4bfe8e9cb0b50bfe0c0e00101fdc9ec Author: Norbert Thiebaud Date: Fri Oct 10 03:52:26 2014 -0500 distro-config should not have --with-vendor=TDF Change-Id: I2809456a49727f7b7abe8521f6e6562ed3fd5c9d diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index 4df42ce..451df4e 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -1,4 +1,3 @@ ---with-vendor=The Document Foundation --with-system-dicts --with-myspell-dicts --with-system-zlib diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf index b04c526..65f7308 100644 --- a/distro-configs/LibreOfficeWin32.conf +++ b/distro-configs/LibreOfficeWin32.conf @@ -1,4 +1,3 @@ ---with-vendor=The Document Foundation --without-system-mesa-headers --without-system-postgresql --without-junit ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: distro-configs/LibreOfficeLinux.conf
distro-configs/LibreOfficeLinux.conf |1 + 1 file changed, 1 insertion(+) New commits: commit d97b807d2315cb510bb13e8da0137262bc0bbc8a Author: Christian Lohmaier Date: Fri Oct 10 10:48:31 2014 +0200 baseline doesn't support gstremer-1.0 Change-Id: I3d08f9df3202c4f594b9adf209dfc0077e6f7d81 diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index de417a1..4df42ce 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -25,6 +25,7 @@ --enable-lockdown --enable-kde --enable-gstreamer-0-10 +--disable-gstreamer --enable-evolution2 --enable-gnome-vfs --enable-scripting-beanshell ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac | 10 +-
1 file changed, 1 insertion(+), 9 deletions(-)
New commits:
commit 5af8c041607d5f25a4b9e11978215f629c0a6c95
Author: Tor Lillqvist
Date: Fri Oct 10 10:20:59 2014 +0300
Bin pointless case statement: both cases were identical
diff --git a/configure.ac b/configure.ac
index 03f58b9..6b79026 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7783,15 +7783,7 @@ fi
if test $enable_python = system; then
if test -z "$PYTHON_CFLAGS" -a $_os = Darwin; then
-# Make sure we use the 2.6 Python when building against the
-# 10.6 SDK.
-case $with_macosx_sdk in
-10.8)
-python_version=2.7;;
-*)
-# 10.9 etc.
-python_version=2.7;;
-esac
+python_version=2.7
PYTHON=python$python_version
if test -d
"$FRAMEWORKSHOME/Python.framework/Versions/${python_version}/include/python${python_version}";
then
PYTHON_CFLAGS="-I$FRAMEWORKSHOME/Python.framework/Versions/${python_version}/include/python${python_version}"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-3' - sc/source
sc/source/core/data/document10.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit af79db308c86d200d9fb76001167511408c68bce
Author: Matthew J. Francis
Date: Thu Oct 9 13:02:18 2014 +0800
fdo#84810 Avoid calc crash when using Paste Special - Link
Change-Id: I52c072578ccc0b9f75a850613056e74d400eb532
Reviewed-on: https://gerrit.libreoffice.org/11867
Reviewed-by: Kohei Yoshida
Tested-by: Kohei Yoshida
(cherry picked from commit 2b6619c597a791775e2d41a68f7e85ef75d1aaa2)
Reviewed-on: https://gerrit.libreoffice.org/11875
(cherry picked from commit b2707c0545d7cc762a9ccfbb8a3b3cea495195e2)
Reviewed-on: https://gerrit.libreoffice.org/11879
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/core/data/document10.cxx
b/sc/source/core/data/document10.cxx
index e468dd3..baf7314 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -76,6 +76,8 @@ bool ScDocument::CopyOneCellFromClip(
return false;
ScCellValue& rSrcCell = rCxt.getSingleCell();
+const ScPatternAttr* pAttr = pClipDoc->GetPattern(aSrcPos);
+rCxt.setSingleCellPattern(pAttr);
if (rCxt.isAsLink())
{
ScSingleRefData aRef;
@@ -89,8 +91,6 @@ bool ScDocument::CopyOneCellFromClip(
else
{
rSrcCell.set(pClipDoc->GetRefCellValue(aSrcPos));
-const ScPatternAttr* pAttr = pClipDoc->GetPattern(aSrcPos);
-rCxt.setSingleCellPattern(pAttr);
// Check the paste flag to see whether we want to paste this cell. If
the
// flag says we don't want to paste this cell, we'll return with true.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/ui/view/viewfun6.cxx | 24 +---
1 file changed, 17 insertions(+), 7 deletions(-)
New commits:
commit 8b3de4010f75cd751ac56982df43c1fa912682da
Author: Eike Rathke
Date: Thu Oct 9 21:10:35 2014 +0200
InsertCurrentTime: in input mode inherit matching format if set
In case a date or time cell format was set, inherit that format for
Ctrl+; or Ctrl+: date/time insertion while editing the cell.
Change-Id: If13e680fc74ab36611f8c11d992dba4b9c91ddb4
(cherry picked from commit 980fd719648fb5b7cbe93ba23c1ee2f180ffcee8)
Reviewed-on: https://gerrit.libreoffice.org/11893
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index 1af27f9..b65eaf3 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -268,22 +268,29 @@ void ScViewFunc::InsertCurrentTime(short nReqFmt, const
OUString& rUndoStr)
const sal_uInt32 nCurNumFormat = rDoc.GetNumberFormat(aCurPos);
SvNumberFormatter* pFormatter = rDoc.GetFormatTable();
const SvNumberformat* pCurNumFormatEntry =
pFormatter->GetEntry(nCurNumFormat);
+const short nCurNumFormatType = (pCurNumFormatEntry ?
+(pCurNumFormatEntry->GetType() & ~NUMBERFORMAT_DEFINED) :
NUMBERFORMAT_UNDEFINED);
if (bInputMode)
{
double fVal = 0.0;
+sal_uInt32 nFormat = 0;
switch (nReqFmt)
{
case NUMBERFORMAT_DATE:
{
Date aActDate( Date::SYSTEM );
fVal = aActDate - *pFormatter->GetNullDate();
+if (nCurNumFormatType == NUMBERFORMAT_DATE)
+nFormat = nCurNumFormat;
}
break;
case NUMBERFORMAT_TIME:
{
Time aActTime( Time::SYSTEM );
fVal = aActTime.GetTimeInDays();
+if (nCurNumFormatType == NUMBERFORMAT_TIME)
+nFormat = nCurNumFormat;
}
break;
default:
@@ -294,15 +301,20 @@ void ScViewFunc::InsertCurrentTime(short nReqFmt, const
OUString& rUndoStr)
{
DateTime aActDateTime( DateTime::SYSTEM );
fVal = aActDateTime - DateTime(
*pFormatter->GetNullDate());
+if (nCurNumFormatType == NUMBERFORMAT_DATETIME)
+nFormat = nCurNumFormat;
}
break;
}
-LanguageType nLang = (pCurNumFormatEntry ?
pCurNumFormatEntry->GetLanguage() : ScGlobal::eLnge);
-sal_uInt32 nFormat = pFormatter->GetStandardFormat( nReqFmt, nLang);
-// This would return a more precise format with seconds and 100th
-// seconds for a time request.
-//nFormat = pFormatter->GetStandardFormat( fVal, nFormat, nReqFmt,
nLang);
+if (!nFormat)
+{
+const LanguageType nLang = (pCurNumFormatEntry ?
pCurNumFormatEntry->GetLanguage() : ScGlobal::eLnge);
+nFormat = pFormatter->GetStandardFormat( nReqFmt, nLang);
+// This would return a more precise format with seconds and 100th
+// seconds for a time request.
+//nFormat = pFormatter->GetStandardFormat( fVal, nFormat, nReqFmt,
nLang);
+}
OUString aString;
Color* pColor;
pFormatter->GetOutputString( fVal, nFormat, aString, &pColor);
@@ -318,8 +330,6 @@ void ScViewFunc::InsertCurrentTime(short nReqFmt, const
OUString& rUndoStr)
}
else
{
-const short nCurNumFormatType = (pCurNumFormatEntry ?
-(pCurNumFormatEntry->GetType() & ~NUMBERFORMAT_DEFINED) :
NUMBERFORMAT_UNDEFINED);
bool bForceReqFmt = false;
const double fCell = rDoc.GetValue( aCurPos);
// Combine requested date/time stamp with existing cell time/date, if
any.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Unittest fails building on OS X 10.9
On 10/10/2014 09:35 AM, Tor Lillqvist wrote: I've added the section "Minimal Setup with MacPorts for external dependencies" [1] which can be very helpful to build LO easily. So that is then now our documented and thus "official" way to build on Mac? If it works, I don't oppose... even if it totally contrary to what has been the collective wisdom so far. I assume the sanity of a MacPorts-in-PATH based build env depends on what other stuff you have installed in your MacPorts installation, so I would not generally suggest that route to the uninitiated. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Unittest fails building on OS X 10.9
> so it is not really a > requirement to have MacPorts. > Indeed not. The wiki page needs to say more clearly that there are two fundamentally different ways to set up a build environment now, and that they shouldn't be mixed. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Unittest fails building on OS X 10.9
Le 10/10/2014 03:28, Robert Antoni Buj i Gelonch a écrit : Hi Anton, > I've added the section "Minimal Setup with MacPorts for external > dependencies" [1] which can be very helpful to build LO easily. > > [1] > https://wiki.documentfoundation.org/Development/BuildingOnMac#Minimal_Setup_with_MacPorts_for_external_dependencies > I didn't use MacPorts to install the autoconf/automake, ant, or doxygen tools, in fact I didn't use MacPorts at all, so it is not really a requirement to have MacPorts. Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/axes/VAxisProperties.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 87bf3fb4a5def8b0536d44ab406dbd31b09c0daf Author: Stephan Bergmann Date: Fri Oct 10 09:39:59 2014 +0200 Fix CppunitTest_chart2_xshape ...regression from d7e477c4518bb3f638af59fa48cae04eba8c76cc "Use boost::optional for these members." Change-Id: I8e02033d75fd52489be03b34fbce494ae49ab7e3 diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx index da04616..80c2261 100644 --- a/chart2/source/view/axes/VAxisProperties.cxx +++ b/chart2/source/view/axes/VAxisProperties.cxx @@ -182,6 +182,7 @@ AxisProperties::AxisProperties( const AxisProperties& rAxisProperties ) , m_bSwapXAndY( rAxisProperties.m_bSwapXAndY ) , m_eCrossoverType( rAxisProperties.m_eCrossoverType ) , m_eLabelPos( rAxisProperties.m_eLabelPos ) +, m_eTickmarkPos( rAxisProperties.m_eTickmarkPos ) , m_bCrossingAxisHasReverseDirection( rAxisProperties.m_bCrossingAxisHasReverseDirection ) , m_bCrossingAxisIsCategoryAxes( rAxisProperties.m_bCrossingAxisIsCategoryAxes ) , m_fLabelDirectionSign( rAxisProperties.m_fLabelDirectionSign ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Unittest fails building on OS X 10.9
> I've added the section "Minimal Setup with MacPorts for external > dependencies" [1] which can be very helpful to build LO easily. > So that is then now our documented and thus "official" way to build on Mac? If it works, I don't oppose... even if it totally contrary to what has been the collective wisdom so far. While you are updating that page, could you also add a mention of building on 10.9, which after all has been the curent release for almost a year now. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source
sw/inc/PostItMgr.hxx |6 +-
sw/inc/SwAppletImpl.hxx| 12 +++-
sw/source/filter/html/SwAppletImpl.cxx | 30 +++---
sw/source/filter/html/htmlplug.cxx |8
sw/source/filter/xml/xmltexte.cxx | 12 ++--
sw/source/uibase/docvw/PostItMgr.cxx | 11 +++
6 files changed, 36 insertions(+), 43 deletions(-)
New commits:
commit f453dc0327535056c8c9908c322763db9eca33be
Author: Noel Grandin
Date: Fri Oct 10 08:55:04 2014 +0200
convert SWHTML_OPTTYPE #defines to enum
Change-Id: I847c7c116984817c7d66d44431db0601f0a27209
diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx
index dcd5a26..5a668be 100644
--- a/sw/inc/SwAppletImpl.hxx
+++ b/sw/inc/SwAppletImpl.hxx
@@ -22,10 +22,12 @@
#include
-#define SWHTML_OPTTYPE_IGNORE 0
-#define SWHTML_OPTTYPE_TAG 1
-#define SWHTML_OPTTYPE_PARAM 2
-#define SWHTML_OPTTYPE_SIZE 3
+enum class SwHtmlOptType {
+IGNORE = 0,
+TAG = 1,
+PARAM = 2,
+SIZE = 3
+};
#include
@@ -49,7 +51,7 @@ class SwApplet_Impl
OUString sAlt;
public:
-static sal_uInt16 GetOptionType( const OUString& rName, bool bApplet );
+static SwHtmlOptType GetOptionType( const OUString& rName, bool bApplet );
SwApplet_Impl( SfxItemPool& rPool, sal_uInt16 nWhich1, sal_uInt16 nWhich2
);
SwApplet_Impl( SfxItemSet& rSet ): aItemSet ( rSet) {}
~SwApplet_Impl();
diff --git a/sw/source/filter/html/SwAppletImpl.cxx
b/sw/source/filter/html/SwAppletImpl.cxx
index b95f544..eff1b23 100644
--- a/sw/source/filter/html/SwAppletImpl.cxx
+++ b/sw/source/filter/html/SwAppletImpl.cxx
@@ -38,9 +38,9 @@ static char const sHTML_O_Object[] = "OBJECT";
}
-sal_uInt16 SwApplet_Impl::GetOptionType( const OUString& rName, bool bApplet )
+SwHtmlOptType SwApplet_Impl::GetOptionType( const OUString& rName, bool
bApplet )
{
-sal_uInt16 nType = bApplet ? SWHTML_OPTTYPE_PARAM : SWHTML_OPTTYPE_TAG;
+SwHtmlOptType nType = bApplet ? SwHtmlOptType::PARAM : SwHtmlOptType::TAG;
switch( rName.toChar() )
{
@@ -48,67 +48,67 @@ sal_uInt16 SwApplet_Impl::GetOptionType( const OUString&
rName, bool bApplet )
case 'a':
if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_align ) ||
rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_alt ) )
-nType = SWHTML_OPTTYPE_IGNORE;
+nType = SwHtmlOptType::IGNORE;
else if( bApplet &&
(rName.equalsIgnoreAsciiCaseAscii( sHTML_O_archive ) ||
rName.equalsIgnoreAsciiCaseAscii( sHTML_O_Archives )) )
-nType = SWHTML_OPTTYPE_TAG;
+nType = SwHtmlOptType::TAG;
break;
case 'C':
case 'c':
if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_class ) ||
(bApplet && (rName.equalsIgnoreAsciiCase(
OOO_STRING_SVTOOLS_HTML_O_code ) ||
rName.equalsIgnoreAsciiCase(
OOO_STRING_SVTOOLS_HTML_O_codebase ))) )
-nType = SWHTML_OPTTYPE_IGNORE;
+nType = SwHtmlOptType::IGNORE;
break;
case 'H':
case 'h':
if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_height ) )
-nType = SWHTML_OPTTYPE_SIZE;
+nType = SwHtmlOptType::SIZE;
else if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_hspace
) ||
(!bApplet && rName.equalsIgnoreAsciiCase(
OOO_STRING_SW_HTML_O_Hidden )) )
-nType = SWHTML_OPTTYPE_IGNORE;
+nType = SwHtmlOptType::IGNORE;
break;
case 'I':
case 'i':
if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_id ) )
-nType = SWHTML_OPTTYPE_IGNORE;
+nType = SwHtmlOptType::IGNORE;
break;
case 'M':
case 'm':
if( bApplet && rName.equalsIgnoreAsciiCase(
OOO_STRING_SVTOOLS_HTML_O_mayscript ) )
-nType = SWHTML_OPTTYPE_IGNORE;
+nType = SwHtmlOptType::IGNORE;
break;
case 'N':
case 'n':
if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_name ) )
-nType = SWHTML_OPTTYPE_IGNORE;
+nType = SwHtmlOptType::IGNORE;
break;
case 'O':
case 'o':
if( bApplet && rName.equalsIgnoreAsciiCaseAscii( sHTML_O_Object ) )
-nType = SWHTML_OPTTYPE_TAG;
+nType = SwHtmlOptType::TAG;
break;
case 'S':
case 's':
if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_style ) ||
(!bApplet && rName.equalsIgnoreAsciiCase(
OOO_STRING_SVTOOLS_HTML_O_src )) )
-nType = SWHTML_OPTTYPE_IGNORE;
+nType = SwHtmlOptType::IGNORE;
break;
case 'T':
case 't':
if( !bApplet && rName.equalsIgnoreAsciiCase(
OOO_STRING_SVTOOLS_HTML_O_type ) )
-nType = SWHTML_OPTTYPE_IGNORE;
+nType = SwHtmlOptType::IGNORE;
bre
Re: Unittest fails building on OS X 10.9
Hi, Yes, your section looks more up to date, than the section "Minimal Setup". Great job you have done. Regards, Joost 2014-10-10 3:28 GMT+02:00 Robert Antoni Buj i Gelonch : > Hi, > > I've added the section "Minimal Setup with MacPorts for external > dependencies" [1] which can be very helpful to build LO easily. > > [1] > https://wiki.documentfoundation.org/Development/BuildingOnMac#Minimal_Setup_with_MacPorts_for_external_dependencies > > Regards, > Robert > > On Thu, Oct 9, 2014 at 9:38 PM, Joost Eekhoorn > wrote: > >> Build has succeeded. >> I saw in this that --disable-cve-test is needed on OS X Mavericks >> >> Still I had to do 2 little, dirty hacks: >> - Moved away 4 CVE-test file from >> ~/lo/core/writerfilter/qa/cppunittest/data/pass/ >> (CVE-2010-333-1.rtf, CVE-2014-1761-1.rtf, CVE-2014-1761-2.rtf and >> CVS-pseudo-2009-0238-1.rtf) >> - Edited ~/lo/core/sw/qa/extras/rtfimport/rtfimport.cxx >> (skipping testN192129) >> >> Beside that, this is what I have done: >> >> Install Ant (OS X Mavericks does not have that anymore) >> >> ./autogen.sh >> --with-ant-home="/usr/local/bin/apache-ant" >> --wiithout-junit >> --enable-python=internal >> --disable-cve-tests >> >> I could not found instdir/program/soffice to start the program, but used: >> instdir/LibreOfficeDev.app/Contents/MacOS/soffice >> >> It would be nice if someone would review my information and update the >> building instructions for Mac: >> https://wiki.documentfoundation.org/Development/BuildingOnMac >> >> >> ___ >> LibreOffice mailing list >> LibreOffice@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/libreoffice >> >> > > > -- > http://about.me/rbuj > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: xmerge/source
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
|5 +
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java
|5 +
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java
| 10 ++
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java
|5 +
xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java
|6 +-
xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java
|6 +-
6 files changed, 7 insertions(+), 30 deletions(-)
New commits:
commit 6d848b2aaf4eb814dba90a3db8e5494530dc0ada
Author: Robert Antoni Buj i Gelonch
Date: Thu Oct 9 21:25:08 2014 +0200
xmerge: The if statement is redundant
Change-Id: I56c5727470c4dba9ffa7c298fb6ccea5be750f33
Reviewed-on: https://gerrit.libreoffice.org/11894
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
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 48c84ef..644d91e 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
@@ -352,10 +352,7 @@ public class CellStyle extends Style implements Cloneable {
Format rhs = tStyle.getFormat();
-if(!fmt.isSubset(rhs))
-return false;
-
-return true;
+return fmt.isSubset(rhs);
}
/**
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java
index 68c689f..3b88008 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java
@@ -225,10 +225,7 @@ public class ColumnStyle extends Style implements
Cloneable {
return false;
ColumnStyle tStyle = (ColumnStyle)style;
-if(colWidth!=tStyle.getColWidth())
-return false;
-
-return true;
+return colWidth == tStyle.getColWidth();
}
/**
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java
index 27f87f0..84514be 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/Format.java
@@ -388,10 +388,7 @@ public class Format implements Cloneable {
if (rhs.align!= align)
return false;
-if (rhs.vertAlign!= vertAlign)
-return false;
-
-return true;
+return rhs.vertAlign == vertAlign;
}
/**
@@ -426,9 +423,6 @@ public class Format implements Cloneable {
if (rhs.align!= align)
return false;
-if (rhs.vertAlign!= vertAlign)
-return false;
-
-return true;
+return rhs.vertAlign == vertAlign;
}
}
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java
index 3f8075c..6639ce1 100644
---
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java
+++
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java
@@ -224,10 +224,7 @@ public class RowStyle extends Style implements Cloneable {
return false;
RowStyle tStyle = (RowStyle)style;
-if(rowHeight!=tStyle.getRowHeight())
-return false;
-
-return true;
+return rowHeight == tStyle.getRowHeight();
}
/**
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java
index c90e5ea..7ca174a 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/test/Driver.java
@@ -292,10 +292,6 @@ public final class Driver {
private boolean isZip(String zipName) {
String str = zipName.toLowerCase();
-if (str.endsWith("sxw") || zipName.endsWith("sxc")) {
-return true;
-}
-
-return false;
+return str.endsWith("sxw") || zipName.endsWith("sxc");
}
}
\ No newline at end of file
diff --git
a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java
b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java
index 7254ed0..aefb3f9 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/ColourConverter.java
+++ b/xmerge/sour
[Libreoffice-commits] core.git: qadevOOo/runner
qadevOOo/runner/convwatch/EnhancedComplexTestCase.java |8 --
qadevOOo/runner/convwatch/FileHelper.java|6 -
qadevOOo/runner/convwatch/FilenameHelper.java|6 -
qadevOOo/runner/convwatch/GraphicalTestArguments.java| 46 +++
qadevOOo/runner/convwatch/IniFile.java | 10 ---
qadevOOo/runner/convwatch/MSOfficePrint.java | 16 +
qadevOOo/runner/graphical/IniFile.java | 31 +-
qadevOOo/runner/graphical/MSOfficePostscriptCreator.java | 22 +--
qadevOOo/runner/graphical/ParameterHelper.java | 15
qadevOOo/runner/helper/OSHelper.java | 45 +++---
qadevOOo/runner/org/openoffice/Runner.java |6 -
qadevOOo/runner/org/openoffice/RunnerService.java|4 -
12 files changed, 48 insertions(+), 167 deletions(-)
New commits:
commit 110ae4e498a55bd50ca0afe558126e9e029f68cd
Author: Robert Antoni Buj i Gelonch
Date: Thu Oct 9 21:51:37 2014 +0200
runner: The if statement is redundant
Change-Id: Ida40034bdfe6a44a936db1243ad6c71616caada3
Reviewed-on: https://gerrit.libreoffice.org/11895
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java
b/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java
index 47e23fc..52587c6 100644
--- a/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java
+++ b/qadevOOo/runner/convwatch/EnhancedComplexTestCase.java
@@ -79,12 +79,8 @@ public abstract class EnhancedComplexTestCase extends
ComplexTestCase
{
sNEEDCHECK = "false";
}
-if (sNEEDCHECK.equalsIgnoreCase("yes") ||
-sNEEDCHECK.equalsIgnoreCase("true"))
-{
-return true;
-}
-return false;
+return sNEEDCHECK.equalsIgnoreCase("yes") ||
+sNEEDCHECK.equalsIgnoreCase("true");
}
diff --git a/qadevOOo/runner/convwatch/FileHelper.java
b/qadevOOo/runner/convwatch/FileHelper.java
index e9f97ef..ba4e4c3 100644
--- a/qadevOOo/runner/convwatch/FileHelper.java
+++ b/qadevOOo/runner/convwatch/FileHelper.java
@@ -44,11 +44,7 @@ public class FileHelper
if (_sFile == null) return false;
File aFile = new File(_sFile);
-if (aFile.exists())
-{
-return true;
-}
-return false;
+return aFile.exists();
}
public static boolean isDir(String _sDir)
diff --git a/qadevOOo/runner/convwatch/FilenameHelper.java
b/qadevOOo/runner/convwatch/FilenameHelper.java
index 19b9eea..56a3b5dd 100644
--- a/qadevOOo/runner/convwatch/FilenameHelper.java
+++ b/qadevOOo/runner/convwatch/FilenameHelper.java
@@ -246,11 +246,7 @@ abstract class FilenameHelper_impl implements Filenamer
{
String sPath = createAbsoluteFilename();
String sPathOther = _aOtherFN.createAbsoluteFilename();
-if (sPath.equals(sPathOther))
-{
-return true;
-}
-return false;
+return sPath.equals(sPathOther);
}
}
diff --git a/qadevOOo/runner/convwatch/GraphicalTestArguments.java
b/qadevOOo/runner/convwatch/GraphicalTestArguments.java
index 49fb1e0..5fc4bed 100644
--- a/qadevOOo/runner/convwatch/GraphicalTestArguments.java
+++ b/qadevOOo/runner/convwatch/GraphicalTestArguments.java
@@ -196,15 +196,9 @@ public class GraphicalTestArguments
{
sREUSE_OFFICE = "false";
}
-if (sREUSE_OFFICE.equalsIgnoreCase("yes") ||
-sREUSE_OFFICE.equalsIgnoreCase("true"))
-{
-m_bResuseOffice = true;
-}
-else
-{
-m_bResuseOffice = false;
-}
+m_bResuseOffice =
+sREUSE_OFFICE.equalsIgnoreCase("yes") ||
+sREUSE_OFFICE.equalsIgnoreCase("true");
String sHTMLOutputPrefix = (String)param.get(
PropertyName.DOC_COMPARATOR_HTML_OUTPUT_PREFIX);
@@ -276,15 +270,9 @@ public class GraphicalTestArguments
String sCreateDefault =
(String)param.get(PropertyName.CREATE_DEFAULT);
if (sCreateDefault != null)
{
-if (sCreateDefault.equalsIgnoreCase("yes") ||
-sCreateDefault.equalsIgnoreCase("true"))
-{
-m_bCreateDefaultReference = true;
-}
-else
-{
-m_bCreateDefaultReference = false;
-}
+m_bCreateDefaultReference =
+sCreateDefault.equalsIgnoreCase("yes") ||
+sCreateDefault.equalsIgnoreCase("true");
}
}
@@ -293,17 +281,12 @@ public class GraphicalTestArguments
{
