KDE and HiDPI

[Keith Curtis]

Hi;

I did some research for KDE and DPI. By default all windows are 96 DPI and
there is no screen auto-detection.

However, it is possible to manually set the DPI for KDE 4.x. In the system
settings, you can click on Appearance - Fonts and there is an option to
"force fonts DPI" to 192 or whatever. Fortunately, that setting applies to
more than fonts. When 192 is set, the HiDPI mode kicks in for LibreOffice
and it looks great.

I've read about more work happening for HiDPI in QT5 / KDE 5 which should
be out in the first-half of this year, but fortunately things can be made
to look fine with current code.

I'll put some updated comments about this in the wiki page also. Between
all the DEs, and other OSes, the test matrix for LibreOffice is large.

Regards,

-Keith
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 12 commits - dbaccess/source l10ntools/source sc/source sdext/source sd/source sfx2/source sot/source starmath/source svx/source sw/source

[Noel Grandin]

 dbaccess/source/ui/control/curledit.cxx|3 -
 l10ntools/source/helpmerge.cxx |2 -
 sc/source/core/data/dptabsrc.cxx   |2 -
 sc/source/ui/view/output2.cxx  |2 -
 sd/source/ui/slideshow/slideshowimpl.cxx   |2 -
 sd/source/ui/view/outlnvsh.cxx |2 -
 sdext/source/pdfimport/pdfparse/pdfentries.cxx |5 --
 sfx2/source/doc/objstor.cxx|2 -
 sot/source/sdstor/ucbstorage.cxx   |2 -
 starmath/source/mathmlexport.cxx   |2 -
 svx/source/svdraw/svdxcgv.cxx  |2 -
 sw/source/filter/ww8/ww8graf.cxx   |   50 +++--
 12 files changed, 33 insertions(+), 43 deletions(-)

New commits:
commit 8f6a8be4ffe7c4c287528e5399767929c7712183
Author: Noel Grandin 
Date:   Wed Feb 19 15:10:59 2014 +0200

cid#1103724 Dereference before null check

Change-Id: Ie90dbddc72224c014792f27ef98e6300d5225b7a

diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index b437f58..9c6d7ff 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -201,7 +201,7 @@ sal_Bool SdrExchangeView::Paste(SvStream& rInput, const 
OUString& rBaseURL, sal_
 
ImpPasteObject(pObj,*pLst,aPos,aSiz,MapMode(eMap,Point(0,0),aMap,aMap),nOptions);
 
 // b4967543
-if(pObj && pObj->GetModel() && pObj->GetOutlinerParaObject())
+if(pObj->GetModel() && pObj->GetOutlinerParaObject())
 {
 SdrOutliner& rOutliner = pObj->GetModel()->GetHitTestOutliner();
 rOutliner.SetText(*pObj->GetOutlinerParaObject());
commit bce04e519356a445489acd016c1c65a66d2f5fa6
Author: Noel Grandin 
Date:   Wed Feb 19 15:09:53 2014 +0200

cid#1078827 Dereference before null check

Change-Id: Id35992113a8e8f2d06bda7f2287227afeec62313

diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx 
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 54c4c02..3571942 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -916,7 +916,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* 
pPresSettings )
 // ---
 
 OUString  aPresSlide( maPresSettings.maPresPage );
-SdPage* pStartPage = mpViewShell ? mpViewShell->GetActualPage() : 0;
+SdPage* pStartPage = mpViewShell->GetActualPage();
 boolbStartWithActualSlide =  pStartPage;
 
 // times should be measured?
commit c39c621978cc2df1c30005abbedfc0711b76d153
Author: Noel Grandin 
Date:   Wed Feb 19 15:08:31 2014 +0200

cid#1078825 Dereference before null check

Change-Id: I9daa1e3a294db0b205fe5b2ec247bbf550d2dca1

diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 654a74c..3e5ed9b 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -1504,7 +1504,7 @@ OUString OutlineViewShell::GetSelectionText(bool 
bCompleteWords)
 ::Outliner* pOl = pOlView->GetOutliner();
 OutlinerView* pOutlinerView = pOlView->GetViewByWindow( GetActiveWindow() 
);
 
-if (pOl && pOlView)
+if (pOl)
 {
 if (bCompleteWords)
 {
commit c45f332e9e265e7e363e0f91f2fe69fb69683253
Author: Noel Grandin 
Date:   Wed Feb 19 15:07:01 2014 +0200

cid#1078824 Dereference before null check

Change-Id: Ic68e7048786415a847a67723890a92cb542bbf80

diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index a7adab3..d035427 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2661,7 +2661,7 @@ sal_Bool SfxObjectShell::CommonSaveAs_Impl
 }
 aParams->ClearItem( SID_COPY_STREAM_IF_POSSIBLE );
 
-pImp->bPasswd = aParams && SFX_ITEM_SET == 
aParams->GetItemState(SID_PASSWORD);
+pImp->bPasswd = SFX_ITEM_SET == aParams->GetItemState(SID_PASSWORD);
 
 SfxMedium *pActMed = GetMedium();
 const INetURLObject aActName(pActMed->GetName());
commit 91e7943cac7490c51bbc03eec2f90422f8e1598e
Author: Noel Grandin 
Date:   Wed Feb 19 14:59:14 2014 +0200

cid#1078823 Dereference before null check

Change-Id: If1a3f54ee38cd97693cebaea680b46ba846b2e71

diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 47158af..f9fd610 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -2715,7 +2715,7 @@ BaseStorageStream* UCBStorage::OpenStream( const 
OUString& rEleName, StreamMode
 }
 }
 
-if ( pElement && !pElement->m_bIsFolder )
+if ( !pElement->m_bIsFolder )
 {
 // check if stream is already created
 if ( pElement->m_xStream.Is() )
commit 78f6d5f0913f0ab16dd3396658b6bb463a9ba857
Author: Noel Grandin 
Date:   Wed Feb 19 14:53:54 2014 +0200

cid#1078821 Dereference before null check

Change-Id: I656df01fc38357de2073c36926c850eb87fed967

diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 9efdae0..dbde7

[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann]

 solenv/gbuild/platform/com_GCC_defs.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7dc6659f7e5bd951ea3dcf8a6596781e0c0b3114
Author: Stephan Bergmann 
Date:   Thu Feb 20 08:19:29 2014 +0100

Allow COMPILER_PLUGIN_TOOL to carry mulitple plugin names

Change-Id: I6e1655287939cf0d36fb6a84aaafc37c88fbceba

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 761765f..de77c7b 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -163,7 +163,7 @@ gb_COMPILER_PLUGINS += -Xclang -plugin-arg-loplugin -Xclang 
\
 --warnings-only='$(COMPILER_PLUGIN_WARNINGS_ONLY)'
 endif
 else
-gb_COMPILER_PLUGINS := -Xclang -load -Xclang 
$(BUILDDIR)/compilerplugins/obj/plugin.so -Xclang -plugin -Xclang loplugin 
-Xclang -plugin-arg-loplugin -Xclang $(COMPILER_PLUGIN_TOOL)
+gb_COMPILER_PLUGINS := -Xclang -load -Xclang 
$(BUILDDIR)/compilerplugins/obj/plugin.so -Xclang -plugin -Xclang loplugin 
$(foreach plugin,$(COMPILER_PLUGIN_TOOL), -Xclang -plugin-arg-loplugin -Xclang 
$(plugin))
 ifneq ($(UPDATE_FILES),)
 gb_COMPILER_PLUGINS += -Xclang -plugin-arg-loplugin -Xclang 
--scope=$(UPDATE_FILES)
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice Gerrit News for core on 2014-02-20

[gerrit]

Moin!

* Open changes on master for project core changed in the last 25 hours:

 First time contributors doing great things! 
+ fdo#63154 Remove unused solar.h ref. in tools
  in https://gerrit.libreoffice.org/8134 from Alexandre Vicenzi
  about module include
+ Remove  in 

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

[Kohei Yoshida]

 sc/qa/unit/ucalc.hxx |2 ++
 sc/qa/unit/ucalc_formula.cxx |   28 
 sc/source/core/tool/interpr6.cxx |1 +
 3 files changed, 31 insertions(+)

New commits:
commit 9e183fbfdbfbe364d17f9d36a0b33d2fae89862d
Author: Kohei Yoshida 
Date:   Thu Feb 20 00:28:06 2014 -0500

fdo#75228: We still need to get the value only to pop value from the stack.

Change-Id: Iad231aa97ed35f91b96cddf8157ebcd9af0f8ec9

diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx
index f404561..a32b3c1 100644
--- a/sc/source/core/tool/interpr6.cxx
+++ b/sc/source/core/tool/interpr6.cxx
@@ -891,6 +891,7 @@ void ScInterpreter::ScCount()
 }
 break;
 case svDouble:
+GetDouble();
 nCount++;
 nFuncFmtType = NUMBERFORMAT_NUMBER;
 break;
commit e50f17ace67dc7dc1680494567d74b4c76ce21d3
Author: Kohei Yoshida 
Date:   Thu Feb 20 00:16:00 2014 -0500

fdo#75228: Add test for this.

Change-Id: Ie89c9f80db0da7d1d0a4a5c06495715aaf555f4c

diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index c40469a..7ceabb4 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -119,6 +119,7 @@ public:
 void testFormulaRefUpdateNamedExpression();
 void testMultipleOperations();
 void testFuncCOLUMN();
+void testFuncCOUNT();
 void testFuncROW();
 void testFuncSUM();
 void testFuncPRODUCT();
@@ -358,6 +359,7 @@ public:
 CPPUNIT_TEST(testFormulaRefUpdateNamedExpression);
 CPPUNIT_TEST(testMultipleOperations);
 CPPUNIT_TEST(testFuncCOLUMN);
+CPPUNIT_TEST(testFuncCOUNT);
 CPPUNIT_TEST(testFuncROW);
 CPPUNIT_TEST(testFuncSUM);
 CPPUNIT_TEST(testFuncPRODUCT);
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 02dfff2..35e6369 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -1734,6 +1734,34 @@ void Test::testFuncCOLUMN()
 m_pDoc->DeleteTab(0);
 }
 
