date:20160724

[Libreoffice-commits] core.git: sw/source

2016-07-24 Thread Miklos Vajna

 sw/source/ui/config/optpage.cxx  |  192 +++
 sw/source/uibase/inc/optpage.hxx |   34 +++---
 2 files changed, 113 insertions(+), 113 deletions(-)

New commits:
commit be23a192ccd25b707a9ff919d6357d9272ff7b75
Author: Miklos Vajna 
Date:   Mon Jul 25 08:09:29 2016 +0200

sw: prefix members of SwTableOptionsTabPage

Change-Id: Id82effaf20663d3c54ab42d02c4aef2b08101c6f
Reviewed-on: https://gerrit.libreoffice.org/27501
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index fe6f353..8eca791 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1090,28 +1090,28 @@ void SwStdFontTabPage::PageCreated( const 
SfxAllItemSet& aSet)
 
 SwTableOptionsTabPage::SwTableOptionsTabPage( vcl::Window* pParent, const 
SfxItemSet& rSet ) :
 SfxTabPage(pParent, "OptTablePage", "modules/swriter/ui/opttablepage.ui", 
&rSet),
-pWrtShell(nullptr),
-bHTMLMode(false)
-{
-get(pHeaderCB,"header");
-get(pRepeatHeaderCB,"repeatheader");
-get(pDontSplitCB,"dontsplit");
-get(pBorderCB,"border");
-get(pNumFormattingCB,"numformatting");
-get(pNumFormatFormattingCB,"numfmtformatting");
-get(pNumAlignmentCB,"numalignment");
-get(pRowMoveMF,"rowmove");
-get(pColMoveMF,"colmove");
-get(pRowInsertMF,"rowinsert");
-get(pColInsertMF,"colinsert");
-get(pFixRB,"fix");
-get(pFixPropRB,"fixprop");
-get(pVarRB,"var");
+m_pWrtShell(nullptr),
+m_bHTMLMode(false)
+{
+get(m_pHeaderCB,"header");
+get(m_pRepeatHeaderCB,"repeatheader");
+get(m_pDontSplitCB,"dontsplit");
+get(m_pBorderCB,"border");
+get(m_pNumFormattingCB,"numformatting");
+get(m_pNumFormatFormattingCB,"numfmtformatting");
+get(m_pNumAlignmentCB,"numalignment");
+get(m_pRowMoveMF,"rowmove");
+get(m_pColMoveMF,"colmove");
+get(m_pRowInsertMF,"rowinsert");
+get(m_pColInsertMF,"colinsert");
+get(m_pFixRB,"fix");
+get(m_pFixPropRB,"fixprop");
+get(m_pVarRB,"var");
 
 Link aLnk(LINK(this, SwTableOptionsTabPage, CheckBoxHdl));
-pNumFormattingCB->SetClickHdl(aLnk);
-pNumFormatFormattingCB->SetClickHdl(aLnk);
-pHeaderCB->SetClickHdl(aLnk);
+m_pNumFormattingCB->SetClickHdl(aLnk);
+m_pNumFormatFormattingCB->SetClickHdl(aLnk);
+m_pHeaderCB->SetClickHdl(aLnk);
 }
 
 SwTableOptionsTabPage::~SwTableOptionsTabPage()
@@ -1121,20 +1121,20 @@ SwTableOptionsTabPage::~SwTableOptionsTabPage()
 
 void SwTableOptionsTabPage::dispose()
 {
-pHeaderCB.clear();
-pRepeatHeaderCB.clear();
-pDontSplitCB.clear();
-pBorderCB.clear();
-pNumFormattingCB.clear();
-pNumFormatFormattingCB.clear();
-pNumAlignmentCB.clear();
-pRowMoveMF.clear();
-pColMoveMF.clear();
-pRowInsertMF.clear();
-pColInsertMF.clear();
-pFixRB.clear();
-pFixPropRB.clear();
-pVarRB.clear();
+m_pHeaderCB.clear();
+m_pRepeatHeaderCB.clear();
+m_pDontSplitCB.clear();
+m_pBorderCB.clear();
+m_pNumFormattingCB.clear();
+m_pNumFormatFormattingCB.clear();
+m_pNumAlignmentCB.clear();
+m_pRowMoveMF.clear();
+m_pColMoveMF.clear();
+m_pRowInsertMF.clear();
+m_pColInsertMF.clear();
+m_pFixRB.clear();
+m_pFixPropRB.clear();
+m_pVarRB.clear();
 SfxTabPage::dispose();
 }
 
@@ -1149,22 +1149,22 @@ bool SwTableOptionsTabPage::FillItemSet( SfxItemSet* )
 bool bRet = false;
 SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
 
-if(pRowMoveMF->IsModified())
-pModOpt->SetTableHMove( (sal_uInt16)pRowMoveMF->Denormalize( 
pRowMoveMF->GetValue(FUNIT_TWIP)));
+if(m_pRowMoveMF->IsModified())
+pModOpt->SetTableHMove( (sal_uInt16)m_pRowMoveMF->Denormalize( 
m_pRowMoveMF->GetValue(FUNIT_TWIP)));
 
-if(pColMoveMF->IsModified())
-pModOpt->SetTableVMove( (sal_uInt16)pColMoveMF->Denormalize( 
pColMoveMF->GetValue(FUNIT_TWIP)));
+if(m_pColMoveMF->IsModified())
+pModOpt->SetTableVMove( (sal_uInt16)m_pColMoveMF->Denormalize( 
m_pColMoveMF->GetValue(FUNIT_TWIP)));
 
-if(pRowInsertMF->IsModified())
-pModOpt->SetTableHInsert((sal_uInt16)pRowInsertMF->Denormalize( 
pRowInsertMF->GetValue(FUNIT_TWIP)));
+if(m_pRowInsertMF->IsModified())
+pModOpt->SetTableHInsert((sal_uInt16)m_pRowInsertMF->Denormalize( 
m_pRowInsertMF->GetValue(FUNIT_TWIP)));
 
-if(pColInsertMF->IsModified())
-pModOpt->SetTableVInsert((sal_uInt16)pColInsertMF->Denormalize( 
pColInsertMF->GetValue(FUNIT_TWIP)));
+if(m_pColInsertMF->IsModified())
+pModOpt->SetTableVInsert((sal_uInt16)m_pColInsertMF->Denormalize( 
m_pColInsertMF->GetValue(FUNIT_TWIP)));
 
 TableChgMode eMode;
-if(pFixRB->IsChecked())
+if(m_pFixRB->IsChecked())
 eMode = TBLFIX_CHGABS;
-else if(pFixPropRB->IsChecked())
+else if(m_pFixPropRB->IsChecked())
 eMode = TBLFIX_CHGPROP;
 else

[Libreoffice-commits] core.git: sd/source

2016-07-24 Thread Caolán McNamara

 sd/source/ui/func/fupage.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 60ab08c6c5c4b5730c1cb54eca5558be214e8925
Author: CaolÃ¡n McNamara 
Date:   Sun Jul 24 17:50:23 2016 +0100

Resolves: tdf#101076 drag-create creates an unfilled shape...

after using the slide properties->background->all slides

This SetAttributes with nothing selected will end up setting the
default object properties. Here I think we are setting the bg color to
the master, and then unsetting the bg color of the slides to none
so the master color shows through.

So the additional SetAttributes call unsets the bg of the default
object style

Change-Id: I5cfd74eef5637b87d2a8778d4b8c8a0cbc0960db
Reviewed-on: https://gerrit.libreoffice.org/27487
Tested-by: Jenkins 
Reviewed-by: Katarina Behrens 

diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index d9c8ad9..8d56182 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -152,7 +152,6 @@ void FuPage::DoExecute( SfxRequest& )
 if( mpArgs )
 {
 ApplyItemSet( mpArgs );
-mpView->SetAttributes( *mpArgs );
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/LOOLWSD.cpp

2016-07-24 Thread Miklos Vajna

 loolwsd/LOOLWSD.cpp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit aa9902970cef0d9f0921da2c8882c45f9ffbfeef
Author: Miklos Vajna 
Date:   Mon Jul 25 08:26:59 2016 +0200

LOOLWSD: avoid performing multiplication at int level

Change-Id: I5d293482860954144f7664638443d5c72ba9a8cc

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 49ccb5b..f7b7bce 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -220,7 +220,7 @@ static void prespawnChildren()
 }
 
 const auto duration = (std::chrono::steady_clock::now() - 
lastForkRequestTime);
-if 
(std::chrono::duration_cast(duration).count() <= 
CHILD_TIMEOUT_SECS * 1000)
+if 
(std::chrono::duration_cast(duration).count() <= 
static_cast(CHILD_TIMEOUT_SECS) * 1000)
 {
 // Not enough time passed to balance children.
 return;
@@ -284,7 +284,7 @@ static std::shared_ptr getNewChild()
 
 Log::debug("getNewChild: No live child, forking more.");
 }
-while 
(chrono::duration_cast(chrono::steady_clock::now() - 
startTime).count() < CHILD_TIMEOUT_SECS * 4000);
+while 
(chrono::duration_cast(chrono::steady_clock::now() - 
startTime).count() < static_cast(CHILD_TIMEOUT_SECS) * 4000);
 
 Log::debug("getNewChild: Timed out while waiting for new child.");
 return nullptr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - sd/qa sd/source

2016-07-24 Thread Miklos Vajna

 sd/qa/unit/tiledrendering/tiledrendering.cxx |   45 ++-
 sd/source/ui/view/sdview.cxx |   19 +++
 2 files changed, 63 insertions(+), 1 deletion(-)

New commits:
commit 4a7c5abb15e559f23f737ef38202a5d72dcb8eb1
Author: Miklos Vajna 
Date:   Fri Jul 22 17:27:25 2016 +0200

sd: implement LOK_CALLBACK_VIEW_LOCK

So that edited shape text doesn't just disappear in other views without
any indication.

Change-Id: I806051492f7bc247c0e66eceda4df5eba8322aad
Reviewed-on: https://gerrit.libreoffice.org/27444
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 
(cherry picked from commit ffd9972e2a21f6490f25c712cd0ba49e534238c8)

diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx 
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 47fd21a..93b2272 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -66,6 +66,7 @@ public:
 void testViewCursors();
 void testViewCursorParts();
 void testCursorViews();
+void testViewLock();
 
 CPPUNIT_TEST_SUITE(SdTiledRenderingTest);
 CPPUNIT_TEST(testRegisterCallback);
@@ -88,6 +89,7 @@ public:
 CPPUNIT_TEST(testViewCursors);
 CPPUNIT_TEST(testViewCursorParts);
 CPPUNIT_TEST(testCursorViews);
+CPPUNIT_TEST(testViewLock);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -821,12 +823,14 @@ public:
 /// Our current part, to be able to decide if a view cursor/selection is 
relevant for us.
 int m_nPart;
 bool m_bCursorVisibleChanged;
+bool m_bViewLock;
 
 ViewCallback()
 : m_bGraphicSelectionInvalidated(false),
   m_bGraphicViewSelectionInvalidated(false),
   m_nPart(0),
-  m_bCursorVisibleChanged(false)
+  m_bCursorVisibleChanged(false),
+  m_bViewLock(false)
 {
 }
 
@@ -859,6 +863,14 @@ public:
 m_bCursorVisibleChanged = true;
 }
 break;
+case LOK_CALLBACK_VIEW_LOCK:
+{
+std::stringstream aStream(pPayload);
+boost::property_tree::ptree aTree;
+boost::property_tree::read_json(aStream, aTree);
+m_bViewLock = 
aTree.get_child("rectangle").get_value() != "EMPTY";
+}
+break;
 }
 }
 };
@@ -963,6 +975,37 @@ void SdTiledRenderingTest::testCursorViews()
 comphelper::LibreOfficeKit::setActive(false);
 }
 
+void SdTiledRenderingTest::testViewLock()
+{
+comphelper::LibreOfficeKit::setActive();
+
+// Load a document that has a shape and create two views.
+SdXImpressDocument* pXImpressDocument = createDoc("shape.odp");
+ViewCallback aView1;
+
SfxViewShell::Current()->registerLibreOfficeKitViewCallback(&ViewCallback::callback,
 &aView1);
+SfxLokHelper::createView();
+
pXImpressDocument->initializeForTiledRendering(uno::Sequence());
+
+// Begin text edit in the second view and assert that the first gets a lock
+// notification.
+sd::ViewShell* pViewShell = 
pXImpressDocument->GetDocShell()->GetViewShell();
+SdPage* pActualPage = pViewShell->GetActualPage();
+SdrObject* pObject = pActualPage->GetObj(0);
+SdrView* pView = pViewShell->GetView();
+aView1.m_bViewLock = false;
+pView->SdrBeginTextEdit(pObject);
+CPPUNIT_ASSERT(aView1.m_bViewLock);
+
+// End text edit in the second view, and assert that the lock is removed in
+// the first view.
+pView->SdrEndTextEdit();
+CPPUNIT_ASSERT(!aView1.m_bViewLock);
+
+mxComponent->dispose();
+mxComponent.clear();
+comphelper::LibreOfficeKit::setActive(false);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdTiledRenderingTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index d3c6e16..01a23f0 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -91,6 +91,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 #include "DrawController.hxx"
 
 #include 
@@ -700,6 +703,18 @@ bool View::SdrBeginTextEdit(
 if ( mpViewSh )
 {
 
mpViewSh->GetViewShellBase().GetDrawController().FireSelectionChangeListener();
+
+if (comphelper::LibreOfficeKit::isActive())
+{
+if (OutlinerView* pView = GetTextEditOutlinerView())
+{
+Rectangle aRectangle = pView->GetOutputArea();
+if (pWin && pWin->GetMapMode().GetMapUnit() == MAP_100TH_MM)
+aRectangle = OutputDevice::LogicToLogic(aRectangle, 
MAP_100TH_MM, MAP_TWIP);
+OString sRectangle = aRectangle.toString();
+SfxLokHelper::notifyOtherViews(&mpViewSh->GetViewShellBase(), 
LOK_CALLBACK_VIEW_LOCK, "rectangle", sRectangle);
+}
+}
 }
 
 if (bReturn)
@@ -790,6 +805,10 @@ SdrEndTextEditKind View::SdrEndTextEdit(bool 
bDontDeleteReally)
 if ( mpViewSh )
 {
 
mpViewSh->GetViewShellBase().GetDraw

[Libreoffice-commits] core.git: sw/qa writerfilter/source

2016-07-24 Thread Justin Luth

 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   16 ++--
 writerfilter/source/dmapper/DomainMapper.cxx |   13 +++--
 2 files changed, 21 insertions(+), 8 deletions(-)

New commits:
commit 9920a0bf9d783978cd6f7b97f7528d8aa2571143
Author: Justin Luth 
Date:   Sat Jul 23 07:54:57 2016 +0300

tdf#75573 - docx handle frame properties at styles

A frame with only a style defined doesn't create paragraph properties,
so the settings were just being ignored.

If the stylesheet is the top context, then the settings belong to
the style.  If this slightly aggressive approach causes a regression,
then just use the style only if the paragraph properties don't exist.

Change-Id: I3b14205dc2bc5305f1eeb4cb72a812e877b532c7
Reviewed-on: https://gerrit.libreoffice.org/27453
Tested-by: Jenkins 
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index d953c4f..82ca994 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1734,9 +1734,21 @@ DECLARE_OOXMLIMPORT_TEST(testfdo76583, "fdo76583.docx")
 
 DECLARE_OOXMLIMPORT_TEST(testTdf75573, "tdf75573_page1frame.docx")
 {
-// the problem was that an odd header was defined but not used, flagged as
-// discardable, and then the unrelated frame was also discarded.
+// the problem was that the frame was discarded
+// when an unrelated, unused, odd-header was flagged as discardable
 lcl_countTextFrames( mxComponent, 1 );
+
+// the frame should be on page 1
+//CPPUNIT_ASSERT_EQUAL( OUString("lorem ipsum"), 
parseDump("/root/page[1]/body/section/txt/anchored/fly/txt[1]/text()") );
+
+// the "Proprietary" style should set the vertical and horizontal anchors 
to the page
+uno::Reference xPropertySet(getShape(1), 
uno::UNO_QUERY);
+//CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME, 
getProperty(xPropertySet, "VertOrientRelation"));
+//CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME, 
getProperty(xPropertySet, "HoriOrientRelation"));
+
+// the frame should be located near the bottom[23186]/center[2955] of the 
page
+CPPUNIT_ASSERT(sal_Int32(2) < getProperty(xPropertySet, 
"VertOrientPosition"));
+CPPUNIT_ASSERT(sal_Int32(2500) < getProperty(xPropertySet, 
"HoriOrientPosition"));
 }
 
 DECLARE_OOXMLIMPORT_TEST(testFdo43093, "fdo43093.docx")
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index ba1069a..9a39149 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -693,8 +693,13 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 case NS_ooxml::LN_CT_FramePr_hSpace:
 case NS_ooxml::LN_CT_FramePr_vSpace:
 {
-ParagraphProperties* pParaProperties = dynamic_cast< 
ParagraphProperties*>(
-m_pImpl->GetTopContextOfType( CONTEXT_PARAGRAPH ).get() );
+ParagraphProperties* pParaProperties = nullptr;
+// handle frame properties at styles
+if( m_pImpl->GetTopContextType() == CONTEXT_STYLESHEET )
+pParaProperties = dynamic_cast< ParagraphProperties*>( 
m_pImpl->GetTopContextOfType( CONTEXT_STYLESHEET ).get() );
+else
+pParaProperties = dynamic_cast< ParagraphProperties*>( 
m_pImpl->GetTopContextOfType( CONTEXT_PARAGRAPH ).get() );
+
 if( pParaProperties )
 {
 switch( nName )
@@ -822,10 +827,6 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 default:;
 }
 }
-else
-{
-//TODO: how to handle frame properties at styles
-}
 }
 break;
 case NS_ooxml::LN_CT_TrackChange_author:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang

2016-07-24 Thread Noel Grandin

 compilerplugins/clang/overrideparam.cxx |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 594dd232c8ff4808d4ad43cc41a9934a9c6d131d
Author: Noel Grandin 
Date:   Mon Jul 25 08:14:06 2016 +0200

loplugin:overrideparam enable checking that default values match

Change-Id: I4ca21d12d6f5dd4bb0b2705f7e36249082b0838c

diff --git a/compilerplugins/clang/overrideparam.cxx 
b/compilerplugins/clang/overrideparam.cxx
index c04165b..c6490d8 100644
--- a/compilerplugins/clang/overrideparam.cxx
+++ b/compilerplugins/clang/overrideparam.cxx
@@ -104,7 +104,6 @@ bool OverrideParam::VisitCXXMethodDecl(const CXXMethodDecl 
* methodDecl) {
 }
 else if (parmVarDecl->hasDefaultArg() && 
superParmVarDecl->hasDefaultArg()
 && !hasSameDefaultParams(parmVarDecl, superParmVarDecl)) {
-/* do nothing for now, will enable this in a later commit
 report(
 DiagnosticsEngine::Warning,
 "overridden method declaration has different default param 
to super-method",
@@ -115,7 +114,6 @@ bool OverrideParam::VisitCXXMethodDecl(const CXXMethodDecl 
* methodDecl) {
 "original param here",
 superParmVarDecl->getSourceRange().getBegin())
 << superParmVarDecl->getSourceRange();
-*/
 }
 /* do nothing for now, will enable this in a later commit
 if (methodDecl->isThisDeclarationADefinition() && 
parmVarDecl->getName().empty()) {
@@ -162,12 +160,23 @@ bool OverrideParam::hasSameDefaultParams(const 
ParmVarDecl * parmVarDecl, const
 {
 return x1 == x2;
 }
+APFloat f1(0.0f), f2(0.0f);
+if (defaultArgExpr->EvaluateAsFloat(f1, compiler.getASTContext())
+&& superDefaultArgExpr->EvaluateAsFloat(f2, compiler.getASTContext()))
+{
+return f1.bitwiseIsEqual(f2);
+}
 // catch params with defaults like "= OUString()"
 if (isa(defaultArgExpr)
 && isa(superDefaultArgExpr))
 {
 return true;
 }
+if (isa(defaultArgExpr)
+&& isa(superDefaultArgExpr))
+{
+return true;
+}
 return false;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/Package_classification.mk

2016-07-24 Thread Gabor Kelemen

 sfx2/Package_classification.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 15613117f9c825aa8309b456e55fe954ec05475c
Author: Gabor Kelemen 
Date:   Sat Jul 23 16:30:58 2016 +0200

tdf#101089 Distribute the Dutch example classification file

Change-Id: I3692f313b728219ed2d7d2b57aee7209f852d04e
Reviewed-on: https://gerrit.libreoffice.org/27461
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/sfx2/Package_classification.mk b/sfx2/Package_classification.mk
index 4ed779c..a65a82a 100644
--- a/sfx2/Package_classification.mk
+++ b/sfx2/Package_classification.mk
@@ -12,6 +12,7 @@ $(eval $(call 
gb_Package_Package,sfx2_classification,$(SRCDIR)/sfx2))
 $(eval $(call 
gb_Package_add_files,sfx2_classification,$(LIBO_SHARE_FOLDER)/classification,\
classification/example.xml \
classification/example_hu-HU.xml \
+   classification/example_nl-NL.xml \
classification/example_pt-BR.xml \
classification/example_sl-SI.xml \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source chart2/source compilerplugins/clang connectivity/source cui/source dbaccess/source editeng/source fpicker/source include/avmedia include/filter include/sf

2016-07-24 Thread Noel Grandin

 basctl/source/inc/basidesh.hxx|8 
 chart2/source/controller/dialogs/tp_AxisPositions.hxx |2 
 chart2/source/controller/dialogs/tp_Scale.hxx |2 
 compilerplugins/clang/overrideparam.cxx   |  179 ++
 connectivity/source/drivers/file/fcode.cxx|6 
 connectivity/source/inc/file/FNumericFunctions.hxx|   16 -
 connectivity/source/inc/file/fcode.hxx|6 
 cui/source/factory/dlgfact.hxx|4 
 cui/source/inc/autocdlg.hxx   |4 
 cui/source/inc/backgrnd.hxx   |2 
 cui/source/inc/border.hxx |2 
 cui/source/inc/chardlg.hxx|8 
 cui/source/inc/hltpbase.hxx   |2 
 cui/source/inc/numfmt.hxx |2 
 cui/source/inc/page.hxx   |2 
 cui/source/inc/paragrph.hxx   |6 
 cui/source/inc/tabstpge.hxx   |2 
 cui/source/options/optgdlg.hxx|2 
 cui/source/options/optinet2.hxx   |2 
 cui/source/options/optmemory.hxx  |2 
 dbaccess/source/ui/dlg/detailpages.hxx|2 
 dbaccess/source/ui/dlg/indexdialog.cxx|2 
 dbaccess/source/ui/inc/indexdialog.hxx|2 
 dbaccess/source/ui/inc/listviewitems.hxx  |2 
 editeng/source/misc/SvXMLAutoCorrectExport.hxx|4 
 fpicker/source/office/RemoteFilesDialog.hxx   |2 
 include/avmedia/mediaitem.hxx |2 
 include/filter/msfilter/svdfppt.hxx   |2 
 include/sfx2/dinfdlg.hxx  |4 
 include/sfx2/mgetempl.hxx |2 
 include/sfx2/printopt.hxx |2 
 include/sfx2/tabdlg.hxx   |2 
 include/svtools/headbar.hxx   |2 
 include/svtools/svlbitm.hxx   |8 
 include/svtools/treelist.hxx  |2 
 include/svx/clipfmtitem.hxx   |2 
 include/svx/fontlb.hxx|2 
 include/svx/hdft.hxx  |2 
 include/svx/srchdlg.hxx   |2 
 include/svx/svx3ditems.hxx|   12 -
 include/svx/xflasit.hxx   |2 
 include/svx/xlnasit.hxx   |2 
 include/tools/stream.hxx  |   16 +
 include/unotools/options.hxx  |4 
 include/vcl/abstdlg.hxx   |2 
 linguistic/source/convdicxml.hxx  |2 
 lotuswordpro/source/filter/lwptblformula.hxx  |2 
 reportdesign/inc/RptPage.hxx  |2 
 reportdesign/source/ui/inc/MarkedSection.hxx  |2 
 rsc/inc/rscarray.hxx  |2 
 rsc/inc/rscclass.hxx  |   12 -
 rsc/inc/rscconst.hxx  |2 
 rsc/inc/rsccont.hxx   |2 
 rsc/inc/rscflag.hxx   |4 
 rsc/inc/rscmgr.hxx|2 
 rsc/inc/rscrange.hxx  |8 
 rsc/inc/rscstr.hxx|2 
 rsc/source/parser/rscicpx.cxx |2 
 sc/inc/attrib.hxx |2 
 sc/inc/conditio.hxx   |2 
 sc/inc/docuno.hxx |2 
 sc/qa/extras/scnamedrangesobj.cxx |2 
 sc/qa/unit/tiledrendering/tiledrendering.cxx  |6 
 sc/source/filter/xml/XMLTableMasterPageExport.hxx |2 
 sc/source/ui/inc/docsh.hxx|2 
 sc/source/ui/inc/tabpages.hxx |2 
 sc/source/ui/inc/tabvwsh.hxx  |4 
 sc/source/ui/inc/tpcalc.hxx   |2 
 sc/source/ui/inc/tpcompatibility.hxx  |2 
 sc/source/ui/inc/tpdefaults.hxx   |2 
 sc/source/ui/inc/tpformula.hxx|2 
 sc/source/ui/inc/tphf.hxx |2 
 sc/source/ui/inc/tpprint.hxx  |2 
 sc/source/ui/inc/tpsort.hxx   |4 
 sc/source/ui/inc/tptable.hxx  |2 
 sc/source/ui/inc/tpusrlst.hxx |2 
 sc/source/ui/inc/tpview.hxx   |4 
 sc/source/ui/inc/uiitems.hxx  |4 
 sd/qa/unit/tiledrendering/tiledrendering.cxx  |8

[Libreoffice-commits] core.git: sc/inc sc/source

2016-07-24 Thread Jochen Nitschke

 sc/inc/hints.hxx   |   13 -
 sc/source/core/tool/hints.cxx  |6 --
 sc/source/ui/unoobj/docuno.cxx |   17 -
 3 files changed, 36 deletions(-)

New commits:
commit 4d4d77a1aad1bcae18bad35dad5308d33d6b2e51
Author: Jochen Nitschke 
Date:   Sun Jul 24 20:43:33 2016 +0200

sc: remove ScPointerChangedHint class

nFlags is never set, ctor was removed
in commit 716636d558e9cc9b910da6d127314d2b20cdf0b6

Change-Id: Id1a608999042ff29b26162fddccaa35806a3e9e6
Reviewed-on: https://gerrit.libreoffice.org/27488
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx
index 326..ac740bc 100644
--- a/sc/inc/hints.hxx
+++ b/sc/inc/hints.hxx
@@ -66,19 +66,6 @@ public:
 SCsTAB  GetDz() const   { return nDz; }
 };
 
-#define SC_POINTERCHANGED_NUMFMT1
-
-class ScPointerChangedHint : public SfxHint
-{
-sal_uInt16  nFlags;
-
-public:
-
-virtual ~ScPointerChangedHint();
-
-sal_uInt16  GetFlags() const{ return nFlags; }
-};
-
 //! move ScLinkRefreshedHint to a different file?
 enum class ScLinkRefType {
 NONE, SHEET, AREA, DDE
diff --git a/sc/source/core/tool/hints.cxx b/sc/source/core/tool/hints.cxx
index 3cbd133..d48b735 100644
--- a/sc/source/core/tool/hints.cxx
+++ b/sc/source/core/tool/hints.cxx
@@ -48,12 +48,6 @@ ScUpdateRefHint::~ScUpdateRefHint()
 {
 }
 
-// ScPointerChangedHint - pointer has become invalid
-
-ScPointerChangedHint::~ScPointerChangedHint()
-{
-}
-
 //  ScLinkRefreshedHint - a link has been refreshed
 
 ScLinkRefreshedHint::ScLinkRefreshedHint() :
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 0146c20..212d701 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -1125,23 +1125,6 @@ void ScModelObj::Notify( SfxBroadcaster& rBC, const 
SfxHint& rHint )
 }
 }
 }
-else if ( dynamic_cast(&rHint) )
-{
-sal_uInt16 nFlags = static_cast(rHint).GetFlags();
-if (nFlags & SC_POINTERCHANGED_NUMFMT)
-{
-//  NumberFormatter-Pointer am Uno-Objekt neu setzen
-
-if (GetFormatter().is())
-{
-SvNumberFormatsSupplierObj* pNumFmt =
-SvNumberFormatsSupplierObj::getImplementation(
-
uno::Reference(xNumberAgg, uno::UNO_QUERY) );
-if ( pNumFmt && pDocShell )
-pNumFmt->SetNumberFormatter( 
pDocShell->GetDocument().GetFormatTable() );
-}
-}
-}
 
 // always call parent - SfxBaseModel might need to handle the same hints 
again
 SfxBaseModel::Notify( rBC, rHint ); // SfxBaseModel is derived from 
SfxListener
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

2016-07-24 Thread Jochen Nitschke

 sc/source/core/data/table5.cxx |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 54cc2f587d2ee2deb9fb334b1b9464213b8823c8
Author: Jochen Nitschke 
Date:   Sun Jul 24 21:16:50 2016 +0200

sc: replace GET_SCALEVALUE macro with a lambda

Change-Id: Id41cf9fec355f84fdc52565e089a8bb04c0e9bdb
Reviewed-on: https://gerrit.libreoffice.org/27492
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index 2ae8872..eb35dd0 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -51,8 +51,6 @@ using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::sheet::TablePageBreakData;
 using ::std::set;
 
-#define GET_SCALEVALUE(set,id)  static_cast(set.Get( id 
)).GetValue()
-
 void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
 {
 if ( pDocument->IsImportingXML() )
@@ -1132,15 +1130,17 @@ void ScTable::SetPageStyle( const OUString& rName )
 if ( aPageStyle != aStrNew )
 {
 SfxStyleSheetBase* pOldStyle = pStylePool->Find( aPageStyle, 
SfxStyleFamily::Page );
-
 if ( pOldStyle && pNewStyle )
 {
 SfxItemSet&  rOldSet  = pOldStyle->GetItemSet();
 SfxItemSet&  rNewSet  = pNewStyle->GetItemSet();
-const sal_uInt16 nOldScale= 
GET_SCALEVALUE(rOldSet,ATTR_PAGE_SCALE);
-const sal_uInt16 nOldScaleToPages = 
GET_SCALEVALUE(rOldSet,ATTR_PAGE_SCALETOPAGES);
-const sal_uInt16 nNewScale= 
GET_SCALEVALUE(rNewSet,ATTR_PAGE_SCALE);
-const sal_uInt16 nNewScaleToPages = 
GET_SCALEVALUE(rNewSet,ATTR_PAGE_SCALETOPAGES);
+auto getScaleValue = [](const SfxItemSet& rSet, sal_uInt16 nId)
+{ return static_cast(rSet.Get(nId)).GetValue(); };
+
+const sal_uInt16 nOldScale= 
getScaleValue(rOldSet,ATTR_PAGE_SCALE);
+const sal_uInt16 nOldScaleToPages = 
getScaleValue(rOldSet,ATTR_PAGE_SCALETOPAGES);
+const sal_uInt16 nNewScale= 
getScaleValue(rNewSet,ATTR_PAGE_SCALE);
+const sal_uInt16 nNewScaleToPages = 
getScaleValue(rNewSet,ATTR_PAGE_SCALETOPAGES);
 
 if ( (nOldScale != nNewScale) || (nOldScaleToPages != 
nNewScaleToPages) )
 InvalidateTextWidth(nullptr, nullptr, false, false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/qa

2016-07-24 Thread Tor Lillqvist

 sd/qa/unit/export-tests.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit facf48d58f7438031a3a5fabd0f59134f6d43851
Author: Tor Lillqvist 
Date:   Mon Jul 25 08:40:32 2016 +0300

loplugin:nullptr

Change-Id: If8f933706b0acb86dcdebb85ec647abfd61fa949

diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 8d195f2..4598014 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -219,7 +219,7 @@ void SdExportTest::testMediaEmbedding()
 #else
 // If glTF is not supported, then the fallback image is imported
 SdrGrafObj *pGrafic = dynamic_cast( pPage->GetObj( 2 ));
-CPPUNIT_ASSERT_MESSAGE( "Could not load glTF fallback image", pGrafic != 
NULL);
+CPPUNIT_ASSERT_MESSAGE( "Could not load glTF fallback image", pGrafic != 
nullptr);
 CPPUNIT_ASSERT_EQUAL( OUString( 
"vnd.sun.star.Package:Models/Fallbacks/duck.png" ), 
pGrafic->GetGrafStreamURL());
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

2016-07-24 Thread Noel Grandin

 sw/source/ui/config/optload.cxx |4 ++--
 sw/source/uibase/inc/swlbox.hxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b0b6d4cf70d7ed0eb4b656d0ef1fdeb1c60eae28
Author: Noel Grandin 
Date:   Mon Jul 25 07:47:46 2016 +0200

inconsistent default param override in SwComboBox::InsertEntry

Change-Id: Ica9f876747e039c1dfbac1f15db668724a49d096

diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 4fa9271..41c215a 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -700,7 +700,7 @@ IMPL_LINK_NOARG_TYPED(SwCaptionOptPage, ShowEntryHdl, 
SvTreeListBox*, void)
 InsCaptionOpt* pOpt = 
static_cast(pSelEntry->GetUserData());
 
 m_pCategoryBox->Clear();
-m_pCategoryBox->InsertEntry(m_sNone);
+m_pCategoryBox->InsertEntry(m_sNone, 0);
 if (pSh)
 {
 const size_t nCount = pMgr->GetFieldTypeCount();
@@ -727,7 +727,7 @@ IMPL_LINK_NOARG_TYPED(SwCaptionOptPage, ShowEntryHdl, 
SvTreeListBox*, void)
 m_pCategoryBox->SetText(m_sNone);
 if (!pOpt->GetCategory().isEmpty() &&
 m_pCategoryBox->GetEntryPos(pOpt->GetCategory()) == 
COMBOBOX_ENTRY_NOTFOUND)
-m_pCategoryBox->InsertEntry(pOpt->GetCategory());
+m_pCategoryBox->InsertEntry(pOpt->GetCategory(), 0);
 if (m_pCategoryBox->GetText().isEmpty())
 {
 sal_Int32 nPos = 0;
diff --git a/sw/source/uibase/inc/swlbox.hxx b/sw/source/uibase/inc/swlbox.hxx
index 94997a3..3eb4860 100644
--- a/sw/source/uibase/inc/swlbox.hxx
+++ b/sw/source/uibase/inc/swlbox.hxx
@@ -60,7 +60,7 @@ public:
 virtual ~SwComboBox();
 
 voidInsertSwEntry(const SwBoxEntry&);
-virtual sal_Int32   InsertEntry(const OUString& rStr, sal_Int32 = 0) 
override;
+virtual sal_Int32   InsertEntry(const OUString& rStr, sal_Int32 = 
COMBOBOX_APPEND) override;
 
 virtual voidRemoveEntryAt(sal_Int32 nPos) override;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source include/vcl

2016-07-24 Thread Noel Grandin

 dbaccess/source/ui/misc/WCPage.cxx |2 +-
 include/vcl/edit.hxx   |2 +-
 include/vcl/vclmedit.hxx   |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 15ed9d81005149fce04a0597a52b20cd8d599235
Author: Noel Grandin 
Date:   Sat Jul 23 14:28:48 2016 +0200

inconsistent default param vals in SetMaxTextLen

so just remove them, only one call site was using them.

Change-Id: Ife00ad7f14d73f865058d1262f71dff1fd2a6abd
Reviewed-on: https://gerrit.libreoffice.org/27458
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/dbaccess/source/ui/misc/WCPage.cxx 
b/dbaccess/source/ui/misc/WCPage.cxx
index a939c95..db54c29 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -70,7 +70,7 @@ OCopyTable::OCopyTable(vcl::Window * pParent)
 get(m_pFT_KeyName, "keynamelabel");
 get(m_pEdKeyName, "keyname");
 
-m_pEdTableName->SetMaxTextLen();
+m_pEdTableName->SetMaxTextLen(EDIT_NOLIMIT);
 
 if ( m_pParent->m_xDestConnection.is() )
 {
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index aecb918..c78ea3a 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -205,7 +205,7 @@ public:
 voidSetInsertMode( bool bInsert );
 boolIsInsertMode() const;
 
-virtual voidSetMaxTextLen( sal_Int32 nMaxLen = EDIT_NOLIMIT );
+virtual voidSetMaxTextLen( sal_Int32 nMaxLen );
 virtual sal_Int32   GetMaxTextLen() const { return mnMaxTextLen; }
 
 voidSetWidthInChars(sal_Int32 nWidthInChars);
diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx
index de13e6f..436195f 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
@@ -80,7 +80,7 @@ public:
 
 voidEnableFocusSelectionHide( bool bHide );
 
-virtual voidSetMaxTextLen(sal_Int32 nMaxLen = 0) override;
+virtual voidSetMaxTextLen(sal_Int32 nMaxLen) override;
 virtual sal_Int32 GetMaxTextLen() const override;
 
 voidSetMaxTextWidth( sal_uLong nMaxWidth );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Another C2220: warning treated as error with MSVC 2015

2016-07-24 Thread jan iversen

Hi

We prefer patches to be submitted through gerrit, as it gives us a possibility 
to review them.

Have a look at:
https://wiki.documentfoundation.org/Development/GetInvolved#Prepare_to_submit_patches

Apart from that, your patch changes the way the program works, by removing the 
try/catch clause, you pass exceptions to higher levels (callers of the 
function), and that is surely not a good idea.

rgds
jan I.


> On 24 Jul 2016, at 20:04, slacka  wrote:
> 
> Can we trust MSVC 2015 unreachable code analysis like we with  this similar
> issue?
> 
>   
> 
> The patch below fixes the build:
> 
> diff --git a/comphelper/source/misc/threadpool.cxx
> b/comphelper/source/misc/threadpool.cxx
> index 6846f4b..6a335e0 100644
> --- a/comphelper/source/misc/threadpool.cxx
> +++ b/comphelper/source/misc/threadpool.cxx
> @@ -72,17 +72,7 @@ public:
> {
> SAL_WARN("comphelper", "exception in thread worker while
> calling doWork(): " << e.Message);
> }
> -try {
> -delete pTask;
> -}
> -catch (const std::exception &e)
> -{
> -SAL_WARN("comphelper", "exception in thread worker while
> deleting task: " << e.what());
> -}
> -catch (const css::uno::Exception &e)
> -{
> -SAL_WARN("comphelper", "exception in thread worker while
> deleting task: " << e.Message);
> -}
> +delete pTask;
> pTag->onTaskWorkerDone();
> }
> }
> 
> 
> 
> 
> 
> 
> --
> View this message in context: 
> http://nabble.documentfoundation.org/C2220-warning-treated-as-error-64-bit-MSVC-2015-tp4184053p4189213.html
> Sent from the Dev mailing list archive at Nabble.com.
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] help.git: source/text

2016-07-24 Thread Stanislav Horacek

 source/text/scalc/01/exponsmooth_embd.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 95e2f998f1a995b7af4f7a4e7ddbf0803daf4cf1
Author: Stanislav Horacek 
Date:   Sun Jul 24 11:41:18 2016 +0200

FORECAST.ETS.*: improve description of aggregation argument

Change-Id: I1192fdeb6249cb63d45a40c099b47685a0dd51f8
Reviewed-on: https://gerrit.libreoffice.org/27472
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/source/text/scalc/01/exponsmooth_embd.xhp 
b/source/text/scalc/01/exponsmooth_embd.xhp
index 5cf821b..f01fa82 100644
--- a/source/text/scalc/01/exponsmooth_embd.xhp
+++ b/source/text/scalc/01/exponsmooth_embd.xhp
@@ -42,7 +42,7 @@
 
 
 
-aggregation (optional): A numeric value from 1 to 
7, with default 1. The aggregation parameter is a numeric value indicating 
which method will be used:
+aggregation (optional): A numeric value from 1 to 
7, with default 1. The aggregation parameter indicates which method will be 
used to aggregate identical time values:
 
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2016-07-24 Thread Stanislav Horacek

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 424b840ea761c9106830508e9b1d656f0edeb073
Author: Stanislav Horacek 
Date:   Sun Jul 24 11:41:18 2016 +0200

Updated core
Project: help  95e2f998f1a995b7af4f7a4e7ddbf0803daf4cf1

FORECAST.ETS.*: improve description of aggregation argument

Change-Id: I1192fdeb6249cb63d45a40c099b47685a0dd51f8
Reviewed-on: https://gerrit.libreoffice.org/27472
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/helpcontent2 b/helpcontent2
index 8e6440c..95e2f99 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8e6440c88f34ad595feca16d0cffbf14940d2fd8
+Subproject commit 95e2f998f1a995b7af4f7a4e7ddbf0803daf4cf1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2016-07-24 Thread Stanislav Horacek

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b394480c8d552c2f5c4699f4f897756188c4d1cd
Author: Stanislav Horacek 
Date:   Sun Jul 24 16:44:32 2016 +0200

Updated core
Project: help  8e6440c88f34ad595feca16d0cffbf14940d2fd8

fix spelling of "coefficient"

Change-Id: Id988f9127d8d7af2dbd72ec899168d21b7d2923b
Reviewed-on: https://gerrit.libreoffice.org/27481
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/helpcontent2 b/helpcontent2
index 8b70a2a..8e6440c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8b70a2a6b13121f589187c97a0ab79c0bc199d7d
+Subproject commit 8e6440c88f34ad595feca16d0cffbf14940d2fd8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

2016-07-24 Thread Stanislav Horacek

 source/text/scalc/01/statistics_regression.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8e6440c88f34ad595feca16d0cffbf14940d2fd8
Author: Stanislav Horacek 
Date:   Sun Jul 24 16:44:32 2016 +0200

fix spelling of "coefficient"

Change-Id: Id988f9127d8d7af2dbd72ec899168d21b7d2923b
Reviewed-on: https://gerrit.libreoffice.org/27481
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/source/text/scalc/01/statistics_regression.xhp 
b/source/text/scalc/01/statistics_regression.xhp
index 658feb2..39ddea7 100644
--- a/source/text/scalc/01/statistics_regression.xhp
+++ b/source/text/scalc/01/statistics_regression.xhp
@@ -58,7 +58,7 @@
 Logarithmic regression: find a logarithmic curve 
in the form of y = a.ln(x) + b, where a is the slope, b is the 
intercept and ln(x) is the natural logarithm of 
x, that best fits the data.
   
   
-Power regression: Find a power curve in the form 
of y = a.x^b, where a 
is the coeficient, b is the power that best fits 
the data.
+Power regression: Find a power curve in the form 
of y = a.x^b, where a 
is the coefficient, b is the power that best fits 
the data.
   
 
 The results of 
the three types of regression analysis of the measurements in the 
table above are shown below.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2016-07-24 Thread Stanislav Horacek

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2702c545963edeb12756dddc97a94b8f727462dc
Author: Stanislav Horacek 
Date:   Sun Jul 24 11:37:48 2016 +0200

Updated core
Project: help  8b70a2a6b13121f589187c97a0ab79c0bc199d7d

FORECAST.ETS.* confidence level: use precise argument name

Change-Id: I4c2d43055b7a85bc39fa22e0721ba9aa0bd448b1
Reviewed-on: https://gerrit.libreoffice.org/27471
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/helpcontent2 b/helpcontent2
index 0157067..8b70a2a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 01570676aa081f69e7663b5dac19d9253e0c648c
+Subproject commit 8b70a2a6b13121f589187c97a0ab79c0bc199d7d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

2016-07-24 Thread Stanislav Horacek

 source/text/scalc/01/exponsmooth_embd.xhp   |2 +-
 source/text/scalc/01/func_forecastetspiadd.xhp  |2 +-
 source/text/scalc/01/func_forecastetspimult.xhp |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8b70a2a6b13121f589187c97a0ab79c0bc199d7d
Author: Stanislav Horacek 
Date:   Sun Jul 24 11:37:48 2016 +0200

FORECAST.ETS.* confidence level: use precise argument name

Change-Id: I4c2d43055b7a85bc39fa22e0721ba9aa0bd448b1
Reviewed-on: https://gerrit.libreoffice.org/27471
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/source/text/scalc/01/exponsmooth_embd.xhp 
b/source/text/scalc/01/exponsmooth_embd.xhp
index d97bb3e..5cf821b 100644
--- a/source/text/scalc/01/exponsmooth_embd.xhp
+++ b/source/text/scalc/01/exponsmooth_embd.xhp
@@ -204,7 +204,7 @@
 
 
 
-confidence (mandatory): A numeric value between 0 
and 1 (exclusive), default is 0.95. A value indicating a confidence level for 
the calculated prediction interval. 
+confidence_level (mandatory): A numeric value 
between 0 and 1 (exclusive), default is 0.95. A value indicating a confidence 
level for the calculated prediction interval.
 With 
values <= 0 or >= 1, the functions will return the #NUM! 
Error.
 
 
diff --git a/source/text/scalc/01/func_forecastetspiadd.xhp 
b/source/text/scalc/01/func_forecastetspiadd.xhp
index cfcdc01..aae1136 100644
--- a/source/text/scalc/01/func_forecastetspiadd.xhp
+++ b/source/text/scalc/01/func_forecastetspiadd.xhp
@@ -31,7 +31,7 @@
 
 
 Syntax
-FORECAST.ETS.PI.ADD(target, values, timeline, [confidence], 
[period_length], [completion], [aggregation])
+FORECAST.ETS.PI.ADD(target, values, timeline, 
[confidence_level], [period_length], [data_completion], 
[aggregation])
 
 
 
diff --git a/source/text/scalc/01/func_forecastetspimult.xhp 
b/source/text/scalc/01/func_forecastetspimult.xhp
index 882c4c8..167c97b 100644
--- a/source/text/scalc/01/func_forecastetspimult.xhp
+++ b/source/text/scalc/01/func_forecastetspimult.xhp
@@ -31,7 +31,7 @@
 
 
 Syntax
-FORECAST.ETS.PI.MULT(target, values, timeline, [confidence], 
[period_length], [completion], [aggregation])
+FORECAST.ETS.PI.MULT(target, values, timeline, 
[confidence_level], [period_length], [data_completion], 
[aggregation])
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

2016-07-24 Thread Stanislav Horacek

 source/text/scalc/01/func_color.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 01570676aa081f69e7663b5dac19d9253e0c648c
Author: Stanislav Horacek 
Date:   Sun Jul 24 20:48:44 2016 +0200

Help index entries are in plural

Change-Id: I6618b16d1669c65c2204d80d4c7632a21e7befea
Reviewed-on: https://gerrit.libreoffice.org/27490
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/source/text/scalc/01/func_color.xhp 
b/source/text/scalc/01/func_color.xhp
index 978b42f..9d1c091 100644
--- a/source/text/scalc/01/func_color.xhp
+++ b/source/text/scalc/01/func_color.xhp
@@ -28,8 +28,8 @@
 
 
 
-  Color;numerical value
-  Color;calculating in spreadsheet
+  colors;numerical values
+  colors;calculating in spreadsheets
   COLOR function
 
 COLOR
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2016-07-24 Thread Stanislav Horacek

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7f3f1804a67eaf3cdaf2a1bbd6b3fb3e2640d340
Author: Stanislav Horacek 
Date:   Sun Jul 24 20:48:44 2016 +0200

Updated core
Project: help  01570676aa081f69e7663b5dac19d9253e0c648c

Help index entries are in plural

Change-Id: I6618b16d1669c65c2204d80d4c7632a21e7befea
Reviewed-on: https://gerrit.libreoffice.org/27490
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/helpcontent2 b/helpcontent2
index 48ad0ab..0157067 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 48ad0ab9ce866e1f6aa651885337fde3ff8dbf07
+Subproject commit 01570676aa081f69e7663b5dac19d9253e0c648c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

2016-07-24 Thread Stanislav Horacek

 source/text/scalc/01/statistics.xhp|2 +-
 source/text/scalc/01/statistics_regression.xhp |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 48ad0ab9ce866e1f6aa651885337fde3ff8dbf07
Author: Stanislav Horacek 
Date:   Sun Jul 24 20:46:02 2016 +0200

use consistent wording in data analysis functions

Change-Id: Ic8bd4f8be1b3a5836e32f62fc5d102343f4ff34a
Reviewed-on: https://gerrit.libreoffice.org/27489
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/source/text/scalc/01/statistics.xhp 
b/source/text/scalc/01/statistics.xhp
index 5b4c356..72b67c3 100644
--- a/source/text/scalc/01/statistics.xhp
+++ b/source/text/scalc/01/statistics.xhp
@@ -38,7 +38,7 @@
 Sampling
 Create a table with data 
sampled from another table.
 
-Menu Data - Statistics - 
Sampling...
+Choose Data - Statistics - 
Sampling
 
 Sampling 
allows you to pick data from a source table to fill a 
target table. The sampling can be random or in a periodic 
basis.
 Sampling is done 
row-wise. That means, the sampled data will pick the whole line of the source 
table and copy into a line of the target table.
diff --git a/source/text/scalc/01/statistics_regression.xhp 
b/source/text/scalc/01/statistics_regression.xhp
index f02fee8..658feb2 100644
--- a/source/text/scalc/01/statistics_regression.xhp
+++ b/source/text/scalc/01/statistics_regression.xhp
@@ -41,9 +41,9 @@
 
 
 
-Menu Data - Statistics - 
Regression...
+Choose Data - Statistics - 
Regression
 
-For more 
information, please visit the Wikipedia: http://en.wikipedia.org/wiki/Regression_analysis";>http://en.wikipedia.org/wiki/Regression_analysis
+For more 
information on regression analysis, refer to the http://en.wikipedia.org/wiki/Regression_analysis";>corresponding Wikipedia 
article.
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2016-07-24 Thread Stanislav Horacek

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f7d67acdaaf6f6bf1a50465360839900404cfe13
Author: Stanislav Horacek 
Date:   Sun Jul 24 20:46:02 2016 +0200

Updated core
Project: help  48ad0ab9ce866e1f6aa651885337fde3ff8dbf07

use consistent wording in data analysis functions

Change-Id: Ic8bd4f8be1b3a5836e32f62fc5d102343f4ff34a
Reviewed-on: https://gerrit.libreoffice.org/27489
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/helpcontent2 b/helpcontent2
index 96c3fd6..48ad0ab 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 96c3fd60a0d02dcd4d9fc1925aed3c28f5170b9a
+Subproject commit 48ad0ab9ce866e1f6aa651885337fde3ff8dbf07
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/qa

2016-07-24 Thread Zdeněk Crhonek

 sc/qa/unit/data/functions/fods/islogical.fods |  795 ++
 1 file changed, 435 insertions(+), 360 deletions(-)

New commits:
commit cb95159e79ee531f3908e30fefae73693672f0a6
Author: ZdenÄk Crhonek 
Date:   Sun Jul 24 17:49:10 2016 +0200

add ISLOGICAL test case

Change-Id: Icbe9ae60daa115ec0498931af4213edc665ed71c
Reviewed-on: https://gerrit.libreoffice.org/27483
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/qa/unit/data/functions/fods/islogical.fods 
b/sc/qa/unit/data/functions/fods/islogical.fods
index fcd692f..5e50d23 100644
--- a/sc/qa/unit/data/functions/fods/islogical.fods
+++ b/sc/qa/unit/data/functions/fods/islogical.fods
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
- 
2016-06-10T20:02:06.652576343P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/131e604073f89e6c1dd54be88b94b7befd881f2e
+ 
2016-06-10T20:02:06.652576343P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/a2c557d80ac68c06ea59586245a7431e061938f0
  
   
0
0
-   26699
-   4515
+   32333
+   8128

 
  view1
@@ -28,10 +28,11 @@
100
60
true
+   false
   
   
-   3
-   17
+   9
+   18
0
0
0
@@ -45,6 +46,7 @@
100
60
true
+   false
   
  
  Sheet2
@@ -69,6 +71,7 @@
  1
  1
  true
+ false
 

   
@@ -108,7 +111,7 @@
true
1
true
-   qQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkE0AElucHV0U2xvdDpUcmF5MQBEdXBsZXg6Tm9uZQAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY=
+   qQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhCkR1cGxleDpOb25lAElucHV0U2xvdDpUcmF5MQBQYWdlU2l6ZTpBNAAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY=
false
0
   
@@ -136,785 +139,770 @@
  
  
   
-   
+   

   
   

   
-  
+  

 
KÄ
   
-  
+  

-

 
KÄ
-   
+   
   
-  
+  
Â£

   
-  
+  
-
Â£

-   
+   
   
-  
+  
Â£

   
-  
+  
-
Â£

-   
+   
   
-  
+  
Â£

   
-  
+  

-
Â£

-   
+   
   
-  
+  
Â£

   
-  
+  

-
Â£

-   
+   
   
-  
+  
Â£

   
-  
+  

-
Â£

-   
+   
   
-  
+  

 
   
-  
+  
(

)
-

Re: Pawan Pal license statement

2016-07-24 Thread jan iversen

WELCOME
Thanks for your license statement.

I see you have added yourself to our wiki:
https://wiki.DocumentFoundation.org/Development/Developers

If you want help to get started or have any questions, then please contact me. 
I am here to help you (and others) in getting their first patch submitted.

LibreOffice is a very big program and getting it built, setting up gerrit, and 
getting the first patch right can be a bit challenging, therefore do not 
hesitate to email me if you want help.

We have made a step by step guide to help you get started:
https://wiki.documentfoundation.org/Development/GetInvolved

rgds
Jan Iversen.

> On 24 Jul 2016, at 16:30, Pawan Pal  wrote:
> 
> All of my past & future contributions to LibreOffice may be
>licensed under the MPLv2/LGPLv3+ dual license.
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sfx2/classification

2016-07-24 Thread Gabor Kelemen

 sfx2/classification/example_nl-NL.xml |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 49edd6d296c5bccbcc614d87b7f1265ede6e6334
Author: Gabor Kelemen 
Date:   Sat Jul 23 16:22:03 2016 +0200

tdf#101088 fix Dutch translation of  tags

Change-Id: I8cf4ff4ab84ee10c51e98e2622dde4f7bafcf849
Reviewed-on: https://gerrit.libreoffice.org/27460
Tested-by: Jenkins 
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/sfx2/classification/example_nl-NL.xml 
b/sfx2/classification/example_nl-NL.xml
index 7bfd749..f00e494 100644
--- a/sfx2/classification/example_nl-NL.xml
+++ b/sfx2/classification/example_nl-NL.xml
@@ -9,7 +9,7 @@
 
 
 
-NL Overheid
+UK-Cabinet
 0
 
 
@@ -21,7 +21,7 @@
 
 
 
-NL Overheid
+UK-Cabinet
 1
 
 
@@ -41,7 +41,7 @@
 
 
 
-NL Overheid
+UK-Cabinet
 2
 
 
@@ -61,7 +61,7 @@
 
 
 
-NL Overheid
+UK-Cabinet
 3
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Another C2220: warning treated as error with MSVC 2015

2016-07-24 Thread slacka

Can we trust MSVC 2015 unreachable code analysis like we with  this similar
issue?

  

The patch below fixes the build:

diff --git a/comphelper/source/misc/threadpool.cxx
b/comphelper/source/misc/threadpool.cxx
index 6846f4b..6a335e0 100644
--- a/comphelper/source/misc/threadpool.cxx
+++ b/comphelper/source/misc/threadpool.cxx
@@ -72,17 +72,7 @@ public:
 {
 SAL_WARN("comphelper", "exception in thread worker while
calling doWork(): " << e.Message);
 }
-try {
-delete pTask;
-}
-catch (const std::exception &e)
-{
-SAL_WARN("comphelper", "exception in thread worker while
deleting task: " << e.what());
-}
-catch (const css::uno::Exception &e)
-{
-SAL_WARN("comphelper", "exception in thread worker while
deleting task: " << e.Message);
-}
+delete pTask;
 pTag->onTaskWorkerDone();
 }
 }






--
View this message in context: 
http://nabble.documentfoundation.org/C2220-warning-treated-as-error-64-bit-MSVC-2015-tp4184053p4189213.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/qa

2016-07-24 Thread Zdeněk Crhonek

 sc/qa/unit/data/functions/fods/syd.fods | 2877 
 1 file changed, 2877 insertions(+)

New commits:
commit 27b9f5bd796f7bbd7fb5ce3d00556e243fa9d7d7
Author: ZdenÄk Crhonek 
Date:   Sun Jul 24 17:41:00 2016 +0200

add SYD test case

Change-Id: I01f5a5e94e13f812ca3a727da32ea51d3454fee0
Reviewed-on: https://gerrit.libreoffice.org/27482
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/qa/unit/data/functions/fods/syd.fods 
b/sc/qa/unit/data/functions/fods/syd.fods
new file mode 100644
index 000..999feac
--- /dev/null
+++ b/sc/qa/unit/data/functions/fods/syd.fods
@@ -0,0 +1,2877 @@
+
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+ 
2016-07-19T11:56:05.71800P0D1LibreOfficeDev/5.2.0.1.0$Linux_X86_64
 
LibreOffice_project/aaeeb0288dfd9beb33efc0a693bc1a025986
+ 
+  
+   0
+   0
+   46511
+   6858
+   
+
+ view1
+ 
+  
+   2
+   8
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   75
+   60
+   true
+  
+  
+   3
+   24
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   75
+   60
+   true
+  
+ 
+ Sheet2
+ 1241
+ 0
+ 75
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ false
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ cs
+ CZ
+ 
+ 
+ 
+
+
+ en
+ US
+ 
+ 
+ 
+
+
+ nl
+ NL
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   rQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMA0wAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhCkR1cGxleDpOb25lAElucHV0U2xvdDpUcmF5MQBQYWdlU2l6ZTpMZXR0ZXIAABIAQ09NUEFUX0RVUExFWF9NT0RFCgBEVVBMRVhfT0ZG
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+
+   KÄ
+  
+  
+   
+   -
+   
+
+   KÄ
+   
+  
+  
+
+   
+
+  
+  
+
+   (
+   
+   )
+  
+  
+
+   -
+   
+
+  
+  
+   
+
+   
+   
+   
+  
+  
+   
+
+   KÄ
+  
+  
+   -
+   
+
+   KÄ
+   
+  
+  
+   
+
+   KÄ
+  
+  
+   -
+   
+
+   KÄ
+   
+  
+  
+   
+
+   KÄ
+  
+  
+   
+   -
+   
+
+   KÄ
+   
+  
+  
+   
+
+   KÄ
+  
+  
+   
+   -
+   
+
+   KÄ
+   
+  
+  
+   Â£

[Libreoffice-commits] core.git: sc/qa

2016-07-24 Thread Zdeněk Crhonek

 sc/qa/unit/data/functions/fods/ppmt.fods | 2366 +++
 1 file changed, 2366 insertions(+)

New commits:
commit 24e00c983e17c432b379f2a4e145ce8cbbe877a4
Author: ZdenÄk Crhonek 
Date:   Sun Jul 24 17:51:52 2016 +0200

add PPMT test case

Change-Id: Ib8347d195c880a6ee64121e6ad60d0c92a4a9760
Reviewed-on: https://gerrit.libreoffice.org/27484
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/qa/unit/data/functions/fods/ppmt.fods 
b/sc/qa/unit/data/functions/fods/ppmt.fods
new file mode 100644
index 000..629407d
--- /dev/null
+++ b/sc/qa/unit/data/functions/fods/ppmt.fods
@@ -0,0 +1,2366 @@
+
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:scr
 ipt="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:form
 x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+ 
2016-07-04T22:04:27.883848290P0D1LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64
 
LibreOffice_project/a2c557d80ac68c06ea59586245a7431e061938f0
+ 
+  
+   0
+   0
+   29439
+   13587
+   
+
+ view1
+ 
+  
+   1
+   2
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   100
+   60
+   true
+   false
+  
+  
+   3
+   24
+   0
+   0
+   0
+   0
+   2
+   0
+   0
+   0
+   0
+   0
+   100
+   60
+   true
+   false
+  
+ 
+ Sheet2
+ 1241
+ 0
+ 100
+ 60
+ false
+ true
+ true
+ true
+ 12632256
+ true
+ true
+ true
+ true
+ false
+ false
+ false
+ 1270
+ 1270
+ 1
+ 1
+ true
+ false
+
+   
+  
+  
+   7
+   false
+   false
+   true
+   true
+   false
+   false
+   false
+   1270
+   1270
+   true
+   true
+   true
+   true
+   true
+   false
+   12632256
+   false
+   Lexmark-E352dn
+   
+
+ cs
+ CZ
+ 
+ 
+ 
+
+
+ en
+ US
+ 
+ 
+ 
+
+
+ nl
+ NL
+ 
+ 
+ 
+
+   
+   true
+   true
+   3
+   1
+   true
+   1
+   true
+   qQH+/0xleG1hcmstRTM1MmRuQ1VQUzpMZXhtYXJrLUUzNTJkbgAWAAMAzwAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkE0AElucHV0U2xvdDpUcmF5MQBEdXBsZXg6Tm9uZQAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY=
+   false
+   0
+  
+ 
+ 
+  
+   http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink";>
+
+   
+  
+ 
+ 
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+ 
+ 
+  
+   
+   
+  
+  
+   
+  
+  
+   
+
+   KÄ
+  
+  
+   
+   -
+   
+
+   KÄ
+   
+  
+  
+
+   
+
+  
+  
+
+   (
+   
+   )
+  
+  
+
+   -
+   
+
+  
+  
+   
+
+   
+   
+   
+  
+  
+   
+
+   KÄ
+  
+  
+   -
+   
+
+   KÄ
+   
+  
+  
+   
+
+   KÄ
+  
+  
+   -
+   
+
+   KÄ
+   
+  
+  
+   
+
+   KÄ
+  
+  
+   
+   -
+   
+
+   KÄ
+   
+  
+  
+   
+
+   KÄ
+  
+

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - bootstrap.1 solenv/bin solenv/javadownloader

2016-07-24 Thread Damjan Jovanovic

 bootstrap.1  |8 +
 solenv/bin/download_external_dependencies.pl |   98 +++-
 solenv/bin/modules/ExtensionsLst.pm  |   77 ++---
 solenv/javadownloader/AOOJavaDownloader.java |  156 +++
 4 files changed, 200 insertions(+), 139 deletions(-)

New commits:
commit 9813bbc278e11149aa0519750f2496f1b3d5ab89
Author: Damjan Jovanovic 
Date:   Sun Jul 24 15:53:36 2016 +

Give up on using Perl's LWP::UserAgent and LWP::Protocol::https to download

files during ./bootstrap. It's a nightmare to get it working on the
buildbots - Infra has been trying on INFRA-11296 for 5 months to get it
installed. Installing through CPAN doesn't always work - tests fail on
CentOS 5 and on Cygwin. Even when installed, it's not always found. The
gain just doesn't justify the effort. Worst of all, it's holding back
development.

What else is there? A CLI tool like wget could work, but it's not listed as
a dependency, and it breaks on CentOS 5 for https://, the thing it's needed
for most.

I instead re-implemented it in Java. Java is freely available, highly
portable, and rock solid. We already use it in the build, and it's
described as being a mandatory build requirement even though
./configure.ac treats it as optional. Best of all it supports https://
out of the box in java.net.URLConnection and uses its own root CA
certificates. Tests show my AOOJavaDownloader class works on FreeBSD and
Windows, supports HTTP redirection, and generally works like a charm.

Patch by: me

diff --git a/bootstrap.1 b/bootstrap.1
index 0981e5f..045b547 100644
--- a/bootstrap.1
+++ b/bootstrap.1
@@ -41,6 +41,14 @@ chmod +x "$SRC_ROOT/solenv/bin/gccinstlib.pl"
 if [ "$DO_FETCH_TARBALLS" = "yes" ]; then
 # check perl include locations
 "$PERL" -e 'print "\nInclude locations: @INC\n\n"';
+
+mkdir -p "$SOLARENV/$INPATH/class"
+"$JAVACOMPILER" "$SOLARENV/javadownloader/AOOJavaDownloader.java" -d 
"$SOLARENV/$INPATH/class"
+if [ "$?" != "0" ]; then
+echo "*** Failed to build AOOJavaDownloader, aborting! ***"
+exit 1
+fi
+
 "$PERL" "$SOLARENV/bin/download_external_dependencies.pl" 
$SRC_ROOT/external_deps.lst
 if [ "$?" != "0" ]; then
 echo "*** Error downloading external dependencies, please fix the 
previous problems and try again ***"
diff --git a/solenv/bin/download_external_dependencies.pl 
b/solenv/bin/download_external_dependencies.pl
index 9db822b..ec68036 100755
--- a/solenv/bin/download_external_dependencies.pl
+++ b/solenv/bin/download_external_dependencies.pl
@@ -507,91 +507,39 @@ sub DownloadFile ($$$)
 my $URL = shift;
 my $checksum = shift;
 
-my $filename = File::Spec->catfile($ENV{'TARFILE_LOCATION'}, $name);
-
-my $temporary_filename = $filename . ".part";
-
-print "downloading to $temporary_filename\n";
-my $out;
-open $out, ">$temporary_filename";
-binmode($out);
-
-# Prepare checksum
-my $digest;
-if (defined $checksum && $checksum->{'type'} eq "SHA1")
-{
-# Use SHA1 only when explicitly requested (by the presence of a 
"SHA1=..." line.)
-$digest = Digest::SHA->new("1");
-}
-elsif ( ! defined $checksum || $checksum->{'type'} eq "MD5")
-{
-# Use MD5 when explicitly requested or when no checksum type is given.
-$digest = Digest::MD5->new();
+if (defined $checksum)
+{
+system(
+$ENV{'JAVAINTERPRETER'},
+"-cp",
+File::Spec->catfile(
+File::Spec->catfile($ENV{'SOLARENV'}, $ENV{'INPATH'}),
+"class"),
+"AOOJavaDownloader",
+$name,
+$URL,
+$checksum->{'type'},
+$checksum->{'value'});
 }
 else
 {
-die "checksum type ".$checksum->{'type'}." is not supported";
+system(
+$ENV{'JAVAINTERPRETER'},
+"-cp",
+File::Spec->catfile(
+File::Spec->catfile($ENV{'SOLARENV'}, $ENV{'INPATH'}),
+"class"),
+"AOOJavaDownloader",
+$name,
+$URL);
 }
 
-# Download the extension.
-my $success = 0;
-
-my $agent = LWP::UserAgent->new();
-$agent->env_proxy;
-my $response = $agent->get($URL);
-
-$success = $response->is_success;
-if ($success)
-{
-my $content = $response->content;
-open $out, ">$temporary_filename";
-binmode($out);
-print $out $content;
-$digest->add($content);
-}
-else
+if ($? == 0)
 {
-print "download from $URL failed (" . $response->status_line . ")\n";
-}
-close($out);
-
-# When download was successful then check the checksum and rename the 
.part file
-# into the actual extension name.
-if ($success)
-{
-my $file_checksum = $digest->hexdigest(

[Libreoffice-commits] core.git: Branch 'feature/nativealpha' - 1965 commits - accessibility/inc accessibility/source android/source animations/source avmedia/source basctl/source basegfx/CppunitTest_b

2016-07-24 Thread Tomaž Vajngerl

Rebased ref, commits from common ancestor:
commit 78ccd3bf3a4dc051bb91a7c4f5646292109202bb
Author: TomaÅ¾ Vajngerl 
Date:   Sun Jul 24 22:14:27 2016 +0900

vcl: use same bitdepth when performing super scaling

Change-Id: I379c4aa9aa83470961fa972eec8cdb67261f749c

diff --git a/vcl/source/bitmap/bitmapscalesuper.cxx 
b/vcl/source/bitmap/bitmapscalesuper.cxx
index ff01aae..ddb3a85 100644
--- a/vcl/source/bitmap/bitmapscalesuper.cxx
+++ b/vcl/source/bitmap/bitmapscalesuper.cxx
@@ -937,7 +937,7 @@ bool BitmapScaleSuper::filter(Bitmap& rBitmap)
 
 Bitmap::ScopedReadAccess pReadAccess(rBitmap);
 
-Bitmap aOutBmp(Size(nDstW, nDstH), 24);
+Bitmap aOutBmp(Size(nDstW, nDstH), rBitmap.GetBitCount());
 Bitmap::ScopedWriteAccess pWriteAccess(aOutBmp);
 
 const long nStartY = 0;
commit bfff0e691326dcf78e6505149ea1c9b06e0a1913
Author: TomaÅ¾ Vajngerl 
Date:   Tue Jun 28 16:39:57 2016 +0800

BitmapProcessor: support 32-bit bitmap in createLightImage

Change-Id: If28c715f9737f34b9d71c1342cae88fcc69231dd

diff --git a/vcl/source/bitmap/BitmapProcessor.cxx 
b/vcl/source/bitmap/BitmapProcessor.cxx
index 1a89da5..e64fd2a 100644
--- a/vcl/source/bitmap/BitmapProcessor.cxx
+++ b/vcl/source/bitmap/BitmapProcessor.cxx
@@ -17,7 +17,9 @@ BitmapEx BitmapProcessor::createLightImage(const BitmapEx& 
rBitmapEx)
 const Size aSize(rBitmapEx.GetSizePixel());
 
 Bitmap aBitmap(rBitmapEx.GetBitmap());
-Bitmap aDarkBitmap(aSize, 24);
+int nBitcount = aBitmap.GetBitCount() == 32 ? 32 : 24;
+
+Bitmap aDarkBitmap(aSize, nBitcount);
 
 BitmapReadAccess* pRead(aBitmap.AcquireReadAccess());
 BitmapWriteAccess* pWrite(aDarkBitmap.AcquireWriteAccess());
commit 442b8c04b4e213ac6224ea8a34c7cfd0db44f9fd
Author: TomaÅ¾ Vajngerl 
Date:   Sun Jun 26 11:31:07 2016 +0800

vcl: Test for PngReader - reading of various PNG formats

Change-Id: I2469751806e03c791c1882a32c31c090d7dac39f

diff --git a/vcl/CppunitTest_vcl_png_test.mk b/vcl/CppunitTest_vcl_png_test.mk
new file mode 100644
index 000..1f88209
--- /dev/null
+++ b/vcl/CppunitTest_vcl_png_test.mk
@@ -0,0 +1,52 @@
+# -*- 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/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,vcl_png_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,vcl_png_test, \
+vcl/qa/cppunit/png/PngFilterTest \
+))
+
+$(eval $(call gb_CppunitTest_set_include,vcl_png_test,\
+$$(INCLUDE) \
+-I$(SRCDIR)/vcl/inc \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,vcl_png_test, \
+   comphelper \
+   cppu \
+   cppuhelper \
+   sal \
+svt \
+   test \
+   tl \
+   unotest \
+   vcl \
+   utl \
+   $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,vcl_png_test,\
+udkapi \
+offapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,vcl_png_test))
+$(eval $(call gb_CppunitTest_use_vcl,vcl_png_test))
+
+$(eval $(call gb_CppunitTest_use_components,vcl_png_test,\
+configmgr/source/configmgr \
+i18npool/util/i18npool \
+ucb/source/core/ucb1 \
+unotools/util/utl \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,vcl_png_test))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 03c884c..a5c3f0f 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -107,6 +107,7 @@ $(eval $(call gb_Module_add_check_targets,vcl,\
CppunitTest_vcl_outdev \
CppunitTest_vcl_app_test \
CppunitTest_vcl_wmf_test \
+   CppunitTest_vcl_png_test \
 ))
 
 
diff --git a/vcl/qa/cppunit/png/PngFilterTest.cxx 
b/vcl/qa/cppunit/png/PngFilterTest.cxx
new file mode 100644
index 000..14e32a6
--- /dev/null
+++ b/vcl/qa/cppunit/png/PngFilterTest.cxx
@@ -0,0 +1,136 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include 
+#include 
+#include 
+
+using namespace css;
+
+class

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loleaflet/dist

2016-07-24 Thread Henry Castro

 loleaflet/dist/toolbar/toolbar.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a30a4c52f320a74c623404272f9553330a027970
Author: Henry Castro 
Date:   Sun Jul 24 10:52:46 2016 -0400

loleaflet: remove styles toolbar from spreadsheets

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 7a30824..5ec34ea 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -755,7 +755,7 @@ map.on('doclayerinit', function () {
{ func: '16', text: _('None'), icon: 
'selected'},
]},
]);
-   toolbar.remove('alignblock', 'bullet', 'numbering', 
'break-numbering');
+   toolbar.remove('styles', 'alignblock', 'bullet', 'numbering', 
'break-numbering');
toolbar.insert('break-align', [
{type: 'button',  id: 'WrapText',  img: 'wraptext', 
hint: _('Wrap Text'), uno: 'WrapText'},
{type: 'button',  id: 'ToggleMergeCells',  img: 
'togglemergecells', hint: _('Merge and Center Cells'), uno: 'ToggleMergeCells'},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/dist

2016-07-24 Thread Henry Castro

 loleaflet/dist/toolbar/toolbar.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7f5eed80a0bb1483f584deff1192677038ece976
Author: Henry Castro 
Date:   Sun Jul 24 10:52:46 2016 -0400

loleaflet: remove styles toolbar from spreadsheets

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index 8cdf473..fcb1ae6 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -760,7 +760,7 @@ map.on('doclayerinit', function () {
{ func: '16', text: _('None'), icon: 
'selected'},
]},
]);
-   toolbar.remove('alignblock', 'bullet', 'numbering', 
'break-numbering');
+   toolbar.remove('styles', 'alignblock', 'bullet', 'numbering', 
'break-numbering');
toolbar.insert('break-align', [
{type: 'button',  id: 'WrapText',  img: 'wraptext', 
hint: _('Wrap Text'), uno: 'WrapText'},
{type: 'button',  id: 'ToggleMergeCells',  img: 
'togglemergecells', hint: _('Merge and Center Cells'), uno: 'ToggleMergeCells'},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Pawan Pal license statement

2016-07-24 Thread Pawan Pal

All of my past & future contributions to LibreOffice may be

   licensed under the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - svgio/source

2016-07-24 Thread Julien Nabet

 svgio/source/svgreader/svgimagenode.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 373e73418addd13bdf55716ccb424feaa42708fc
Author: Julien Nabet 
Date:   Sat Jul 23 22:42:55 2016 +0200

tdf#101070: svg/insert, avoid infinite recursive loop when referencing 
oneself

See bt https://bugs.documentfoundation.org/attachment.cgi?id=126377

Change-Id: I3c6546a5449fc42613e30a7f45f31862752b7187
Reviewed-on: https://gerrit.libreoffice.org/27468
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit b7a18f18efbba086454e3b5ec157b156980f97b6)
Reviewed-on: https://gerrit.libreoffice.org/27479

diff --git a/svgio/source/svgreader/svgimagenode.cxx 
b/svgio/source/svgreader/svgimagenode.cxx
index 91286fa..fa27bca 100644
--- a/svgio/source/svgreader/svgimagenode.cxx
+++ b/svgio/source/svgreader/svgimagenode.cxx
@@ -242,7 +242,7 @@ namespace svgio
 << e.getMessage() << "\"");
 }
 
-if (!aAbsUrl.isEmpty())
+if (!aAbsUrl.isEmpty() && !rPath.equals(aAbsUrl))
 {
 SvFileStream aStream(aAbsUrl, STREAM_STD_READ);
 Graphic aGraphic;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - svgio/source

2016-07-24 Thread Julien Nabet

 svgio/source/svgreader/svgimagenode.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 77421906467e93e06c90740fb4ff95e7b8f8834b
Author: Julien Nabet 
Date:   Sat Jul 23 22:42:55 2016 +0200

tdf#101070: svg/insert, avoid infinite recursive loop when referencing 
oneself

See bt https://bugs.documentfoundation.org/attachment.cgi?id=126377

Change-Id: I3c6546a5449fc42613e30a7f45f31862752b7187
Reviewed-on: https://gerrit.libreoffice.org/27468
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit b7a18f18efbba086454e3b5ec157b156980f97b6)
Reviewed-on: https://gerrit.libreoffice.org/27478

diff --git a/svgio/source/svgreader/svgimagenode.cxx 
b/svgio/source/svgreader/svgimagenode.cxx
index 47c8023..49bf619 100644
--- a/svgio/source/svgreader/svgimagenode.cxx
+++ b/svgio/source/svgreader/svgimagenode.cxx
@@ -242,7 +242,7 @@ namespace svgio
 << e.getMessage() << "\"");
 }
 
-if (!aAbsUrl.isEmpty())
+if (!aAbsUrl.isEmpty() && !rPath.equals(aAbsUrl))
 {
 SvFileStream aStream(aAbsUrl, STREAM_STD_READ);
 Graphic aGraphic;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - icon-themes/tango

2016-07-24 Thread Adolfo Jayme Barrientos

 icon-themes/tango/cmd/lc_currencyfield.png |binary
 icon-themes/tango/cmd/sc_currencyfield.png |binary
 2 files changed

New commits:
commit 578fa3dab0db98f0a07cef00b81d4fd3f56d8794
Author: Adolfo Jayme Barrientos 
Date:   Sun Jul 24 02:47:21 2016 -0500

tdf#100849 Restore Tango currency-neutral icon

This partially reverts f18096f1b5cce12033e6721fa6624f02e797acc3.

Change-Id: I0697214e39406905b995e4fd30ee64702908e5aa
(cherry picked from commit c3c4aec158a595826e37652a82c5782433022a7b)
Reviewed-on: https://gerrit.libreoffice.org/27470
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/icon-themes/tango/cmd/lc_currencyfield.png 
b/icon-themes/tango/cmd/lc_currencyfield.png
index 7d60025..7f09c08 100644
Binary files a/icon-themes/tango/cmd/lc_currencyfield.png and 
b/icon-themes/tango/cmd/lc_currencyfield.png differ
diff --git a/icon-themes/tango/cmd/sc_currencyfield.png 
b/icon-themes/tango/cmd/sc_currencyfield.png
index e403abc..ae67122 100644
Binary files a/icon-themes/tango/cmd/sc_currencyfield.png and 
b/icon-themes/tango/cmd/sc_currencyfield.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svgio/source

2016-07-24 Thread Julien Nabet

 svgio/source/svgreader/svgimagenode.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b7a18f18efbba086454e3b5ec157b156980f97b6
Author: Julien Nabet 
Date:   Sat Jul 23 22:42:55 2016 +0200

tdf#101070: svg/insert, avoid infinite recursive loop when referencing 
oneself

See bt https://bugs.documentfoundation.org/attachment.cgi?id=126377

Change-Id: I3c6546a5449fc42613e30a7f45f31862752b7187
Reviewed-on: https://gerrit.libreoffice.org/27468
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/svgio/source/svgreader/svgimagenode.cxx 
b/svgio/source/svgreader/svgimagenode.cxx
index 074f46f..533389d 100644
--- a/svgio/source/svgreader/svgimagenode.cxx
+++ b/svgio/source/svgreader/svgimagenode.cxx
@@ -242,7 +242,7 @@ namespace svgio
 << e.getMessage() << "\"");
 }
 
-if (!aAbsUrl.isEmpty())
+if (!aAbsUrl.isEmpty() && !rPath.equals(aAbsUrl))
 {
 SvFileStream aStream(aAbsUrl, STREAM_STD_READ);
 Graphic aGraphic;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/nativealpha' - vcl/source

2016-07-24 Thread Tomaž Vajngerl

 vcl/source/bitmap/bitmapscalesuper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ff3a4cb06f710bf4f85e6580c1df516b984f9db8
Author: TomaÅ¾ Vajngerl 
Date:   Sun Jul 24 22:14:27 2016 +0900

vcl: use same bitdepth when performing super scaling

Change-Id: I379c4aa9aa83470961fa972eec8cdb67261f749c

diff --git a/vcl/source/bitmap/bitmapscalesuper.cxx 
b/vcl/source/bitmap/bitmapscalesuper.cxx
index 9fb1f44..61387fa 100644
--- a/vcl/source/bitmap/bitmapscalesuper.cxx
+++ b/vcl/source/bitmap/bitmapscalesuper.cxx
@@ -936,7 +936,7 @@ bool BitmapScaleSuper::filter(Bitmap& rBitmap)
 
 Bitmap::ScopedReadAccess pReadAccess(rBitmap);
 
-Bitmap aOutBmp(Size(nDstW, nDstH), 24);
+Bitmap aOutBmp(Size(nDstW, nDstH), rBitmap.GetBitCount());
 Bitmap::ScopedWriteAccess pWriteAccess(aOutBmp);
 
 const long nStartY = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: starmath/qa

2016-07-24 Thread Takeshi Abe

 starmath/qa/cppunit/test_node.cxx |   49 ++
 1 file changed, 49 insertions(+)

New commits:
commit 90517f4071c0a5950f88227c5ec345f4aa6ca0cd
Author: Takeshi Abe 
Date:   Sun Jul 24 05:52:57 2016 +0900

starmath: Add unit test for tdf#52225

Change-Id: Id0e9cb3f2fb939bedc2f8e7a56d40a0f82c1e9ca
Reviewed-on: https://gerrit.libreoffice.org/27469
Tested-by: Jenkins 
Reviewed-by: Takeshi Abe 

diff --git a/starmath/qa/cppunit/test_node.cxx 
b/starmath/qa/cppunit/test_node.cxx
index 5f2dca8..b07f26c 100644
--- a/starmath/qa/cppunit/test_node.cxx
+++ b/starmath/qa/cppunit/test_node.cxx
@@ -16,6 +16,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -33,9 +34,11 @@ public:
 
 private:
 void testTdf47813();
+void testTdf52225();
 
 CPPUNIT_TEST_SUITE(NodeTest);
 CPPUNIT_TEST(testTdf47813);
+CPPUNIT_TEST(testTdf52225);
 CPPUNIT_TEST_SUITE_END();
 
 SmDocShellRef mxDocShell;
@@ -81,6 +84,52 @@ void NodeTest::testTdf47813()
 CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, nWidthR/static_cast(nWidthA), 
0.01);
 }
 
+void NodeTest::testTdf52225()
+{
+#define CHECK_GREEK_SYMBOL(text, code, bItalic) do {\
+mxDocShell->SetText(text);  \
+const SmTableNode *pTree= mxDocShell->GetFormulaTree(); \
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(1), pTree->GetNumSubNodes());   \
+const SmNode *pLine = pTree->GetSubNode(0); \
+CPPUNIT_ASSERT(pLine);  \
+CPPUNIT_ASSERT_EQUAL(NLINE, pLine->GetType());  \
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(1), pLine->GetNumSubNodes());   \
+const SmNode *pNode = pLine->GetSubNode(0); \
+CPPUNIT_ASSERT(pNode);  \
+CPPUNIT_ASSERT_EQUAL(NSPECIAL, pNode->GetType());   \
+const SmSpecialNode *pSn = static_cast(pNode); \
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), pSn->GetText().getLength()); \
+CPPUNIT_ASSERT_EQUAL(sal_Unicode(code), pSn->GetText()[0]); \
+CPPUNIT_ASSERT_EQUAL(OUString(text), pSn->GetToken().aText);\
+CPPUNIT_ASSERT_EQUAL(bItalic, IsItalic(pSn->GetFont()));\
+} while (false)
+
+SmFormat aFormat = mxDocShell->GetFormat();
+CPPUNIT_ASSERT_EQUAL(sal_Int16(0), aFormat.GetGreekCharStyle()); // 
default format
+CHECK_GREEK_SYMBOL("%ALPHA", 0x0391, false);
+CHECK_GREEK_SYMBOL("%iALPHA", 0x0391, true);
+CHECK_GREEK_SYMBOL("%alpha", 0x03b1, false);
+CHECK_GREEK_SYMBOL("%ialpha", 0x03b1, true);
+
+// mode 1
+aFormat.SetGreekCharStyle(1);
+mxDocShell->SetFormat(aFormat);
+CHECK_GREEK_SYMBOL("%BETA", 0x0392, true);
+CHECK_GREEK_SYMBOL("%iBETA", 0x0392, true);
+CHECK_GREEK_SYMBOL("%beta", 0x03b2, true);
+CHECK_GREEK_SYMBOL("%ibeta", 0x03b2, true);
+
+// mode 2
+aFormat.SetGreekCharStyle(2);
+mxDocShell->SetFormat(aFormat);
+CHECK_GREEK_SYMBOL("%GAMMA", 0x0393, false);
+CHECK_GREEK_SYMBOL("%iGAMMA", 0x0393, true);
+CHECK_GREEK_SYMBOL("%gamma", 0x03b3, true);
+CHECK_GREEK_SYMBOL("%igamma", 0x03b3, true);
+
+#undef CHECK_GREEK_SYMBOL
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(NodeTest);
 
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/headless

2016-07-24 Thread Tomaž Vajngerl

 vcl/headless/svpgdi.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit b49005115076771da2669d120e72606bc2b0f532
Author: TomaÅ¾ Vajngerl 
Date:   Sun Jun 19 10:19:17 2016 +0800

don't use AA in SVP backend when getAntiAliasB2DDraw is false

Change-Id: Icea880a824f57ca74eb9e22820893faf6cbf7945

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 364050a..7482a68 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -684,7 +684,10 @@ void SvpSalGraphics::drawLine( long nX1, long nY1, long 
nX2, long nY2 )
 cairo_t* cr = getCairoContext(false);
 clipRegion(cr);
 
-AddPolygonToPath(cr, aPoly, aPoly.isClosed(), !getAntiAliasB2DDraw(), 
true);
+bool bAA = getAntiAliasB2DDraw();
+
+cairo_set_antialias(cr, bAA ? CAIRO_ANTIALIAS_DEFAULT : 
CAIRO_ANTIALIAS_NONE);
+AddPolygonToPath(cr, aPoly, aPoly.isClosed(), !bAA, true);
 
 applyColor(cr, m_aLineColor);
 
@@ -766,6 +769,7 @@ bool SvpSalGraphics::drawPolyLine(
 cairo_set_line_width(cr, rLineWidths.getX());
 cairo_set_miter_limit(cr, fMiterLimit);
 
+cairo_set_antialias(cr, getAntiAliasB2DDraw() ? CAIRO_ANTIALIAS_DEFAULT : 
CAIRO_ANTIALIAS_NONE);
 
 basegfx::B2DRange extents(0, 0, 0, 0);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/source

2016-07-24 Thread Julien Nabet

 vcl/source/image/ImageList.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit c360f90ea902ca697c7a7145825450d430b02e07
Author: Julien Nabet 
Date:   Sun Jul 24 11:40:59 2016 +0200

For a failing image load, indicate theme

(only in case OSL_DEBUG_LEVEL>0)

Change-Id: I31217c72c9bddaa748a5980252b40d025c76b730
Reviewed-on: https://gerrit.libreoffice.org/27473
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/vcl/source/image/ImageList.cxx b/vcl/source/image/ImageList.cxx
index aab0150..07182af 100644
--- a/vcl/source/image/ImageList.cxx
+++ b/vcl/source/image/ImageList.cxx
@@ -139,6 +139,9 @@ void ImageAryData::Load(const OUString &rPrefix)
 aMessage.append( "ImageAryData::Load: failed to load image '" );
 aMessage.append( OUStringToOString( aFileName, RTL_TEXTENCODING_UTF8 
).getStr() );
 aMessage.append( "'" );
+aMessage.append( " from icon theme '" );
+aMessage.append( OUStringToOString( aIconTheme, RTL_TEXTENCODING_UTF8 
).getStr() );
+aMessage.append( "'" );
 OSL_FAIL( aMessage.makeStringAndClear().getStr() );
 }
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: WebDAV ucb provider: neon, serf, ideas...

2016-07-24 Thread Giuseppe Castagno


Hi all,

On 07/21/2016 08:51 AM, Giuseppe Castagno wrote:



1) Add OPTIONS method
==
For OPTIONS method specification, please see:

for general details.

where the use of OPTIONS method is detailed for WebDAV.

The reason to implement this method, is to better detect if a URL
resource is a simple Web resource or if it's WebDAV. In this latter case
detect what methods it supports and what DAV class or classes it
implements.
In case of Web accessing (that is, not WebDAV) It should enhance a
little the performance, by removing the bunch of PROPFIND method LO
sends on Web resource.

I've been working on this for a few months now, it seems to works well,
I think it's ripe for inclusion in main codebase.


I opened a bug to act as anchor for the OPTIONS method implementation:

https://bugs.documentfoundation.org/show_bug.cgi?id=101094

In the next days I'll start to push the commits that make up the change, 
piping them through Gerrit first.


--
Kind Regards,
Giuseppe Castagno aka beppec56
Acca Esse http://www.acca-esse.eu
giuseppe.castagno at acca-esse.eu

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: icon-themes/tango

2016-07-24 Thread Adolfo Jayme Barrientos

 icon-themes/tango/cmd/lc_currencyfield.png |binary
 icon-themes/tango/cmd/sc_currencyfield.png |binary
 2 files changed

New commits:
commit c3c4aec158a595826e37652a82c5782433022a7b
Author: Adolfo Jayme Barrientos 
Date:   Sun Jul 24 02:47:21 2016 -0500

tdf#100849 Restore Tango currency-neutral icon

This partially reverts f18096f1b5cce12033e6721fa6624f02e797acc3.

Change-Id: I0697214e39406905b995e4fd30ee64702908e5aa

diff --git a/icon-themes/tango/cmd/lc_currencyfield.png 
b/icon-themes/tango/cmd/lc_currencyfield.png
index 7d60025..7f09c08 100644
Binary files a/icon-themes/tango/cmd/lc_currencyfield.png and 
b/icon-themes/tango/cmd/lc_currencyfield.png differ
diff --git a/icon-themes/tango/cmd/sc_currencyfield.png 
b/icon-themes/tango/cmd/sc_currencyfield.png
index e403abc..ae67122 100644
Binary files a/icon-themes/tango/cmd/sc_currencyfield.png and 
b/icon-themes/tango/cmd/sc_currencyfield.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

2016-07-24 Thread Caolán McNamara

 sw/source/core/inc/tabfrm.hxx|2 --
 sw/source/core/layout/tabfrm.cxx |   25 +++--
 2 files changed, 3 insertions(+), 24 deletions(-)

New commits:
commit e22122e20ca69d0f2b0e8831e9ebf3afd2064329
Author: CaolÃ¡n McNamara 
Date:   Sat Jul 23 21:48:25 2016 +0100

Resolves: tdf#101058 crash on deleting certain table row

regression from...

commit 15d8b51bf82610c663f80fe552a1c0315e137ad3
Author: CaolÃ¡n McNamara 
Date:   Tue Feb 5 17:33:49 2013 +

Resolves: rhbz#907933 crash on removing second last para in cell...

if (basically) the last para is on next page

so revert that and try a different fix which now works to keep the original
problem crash-free and fix this one too

Change-Id: Ia6b3ef48c43ceceb7ee7cc2b8b803314349f3785

diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx
index bd42457..92da368 100644
--- a/sw/source/core/inc/tabfrm.hxx
+++ b/sw/source/core/inc/tabfrm.hxx
@@ -156,8 +156,6 @@ public:
 
 bool HasFollowFlowLine() const { return m_bHasFollowFlowLine; }
 void SetFollowFlowLine(bool bNew) { m_bHasFollowFlowLine = bNew; }
-//return the SwTabFrame (if any) that this SwTabFrame is a follow flow 
line for
-SwTabFrame* GetFollowFlowLineFor();
 
 bool IsRebuildLastLine() const { return m_bIsRebuildLastLine; }
 void SetRebuildLastLine(bool bNew) { m_bIsRebuildLastLine = bNew; }
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 3295980..e4edd2b 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -129,28 +129,8 @@ extern const SwTable   *g_pRowCacheLastTable;
 extern const SwTabFrame  *g_pRowCacheLastTabFrame;
 extern const SwFrame *g_pRowCacheLastCellFrame;
 
-//return the SwTabFrame (if any) that this SwTabFrame is a follow flow line for
-SwTabFrame* SwTabFrame::GetFollowFlowLineFor()
-{
-SwFlowFrame *pPrec = GetPrecede();
-if (pPrec && pPrec->GetFrame().IsTabFrame())
-{
-SwTabFrame *pPrevTabFrame = static_cast(pPrec);
-assert(this == pPrevTabFrame->GetFollow());
-if (pPrevTabFrame->HasFollowFlowLine() && pPrevTabFrame->GetFollow() 
== this)
-return pPrevTabFrame;
-}
-return nullptr;
-}
-
 void SwTabFrame::DestroyImpl()
 {
-//rhbz#907933, we are a follow flow line for something and have been
-//deleted, remove ourself as a follow flowline
-SwTabFrame* pFlowFrameFor = GetFollowFlowLineFor();
-if (pFlowFrameFor)
-pFlowFrameFor->RemoveFollowFlowLine();
-
 // There is some terrible code in fetab.cxx, that
 // makes use of these global pointers. Obviously
 // this code did not consider that a TabFrame can be
@@ -838,7 +818,8 @@ static long lcl_GetMaximumLayoutRowSpan( const SwRowFrame& 
rRow )
 bool SwTabFrame::RemoveFollowFlowLine()
 {
 // find FollowFlowLine
-SwRowFrame* pFollowFlowLine = GetFollow()->GetFirstNonHeadlineRow();
+SwTabFrame *pFoll = GetFollow();
+SwRowFrame* pFollowFlowLine = pFoll ? pFoll->GetFirstNonHeadlineRow() : 
nullptr;
 
 // find last row in master
 SwFrame* pLastLine = GetLastLower();
@@ -1270,7 +1251,7 @@ bool SwTabFrame::Join()
 
 SwTabFrame *pFoll = GetFollow();
 
-if ( !pFoll->IsJoinLocked() )
+if (pFoll && !pFoll->IsJoinLocked())
 {
 SWRECTFN( this )
 pFoll->Cut();   //Cut out first to avoid unnecessary notifications.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

46 matches

Mail list logo