+void Test::testFuncCOUNT()
+{
+m_pDoc->InsertTab(0, "Formula");
+sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on.
+
+m_pDoc->SetValue(ScAddress(0,0,0), 2); // A1
+m_pDoc->SetValue(ScAddress(0,1,0), 4); // A2
+m_pDoc->SetValue(ScAddress(0,2,0), 6); // A3
+
+ScAddress aPos(1,0,0);
+m_pDoc->SetString(aPos, "=COUNT(A1:A3)");
+CPPUNIT_ASSERT_EQUAL(3.0, m_pDoc->GetValue(aPos));
+
+aPos.IncRow();
+m_pDoc->SetString(aPos, "=COUNT(A1:A3;2)");
+CPPUNIT_ASSERT_EQUAL(4.0, m_pDoc->GetValue(aPos));
+
+aPos.IncRow();
+m_pDoc->SetString(aPos, "=COUNT(A1:A3;2;4)");
+CPPUNIT_ASSERT_EQUAL(5.0, m_pDoc->GetValue(aPos));
+
+aPos.IncRow();
+m_pDoc->SetString(aPos, "=COUNT(A1:A3;2;4;6)");
+CPPUNIT_ASSERT_EQUAL(6.0, m_pDoc->GetValue(aPos));
+
+m_pDoc->DeleteTab(0);
+}
+
 void Test::testFuncROW()
 {
 m_pDoc->InsertTab(0, "Formula");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=65675

Bug 65675 depends on bug 73565, which changed state.

Bug 73565 Summary: Autofilter on date creates a "dummy" thing instead of date 
list
https://bugs.freedesktop.org/show_bug.cgi?id=73565

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

[Kohei Yoshida]

 sc/source/ui/cctrl/checklistmenu.cxx |  106 +--
 1 file changed, 64 insertions(+), 42 deletions(-)

New commits:
commit 7af1124f83df4d96f6ebe58536de7c51406df661
Author: Kohei Yoshida 
Date:   Wed Feb 19 23:45:38 2014 -0500

fdo#73565: Populate date members in a locale-safe way.

Change-Id: Id90b2829465fada690b0446d6d823e76e792c77b
(cherry picked from commit 2be2786879883badd6d0075e63965bacd312ed23)
Reviewed-on: https://gerrit.libreoffice.org/8139
Tested-by: Markus Mohrhard 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index 2cde8eb..848d84c 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -32,6 +32,7 @@
 #include "svtools/fmtfield.hxx"
 #include "document.hxx"
 
+using namespace com::sun::star;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::accessibility::XAccessible;
 using ::com::sun::star::accessibility::XAccessibleContext;
@@ -1279,50 +1280,71 @@ void ScCheckListMenuWindow::setMemberSize(size_t n)
 void ScCheckListMenuWindow::addDateMember(const OUString& rsName, double nVal, 
bool bVisible)
 {
 ScDocument* pDoc = getDoc();
-if ( pDoc )
+SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
+
+// Convert the numeric date value to a date object.
+Date aDate = *(pFormatter->GetNullDate());
+aDate += static_cast(rtl::math::approxFloor(nVal));
+
+sal_uInt16 nYear = aDate.GetYear();
+sal_uInt16 nMonth = aDate.GetMonth();
+sal_uInt16 nDay = aDate.GetDay();
+
+// Get the localized month name list.
+CalendarWrapper* pCalendar = ScGlobal::GetCalendar();
+uno::Sequence aMonths = pCalendar->getMonths();
+if (aMonths.getLength() < nMonth)
+return;
+
+OUString aYearName = OUString::number(nYear);
+OUString aMonthName = aMonths[nMonth-1].FullName;
+OUString aDayName = OUString::number(nDay);
+
+maChecks.SetUpdateMode(false);
+
+SvTreeListEntry* pYearEntry = maChecks.FindEntry(NULL, aYearName);
+if (!pYearEntry)
 {
-SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
-OUString rsDate;
-if ( pFormatter )
-{
-OUString sFormat("//DD");
-Color* pColor = NULL;
-pFormatter->GetPreviewString(sFormat,
-nVal,
-rsDate,
-&pColor,
-ScGlobal::eLnge );
-}
-maChecks.SetUpdateMode(false);
-sal_Int32 nIndex = 0;
-OUString sParent;
-SvTreeListEntry* pParent = NULL;
-int count = 0;
-do
-{
-OUString sPart = rsDate.getToken( 0, '/', nIndex );
-bool bLeaf = ( ++count == 3 );
-SvTreeListEntry* pChild = maChecks.FindEntry( pParent, sPart );
-if ( !pChild )
-{
-if ( bLeaf )
-pChild = maChecks.SvTreeListBox::InsertEntry( sPart, 
pParent, sal_False, LISTBOX_APPEND, NULL, SvLBoxButtonKind_enabledCheckbox );
-else
-pChild = maChecks.SvTreeListBox::InsertEntry( sPart, 
pParent, sal_True, LISTBOX_APPEND, NULL, SvLBoxButtonKind_enabledCheckbox );
-Member aMember;
-aMember.maName = sPart;
-aMember.maRealName = rsName;
-aMember.mbDate = true;
-aMember.mbLeaf = bLeaf;
-aMember.mbVisible = bVisible;
-aMember.mpParent = pParent;
-maMembers.push_back(aMember);
-}
-sParent = sPart;
-pParent = pChild;
-} while ( nIndex >= 0 );
-maChecks.SetUpdateMode(true);
+pYearEntry = maChecks.InsertEntry(aYearName, NULL, true);
+Member aMemYear;
+aMemYear.maName = aYearName;
+aMemYear.maRealName = rsName;
+aMemYear.mbDate = true;
+aMemYear.mbLeaf = false;
+aMemYear.mbVisible = bVisible;
+aMemYear.mpParent = NULL;
+maMembers.push_back(aMemYear);
+}
+
+SvTreeListEntry* pMonthEntry = maChecks.FindEntry(pYearEntry, aMonthName);
+if (!pMonthEntry)
+{
+pMonthEntry = maChecks.InsertEntry(aMonthName, pYearEntry, true);
+Member aMemMonth;
+aMemMonth.maName = aMonthName;
+aMemMonth.maRealName = rsName;
+aMemMonth.mbDate = true;
+aMemMonth.mbLeaf = false;
+aMemMonth.mbVisible = bVisible;
+aMemMonth.mpParent = pYearEntry;
+maMembers.push_back(aMemMonth);
 }
+
+SvTreeListEntry* pDayEntry = maChecks.FindEntry(pMonthEntry, aDayName);
+if (!pDayEntry)
+{
+pDayEntry = maChecks.InsertEntry(aDayName, pMonthEntry, false);
+Member aMemDay;
+aMemDay.maName = aDayName;
+aMemDay.maRealName = rsName;
+aMemDay.mbDate = true;
+aMemDay.mbLeaf = true;
+aMemDay.mbVisible = 

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

[Kohei Yoshida]

 sc/source/ui/cctrl/checklistmenu.cxx |  106 +--
 1 file changed, 64 insertions(+), 42 deletions(-)

New commits:
commit 2be2786879883badd6d0075e63965bacd312ed23
Author: Kohei Yoshida 
Date:   Wed Feb 19 23:45:38 2014 -0500

fdo#73565: Populate date members in a locale-safe way.

Change-Id: Id90b2829465fada690b0446d6d823e76e792c77b

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index e055636..2e88e17 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -32,6 +32,7 @@
 #include "svtools/fmtfield.hxx"
 #include "document.hxx"
 
+using namespace com::sun::star;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::accessibility::XAccessible;
 using ::com::sun::star::accessibility::XAccessibleContext;
@@ -1280,50 +1281,71 @@ void ScCheckListMenuWindow::setMemberSize(size_t n)
 void ScCheckListMenuWindow::addDateMember(const OUString& rsName, double nVal, 
bool bVisible)
 {
 ScDocument* pDoc = getDoc();
-if ( pDoc )
+SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
+
+// Convert the numeric date value to a date object.
+Date aDate = *(pFormatter->GetNullDate());
+aDate += static_cast(rtl::math::approxFloor(nVal));
+
+sal_uInt16 nYear = aDate.GetYear();
+sal_uInt16 nMonth = aDate.GetMonth();
+sal_uInt16 nDay = aDate.GetDay();
+
+// Get the localized month name list.
+CalendarWrapper* pCalendar = ScGlobal::GetCalendar();
+uno::Sequence aMonths = pCalendar->getMonths();
+if (aMonths.getLength() < nMonth)
+return;
+
+OUString aYearName = OUString::number(nYear);
+OUString aMonthName = aMonths[nMonth-1].FullName;
+OUString aDayName = OUString::number(nDay);
+
+maChecks.SetUpdateMode(false);
+
+SvTreeListEntry* pYearEntry = maChecks.FindEntry(NULL, aYearName);
+if (!pYearEntry)
 {
-SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
-OUString rsDate;
-if ( pFormatter )
-{
-OUString sFormat("//DD");
-Color* pColor = NULL;
-pFormatter->GetPreviewString(sFormat,
-nVal,
-rsDate,
-&pColor,
-ScGlobal::eLnge );
-}
-maChecks.SetUpdateMode(false);
-sal_Int32 nIndex = 0;
-OUString sParent;
-SvTreeListEntry* pParent = NULL;
-int count = 0;
-do
-{
-OUString sPart = rsDate.getToken( 0, '/', nIndex );
-bool bLeaf = ( ++count == 3 );
-SvTreeListEntry* pChild = maChecks.FindEntry( pParent, sPart );
-if ( !pChild )
-{
-if ( bLeaf )
-pChild = maChecks.SvTreeListBox::InsertEntry( sPart, 
pParent, sal_False, LISTBOX_APPEND, NULL, SvLBoxButtonKind_enabledCheckbox );
-else
-pChild = maChecks.SvTreeListBox::InsertEntry( sPart, 
pParent, sal_True, LISTBOX_APPEND, NULL, SvLBoxButtonKind_enabledCheckbox );
-Member aMember;
-aMember.maName = sPart;
-aMember.maRealName = rsName;
-aMember.mbDate = true;
-aMember.mbLeaf = bLeaf;
-aMember.mbVisible = bVisible;
-aMember.mpParent = pParent;
-maMembers.push_back(aMember);
-}
-sParent = sPart;
-pParent = pChild;
-} while ( nIndex >= 0 );
-maChecks.SetUpdateMode(true);
+pYearEntry = maChecks.InsertEntry(aYearName, NULL, true);
+Member aMemYear;
+aMemYear.maName = aYearName;
+aMemYear.maRealName = rsName;
+aMemYear.mbDate = true;
+aMemYear.mbLeaf = false;
+aMemYear.mbVisible = bVisible;
+aMemYear.mpParent = NULL;
+maMembers.push_back(aMemYear);
+}
+
+SvTreeListEntry* pMonthEntry = maChecks.FindEntry(pYearEntry, aMonthName);
+if (!pMonthEntry)
+{
+pMonthEntry = maChecks.InsertEntry(aMonthName, pYearEntry, true);
+Member aMemMonth;
+aMemMonth.maName = aMonthName;
+aMemMonth.maRealName = rsName;
+aMemMonth.mbDate = true;
+aMemMonth.mbLeaf = false;
+aMemMonth.mbVisible = bVisible;
+aMemMonth.mpParent = pYearEntry;
+maMembers.push_back(aMemMonth);
 }
+
+SvTreeListEntry* pDayEntry = maChecks.FindEntry(pMonthEntry, aDayName);
+if (!pDayEntry)
+{
+pDayEntry = maChecks.InsertEntry(aDayName, pMonthEntry, false);
+Member aMemDay;
+aMemDay.maName = aDayName;
+aMemDay.maRealName = rsName;
+aMemDay.mbDate = true;
+aMemDay.mbLeaf = true;
+aMemDay.mbVisible = bVisible;
+aMemDay.mpParent = pMonthEntry;
+maMembers.push_back(aMemDay);
+}
+
+maChecks.SetUpdateMode(true);
 }
 
 void ScCheckListMenuWindow::addMember(const OUString

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=65675

mariosv  changed:

   What|Removed |Added

 Depends on||75228

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=65675

mariosv  changed:

   What|Removed |Added

 Depends on|75228   |

--- Comment #98 from mariosv  ---
Added
https://bugs.freedesktop.org/show_bug.cgi?id=75228

Ranges in COUNT() function are not well counted if there isn't a range as the
last parameter of the function.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=65675

mariosv  changed:

   What|Removed |Added

 Depends on||75228

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Unity for HiDPI

[Keith Curtis]

Hi Björn,

I have done some reading that the next version of Unity is going to
have HiDPI support.

Do you know if they will return 192 DPI when on these screens like
what Gnome 3.10 does? I could find some Unity alias and ask, but you
might know or be able to encourage them ;-) Unfortunately, I can't
easily install Unity to test because I'd have to replace a lot of my
other core packages.

-Keith
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - sal/inc sal/rtl sal/util sd/inc sd/source svl/inc svl/source

[Stephan Bergmann]

 sal/inc/rtl/string.h |   18 
 sal/inc/rtl/string.hxx   |   15 --
 sal/inc/rtl/ustring.h|   18 
 sal/inc/rtl/ustring.hxx  |   15 --
 sal/rtl/source/strtmpl.cxx   |   64 +++
 sal/util/sal.map |6 
 sd/inc/sdpage.hxx|2 -
 sd/source/core/sdpage2.cxx   |4 +-
 sd/source/core/stlpool.cxx   |2 -
 svl/inc/svl/itemset.hxx  |2 -
 svl/source/items/itemset.cxx |4 +-
 11 files changed, 12 insertions(+), 138 deletions(-)

New commits:
commit 98554820e6109c3e3f4ea83bf036d9f20ef1685e
Author: Stephan Bergmann 
Date:   Thu Feb 20 09:23:20 2014 +0530

Stick to a single O[U]String hash function

Ported from: 042725a5dadc9f2c6368ca451b6d20046129b8af

Change-Id: I87f11d9101e21bdadaaffb719a762d0030639cb1

diff --git a/sal/inc/rtl/string.h b/sal/inc/rtl/string.h
index 3def4c1..9f3c69a 100644
--- a/sal/inc/rtl/string.h
+++ b/sal/inc/rtl/string.h
@@ -277,24 +277,6 @@ SAL_DLLPUBLIC sal_Int32 SAL_CALL rtl_str_hashCode(
 SAL_DLLPUBLIC sal_Int32 SAL_CALL rtl_str_hashCode_WithLength(
 const sal_Char * str, sal_Int32 len ) SAL_THROW_EXTERN_C();
 
-/** Return a hash code (64bit) for a string.
-
-It is not allowed to store the hash code persistently, because later
-versions could return other hash codes.
-
-@param str
-a string.  Need not be null-terminated, but must be at least as long as
-the specified len.
-
-@param len
-the length of the string.
-
-@return
-a hash code for the given string.
- */
-SAL_DLLPUBLIC sal_uInt64 SAL_CALL rtl_str_hashCode64_WithLength(
-const sal_Char * str, sal_Int32 len ) SAL_THROW_EXTERN_C();
-
 /** Search for the first occurrence of a character within a string.
 
 The string must be null-terminated.
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index e9a9342..cbd4b9a 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -866,21 +866,6 @@ public:
 }
 
 /**
-  Returns a 64bit hash of the string data.
-  This hashes the entire data, while hashCode would do sampling for larger 
string sizes.
-
-  @return   a hash code value of the string data
-
-  @see hashCode() for simple hashes
-
-  @since LibreOffice 4.3
-*/
-sal_uInt64 hashCode64() const SAL_THROW(())
-{
-return rtl_str_hashCode64_WithLength( pData->buffer, pData->length );
-}
-
-/**
   Returns a hashcode for this string.
 
   @return   a hash code value for this object.
diff --git a/sal/inc/rtl/ustring.h b/sal/inc/rtl/ustring.h
index 24a7dd8..0352e59 100644
--- a/sal/inc/rtl/ustring.h
+++ b/sal/inc/rtl/ustring.h
@@ -551,24 +551,6 @@ SAL_DLLPUBLIC sal_Int32 SAL_CALL rtl_ustr_hashCode(
 SAL_DLLPUBLIC sal_Int32 SAL_CALL rtl_ustr_hashCode_WithLength(
 const sal_Unicode * str, sal_Int32 len ) SAL_THROW_EXTERN_C();
 
-/** Return a hash code (64bit) for a string.
-
-It is not allowed to store the hash code persistently, because later
-versions could return other hash codes.
-
-@param str
-a string.  Need not be null-terminated, but must be at least as long as
-the specified len.
-
-@param len
-the length of the string.
-
-@return
-a hash code for the given string.
- */
-SAL_DLLPUBLIC sal_uInt64 SAL_CALL rtl_ustr_hashCode64_WithLength(
-const sal_Unicode * str, sal_Int32 len ) SAL_THROW_EXTERN_C();
-
 /** Search for the first occurrence of a character within a string.
 
 The string must be null-terminated.
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index 1f75101..36295116 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -1168,21 +1168,6 @@ public:
 }
 
 /**
-  Returns a 64bit hash of the string data.
-  This hashes the entire data, while hashCode would do sampling for larger 
string sizes.
-
-  @return   a hash code value of the string data
-
-  @see hashCode() for simple hashes
-
-  @since LibreOffice 4.3
-*/
-sal_uInt64 hashCode64() const SAL_THROW(())
-{
-return rtl_ustr_hashCode64_WithLength( pData->buffer, pData->length );
-}
-
-/**
   Returns a hashcode for this string.
 
   @return   a hash code value for this object.
diff --git a/sal/rtl/source/strtmpl.cxx b/sal/rtl/source/strtmpl.cxx
index 9b8fa51..3ba2eaf 100644
--- a/sal/rtl/source/strtmpl.cxx
+++ b/sal/rtl/source/strtmpl.cxx
@@ -272,72 +272,18 @@ sal_Int32 SAL_CALL IMPL_RTL_STRNAME( hashCode )( const 
IMPL_RTL_STRCODE* pStr )
 
 /* --- */
 
-sal_uInt64 SAL_CALL IMPL_RTL_STRNAME( hashCode64_WithLength )( const 
IMPL_RTL_STRCODE* pStr,
-   sal_Int32 nLen )
-SAL_THROW_EXTERN_C()
-{
-sal_uInt64 nHash = 0;
-
-for( sal_Int32 i = 0; i < nLen; i++ )
-nHash = (nHash << 5) - nHash + *pS

Re: Testing/Working on PyUNO?

[Keith Curtis]

Hi Markus,

Thanks for the explanation. I've recently been talking to lots of
younger programmers and so wanted to write a few words.

It is a conundrum to me why you have a quite large C++ team, but not
many people supplementing and polishing in Python, especially given
they should be easier to find. They are out there!

Regards,

-Keith




On Wed, Feb 19, 2014 at 6:50 PM, Markus Mohrhard
 wrote:
> Hey Keith,
>
>
> On Wed, Feb 19, 2014 at 6:47 PM, Keith Curtis  wrote:
>>
>> Hi;
>>
>> The C/C++ groups I worked in had all testers working in a scripting
>> language. Those who had the skills and interest to write in C/C++ moved to
>> product code. It was easy for developers to debug problems because the
>> test
>> application allowed you to configure which tests to run, the IDE was easy
>> to
>> use with single-step debugging, etc. You'd need two debuggers running, but
>> it worked great and was little slower than working with C++ tests.
>
>
> So we are not really discussing about python tests in general. I'm sorry if
> that was the impression. For out-of-process tests python tests are arguably
> the best choice. It is however much more complicated when it comes to
> in-process tests. We already use out-of-process python tests like the crash
> testing or convwatch. The whole discussion was mostly where python tests
> make sense in our build as in-process tests.
>
>>
>>
>> In the situation here, I agree that unit tests should be in C++, typically
>> written by the developers when they write their code. However, there can
>> still be room for further testing in Python. I've seen code that would
>> call
>> random APIs with random values and via genetic algorithms would come up
>> with
>> good ways to stress and crash the product. It would find plenty of bugs
>> that
>> no unit test ever could. The test harness was very good, it only reported
>> problems that were reproducible, and the app would narrow it down to the
>> shortest number of steps. So perhaps it is good to figure out whether
>> something is a unit test, a UNO test, or some other fancier kind of
>> testing.
>> If a developer doesn't want to run Python, they can just look at the stack
>> trace and try to figure it out on their own similar to what happens when
>> bugs are reported today. Python just makes it more reproducible.
>
>
> So for UNO it makes sense to use python instead of our current java tests (I
> still would prefer C++ as it is easier to debug but python already allows
> in-process tests). However calling something through UNO or in the UI often
> takes different code paths. That means if a test through the API fails you
> can't just try to reproduce it in the UI and see if you can debug it there.
> On the other hand looking at the API documentation and writing a test FOR
> the API can be done perfectly find in python (with the exception that is
> still a bit more difficult to debug).
>
>
>>
>> It also seems that people who are interested in Python today could work on
>> making it easier to contribute to LibreOffice in Python. There is a small
>> community of Python hackers contributing to today, mostly it seems it is
>> just Xisco Fauli. You don't need to re-write the whole app in Python to
>> bring in new people, as there are already plenty of places to contribute,
>> especially if you consider Base ;-) I find more and more programmers who
>> don't have C++ experience, meanwhile Python is one of the fastest growing
>> languages.
>>
>
> I mostly agree. IMO we have many tasks perfectly in the scope of python
> scripting where python is the best tool for the job. So it is not like the
> project does not value great python developers and if there are people out
> there who only know python and want to contribute we are not short of nice
> and important tasks.
>
> Regards,
> Markus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 75240] improve coding style in bitmap3.cxx

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=75240

Markus Mohrhard  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 Whiteboard||EasyHack DifficultyBeginner
   ||SkillCpp TopicCleanup
 CC||libreoffice@lists.freedeskt
   ||op.org
 Ever confirmed|0   |1

--- Comment #1 from Markus Mohrhard  ---
Making it an easy hack

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=65675

--- Comment #97 from Tom Colley  ---
I would endorse an enhancement regarding this bug. Although not severe, it has
been coming up as an issue since Version 3.5.5.3. I suggest either:

a) enable custom dictionary as a Writing Aid during initial installation. The
manual equivalent is: Go to Tools>Options>Language Settings>Writing
Aids>User-defined dictionaries and enable User defined dictionary "standard
[ALL]")

AND/OR

b) if the above dictionary isn't enabled, but a user opts to add a word to the
custom dictionary during spell-checking/correcting procedures, then the user is
prompted to give the application permission to enable this dictionary.

(In reply to comment #33)
> Adding Bug 60870: The custom dictionary is not initialized at startup

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Takeshi Abe]

 connectivity/source/drivers/jdbc/Object.cxx|6 +++---
 dbaccess/source/core/api/SingleSelectQueryComposer.cxx |   14 --
 dbaccess/source/ui/app/AppIconControl.cxx  |4 ++--
 dbaccess/source/ui/control/FieldDescControl.cxx|   10 +++---
 dbaccess/source/ui/misc/propertystorage.cxx|6 --
 dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx  |4 ++--
 dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx   |   14 --
 7 files changed, 22 insertions(+), 36 deletions(-)

New commits:
commit c92753e39575b4b823ce9df8f10fc8ecb8a9915e
Author: Takeshi Abe 
Date:   Thu Feb 20 11:02:54 2014 +0900

Replace deprecated std::auto_ptr with boost::scoped_ptr

Change-Id: Iafdebacd43ed24a30fb8e2d041fe975a1adbcfa0

diff --git a/connectivity/source/drivers/jdbc/Object.cxx 
b/connectivity/source/drivers/jdbc/Object.cxx
index 461c1ba..f2a9ece 100644
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/Object.cxx
@@ -30,7 +30,7 @@
 
 #include 
 
-#include 
+#include 
 
 using namespace connectivity;
 using namespace ::com::sun::star::uno;
@@ -172,14 +172,14 @@ namespace
 
 if ( _pEnvironment->IsInstanceOf( jThrow, 
java_sql_SQLException_BASE::st_getMyClass() ) )
 {
-::std::auto_ptr< java_sql_SQLException_BASE > pException( new 
java_sql_SQLException_BASE( _pEnvironment, jThrow ) );
+boost::scoped_ptr< java_sql_SQLException_BASE > pException( new 
java_sql_SQLException_BASE( _pEnvironment, jThrow ) );
 _out_rException = SQLException( pException->getMessage(), 
_rxContext,
 pException->getSQLState(), pException->getErrorCode(), Any() );
 return true;
 }
 else if ( _pEnvironment->IsInstanceOf( jThrow, 
java_lang_Throwable::st_getMyClass() ) )
 {
-::std::auto_ptr< java_lang_Throwable > pThrow( new 
java_lang_Throwable( _pEnvironment, jThrow ) );
+boost::scoped_ptr< java_lang_Throwable > pThrow( new 
java_lang_Throwable( _pEnvironment, jThrow ) );
 #if OSL_DEBUG_LEVEL > 0
 pThrow->printStackTrace();
 #endif
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx 
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index a5b3d5e..7a324e9 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -55,7 +55,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 using namespace ::dbaccess;
 using namespace ::dbtools;
@@ -676,9 +676,7 @@ void OSingleSelectQueryComposer::setSingleAdditiveClause( 
SQLPart _ePart, const
 aClauses.push_back( getSQLPart( eLoopParts, m_aSqlIterator, sal_True ) 
);
 
 // overwrite the one part in question here
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-::std::auto_ptr< TokenComposer > pComposer;
-SAL_WNODEPRECATED_DECLARATIONS_POP
+boost::scoped_ptr< TokenComposer > pComposer;
 if ( ( _ePart == Where ) || ( _ePart == Having ) )
 pComposer.reset( new FilterCreator );
 else
@@ -816,9 +814,7 @@ Reference< XNameAccess > SAL_CALL 
OSingleSelectQueryComposer::getColumns(  ) thr
 OUString sSQL( aSQL.makeStringAndClear() );
 // normalize the statement so that it doesn't contain any 
application-level features anymore
 OUString sError;
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-const ::std::auto_ptr< OSQLParseNode > pStatementTree( 
m_aSqlParser.parseTree( sError, sSQL, false ) );
-SAL_WNODEPRECATED_DECLARATIONS_POP
+const boost::scoped_ptr< OSQLParseNode > pStatementTree( 
m_aSqlParser.parseTree( sError, sSQL, false ) );
 OSL_ENSURE( pStatementTree.get(), 
"OSingleSelectQueryComposer::getColumns: could not parse the column retrieval 
statement!" );
 if ( pStatementTree.get() )
 if ( !pStatementTree->parseNodeToExecutableStatement( sSQL, 
m_xConnection, m_aSqlParser, NULL ) )
@@ -1738,9 +1734,7 @@ Sequence< Sequence< PropertyValue > > 
OSingleSelectQueryComposer::getStructuredC
 const OSQLParseNode* pTempNode = m_aAdditiveIterator.getParseTree();
 
 OUString aErrorMsg;
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-::std::auto_ptr pSqlParseNode( 
m_aSqlParser.parseTree(aErrorMsg,aSql));
-SAL_WNODEPRECATED_DECLARATIONS_POP
+boost::scoped_ptr pSqlParseNode( 
m_aSqlParser.parseTree(aErrorMsg,aSql));
 if ( pSqlParseNode.get() )
 {
 m_aAdditiveIterator.setParseTree(pSqlParseNode.get());
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx 
b/dbaccess/source/ui/app/AppIconControl.cxx
index 752ac35..ad6f505 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -25,7 +25,7 @@
 #include 
 #include "callbacks.hxx"
 #include "AppElementType.hxx"
-#include 
+#include 
 
 using namespace ::dbaui;
 // class OApplicationIconControl
@@ -68,7 +68,

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=65675

Bug 65675 depends on bug 75032, which changed state.

Bug 75032 Summary: Other: crash when undo 'delete row above' with comments in 
rows below
https://bugs.freedesktop.org/show_bug.cgi?id=75032

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/column.hxx   |2 
 sc/inc/mtvcellfunc.hxx  |   11 +++
 sc/source/core/data/column2.cxx |  111 +---
 3 files changed, 50 insertions(+), 74 deletions(-)

New commits:
commit f0b4fe210200a3620cf05f30242771b01d991658
Author: Kohei Yoshida 
Date:   Mon Feb 17 12:20:57 2014 -0500

fdo#75032: Handle note copying correctly.

(cherry picked from commit 575e88da278f536ebfb6562dfd98f341240afec4)

Conflicts:
sc/source/core/data/column2.cxx

Change-Id: Iae37ac86889d7a25f25e6dd0b69f724107c6798a
Reviewed-on: https://gerrit.libreoffice.org/8089
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index c6db640..529f84f 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -167,6 +167,8 @@ public:
 const sc::CellStoreType& GetCellStore() const { return maCells; }
 sc::CellTextAttrStoreType& GetCellAttrStore() { return maCellTextAttrs; }
 const sc::CellTextAttrStoreType& GetCellAttrStore() const { return 
maCellTextAttrs; }
+sc::CellNoteStoreType& GetCellNoteStore() { return maCellNotes; }
+const sc::CellNoteStoreType& GetCellNoteStore() const { return 
maCellNotes; }
 
 ScRefCellValue GetCellValue( SCROW nRow ) const;
 ScRefCellValue GetCellValue( const sc::CellStoreType::const_iterator& 
itPos, size_t nOffset ) const;
diff --git a/sc/inc/mtvcellfunc.hxx b/sc/inc/mtvcellfunc.hxx
index fc6d2dc..d5e7921 100644
--- a/sc/inc/mtvcellfunc.hxx
+++ b/sc/inc/mtvcellfunc.hxx
@@ -166,6 +166,17 @@ void ProcessNote(CellNoteStoreType& rStore, _Func& rFunc)
 ProcessElements1 >(rStore, rFunc, aElse);
 }
 
+template
+typename CellNoteStoreType::const_iterator
+ParseNote(
+const CellNoteStoreType::const_iterator& itPos, const CellNoteStoreType& 
rStore,
+SCROW nStart, SCROW nEnd, _Func& rFunc)
+{
+FuncElseNoOp aElse;
+return ParseElements1 >(
+itPos, rStore, nStart, nEnd, rFunc, aElse);
+}
+
 template
 typename CellNoteStoreType::iterator
 ProcessNote(
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 1d28780..ae1a722 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1798,85 +1798,48 @@ void ScColumn::CopyCellTextAttrsToDocument(SCROW nRow1, 
SCROW nRow2, ScColumn& r
 }
 }
 
-void ScColumn::CopyCellNotesToDocument(SCROW nRow1, SCROW nRow2, ScColumn& 
rDestCol, bool bCloneCaption, SCROW nRowOffsetDest) const
-{
-SCCOL nDestCol = rDestCol.GetCol();
-SCTAB nDestTab = rDestCol.GetTab();
-
-rDestCol.maCellNotes.set_empty(nRow1 + nRowOffsetDest, nRow2 + 
nRowOffsetDest); // Empty the destination range first.
+namespace {
 
-sc::CellNoteStoreType::const_iterator itBlk = maCellNotes.begin(), 
itBlkEnd = maCellNotes.end();
+class CopyCellNotesHandler
+{
+ScColumn& mrDestCol;
+sc::CellNoteStoreType& mrDestNotes;
+sc::CellNoteStoreType::iterator miPos;
+SCTAB mnSrcTab;
+SCCOL mnSrcCol;
+SCTAB mnDestTab;
+SCCOL mnDestCol;
+SCROW mnDestOffset; /// Add this to the source row position to get the 
destination row.
+bool mbCloneCaption;
 
-// Locate the top row position.
-size_t nOffsetInBlock = 0;
-size_t nBlockStart = 0, nBlockEnd = 0, nRowPos = 
static_cast(nRow1);
-for (; itBlk != itBlkEnd; ++itBlk, nBlockStart = nBlockEnd)
-{
-nBlockEnd = nBlockStart + itBlk->size;
-if (nBlockStart <= nRowPos && nRowPos < nBlockEnd)
-{
-// Found.
-nOffsetInBlock = nRowPos - nBlockStart;
-break;
-}
+public:
+CopyCellNotesHandler( const ScColumn& rSrcCol, ScColumn& rDestCol, SCROW 
nDestOffset, bool bCloneCaption ) :
+mrDestCol(rDestCol),
+mrDestNotes(rDestCol.GetCellNoteStore()),
+miPos(mrDestNotes.begin()),
+mnSrcTab(rSrcCol.GetTab()),
+mnSrcCol(rSrcCol.GetCol()),
+mnDestTab(rDestCol.GetTab()),
+mnDestCol(rDestCol.GetCol()),
+mnDestOffset(nDestOffset),
+mbCloneCaption(bCloneCaption) {}
+
+void operator() ( size_t nRow, const ScPostIt* p )
+{
+SCROW nDestRow = nRow + mnDestOffset;
+ScAddress aSrcPos(mnSrcCol, nRow, mnSrcTab);
+ScAddress aDestPos(mnDestCol, nDestRow, mnDestTab);
+miPos = mrDestNotes.set(miPos, nDestRow, p->Clone(aSrcPos, 
mrDestCol.GetDoc(), aDestPos, mbCloneCaption));
 }
+};
 
-if (itBlk == itBlkEnd)
-// Specified range not found. Bail out.
-return;
-
-nRowPos = static_cast(nRow2); // End row position.
-
-// Keep copying until we hit the end row position.
-sc::cellnote_block::const_iterator itData, itDataEnd;
-for (; itBlk != itBlkEnd; ++itBlk, nBlockStart = nBlockEnd, nOffsetInBlock 
= 0)
-{
-nBlockEnd = nBlockStart + itBlk->size;
-
-if (itBlk->data) // Non-empty block.
-{
-itData = sc::cellnote_block::begin(*itBlk->data

gbuild GNU makes moved to new location (was: GNU make with depcache ...)

[Bjoern Michaelsen]

Hi,

On Tue, Feb 18, 2014 at 04:57:39PM +0100, Bjoern Michaelsen wrote:
> P.S.: We current have two gnu make forks in dev-tools, one in the gnu-make-lo
>   repository on gerrit, were one cant push to. Such a mess. When nobody
>   protests, I will delete the copies in dev-tools and make the gnu-make-lo
>   repository writable. Whatever forking had been done there and is still 
> of
>   value needs to be pushed on proper branches there then.

Discussed this with Norbert on IRC and moved the dev-tools copies to 
gnu-make-lo proper. So

  (repo/branch/dir)
  dev-tools/master/make-3.81moved to gnu-make-lo/gnu-make-lo-3.81/.

https://gerrit.libreoffice.org/gitweb?p=gnu-make-lo.git;a=shortlog;h=refs/heads/gnu-make-lo-3.81
  dev-tools/master/make-3.82-gbuild moved to gnu-make-lo/gnu-make-lo-3.82/.

https://gerrit.libreoffice.org/gitweb?p=gnu-make-lo.git;a=shortlog;h=refs/heads/gnu-make-lo-3.82
  dev-tools/master/make-4.0-gbuild moved to gnu-make-lo/gnu-make-lo-4.0/.

https://gerrit.libreoffice.org/gitweb?p=gnu-make-lo.git;a=shortlog;h=refs/heads/gnu-make-lo-3.82

and the new depcache branch is now at gnu-make-lo repo, branch feature/depcache:
  
https://gerrit.libreoffice.org/gitweb?p=gnu-make-lo.git;a=shortlog;h=refs/heads/feature/depcache

I will delete the dirs in dev-tools soonish, and put a README.gnumake there 
pointing to the new location.

@Norbert: Can you easily make gnu-make-lo replicate too (primarily to 
Github/Gitorious?).

Best,

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

HTML tags must be uppercase

[Kohei Yoshida]

Just FYI,

http://cgit.freedesktop.org/libreoffice/core/commit/?id=3d481254a07fe82d11953f9825a2f8fc6eeabc0b

we need to stick with uppercased HTML tags because using lower-cased
tags apparently breaks Windows clipboard functionality.

https://bugs.freedesktop.org/show_bug.cgi?id=74584
https://bugs.freedesktop.org/show_bug.cgi?id=74537

No idea why lower-cased html tags won't work there, but the condition
appears to be indepdent of applications.  I've tested Word, Excel and
Firefox, and the bug reporters have tested several others such as Google
Chrome and Thunderbird.

The 4.2 backport request is pending here:
https://gerrit.libreoffice.org/#/c/8132/

Kohei

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

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

[Michael Stahl]

 svtools/source/svhtml/parhtml.cxx  |   12 +
 sw/source/core/layout/paintfrm.cxx |  257 ++---
 2 files changed, 137 insertions(+), 132 deletions(-)

New commits:
commit 22b709e84a7b6d38cab2dd37f2f2b28e0fc9d062
Author: Michael Stahl 
Date:   Wed Feb 19 22:01:47 2014 +0100

unindent SwTabFrmPainter::PaintLines a little

Change-Id: I1602bd62bf970092ecffba579d428fadaf8574cc

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 81d7cbc..f9f2d23 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2405,7 +2405,7 @@ void SwTabFrmPainter::HandleFrame( const SwLayoutFrm& 
rLayoutFrm )
 }
 }
 
-void SwTabFrmPainter::PaintLines( OutputDevice& rDev, const SwRect& rRect ) 
const
+void SwTabFrmPainter::PaintLines(OutputDevice& rDev, const SwRect& rRect) const
 {
 // #i16816# tagged pdf support
 SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, rDev );
@@ -2496,141 +2496,141 @@ void SwTabFrmPainter::PaintLines( OutputDevice& rDev, 
const SwRect& rRect ) cons
 aRepaintRect.Pos().X() -= nRepaintRectSize;
 }
 
-if ( rRect.IsOver( aRepaintRect ) )
+if (!rRect.IsOver(aRepaintRect))
 {
-svx::frame::Style aStyles[ 7 ];
-aStyles[ 0 ] = rEntryStyle;
-FindStylesForLine( aStart, aEnd, aStyles, bHori );
+continue;
+}
 
-// subsidiary lines
-const Color* pTmpColor = 0;
-if ( 0 == aStyles[ 0 ].GetWidth() )
-{
-if ( IS_SUBS_TABLE && pGlobalShell->GetWin() )
-aStyles[ 0 ].Set( rCol, rCol, rCol, false, 1, 0, 0 );
-}
-else
-pTmpColor = pHCColor;
+svx::frame::Style aStyles[ 7 ];
+aStyles[ 0 ] = rEntryStyle;
+FindStylesForLine( aStart, aEnd, aStyles, bHori );
 
-// The line sizes stored in the line style have to be adjusted 
as well.
-// This will guarantee that lines with the same twip size will 
have the
-// same pixel size.
-for ( int i = 0; i < 7; ++i )
-{
-sal_uInt16 nPrim = aStyles[ i ].Prim();
-sal_uInt16 nDist = aStyles[ i ].Dist();
-sal_uInt16 nSecn = aStyles[ i ].Secn();
-
-if ( nPrim > 0 )
-nPrim = (sal_uInt16)( std::max( 1L, nPixelSzH * ( 
nPrim / nPixelSzH ) ) );
-if ( nDist > 0 )
-nDist = (sal_uInt16)( std::max( 1L, nPixelSzH * ( 
nDist / nPixelSzH ) ) );
-if ( nSecn > 0 )
-nSecn = (sal_uInt16)( std::max( 1L, nPixelSzH * ( 
nSecn / nPixelSzH ) ) );
-
-aStyles[ i ].Set( nPrim, nDist, nSecn );
-}
+// subsidiary lines
+const Color* pTmpColor = 0;
+if (0 == aStyles[ 0 ].GetWidth())
+{
+if (IS_SUBS_TABLE && pGlobalShell->GetWin())
+aStyles[ 0 ].Set( rCol, rCol, rCol, false, 1, 0, 0 );
+}
+else
+pTmpColor = pHCColor;
 
-// The (twip) positions will be adjusted to meet these 
requirements:
-// 1. The y coordinates are located in the middle of the pixel 
grid
-// 2. The x coordinated are located at the beginning of the 
pixel grid
-// This is done, because the horizontal lines are painted "at 
beginning",
-// whereas the vertical lines are painted "centered". By 
making the line
-// sizes a multiple of one pixel size, we can assure, that all 
lines having
-// the same twip size have the same pixel size, independent of 
their position
-// on the screen.
-Point aPaintStart = rDev.PixelToLogic( rDev.LogicToPixel( 
aStart ) );
-Point aPaintEnd = rDev.PixelToLogic( rDev.LogicToPixel( aEnd ) 
);
-
-if( pGlobalShell->GetWin() )
-{
-// The table borders do not use SwAlignRect, but all the 
other frames do.
-// Therefore we tweak the outer borders a bit to achieve 
that the outer
-// borders match the subsidiary lines of the upper:
-if ( aStart.X() == aUpper.Left() )
-aPaintStart.X() = aUpperAligned.Left();
-else if ( aStart.X() == aUpper._Right() )
-aPaintStart.X() = aUpperAligned._Right();
-if ( aStart.Y() == aUpper.Top() )
-aPaintStart.Y() = aUpperAligned.Top();
-else if ( aStart.Y() == aUpper._Bottom() )
-aPaintStart.Y() = aUpperAligned._B

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - swext/mediawiki

[Julien Nabet]

 swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1c33633ef18274bf384c74c492195519be83c050
Author: Julien Nabet 
Date:   Wed Feb 19 22:23:58 2014 +0100

Resolves: fdo#69925 Wiki Publisher Extension is not working

Regression from 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=b80d8c695e6b6ded231e67ed9a80bcd1f1250c03
"compareTo" has been replaced by "==", so we compared the equality ot the 
pointers on the objects instead of the content of the strings
To make it simple and since we compare String objects, let's simply use 
"equals" method

Change-Id: I65bc1a87751297411fdbe722d3f49bce5e291638
(cherry picked from commit 9e2d1d21f9a58e320444f6eaea2f006530bbd2cb)
Signed-off-by: Michael Stahl 

diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java 
b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
index ff9f85a..4cad2f6 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
@@ -134,7 +134,7 @@ public final class WikiEditorImpl extends WeakBase
 {
 final com.sun.star.util.URL myURL = aURL;
 //logger.log( Level.INFO, "received dispatch request for: 
"+aURL.Complete );
-if ( aURL.Protocol == protocolName )
+if ( aURL.Protocol.equals(protocolName) )
 {
 /*
 synchronized( this )
@@ -146,7 +146,7 @@ public final class WikiEditorImpl extends WeakBase
 
 try
 {
-if ( myURL.Path == "send" )
+if ( myURL.Path.equals("send") )
 {
 sendArticle();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Testing/Working on PyUNO?

[Markus Mohrhard]

Hey Keith,


On Wed, Feb 19, 2014 at 6:47 PM, Keith Curtis  wrote:

> Hi;
>
> The C/C++ groups I worked in had all testers working in a scripting
> language. Those who had the skills and interest to write in C/C++ moved to
> product code. It was easy for developers to debug problems because the test
> application allowed you to configure which tests to run, the IDE was easy
> to
> use with single-step debugging, etc. You'd need two debuggers running, but
> it worked great and was little slower than working with C++ tests.
>

So we are not really discussing about python tests in general. I'm sorry if
that was the impression. For out-of-process tests python tests are arguably
the best choice. It is however much more complicated when it comes to
in-process tests. We already use out-of-process python tests like the crash
testing or convwatch. The whole discussion was mostly where python tests
make sense in our build as in-process tests.


>
> In the situation here, I agree that unit tests should be in C++, typically
> written by the developers when they write their code. However, there can
> still be room for further testing in Python. I've seen code that would call
> random APIs with random values and via genetic algorithms would come up
> with
> good ways to stress and crash the product. It would find plenty of bugs
> that
> no unit test ever could. The test harness was very good, it only reported
> problems that were reproducible, and the app would narrow it down to the
> shortest number of steps. So perhaps it is good to figure out whether
> something is a unit test, a UNO test, or some other fancier kind of
> testing.
> If a developer doesn't want to run Python, they can just look at the stack
> trace and try to figure it out on their own similar to what happens when
> bugs are reported today. Python just makes it more reproducible.
>

So for UNO it makes sense to use python instead of our current java tests
(I still would prefer C++ as it is easier to debug but python already
allows in-process tests). However calling something through UNO or in the
UI often takes different code paths. That means if a test through the API
fails you can't just try to reproduce it in the UI and see if you can debug
it there. On the other hand looking at the API documentation and writing a
test FOR the API can be done perfectly find in python (with the exception
that is still a bit more difficult to debug).



> It also seems that people who are interested in Python today could work on
> making it easier to contribute to LibreOffice in Python. There is a small
> community of Python hackers contributing to today, mostly it seems it is
> just Xisco Fauli. You don't need to re-write the whole app in Python to
> bring in new people, as there are already plenty of places to contribute,
> especially if you consider Base ;-) I find more and more programmers who
> don't have C++ experience, meanwhile Python is one of the fastest growing
> languages.
>
>
I mostly agree. IMO we have many tasks perfectly in the scope of python
scripting where python is the best tool for the job. So it is not like the
project does not value great python developers and if there are people out
there who only know python and want to contribute we are not short of nice
and important tasks.

Regards,
Markus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - swext/mediawiki

[Julien Nabet]

 swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6dd74978f4a41f8bb79b87784d50a85880e7e9e0
Author: Julien Nabet 
Date:   Wed Feb 19 22:23:58 2014 +0100

Resolves: fdo#69925 Wiki Publisher Extension is not working

Regression from 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=b80d8c695e6b6ded231e67ed9a80bcd1f1250c03
"compareTo" has been replaced by "==", so we compared the equality ot the 
pointers on the objects instead of the content of the strings
To make it simple and since we compare String objects, let's simply use 
"equals" method

Change-Id: I65bc1a87751297411fdbe722d3f49bce5e291638
Reviewed-on: https://gerrit.libreoffice.org/8133
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java 
b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
index ff9f85a..4cad2f6 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
@@ -134,7 +134,7 @@ public final class WikiEditorImpl extends WeakBase
 {
 final com.sun.star.util.URL myURL = aURL;
 //logger.log( Level.INFO, "received dispatch request for: 
"+aURL.Complete );
-if ( aURL.Protocol == protocolName )
+if ( aURL.Protocol.equals(protocolName) )
 {
 /*
 synchronized( this )
@@ -146,7 +146,7 @@ public final class WikiEditorImpl extends WeakBase
 
 try
 {
-if ( myURL.Path == "send" )
+if ( myURL.Path.equals("send") )
 {
 sendArticle();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/CustomTarget_registry.mk

[Bjoern Michaelsen]

 postprocess/CustomTarget_registry.mk |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 76fc71a989b0059c78f4898694e7fa57ebed9248
Author: Bjoern Michaelsen 
Date:   Sun Feb 16 00:25:12 2014 +0100

add missing postprocess deps

- these sometimes break a highly parallel build

Change-Id: Ia30041d2d2ce69900db0476313a0bf2baf6da7a5

diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index 064228e..9f8d187 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -524,13 +524,16 @@ $(call gb_XcdTarget_get_target,Langpack-$(1).xcd) : \
$(call 
gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-$(1).list
 
 $(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-$(1).list : \
-   $(call gb_XcuLangpackTarget_get_target,Langpack-$(1).xcu)
+   $(call gb_XcuLangpackTarget_get_target,Langpack-$(1).xcu) \
+   | $(call gb_CustomTarget_get_workdir,postprocess/registry)/.dir
 
 $(call gb_XcdTarget_get_target,fcfg_langpack_$(1).xcd) : \
-   $(call 
gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_$(1).list
+   $(call 
gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_$(1).list \
+   | $(call gb_CustomTarget_get_workdir,postprocess/registry)/.dir
 
 $(call 
gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_$(1).list : \
-   $(call gb_Configuration_get_target,fcfg_langpack)
+   $(call gb_Configuration_get_target,fcfg_langpack) \
+   | $(call gb_CustomTarget_get_workdir,postprocess/registry)/.dir
 
 $(call gb_XcdTarget_get_target,registry_$(1).xcd) : \
$(call 
gb_CustomTarget_get_workdir,postprocess/registry)/registry_$(1).list
@@ -540,7 +543,8 @@ $(call 
gb_CustomTarget_get_workdir,postprocess/registry)/registry_$(1).list : \
$(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),\
$(foreach driver,$(postprocess_DRIVERS),$(call 
gb_Configuration_get_target,$(driver))) \
) \
-   $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),$(call 
gb_Configuration_get_target,updchk))
+   $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),$(call 
gb_Configuration_get_target,updchk)) \
+   | $(call gb_CustomTarget_get_workdir,postprocess/registry)/.dir
 
 endef
 $(foreach lang,$(gb_Configuration_LANGS),$(eval $(call 
postprocess_lang_deps,$(lang
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 svtools/source/svhtml/htmlkywd.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 1f74a3ce201bad68f160584900285e2c087ab2c0
Author: Kohei Yoshida 
Date:   Wed Feb 19 16:34:19 2014 -0500

fdo#74584: Upcase the tag name before searching.

Else HTML import or detection code would fail.

Change-Id: Id79e8eac87d8001527f068f8fd49636353dc38d5

diff --git a/svtools/source/svhtml/htmlkywd.cxx 
b/svtools/source/svhtml/htmlkywd.cxx
index c0b7915..affbc86 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.cxx
@@ -189,6 +189,7 @@ static int SAL_CALL HTMLKeyCompare( const void *pFirst, 
const void *pSecond)
 
 int GetHTMLToken( const OUString& rName )
 {
+OUString aNameUpper = rName.toAsciiUpperCase();
 if( !bSortKeyWords )
 {
 qsort( (void*) aHTMLTokenTab,
@@ -200,12 +201,12 @@ int GetHTMLToken( const OUString& rName )
 
 int nRet = 0;
 
-if( !rName.compareTo( OOO_STRING_SVTOOLS_HTML_comment, 3  ) )
+if (!aNameUpper.compareTo(OOO_STRING_SVTOOLS_HTML_comment, 3))
 return HTML_COMMENT;
 
 void* pFound;
 HTML_TokenEntry aSrch;
-aSrch.pUToken = &rName;
+aSrch.pUToken = &aNameUpper;
 aSrch.nToken = -1;
 
 pFound = bsearch( (sal_Char *) &aSrch,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bean/com connectivity/source

[Julien Nabet]

 bean/com/sun/star/comp/beans/OOoBean.java   |2 +-
 connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 488bb7ca0caf0f7f97d05e470783aec71ef13e75
Author: Julien Nabet 
Date:   Wed Feb 19 22:33:24 2014 +0100

Typo: interupted -> interrupted

Change-Id: I9b2a53318e288a8236dbd76568ae28fbbb6cfe5f

diff --git a/bean/com/sun/star/comp/beans/OOoBean.java 
b/bean/com/sun/star/comp/beans/OOoBean.java
index 7562012..49bab1b 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -1483,7 +1483,7 @@ 
xLayoutManager.showElement("private:resource/menubar/menubar");
 }
 catch ( java.lang.InterruptedException aExc )
 {
-dbgPrint("EventListener(" + aTag + ") interupted.");
+dbgPrint("EventListener(" + aTag + ") interrupted.");
 // thread can be ended by EvendListener.end();
 break;
 }
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx 
b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
index 7b04194..3bfca5a 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
@@ -245,7 +245,7 @@ extern "C" void MNS_Mozilla_UI_Thread( void *arg )
 
 //do the mozilla event loop
 MNS_XPCOM_EventLoop();
-//we are interupted
+//we are interrupted
 
 if (sServiceManager)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: swext/mediawiki

[Julien Nabet]

 swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9e2d1d21f9a58e320444f6eaea2f006530bbd2cb
Author: Julien Nabet 
Date:   Wed Feb 19 22:23:58 2014 +0100

Resolves: fdo#69925 Wiki Publisher Extension is not working

Regression from 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=b80d8c695e6b6ded231e67ed9a80bcd1f1250c03
"compareTo" has been replaced by "==", so we compared the equality ot the 
pointers on the objects instead of the content of the strings
To make it simple and since we compare String objects, let's simply use 
"equals" method

Change-Id: I65bc1a87751297411fdbe722d3f49bce5e291638

diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java 
b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
index ff9f85a..4cad2f6 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
@@ -134,7 +134,7 @@ public final class WikiEditorImpl extends WeakBase
 {
 final com.sun.star.util.URL myURL = aURL;
 //logger.log( Level.INFO, "received dispatch request for: 
"+aURL.Complete );
-if ( aURL.Protocol == protocolName )
+if ( aURL.Protocol.equals(protocolName) )
 {
 /*
 synchronized( this )
@@ -146,7 +146,7 @@ public final class WikiEditorImpl extends WeakBase
 
 try
 {
-if ( myURL.Path == "send" )
+if ( myURL.Path.equals("send") )
 {
 sendArticle();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sc/source/ui/app/transobj.cxx  |1 +
 sc/source/ui/docshell/autostyl.cxx |5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 27e4a3248d2e541bb05a2f943e85ae1b9eeb4530
Author: Caolán McNamara 
Date:   Wed Feb 19 20:35:40 2014 +

coverity#738802 Uninitialized scalar field

Change-Id: If4951e6c02b026aaad20c83d08fd4917af03e701

diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 82b5731..9f48db9 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -119,6 +119,7 @@ void ScTransferObj::PaintToDev( OutputDevice* pDev, 
ScDocument* pDoc, double nPr
 
 ScTransferObj::ScTransferObj( ScDocument* pClipDoc, const 
TransferableObjectDescriptor& rDesc ) :
 pDoc( pClipDoc ),
+nNonFiltered(0),
 aObjDesc( rDesc ),
 nDragHandleX( 0 ),
 nDragHandleY( 0 ),
commit aecb68988b9e733f8cb37cc998560c824e96af73
Author: Caolán McNamara 
Date:   Wed Feb 19 20:34:53 2014 +

coverity#738803 Uninitialized scalar field

Change-Id: Id24edb82d99d576435a8f310bfaf8521a77f97b3

diff --git a/sc/source/ui/docshell/autostyl.cxx 
b/sc/source/ui/docshell/autostyl.cxx
index 78dbf5c..5e031fa 100644
--- a/sc/source/ui/docshell/autostyl.cxx
+++ b/sc/source/ui/docshell/autostyl.cxx
@@ -79,8 +79,9 @@ struct FindNonZeroTimeout : public 
::std::unary_function
 
 }
 
-ScAutoStyleList::ScAutoStyleList(ScDocShell* pShell) :
-pDocSh( pShell )
+ScAutoStyleList::ScAutoStyleList(ScDocShell* pShell)
+: pDocSh(pShell)
+, nTimerStart(0)
 {
 aTimer.SetTimeoutHdl( LINK( this, ScAutoStyleList, TimerHdl ) );
 aInitTimer.SetTimeoutHdl( LINK( this, ScAutoStyleList, InitHdl ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svtools

[Kohei Yoshida]

 include/svtools/htmlkywd.hxx |  654 +--
 1 file changed, 327 insertions(+), 327 deletions(-)

New commits:
commit 3d481254a07fe82d11953f9825a2f8fc6eeabc0b
Author: Kohei Yoshida 
Date:   Wed Feb 19 15:27:04 2014 -0500

fdo#74584, fdo#74537: HTML tags *must* be UPPERCASE.

Else Windows clipboard handling would break for both Writer and Calc.

Change-Id: I674bb7a0c3acead13922190922882490b24c83b4

diff --git a/include/svtools/htmlkywd.hxx b/include/svtools/htmlkywd.hxx
index 63c3f70..7b22d9c 100644
--- a/include/svtools/htmlkywd.hxx
+++ b/include/svtools/htmlkywd.hxx
@@ -26,122 +26,122 @@
 "HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\""
 
 // diese werden nur eingeschaltet
-#define OOO_STRING_SVTOOLS_HTML_area "area"
-#define OOO_STRING_SVTOOLS_HTML_base "base"
+#define OOO_STRING_SVTOOLS_HTML_area "AREA"
+#define OOO_STRING_SVTOOLS_HTML_base "BASE"
 #define OOO_STRING_SVTOOLS_HTML_comment "!--"
 #define OOO_STRING_SVTOOLS_HTML_doctype "!DOCTYPE"
-#define OOO_STRING_SVTOOLS_HTML_embed "embed"
-#define OOO_STRING_SVTOOLS_HTML_horzrule "hr"
-#define OOO_STRING_SVTOOLS_HTML_image "img"
-#define OOO_STRING_SVTOOLS_HTML_input "input"
-#define OOO_STRING_SVTOOLS_HTML_linebreak "br"
-#define OOO_STRING_SVTOOLS_HTML_li "li"
-#define OOO_STRING_SVTOOLS_HTML_link "link"
-#define OOO_STRING_SVTOOLS_HTML_meta "meta"
-#define OOO_STRING_SVTOOLS_HTML_nobr "nobr"
-#define OOO_STRING_SVTOOLS_HTML_option "option"
-#define OOO_STRING_SVTOOLS_HTML_param "param"
-#define OOO_STRING_SVTOOLS_HTML_spacer "spacer"
+#define OOO_STRING_SVTOOLS_HTML_embed "EMBED"
+#define OOO_STRING_SVTOOLS_HTML_horzrule "HR"
+#define OOO_STRING_SVTOOLS_HTML_image "IMG"
+#define OOO_STRING_SVTOOLS_HTML_input "INPUT"
+#define OOO_STRING_SVTOOLS_HTML_linebreak "BR"
+#define OOO_STRING_SVTOOLS_HTML_li "LI"
+#define OOO_STRING_SVTOOLS_HTML_link "LINK"
+#define OOO_STRING_SVTOOLS_HTML_meta "META"
+#define OOO_STRING_SVTOOLS_HTML_nobr "NOBR"
+#define OOO_STRING_SVTOOLS_HTML_option "OPTION"
+#define OOO_STRING_SVTOOLS_HTML_param "PARAM"
+#define OOO_STRING_SVTOOLS_HTML_spacer "SPACER"
 
 // diese werden wieder abgeschaltet
-#define OOO_STRING_SVTOOLS_HTML_abbreviation "abbrev"
-#define OOO_STRING_SVTOOLS_HTML_acronym "acronym"
-#define OOO_STRING_SVTOOLS_HTML_address "address"
-#define OOO_STRING_SVTOOLS_HTML_anchor "a"
-#define OOO_STRING_SVTOOLS_HTML_applet "applet"
-#define OOO_STRING_SVTOOLS_HTML_author "au"
-#define OOO_STRING_SVTOOLS_HTML_banner "banner"
-#define OOO_STRING_SVTOOLS_HTML_basefont "basefont"
-#define OOO_STRING_SVTOOLS_HTML_bigprint "big"
-#define OOO_STRING_SVTOOLS_HTML_blink "blink"
-#define OOO_STRING_SVTOOLS_HTML_blockquote "blockquote"
-#define OOO_STRING_SVTOOLS_HTML_blockquote30 "bq"
-#define OOO_STRING_SVTOOLS_HTML_body "body"
-#define OOO_STRING_SVTOOLS_HTML_bold "b"
-#define OOO_STRING_SVTOOLS_HTML_caption "caption"
-#define OOO_STRING_SVTOOLS_HTML_center "center"
-#define OOO_STRING_SVTOOLS_HTML_citiation "cite"
-#define OOO_STRING_SVTOOLS_HTML_code "code"
-#define OOO_STRING_SVTOOLS_HTML_col "col"
-#define OOO_STRING_SVTOOLS_HTML_colgroup "colgroup"
-#define OOO_STRING_SVTOOLS_HTML_credit "credit"
-#define OOO_STRING_SVTOOLS_HTML_dd "dd"
-#define OOO_STRING_SVTOOLS_HTML_deflist "dl"
-#define OOO_STRING_SVTOOLS_HTML_deletedtext "del"
-#define OOO_STRING_SVTOOLS_HTML_dirlist "dir"
-#define OOO_STRING_SVTOOLS_HTML_division "div"
-#define OOO_STRING_SVTOOLS_HTML_dt "dt"
-#define OOO_STRING_SVTOOLS_HTML_emphasis "em"
-#define OOO_STRING_SVTOOLS_HTML_figure "fig"
-#define OOO_STRING_SVTOOLS_HTML_font "font"
-#define OOO_STRING_SVTOOLS_HTML_footnote "fn"
-#define OOO_STRING_SVTOOLS_HTML_form "form"
-#define OOO_STRING_SVTOOLS_HTML_frame "frame"
-#define OOO_STRING_SVTOOLS_HTML_frameset "frameset"
-#define OOO_STRING_SVTOOLS_HTML_head1 "h1"
-#define OOO_STRING_SVTOOLS_HTML_head2 "h2"
-#define OOO_STRING_SVTOOLS_HTML_head3 "h3"
-#define OOO_STRING_SVTOOLS_HTML_head4 "h4"
-#define OOO_STRING_SVTOOLS_HTML_head5 "h5"
-#define OOO_STRING_SVTOOLS_HTML_head6 "h6"
-#define OOO_STRING_SVTOOLS_HTML_head "head"
-#define OOO_STRING_SVTOOLS_HTML_html "html"
-#define OOO_STRING_SVTOOLS_HTML_iframe "iframe"
-#define OOO_STRING_SVTOOLS_HTML_insertedtext "ins"
-#define OOO_STRING_SVTOOLS_HTML_italic "i"
-#define OOO_STRING_SVTOOLS_HTML_keyboard "kbd"
-#define OOO_STRING_SVTOOLS_HTML_language "lang"
-#define OOO_STRING_SVTOOLS_HTML_listheader "lh"
-#define OOO_STRING_SVTOOLS_HTML_map "map"
-#define OOO_STRING_SVTOOLS_HTML_menulist "menu"
-#define OOO_STRING_SVTOOLS_HTML_multicol "multicol"
-#define OOO_STRING_SVTOOLS_HTML_noembed "noembed"
-#define OOO_STRING_SVTOOLS_HTML_noframe "noframe"
-#define OOO_STRING_SVTOOLS_HTML_noframes "noframes"
-#define OOO_STRING_SVTOOLS_HTML_noscript "noscript"
-#define OOO_STRING_SVTOOLS_HTML_note "note"
-#define OOO_STRING_SVTOOLS_HTML_object "object"
-#define OOO_STRING_SVTOOLS_HTML_orderlist "ol"
-#define OOO_STRING_SVTOOLS_HTML_parabreak "p"
-#

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - bb/e35be767d76d08891c4f3d3600d80e0e6805f2

[Caolán McNamara]

 bb/e35be767d76d08891c4f3d3600d80e0e6805f2 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 91828b9f6c84ef1b07234d8f20b63ec0da810f07
Author: Caolán McNamara 
Date:   Wed Feb 19 20:31:14 2014 +

Notes added by 'git notes add'

diff --git a/bb/e35be767d76d08891c4f3d3600d80e0e6805f2 
b/bb/e35be767d76d08891c4f3d3600d80e0e6805f2
new file mode 100644
index 000..d85aeb5
--- /dev/null
+++ b/bb/e35be767d76d08891c4f3d3600d80e0e6805f2
@@ -0,0 +1 @@
+merged as: db1d2af02861b49e4f53d726d59cd71c20cee9b1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Armin Le Grand]

 include/svx/sdr/contact/viewcontactofsdrole2obj.hxx |7 +
 svx/source/engine3d/scene3d.cxx |   10 ++
 svx/source/sdr/contact/viewcontactofsdrole2obj.cxx  |   76 +---
 svx/source/unodraw/unoshape.cxx |   10 ++
 4 files changed, 77 insertions(+), 26 deletions(-)

New commits:
commit db1d2af02861b49e4f53d726d59cd71c20cee9b1
Author: Armin Le Grand 
Date:   Tue Feb 18 21:18:13 2014 +

Resolves: #i123539# some optimizations for 3D chart...

geometry creation using UNO API

(cherry picked from commit bbe35be767d76d08891c4f3d3600d80e0e6805f2)

Change-Id: Ic9b6ab8fc31cfe585f7c75d85bafe4613910c57a

diff --git a/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx 
b/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx
index 87e37d0..89e51bf 100644
--- a/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx
@@ -37,6 +37,10 @@ namespace sdr
 {
 class ViewContactOfSdrOle2Obj : public ViewContactOfSdrRectObj
 {
+private:
+// #i123539# allow local buffering of chart data (if chart)
+drawinglayer::primitive2d::Primitive2DReference mxChartContent;
+
 protected:
 // Create a Object-Specific ViewObjectContact, set ViewContact and
 // ObjectContact. Always needs to return something.
@@ -62,6 +66,9 @@ namespace sdr
 // from the VOC which knows that
 drawinglayer::primitive2d::Primitive2DSequence 
createPrimitive2DSequenceWithParameters() const;
 
+// #i123539# get rid of buffered chart content (if there) on change
+virtual void ActionChanged();
+
 protected:
 // This method is responsible for creating the graphical 
visualisation data
 // ONLY based on model data, just wraps to call 
createPrimitive2DSequenceWithParameters(false)
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 8c77c79..338d0ad 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -45,6 +45,7 @@
 #include 
 #include 
 #include 
+#include 
 
 //
 
@@ -379,7 +380,14 @@ void E3dScene::NewObjectInserted(const E3dObject* p3DObj)
 void E3dScene::StructureChanged()
 {
 E3dObject::StructureChanged();
-SetRectsDirty();
+
+if(!GetModel() || !GetModel()->isLocked())
+{
+// #i123539# optimization for 3D chart object generation: do not reset
+// already calculated scene projection data every time an object gets
+// initialized
+SetRectsDirty();
+}
 
 ImpCleanup3DDepthMapper();
 }
diff --git a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx 
b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
index 9aa5d07..9be07d1 100644
--- a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
@@ -51,7 +51,8 @@ namespace sdr
 }
 
 ViewContactOfSdrOle2Obj::ViewContactOfSdrOle2Obj(SdrOle2Obj& rOle2Obj)
-:   ViewContactOfSdrRectObj(rOle2Obj)
+:   ViewContactOfSdrRectObj(rOle2Obj),
+mxChartContent()
 {
 }
 
@@ -100,30 +101,45 @@ namespace sdr
 
 if(GetOle2Obj().IsChart())
 {
-// try to get chart primitives and chart range directly from 
xChartModel
-basegfx::B2DRange aChartContentRange;
-const drawinglayer::primitive2d::Primitive2DSequence 
aChartSequence(
-ChartHelper::tryToGetChartContentAsPrimitive2DSequence(
-GetOle2Obj().getXModel(),
-aChartContentRange));
-const double fWidth(aChartContentRange.getWidth());
-const double fHeight(aChartContentRange.getHeight());
-
-if(aChartSequence.hasElements()
-&& basegfx::fTools::more(fWidth, 0.0)
-&& basegfx::fTools::more(fHeight, 0.0))
+// #i123539# allow buffering and reuse of local chart data to 
not need to rebuild it
+// on every ViewObjectContact::getPrimitive2DSequence call. 
: No tneeded for
+// aw080, there this mechanism alraedy works differently
+if(mxChartContent.is())
 {
-// create embedding transformation
-basegfx::B2DHomMatrix aEmbed(
-basegfx::tools::createTranslateB2DHomMatrix(
--aChartContentRange.getMinX(),
--aChartContentRange.getMinY()));
-
-aEmbed.scale(1.0 / fWidth, 1.0 / fHeight);
-aEmbed = aObjectMatrix * aEmbed;
-xContent = new 
drawinglayer::primitive2d::TransformPrimitive2D(
-aEmbed,
- 

Re: Testing/Working on PyUNO?

[Keith Curtis]

Hi;

The C/C++ groups I worked in had all testers working in a scripting
language. Those who had the skills and interest to write in C/C++ moved to
product code. It was easy for developers to debug problems because the test
application allowed you to configure which tests to run, the IDE was easy to
use with single-step debugging, etc. You'd need two debuggers running, but
it worked great and was little slower than working with C++ tests.

In the situation here, I agree that unit tests should be in C++, typically
written by the developers when they write their code. However, there can
still be room for further testing in Python. I've seen code that would call
random APIs with random values and via genetic algorithms would come up with
good ways to stress and crash the product. It would find plenty of bugs that
no unit test ever could. The test harness was very good, it only reported
problems that were reproducible, and the app would narrow it down to the
shortest number of steps. So perhaps it is good to figure out whether
something is a unit test, a UNO test, or some other fancier kind of testing.
If a developer doesn't want to run Python, they can just look at the stack
trace and try to figure it out on their own similar to what happens when
bugs are reported today. Python just makes it more reproducible.

It also seems that people who are interested in Python today could work on
making it easier to contribute to LibreOffice in Python. There is a small
community of Python hackers contributing to today, mostly it seems it is
just Xisco Fauli. You don't need to re-write the whole app in Python to
bring in new people, as there are already plenty of places to contribute,
especially if you consider Base ;-) I find more and more programmers who
don't have C++ experience, meanwhile Python is one of the fastest growing
languages.

Regards,

-Keith



--
View this message in context: 
http://nabble.documentfoundation.org/Re-Testing-Working-on-PyUNO-tp4097868p4097981.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Testing/Working on PyUNO?

[Bjoern Michaelsen]

On Wed, Feb 19, 2014 at 05:57:26PM +0100, Markus Mohrhard wrote:
> 1) test core functionality with implementation details but that will rely
> on implementation details and will bit rot if you don't execute them
> 2) test our stable API but then you should not try to avoid implementation
> details which means you can't test most bugs
> 
> From what I see only point 2 makes sense for python tests especially if you
> want to run them only before releases and don't make them fail the build.

Right, I want 2 as it still can help for a lot of issues. How should 1 even
work via PyUNO (which isnt exposing implementation details?).

The idea is essentially even if we 'only' cover the stable API, we can trigger
a _lot_ of code paths like that. And that can be helpful on its own.

Best,

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

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

[Miklos Vajna]

 writerfilter/source/dmapper/DomainMapper.cxx   |   14 +-
 writerfilter/source/doctok/resources.xmi   |  124 -
 writerfilter/source/ooxml/model.xml|8 -
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 
 4 files changed, 12 insertions(+), 136 deletions(-)

New commits:
commit 2237604b6b1d08439ac37f096a787c449a046b5f
Author: Miklos Vajna 
Date:   Wed Feb 19 18:10:55 2014 +0100

writerfilter: convert PF{OverflowPunct,TopLinePunct,AutoSpaceDE,AutoSpaceDN}

Change-Id: Ibe0d43c35afa12f2bad33645ec4f849b5fb8a811

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 5f692a0..3ac0ac3 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1224,15 +1224,15 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext, SprmType
 rContext->Insert( PROP_PARA_ORPHANS, aVal );
 }
 break;  // sprmPFWidowControl
-case NS_sprm::LN_PFOverflowPunct: ;  // sprmPFOverflowPunct - hanging 
punctuation
+case NS_ooxml::LN_CT_PPrBase_overflowPunct:
 rContext->Insert(PROP_PARA_IS_HANGING_PUNCTUATION, uno::makeAny( 
nIntValue ? false : true ));
 break;
-case NS_sprm::LN_PFTopLinePunct:
-break;  // sprmPFTopLinePunct
-case NS_sprm::LN_PFAutoSpaceDE:
-break;  // sprmPFAutoSpaceDE
-case NS_sprm::LN_PFAutoSpaceDN:
-break;  // sprmPFAutoSpaceDN
+case NS_ooxml::LN_CT_PPrBase_topLinePunct:
+break;
+case NS_ooxml::LN_CT_PPrBase_autoSpaceDE:
+break;
+case NS_ooxml::LN_CT_PPrBase_autoSpaceDN:
+break;
 case NS_sprm::LN_PWAlignFont:
 {
 sal_Int16 nAlignment = 0;
diff --git a/writerfilter/source/doctok/resources.xmi 
b/writerfilter/source/doctok/resources.xmi
index f1a59ca..1905178 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -286,130 +286,6 @@
   
 
 
-
-
-  
-
-  
-  
-
-  0x2435
-  
-
-  
-
-  
-  
-
-  
rtf:sprmPFOverflowPunct
-  
-
-  
-
-  
-  
-
-  paragraph
-  
-
-  
-
-  
-
-
-
-
-  
-
-  
-  
-
-  0x2436
-  
-
-  
-
-  
-  
-
-  
rtf:sprmPFTopLinePunct
-  
-
-  
-
-  
-  
-
-  paragraph
-  
-
-  
-
-  
-
-
-
-
-  
-
-  
-  
-
-  0x2437
-  
-
-  
-
-  
-  
-
-  
rtf:sprmPFAutoSpaceDE
-  
-
-  
-
-  
-  
-
-  paragraph
-  
-
-  
-
-  
-
-
-
-
-  
-
-  
-  
-
-  0x2438
-  
-
-  
-
-  
-  
-
-  
rtf:sprmPFAutoSpaceDN
-  
-
-  
-
-  
-  
-
-  paragraph
-  
-
-  
-
-  
-
-
 
 
   
diff --git a/writerfilter/source/ooxml/model.xml 
b/writerfilter/source/ooxml/model.xml
index 59fadd4..89c6bbc 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -22351,10 +22351,10 @@
   
   
   
-  
-  
-  
-  
+  
+  
+  
+  
   
   
   
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index d250c4c..0912bee 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3864,7 +3864,7 @@ int RTFDocumentImpl::dispatchToggle(RTFKeyword nKeyword, 
bool bParam, int nParam
 switch (nKeyword)
 {
 case RTF_ASPALPHA:
-m_aStates.top().aParagraphSprms.set(NS_sprm::LN_PFAutoSpaceDE, 
pBoolValue);
+
m_aStates.top().aParagraphSprms.set(NS_ooxml::LN_CT_PPrBase_autoSpaceDE, 
pBoolValue);
 break;
 case RTF_DELETED:
 case RTF_REVISED:
___

Re: Testing/Working on PyUNO?

[Bjoern Michaelsen]

On Wed, Feb 19, 2014 at 11:37:00AM -0500, Kohei Yoshida wrote:
> Oh, so we volunteer to carry the burden of testing all 3rd party
> libraries that we ship with?  A worthy goal indeed but is that really
> practical?

Practical or not, this is daily reality for me. ;)

Best,

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

Re: Testing/Working on PyUNO?

[Markus Mohrhard]

On Wed, Feb 19, 2014 at 5:55 PM, Bjoern Michaelsen <
bjoern.michael...@canonical.com> wrote:

> On Wed, Feb 19, 2014 at 11:37:00AM -0500, Kohei Yoshida wrote:
> > On Wed, 2014-02-19 at 17:27 +0100, Bjoern Michaelsen wrote:
> > > On Wed, Feb 19, 2014 at 11:19:53AM -0500, Kohei Yoshida wrote:
> > > > Yet, it's the core developers who will likely be called in to answer
> > > > "hey my build failed with this python test, tell me what's wrong!!!"
> > >
> > > In subsequentcheck? If that should indeed be the case even then, we
> can make a
> > > separate "make pythoncheck" target.
> > >
> > > > Now you are the one being academic here.  Stick to the topic please,
> > > > which is whether or not Python tests should be used to test core
> > > > functionality.  Nobody is talking about boost here.
> > >
> > > I am talking about testing the _product_ here.
> >
> > And I'm talking about what tools should be used to test what part of the
> > product.  I think you are at one level above us.  No wonder we are
> > talking past each other.
>
> Yes, there is a difference between:
>
>  https://en.wikipedia.org/wiki/Integration_testing
>  https://en.wikipedia.org/wiki/Unit_testing
>
> and both have their use, but are very different beasts. I think, if we
> dont mix
> them up, we can have both, handle them differently and all be happy.
>
>
All our higher level tests are already integration tests. Only some low
level classes have real unit tests. There is a third option that is more in
the line of python and java tests and that are API tests. So making sure
that the functionality that we provide through the API is not broken. That
is fundamentally different from testing the core.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Testing/Working on PyUNO?

[Bjoern Michaelsen]

Hi Kevin,

On Wed, Feb 19, 2014 at 11:42:03AM -0500, Kevin Hunter Kesling wrote:
> I'm sorry to have ignited a discussion for which I wasn't looking.

I think it was just a misunderstanding and tensions are still rising a bit high
because of the recent release. Things are clearing up now. So, no worries, we
should be good. ;)

Best,

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

Re: Testing/Working on PyUNO?

[Markus Mohrhard]

On Wed, Feb 19, 2014 at 5:50 PM, Bjoern Michaelsen <
bjoern.michael...@canonical.com> wrote:

> On Wed, Feb 19, 2014 at 05:20:19PM +0100, Markus Mohrhard wrote:
> > I doubt that. Look at the situation with the java tests where I'm the
> only
> > one who rewrites failing tests in c++. Most people just disable the test
> > that is failing and go on.
>
> I just linked a bug that showed more 50 crash reports per day in the
> released
> product and was almost impossible to reproduce but was somewhat
> reproducable
> with the java tests. As for rewriting the Java tests -- the unoapi
> framework
> made that extra painful, though it should be somewhat saner for the complex
> tests. So given the choice, the Python tests should not imitate the unoapi
> test, to stay easily rewritable.
>

> Also not that as I said in the other mail, I wouldnt want those tests to
> be run
> like unittests (on every build), but rather on each tagged release an
> prerelease build (with more runs optional) and we should aim to get them
> in a
> reasonable state by release (not ASAP/next day as for unittests) and no
> they
> are not blockers for a release in any way.
>
>
So what you say is that you want to have python tests that test core
functionality but don't want to run them regularly. Somehow that can't
work. You have the two things you can do:

1) test core functionality with implementation details but that will rely
on implementation details and will bit rot if you don't execute them
2) test our stable API but then you should not try to avoid implementation
details which means you can't test most bugs

>From what I see only point 2 makes sense for python tests especially if you
want to run them only before releases and don't make them fail the build.

Regards,
Markus
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Testing/Working on PyUNO?

[Bjoern Michaelsen]

On Wed, Feb 19, 2014 at 11:37:00AM -0500, Kohei Yoshida wrote:
> On Wed, 2014-02-19 at 17:27 +0100, Bjoern Michaelsen wrote:
> > On Wed, Feb 19, 2014 at 11:19:53AM -0500, Kohei Yoshida wrote:
> > > Yet, it's the core developers who will likely be called in to answer
> > > "hey my build failed with this python test, tell me what's wrong!!!"
> > 
> > In subsequentcheck? If that should indeed be the case even then, we can 
> > make a
> > separate "make pythoncheck" target.
> > 
> > > Now you are the one being academic here.  Stick to the topic please,
> > > which is whether or not Python tests should be used to test core
> > > functionality.  Nobody is talking about boost here.
> > 
> > I am talking about testing the _product_ here.
> 
> And I'm talking about what tools should be used to test what part of the
> product.  I think you are at one level above us.  No wonder we are
> talking past each other.

Yes, there is a difference between:

 https://en.wikipedia.org/wiki/Integration_testing
 https://en.wikipedia.org/wiki/Unit_testing

and both have their use, but are very different beasts. I think, if we dont mix
them up, we can have both, handle them differently and all be happy.

Best,

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

Re: Testing/Working on PyUNO?

[Kohei Yoshida]

On Wed, 2014-02-19 at 10:45 -0600, James Michael DuPont wrote:
> I have been doing a ton of work with pyuno at work and am interested
> in anything to improve the code quality there.

So are we.


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

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

[Caolán McNamara]

 sd/inc/sdmod.hxx |1 -
 sd/source/ui/dlg/dlgass.cxx  |2 --
 sd/source/ui/slideshow/slideshowimpl.cxx |1 +
 sd/source/ui/slideshow/slideshowimpl.hxx |1 -
 sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx |2 --
 slideshow/source/engine/animationnodes/basecontainernode.cxx |1 +
 slideshow/source/engine/shapes/drawinglayeranimation.cxx |3 +++
 7 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 419428f384add9b2429b6f811296ad16e2c4c2a4
Author: Caolán McNamara 
Date:   Wed Feb 19 16:45:12 2014 +

coverity#738820 bAutoSave is unused

Change-Id: I98fca5611e47a4368e4947d29e703e661bfeebaa

diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 518f086..477093c 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -125,7 +125,6 @@ protected:
 SvxSearchItem*  pSearchItem;
 SvNumberFormatter*  pNumberFormatter;
 SvStorageRefxOptionStorage;
-sal_BoolbAutoSave;
 sal_BoolbWaterCan;
 SfxErrorHandler*mpErrorHdl;
 /** This device is used for printer independent layout.  It is virtual
commit b64e2d2a3020e39f29225ebf3be44a8a7fcf6976
Author: Caolán McNamara 
Date:   Wed Feb 19 16:44:22 2014 +

coverity#738822 mnTemplate is unused

Change-Id: Ic9c4a520a5a3a849a16f68e033bae9ba83088f6e

diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index c47da15..a6f6674 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -230,8 +230,6 @@ public:
 sal_uInt16 mnShowPage;
 sal_Bool mbDocPreview;
 
-sal_uLong mnTemplate;
-
 OUString maPageListFile;
 
 void UpdatePreview( sal_Bool bDocPreview );
commit d9568be3afbea59b366d4cc9b9cbf9aabfa118f9
Author: Caolán McNamara 
Date:   Wed Feb 19 16:43:09 2014 +

coverity#738826 Uninitialized scalar field

Change-Id: Ib76b31ffb4c9708dc5f5d219c7a861a32f8851ff

diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx 
b/sd/source/ui/slideshow/slideshowimpl.cxx
index a047e43..54c4c02 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -521,6 +521,7 @@ SlideshowImpl::SlideshowImpl( const Reference< 
XPresentation2 >& xPresentation,
 , mbRehearseTimings(false)
 , mbDesignMode(false)
 , mbIsPaused(false)
+, mbWasPaused(false)
 , mbInputFreeze(false)
 , mbActive(sal_False)
 , maPresSettings( pDoc->getPresentationSettings() )
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx 
b/sd/source/ui/slideshow/slideshowimpl.hxx
index 1b3f5d5..d4eeabb 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -369,7 +369,6 @@ private:
 boolmbSlideBorderVisible;
 boolmbSetOnlineSpelling;
 boolmbDisposed;
-boolmbMouseIsDrawing;
 boolmbAutoSaveWasOn;
 boolmbRehearseTimings;
 boolmbDesignMode;
commit 4db1cdd41cc4ed996c51e382313325e0db531a75
Author: Caolán McNamara 
Date:   Wed Feb 19 16:34:36 2014 +

coverity#738827 mbIsDeselectionPending unused

Change-Id: Icfe7a8f49853ec7250de1c4c578038787eb8f241

diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx 
b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
index 0f6c119..e09f7d1 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
@@ -135,8 +135,6 @@ private:
 */
 bool mbProcessingMouseButtonDown;
 
-bool mbIsDeselectionPending;
-
 /** Remember the slide where the shift key was pressed and started a
 multiselection via keyboard.
 */
commit d5c30421ca603e9f0acc75ebef0c6fb7fc9ec1de
Author: Caolán McNamara 
Date:   Wed Feb 19 16:26:30 2014 +

coverity#738842 Uninitialized scalar field

Change-Id: Ic362a2e18452920f1474880fc1c2aac8cc8f56b0

diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx 
b/slideshow/source/engine/animationnodes/basecontainernode.cxx
index b2896aa..fc0a889 100644
--- a/slideshow/source/engine/animationnodes/basecontainernode.cxx
+++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx
@@ -44,6 +44,7 @@ BaseContainerNode::BaseContainerNode(
 : BaseNode( xNode, rParent, rContext ),
   maChildren(),
   mnFinishedChildren(0),
+  mnLeftIterations(0),
   mbDurationIndefinite( isIndefiniteTiming( xNode->getEnd() ) &&
 isIndefiniteTiming( xNode->getDuration() ) )
 {
commit aea2c1d59ed38f071ba0965dd3ffe767360cb428
Author: Caolán McNamara 
Date:   Wed Feb 19 16:25:16 2014 +

coverity#738843 Uninitialized scalar field

Change-Id: I3323ceab5eacc02123384dc6bf24a7d5656

Re: Testing/Working on PyUNO?

[Kohei Yoshida]

On Wed, 2014-02-19 at 11:42 -0500, Kevin Hunter Kesling wrote:
> I'm sorry to have ignited a discussion for which I wasn't looking.  I 
> clearly don't have the authority to weigh in given my (lack of) 
> meritocratic wealth in the LibO community, so let me keep this simple: 
> I'm truly just trying to find an agreeable avenue for hacking on LibO 
> given my use cases and time.

Hi Kevin,

Just to be clear, I do see PyUNO as a very important part of LibreOffice
as the product, which can potentially be a major selling point over MS
Office which still uses Visual Basic as the main macro language.  And I
do see that it's a shame that we don't have enough documentation
coverage on PyUNO, and I'm all for increasing the stability of PyUNO.

I was just trying to point out some of the mis-understandings
surrounding the test framework and some practical view points from those
of us who are in the front line.   But then the discussion has blown out
of proportion and we are now basically discussing the origin of the
universe...

So, please don't feel bad about this.

Hopefully what Stephan has proposed is a good starting point for you?
There are places for Python tests, which nobody is disputing.

Kohei

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

Re: Testing/Working on PyUNO?

[Bjoern Michaelsen]

On Wed, Feb 19, 2014 at 05:20:19PM +0100, Markus Mohrhard wrote:
> I doubt that. Look at the situation with the java tests where I'm the only
> one who rewrites failing tests in c++. Most people just disable the test
> that is failing and go on.

I just linked a bug that showed more 50 crash reports per day in the released
product and was almost impossible to reproduce but was somewhat reproducable
with the java tests. As for rewriting the Java tests -- the unoapi framework
made that extra painful, though it should be somewhat saner for the complex
tests. So given the choice, the Python tests should not imitate the unoapi
test, to stay easily rewritable.

Also not that as I said in the other mail, I wouldnt want those tests to be run
like unittests (on every build), but rather on each tagged release an
prerelease build (with more runs optional) and we should aim to get them in a
reasonable state by release (not ASAP/next day as for unittests) and no they
are not blockers for a release in any way.

Best,

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

Re: Testing/Working on PyUNO?

[James Michael DuPont]

I have been doing a ton of work with pyuno at work and am interested in
anything to improve the code quality there.
mike


On Wed, Feb 19, 2014 at 5:02 AM, Stephan Bergmann wrote:

> [putting the dev list on CC, quoting the original mail in full below for
> reference]
>
> Hi Kevin,
>
> First of all: great that you want to improve the PyUNO situation!  This is
> a part of the code that could indeed benefit from lots of love.
>
> Regarding the Python tests, I see both sides' points:
>
> On the one hand, a test in Python indeed does not only serve as a test for
> the immediate subject of the test, but also---somewhat indirectly---as a
> test of the PyUNO infrastructure and as part of a corpus of PyUNO example
> code.  This is not much different from how our well-hated so-called
> "unoapi" and "complex" tests test URP (and Java) interaction as a side
> effect (though they're so ugly that nobody in their right mind would claim
> that they are valuable additions to any corpus of example code).
>
> On the other hand, a test is intended to fail (as soon as you introduce an
> error), and should make it easy for the developer to find the underlying
> error.  For that, any extra layers between the test code and the code under
> test are detrimental, in that they make it harder to debug the problem and
> introduce the likelihood that a reported error is not actually in the code
> under test but rather somewhere else in the infrastructure (which remains
> an error that needs to be fixed after all, but less likely by the person
> who changed the code under test).
>
> So, what can we do here?  How about an additional code module dedicated to
> subsequentchecks written in Python, which, while serving the useful purpose
> of testing specific application functionality (and in which role they may
> deliberately duplicate existing "native" tests), are meant more as a means
> to improve the PyUNO situation.
>
> The idea would be that Kevin (and others) would fill this with PyUNO
> coding scenarios that cross their mind, discover errors in the PyUNO
> infrastructure, ideally distill tests for those specific errors out of the
> more general tests (that could then even go into more specific code modules
> like pyuno or testtools), and eventually prune test snippets again that are
> no longer useful.
>
> What I would like to avoid though is a sort of code dump, filled with
> random one-off stuff of little value to anybody.  We have <
> https://gerrit.libreoffice.org/#/admin/projects/sdk-examples> already,
> and it lies virtually dormant.
>
> How does that sound?
>
> Stephan
>
>
> On 02/17/2014 08:53 PM, Kevin Hunter Kesling wrote:
>
>> Hi Stephan,
>>
>> Markus (moggi) suggested over IRC that I talk to you about how to test
>> PyUNO interactions with Calc.  The long-winded email below is just
>> background for this question: I claim the LibO/Python bindings are weak
>> and poorly tested.  As my work often presents opportunities that could
>> be brilliantly addressed by easier Python scripting of LibO, I'd like to
>> improve the Python bindings situation.  How best can I accomplish this?
>>
>> I recently submitted a patch to gerrit that adds a test nominally for a
>> recently closed bug:
>>
>>  https://gerrit.libreoffice.org/#/c/8078/
>>
>> This test is a functional test of a specific Calc interaction (inserting
>> cells).  As noted in the commit message, the bug was already quashed,
>> and Kohei said in the IRC conversation[1] that the offending library
>> (mdds) already has a test for it's role in the related fdo bug. However,
>> that still says to me that the actual part that an end-user cares about
>> -- in this case the inserting of cells -- is not directly tested.
>>
>> Through interaction with Kohei and Markus, it's clear that writing the
>> tests for the internal workings of a C++ project in Python is not
>> acceptable (not the right "tool for the job"), and I can see the
>> perspective that not one, but two core maintainers have.
>>
>> However, this leads me to the larger observation (the one for which I
>> originally decided to write the test in Python over C++) is that I see
>> hardly any tests of LibO's Python bindings of Calc (sc/).  Ideally, I'd
>> like to be able to do more Python scripting of LibO, and the quality of
>> the bindings is what holds me back.  This snippet from the attached
>> larger IRC conversation may help elucidate where I'm coming from:
>>
>>  (01:57:35 PM) kohei: and I'm generally not in favor of python
>> unit tests. it's not very useful for the maintainers to
>> debug failures.
>>  (01:58:48 PM) frothnicator: kohei: okay, I hear that I don't
>> get it.  I'm trying to.  The only way I know to test and
>> learn something is to use it.  My main interaction would be
>> through UNO, unless I learn of a better way.  Thus, when I
>> try to introspect an item through Python's REPL, and get
>> back an exception for merely calling repr(som

Re: Testing/Working on PyUNO?

[Kohei Yoshida]

On Wed, 2014-02-19 at 17:27 +0100, Bjoern Michaelsen wrote:
> On Wed, Feb 19, 2014 at 11:19:53AM -0500, Kohei Yoshida wrote:
> > Yet, it's the core developers who will likely be called in to answer
> > "hey my build failed with this python test, tell me what's wrong!!!"
> 
> In subsequentcheck? If that should indeed be the case even then, we can make a
> separate "make pythoncheck" target.
> 
> > Now you are the one being academic here.  Stick to the topic please,
> > which is whether or not Python tests should be used to test core
> > functionality.  Nobody is talking about boost here.
> 
> I am talking about testing the _product_ here.

And I'm talking about what tools should be used to test what part of the
product.  I think you are at one level above us.  No wonder we are
talking past each other.

> > But to answer that question, if we discover a bug in boost, that should
> > be fixed and tested in the boost project. Not us.
> 
> A bug in boost is a bug in LibreOffice. At least on Windows, but for TDF 
> builds
> also elsewhere. And a test that finds a bug is still a good test, even if it
> wasnt written for that.

Oh, so we volunteer to carry the burden of testing all 3rd party
libraries that we ship with?  A worthy goal indeed but is that really
practical?

Kohei

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

Re: Testing/Working on PyUNO?

[Bjoern Michaelsen]

On Wed, Feb 19, 2014 at 11:19:53AM -0500, Kohei Yoshida wrote:
> Yet, it's the core developers who will likely be called in to answer
> "hey my build failed with this python test, tell me what's wrong!!!"

In subsequentcheck? If that should indeed be the case even then, we can make a
separate "make pythoncheck" target.

> Now you are the one being academic here.  Stick to the topic please,
> which is whether or not Python tests should be used to test core
> functionality.  Nobody is talking about boost here.

I am talking about testing the _product_ here.

> But to answer that question, if we discover a bug in boost, that should
> be fixed and tested in the boost project. Not us.

A bug in boost is a bug in LibreOffice. At least on Windows, but for TDF builds
also elsewhere. And a test that finds a bug is still a good test, even if it
wasnt written for that.

Best,

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

Re: Testing/Working on PyUNO?

[Markus Mohrhard]

On Wed, Feb 19, 2014 at 4:51 PM, Bjoern Michaelsen <
bjoern.michael...@canonical.com> wrote:

> Hi,
>
> On Wed, Feb 19, 2014 at 09:29:36AM -0500, Kohei Yoshida wrote:
> > Telling core developers who diligently maintain C++ tests to maintain
> Python
> > tests just because someone likes to write them (but not maintain them) is
> > equally silly.
>
> Nobody told core developers to do so.
>
> > And you are asking the wrong question.  It's not about C++ tests vs
> Python
> > tests; it's about what tests are appropriate for Python, and what tests
> are
> > better to be written in C++.
>
> No. The question is: If a volunteer shows up and says "I will write Python
> test, but (for whatever reason) no C++ tests.", we will not tell them to
> not do
> that. That core application maintainers would prefer C++ tests is
> understood --
> but its entirely academic in this scenario.
>

Well I won't accept tests for some bugs in python and this is a valid
decision in my opinion. Sure if you want to accept and maintain python
tests for parts that you maintain, which means to debug the test when the
test fails, you are free to accept them. I'm not in favor of just accepting
whatever someone wants to do, there must be a benefit to it and I don't see
one for example in python tests testing calc core data structures.


>
> > I agree, except for the "that remains to be seen" part.  It's been seen,
> > and it's not helpful. ;-)
>
> Well, how so? Reports on failures are always helpful. What is needed is
> that
> the bug is reported generally in the direction of those that are
> interested in
> fixing the root cause (root cause in the bridge -> UNO guys were the bugs
> should go first, otherwise app guys). But that is a communication issue
> and has
> little to do with the tests themselves.
>

No. A failure is only helpful if it is an issue. Look at the java tests
that randomly fail because a sleep is too short on your machine or rely on
implementation details. A test and a failure is only helpful if it helps to
fix and prevent issues. A test that just adds noise is only encouraging
people to just disable tests and ignore the results.


>
> > And the investigation is hard and time-consuming, it's very discouraging
> > for the core developers who are unfortunate enough to deal with
> > failures.
>
> Its still better than a bug without a reproduction scenario. So consider a
> failed Python test a mere "bug with a good reproduction scenario" for now.
>
> > And this is non-sense.  Re-writing a test is very laborous and
> > un-exciting process, and nobody wants to either 1) write tests that will
> > be re-written completely when they fail, and 2) not many people want to
> > re-write existing tests.  And who would be re-writing tests?  Those who
> > have written the original Python tests, or those who maintain the code
> > that triggers failure?
>
> I would say the UNO bridge guys will have a look at that. Its a good way to
> find out if its really a bridge or a core issue. If we have a few bugs
> investigated like that we will see how much of that is core and how much
> is an
> bridge issue. If 90% of the bugs originate in the UNO bridge, the rewrites
> should mainly come from there. If its the other way around, well then other
> devs should contribute too.
>

I doubt that. Look at the situation with the java tests where I'm the only
one who rewrites failing tests in c++. Most people just disable the test
that is failing and go on. Tests are write once debug often so spending
some more time to write good tests and in the end save much more time when
the test fails is my preferred way. I won't tell other people what they
should do or prefer in their code but I think in the end the decision is
done by the people doing the work in the code.


> > Since you said that it's non-sense to ask Python
> > test writers to write tests in C++, I would assume it's the latter.
>
> You have to look at the reality of the market: These days, there are much
> fewer
> reasons to be interested in becoming or even starting as a C++ hacker than
> 10
> years ago for a student or newcomer. Its a skill available in much less
> abundance. OTOH, if people see how easy it is to 'translate' Python to C++
> --
> they might get a hang for it. Do assume everyone to have the same
> interests and
> perks as you -- we have people translating source code comments, we have
> people
> doing coverity fixes, we have people tweaking the build system, there is a
> lot
> of variance in the interest. If someone has something to offer, we should
> take
> advantage of that.
>

I don't agree here. We should not take something just to take it. It should
make sense and move the project forward. If python tests move the project
forward depends on many details. Testing the python bridge of course
requires python tests but that does not mean that every test makes sense in
python.


> > Aimlessly increasing the test count while most of them are already
> > covered in the core tests are not

Re: Testing/Working on PyUNO?

[Kohei Yoshida]

On Wed, 2014-02-19 at 16:51 +0100, Bjoern Michaelsen wrote:
> Hi,
> 
> On Wed, Feb 19, 2014 at 09:29:36AM -0500, Kohei Yoshida wrote:
> > Telling core developers who diligently maintain C++ tests to maintain Python
> > tests just because someone likes to write them (but not maintain them) is
> > equally silly. 
> 
> Nobody told core developers to do so.

Yet, it's the core developers who will likely be called in to answer
"hey my build failed with this python test, tell me what's wrong!!!"

> > And you are asking the wrong question.  It's not about C++ tests vs Python
> > tests; it's about what tests are appropriate for Python, and what tests are
> > better to be written in C++.
> 
> No. The question is: If a volunteer shows up and says "I will write Python
> test, but (for whatever reason) no C++ tests.", we will not tell them to not 
> do
> that. That core application maintainers would prefer C++ tests is understood 
> --
> but its entirely academic in this scenario.

Not academic at all. This is from practical point of view in case you
fail to see that.

I keep repeating myself, and will repeat again.

1) tests are designed to ease the maintainers where to look in case of
failure.  The easier the process is the better. C++ tests provide that.
Python tests don't, *for core functionality bugs*.

2) if a volunteer shows up, we have the duty to tell him/her whether
something is of use, and in case it's not, steer him or her in the right
direction.  But you are saying that if a volunteer shows up, wants to do
something that would not just be much use but something we don't want,
we have a duty be clear on that.

> 
> > I agree, except for the "that remains to be seen" part.  It's been seen,
> > and it's not helpful. ;-)
> 
> Well, how so? Reports on failures are always helpful. What is needed is that
> the bug is reported generally in the direction of those that are interested in
> fixing the root cause (root cause in the bridge -> UNO guys were the bugs
> should go first, otherwise app guys).

In reality it's not clear cut, and we really don't have this layer of
expertise anymore.  What typically happens is that if the test indicates
a failure in Calc, Calc devs get called in no matter where the problem
may be.  And this is not academic, but speaking from my experience.

>  But that is a communication issue and has
> little to do with the tests themselves.

It have a lot to do with how the tests should be written, and what those
tests should test.

> 
> > And the investigation is hard and time-consuming, it's very discouraging
> > for the core developers who are unfortunate enough to deal with
> > failures. 
> 
> Its still better than a bug without a reproduction scenario. So consider a
> failed Python test a mere "bug with a good reproduction scenario" for now.

But that's not what we are talking about here.  Kevin insists to write
Python test to test core functionality, which is already covered in core
test.

> 
> > And this is non-sense.  Re-writing a test is very laborous and
> > un-exciting process, and nobody wants to either 1) write tests that will
> > be re-written completely when they fail, and 2) not many people want to
> > re-write existing tests.  And who would be re-writing tests?  Those who
> > have written the original Python tests, or those who maintain the code
> > that triggers failure? 
> 
> I would say the UNO bridge guys will have a look at that. 

And who would be the UNO bridge guys?  I need to keep those names in
mind.

> Its a good way to
> find out if its really a bridge or a core issue.

And that would require at least some investigations in the core.

>  If we have a few bugs
> investigated like that we will see how much of that is core and how much is an
> bridge issue. If 90% of the bugs originate in the UNO bridge, the rewrites
> should mainly come from there. If its the other way around, well then other
> devs should contribute too.
> 
> > Since you said that it's non-sense to ask Python
> > test writers to write tests in C++, I would assume it's the latter.
> 
> You have to look at the reality of the market: These days, there are much 
> fewer
> reasons to be interested in becoming or even starting as a C++ hacker than 10
> years ago for a student or newcomer.

And you need to realize the reality that this is a C++ project. Not a
python project.  The core is written in C++, not Python.  If all you are
interested in is attract new comers, start a new office project written
in Python all the way.

>  Its a skill available in much less
> abundance.

Fine. Let's re-write LibreOffice in Python!  Or maybe we should try PHP!

>  OTOH, if people see how easy it is to 'translate' Python to C++ --
> they might get a hang for it. Do assume everyone to have the same interests 
> and
> perks as you

I somehow doubt that.  If that's the case, we wouldn't be having this
back and forth discussion.  I'm interested in writing tests that are
efficient, to the point, reproduce bugs that they ar

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

[Stephan Bergmann]

 sc/source/ui/view/gridwin.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e12a387dc7ea86574a82cdb3325c253bcd28138e
Author: Stephan Bergmann 
Date:   Wed Feb 19 17:11:10 2014 +0100

loplugin:literaltoboolconversion

Change-Id: I22f209958c130ec4934480ab2c3570dd208b0cc7

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 89931cd..e980235 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -4465,7 +4465,7 @@ sal_Int8 ScGridWindow::ExecuteDrop( const 
ExecuteDropEvent& rEvt )
 if ( nFormatId )
 {
 pScMod->SetInExecuteDrop( true );   // #i28468# prevent error messages 
from PasteDataFormat
-bPasteIsDrop = sal_True;
+bPasteIsDrop = true;
 bDone = pViewData->GetView()->PasteDataFormat(
 nFormatId, rEvt.maDropEvent.Transferable, nPosX, nPosY, 
&aLogicPos, bIsLink );
 bPasteIsDrop = false;
@@ -4541,7 +4541,7 @@ void ScGridWindow::PasteSelection( const Point& rPosPixel 
)
 sal_uLong nFormatId = lcl_GetDropFormatId( xTransferable, true );
 if ( nFormatId )
 {
-bPasteIsDrop = sal_True;
+bPasteIsDrop = true;
 pViewData->GetView()->PasteDataFormat( nFormatId, 
xTransferable, nPosX, nPosY, &aLogicPos );
 bPasteIsDrop = false;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - svx/inc svx/source

[Armin Le Grand]

 svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx  |7 +
 svx/source/engine3d/scene3d.cxx  |   10 ++
 svx/source/sdr/contact/viewcontactofsdrole2obj.cxx   |   76 +--
 svx/source/sdr/primitive2d/sdrdecompositiontools.cxx |5 +
 svx/source/unodraw/unoshape.cxx  |   10 ++
 5 files changed, 81 insertions(+), 27 deletions(-)

New commits:
commit 1e403aa7bbfe0353db3d8f02dba5d29ba5876f4d
Author: Armin Le Grand 
Date:   Tue Feb 18 22:09:25 2014 +

i121494 Corrected text decomposition when no text distances for text frame 
are given

diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx 
b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
index 2a029f1..0ba9d8e 100644
--- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
+++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
@@ -257,8 +257,11 @@ namespace drawinglayer
 aTextAnchorRange.expand(aBottomRight);
 
 // now create a transformation from this basic range 
(aTextAnchorRange)
+// #121494# if we have no scale use at least 1.0 to have a 
carrier e.g. for
+// mirror values, else these will get lost
 aAnchorTransform = 
basegfx::tools::createScaleTranslateB2DHomMatrix(
-aTextAnchorRange.getWidth(), aTextAnchorRange.getHeight(),
+basegfx::fTools::equalZero(aTextAnchorRange.getWidth()) ? 
1.0 : aTextAnchorRange.getWidth(),
+basegfx::fTools::equalZero(aTextAnchorRange.getHeight()) ? 
1.0 : aTextAnchorRange.getHeight(),
 aTextAnchorRange.getMinX(), aTextAnchorRange.getMinY());
 
 // apply mirroring
commit bbe35be767d76d08891c4f3d3600d80e0e6805f2
Author: Armin Le Grand 
Date:   Tue Feb 18 21:18:13 2014 +

i123539 some optimizations for 3D chart geometry creation using UNO API

diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx 
b/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx
index c6e5650..479f4e6 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx
@@ -41,6 +41,10 @@ namespace sdr
 {
 class ViewContactOfSdrOle2Obj : public ViewContactOfSdrRectObj
 {
+private:
+// #123539# allow local buffering of chart data (if chart)
+drawinglayer::primitive2d::Primitive2DReference mxChartContent;
+
 protected:
 // Create a Object-Specific ViewObjectContact, set ViewContact and
 // ObjectContact. Always needs to return something.
@@ -66,6 +70,9 @@ namespace sdr
 // from the VOC which knows that
 drawinglayer::primitive2d::Primitive2DSequence 
createPrimitive2DSequenceWithParameters(bool bHighContrast) const;
 
+// #123539# get rid of buffered chart content (if there) on change
+virtual void ActionChanged();
+
 protected:
 // This method is responsible for creating the graphical 
visualisation data
 // ONLY based on model data, just wraps to call 
createPrimitive2DSequenceWithParameters(false)
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 446b407..afa492d 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -53,6 +53,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define ITEMVALUE(ItemSet,Id,Cast)  ((const Cast&)(ItemSet).Get(Id)).GetValue()
 
@@ -455,7 +456,14 @@ void E3dScene::NewObjectInserted(const E3dObject* p3DObj)
 void E3dScene::StructureChanged()
 {
 E3dObject::StructureChanged();
-SetRectsDirty();
+
+if(!GetModel() || !GetModel()->isLocked())
+{
+// #123539# optimization for 3D chart object generation: do not reset
+// already calculated scene projection data every time an object gets
+// initialized
+SetRectsDirty();
+}
 
 // #110988#
 ImpCleanup3DDepthMapper();
diff --git a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx 
b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
index 202f241..495d168 100644
--- a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx
@@ -58,7 +58,8 @@ namespace sdr
 }
 
 ViewContactOfSdrOle2Obj::ViewContactOfSdrOle2Obj(SdrOle2Obj& rOle2Obj)
-:   ViewContactOfSdrRectObj(rOle2Obj)
+:   ViewContactOfSdrRectObj(rOle2Obj),
+mxChartContent()
 {
 }
 
@@ -104,30 +105,45 @@ namespace sdr
 
 if(GetOle2Obj().IsChart())
 {
-// try to get chart primitives and chart range directly from 
xChartModel
-basegfx::B2DRange aChartContentRange;
-const drawinglayer::primitive2d::Primitive2DSequence 
aChartSequence(
-ChartHelper::tryToGetChartContentAsPrimitive2DSequence(
-GetOle

Re: interim release 4.2.1 -- branches and outstanding patches

[Bjoern Michaelsen]

On Wed, Feb 19, 2014 at 03:31:45PM +0100, Christian Lohmaier wrote:
> * release will be done from libreoffice-4-2-2 branch.
> * everything that is in 4-2-1 branch must be cherry-picked to 4-2-2
> branch to be included in the tag/release
> * cherry-picking from 4-2-1 branch to 4-2-2 branch doesn't require review.

understood, that should work, Thanks!

Best,

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

Re: Testing/Working on PyUNO?

[Bjoern Michaelsen]

Hi,

On Wed, Feb 19, 2014 at 09:29:36AM -0500, Kohei Yoshida wrote:
> Telling core developers who diligently maintain C++ tests to maintain Python
> tests just because someone likes to write them (but not maintain them) is
> equally silly. 

Nobody told core developers to do so.

> And you are asking the wrong question.  It's not about C++ tests vs Python
> tests; it's about what tests are appropriate for Python, and what tests are
> better to be written in C++.

No. The question is: If a volunteer shows up and says "I will write Python
test, but (for whatever reason) no C++ tests.", we will not tell them to not do
that. That core application maintainers would prefer C++ tests is understood --
but its entirely academic in this scenario.

> I agree, except for the "that remains to be seen" part.  It's been seen,
> and it's not helpful. ;-)

Well, how so? Reports on failures are always helpful. What is needed is that
the bug is reported generally in the direction of those that are interested in
fixing the root cause (root cause in the bridge -> UNO guys were the bugs
should go first, otherwise app guys). But that is a communication issue and has
little to do with the tests themselves.

> And the investigation is hard and time-consuming, it's very discouraging
> for the core developers who are unfortunate enough to deal with
> failures. 

Its still better than a bug without a reproduction scenario. So consider a
failed Python test a mere "bug with a good reproduction scenario" for now.

> And this is non-sense.  Re-writing a test is very laborous and
> un-exciting process, and nobody wants to either 1) write tests that will
> be re-written completely when they fail, and 2) not many people want to
> re-write existing tests.  And who would be re-writing tests?  Those who
> have written the original Python tests, or those who maintain the code
> that triggers failure? 

I would say the UNO bridge guys will have a look at that. Its a good way to
find out if its really a bridge or a core issue. If we have a few bugs
investigated like that we will see how much of that is core and how much is an
bridge issue. If 90% of the bugs originate in the UNO bridge, the rewrites
should mainly come from there. If its the other way around, well then other
devs should contribute too.

> Since you said that it's non-sense to ask Python
> test writers to write tests in C++, I would assume it's the latter.

You have to look at the reality of the market: These days, there are much fewer
reasons to be interested in becoming or even starting as a C++ hacker than 10
years ago for a student or newcomer. Its a skill available in much less
abundance. OTOH, if people see how easy it is to 'translate' Python to C++ --
they might get a hang for it. Do assume everyone to have the same interests and
perks as you -- we have people translating source code comments, we have people
doing coverity fixes, we have people tweaking the build system, there is a lot
of variance in the interest. If someone has something to offer, we should take
advantage of that.

> Aimlessly increasing the test count while most of them are already
> covered in the core tests are not very useful, and only to serve to
> increase the build time.

This is what I said ment with "question is when to run them". FWIW, I think
they should belong to the subsequentcheck tests (and thus not be run on every
build) -- and they should work out of tree too like the current 
subsequentchecks:

 http://skyfromme.wordpress.com/2013/03/19/autopkgtests-for-adults/

That is, you should be able to run them against a LibreOffice installation
_without_ having to do a complete build. This is something we can easily do
with Python (and which is much harder in C++) and it will allow:

- devs that ignore subsquentchecks to continue to do so
- CI like the one mentioned in the link
- people to run the tests on daily builds without building themselves
  (this hopefully also gets more people to test master in general, esp. on 
Windows)
- people to go back in time and bibisect a failing test to its origin

FWIW, I do NOT want these tests to "stop the press" if one fails(*). Like the
other subsequentcheck we should have a look at them once in a while and run
them on the tagged versions (e.g. starting at alpha1 of a major) and then try
to have triaged failures around the time of the release as false positives or
real issues. The hope is this will give us some more early visibility of
critical areas -- thats all. The unoapi test in all their ugliness did so too,
see for example:

 https://bugs.launchpad.net/ubuntu/+source/gcc-4.7/+bug/1017125

It was tricky enough, but how long do you thing would it take to triage a bug
where a buggy boost implementation corrupts its internal data stucture causing
a Heisenbug in LibreOffice when it reads back from that data stucture much 
later,
if there wasnt a reproduction scenario (no matter how bad)?

Best,

Bjoern

(*) or a tinderbox spamming the world

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

[Caolán McNamara]

 cui/source/dialogs/SpellDialog.cxx |4 ++--
 cui/source/inc/SpellDialog.hxx |4 ++--
 sc/source/ui/inc/validate.hxx  |2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit dbeb8d405eba695cefbcf2660d556d70731eac79
Author: Caolán McNamara 
Date:   Wed Feb 19 15:40:46 2014 +

Resolves: fdo#74242 now VclMultiLineEdit's a11y work

MultiLineEdit don't, continue to replace MultiLineEdit with
VclMultiLineEdit as we continue .ui conversion and delete
at end

Change-Id: I0d5c5621d5fe26ac5e39392c66b95eebb0786f0d

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index a82616c..255817f 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1186,7 +1186,7 @@ bool SpellDialog::ApplyChangeAllList_Impl(SpellPortions& 
rSentence, bool &bHasRe
 
 //---
 SentenceEditWindow_Impl::SentenceEditWindow_Impl(Window * pParent, WinBits 
nBits)
-: MultiLineEdit(pParent, nBits)
+: VclMultiLineEdit(pParent, nBits)
 , m_nErrorStart(0)
 , m_nErrorEnd(0)
 , m_bIsUndoEditMode(false)
@@ -1541,7 +1541,7 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent& 
rNEvt )
 else
 bChange = false;
 }
-return bChange || MultiLineEdit::PreNotify(rNEvt);
+return bChange || VclMultiLineEdit::PreNotify(rNEvt);
 }
 
 //---
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index a159734..2284176 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -56,9 +56,9 @@ namespace svx{
 class SpellDialog;
 struct SpellErrorDescription;
 // --
-class SentenceEditWindow_Impl : public MultiLineEdit
+class SentenceEditWindow_Impl : public VclMultiLineEdit
 {
-using MultiLineEdit::SetText;
+using VclMultiLineEdit::SetText;
 
 private:
 std::set< sal_uInt16 >  m_aIgnoreErrorsAt;
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index eed4883..6faa2d0 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -212,7 +212,7 @@ private:
 ListBox maLbValue;
 FixedText   maFtMin;
 formula::RefEditmaEdMin;
-MultiLineEdit   maEdList;   /// Entries for explicit list
+VclMultiLineEditmaEdList;   /// Entries for explicit list
 FixedText   maFtMax;
 formula::RefEditmaEdMax;
 FixedText   maFtHint;   /// Hint text for cell range 
validity.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 7 commits - accessibility/source include/vcl starmath/inc starmath/source svl/source sw/source vcl/source

[Caolán McNamara]

 accessibility/source/extended/textwindowaccessibility.cxx |1 
 include/vcl/textdata.hxx  |1 
 include/vcl/vclmedit.hxx  |2 +
 starmath/inc/cursor.hxx   |   22 +++---
 starmath/source/node.cxx  |   18 ++-
 starmath/source/rtfexport.cxx |1 
 starmath/source/view.cxx  |   11 +++
 svl/source/filerec/filerec.cxx|6 ++-
 svl/source/inc/poolio.hxx |3 +
 sw/source/ui/dbui/mmaddressblockpage.cxx  |   13 +---
 vcl/source/control/edit.cxx   |6 +--
 vcl/source/edit/textview.cxx  |   18 ++-
 vcl/source/edit/vclmedit.cxx  |   18 +++
 13 files changed, 85 insertions(+), 35 deletions(-)

New commits:
commit 49cecd8b41cac29cc9642944eaae5b5f63a1bd46
Author: Caolán McNamara 
Date:   Wed Feb 19 12:26:47 2014 +

Related: fdo#74242 hook up a selection and caret change for multiline edits

a) split the textengine selection changed broadcast into a text selection 
changed
and text caret change event
b) handle both in existing places that handled the text selection event
c) listen for them in VclMultiLineEdit and translate to
VCLEVENT_EDIT_SELECTIONCHANGED VCLEVENT_EDIT_CARETCHANGED events
d) profit from the VCLEVENT_EDIT_SELECTIONCHANGED and
VCLEVENT_EDIT_CARETCHANGED handling in
accessibility/source/standard/vclxaccessibleedit.cxx for VCLXAccessibleEdits

Change-Id: I09187e76ae4eb189ee9469e388374154087faf80

diff --git a/accessibility/source/extended/textwindowaccessibility.cxx 
b/accessibility/source/extended/textwindowaccessibility.cxx
index d13525d..a37effa 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -1659,6 +1659,7 @@ void Document::Notify(::SfxBroadcaster &, ::SfxHint const 
& rHint)
 break;
 }
 case TEXT_HINT_VIEWSELECTIONCHANGED:
+case TEXT_HINT_VIEWCARETCHANGED:
 {
 ::osl::MutexGuard aInternalGuard(GetMutex());
 if (!isAlive())
diff --git a/include/vcl/textdata.hxx b/include/vcl/textdata.hxx
index 925efff..d05f2f7 100644
--- a/include/vcl/textdata.hxx
+++ b/include/vcl/textdata.hxx
@@ -121,6 +121,7 @@ inline sal_Bool TextSelection::operator != ( const 
TextSelection& rSel ) const
 
 #define TEXT_HINT_VIEWSCROLLED  100
 #define TEXT_HINT_VIEWSELECTIONCHANGED  101
+#define TEXT_HINT_VIEWCARETCHANGED  102
 
 class VCL_DLLPUBLIC TextHint : public SfxSimpleHint
 {
diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx
index 83c50c6..097d9e8 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
@@ -63,6 +63,8 @@ public:
 virtual ~VclMultiLineEdit();
 
 
+voidSelectionChanged();
+voidCaretChanged();
 virtual voidModify();
 virtual voidUpdateData();
 
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx 
b/sw/source/ui/dbui/mmaddressblockpage.cxx
index bdb0848..18b9707 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -1293,13 +1293,16 @@ AddressMultiLineEdit::~AddressMultiLineEdit()
 EndListening(*GetTextEngine());
 }
 
-voidAddressMultiLineEdit::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& 
rHint )
+void AddressMultiLineEdit::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& 
rHint)
 {
-if(rHint.ISA(TextHint) &&
-static_cast(rHint).GetId() == 
TEXT_HINT_VIEWSELECTIONCHANGED &&
-m_aSelectionLink.IsSet())
+if (m_aSelectionLink.IsSet() && rHint.ISA(TextHint))
 {
-m_aSelectionLink.Call(this);
+const TextHint& rTextHint = static_cast(rHint);
+if (rTextHint.GetId() == TEXT_HINT_VIEWSELECTIONCHANGED ||
+rTextHint.GetId() == TEXT_HINT_VIEWCARETCHANGED)
+{
+m_aSelectionLink.Call(this);
+}
 }
 }
 
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index f923c51..cd75e6b 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2642,13 +2642,13 @@ void Edit::ImplSetSelection( const Selection& 
rSelection, sal_Bool bPaint )
 ImplInvalidateOrRepaint();
 ImplShowCursor();
 
-sal_Bool bCaret = sal_False, bSelection = sal_False;
+bool bCaret = false, bSelection = false;
 long nB=aNew.Max(), nA=aNew.Min(),oB=aTemp.Max(), 
oA=aTemp.Min();
 long nGap = nB-nA, oGap = oB-oA;
 if (nB != oB)
-bCaret = sal_True;
+bCaret = true;
 if (nGa

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

[Stephan Bergmann]

 vcl/source/filter/wmf/winmtf.cxx |4 ++--
 vcl/source/filter/wmf/winwmf.cxx |6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit e69ede57ff128cdb3974c8f8940ca0dbf64edb0b
Author: Stephan Bergmann 
Date:   Wed Feb 19 16:17:39 2014 +0100

loplugin:literaltoboolconversion

Change-Id: I0c444f2e81e2e0ac9d6969f674ec3da013427cee

diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index f26c971..7d0d479 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -579,7 +579,7 @@ void WinMtfOutput::SelectObject( sal_Int32 nIndex )
 break;
 case NULL_BRUSH :
 {
-pGDIObj->Set( GDI_BRUSH, new WinMtfFillStyle( Color( 
COL_TRANSPARENT ), sal_True ) );
+pGDIObj->Set( GDI_BRUSH, new WinMtfFillStyle( Color( 
COL_TRANSPARENT ), true ) );
 }
 break;
 case WHITE_PEN :
@@ -987,7 +987,7 @@ sal_uInt32 WinMtfOutput::SetRasterOp( sal_uInt32 nRasterOp )
 {
 aNopFillStyle = maFillStyle;
 aNopLineStyle = maLineStyle;
-maFillStyle = WinMtfFillStyle( Color( COL_TRANSPARENT ), 
sal_True );
+maFillStyle = WinMtfFillStyle( Color( COL_TRANSPARENT ), 
true );
 maLineStyle = WinMtfLineStyle( Color( COL_TRANSPARENT ), 
sal_True );
 mbNopMode = sal_True;
 }
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index 83cbfe5..f53e396 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -708,7 +708,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
 aBmp.ReleaseAccess( pBmp );
 }
 Color aColor( (sal_uInt8)( nRed / nCount ), (sal_uInt8)( nGreen / 
nCount ), (sal_uInt8)( nBlue / nCount ) );
-pOut->CreateObject( GDI_BRUSH, new WinMtfFillStyle( aColor, 
sal_False ) );
+pOut->CreateObject( GDI_BRUSH, new WinMtfFillStyle( aColor, false 
) );
 }
 break;
 
@@ -728,13 +728,13 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
 
 case W_META_CREATEBRUSH:
 {
-pOut->CreateObject( GDI_BRUSH, new WinMtfFillStyle( Color( 
COL_WHITE ), sal_False ) );
+pOut->CreateObject( GDI_BRUSH, new WinMtfFillStyle( Color( 
COL_WHITE ), false ) );
 }
 break;
 
 case W_META_CREATEPATTERNBRUSH:
 {
-pOut->CreateObject( GDI_BRUSH, new WinMtfFillStyle( Color( 
COL_WHITE ), sal_False ) );
+pOut->CreateObject( GDI_BRUSH, new WinMtfFillStyle( Color( 
COL_WHITE ), false ) );
 }
 break;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: unusedcode.easy writerfilter/source

[Miklos Vajna]

 unusedcode.easy |1 
 writerfilter/source/resourcemodel/resourcemodel.cxx |   37 
 writerfilter/source/resourcemodel/resourcemodel.hxx |1 
 3 files changed, 39 deletions(-)

New commits:
commit c23faa9a5a47e059536b99573da6832ef5705faf
Author: Miklos Vajna 
Date:   Wed Feb 19 16:04:05 2014 +0100

writerfilter: unused WW8TableManager

Change-Id: I29a4b2326a8fe25c1f2288d6218e1e0a9b2ad3e5

diff --git a/unusedcode.easy b/unusedcode.easy
index 1388f49..c5f3dc6 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -369,7 +369,6 @@ svx::frame::Style::Style(editeng::SvxBorderLine const&, 
double, unsigned short)
 utl::MediaDescriptor::PROP_DEEPDETECTION()
 utl::toISO8601(com::sun::star::util::Time const&)
 vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, int)
-writerfilter::WW8TableManager::WW8TableManager()
 writerfilter::dump(writerfilter::OutputWithDepth, std::allocator > >&, char const*, 
boost::shared_ptr >)
 writerfilter::dump(writerfilter::OutputWithDepth, std::allocator > >&, char const*, 
boost::shared_ptr >)
 writerfilter::dump(writerfilter::OutputWithDepth, std::allocator > >&, char const*, rtl::OUString 
const&)
diff --git a/writerfilter/source/resourcemodel/resourcemodel.cxx 
b/writerfilter/source/resourcemodel/resourcemodel.cxx
index 275b377..bb07526 100644
--- a/writerfilter/source/resourcemodel/resourcemodel.cxx
+++ b/writerfilter/source/resourcemodel/resourcemodel.cxx
@@ -158,43 +158,6 @@ void WW8TableDataHandler::endCell(const string & end)
 
 // - WW8TableDataManager ---
 
-class WW8TableManager :
-public TableManager
-{
-typedef TableDataHandler
-TableDataHandlerPointer_t;
-
-public:
-WW8TableManager();
-virtual ~WW8TableManager() {}
-virtual void endParagraphGroup();
-virtual bool sprm(Sprm & rSprm);
-};
-
-WW8TableManager::WW8TableManager()
-{
-TableDataHandler::Pointer_t pHandler(new 
WW8TableDataHandler());
-setHandler(pHandler);
-}
-
-bool WW8TableManager::sprm(Sprm & rSprm)
-{
-TableManager::sprm(rSprm);
-output.setDepth(getTableDepthNew());
-return true;
-}
-
-void WW8TableManager::endParagraphGroup()
-{
-string tmpStr = "";
-output.addItem(tmpStr);
-TableManager::endParagraphGroup();
-}
-
 void WW8BinaryObjHandler::data
 (const sal_uInt8 * buf, size_t length,
  writerfilter::Reference::Pointer_t /*pRef*/)
diff --git a/writerfilter/source/resourcemodel/resourcemodel.hxx 
b/writerfilter/source/resourcemodel/resourcemodel.hxx
index ebbe356..3deb27e 100644
--- a/writerfilter/source/resourcemodel/resourcemodel.hxx
+++ b/writerfilter/source/resourcemodel/resourcemodel.hxx
@@ -19,7 +19,6 @@
 #include 
 
 namespace writerfilter {
-class WW8TableManager;
 class WW8BinaryObjHandler : public BinaryObj
 {
 public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

[Markus Mohrhard]

 sc/source/filter/xml/XMLExportDatabaseRanges.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 1cb71ca9840ec241242776548a42814d21463040
Author: Markus Mohrhard 
Date:   Wed Feb 19 00:39:53 2014 +0100

don't generate broken XML files, related #i116460#

Change-Id: I5d7f487b787295af6189425601c5d7e829a3db52
Reviewed-on: https://gerrit.libreoffice.org/8121
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx 
b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index f9ea2c6..ea2b31c 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -431,10 +431,6 @@ private:
 
 void writeCondition(const ScQueryEntry& rEntry, SCCOLROW nFieldStart, bool 
bCaseSens, bool bRegExp)
 {
-mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, 
OUString::number(rEntry.nField - nFieldStart));
-if (bCaseSens)
-mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, 
XML_TRUE);
-
 const ScQueryEntry::QueryItemsType& rItems = rEntry.GetQueryItems();
 if (rItems.empty())
 {
@@ -442,7 +438,11 @@ private:
 return;
 }
 
-else if (rItems.size() == 1)
+mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, 
OUString::number(rEntry.nField - nFieldStart));
+if (bCaseSens)
+mrExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, 
XML_TRUE);
+
+if (rItems.size() == 1)
 {
 // Single item condition.
 const ScQueryEntry::Item& rItem = rItems.front();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

[Kohei Yoshida]

 sc/source/ui/view/tabview2.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 793c2b2b3ac8c8e74ccdfc6876ce47e5039fb65a
Author: Kohei Yoshida 
Date:   Tue Feb 18 20:40:27 2014 -0500

fdo#74857: Update the incrementer when skipping over hidden regions.

Otherwise it would over-shoot.

Change-Id: I1f9741345dfe353e0b035ff3bead736ab3fccbef
(cherry picked from commit 637353bb46d3c7d9537e47e4e003aef78a0c0ab3)
Reviewed-on: https://gerrit.libreoffice.org/8117
Tested-by: Markus Mohrhard 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index bcce76e..8762520 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -86,6 +86,7 @@ void moveCursorByProtRule(
 if(nNewUnhiddenCol >= MAXCOL)
 return;
 
+i += nEndCol - nNewUnhiddenCol + 1;
 nNewUnhiddenCol = nEndCol +1;
 }
 
@@ -105,6 +106,7 @@ void moveCursorByProtRule(
 if(nNewUnhiddenCol <= 0)
 return;
 
+i -= nNewUnhiddenCol - nStartCol + 1;
 nNewUnhiddenCol = nStartCol - 1;
 }
 
@@ -125,6 +127,7 @@ void moveCursorByProtRule(
 if(nNewUnhiddenRow >= MAXROW)
 return;
 
+i += nEndRow - nNewUnhiddenRow + 1;
 nNewUnhiddenRow = nEndRow + 1;
 }
 
@@ -144,6 +147,7 @@ void moveCursorByProtRule(
 if(nNewUnhiddenRow <= 0)
 return;
 
+i -= nNewUnhiddenRow - nStartRow + 1;
 nNewUnhiddenRow = nStartRow - 1;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

[Kohei Yoshida]

 sc/source/core/data/column3.cxx |   25 -
 1 file changed, 20 insertions(+), 5 deletions(-)

New commits:
commit 563516fc10f1590a5987606de5444643b1b83747
Author: Kohei Yoshida 
Date:   Tue Feb 18 22:57:39 2014 -0500

fdo#72491: Always set input as text when that's requested.

Even when the text begins with '='.

Change-Id: I6e0a995f3042240b9f78068b5d0b9b758eb253ed
(cherry picked from commit ca50752c34de4477c696471b707e1b8136e27661)
Reviewed-on: https://gerrit.libreoffice.org/8122
Tested-by: Markus Mohrhard 
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 13ee606..50c52ce 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -1492,6 +1492,19 @@ void ScColumn::StartListeningInArea( 
sc::StartListeningContext& rCxt, SCROW nRow
 sc::ProcessFormula(maCells.begin(), maCells, nRow1, nRow2, aFunc);
 }
 
+namespace {
+
+void applyTextNumFormat( ScColumn& rCol, SCROW nRow, SvNumberFormatter* 
pFormatter )
+{
+sal_uInt32 nFormat = pFormatter->GetStandardFormat(NUMBERFORMAT_TEXT);
+ScPatternAttr aNewAttrs(rCol.GetDoc().GetPool());
+SfxItemSet& rSet = aNewAttrs.GetItemSet();
+rSet.Put(SfxUInt32Item(ATTR_VALUE_FORMAT, nFormat));
+rCol.ApplyPattern(nRow, aNewAttrs);
+}
+
+}
+
 bool ScColumn::ParseString(
 ScCellValue& rCell, SCROW nRow, SCTAB nTabP, const OUString& rString,
 formula::FormulaGrammar::AddressConvention eConv,
@@ -1528,6 +1541,12 @@ bool ScColumn::ParseString(
 {
 rCell.set(rPool.intern(rString));
 }
+else if (aParam.meSetTextNumFormat == ScSetStringParam::Always)
+{
+// Set the cell format type to Text.
+applyTextNumFormat(*this, nRow, aParam.mpNumFormatter);
+rCell.set(rPool.intern(rString));
+}
 else // = Formula
 rCell.set(
 new ScFormulaCell(
@@ -1632,11 +1651,7 @@ bool ScColumn::ParseString(
 if (aParam.meSetTextNumFormat != ScSetStringParam::Never && 
aParam.mpNumFormatter->IsNumberFormat(rString, nIndex, nVal))
 {
 // Set the cell format type to Text.
-sal_uInt32 nFormat = 
aParam.mpNumFormatter->GetStandardFormat(NUMBERFORMAT_TEXT);
-ScPatternAttr aNewAttrs(pDocument->GetPool());
-SfxItemSet& rSet = aNewAttrs.GetItemSet();
-rSet.Put( SfxUInt32Item(ATTR_VALUE_FORMAT, nFormat) );
-ApplyPattern(nRow, aNewAttrs);
+applyTextNumFormat(*this, nRow, aParam.mpNumFormatter);
 }
 
 rCell.set(rPool.intern(rString));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Testing/Working on PyUNO?

[Kohei Yoshida]

On Wed, 2014-02-19 at 12:02 +0100, Stephan Bergmann wrote:
> So, what can we do here?  How about an additional code module
> dedicated 
> to subsequentchecks written in Python, which, while serving the
> useful 
> purpose of testing specific application functionality (and in which
> role 
> they may deliberately duplicate existing "native" tests), are meant
> more 
> as a means to improve the PyUNO situation.
> 
> The idea would be that Kevin (and others) would fill this with PyUNO 
> coding scenarios that cross their mind, discover errors in the PyUNO 
> infrastructure, ideally distill tests for those specific errors out
> of 
> the more general tests (that could then even go into more specific
> code 
> modules like pyuno or testtools), and eventually prune test snippets 
> again that are no longer useful.

I have no objection here.  If the test writters are careful enough to
ensure that the tests are designed to catch the errors in the Python UNO
layer, and not cover or insist on testing the core functionality that
are not really Python specific, then I don't see any downside.

And I would like such tests to be run either independent of the build,
or a part of top level "make check", much like how the current Java UNO
API tests run.

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

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

[Miklos Vajna]

 sw/qa/extras/odfimport/data/annotation-formatting.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx  |   11 +++
 2 files changed, 11 insertions(+)

New commits:
commit 1733b678417085f17f07e0018fda08fc70b84621
Author: Miklos Vajna 
Date:   Wed Feb 19 15:45:46 2014 +0100

CppunitTest_sw_odfimport: add annotation formatting testcase

Most probably this was fixed by 0761f81643a6890457e9ef7d913ab5c88c2593a4
(123792: complete annotations on text ranges feature, 2013-12-19).

Change-Id: Ic712c1a33271081205901ddbf5d629d6f2198126

diff --git a/sw/qa/extras/odfimport/data/annotation-formatting.odt 
b/sw/qa/extras/odfimport/data/annotation-formatting.odt
new file mode 100644
index 000..ce8d98f
Binary files /dev/null and 
b/sw/qa/extras/odfimport/data/annotation-formatting.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 8f7f8a7..8fa14b4 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -10,6 +10,7 @@
 
 #if !defined(MACOSX) && !defined(WNT)
 
+#include 
 #include 
 #include 
 #include 
@@ -437,6 +438,16 @@ DECLARE_ODFIMPORT_TEST(testSpellmenuRedline, 
"spellmenu-redline.odt")
 CPPUNIT_ASSERT_EQUAL(sal_uInt16(FN_REDLINE_PREV_CHANGE), 
aPopup.GetItemId(aPopup.GetItemCount() - 1));
 }
 
+DECLARE_ODFIMPORT_TEST(testAnnotationFormatting, "annotation-formatting.odt")
+{
+uno::Reference xTextField = getProperty< 
uno::Reference >(getRun(getParagraph(1), 1), "TextField");
+uno::Reference xText = getProperty< 
uno::Reference >(xTextField, "TextRange");
+// Make sure we test the right annotation.
+uno::Reference xParagraph = getParagraphOfText(1, xText, 
"Looses: bold");
+// Formatting was lost: the second text portion was NORMAL, not BOLD.
+CPPUNIT_ASSERT_EQUAL(awt::FontWeight::BOLD, 
getProperty(getRun(xParagraph, 2), "CharWeight"));
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-2' - .gitreview

[Michael Stahl]

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

New commits:
commit 5fcd1ada739ec006126ee1eb97c6a25fa561a7fc
Author: Michael Stahl 
Date:   Wed Feb 19 15:29:04 2014 +0100

fix branch in .gitreview

Change-Id: Ie1c52f3984d75afe67dafee520c136eed26bbf25

diff --git a/.gitreview b/.gitreview
index 710fd1e..b6456e0 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=logerrit
 port=29418
 project=core
 defaultremote=logerrit
-defaultbranch=libreoffice-4-2
+defaultbranch=libreoffice-4-2-2
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: interim release 4.2.1 -- branches and outstanding patches

[Christian Lohmaier]

Hi Björn, *,

On Wed, Feb 19, 2014 at 11:28 AM, Bjoern Michaelsen
 wrote:
> [...]
> I assume patches intended for the
> "LibreOffice 4.2.2 final" release still should get pushed to
> refs/for/libreoffice-4-2-1, right?

No. I will create the tag for 4.2.2 based on the libreoffice-4-2-2
branch. So you should target 4-2-2 branch for any incoming patches.

> If that is the case, what is the libreoffice-4-2-2 branch for and shouldnt we 
> kill
> it for now to avoid confusion?

It is mainly to not break the tooling that creates diffs from the
tags/trees, commit-notifications, etc. and for those who try to hunt
down stuff in months from now that then puzzle where they'd find the
diff between 4.2.1 and 4.2.2

When I created the libreoffice-4-2-2 branch, I picked all commits that
were committed to the 4-2-1 branch at the time.

Any commits for 4.2.2 should be on the libreoffice-4-2-2 branch.

> I see already commits on that branch that are
> not on the libreoffice-4-2-1 branch there.

That is OK. 4-2-1 is "dead end".

> Having some people commit on -4-2-1
> and some on -4-2-2 is really the worst scenario.

Having a 4.2.2 release from a 4-2-1 branch is in the same order of magnitude
So as written in the announce for the branch¹ "Please make sure to
push any pending fixes to the libreoffice-4-2-2 branch instead of
libreoffice-4-2-1."

That being said: If it is already committed to 4-2-1 branch, then it
doesn't need any additional review for the 4-2-2 branch. So if there
are patches in 4-2-1 that are not in 4-2-2, those can be cherry-picked
without additional review

> @Cloph: Can you confirm the first and clarify on the second?

* release will be done from libreoffice-4-2-2 branch.
* everything that is in 4-2-1 branch must be cherry-picked to 4-2-2
branch to be included in the tag/release
* cherry-picking from 4-2-1 branch to 4-2-2 branch doesn't require review.

ciao
Christian

[1] http://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg88403.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - postprocess/signing

[Andras Timar]

 postprocess/signing/signing.pl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 25b1c6a1f16175fceec0176bf64e2e8fcc8871f1
Author: Andras Timar 
Date:   Wed Feb 19 14:40:45 2014 +0100

fdo#75206: use 'ne' for string comparison

Change-Id: I0d059933786119c3c26202c7b48d793404e5a0eb
Signed-off-by: Michael Stahl 

diff --git a/postprocess/signing/signing.pl b/postprocess/signing/signing.pl
index fc17092..875076a 100644
--- a/postprocess/signing/signing.pl
+++ b/postprocess/signing/signing.pl
@@ -47,7 +47,7 @@ if ( $#ARGV < 2 ) {
 exit(1);
 }
 @args = parse_options();
-get_exclude_files() if ($opt_exclude != "");
+get_exclude_files() if ($opt_exclude ne "");
 @files_to_sign = get_files(\@args);
 if ( $opt_log ) {   # logging
 open(LOG,">$opt_log") || die "Can't open log file $opt_log\n";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Testing/Working on PyUNO?

[Kohei Yoshida]

On Wed, 2014-02-19 at 12:32 +0100, Bjoern Michaelsen wrote:
> Hi,
> 
> On Wed, Feb 19, 2014 at 12:02:35PM +0100, Stephan Bergmann wrote:
> > The idea would be that Kevin (and others) would fill this with PyUNO
> > coding scenarios that cross their mind, discover errors in the PyUNO
> > infrastructure, ideally distill tests for those specific errors out
> > of the more general tests (that could then even go into more
> > specific code modules like pyuno or testtools), and eventually prune
> > test snippets again that are no longer useful.
> 
> That sounds very good to me. I think if the tests:
> 
> - serve as example code for Python users and thus attract more people around 
> it 
> - test PyUNO and the underlying product
> - tests are reasonably selfcontained and do not introduce a huge framework on
>   their own (hint: like unoapi did)
> 
> that would be huge winner. As telling Python users to write C++ tests instead
> is of course nonsense -- and if our options are either getting Python tests or
> none at all, I much prefer the first.

This goes both ways. Telling core developers who diligently maintain C++
tests to maintain Python tests just because someone likes to write them
(but not maintain them) is equally silly.  And you are asking the wrong
question.  It's not about C++ tests vs Python tests; it's about what
tests are appropriate for Python, and what tests are better to be
written in C++.  This point is unfortunately not really understood
(though Stephan clearly does) and the discussion is unfortunately going
in circles as a result.

> The tricky question will be to decide when to run these tests and what to do
> with flaky tests -- aka tests that are flaky because of PyUNO and not the
> underlying code. It would be unhelpful if a huge load of PyUNO failures turn 
> up
> at the application developers -- but that remains to be seen.

I agree, except for the "that remains to be seen" part.  It's been seen,
and it's not helpful. ;-)

> Ultimately, most tests should pass almost all the time. _If_ a test fails, it
> should always be worth investigating.

And the investigation is hard and time-consuming, it's very discouraging
for the core developers who are unfortunate enough to deal with
failures.  Note that those who volunteer to write tests will not be the
ones who deal with their failures and maintain them.  The burden will
likely be on the maintainers.  I for one spent tremendous thoughts on
ensuring that the tests are at an appropriate place, writtin in such a
way to make them easier to debug when they fail (and they are designed
to fail).

>  Part of that might be that the failing
> tests gets rewritten in C++. So we would have a big set of Python tests (as
> there are more people available to write them) and whenever one of those 
> fails,
> it migrates to C++. As you never know beforehand which one that will be, this
> will help selecting the important ones.

And this is non-sense.  Re-writing a test is very laborous and
un-exciting process, and nobody wants to either 1) write tests that will
be re-written completely when they fail, and 2) not many people want to
re-write existing tests.  And who would be re-writing tests?  Those who
have written the original Python tests, or those who maintain the code
that triggers failure?  Since you said that it's non-sense to ask Python
test writers to write tests in C++, I would assume it's the latter.

> Recent developments made more than obvious that no matter how much tests you
> think you have, it will always be too few.

This is true. But it's not really related to this discussion.  Also, the
quality of the tests do matter as well, not just the quantity.
Aimlessly increasing the test count while most of them are already
covered in the core tests are not very useful, and only to serve to
increase the build time.

Kohei

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

[Libreoffice-commits] core.git: RepositoryModule_host.mk

[Tor Lillqvist]

 RepositoryModule_host.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7f564cc75a412eede121bbc9595202255474917b
Author: Tor Lillqvist 
Date:   Wed Feb 19 16:08:26 2014 +0200

Consistently use gb_Helper_optional

Change-Id: I73108da58cfb1243b699678661a628643fa170a2

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 5ade85a..29670f7 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -184,11 +184,11 @@ endef
 ifeq (,$(filter-out all,$(MAKECMDGOALS)))
 $(eval $(call repositorymodule_serialize,\
scfilt scopencl \
-   $(if $(filter SCRIPTING,$(BUILD_TYPE)),vbaobj) \
+   $(call gb_Helper_optional,SCRIPTING,vbaobj) \
sc msword \
$(call gb_Helper_optional,DESKTOP,swui) \
sw sd \
-   $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) \
+   $(call gb_Helper_optional,DBCONNECTIVITY,dbu) \
writerfilter cui chartcontroller chartcore oox svx \
$(if $(MERGELIBS),merged,svxcore) \
xo sfx fwk svt vcl \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryModule_host.mk

[Tor Lillqvist]

 RepositoryModule_host.mk |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 32e5370d84c9dfd3c0ada9a6476795c518e8947d
Author: Tor Lillqvist 
Date:   Wed Feb 19 15:49:55 2014 +0200

Fix fallout from 9ad3fc29dd98167c35fcb599da0b4e764ddf04dd

No scui library for non-DESKTOP any more.

Change-Id: Ic92aecc796e3e889ad1f3dceeb5ec540857d3d44

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 48d5518..5ade85a 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -185,7 +185,9 @@ ifeq (,$(filter-out all,$(MAKECMDGOALS)))
 $(eval $(call repositorymodule_serialize,\
scfilt scopencl \
$(if $(filter SCRIPTING,$(BUILD_TYPE)),vbaobj) \
-   sc msword swui sw sd \
+   sc msword \
+   $(call gb_Helper_optional,DESKTOP,swui) \
+   sw sd \
$(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) \
writerfilter cui chartcontroller chartcore oox svx \
$(if $(MERGELIBS),merged,svxcore) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: postprocess/signing

[Andras Timar]

 postprocess/signing/signing.pl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 77e48e23641846653691e54f315080c8d8a2d898
Author: Andras Timar 
Date:   Wed Feb 19 14:40:45 2014 +0100

use 'ne' for string comparison

Change-Id: I0d059933786119c3c26202c7b48d793404e5a0eb

diff --git a/postprocess/signing/signing.pl b/postprocess/signing/signing.pl
index fc17092..875076a 100644
--- a/postprocess/signing/signing.pl
+++ b/postprocess/signing/signing.pl
@@ -47,7 +47,7 @@ if ( $#ARGV < 2 ) {
 exit(1);
 }
 @args = parse_options();
-get_exclude_files() if ($opt_exclude != "");
+get_exclude_files() if ($opt_exclude ne "");
 @files_to_sign = get_files(\@args);
 if ( $opt_log ) {   # logging
 open(LOG,">$opt_log") || die "Can't open log file $opt_log\n";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Interested in Developing Accessible Android UI for LibreOffice

[Keith Creasy]

Hello.

 

We are interested in using LibreOffice to create an accessible (for blind
users) suite for Anddroid devices. I have the LibreOffice repository and can
build all of it, including the experimental Android apps, with the exception
of generating an Android package (apk) that includes the native library.Can
someone give me a pointer or some hints about how to make this happen?

 

I am assuming that one would use ndk-build to build an Android native
library but the jni directories in the experimental apps are empty except
for the Android.mk file. Attempts to run ndk-build on these projects just
results in an error:

 

/home/kcreasy/ndk/build/core/build-shared-library.mk:23: *** Android NDK:
Missing LOCAL_MODULE before including BUILD_SHARED_LIBRARY in jni/Android.mk
.  Stop.

 

 

Thank you.

 

Keith

 

 

 

 

Thanks.

 

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

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

[Stephan Bergmann]

 comphelper/source/container/embeddedobjectcontainer.cxx |8 
 comphelper/source/misc/officerestartmanager.cxx |4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit d12e4724748752b62b38f15f1223df5b87a00530
Author: Stephan Bergmann 
Date:   Wed Feb 19 14:31:09 2014 +0100

comphelper: sal_Bool -> bool sequel

Change-Id: I2b9bd19abf4510fccef0374a539069cb8222ccae

diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx 
b/comphelper/source/container/embeddedobjectcontainer.cxx
index eaa9772..ebe4df1 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -1241,13 +1241,13 @@ bool EmbeddedObjectContainer::InsertGraphicStream( 
const com::sun::star::uno::Re
 throw uno::RuntimeException();
 
 xPropSet->setPropertyValue("UseCommonStoragePasswordEncryption",
-uno::makeAny( (sal_Bool)sal_True ) );
+uno::makeAny( true ) );
 uno::Any aAny;
 aAny <<= rMediaType;
 xPropSet->setPropertyValue("MediaType", aAny );
 
 xPropSet->setPropertyValue("Compressed",
-uno::makeAny( (sal_Bool)sal_True ) );
+uno::makeAny( true ) );
 }
 catch (const uno::Exception&)
 {
@@ -1271,9 +1271,9 @@ bool 
EmbeddedObjectContainer::InsertGraphicStreamDirectly( const com::sun::star:
 aProps[0].Name = "MediaType";
 aProps[0].Value <<= rMediaType;
 aProps[1].Name = "UseCommonStoragePasswordEncryption";
-aProps[1].Value <<= (sal_Bool)sal_True;
+aProps[1].Value <<= true;
 aProps[2].Name = "Compressed";
-aProps[2].Value <<= (sal_Bool)sal_True;
+aProps[2].Value <<= true;
 
 if ( xReplacement->hasByName( rObjectName ) )
 xReplacement->removeElement( rObjectName );
diff --git a/comphelper/source/misc/officerestartmanager.cxx 
b/comphelper/source/misc/officerestartmanager.cxx
index 3977fd8..aec471e 100644
--- a/comphelper/source/misc/officerestartmanager.cxx
+++ b/comphelper/source/misc/officerestartmanager.cxx
@@ -136,7 +136,7 @@ void SAL_CALL OOfficeRestartManager::notify( const 
uno::Any& /* aData */ )
 uno::Reference< beans::XPropertySet > xPropertySet( xDesktop, 
uno::UNO_QUERY_THROW );
 OUString aVetoPropName( "SuspendQuickstartVeto" );
 uno::Any aValue;
-aValue <<= (sal_Bool)sal_True;
+aValue <<= true;
 xPropertySet->setPropertyValue( aVetoPropName, aValue );
 
 try
@@ -147,7 +147,7 @@ void SAL_CALL OOfficeRestartManager::notify( const 
uno::Any& /* aData */ )
 
 if ( !bSuccess )
 {
-aValue <<= (sal_Bool)sal_False;
+aValue <<= false;
 xPropertySet->setPropertyValue( aVetoPropName, aValue );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 28/c0c081d07e5a49ccd238e7f4e882347ab3690c

[Caolán McNamara]

 28/c0c081d07e5a49ccd238e7f4e882347ab3690c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit bcb38fa0229175386142cdbc4a441bb8f7080305
Author: Caolán McNamara 
Date:   Wed Feb 19 13:07:39 2014 +

Notes added by 'git notes add'

diff --git a/28/c0c081d07e5a49ccd238e7f4e882347ab3690c 
b/28/c0c081d07e5a49ccd238e7f4e882347ab3690c
new file mode 100644
index 000..4aa2834
--- /dev/null
+++ b/28/c0c081d07e5a49ccd238e7f4e882347ab3690c
@@ -0,0 +1 @@
+merged as: 58e7439c396ba8d449e32db9afd8f3f71acc071b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - svtools/source sw/inc sw/source vcl/source

[Caolán McNamara]

 svtools/source/brwbox/datwin.cxx  |3 +
 svtools/source/contnr/templwin.cxx|3 -
 svtools/source/svhtml/parhtml.cxx |1 
 sw/inc/IDocumentContentOperations.hxx |2 
 sw/inc/doc.hxx|5 +
 sw/source/core/doc/doclay.cxx |   94 ++
 sw/source/core/frmedt/fecopy.cxx  |7 +-
 sw/source/core/frmedt/fefly1.cxx  |2 
 sw/source/core/unocore/unodraw.cxx|2 
 sw/source/filter/html/htmldraw.cxx|2 
 sw/source/filter/ww8/ww8graf.cxx  |4 -
 sw/source/filter/ww8/ww8graf2.cxx |2 
 sw/source/filter/ww8/ww8par4.cxx  |2 
 vcl/source/filter/wmf/winmtf.hxx  |   13 ++--
 14 files changed, 79 insertions(+), 63 deletions(-)

New commits:
commit 14a502e4988574e4c56d2653d2170e1b14576d4d
Author: Caolán McNamara 
Date:   Wed Feb 19 12:54:17 2014 +

coverity#738857 Uninitialized scalar field

Change-Id: Ic82e559e9b7ca31fa6d9b5ff1d1fc5ae3fac9b88

diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 5c6c288..5d81568 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -197,7 +197,10 @@ BrowserDataWin::BrowserDataWin( BrowseBox* pParent )
 ,bNoScrollBack( false )
 ,bNoHScroll( false )
 ,bNoVScroll( false )
+,bAutoHScroll(false)
+,bAutoVScroll(false)
 ,bUpdateMode( true )
+,bAutoSizeLastCol(false)
 ,bResizeOnPaint( false )
 ,bUpdateOnUnlock( false )
 ,bInUpdateScrollbars( false )
commit b0e1a3f962adbf4e0f127b3102b88e04f2f3d9de
Author: Caolán McNamara 
Date:   Wed Feb 19 12:42:17 2014 +

coverity#738860 Uninitialized scalar field

Change-Id: I968c9f10d426b90e6883e7a0ff1387187d97dcd2

diff --git a/svtools/source/contnr/templwin.cxx 
b/svtools/source/contnr/templwin.cxx
index 41e2f51..8674c24 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -586,7 +586,8 @@ OUString SvtDocInfoTable_Impl::GetString( long nId ) const
 // class SvtFrameWindow_Impl -
 
 SvtFrameWindow_Impl::SvtFrameWindow_Impl( Window* pParent )
-  : Window( pParent )
+: Window(pParent)
+, bDocInfo(false)
 {
 // create windows and frame
 pEditWin = new ODocumentInfoPreview( this ,WB_LEFT | WB_VSCROLL | 
WB_READONLY | WB_BORDER | WB_3DLOOK);
commit 2b2a3ed37358cab49933a218c8a8544be03fba22
Author: Caolán McNamara 
Date:   Wed Feb 19 12:41:22 2014 +

coverity#738862 Uninitialized scalar field

Change-Id: Ib970ef372e7754db890b5a4cd9c9b422a129ba02

diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
index e094c54..c200907 100644
--- a/vcl/source/filter/wmf/winmtf.hxx
+++ b/vcl/source/filter/wmf/winmtf.hxx
@@ -337,18 +337,18 @@ typedef enum {
 struct WinMtfFillStyle
 {
 Color   aFillColor;
-sal_BoolbTransparent;
+boolbTransparent;
 WinMtfFillStyleType aType;
 Bitmap  aBmp;
 
 WinMtfFillStyle()
 : aFillColor(Color(COL_BLACK))
-, bTransparent(sal_False)
+, bTransparent(false)
 , aType(FillStyleSolid)
 {
 }
 
-WinMtfFillStyle( const Color& rColor, sal_Bool bTrans = sal_False )
+WinMtfFillStyle(const Color& rColor, bool bTrans = false)
 : aFillColor(rColor)
 , bTransparent(bTrans)
 , aType(FillStyleSolid)
@@ -356,19 +356,20 @@ struct WinMtfFillStyle
 }
 
 WinMtfFillStyle(Bitmap& rBmp)
-: aType(FillStylePattern)
+: bTransparent(false)
+, aType(FillStylePattern)
 , aBmp(rBmp)
 {
 }
 
-sal_Bool operator==( const WinMtfFillStyle& rStyle )
+bool operator==( const WinMtfFillStyle& rStyle )
 {
 return (  ( aFillColor == rStyle.aFillColor )
&& ( bTransparent == rStyle.bTransparent )
&& ( aType == rStyle.aType )
);
 }
-sal_Bool operator==( WinMtfFillStyle* pStyle )
+bool operator==( WinMtfFillStyle* pStyle )
 {
 return (  ( aFillColor == pStyle->aFillColor )
&& ( bTransparent == pStyle->bTransparent )
commit 85f48b1b47903b41ebaa4b432e756833a5e92e45
Author: Caolán McNamara 
Date:   Wed Feb 19 12:38:35 2014 +

coverity#738865 Uninitialized scalar field

Change-Id: Ie6473e4a8c4b311b6862019046fb4ae9cf05e1fb

diff --git a/svtools/source/svhtml/parhtml.cxx 
b/svtools/source/svhtml/parhtml.cxx
index 942e881..6517e5c 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -296,6 +296,7 @@ HTMLParser::HTMLParser( SvStream& rIn, bool bReadNewDoc ) :
 bPre_IgnoreNewPara(false),
 bReadNextChar(false),
 bReadComment(false),
+nPre_LinePos(0),
 mnPendingOffToken(0)
 {
 //#i76649, default to UTF-8 for HTML unless we know differently
commit 58e7439c396ba8d449e32db9afd8f3f71acc

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

[Stephan Bergmann]

 sot/source/sdstor/ucbstorage.cxx   |4 ++--
 sot/source/unoolestorage/xolesimplestorage.cxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 81a2fc786728205b0a869b38a95fc889662b08a6
Author: Stephan Bergmann 
Date:   Wed Feb 19 14:05:37 2014 +0100

sot: sal_Bool -> bool fixup

Change-Id: I53777b6f72f5ff60228e40e9ec2a0e909e059fcf

diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 9d3e66a..47158af 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -2156,7 +2156,7 @@ sal_Int16 UCBStorage_Impl::Commit()
 // first remove all open stream handles
 if( !pElement->m_xStream.Is() || 
pElement->m_xStream->Clear() )
 {
-pContent->executeCommand( OUString("delete"), 
makeAny( sal_Bool( sal_True ) ) );
+pContent->executeCommand( OUString("delete"), 
makeAny( true ) );
 nRet = COMMIT_RESULT_SUCCESS;
 }
 else
@@ -2189,7 +2189,7 @@ sal_Int16 UCBStorage_Impl::Commit()
 // OLE storage should be stored encrytped, if the 
storage uses encryption
 pElement->m_xStream->m_aContentType = 
"application/vnd.sun.star.oleobject";
 Any aValue;
-aValue <<= (sal_Bool)sal_True;
+aValue <<= true;
 
pElement->m_xStream->m_pContent->setPropertyValue("Encrypted", aValue );
 }
 
diff --git a/sot/source/unoolestorage/xolesimplestorage.cxx 
b/sot/source/unoolestorage/xolesimplestorage.cxx
index 3fe6aa5..1de814e 100644
--- a/sot/source/unoolestorage/xolesimplestorage.cxx
+++ b/sot/source/unoolestorage/xolesimplestorage.cxx
@@ -476,7 +476,7 @@ uno::Any SAL_CALL OLESimpleStorage::getByName( const 
OUString& aName )
 
 uno::Sequence< uno::Any > aArgs( 2 );
 aArgs[0] <<= xInputStream; // allow readonly access only
-aArgs[1] <<= (sal_Bool)sal_True; // do not create copy
+aArgs[1] <<= true; // do not create copy
 
 uno::Reference< container::XNameContainer > xResultNameContainer(
 m_xFactory->createInstanceWithArguments(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sc/source/ui/view/gridwin.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c98658118554c237e6d7a3440eff9d3038694154
Author: Stephan Bergmann 
Date:   Wed Feb 19 14:00:53 2014 +0100

sal_Bool -> bool fixup

Change-Id: I822bc698c6869561b080b8e5a86911350c6d7f38

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 3202560..89931cd 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -3499,8 +3499,8 @@ static ScRange lcl_MakeDropRange( SCCOL nPosX, SCROW 
nPosY, SCTAB nTab, const Sc
 
 //
 
-extern sal_Bool bPasteIsDrop;   // viewfun4 -> move to header
-extern sal_Bool bPasteIsMove;   // viewfun7 -> move to header
+extern bool bPasteIsDrop;   // viewfun4 -> move to header
+extern bool bPasteIsMove;   // viewfun7 -> move to header
 
 //
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sc/source/ui/dbgui/tpsort.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 65c7200d7834a57758eeffeea770858d22f27e95
Author: Stephan Bergmann 
Date:   Wed Feb 19 13:26:00 2014 +0100

loplugin:implicitboolconversion

Change-Id: I89d2bd21c11e07e645d270f9735664d06403b7d2

diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 3ee92af..1a15e6e 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -776,7 +776,7 @@ void ScTabPageSortOptions::ActivatePage( const SfxItemSet& 
rSet )
 aSortData = static_cast(rSet.Get( SCITEM_SORTDATA 
)).GetSortData();
 if ( pDlg )
 {
-if ( m_pBtnHeader->IsChecked() != (pDlg->GetHeaders() ? 1 : 0) )
+if ( m_pBtnHeader->IsChecked() != pDlg->GetHeaders() )
 {
 m_pBtnHeader->Check( pDlg->GetHeaders() );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |2 ++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   13 -
 2 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 4fc2bec5251e7aed613e73f234a02c0cd80fee35
Author: Miklos Vajna 
Date:   Wed Feb 19 13:08:07 2014 +0100

DOCX OLE import: inherit more properties

Change-Id: Ifa7eb3eee774266f440b313437f0decce27eedc5

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 3c7c473..7436e58 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1787,6 +1787,8 @@ DECLARE_OOXMLIMPORT_TEST(testOleAnchor, "ole-anchor.docx")
 {
 // This was AS_CHARACTER, even if the VML style explicitly contains 
"position:absolute".
 CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER, 
getProperty(getShape(1), "AnchorType"));
+// This was DYNAMIC, even if the default is THROUGHT and there is no 
w10:wrap element in the bugdoc.
+CPPUNIT_ASSERT_EQUAL(text::WrapTextMode_THROUGHT, 
getProperty(getShape(1), "Surround"));
 }
 
 DECLARE_OOXMLIMPORT_TEST(testDMLGroupShapeCapitalization, 
"dml-groupshape-capitalization.docx")
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 9e290e6..d8237f3 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1233,7 +1233,18 @@ void DomainMapper_Impl::appendOLE( const OUString& 
rStreamName, OLEHandlerPtr pO
 uno::makeAny(xGraphic));
 uno::Reference 
xReplacementProperties(pOLEHandler->getShape(), uno::UNO_QUERY);
 if (xReplacementProperties.is())
-xOLEProperties->setPropertyValue("AnchorType", 
xReplacementProperties->getPropertyValue("AnchorType"));
+{
+OUString pProperties[] = {
+OUString("AnchorType"),
+OUString("Surround"),
+OUString("HoriOrient"),
+OUString("HoriOrientPosition"),
+OUString("VertOrient"),
+OUString("VertOrientPosition")
+};
+for (size_t i = 0; i < SAL_N_ELEMENTS(pProperties); ++i)
+xOLEProperties->setPropertyValue(pProperties[i], 
xReplacementProperties->getPropertyValue(pProperties[i]));
+}
 else
 // mimic the treatment of graphics here.. it seems anchoring as 
character
 // gives a better ( visually ) result
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Testing/Working on PyUNO?

[Bjoern Michaelsen]

Hi,

On Wed, Feb 19, 2014 at 12:02:35PM +0100, Stephan Bergmann wrote:
> The idea would be that Kevin (and others) would fill this with PyUNO
> coding scenarios that cross their mind, discover errors in the PyUNO
> infrastructure, ideally distill tests for those specific errors out
> of the more general tests (that could then even go into more
> specific code modules like pyuno or testtools), and eventually prune
> test snippets again that are no longer useful.

That sounds very good to me. I think if the tests:

- serve as example code for Python users and thus attract more people around it 
- test PyUNO and the underlying product
- tests are reasonably selfcontained and do not introduce a huge framework on
  their own (hint: like unoapi did)

that would be huge winner. As telling Python users to write C++ tests instead
is of course nonsense -- and if our options are either getting Python tests or
none at all, I much prefer the first.

The tricky question will be to decide when to run these tests and what to do
with flaky tests -- aka tests that are flaky because of PyUNO and not the
underlying code. It would be unhelpful if a huge load of PyUNO failures turn up
at the application developers -- but that remains to be seen.

Ultimately, most tests should pass almost all the time. _If_ a test fails, it
should always be worth investigating. Part of that might be that the failing
tests gets rewritten in C++. So we would have a big set of Python tests (as
there are more people available to write them) and whenever one of those fails,
it migrates to C++. As you never know beforehand which one that will be, this
will help selecting the important ones.

Recent developments made more than obvious that no matter how much tests you
think you have, it will always be too few.

Best,

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

[Libreoffice-commits] core.git: sc/Module_sc.mk sc/source sd/Module_sd.mk sd/source sw/Module_sw.mk sw/source

[Matúš Kukan]

 sc/Module_sc.mk|2 +-
 sc/source/ui/attrdlg/scabstdlg.cxx |   11 +++
 sd/Module_sd.mk|2 +-
 sd/source/ui/dlg/sdabstdlg.cxx |   11 +++
 sw/Module_sw.mk|5 ++---
 sw/source/ui/dialog/swabstdlg.cxx  |   11 +++
 6 files changed, 25 insertions(+), 17 deletions(-)

New commits:
commit 9ad3fc29dd98167c35fcb599da0b4e764ddf04dd
Author: Matúš Kukan 
Date:   Wed Feb 19 12:21:12 2014 +0100

Avoid app specific CreateDialogFactory code for non-DESKTOP.

As happened in 7e9ac5952711400ad856b3328c5cc00c05cec6f2 for cui library.

Change-Id: If51201eb452d4b84729b37949fb9b949020b47b8

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 094290a..fae40f5 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_targets,sc,\
Library_sc \
Library_scd \
Library_scfilt \
-   Library_scui \
+   $(call gb_Helper_optional,DESKTOP,Library_scui) \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,sc,\
diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx 
b/sc/source/ui/attrdlg/scabstdlg.cxx
index 10be258..88768ed 100644
--- a/sc/source/ui/attrdlg/scabstdlg.cxx
+++ b/sc/source/ui/attrdlg/scabstdlg.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 
 #include "scabstdlg.hxx"
 
@@ -38,8 +39,9 @@ extern "C" ScAbstractDialogFactory* ScCreateDialogFactory();
 
 ScAbstractDialogFactory* ScAbstractDialogFactory::Create()
 {
-#ifndef DISABLE_DYNLOADING
 ScFuncPtrCreateDialogFactory fp = 0;
+#if HAVE_FEATURE_DESKTOP
+#ifndef DISABLE_DYNLOADING
 static ::osl::Module aDialogLibrary;
 
 OUStringBuffer aStrBuf;
@@ -49,12 +51,13 @@ ScAbstractDialogFactory* ScAbstractDialogFactory::Create()
  
SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
 fp = ( ScAbstractDialogFactory* (SAL_CALL*)() )
 aDialogLibrary.getFunctionSymbol( OUString("CreateDialogFactory") 
);
+#else
+fp = ScCreateDialogFactory();
+#endif
+#endif
 if ( fp )
 return fp();
 return 0;
-#else
-return ScCreateDialogFactory();
-#endif
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 3321279..63a345e 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_Module_add_targets,sd,\
 Library_sd \
 Library_sdd \
 Library_sdfilt \
-Library_sdui \
+$(call gb_Helper_optional,DESKTOP,Library_sdui) \
 Package_opengl \
 Package_web \
 Package_xml \
diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx
index b62eea7..34b737a 100644
--- a/sd/source/ui/dlg/sdabstdlg.cxx
+++ b/sd/source/ui/dlg/sdabstdlg.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 
 #include "sdabstdlg.hxx"
 
@@ -38,19 +39,21 @@ extern "C" SdAbstractDialogFactory* SdCreateDialogFactory();
 
 SdAbstractDialogFactory* SdAbstractDialogFactory::Create()
 {
-#ifndef DISABLE_DYNLOADING
 SdFuncPtrCreateDialogFactory fp = 0;
+#if HAVE_FEATURE_DESKTOP
+#ifndef DISABLE_DYNLOADING
 static ::osl::Module aDialogLibrary;
 static const OUString sLibName(::vcl::unohelper::CreateLibraryName("sdui", 
sal_True));
 if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, 
sLibName ) )
 fp = ( SdAbstractDialogFactory* (SAL_CALL*)() )
 aDialogLibrary.getFunctionSymbol( "CreateDialogFactory" );
+#else
+fp = SdCreateDialogFactory();
+#endif
+#endif
 if ( fp )
 return fp();
 return 0;
-#else
-return SdCreateDialogFactory();
-#endif
 }
 
 
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index d5d3f44..804cea2 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -20,12 +20,11 @@
 $(eval $(call gb_Module_Module,sw))
 
 $(eval $(call gb_Module_add_targets,sw,\
-   $(if $(filter DESKTOP,$(BUILD_TYPE)), \
-   Executable_tiledrendering) \
+   $(call gb_Helper_optional,DESKTOP,Executable_tiledrendering) \
Library_msword \
Library_sw \
Library_swd \
-   Library_swui \
+   $(call gb_Helper_optional,DESKTOP,Library_swui) \
 ))
 
 $(eval $(call gb_Module_add_l10n_targets,sw,\
diff --git a/sw/source/ui/dialog/swabstdlg.cxx 
b/sw/source/ui/dialog/swabstdlg.cxx
index 64da0e3..db26ac1 100644
--- a/sw/source/ui/dialog/swabstdlg.cxx
+++ b/sw/source/ui/dialog/swabstdlg.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
 
 #include "swabstdlg.hxx"
 
@@ -37,20 +38,22 @@ extern "C" SwAbstractDialogFactory* SwCreateDialogFactory();
 
 SwAbstractDialogFactory* SwAbstractDialogFactory::Create()
 {
-#ifndef DISABLE_DYNLOADING
 SwFuncPtrCreateDialogFactory fp = 0;
+#if HAVE_FEATURE_DESKTOP
+#ifndef DISABLE_DYNLOADING
 static ::osl::Module aDialogLibrary

[Libreoffice-commits] core.git: 6 commits - accessibility/source svtools/source svx/source sw/inc vcl/source

[Caolán McNamara]

 accessibility/source/standard/vclxaccessibleedit.cxx |   31 ---
 svtools/source/uno/treecontrolpeer.cxx   |   13 ---
 svx/source/tbxctrls/extrusioncontrols.cxx|1 
 svx/source/tbxctrls/itemwin.cxx  |9 +++--
 sw/inc/ndgrf.hxx |1 
 vcl/source/control/edit.cxx  |   14 
 6 files changed, 35 insertions(+), 34 deletions(-)

New commits:
commit 3d024d29fa7344240f6cf407d023ef3537b0a5a9
Author: Caolán McNamara 
Date:   Wed Feb 19 11:04:02 2014 +

Related: fdo#74242 send selection change before caret change

because that's what I see gtk does

Change-Id: Ifa20f4d84fd31ea6fcc640589b72efd00c9665fd

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 2e8b3f9..f923c51 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2649,19 +2649,21 @@ void Edit::ImplSetSelection( const Selection& 
rSelection, sal_Bool bPaint )
 bCaret = sal_True;
 if (nGap != 0 || oGap != 0)
 bSelection = sal_True;
-if (bCaret)
+
+if (bSelection)
 {
 if ( mbIsSubEdit )
-((Edit*)GetParent())->ImplCallEventListeners( 
VCLEVENT_EDIT_CARETCHANGED );
+((Edit*)GetParent())->ImplCallEventListeners( 
VCLEVENT_EDIT_SELECTIONCHANGED );
 else
-ImplCallEventListeners( VCLEVENT_EDIT_CARETCHANGED );
+ImplCallEventListeners( VCLEVENT_EDIT_SELECTIONCHANGED 
);
 }
-if (bSelection)
+
+if (bCaret)
 {
 if ( mbIsSubEdit )
-((Edit*)GetParent())->ImplCallEventListeners( 
VCLEVENT_EDIT_SELECTIONCHANGED );
+((Edit*)GetParent())->ImplCallEventListeners( 
VCLEVENT_EDIT_CARETCHANGED );
 else
-ImplCallEventListeners( VCLEVENT_EDIT_SELECTIONCHANGED 
);
+ImplCallEventListeners( VCLEVENT_EDIT_CARETCHANGED );
 }
 
 // #103511# notify combobox listeners of deselection
commit da13dd9a3513fa003b5a3537f6d1fb4e8ce23262
Author: Caolán McNamara 
Date:   Wed Feb 19 10:58:04 2014 +

Related: fdo#74242 #i104470# we now have a seperate CARET_CHANGED event

so cursoring left and right in normal non-multiline edit widgets should
give a11y cursor-changed events

Change-Id: I91e86e43d049793912b3ffcc2802bb9aa4b3857c

diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx 
b/accessibility/source/standard/vclxaccessibleedit.cxx
index 20e4c86..b7e5376 100644
--- a/accessibility/source/standard/vclxaccessibleedit.cxx
+++ b/accessibility/source/standard/vclxaccessibleedit.cxx
@@ -77,33 +77,30 @@ void VCLXAccessibleEdit::ProcessWindowEvent( const 
VclWindowEvent& rVclWindowEve
 SetText( implGetText() );
 }
 break;
-case VCLEVENT_EDIT_SELECTIONCHANGED:
+case VCLEVENT_EDIT_CARETCHANGED:
 {
 sal_Int32 nOldCaretPosition = m_nCaretPosition;
-sal_Int32 nOldSelectionStart = m_nSelectionStart;
-
 m_nCaretPosition = getCaretPosition();
-m_nSelectionStart = getSelectionStart();
 
 Window* pWindow = GetWindow();
-if ( pWindow && pWindow->HasChildPathFocus() )
+if (pWindow && pWindow->HasChildPathFocus())
 {
-if ( m_nCaretPosition != nOldCaretPosition )
+if (m_nCaretPosition != nOldCaretPosition)
 {
 Any aOldValue, aNewValue;
-aOldValue <<= (sal_Int32) nOldCaretPosition;
-aNewValue <<= (sal_Int32) m_nCaretPosition;
+aOldValue <<= nOldCaretPosition;
+aNewValue <<= m_nCaretPosition;
 NotifyAccessibleEvent( AccessibleEventId::CARET_CHANGED, 
aOldValue, aNewValue );
 }
-
-// #i104470# VCL only has SELECTION_CHANGED, but UAA 
distinguishes between SELECTION_CHANGED and CARET_CHANGED
-sal_Bool bHasSelection = ( m_nSelectionStart != 
m_nCaretPosition );
-sal_Bool bHadSelection = ( nOldSelectionStart != 
nOldCaretPosition );
-if ( ( bHasSelection != bHadSelection ) || ( bHasSelection && 
( ( m_nCaretPosition != nOldCaretPosition ) || ( m_nSelectionStart != 
nOldSelectionStart ) ) ) )
-{
-NotifyAccessibleEvent( 
AccessibleEventId::TEXT_SELECTION_CHANGED, Any(), Any() );
-}
-
+}
+}
+break;
+case VCLEVENT_EDIT_SELECTIONCHANGED:
+{
+Window* pWindow = GetWindow();
+if (pWindow && pWindow->HasChildPathFo

Re: Testing/Working on PyUNO?

[Stephan Bergmann]

[putting the dev list on CC, quoting the original mail in full below for 
reference]


Hi Kevin,

First of all: great that you want to improve the PyUNO situation!  This 
is a part of the code that could indeed benefit from lots of love.


Regarding the Python tests, I see both sides' points:

On the one hand, a test in Python indeed does not only serve as a test 
for the immediate subject of the test, but also---somewhat 
indirectly---as a test of the PyUNO infrastructure and as part of a 
corpus of PyUNO example code.  This is not much different from how our 
well-hated so-called "unoapi" and "complex" tests test URP (and Java) 
interaction as a side effect (though they're so ugly that nobody in 
their right mind would claim that they are valuable additions to any 
corpus of example code).


On the other hand, a test is intended to fail (as soon as you introduce 
an error), and should make it easy for the developer to find the 
underlying error.  For that, any extra layers between the test code and 
the code under test are detrimental, in that they make it harder to 
debug the problem and introduce the likelihood that a reported error is 
not actually in the code under test but rather somewhere else in the 
infrastructure (which remains an error that needs to be fixed after all, 
but less likely by the person who changed the code under test).


So, what can we do here?  How about an additional code module dedicated 
to subsequentchecks written in Python, which, while serving the useful 
purpose of testing specific application functionality (and in which role 
they may deliberately duplicate existing "native" tests), are meant more 
as a means to improve the PyUNO situation.


The idea would be that Kevin (and others) would fill this with PyUNO 
coding scenarios that cross their mind, discover errors in the PyUNO 
infrastructure, ideally distill tests for those specific errors out of 
the more general tests (that could then even go into more specific code 
modules like pyuno or testtools), and eventually prune test snippets 
again that are no longer useful.


What I would like to avoid though is a sort of code dump, filled with 
random one-off stuff of little value to anybody.  We have 
 already, 
and it lies virtually dormant.


How does that sound?

Stephan


On 02/17/2014 08:53 PM, Kevin Hunter Kesling wrote:

Hi Stephan,

Markus (moggi) suggested over IRC that I talk to you about how to test
PyUNO interactions with Calc.  The long-winded email below is just
background for this question: I claim the LibO/Python bindings are weak
and poorly tested.  As my work often presents opportunities that could
be brilliantly addressed by easier Python scripting of LibO, I'd like to
improve the Python bindings situation.  How best can I accomplish this?

I recently submitted a patch to gerrit that adds a test nominally for a
recently closed bug:

 https://gerrit.libreoffice.org/#/c/8078/

This test is a functional test of a specific Calc interaction (inserting
cells).  As noted in the commit message, the bug was already quashed,
and Kohei said in the IRC conversation[1] that the offending library
(mdds) already has a test for it's role in the related fdo bug. However,
that still says to me that the actual part that an end-user cares about
-- in this case the inserting of cells -- is not directly tested.

Through interaction with Kohei and Markus, it's clear that writing the
tests for the internal workings of a C++ project in Python is not
acceptable (not the right "tool for the job"), and I can see the
perspective that not one, but two core maintainers have.

However, this leads me to the larger observation (the one for which I
originally decided to write the test in Python over C++) is that I see
hardly any tests of LibO's Python bindings of Calc (sc/).  Ideally, I'd
like to be able to do more Python scripting of LibO, and the quality of
the bindings is what holds me back.  This snippet from the attached
larger IRC conversation may help elucidate where I'm coming from:

 (01:57:35 PM) kohei: and I'm generally not in favor of python
unit tests. it's not very useful for the maintainers to
debug failures.
 (01:58:48 PM) frothnicator: kohei: okay, I hear that I don't
get it.  I'm trying to.  The only way I know to test and
learn something is to use it.  My main interaction would be
through UNO, unless I learn of a better way.  Thus, when I
try to introspect an item through Python's REPL, and get
back an exception for merely calling repr(some_object), or
my remote connection is broken because of a recoverable
exception, I don't know what else to call that unstable.

The point being that though I wrote it in Python, the test is actually
testing multiple things, both of which are important to me: the
interaction between Python and LibO, and the core functionality that
motivated

minutes of ESC call ...

[Michael Meeks]

Apologies - I completely forgot to send this last week:

* Present:
+ Cedric, David, Andras, Christian, Astron, Markus, Michael M, Miklos,
  Lionel, Stephan, Caolan, Kendy, Adam, Bjoern, Jacobo, Tor
 
* Completed Action Items
+ add slides to 
https://wiki.documentfoundation.org/Marketing/Events/Fosdem2014/talks
[ volunteer to add thumbnails appreciated ;-].
 
* Pending Action Items:
+ GSOC mentors - prune / remove already done ideas from each side (All)
+ need design for copying styles between templates (Cor Nouws/other UX?)
cf. 
http://www.mail-archive.com/libreoffice-ux-advise@lists.freedesktop.org/msg01658.html

http://www.mail-archive.com/libreoffice-ux-advise@lists.freedesktop.org/msg01663.html
[ Astron made mockup, discussed with Cor, but not published yet ]
+ look into non-functioning 'install' button in update dialog (Kendy / 
Andras)
[ Kendy has security concerns around downloading & executing pieces here
  not a trivial fix. Signing / build verification discussion stalled.
  Investigation ongoing. ].
+ Online Help needs update to match current behavior (Help -> Check for 
Updates -> Help)
 
https://help.libreoffice.org/swriter/EXTENSIONS_HID_CHECK_FOR_UPD_DLG
AI  + File an MAB and loose it here (Kendy)
+ https://bugs.freedesktop.org/show_bug.cgi?id=74934
 
* Release Engineering update (Christian)
+ 4.1.5 RC3 status
+ a Calc problem needed RC3
+ Linux & Mac already uploaded, Windows just packinging
+ will be announced for early testing later today,
  final announcement delayed to the next week
+ 4.2.1 RC1 status
+ currently building on Windows (almost finished),
+ can be pushed to pre-releases & announced to early-QA today.
+ new-strings, previously un-translated, now marked - but didn't
  update them in Pootle - not yet available
+ will be updated today, so 2 weeks until fixing in RC2.
* GSoC update (Cedric)
+ Google review starting / underway
+ please consider what you are able to mentor:
+ https://wiki.documentfoundation.org/Development/GSoC/Ideas
+ please checkout tasks with only one mentor and add yourself as a backup 
mentor.
 
* Crashtest update (Markus)
+ new crash-test / data (?)
+ 
http://dev-builds.libreoffice.org/crashtest/f3d93434829d0e7c004679d000c30a934083b188/
+ calc looks really good outside of sxc
+ about 50x new writer issues on master
 
* UX hackfest bits (Kendy)
+ update achievements: Ahmad, Mirek, Tamas, Jacobo, others ... ?
  https://wiki.documentfoundation.org/Hackfest/FOSDEM2014#Achievements
+ be great to get some a11y fixes in (Jacobo)
+ need more small usability bugs for the next hack-fest to nail (Astron)
+ would have been good to have 50x string change bugs or somesuch.
+ could we file these as easy hacks ? (Michael)
+ perhaps a list like the QA team ? (Astron)
AI: + will try filing a lot of small string changes as easy hacks 
(Michael)
+ instead, had a number of quite large bugs, of which few were fixed.
 
* UX update (Astron)
+ Mirek & Astron - been distracted, not a lot happening just now.
+ need to get chats re-started etc.
 
* new hack-fest proposal (Bjoern)
+ offer of a hack-fest there, end of April
+ somewhat far away, but flights not so expensive ~Eur300 return
+ will enough people go there ? and what date ?
+ initial proposal - Easter weekend but expensive etc.
+ weekend ~problematic ? but Thur/Fri possible; April 24-25th ?
+ do we have budget ? (Michael)
+ yes, developer budget is there (Bjoern)
   + do we find enough (of the right) people to go ?
+ not end of April, would like to go (Stephan)
 
* HiDPI patches for 4.2.x? (Kendy)
+ LibreOffice does not look good on HiDPI screens at all - close to unusable
+ proposal to merge the HiDPI work to 4.2.x as a late feature
+ I would split the work into 'safe' and 'need real review' parts & 
push to a branch
+ can I get ESC approval / 3 intedependent reviews for that ?
+ is it a feature or a bug-fix ? (Michael)
+ most of the pieces going in enclosed in an if (hidpi) ...
+ checking that everything in the right if.
+ less safe part is checking / setting that flag; a small VCL piece.
+ Michael / Caolan signed up to review as/when there is a branch.
 
* Certification update (Kendy/Bjoern/Stephan)
 
* QA (Bjoern)
+ Celebrated 25k reported bugs in LibreOffice recently:
   + http://skyfromme.wordpress.com/2014/02/11/libreoffice-bugzilla-status/
   + mostly closed, great to see Sophie's impact on triage.
+ post-release bug filing rate is ~static
   + so release not terribly bad.
+ 4.2.0 pushed to Ubuntu development release
+ Awesome work by Michael Stahl on writer regressio

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 0e/90517f3dd568cfe2be4bf8c256b94c9401d046

[Caolán McNamara]

 0e/90517f3dd568cfe2be4bf8c256b94c9401d046 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5037f1a55cd17103cb768f38c24abaa9e8f25a5f
Author: Caolán McNamara 
Date:   Wed Feb 19 10:38:24 2014 +

Notes added by 'git notes add'

diff --git a/0e/90517f3dd568cfe2be4bf8c256b94c9401d046 
b/0e/90517f3dd568cfe2be4bf8c256b94c9401d046
new file mode 100644
index 000..97a6630
--- /dev/null
+++ b/0e/90517f3dd568cfe2be4bf8c256b94c9401d046
@@ -0,0 +1 @@
+merged as: ce96f8b02e490b74bff57ca57a2c6a86c3041e32
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andre Fischer]

 framework/source/layoutmanager/layoutmanager.cxx |1 +
 sw/source/filter/ww8/rtfsdrexport.cxx|1 +
 sw/source/filter/ww8/ww8par.hxx  |1 -
 sw/source/ui/inc/cfgitems.hxx|1 -
 4 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ce96f8b02e490b74bff57ca57a2c6a86c3041e32
Author: Andre Fischer 
Date:   Tue Feb 18 09:21:55 2014 +

Resolves: #i122576# Reset the docking area acceptor in the destructor

(cherry picked from commit 0e90517f3dd568cfe2be4bf8c256b94c9401d046)

Conflicts:
framework/source/layoutmanager/layoutmanager.cxx

Change-Id: Ib053a1b474434f81608a04ca0d30dd32fe410e5a

diff --git a/framework/source/layoutmanager/layoutmanager.cxx 
b/framework/source/layoutmanager/layoutmanager.cxx
index d1267dbe..2b570dd 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -155,6 +155,7 @@ LayoutManager::~LayoutManager()
 {
 Application::RemoveEventListener( LINK( this, LayoutManager, 
SettingsChanged ) );
 m_aAsyncLayoutTimer.Stop();
+setDockingAreaAcceptor(NULL);
 delete m_pGlobalSettings;
 }
 
commit 5bb7c0ab476ca108aecb5bf43ec9adc6d173f13b
Author: Caolán McNamara 
Date:   Wed Feb 19 10:21:10 2014 +

coverity#738892 Uninitialized scalar field

Change-Id: I4eecd759cf22f91a98830fc51b394ac959d6dc8a

diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx 
b/sw/source/filter/ww8/rtfsdrexport.cxx
index 9a2f051..86989b8 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -39,6 +39,7 @@ RtfSdrExport::RtfSdrExport( RtfExport &rExport )
   m_rAttrOutput( (RtfAttributeOutput&)m_rExport.AttrOutput() ),
   m_pSdrObject( NULL ),
   m_nShapeType( ESCHER_ShpInst_Nil ),
+  m_nShapeFlags ( 0 ) ,
   m_pShapeStyle( new OStringBuffer( 200 ) ),
   m_pShapeTypeWritten( new bool[ ESCHER_ShpInst_COUNT ] )
 {
commit 03fb400dc3900d0ca063d9a25b5265ba4e451486
Author: Caolán McNamara 
Date:   Wed Feb 19 10:19:46 2014 +

coverity#738895 unused member

Change-Id: I6bca0a36708e4e8fd3a22a23d76a89525b6d75bc

diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index d98eb0a..ba6ec23 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -640,7 +640,6 @@ public:
 
 sal_uInt16 hpsCheckBox;
 sal_uInt16 nChecked;
-sal_uInt16 nDefaultChecked;
 
 OUString sTitle;
 OUString sDefault;
commit 285d1d1a5df5398d78bd45e6641cea371f9bbc17
Author: Caolán McNamara 
Date:   Wed Feb 19 10:18:14 2014 +

coverity#738899 unused member

Change-Id: I3f96d50709c9a6832192b97d4174b9cea07c5057

diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/ui/inc/cfgitems.hxx
index af77a76..e78f850 100644
--- a/sw/source/ui/inc/cfgitems.hxx
+++ b/sw/source/ui/inc/cfgitems.hxx
@@ -91,7 +91,6 @@ class SW_DLLPUBLIC SwElemItem : public SfxPoolItem
 bool bSmoothScroll  :1;
 //visual aids
 bool bCrosshair :1;
-bool bHandles   :1;
 //display
 bool bTable :1;
 bool bGraphic   :1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

interim release 4.2.1 -- branches and outstanding patches

[Bjoern Michaelsen]

Hi,

just asking for a short clarification. As per:

 
http://nabble.documentfoundation.org/interim-release-this-week-4-2-1-td4097746.html

we are releasing the libreoffice-4.2.1.1 tag as "LibreOffice 4.2.1 final". As
there are already some further patches on the libreoffice-4-2-1 branch[1] and
also some still waiting for review[2], I assume patches intended for the
"LibreOffice 4.2.2 final" release still should get pushed to
refs/for/libreoffice-4-2-1, right?

If that is the case, what is the libreoffice-4-2-2 branch for and shouldnt we 
kill
it for now to avoid confusion? I see already commits on that branch that are
not on the libreoffice-4-2-1 branch there. Having some people commit on -4-2-1
and some on -4-2-2 is really the worst scenario.

@Cloph: Can you confirm the first and clarify on the second?

Best,

Bjoern

[1] 
https://gerrit.libreoffice.org/gitweb?p=core.git;a=shortlog;h=refs/heads/libreoffice-4-2-1
[2] 
https://gerrit.libreoffice.org/#/q/status:open+project:core+branch:libreoffice-4-2-1,n,z
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 7e/5783030c82f8ec87b88899869e9152cf5c3271

[Caolán McNamara]

 7e/5783030c82f8ec87b88899869e9152cf5c3271 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d96ced7f8a874e2f73eab7c823a79b5107377e88
Author: Caolán McNamara 
Date:   Wed Feb 19 10:17:30 2014 +

Notes added by 'git notes add'

diff --git a/7e/5783030c82f8ec87b88899869e9152cf5c3271 
b/7e/5783030c82f8ec87b88899869e9152cf5c3271
new file mode 100644
index 000..96ae75a
--- /dev/null
+++ b/7e/5783030c82f8ec87b88899869e9152cf5c3271
@@ -0,0 +1 @@
+merged as: 5b9003372effe4ee4bc34f34ee20138ac6a6050f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 8 commits - filter/source slideshow/source svx/source sw/source unotools/source

[Andre Fischer]

 filter/source/msfilter/msdffimp.cxx|4 
 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx |   42 
++
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx|   23 
+
 svx/source/sidebar/possize/PosSizePropertyPanel.hxx|   12 
++
 svx/source/svdraw/svdopath.cxx |   33 
++-
 sw/source/ui/config/usrpref.cxx|4 
 sw/source/ui/docvw/edtwin.cxx  |   18 
+++-
 sw/source/ui/inc/edtwin.hxx|   16 
+--
 sw/source/ui/inc/gloslst.hxx   |6 +
 unotools/source/config/securityoptions.cxx |6 +
 10 files changed, 135 insertions(+), 29 deletions(-)

New commits:
commit 5b9003372effe4ee4bc34f34ee20138ac6a6050f
Author: Andre Fischer 
Date:   Tue Feb 18 14:17:32 2014 +

Resolves: #i124216# Detect changes of the UI scale.

(cherry picked from commit 7e5783030c82f8ec87b88899869e9152cf5c3271)

Conflicts:
svx/source/sidebar/possize/PosSizePropertyPanel.hxx

Change-Id: Ia31d5645694ca9b9ebb36f38c650103905b346a8

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 291d71b..f320e3e 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -811,6 +811,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
 
 case SID_ATTR_METRIC:
 MetricState( eState, pState );
+UpdateUIScale();
 break;
 
 default:
@@ -1162,4 +1163,26 @@ void PosSizePropertyPanel::DisableControls()
 }
 
 
+
+
+void PosSizePropertyPanel::UpdateUIScale()
+{
+const Fraction aUIScale (mpView->GetModel()->GetUIScale());
+if (maUIScale != aUIScale)
+{
+// UI scale has changed.
+
+// Remember the new UI scale.
+maUIScale = aUIScale;
+
+// The content of the position and size boxes is only updated when 
item changes are notified.
+// Request such notifications without changing the actual item values.
+GetBindings()->Invalidate(SID_ATTR_TRANSFORM_POS_X, sal_True, 
sal_False);
+GetBindings()->Invalidate(SID_ATTR_TRANSFORM_POS_Y, sal_True, 
sal_False);
+GetBindings()->Invalidate(SID_ATTR_TRANSFORM_WIDTH, sal_True, 
sal_False);
+GetBindings()->Invalidate(SID_ATTR_TRANSFORM_HEIGHT, sal_True, 
sal_False);
+}
+}
+
+
 } } // end of namespace svx::sidebar
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index f789282..5649a49 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -173,6 +173,18 @@ private:
 void MetricState( SfxItemState eState, const SfxPoolItem* pState );
 FieldUnit GetCurrentUnit( SfxItemState eState, const SfxPoolItem* pState );
 void DisableControls();
+
+/** Check if the UI scale has changed and handle such a change.
+UI scale is an SD only feature.  The UI scale is represented by items
+ATTR_OPTIONS_SCALE_X and
+ATTR_OPTIONS_SCALE_Y.
+As we have no direct access (there is no dependency of svx on sd) we 
have to
+use a small trick (aka hack):
+a) call this method whenever a change of the metric item is notified,
+b) check if the UI scale has changed (strangely, the UI scale value is 
available at the SdrModel.
+c) invalidate the items for position and size to trigger notifications 
of their current values.
+*/
+void UpdateUIScale();
 };
 
 
commit aad580af924d477f90264d6d1a2365d8e0cf8c9c
Author: Caolán McNamara 
Date:   Wed Feb 19 09:41:49 2014 +

coverity#738900 Uninitialized scalar field

Change-Id: I71eef3a4ffddac418b79866c0080c2d2d58a8226

diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx
index acdcac3..e848580 100644
--- a/sw/source/ui/config/usrpref.cxx
+++ b/sw/source/ui/config/usrpref.cxx
@@ -50,7 +50,8 @@ SwMasterUsrPref::SwMasterUsrPref(sal_Bool bWeb) :
 bIsHScrollMetricSet(sal_False),
 bIsVScrollMetricSet(sal_False),
 nDefTab( MM50 * 4 ),
-bIsSquaredPageMode(sal_False),
+bIsSquaredPageMode(false),
+bIsAlignMathObjectsToBaseline(false),
 aContentConfig(bWeb, *this),
 aLayoutConfig(bWeb, *this),
 aGridConfig(bWeb, *this),
@@ -60,6 +61,7 @@ SwMasterUsrPref::SwMasterUsrPref(sal_Bool bWeb) :
 {
 MeasurementSystem eSystem = 
SvtSysLocale().GetLocaleData().getMeasurementSystemEnum();
 eUserMetric = MEASURE_METRIC == eSystem ? FUNIT_CM : FUNIT_INCH;
+eHScrollMetric = eVScrollMetric = eUserMetric;
 
 aContentConfig.Load();
 aLayoutConfig.Load();
commit df889fb50b1a6e52de05484

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - padmin/source

[Michael Stahl]

 0 files changed

New commits:
commit bea557c3268a7624f11ff76076ed58699abf6d02
Author: Michael Stahl 
Date:   Tue Feb 18 14:09:43 2014 +0100

chmod spadmin script executable

Change-Id: I008be78b41a20924c1dabe291157ef9633282fe6
(cherry picked from commit a67f3f73248f998764bea46292118aa2c9886c11)
Reviewed-on: https://gerrit.libreoffice.org/8114
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/padmin/source/spadmin.sh b/padmin/source/spadmin.sh
old mode 100644
new mode 100755
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 63154] replace tools/solar.h macros with osl versions

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=63154

--- Comment #54 from Stephan Bergmann  ---
(In reply to comment #6)
> not sure who had the crazy idea of hard-coding "lo" into dozens of library
> loading calls... but clearly that silly "lo" suffix serves no useful purpose
> and we should just get rid of it in the build system, in which case
> SVLIBRARY can be trivially replaced with SAL_MODULENAME.

See bug 67313 for a rationale why the "lo" suffix is useful after all.

(In reply to comment #53)
> Any idea of where to put SVLIBRARY, or it can't be touched yet?

In light of the above, I would still stick to comment 3.

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8d/769be834186ae6aa05e64d88b95a6b9d874c2e

[Caolán McNamara]

 8d/769be834186ae6aa05e64d88b95a6b9d874c2e |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4df705461fb1836d583e194ac80541e6b469b6f1
Author: Caolán McNamara 
Date:   Wed Feb 19 09:13:00 2014 +

Notes added by 'git notes add'

diff --git a/8d/769be834186ae6aa05e64d88b95a6b9d874c2e 
b/8d/769be834186ae6aa05e64d88b95a6b9d874c2e
new file mode 100644
index 000..a5985ce
--- /dev/null
+++ b/8d/769be834186ae6aa05e64d88b95a6b9d874c2e
@@ -0,0 +1 @@
+merged as: 91a7096af027d3a5b12972a6a5256c2a52812686
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sc/source/ui/unoobj/viewuno.cxx  |3 +
 sw/inc/docsh.hxx |6 ---
 sw/inc/swwait.hxx|   19 --
 sw/source/ui/app/swwait.cxx  |   70 +--
 sw/source/ui/dochdl/swdtflvr.cxx |3 -
 5 files changed, 65 insertions(+), 36 deletions(-)

New commits:
commit b68e42c51823eb1690c0a0fa096124ec607616b2
Author: Caolán McNamara 
Date:   Tue Feb 18 20:50:35 2014 +

coverity#738809 Uninitialized scalar field

Change-Id: If2d985ae8ed940e22d755289b8176f92238bc911

diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index a6d3e36..62f7e8e 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -468,7 +468,8 @@ ScTabViewObj::ScTabViewObj( ScTabViewShell* pViewSh ) :
 aActivationListeners( 0 ),
 nPreviousTab( 0 ),
 bDrawSelModeSet(false),
-mbLeftMousePressed(false),
+bFilteredRangeSelection(false),
+mbLeftMousePressed(false),
 mbPendingSelectionChanged(false)
 {
 if (pViewSh)
commit 91a7096af027d3a5b12972a6a5256c2a52812686
Author: Oliver-Rainer Wittmann 
Date:   Mon Feb 17 16:38:10 2014 +

Resolves: #i124096# avoid unlock of dispatcher by...

recursive Lock-Unlock-pattern

(cherry picked from commit 8d769be834186ae6aa05e64d88b95a6b9d874c2e)

Conflicts:
sw/inc/docsh.hxx
sw/inc/swwait.hxx
sw/source/core/doc/docdesc.cxx
sw/source/core/edit/autofmt.cxx
sw/source/core/edit/edtab.cxx
sw/source/ui/app/docsh.cxx
sw/source/ui/app/docsh2.cxx
sw/source/ui/app/docshini.cxx
sw/source/ui/app/swwait.cxx
sw/source/ui/dbui/dbinsdlg.cxx
sw/source/ui/dbui/dbmgr.cxx
sw/source/ui/dochdl/swdtflvr.cxx
sw/source/ui/lingu/hyp.cxx
sw/source/ui/misc/glossary.cxx
sw/source/ui/misc/redlndlg.cxx
sw/source/ui/shells/annotsh.cxx
sw/source/ui/shells/drawsh.cxx
sw/source/ui/shells/drwtxtex.cxx
sw/source/ui/shells/frmsh.cxx
sw/source/ui/shells/textsh1.cxx
sw/source/ui/uiview/view2.cxx
sw/source/ui/uiview/viewsrch.cxx

Change-Id: I332d9ef6c3ce3205608850f9caccfa7b83a54ef3

diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 5f919cf..04471ea 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -262,12 +262,6 @@ public:
 
 sal_Int16   GetUpdateDocMode() const {return nUpdateDocMode;}
 
-/** Activate wait cursor for all windows of this document
-Optionally all dispatcher could be Locked
-Usually locking should be done using the class: SwWait. */
-void EnterWait( bool bLockDispatcher );
-void LeaveWait( bool bLockDispatcher );
-
 void ToggleBrowserMode(sal_Bool bOn, SwView* pView);
 
 sal_uLong LoadStylesFromFile( const OUString& rURL, SwgReaderOption& rOpt,
diff --git a/sw/inc/swwait.hxx b/sw/inc/swwait.hxx
index 6e4f422..bdf620f 100644
--- a/sw/inc/swwait.hxx
+++ b/sw/inc/swwait.hxx
@@ -21,15 +21,28 @@
 
 #include "swdllapi.h"
 
+#include 
+
 class SwDocShell;
+class SfxDispatcher;
 
 class SW_DLLPUBLIC SwWait
 {
-SwDocShell &rDoc;
-boolbLock;
 public:
-SwWait( SwDocShell &rDocShell, bool bLockDispatcher );
+// Activate wait cursor for all windows of given document 
+// Optional all dispatcher could be Locked
+SwWait(
+SwDocShell &rDocShell,
+const bool bLockUnlockDispatcher );
 ~SwWait();
+
+private:
+void EnterWaitAndLockDispatcher();
+void LeaveWaitAndUnlockDispatcher();
+
+SwDocShell& mrDoc;
+const bool mbLockUnlockDispatcher;
+boost::unordered_set< SfxDispatcher* > mpLockedDispatchers;
 };
 
 #endif
diff --git a/sw/source/ui/app/swwait.cxx b/sw/source/ui/app/swwait.cxx
index 683b825..9ac290e 100644
--- a/sw/source/ui/app/swwait.cxx
+++ b/sw/source/ui/app/swwait.cxx
@@ -17,47 +17,69 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+#include 
+
 #include 
 #include 
 #include 
-#include 
-#include 
 
 
-void SwDocShell::EnterWait( bool bLockDispatcher )
+SwWait::SwWait(
+SwDocShell &rDocShell,
+const bool bLockUnlockDispatcher )
+: mrDoc ( rDocShell )
+, mbLockUnlockDispatcher( bLockUnlockDispatcher )
+, mpLockedDispatchers()
 {
-SfxViewFrame *pFrame = SfxViewFrame::GetFirst( this, sal_False );
+EnterWaitAndLockDispatcher();
+}
+
+SwWait::~SwWait()
+{
+LeaveWaitAndUnlockDispatcher();
+}
+
+void SwWait::EnterWaitAndLockDispatcher()
+{
+SfxViewFrame *pFrame = SfxViewFrame::GetFirst( &mrDoc, sal_False );
 while ( pFrame )
 {
 pFrame->GetWindow().EnterWait();
-if ( bLockDispatcher )
-pFrame->GetDispatcher()->Lock( sal_True );
-pFrame = SfxViewFrame::GetNext( *pFrame, this, sal_False );
+if ( mbLockUnlockDispatcher )
+{
+// do not look already locked dispatchers
+SfxDispatcher* pDispatcher = pFrame->

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

[Jan-Marek Glogowski]

 vcl/source/window/menu.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 56bea42176e5f0b850da0bab410dda560fc89255
Author: Jan-Marek Glogowski 
Date:   Wed Feb 19 08:45:05 2014 +

Fix minimal VCL menu item height with icons

Don't reset the calculated minimal menu item height to the icon
height, if the minimal height is already larger then the icon height.

Change-Id: Ifcd6c750352c4d3f754a693df7254a4654a8afe6

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index c2de81b..8d3e3f4 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2412,7 +2412,8 @@ Size Menu::ImplCalcSize( const Window* pWin )
 const StyleSettings& rSettings = pWin->GetSettings().GetStyleSettings();
 if ( rSettings.GetUseImagesInMenus() )
 {
-nMinMenuItemHeight = 16;
+if ( 16 > nMinMenuItemHeight )
+nMinMenuItemHeight = 16;
 for ( size_t i = pItemList->size(); i; )
 {
 MenuItemData* pData = pItemList->GetDataFromPos( --i );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits