[Libreoffice-bugs] [Bug 92787] Calc crashes when sorting a column
https://bugs.documentfoundation.org/show_bug.cgi?id=92787 --- Comment #1 from Francisco franciscoadriansanc...@gmail.com --- Created attachment 117285 -- https://bugs.documentfoundation.org/attachment.cgi?id=117285action=edit file I'm attaching also the ODS with which I have had problems. However, since I haven't been able to reproduce it with defined steps I'm not sure if it will help :-( -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] libvisio.git: 4 commits - src/lib
src/lib/VSDContentCollector.cpp | 11 ++ src/lib/VSDStyles.cpp | 153 src/lib/VSDStylesCollector.cpp |5 + 3 files changed, 61 insertions(+), 108 deletions(-) New commits: commit 1c71f0a300b012cca709662823e9cbfa85fb7b36 Author: David Tardon dtar...@redhat.com Date: Thu Jul 16 18:59:23 2015 +0200 avoid endless loop when reading broken file Change-Id: I95ba48b926e51873786255e8933e94def4b04ace diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp index 1d98798..8f2759a 100644 --- a/src/lib/VSDContentCollector.cpp +++ b/src/lib/VSDContentCollector.cpp @@ -8,6 +8,7 @@ */ #include string.h // for memcpy +#include set #include stack #include boost/spirit/include/classic.hpp #include unicode/ucnv.h @@ -1771,6 +1772,9 @@ void libvisio::VSDContentCollector::transformPoint(double x, double y, XForm * unsigned shapeId = m_currentShapeId; + std::setunsigned visitedShapes; // avoid mutually nested shapes in broken files + visitedShapes.insert(shapeId); + if (txtxform) applyXForm(x, y, *txtxform); @@ -1791,7 +1795,7 @@ void libvisio::VSDContentCollector::transformPoint(double x, double y, XForm * if (iter != m_groupMemberships-end() shapeId != iter-second) { shapeId = iter-second; -shapeFound = true; +shapeFound = visitedShapes.insert(shapeId).second; } } if (!shapeFound) @@ -1828,6 +1832,9 @@ void libvisio::VSDContentCollector::transformFlips(bool flipX, bool flipY) unsigned shapeId = m_currentShapeId; + std::setunsigned visitedShapes; // avoid mutually nested shapes in broken files + visitedShapes.insert(shapeId); + while (true m_groupXForms) { std::mapunsigned, XForm::iterator iterX = m_groupXForms-find(shapeId); @@ -1848,7 +1855,7 @@ void libvisio::VSDContentCollector::transformFlips(bool flipX, bool flipY) if (iter != m_groupMemberships-end() shapeId != iter-second) { shapeId = iter-second; -shapeFound = true; +shapeFound = visitedShapes.insert(shapeId).second; } } if (!shapeFound) commit 03eed259ce331998af623cf5da5320441ed55d1f Author: David Tardon dtar...@redhat.com Date: Thu Jul 16 18:43:34 2015 +0200 avoid endless loop when reading broken file Change-Id: I4956a3438d273a06a11d96031e2759062dce1e95 diff --git a/src/lib/VSDStyles.cpp b/src/lib/VSDStyles.cpp index ff29267..f8fd33d 100644 --- a/src/lib/VSDStyles.cpp +++ b/src/lib/VSDStyles.cpp @@ -7,6 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include set #include stack #include VSDStyles.h #include VSDTypes.h @@ -24,12 +25,18 @@ T getOptionalStyle(const std::mapunsigned, unsigned styleMasters, const std:: if (MINUS_ONE == styleIndex) return style; std::stackunsigned styleIdStack; + std::setunsigned foundStyles; styleIdStack.push(styleIndex); while (true) { std::mapunsigned, unsigned::const_iterator iter = styleMasters.find(styleIdStack.top()); if (iter != styleMasters.end() iter-second != MINUS_ONE) - styleIdStack.push(iter-second); +{ + if (foundStyles.insert(iter-second).second) +styleIdStack.push(iter-second); + else // we already have this style - stop incoming endless loop +break; +} else break; } commit 4a2e82ddca257374ab04c7bbbc1869e666a2d6b9 Author: David Tardon dtar...@redhat.com Date: Thu Jul 16 16:56:00 2015 +0200 avoid copypasta Change-Id: I5f7dc4912aebd763da27984fcd5644a9419901bf diff --git a/src/lib/VSDStyles.cpp b/src/lib/VSDStyles.cpp index 8280ae4..ff29267 100644 --- a/src/lib/VSDStyles.cpp +++ b/src/lib/VSDStyles.cpp @@ -11,6 +11,42 @@ #include VSDStyles.h #include VSDTypes.h +namespace libvisio +{ + +namespace +{ + +templatetypename T +T getOptionalStyle(const std::mapunsigned, unsigned styleMasters, const std::mapunsigned, T styles, const unsigned styleIndex) +{ + T style; + if (MINUS_ONE == styleIndex) +return style; + std::stackunsigned styleIdStack; + styleIdStack.push(styleIndex); + while (true) + { +std::mapunsigned, unsigned::const_iterator iter = styleMasters.find(styleIdStack.top()); +if (iter != styleMasters.end() iter-second != MINUS_ONE) + styleIdStack.push(iter-second); +else + break; + } + while (!styleIdStack.empty()) + { +typename std::mapunsigned, T::const_iterator iter = styles.find(styleIdStack.top()); +if (iter != styles.end()) + style.override(iter-second); +styleIdStack.pop(); + } + return style; +} + +} + +} + libvisio::VSDStyles::VSDStyles() : m_lineStyles(), m_fillStyles(), m_textBlockStyles(), m_charStyles(), m_paraStyles(), m_themeRefs(), m_lineStyleMasters(), m_fillStyleMasters(), m_textStyleMasters() @@ -94,52 +130,12 @@ void libvisio::VSDStyles::addTextStyleMaster(unsigned textStyleIndex, unsigned t
[Libreoffice-bugs] [Bug 76845] Other: File Wizards Web Pages crashes LibreOffice on Windows
https://bugs.documentfoundation.org/show_bug.cgi?id=76845 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added CC||serval2...@yahoo.fr --- Comment #7 from Julien Nabet serval2...@yahoo.fr --- Gordo: following http://cgit.freedesktop.org/libreoffice/core/commit/?id=2f0d1a23759c1b973593bfba642d01fb3df3c269, could you give a new try with a more recent build? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92784] Typo error?
https://bugs.documentfoundation.org/show_bug.cgi?id=92784 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added Status|UNCONFIRMED |NEW CC||serval2...@yahoo.fr Ever confirmed|0 |1 --- Comment #3 from Julien Nabet serval2...@yahoo.fr --- On pc Debian x86-64 with master sources updated yesterday, I could reproduce this SAL_USE_VCLPLUGIN=gen not with gtk3. rendering/vcl problem -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92794] Addressbook Integration: Unevaluated variable '$filename$' displayed in error dialog
https://bugs.documentfoundation.org/show_bug.cgi?id=92794 Robinson Tryon (qubit) qu...@runcibility.com changed: What|Removed |Added CC||qu...@runcibility.com, ||serval2...@yahoo.fr --- Comment #1 from Robinson Tryon (qubit) qu...@runcibility.com --- Julien: Same issue/related to bug 90446? And do you expect this to be fixed on the 5.0 branch? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92789] FILEOPEN embedded graphic of format pct is not displayed.
https://bugs.documentfoundation.org/show_bug.cgi?id=92789 Maxim Monastirsky momonas...@gmail.com changed: What|Removed |Added CC||caol...@redhat.com, ||momonas...@gmail.com Component|Writer |filters and storage Version|5.1.0.0.alpha0+ Master |4.4.0.0.beta1 --- Comment #4 from Maxim Monastirsky momonas...@gmail.com --- @Caolán: You might be interested in this one. This regressed in your coverity#1209824 commit (and started to show the error message in one of the coverity#1242658 commits). -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 87274] CONDITIONAL FORMATTING: Option for reunify ranges with same conditions
https://bugs.documentfoundation.org/show_bug.cgi?id=87274 m.a.riosv miguelange...@libreoffice.org changed: What|Removed |Added CC||ariel...@gmail.com --- Comment #2 from m.a.riosv miguelange...@libreoffice.org --- *** Bug 92769 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92769] EDITING: Broken Conditional Formatting When Copying
https://bugs.documentfoundation.org/show_bug.cgi?id=92769 m.a.riosv miguelange...@libreoffice.org changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED CC||miguelangelrv@libreoffice.o ||rg Resolution|--- |DUPLICATE --- Comment #2 from m.a.riosv miguelange...@libreoffice.org --- Hi @Benjamin, thanks for reporting. It's how it works for nwo. At the end of 2014 I opended a request for enhancement about this matter. *** This bug has been marked as a duplicate of bug 87274 *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92282] Freeze when saving file as pptx
https://bugs.documentfoundation.org/show_bug.cgi?id=92282 tommy27 ba...@quipo.it changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #3 from tommy27 ba...@quipo.it --- @raal please retest with a newer 5.1 alpha build then give feedback. NEEDINFO until then. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: 11 commits - chart2/Library_chartcontroller.mk chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk include/sfx2 officecfg/registry sfx2/source
chart2/Library_chartcontroller.mk |2 chart2/UIConfig_chart2.mk |1 chart2/source/controller/inc/ChartController.hxx|2 chart2/source/controller/main/ChartController.cxx | 30 - chart2/source/controller/sidebar/Chart2PanelFactory.cxx |3 chart2/source/controller/sidebar/ChartElementsPanel.cxx | 37 - chart2/source/controller/sidebar/ChartElementsPanel.hxx |7 chart2/source/controller/sidebar/ChartSeriesPanel.cxx | 295 ++ chart2/source/controller/sidebar/ChartSeriesPanel.hxx | 99 +++ chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx | 42 + chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx | 50 + chart2/uiconfig/ui/sidebarelements.ui | 40 - chart2/uiconfig/ui/sidebarseries.ui | 156 + include/sfx2/sidebar/EnumContext.hxx|3 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu| 101 ++- officecfg/registry/schema/org/openoffice/Office/UI/Sidebar.xcs |6 sfx2/source/sidebar/EnumContext.cxx |3 17 files changed, 781 insertions(+), 96 deletions(-) New commits: commit 857bc3094eafaaf69c607222ec9f90e84da07916 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Thu Jul 16 22:12:03 2015 +0200 handle error bars in series panel Change-Id: I29558530f775d1fab3dd2fca2e6c03c4717af769 diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx index c6f1a9b..b318f59 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx @@ -22,6 +22,7 @@ #include sfx2/sidebar/ControlFactory.hxx #include com/sun/star/chart2/DataPointLabel.hpp +#include com/sun/star/chart/ErrorBarStyle.hpp #include ChartSeriesPanel.hxx #include ChartController.hxx @@ -39,6 +40,7 @@ #include ChartModel.hxx #include DataSeriesHelper.hxx #include RegressionCurveHelper.hxx +#include StatisticsHelper.hxx using namespace css; using namespace css::uno; @@ -109,6 +111,39 @@ void setTrendlineVisible(css::uno::Referencecss::frame::XModel } +bool isErrorBarVisible(css::uno::Referencecss::frame::XModel +xModel, const OUString rCID, bool bYError) +{ +css::uno::Reference css::chart2::XDataSeries xSeries( +ObjectIdentifier::getDataSeriesForCID(rCID, xModel), uno::UNO_QUERY ); + +if (!xSeries.is()) +return false; + +return StatisticsHelper::hasErrorBars(xSeries, bYError); +} + +void setErrorBarVisible(css::uno::Referencecss::frame::XModel +xModel, const OUString rCID, bool bYError, bool bVisible) +{ +css::uno::Reference css::chart2::XDataSeries xSeries( +ObjectIdentifier::getDataSeriesForCID(rCID, xModel), uno::UNO_QUERY ); + +if (!xSeries.is()) +return; + +if (bVisible) +{ +StatisticsHelper::addErrorBars( xSeries, comphelper::getProcessComponentContext(), +css::chart::ErrorBarStyle::STANDARD_DEVIATION, +bYError); +} +else +{ +StatisticsHelper::removeErrorBars( xSeries, bYError ); +} +} + } ChartSeriesPanel::ChartSeriesPanel( @@ -181,6 +216,8 @@ void ChartSeriesPanel::updateData() SolarMutexGuard aGuard; mpCBLabel-Check(isDataLabelVisible(mxModel, aCID)); mpCBTrendline-Check(isTrendlineVisible(mxModel, aCID)); +mpCBXError-Check(isErrorBarVisible(mxModel, aCID, false)); +mpCBYError-Check(isErrorBarVisible(mxModel, aCID, true)); } VclPtrvcl::Window ChartSeriesPanel::Create ( @@ -245,6 +282,10 @@ IMPL_LINK(ChartSeriesPanel, CheckBoxHdl, CheckBox*, pCheckBox) setDataLabelVisible(mxModel, aCID, bChecked); else if (pCheckBox == mpCBTrendline.get()) setTrendlineVisible(mxModel, aCID, bChecked); +else if (pCheckBox == mpCBXError.get()) +setErrorBarVisible(mxModel, aCID, false, bChecked); +else if (pCheckBox == mpCBYError.get()) +setErrorBarVisible(mxModel, aCID, true, bChecked); return 0; } commit c3ad5c110a83e25e9ff00e56d612075755136e3e Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Thu Jul 16 22:02:30 2015 +0200 always update the data when we change selection Change-Id: Iae62f84401c23415a05fa2c5d1a541b239252aea diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx index 054f338..c6f1a9b 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx @@ -208,12 +208,6 @@ void ChartSeriesPanel::DataChanged( void ChartSeriesPanel::HandleContextChange( const ::sfx2::sidebar::EnumContext rContext) { -if(maContext == rContext) -
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/btndlg.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3209d1a5fc7f1711bf4fb42e57ab300082ba51e8 Author: Noel Grandin n...@peralex.com Date: Thu Jul 16 08:35:06 2015 +0200 loplugin:redundantcast Change-Id: Ifafd45865c93d474510bd0557bb9ab3843b7dbb7 diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx index ec98f89..145b02f 100644 --- a/vcl/source/window/btndlg.cxx +++ b/vcl/source/window/btndlg.cxx @@ -98,7 +98,7 @@ ImplBtnDlgItem* ButtonDialog::ImplGetItem( sal_uInt16 nId ) const for (auto it : m_ItemList) { if (it-mnId == nId) -return const_castImplBtnDlgItem*((*it)); +return (*it); } return NULL; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - 12 commits - editeng/source include/svx svx/source
editeng/source/outliner/overflowingtxt.cxx |4 +-- include/svx/textchain.hxx |2 - svx/source/svdraw/svdedxv.cxx | 28 +++ svx/source/svdraw/svdotext.cxx |2 - svx/source/svdraw/textchainflow.cxx| 30 +++-- 5 files changed, 48 insertions(+), 18 deletions(-) New commits: commit 8a370da33bbca5ecdb8c8d0551625f7bc843af8d Author: matteocam matteo.campane...@gmail.com Date: Wed Jul 15 17:27:05 2015 -0400 Right arrow at last para moves to next link Change-Id: Ic7e567d3d3120e0f8e2860cb90aa855dc68f760d diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index e708471..4f857fc 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -1296,13 +1296,24 @@ bool SdrObjEditView::KeyInput(const KeyEvent rKEvt, vcl::Window* pWin) SdrOutliner *pOutl = GetTextEditOutliner(); sal_Int32 nLastPara = pOutl-GetParagraphCount()-1; -if (eFunc == KeyFuncType::DONTKNOW nCode == KEY_RIGHT aCurSel.nEndPara == nLastPara) { +SdrTextObj* pTextObj = NULL; +if (mxTextEditObj.is()) +pTextObj= dynamic_castSdrTextObj*(mxTextEditObj.get()); + +// XXX: Add check for last position in the para +if (pTextObj pTextObj-IsChainable() pTextObj-GetNextLinkInChain() +eFunc == KeyFuncType::DONTKNOW nCode == KEY_RIGHT aCurSel.nEndPara == nLastPara) { fprintf(stderr, [CHAIN - CURSOR] Trying to move to next box\n ); +// Move to next box +SdrEndTextEdit(); +SdrTextObj *pNextLink = pTextObj-GetNextLinkInChain(); +SdrBeginTextEdit(pNextLink); + // XXX: Careful with the checks below for pWin and co. You should do them here I guess. return true; } else -// Old code from here +// FIXME(matteocam): Old code from here if (pTextEditOutlinerView-PostKeyEvent(rKEvt, pWin)) { if( pMod ) commit 733cd3bb573e7904f565b0ad071d3b133b429dae Author: matteocam matteo.campane...@gmail.com Date: Wed Jul 15 17:19:22 2015 -0400 First experiment with right arrow key to move to next link Change-Id: If2c67ec0a8f87ba05098abeeaea72237d648257d diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 4bbb28d..e708471 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -1286,6 +1286,23 @@ bool SdrObjEditView::KeyInput(const KeyEvent rKEvt, vcl::Window* pWin) { if(pTextEditOutlinerView) { +// XXX: Find a clean way to do this (even cleaner than the code commented below) +// if( pTextEditOutlinerView-IsKeyEventPushingOutOfPage(rKevt, pWin) +// pWin = HandleKeyPushingOutOfBox(rKevt); +KeyFuncType eFunc = rKEvt.GetKeyCode().GetFunction(); +sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); +ESelection aCurSel = pTextEditOutlinerView-GetSelection(); + +SdrOutliner *pOutl = GetTextEditOutliner(); +sal_Int32 nLastPara = pOutl-GetParagraphCount()-1; + +if (eFunc == KeyFuncType::DONTKNOW nCode == KEY_RIGHT aCurSel.nEndPara == nLastPara) { +fprintf(stderr, [CHAIN - CURSOR] Trying to move to next box\n ); + +// XXX: Careful with the checks below for pWin and co. You should do them here I guess. +return true; +} else +// Old code from here if (pTextEditOutlinerView-PostKeyEvent(rKEvt, pWin)) { if( pMod ) commit 23e5c185b473ad6bb9fd4711b39a786872fef569 Author: matteocam matteo.campane...@gmail.com Date: Wed Jul 15 16:51:10 2015 -0400 Revert Broadcast changed text in target link when in static mode This reverts commit cae895d03aab6ffe719f331c90699e4b6238ac97. diff --git a/svx/source/svdraw/textchainflow.cxx b/svx/source/svdraw/textchainflow.cxx index d2667e9..4d6352f 100644 --- a/svx/source/svdraw/textchainflow.cxx +++ b/svx/source/svdraw/textchainflow.cxx @@ -204,7 +204,7 @@ void TextChainFlow::impLeaveOnlyNonOverflowingText(SdrOutliner *pNonOverflOutl) // adds it to current outliner anyway (useful in static decomposition) pNonOverflOutl-SetText(*pNewText); -mpTargetLink-SetOutlinerParaObject(pNewText); +mpTargetLink-NbcSetOutlinerParaObject(pNewText); // For some reason the paper size is lost after last instruction, so we set it. pNonOverflOutl-SetPaperSize(Size(pNonOverflOutl-GetPaperSize().Width(), pNonOverflOutl-GetTextHeight())); commit cae895d03aab6ffe719f331c90699e4b6238ac97 Author: matteocam matteo.campane...@gmail.com Date: Wed Jul 15 16:50:10 2015 -0400 Broadcast changed text in target link when in static mode Change-Id: I20e72cfedfb4d690586ceb1e0470c8bef7f0dd9a diff --git a/svx/source/svdraw/textchainflow.cxx
[Libreoffice-commits] core.git: 19 commits - chart2/source chart2/uiconfig embeddedobj/source sfx2/source
chart2/source/controller/inc/ChartController.hxx | 688 + chart2/source/controller/inc/CommandDispatchContainer.hxx | 149 ++ chart2/source/controller/inc/SelectionHelper.hxx | 123 ++ chart2/source/controller/main/ChartController.cxx | 37 chart2/source/controller/main/ChartController.hxx | 688 - chart2/source/controller/main/CommandDispatchContainer.hxx | 149 -- chart2/source/controller/main/SelectionHelper.hxx | 123 -- chart2/source/controller/sidebar/Chart2PanelFactory.cxx| 37 chart2/source/controller/sidebar/ChartElementsPanel.cxx| 431 +++- chart2/source/controller/sidebar/ChartElementsPanel.hxx| 39 chart2/uiconfig/ui/sidebarelements.ui | 125 -- embeddedobj/source/commonembedding/embedobj.cxx|4 embeddedobj/source/general/docholder.cxx | 11 sfx2/source/sidebar/SidebarController.cxx |1 14 files changed, 1481 insertions(+), 1124 deletions(-) New commits: commit b1663b86ae68e023df98e9b204234170eef33825 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Thu Jul 16 02:42:01 2015 +0200 handle legend position combobox correctly Change-Id: Ic19e8cd20d739761975db2b00cb92fd27f8ac4be diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx index 36afcc3..e26c65a 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx @@ -20,6 +20,9 @@ #include sfx2/sidebar/ResourceDefinitions.hrc #include sfx2/sidebar/Theme.hxx #include sfx2/sidebar/ControlFactory.hxx +#include com/sun/star/chart2/LegendPosition.hpp +#include com/sun/star/chart/ChartLegendExpansion.hpp + #include ChartElementsPanel.hxx #include ChartController.hxx #include sfx2/bindings.hxx @@ -242,6 +245,77 @@ void setAxisVisible(css::uno::Referencecss::frame::XModel xModel, AxisType eTy } } +sal_Int32 getLegendPos(css::uno::Referencecss::frame::XModel xModel) +{ +ChartModel* pModel = getChartModel(xModel); +if (!pModel) +return 4; + +Reference beans::XPropertySet xLegendProp( LegendHelper::getLegend(*pModel), uno::UNO_QUERY ); +if (!xLegendProp.is()) +return 4; + +chart2::LegendPosition eLegendPos = chart2::LegendPosition_CUSTOM; +xLegendProp-getPropertyValue(AnchorPosition) = eLegendPos; +switch(eLegendPos) +{ +case chart2::LegendPosition_LINE_START: +return 1; +case chart2::LegendPosition_LINE_END: +return 2; +case chart2::LegendPosition_PAGE_START: +return 3; +case chart2::LegendPosition_PAGE_END: +return 0; +default: +return 4; +} +} + +void setLegendPos(css::uno::Referencecss::frame::XModel xModel, sal_Int32 nPos) +{ +ChartModel* pModel = getChartModel(xModel); +if (!pModel) +return; + +Reference beans::XPropertySet xLegendProp( LegendHelper::getLegend(*pModel), uno::UNO_QUERY ); +if (!xLegendProp.is()) +return; + +chart2::LegendPosition eLegendPos = chart2::LegendPosition_CUSTOM; +css::chart::ChartLegendExpansion eExpansion = css::chart::ChartLegendExpansion_HIGH; +switch(nPos) +{ +case 3: +eLegendPos = chart2::LegendPosition_PAGE_START; +eExpansion = css::chart::ChartLegendExpansion_WIDE; +break; +case 1: +eLegendPos = chart2::LegendPosition_LINE_START; +break; +case 2: +eLegendPos = chart2::LegendPosition_LINE_END; +break; +case 0: +eLegendPos = chart2::LegendPosition_PAGE_END; +eExpansion = css::chart::ChartLegendExpansion_WIDE; +break; +case 4: +eLegendPos = chart2::LegendPosition_CUSTOM; +break; +default: +assert(false); +} + +xLegendProp-setPropertyValue(AnchorPosition, css::uno::makeAny(eLegendPos)); +xLegendProp-setPropertyValue(Expansion, css::uno::makeAny(eExpansion)); + +if (eLegendPos != chart2::LegendPosition_CUSTOM) +{ +xLegendProp-setPropertyValue(RelativePosition, uno::Any()); +} +} + } ChartElementsPanel::ChartElementsPanel( @@ -274,6 +348,8 @@ ChartElementsPanel::ChartElementsPanel( get(mpCBGridVerticalMinor, checkbutton_gridline_vertical_minor); get(mpCBGridHorizontalMinor, checkbutton_gridline_horizontal_minor); +get(mpLBLegendPosition, comboboxtext_legend); + Initialize(); } @@ -332,6 +408,8 @@ void ChartElementsPanel::Initialize() mpCBGridHorizontalMajor-SetClickHdl(aLink); mpCBGridVerticalMinor-SetClickHdl(aLink); mpCBGridHorizontalMinor-SetClickHdl(aLink); + +mpLBLegendPosition-SetSelectHdl(LINK(this, ChartElementsPanel, LegendPosHdl)); } void
[Libreoffice-commits] core.git: include/sfx2
include/sfx2/sfxhelp.hxx |2 -- include/sfx2/templateviewitem.hxx |2 -- 2 files changed, 4 deletions(-) New commits: commit c6d73d24a7092512cbc60c255d0f20e7f9f29cf3 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jul 16 10:15:30 2015 +0200 -Werror,-Wunused-private-field Change-Id: I14e28c966a0d792eeaff9012616bd83de87f2abd diff --git a/include/sfx2/sfxhelp.hxx b/include/sfx2/sfxhelp.hxx index 5ff4361..8cbeed5 100644 --- a/include/sfx2/sfxhelp.hxx +++ b/include/sfx2/sfxhelp.hxx @@ -29,8 +29,6 @@ class SfxHelp_Impl; class SfxFrame; class SFX2_DLLPUBLIC SfxHelp : public Help { -OUStringaTicket;// for Plugins -OUStringaUser; boolbIsDebug; SfxHelp_Impl* pImp; diff --git a/include/sfx2/templateviewitem.hxx b/include/sfx2/templateviewitem.hxx index 9ed06ca..f35d281 100644 --- a/include/sfx2/templateviewitem.hxx +++ b/include/sfx2/templateviewitem.hxx @@ -39,8 +39,6 @@ public: private: OUString maPath; -OUString maAuthor; -OUString maKeywords; OUString maSubTitle; Point maSubTitlePos; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 92706] CRASH - when autmatically launching table creation wizard after registration of database
https://bugs.documentfoundation.org/show_bug.cgi?id=92706 --- Comment #7 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Michael Meeks committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=9e2e8bb5e6c5a7df376f6ada90703f59c95f19d6 tdf#92706 - avoid dbaccess wizard crash. It will be available in 5.1.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92706] CRASH - when autmatically launching table creation wizard after registration of database
https://bugs.documentfoundation.org/show_bug.cgi?id=92706 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard| target:5.0.0 | target:5.0.0 target:5.1.0 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-qa] Experimental functions but not the visual math editor?
Hi, For QA in real life purpose I want to enable experimental features but not the visual math editor. Is there a mean to do that? I did not find any key doing that in the expert configuration tool. Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. Disclaimer: my Internet Provider being located in France, each of our exchanges over Internet will be scanned by French spying services. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-commits] core.git: 5 commits - fpicker/source
fpicker/source/office/RemoteFilesDialog.cxx | 14 +++ fpicker/source/office/RemoteFilesDialog.hxx | 52 ++-- fpicker/source/office/iodlg.hxx | 42 +++--- 3 files changed, 54 insertions(+), 54 deletions(-) New commits: commit 795ac5bc53f6c15f2ab4634201747eb1c3e3331f Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jul 16 10:29:28 2015 +0200 loplugin:stringconstant Change-Id: I59da081fc90ffb96c438ed755266f5a69fbd199d diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 765ec4b..d59c9bd 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -640,7 +640,7 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, SelectHdl ) } else { -m_sPath = ; +m_sPath.clear(); m_pName_ed-SetText( ); } @@ -739,8 +739,8 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, OkHdl ) bool bFileDlg = ( m_eType == REMOTEDLG_TYPE_FILEDLG ); bool bSelected = ( m_pFileView-GetSelectionCount() 0 ); -if( !sCurrentPath.endsWith( OUString( / ) ) ) -sCurrentPath += OUString( / ); +if( !sCurrentPath.endsWith(/) ) +sCurrentPath += /; if( !bSelected ) { commit 78d73a51bf40c6f69347bbc90b955696c86a022d Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jul 16 10:28:37 2015 +0200 loplugin:vclwidgets Change-Id: I8671f8540da2e86eedb4cdc7a248ebb1d6caa376 diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 2ae54aa..765ec4b 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -17,7 +17,7 @@ class FileViewContainer : public vcl::Window VclPtr Splitter m_pSplitter; int m_nCurrentFocus; -vcl::Window* m_pFocusWidgets[4]; +VclPtrvcl::Window m_pFocusWidgets[4]; public: FileViewContainer( vcl::Window *pParent ) commit 79dafc7af0189935f81544dc8300b730b98db88f Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jul 16 10:27:42 2015 +0200 loplugin:simplifybool Change-Id: Id079a6cc2841f42b0dc10ed2be596cc8f7db4e25 diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 0d1fc8f..2ae54aa 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -141,7 +141,7 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent, WinBits nBits ) m_eMode = ( nBits WB_SAVEAS ) ? REMOTEDLG_MODE_SAVE : REMOTEDLG_MODE_OPEN; m_eType = ( nBits WB_PATH ) ? REMOTEDLG_TYPE_PATHDLG : REMOTEDLG_TYPE_FILEDLG; -m_bMultiselection = ( nBits SFXWB_MULTISELECTION ) ? true : false; +m_bMultiselection = ( nBits SFXWB_MULTISELECTION ) != 0; m_bIsUpdated = false; m_bIsConnected = false; m_nCurrentFilter = LISTBOX_ENTRY_NOTFOUND; commit 53bf91d66e28b636af468fe0c4b00738436732b3 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jul 16 10:26:57 2015 +0200 loplugin:passstuffbyref Change-Id: I37c254bd1fdb3cfb05d513f87fa4f4a468466bb0 diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 15a249f..0d1fc8f 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -395,7 +395,7 @@ OUString RemoteFilesDialog::GetPath() const return m_sPath; } -FileViewResult RemoteFilesDialog::OpenURL( OUString sURL ) +FileViewResult RemoteFilesDialog::OpenURL( OUString const sURL ) { FileViewResult eResult = eFailure; diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx index df9106e..ba48b8e 100644 --- a/fpicker/source/office/RemoteFilesDialog.hxx +++ b/fpicker/source/office/RemoteFilesDialog.hxx @@ -140,7 +140,7 @@ private: /* If failure returns 0 */ int GetSelectedServicePos(); -FileViewResult OpenURL( OUString sURL ); +FileViewResult OpenURL( OUString const sURL ); void AddFileExtension(); commit 5e090212b1a33a9ff2b1d0fd65909dad2f87758a Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jul 16 10:26:07 2015 +0200 -Werror,-Winconsistent-missing-override Change-Id: I5f7ab4c7eb106fc7bc0d93abc78ab9168c6867a6 diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index ec34e96..15a249f 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -109,7 +109,7 @@ class FileViewContainer : public vcl::Window m_pFocusWidgets[m_nCurrentFocus]-GrabFocus(); } -virtual bool Notify( NotifyEvent rNEvt ) +virtual bool Notify( NotifyEvent rNEvt ) SAL_OVERRIDE { if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { diff --git
Experimental functions but not the visual math editor?
Hi, For QA in real life purpose I want to enable experimental features but not the visual math editor. Is there a mean to do that? I did not find any key doing that in the expert configuration tool. Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. Disclaimer: my Internet Provider being located in France, each of our exchanges over Internet will be scanned by French spying services. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - filter/qa filter/source
filter/qa/cppunit/data/met/fail/crash-1.met |binary filter/source/graphicfilter/ios2met/ios2met.cxx |7 --- 2 files changed, 4 insertions(+), 3 deletions(-) New commits: commit e39e26533cba5be4445bdb39884bb1bc32083bbb Author: Caolán McNamara caol...@redhat.com Date: Wed Jul 15 12:25:35 2015 +0100 bump size type Change-Id: I2c32c253499a3efb22a3312ed1f0a608649ce124 (cherry picked from commit dc71a72753202d29544845cfd58992bac63c6837) Reviewed-on: https://gerrit.libreoffice.org/17088 Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com diff --git a/filter/qa/cppunit/data/met/fail/crash-1.met b/filter/qa/cppunit/data/met/fail/crash-1.met new file mode 100644 index 000..c46b4a9 Binary files /dev/null and b/filter/qa/cppunit/data/met/fail/crash-1.met differ diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 7b024ae..944dab3 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -208,7 +208,7 @@ enum PenStyle { PEN_NULL, PEN_SOLID, PEN_DOT, PEN_DASH, PEN_DASHDOT }; struct OSPalette { OSPalette * pSucc; sal_uInt32 * p0RGB; // May be NULL! -sal_uInt16 nSize; +size_t nSize; }; struct OSArea { @@ -733,12 +733,13 @@ void OS2METReader::SetPalette0RGB(sal_uInt16 nIndex, sal_uLong nCol) } if (pPaletteStack-p0RGB==NULL || nIndex=pPaletteStack-nSize) { sal_uInt32 * pOld0RGB=pPaletteStack-p0RGB; -sal_uInt16 i,nOldSize=pPaletteStack-nSize; +size_t nOldSize = pPaletteStack-nSize; if (pOld0RGB==NULL) nOldSize=0; pPaletteStack-nSize=2*(nIndex+1); if (pPaletteStack-nSize256) pPaletteStack-nSize=256; pPaletteStack-p0RGB = new sal_uInt32[pPaletteStack-nSize]; -for (i=0; ipPaletteStack-nSize; i++) { +for (size_t i=0; i pPaletteStack-nSize; ++i) +{ if (inOldSize) pPaletteStack-p0RGB[i]=pOld0RGB[i]; else if (i==0) pPaletteStack-p0RGB[i]=0x00ff; else pPaletteStack-p0RGB[i]=0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/qa filter/source
filter/qa/cppunit/data/pict/fail/exception-1.pct |binary filter/source/graphicfilter/ipict/ipict.cxx |5 + 2 files changed, 5 insertions(+) New commits: commit cf4159e16c13a13d0bedccebb50bb08f1662bc1c Author: Caolán McNamara caol...@redhat.com Date: Thu Jul 16 10:01:24 2015 +0100 exception on div by 0 Change-Id: Id33d6a5e3df5812babd28ebfc65b95ce97219ad3 diff --git a/filter/qa/cppunit/data/pict/fail/exception-1.pct b/filter/qa/cppunit/data/pict/fail/exception-1.pct new file mode 100644 index 000..f9cd85a Binary files /dev/null and b/filter/qa/cppunit/data/pict/fail/exception-1.pct differ diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index e6b7fd0..0c1960b 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -1859,6 +1859,7 @@ sal_uLong PictReader::ReadData(sal_uInt16 nOpcode) void PictReader::ReadPict( SvStream rStreamPict, GDIMetaFile rGDIMetaFile ) { +try { sal_uInt16 nOpcode; sal_uInt8 nOneByteOpcode; sal_uLong nSize, nPercent, nLastPercent; @@ -1950,6 +1951,10 @@ void PictReader::ReadPict( SvStream rStreamPict, GDIMetaFile rGDIMetaFile ) pPict-SetEndian(nOrigNumberFormat); if (pPict-GetError()) pPict-Seek(nOrigPos); +} catch (...) +{ +rStreamPict.SetError(SVSTREAM_FILEFORMAT_ERROR); +} } namespace pict { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/guisaveas.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b70acbc198fdd570785bc6d4dec992d8474024dc Author: Noel Grandin n...@peralex.com Date: Thu Jul 16 11:40:44 2015 +0200 fix windows build warning C4245: '=' : conversion from 'int' to 'sal_uInt8', signed/unsigned mismatch Change-Id: I4856a096a647ef47cdb208211f588f98fab71290 diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 6a204fa..3d98457 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -161,7 +161,7 @@ static sal_uInt8 getStoreModeFromSlotName( const OUString aSlotName ) else if ( aSlotName == SaveAs ) nResult = SAVEAS_REQUESTED; else if ( aSlotName == SaveAsRemote ) -nResult = SAVEASREMOTE_REQUESTED; +nResult = static_castsal_uInt8(SAVEASREMOTE_REQUESTED); else throw task::ErrorCodeIOException( (getStoreModeFromSlotName(\ + aSlotName ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Experimental functions but not the visual math editor?
What is the exact thing you’re trying to achieve with that? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: 8 commits - loleaflet/debug loleaflet/dist loleaflet/README loleaflet/src loolwsd/LOOLSession.cpp loolwsd/protocol.txt
loleaflet/README | 60 loleaflet/debug/document/document_simple_example.html |8 loleaflet/dist/dialog/vex-theme-plain.css | 183 + loleaflet/dist/dialog/vex.combined.min.js |2 loleaflet/dist/dialog/vex.css | 248 ++ loleaflet/dist/images/save.png|binary loleaflet/dist/images/saveas.png |binary loleaflet/src/control/Buttons.js | 13 loleaflet/src/control/Control.Buttons.js | 31 ++ loleaflet/src/layer/tile/TileLayer.js |4 loleaflet/src/map/Map.js |4 loolwsd/LOOLSession.cpp | 20 + loolwsd/protocol.txt |2 13 files changed, 559 insertions(+), 16 deletions(-) New commits: commit 606ef3679ec515332fc98da265b8249453078e7b Author: Mihai Varga mihai.va...@collabora.com Date: Thu Jul 16 12:50:53 2015 +0300 loleaflet: saveas icon and dialog diff --git a/loleaflet/dist/images/saveas.png b/loleaflet/dist/images/saveas.png new file mode 100644 index 000..03d78c9 Binary files /dev/null and b/loleaflet/dist/images/saveas.png differ diff --git a/loleaflet/src/control/Control.Buttons.js b/loleaflet/src/control/Control.Buttons.js index e25532c..432dfa0 100644 --- a/loleaflet/src/control/Control.Buttons.js +++ b/loleaflet/src/control/Control.Buttons.js @@ -20,7 +20,8 @@ L.Control.Buttons = L.Control.extend({ 'aligncenter': {title: 'Center horizontaly', uno: 'AlignCenter', iconName: 'aligncenter.png'}, 'alignright':{title: 'Align right',uno: 'AlignRight', iconName: 'alignright.png'}, 'alignblock':{title: 'Justified', uno: 'AlignBlock', iconName: 'alignblock.png'}, - 'save': {title: 'Save', uno: 'Save',iconName: 'save.png'} + 'save': {title: 'Save', uno: 'Save',iconName: 'save.png'}, + 'saveas':{title: 'Save As',uno: '', iconName: 'saveas.png'}, }; for (var key in this._buttons) { var button = this._buttons[key]; @@ -52,7 +53,16 @@ L.Control.Buttons = L.Control.extend({ _onButtonClick: function (e) { var id = e.target.id; var button = this._buttons[id]; - this._map.toggleCommandState(button.uno); + if (id === 'saveas') { + vex.dialog.open({ + message: 'Save as:', + input: this._getDialogHTML(), + callback: L.bind(this._onSaveAs, this) + }); + } + else { + this._map.toggleCommandState(button.uno); + } }, _onStateChange: function (e) { @@ -69,6 +79,22 @@ L.Control.Buttons = L.Control.extend({ } } } + }, + + _getDialogHTML: function () { + return ( + 'label for=urlURL/label' + + 'input name=url type=text value=' + this._map._docLayer.options.doc + '/' + + 'label for=formatFormat/label' + + 'input name=format type=text /' + + 'label for=optionsOptions/label' + + 'input name=options type=text /'); + }, + + _onSaveAs: function (e) { + if (e !== false) { + this._map.saveAs(e.url, e.format, e.options); + } } }); commit 1c16fd89f3021e5e7ad2f8f5861b920325cc890f Author: Mihai Varga mihai.va...@collabora.com Date: Thu Jul 16 12:50:08 2015 +0300 loleaflet: saveAs API diff --git a/loleaflet/README b/loleaflet/README index b6b90b0..6a5729c 100644 --- a/loleaflet/README +++ b/loleaflet/README @@ -105,6 +105,10 @@ Statusindicator (when the document is loading): + e.value == a value from 0 to 100 indicating the status if the statusType is 'setvalue +Save: +- API: +map.saveAs(url, [format, options]) + Contributing diff --git a/loleaflet/src/control/Buttons.js b/loleaflet/src/control/Buttons.js index 07a37e2..1ce0c98 100644 --- a/loleaflet/src/control/Buttons.js +++ b/loleaflet/src/control/Buttons.js @@ -6,5 +6,18 @@ L.Map.include({ if (this._docLayer._permission === 'edit') { this.socket.send('uno .uno:' + unoState); } + }, + + saveAs: function (url, format, options) { + if (format === undefined || format === null) { + format =
Re: Experimental functions but not the visual math editor?
Le 16/07/2015 11:43, Adolfo Jayme Barrientos a écrit : What is the exact thing you’re trying to achieve with that? From my point of view the visual math editor in its current state is not usable for a daily work, I prefer the good old text editor. Currently I can't test other experimental features without having the visual editor. Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. Disclaimer: my Internet Provider being located in France, each of our exchanges over Internet will be scanned by French spying services. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - 26 commits - chart2/source configure.ac cui/source download.lst editeng/source external/liblangtag filter/qa filter/s
chart2/source/controller/sidebar/ChartElementsPanel.cxx | 11 chart2/source/controller/sidebar/ChartElementsPanel.hxx |1 configure.ac |2 cui/source/factory/dlgfact.cxx | 20 cui/source/factory/dlgfact.hxx |4 download.lst |2 editeng/source/accessibility/AccessibleParaManager.cxx | 10 editeng/source/editeng/editdoc.hxx | 37 editeng/source/editeng/editeng.cxx |4 editeng/source/editeng/editstt2.hxx |7 editeng/source/editeng/editundo.hxx |3 editeng/source/editeng/edtspell.cxx | 30 editeng/source/editeng/edtspell.hxx |4 editeng/source/editeng/eertfpar.hxx |8 editeng/source/editeng/impedit.hxx | 47 editeng/source/items/paraitem.cxx | 17 editeng/source/misc/splwrap.cxx | 17 editeng/source/misc/svxacorr.cxx | 40 editeng/source/outliner/outleeng.cxx |5 editeng/source/outliner/outleeng.hxx |1 editeng/source/outliner/paralist.hxx |1 external/liblangtag/UnpackedTarball_langtag.mk | 20 external/liblangtag/liblangtag-0.5.1-include-last-record-in-language-subtag-registry.patch | 49 external/liblangtag/liblangtag-0.5.1-msvc-snprintf.patch | 25 external/liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch | 12 external/liblangtag/liblangtag-0.5.1-msvc-strtoull.patch | 15 external/liblangtag/liblangtag-0.5.1-msvc-warning.patch | 21 external/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch | 31 external/liblangtag/liblangtag-0.5.1-scope-declaration.patch | 13 external/liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch | 14 external/liblangtag/liblangtag-0.5.1-unistd.patch | 12 external/liblangtag/liblangtag-0.5.1-vsnprintf.patch | 18 external/liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch | 16 external/liblangtag/liblangtag-leak.patch.0 | 10 filter/qa/cppunit/data/pict/fail/exception-1.pct |binary filter/source/graphicfilter/ipict/ipict.cxx |5 fpicker/source/office/RemoteFilesDialog.cxx | 14 fpicker/source/office/RemoteFilesDialog.hxx | 52 fpicker/source/office/iodlg.hxx | 42 framework/source/uielement/saveasmenucontroller.cxx |4 include/editeng/AccessibleEditableTextPara.hxx |3 include/editeng/AccessibleParaManager.hxx |2 include/editeng/acorrcfg.hxx |4 include/editeng/borderline.hxx |4 include/editeng/charsetcoloritem.hxx |1 include/editeng/cmapitem.hxx |2 include/editeng/crossedoutitem.hxx |2 include/editeng/editeng.hxx |3 include/editeng/editstat.hxx |4 include/editeng/editview.hxx
[Libreoffice-commits] core.git: hwpfilter/source
hwpfilter/source/drawdef.h |6 hwpfilter/source/formula.cxx |2 hwpfilter/source/hbox.cxx | 34 ++-- hwpfilter/source/hbox.h| 30 ++-- hwpfilter/source/hcode.cxx | 66 - hwpfilter/source/hinfo.cxx | 56 hwpfilter/source/hiodev.h |4 hwpfilter/source/hpara.cxx |4 hwpfilter/source/hpara.h | 14 +- hwpfilter/source/hwpeq.cxx | 44 +++--- hwpfilter/source/hwpfile.cxx |2 hwpfilter/source/hwpread.cxx | 76 +-- hwpfilter/source/hwpreader.cxx | 279 - 13 files changed, 308 insertions(+), 309 deletions(-) New commits: commit 188208d93a5d95e1f5eb39294c5e467d6d53edef Author: Jihui Choi jihui.c...@gmail.com Date: Mon Jun 22 12:56:10 2015 +0200 tdf#91067: Translate Korean comments Change-Id: Idbee9cb5a1745bb2cc3c4cb1238773da7ff2a0a3 Signed-off-by: Andrea Gelmini andrea.gelm...@gelma.net diff --git a/hwpfilter/source/drawdef.h b/hwpfilter/source/drawdef.h index b80c18b..c6be198 100644 --- a/hwpfilter/source/drawdef.h +++ b/hwpfilter/source/drawdef.h @@ -119,9 +119,9 @@ struct RotationProperty */ struct HWPDOProperty { -int line_pstyle; /* ì ì¤ê° 모ì */ -int line_hstyle; /* ë íì´í 모ì */ -int line_tstyle; /* ìì 모ì */ +int line_pstyle; /* Style of the middle of line */ +int line_hstyle; /* Style of the end of line */ +int line_tstyle; /* Style of the start of line */ unsigned int line_color; hunit line_width; unsigned int fill_color; diff --git a/hwpfilter/source/formula.cxx b/hwpfilter/source/formula.cxx index bb48aef..6478811 100644 --- a/hwpfilter/source/formula.cxx +++ b/hwpfilter/source/formula.cxx @@ -383,7 +383,7 @@ void Formula::makeDecoration(Node *res) else fprintf(stderr,math:munder\n); #else - /* accentë ì¸ì trueì´ê³ , ì¸ì , falseì¸ì§ ëª¨ë¥´ê² ë¤. */ + /* FIXME: no idea when 'accent' is true or false. */ if( isover ){ padd(accent,CDATA,true); rstartEl(math:mover, rList); diff --git a/hwpfilter/source/hbox.cxx b/hwpfilter/source/hbox.cxx index 4ef9cbf..c026ca4 100644 --- a/hwpfilter/source/hbox.cxx +++ b/hwpfilter/source/hbox.cxx @@ -451,7 +451,7 @@ Footnote::~Footnote() // auto number(18) // new number(19) // show page number (20) -// íì쪽ìì/ê°ì¶ê¸° (21) +// Start/Hide odd-numbered side (21) // mail merge(22) hchar_string MailMerge::GetString() @@ -597,9 +597,9 @@ static void getOutlineNumStr(int style, int level, int num, hchar * hstr) enum { OUTLINE_ON, OUTLINE_NUM }; -/* level ì 0ë¶í° ìì. ì¦ 1.1.1. ì ë 벨ì 2ì´ë¤. -numberë ê°ì´ ê·¸ëë¡ ë¤ì´ê° ìë¤. ì¦, 1.2.1ìë 1,2,1ì´ ë¤ì´ê° ìë¤. -style ì 1ë¶í° ê°ì´ ë¤ì´ê° ìë¤. hbox.hì ì ìë ë°ë¡.. +/* level starts from zero. ex) '1.1.1.' is the level 2. + number has the value. ex) '1.2.1' has '1,2,1' + style has the value which starts from 1 according to the definition in hbox.h */ hchar_string Outline::GetUnicode() const { @@ -658,17 +658,17 @@ hchar_string Outline::GetUnicode() const if( deco[i][0] ){ buffer[l++] = deco[i][0]; } -/* level ì 0ë¶í° ìì. ì¦ 1.1.1. ì ë 벨ì 2ì´ë¤. -numberë ê°ì´ ê·¸ëë¡ ë¤ì´ê° ìë¤. ì¦, 1.2.1ìë 1,2,1ì´ ë¤ì´ê° ìë¤. -style ì 1ë¶í° ê°ì´ ë¤ì´ê° ìë¤. hbox.hì ì ìë ë°ë¡.. +/* level starts from zero. ex) '1.1.1.' is the level 2. + number has the value. ex) '1.2.1' has '1,2,1' + style has the value which starts from 1 according to the definition in hbox.h */ switch( user_shape[i] ) { case 0: buffer[l++] = '1' + number[i] - 1; break; -case 1: /* ë문ìë¡ë§ */ -case 2: /* ì문ìë¡ë§ */ +case 1: /* Uppercase Roman */ +case 2: /* Lowercase Roman */ num2roman(number[i], dest); if( user_shape[i] == 1 ){ char *ptr = dest; @@ -693,22 +693,22 @@ hchar_string Outline::GetUnicode() const case 6: buffer[l++] = olHanglJaso(number[i] -1, OL_HANGL_JASO); break; -case 7: /* íì ì«ì : ì¼ë° ì«ìë¡ íí */ +case 7: /* Chinese numbers: the number represented by the general */ buffer[l++] = '1' + number[i] -1; break; -case 8: /* ìì«ì */ +case 8: /* Circled numbers */ buffer[l++] = 0x2e00 + number[i];
[Libreoffice-bugs] [Bug 91067] translate Korean comments, removing redundant ones
https://bugs.documentfoundation.org/show_bug.cgi?id=91067 --- Comment #3 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Jihui Choi committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=188208d93a5d95e1f5eb39294c5e467d6d53edef tdf#91067: Translate Korean comments It will be available in 5.1.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 91067] translate Korean comments, removing redundant ones
https://bugs.documentfoundation.org/show_bug.cgi?id=91067 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|| target:5.1.0 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - external/jfreereport
external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk |1 external/jfreereport/UnpackedTarball_jfreereport_libformula.mk |1 external/jfreereport/patches/flow-engine_date_is_datetime.patch.1| 13 external/jfreereport/patches/libformula-datevalue_truncation.patch.1 | 29 ++ 4 files changed, 44 insertions(+) New commits: commit 9c20406420966ae8cdc866a8d4fef2b949529a07 Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Jul 14 17:49:44 2015 +0200 tdf#92654 a Date can contain a Time, so don't loose date by default also fix DATEVALUE() function that was relying on this dataloss Change-Id: I6030505a762df3ecbfe9a8331267846d3de817e8 Reviewed-on: https://gerrit.libreoffice.org/17049 Tested-by: Jenkins c...@libreoffice.org Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com diff --git a/external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk b/external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk index f6640e4..e0d309a 100644 --- a/external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk +++ b/external/jfreereport/UnpackedTarball_jfreereport_flow_engine.mk @@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,jfreereport_flow_engine,\ $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_flow_engine,\ external/jfreereport/patches/flow-engine.patch \ + external/jfreereport/patches/flow-engine_date_is_datetime.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk b/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk index bb78966..ec9d29d 100644 --- a/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk +++ b/external/jfreereport/UnpackedTarball_jfreereport_libformula.mk @@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,jfreereport_libformula,\ external/jfreereport/patches/common_build.patch \ external/jfreereport/patches/libformula-time-notz.patch \ external/jfreereport/patches/libformula-minutes_truncation.patch.1 \ + external/jfreereport/patches/libformula-datevalue_truncation.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/patches/flow-engine_date_is_datetime.patch.1 b/external/jfreereport/patches/flow-engine_date_is_datetime.patch.1 new file mode 100644 index 000..3ed23ee --- /dev/null +++ b/external/jfreereport/patches/flow-engine_date_is_datetime.patch.1 @@ -0,0 +1,13 @@ +diff -ur jfreereport_flow_engine.org/source/org/jfree/report/expressions/ReportFormulaContext.java jfreereport_flow_engine/source/org/jfree/report/expressions/ReportFormulaContext.java +--- jfreereport_flow_engine.org/source/org/jfree/report/expressions/ReportFormulaContext.java 2015-07-14 17:24:51.924156060 +0200 jfreereport_flow_engine/source/org/jfree/report/expressions/ReportFormulaContext.java 2015-07-14 17:27:56.669270298 +0200 +@@ -120,7 +120,7 @@ + { + if (flags.isDate()) + { +- return DateTimeType.DATE_TYPE; ++ return DateTimeType.DATETIME_TYPE; + } + if (flags.isNumeric()) + { +Only in jfreereport_flow_engine/source/org/jfree/report/expressions: ReportFormulaContext.java~ diff --git a/external/jfreereport/patches/libformula-datevalue_truncation.patch.1 b/external/jfreereport/patches/libformula-datevalue_truncation.patch.1 new file mode 100644 index 000..069c667 --- /dev/null +++ b/external/jfreereport/patches/libformula-datevalue_truncation.patch.1 @@ -0,0 +1,29 @@ +diff -ur jfreereport_libformula.org/source/org/pentaho/reporting/libraries/formula/function/datetime/DateValueFunction.java jfreereport_libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/DateValueFunction.java +--- jfreereport_libformula.org/source/org/pentaho/reporting/libraries/formula/function/datetime/DateValueFunction.java 2010-06-01 17:15:50.0 +0200 jfreereport_libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/DateValueFunction.java 2015-07-14 17:24:42.503895240 +0200 +@@ -18,6 +18,7 @@ + package org.pentaho.reporting.libraries.formula.function.datetime; + + import java.util.Date; ++import java.util.Calendar; + + import org.pentaho.reporting.libraries.formula.EvaluationException; + import org.pentaho.reporting.libraries.formula.FormulaContext; +@@ -28,6 +29,7 @@ + import org.pentaho.reporting.libraries.formula.typing.Type; + import org.pentaho.reporting.libraries.formula.typing.TypeRegistry; + import org.pentaho.reporting.libraries.formula.typing.coretypes.DateTimeType; ++import org.pentaho.reporting.libraries.formula.util.DateUtil; + + /** + * This function returns +@@ -61,7 +63,8 @@ + final Object value = parameters.getValue(0); + + final Date date1 = typeRegistry.convertToDate(type, value); +-return new
[Libreoffice-commits] core.git: external/liblangtag
external/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch | 31 -- 1 file changed, 31 deletions(-) New commits: commit 43cf7b9abf1262011b22a7b1a355569585f76b16 Author: Eike Rathke er...@redhat.com Date: Thu Jul 16 11:50:27 2015 +0200 rm unused patch Change-Id: Ie33bc6a6ef5c1a638a138e4989bd885b6b678ab4 diff --git a/external/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch b/external/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch deleted file mode 100644 index 1c9ac14..000 --- a/external/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -ru langtag.orig/liblangtag/lt-trie.c langtag/liblangtag/lt-trie.c UnpackedTarball/langtag.orig/liblangtag/lt-trie.c 2013-04-30 04:37:30.0 +0200 -+++ UnpackedTarball/langtag/liblangtag/lt-trie.c 2013-04-30 14:57:50.777932196 +0200 -@@ -33,11 +33,6 @@ - lt_iter_tmpl_t parent; - lt_trie_node_t *root; - }; --typedef struct _lt_trie_iter_t { -- lt_iter_tparent; -- lt_list_t *stack; -- lt_string_t *pos_str; --} lt_trie_iter_t; - - /* private */ - static lt_trie_node_t * -diff -ru langtag.orig/liblangtag/lt-trie.h langtag/liblangtag/lt-trie.h UnpackedTarball/langtag.orig/liblangtag/lt-trie.h 2013-04-30 04:44:36.0 +0200 -+++ UnpackedTarball/langtag/liblangtag/lt-trie.h 2013-04-30 14:57:57.746969291 +0200 -@@ -21,7 +21,11 @@ - LT_BEGIN_DECLS - - typedef struct _lt_trie_t lt_trie_t; --typedef struct _lt_trie_iter_t lt_trie_iter_t; -+typedef struct _lt_trie_iter_t { -+ lt_iter_tparent; -+ lt_list_t *stack; -+ lt_string_t *pos_str; -+} lt_trie_iter_t; - - lt_trie_t *lt_trie_new(void); - lt_trie_t *lt_trie_ref(lt_trie_t *trie); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Unicode 8.0?
I would like to ask when will be adopted Old Hungarian fonts. It is defined in the UNICODE 8.0, central-europe subgroup, and it must be typed right to left writing. Thanks! Kovács Viktor (name written by Hungarian name order) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 91067] translate Korean comments, removing redundant ones
https://bugs.documentfoundation.org/show_bug.cgi?id=91067 Adolfo Jayme f...@libreoffice.org changed: What|Removed |Added Whiteboard|EasyHack DifficultyBeginner | |SkillCpp| --- Comment #2 from Adolfo Jayme f...@libreoffice.org --- A patch addressing this will be pushed soon. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
Gerrit Windows build: what configure should I use at home?
Hi all, I'd like to prepare home a Win7 machine to build LibO with a configure script as the one used by gerrit builds. What will it be the most current configure to use? Looking at the log available, it seems that a prepared set of shell variable is used, what configure generated it? Thanks -- Kind Regards, Giuseppe Castagno aka beppec56 Acca Esse http://www.acca-esse.eu giuseppe.castagno at acca-esse.eu ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 64827] FILESAVE: Changing file extension (filter) also changes file name
https://bugs.documentfoundation.org/show_bug.cgi?id=64827 Gauthier achat1...@free.fr changed: What|Removed |Added Version|4.4.4.3 release |4.0.2.2 release --- Comment #18 from Gauthier achat1...@free.fr --- (In reply to Joel Madero from comment #16) Please don't change things without knowing what they stand for. 1) It's not high just because it affects you - reverting to medium; 2) REOPENED is incorrect - pushing back to UNCONFIRMED so someone from QA team attempts to reproduce. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 91067] translate Korean comments, removing redundant ones
https://bugs.documentfoundation.org/show_bug.cgi?id=91067 Adolfo Jayme f...@libreoffice.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92774] Can't add word to dictionary or use other options when list of choices is very long and have to scroll
https://bugs.documentfoundation.org/show_bug.cgi?id=92774 --- Comment #8 from Carlos Rodriguez carlos.rodrig...@tegnix.com --- I can confirm on Debian 8 (jessie) with just hk word and choosing English (USA) language for selection and: Version: 5.1.0.0.alpha1+ Build ID: 9be553f4c61f220ebbe212dc76cb9cce4ae1c106 TinderBox: Linux-rpm_deb-x86_64@46-TDF, Branch:master, Time: 2015-07-13_22:45:19 Locale: es-ES (es_ES.UTF-8) It's important to mention that if I change the language for this selection, the bug is not reproducible. Works also fine under: Version: 5.0.1.0.0+ Build ID: b0153639c17d40061480a7bbde11fa0249e3051f TinderBox: Linux-rpm_deb-x86_64@46-TDF, Branch:libreoffice-5-0, Time: 2015-07-14_03:50:43 Locale: es-ES (es_ES.UTF-8) and Version: 4.4.6.0.0+ Build ID: 865afb6ed25891129efb6907595c892e417a191a TinderBox: Linux-rpm_deb-x86_64@46-TDF, Branch:libreoffice-4-4, Time: 2015-07-14_00:39:03 Locale: es_ES.UTF-8 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92573] Writer crash when attempting to open one file.
https://bugs.documentfoundation.org/show_bug.cgi?id=92573 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard| target:5.1.0 | target:5.1.0 target:4.4.6 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92573] Writer crash when attempting to open one file.
https://bugs.documentfoundation.org/show_bug.cgi?id=92573 --- Comment #15 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolán McNamara committed a patch related to this issue. It has been pushed to libreoffice-4-4: http://cgit.freedesktop.org/libreoffice/core/commit/?id=03e115e51e5102ffd9c8498f865ed9e768f4f490h=libreoffice-4-4 fix a11y crash seen on close of tdf#92573 It will be available in 4.4.6. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92573] Writer crash when attempting to open one file.
https://bugs.documentfoundation.org/show_bug.cgi?id=92573 --- Comment #16 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Caolán McNamara committed a patch related to this issue. It has been pushed to libreoffice-5-0: http://cgit.freedesktop.org/libreoffice/core/commit/?id=c7d2270f86b2bd1f3c764d8461a40c903780ee56h=libreoffice-5-0 fix a11y crash seen on close of tdf#92573 It will be available in 5.0.1. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92573] Writer crash when attempting to open one file.
https://bugs.documentfoundation.org/show_bug.cgi?id=92573 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard| target:5.1.0 target:4.4.6 | target:5.1.0 target:4.4.6 ||target:5.0.1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - filter/qa filter/source
filter/qa/cppunit/data/met/pass/hang-2.met |binary filter/source/graphicfilter/ios2met/ios2met.cxx | 33 ++-- 2 files changed, 26 insertions(+), 7 deletions(-) New commits: commit fdc0b506538560e13127a44a7de817412c13035b Author: Caolán McNamara caol...@redhat.com Date: Wed Jul 15 12:59:55 2015 +0100 tools polygons limited to 16bit indexes Change-Id: Ib0f727a3681492c15b807ca159d8bf7675ee8f29 (cherry picked from commit 89857aacac98f0f8e5dca4718affec493951f904) WaE: C2220 Change-Id: Ibf9fa7ffc3beb237a470952c265fb1bce313a08a (cherry picked from commit 8547c336b3253d90daae1c79a2b1a57996a39102) Reviewed-on: https://gerrit.libreoffice.org/17091 Tested-by: Jenkins c...@libreoffice.org Reviewed-by: Michael Meeks michael.me...@collabora.com diff --git a/filter/qa/cppunit/data/met/pass/hang-2.met b/filter/qa/cppunit/data/met/pass/hang-2.met new file mode 100644 index 000..84b432e Binary files /dev/null and b/filter/qa/cppunit/data/met/pass/hang-2.met differ diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 0553d1f..2ff00f6 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -1173,18 +1173,37 @@ void OS2METReader::ReadPartialArc(bool bGivenPos, sal_uInt16 nOrderSize) void OS2METReader::ReadPolygons() { -sal_uInt32 i,j,nNumPolys, nNumPoints; tools::PolyPolygon aPolyPoly; Polygon aPoly; Point aPoint; -sal_uInt8 nFlags; -pOS2MET-ReadUChar( nFlags ).ReadUInt32( nNumPolys ); -for (i=0; inNumPolys; i++) { -pOS2MET-ReadUInt32( nNumPoints ); -if (i==0) nNumPoints++; +sal_uInt8 nFlags(0); +sal_uInt32 nNumPolys(0); +pOS2MET-ReadUChar(nFlags).ReadUInt32(nNumPolys); + +if (nNumPolys SAL_MAX_UINT16) +{ +pOS2MET-SetError(SVSTREAM_FILEFORMAT_ERROR); +ErrorCode=11; +return; +} + +for (sal_uInt32 i=0; inNumPolys; ++i) +{ +sal_uInt32 nNumPoints(0); +pOS2MET-ReadUInt32(nNumPoints); +sal_uInt32 nLimit = SAL_MAX_UINT16; +if (i==0) --nLimit; +if (nNumPoints nLimit) +{ +pOS2MET-SetError(SVSTREAM_FILEFORMAT_ERROR); +ErrorCode=11; +return; +} +if (i==0) ++nNumPoints; aPoly.SetSize((short)nNumPoints); -for (j=0; jnNumPoints; j++) { +for (sal_uInt32 j=0; jnNumPoints; ++j) +{ if (i==0 j==0) aPoint=aAttr.aCurPos; else aPoint=ReadPoint(); aPoly.SetPoint(aPoint,(short)j); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - filter/qa filter/source
filter/qa/cppunit/data/pbm/fail/hang-1.pbm |binary filter/qa/cppunit/data/pbm/indeterminate/.gitignore |1 + filter/qa/cppunit/data/pbm/pass/rhbz160429-1.pbm|binary filter/qa/cppunit/filters-ppm-test.cxx |4 filter/source/graphicfilter/ipbm/ipbm.cxx |2 +- 5 files changed, 6 insertions(+), 1 deletion(-) New commits: commit 1cf6e5d1afa7f89d7cfc595ba3dacb9633abde87 Author: Caolán McNamara caol...@redhat.com Date: Wed Jul 15 14:01:46 2015 +0100 avoid hang in short pbm Change-Id: I9b7f0832a4dc231e1e8f963858c155e3cd392667 (cherry picked from commit b8637e67d6d39e47d22cfce496000288f0dc58d8) Reviewed-on: https://gerrit.libreoffice.org/17085 Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com diff --git a/filter/qa/cppunit/data/pbm/fail/.gitignore b/filter/qa/cppunit/data/pbm/fail/.gitignore new file mode 100644 index 000..e69de29 diff --git a/filter/qa/cppunit/data/pbm/fail/hang-1.pbm b/filter/qa/cppunit/data/pbm/fail/hang-1.pbm new file mode 100644 index 000..21742d2 Binary files /dev/null and b/filter/qa/cppunit/data/pbm/fail/hang-1.pbm differ diff --git a/filter/qa/cppunit/data/pbm/indeterminate/.gitignore b/filter/qa/cppunit/data/pbm/indeterminate/.gitignore new file mode 100644 index 000..e9c5b17 --- /dev/null +++ b/filter/qa/cppunit/data/pbm/indeterminate/.gitignore @@ -0,0 +1 @@ +*.ppm-* diff --git a/filter/qa/cppunit/data/pbm/pass/.gitignore b/filter/qa/cppunit/data/pbm/pass/.gitignore new file mode 100644 index 000..e69de29 diff --git a/filter/qa/cppunit/data/pbm/pass/rhbz160429-1.pbm b/filter/qa/cppunit/data/pbm/pass/rhbz160429-1.pbm new file mode 100644 index 000..d6e3fc6 Binary files /dev/null and b/filter/qa/cppunit/data/pbm/pass/rhbz160429-1.pbm differ diff --git a/filter/qa/cppunit/filters-ppm-test.cxx b/filter/qa/cppunit/filters-ppm-test.cxx index 9b281ab..e8bef14 100644 --- a/filter/qa/cppunit/filters-ppm-test.cxx +++ b/filter/qa/cppunit/filters-ppm-test.cxx @@ -62,6 +62,10 @@ void PpmFilterTest::testCVEs() testDir(OUString(), getURLFromSrc(/filter/qa/cppunit/data/ppm/), OUString()); + +testDir(OUString(), +getURLFromSrc(/filter/qa/cppunit/data/pbm/), +OUString()); } CPPUNIT_TEST_SUITE_REGISTRATION(PpmFilterTest); diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx index 63a8b09..720bc9f 100644 --- a/filter/source/graphicfilter/ipbm/ipbm.cxx +++ b/filter/source/graphicfilter/ipbm/ipbm.cxx @@ -195,7 +195,7 @@ bool PBMReader::ImplReadHeader() } while ( bFinished == false ) { -if ( mrPBM.GetError() ) +if (!mrPBM.good()) return false; mrPBM.ReadUChar( nDat ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - filter/qa filter/source
filter/qa/cppunit/data/met/pass/hang-2.met |binary filter/source/graphicfilter/ios2met/ios2met.cxx | 33 ++-- 2 files changed, 26 insertions(+), 7 deletions(-) New commits: commit 62d88405e4c9fc3dfc6ea960f9b5f9c594e8bcf8 Author: Caolán McNamara caol...@redhat.com Date: Wed Jul 15 12:59:55 2015 +0100 tools polygons limited to 16bit indexes (cherry picked from commit 89857aacac98f0f8e5dca4718affec493951f904) WaE: C2220 (cherry picked from commit 8547c336b3253d90daae1c79a2b1a57996a39102) Change-Id: Ib0f727a3681492c15b807ca159d8bf7675ee8f29 Reviewed-on: https://gerrit.libreoffice.org/17089 Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com diff --git a/filter/qa/cppunit/data/met/pass/hang-2.met b/filter/qa/cppunit/data/met/pass/hang-2.met new file mode 100644 index 000..84b432e Binary files /dev/null and b/filter/qa/cppunit/data/met/pass/hang-2.met differ diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 946d68f..ce19c4d 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -1191,18 +1191,37 @@ void OS2METReader::ReadPartialArc(bool bGivenPos, sal_uInt16 nOrderSize) void OS2METReader::ReadPolygons() { -sal_uInt32 i,j,nNumPolys, nNumPoints; tools::PolyPolygon aPolyPoly; Polygon aPoly; Point aPoint; -sal_uInt8 nFlags; -pOS2MET-ReadUChar( nFlags ).ReadUInt32( nNumPolys ); -for (i=0; inNumPolys; i++) { -pOS2MET-ReadUInt32( nNumPoints ); -if (i==0) nNumPoints++; +sal_uInt8 nFlags(0); +sal_uInt32 nNumPolys(0); +pOS2MET-ReadUChar(nFlags).ReadUInt32(nNumPolys); + +if (nNumPolys SAL_MAX_UINT16) +{ +pOS2MET-SetError(SVSTREAM_FILEFORMAT_ERROR); +ErrorCode=11; +return; +} + +for (sal_uInt32 i=0; inNumPolys; ++i) +{ +sal_uInt32 nNumPoints(0); +pOS2MET-ReadUInt32(nNumPoints); +sal_uInt32 nLimit = SAL_MAX_UINT16; +if (i==0) --nLimit; +if (nNumPoints nLimit) +{ +pOS2MET-SetError(SVSTREAM_FILEFORMAT_ERROR); +ErrorCode=11; +return; +} +if (i==0) ++nNumPoints; aPoly.SetSize((short)nNumPoints); -for (j=0; jnNumPoints; j++) { +for (sal_uInt32 j=0; jnNumPoints; ++j) +{ if (i==0 j==0) aPoint=aAttr.aCurPos; else aPoint=ReadPoint(); aPoly.SetPoint(aPoint,(short)j); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4-5' - sc/source
sc/source/core/data/document.cxx | 63 +++ 1 file changed, 63 insertions(+) New commits: commit a9c9c387a37282732b3082517f1af943a598718e Author: Eike Rathke er...@redhat.com Date: Tue Jul 7 23:36:02 2015 +0200 end/restart group listening in DeleteSelection(), similar to DeleteArea() Reproducer: * in A1 enter =SUM(B1:C4) * copy A1 to clipboard * paste to A2 and A3 * formula in A2 is =SUM(B2:C5) A3 is =SUM(B3:C6) * select A2:A3 * hit Del key to delete the two cells * enter any numeric value in B2 = formula result in A1 is not updated Shift+Ctrl+F9 hard recalc updates Change-Id: I55e55b8cfe69e9273170ceaea4e6c046b3d4f7b7 (cherry picked from commit a49b8af4cf03ae08cb7a28f66e24368a7b08ae3f) Reviewed-on: https://gerrit.libreoffice.org/16843 Reviewed-by: Caolán McNamara caol...@redhat.com Reviewed-by: Michael Meeks michael.me...@collabora.com Reviewed-by: Adolfo Jayme Barrientos fit...@ubuntu.com Tested-by: Adolfo Jayme Barrientos fit...@ubuntu.com diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 4a4f0004..59fef65 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -5611,18 +5611,81 @@ void ScDocument::ClearSelectionItems( const sal_uInt16* pWhich, const ScMarkData void ScDocument::DeleteSelection( InsertDeleteFlags nDelFlag, const ScMarkData rMark, bool bBroadcast ) { +sc::AutoCalcSwitch aACSwitch(*this, false); + +std::vectorScAddress aGroupPos; +// Destroy and reconstruct listeners only if content is affected. +bool bDelContent = ((nDelFlag ~IDF_CONTENTS) != nDelFlag); +if (bDelContent) +{ +// Record the positions of top and/or bottom formula groups that +// intersect the area borders. +sc::EndListeningContext aCxt(*this); +ScRangeList aRangeList; +rMark.FillRangeListWithMarks( aRangeList, false); +for (size_t i = 0; i aRangeList.size(); ++i) +{ +const ScRange* pRange = aRangeList[i]; +if (pRange) +EndListeningIntersectedGroups( aCxt, *pRange, aGroupPos); +} +aCxt.purgeEmptyBroadcasters(); +} + SCTAB nMax = static_castSCTAB(maTabs.size()); ScMarkData::const_iterator itr = rMark.begin(), itrEnd = rMark.end(); for (; itr != itrEnd *itr nMax; ++itr) if (maTabs[*itr]) maTabs[*itr]-DeleteSelection(nDelFlag, rMark, bBroadcast); + +if (bDelContent) +{ +// Re-start listeners on those top bottom groups that have been split. +SetNeedsListeningGroups(aGroupPos); +StartNeededListeners(); +} } void ScDocument::DeleteSelectionTab( SCTAB nTab, InsertDeleteFlags nDelFlag, const ScMarkData rMark, bool bBroadcast ) { if (ValidTab(nTab) nTab static_castSCTAB(maTabs.size()) maTabs[nTab]) +{ +sc::AutoCalcSwitch aACSwitch(*this, false); + +std::vectorScAddress aGroupPos; +// Destroy and reconstruct listeners only if content is affected. +bool bDelContent = ((nDelFlag ~IDF_CONTENTS) != nDelFlag); +if (bDelContent) +{ +// Record the positions of top and/or bottom formula groups that +// intersect the area borders. +sc::EndListeningContext aCxt(*this); +ScRangeList aRangeList; +rMark.FillRangeListWithMarks( aRangeList, false); +for (size_t i = 0; i aRangeList.size(); ++i) +{ +const ScRange* pRange = aRangeList[i]; +if (pRange pRange-aStart.Tab() = nTab nTab = pRange-aEnd.Tab()) +{ +ScRange aRange( *pRange); +aRange.aStart.SetTab( nTab); +aRange.aEnd.SetTab( nTab); +EndListeningIntersectedGroups( aCxt, aRange, aGroupPos); +} +} +aCxt.purgeEmptyBroadcasters(); +} + maTabs[nTab]-DeleteSelection(nDelFlag, rMark, bBroadcast); + +if (bDelContent) +{ +// Re-start listeners on those top bottom groups that have been split. +SetNeedsListeningGroups(aGroupPos); +StartNeededListeners(); +} +} else { OSL_FAIL(wrong table); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - filter/qa filter/source
filter/qa/cppunit/data/pbm/fail/hang-1.pbm |binary filter/qa/cppunit/data/pbm/indeterminate/.gitignore |1 + filter/qa/cppunit/data/pbm/pass/rhbz160429-1.pbm|binary filter/qa/cppunit/filters-ppm-test.cxx |4 filter/source/graphicfilter/ipbm/ipbm.cxx |2 +- 5 files changed, 6 insertions(+), 1 deletion(-) New commits: commit c48004eb562a9c4b377cf31a09a04cb03abdc58e Author: Caolán McNamara caol...@redhat.com Date: Wed Jul 15 14:01:46 2015 +0100 avoid hang in short pbm Change-Id: I9b7f0832a4dc231e1e8f963858c155e3cd392667 (cherry picked from commit b8637e67d6d39e47d22cfce496000288f0dc58d8) Reviewed-on: https://gerrit.libreoffice.org/17083 Tested-by: Jenkins c...@libreoffice.org Reviewed-by: Michael Meeks michael.me...@collabora.com diff --git a/filter/qa/cppunit/data/pbm/fail/.gitignore b/filter/qa/cppunit/data/pbm/fail/.gitignore new file mode 100644 index 000..e69de29 diff --git a/filter/qa/cppunit/data/pbm/fail/hang-1.pbm b/filter/qa/cppunit/data/pbm/fail/hang-1.pbm new file mode 100644 index 000..21742d2 Binary files /dev/null and b/filter/qa/cppunit/data/pbm/fail/hang-1.pbm differ diff --git a/filter/qa/cppunit/data/pbm/indeterminate/.gitignore b/filter/qa/cppunit/data/pbm/indeterminate/.gitignore new file mode 100644 index 000..e9c5b17 --- /dev/null +++ b/filter/qa/cppunit/data/pbm/indeterminate/.gitignore @@ -0,0 +1 @@ +*.ppm-* diff --git a/filter/qa/cppunit/data/pbm/pass/.gitignore b/filter/qa/cppunit/data/pbm/pass/.gitignore new file mode 100644 index 000..e69de29 diff --git a/filter/qa/cppunit/data/pbm/pass/rhbz160429-1.pbm b/filter/qa/cppunit/data/pbm/pass/rhbz160429-1.pbm new file mode 100644 index 000..d6e3fc6 Binary files /dev/null and b/filter/qa/cppunit/data/pbm/pass/rhbz160429-1.pbm differ diff --git a/filter/qa/cppunit/filters-ppm-test.cxx b/filter/qa/cppunit/filters-ppm-test.cxx index e98ce6f..10f2658 100644 --- a/filter/qa/cppunit/filters-ppm-test.cxx +++ b/filter/qa/cppunit/filters-ppm-test.cxx @@ -62,6 +62,10 @@ void PpmFilterTest::testCVEs() testDir(OUString(), getURLFromSrc(/filter/qa/cppunit/data/ppm/), OUString()); + +testDir(OUString(), +getURLFromSrc(/filter/qa/cppunit/data/pbm/), +OUString()); } CPPUNIT_TEST_SUITE_REGISTRATION(PpmFilterTest); diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx index 248d4df..e545334 100644 --- a/filter/source/graphicfilter/ipbm/ipbm.cxx +++ b/filter/source/graphicfilter/ipbm/ipbm.cxx @@ -179,7 +179,7 @@ bool PBMReader::ImplReadHeader() } while ( !bFinished ) { -if ( mrPBM.GetError() ) +if (!mrPBM.good()) return false; mrPBM.ReadUChar( nDat ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx| 34 writerfilter/source/dmapper/DomainMapper_Impl.cxx | 364 - writerfilter/source/dmapper/DomainMapper_Impl.hxx |7 writerfilter/source/dmapper/GraphicHelpers.cxx |6 writerfilter/source/dmapper/GraphicImport.cxx | 91 +- writerfilter/source/dmapper/ModelEventListener.cxx |6 writerfilter/source/dmapper/NumberingManager.cxx| 34 writerfilter/source/dmapper/OLEHandler.cxx |6 writerfilter/source/dmapper/PropertyIds.cxx | 761 +--- writerfilter/source/dmapper/PropertyIds.hxx | 15 writerfilter/source/dmapper/PropertyMap.cxx | 88 -- writerfilter/source/dmapper/StyleSheetTable.cxx | 36 writerfilter/source/dmapper/TrackChangesHandler.cxx | 18 13 files changed, 669 insertions(+), 797 deletions(-) New commits: commit 091f6c382394390206f784a5ec79842709e0f3bc Author: Matthew Pottage matthewpott...@invincitech.com Date: Wed Jul 1 16:51:45 2015 +0100 Removed singleton PropertyNameSupplier and replaced it with single function. Measurements showed that the optimisation of caching PropertyIds and their string equivalent leads to an increase of approx. 6 times in the total overall time spent in PropertyNameSupplier::getName(eId), when running the unit tests. PropertyNameSupplier was the only PropertyNameSupplier (no derived classes). This means that getPropertyName can easily provide the same functionality. Change-Id: I933b67c11d4cc35395a0c70e15f1c24ac9842ab0 Reviewed-on: https://gerrit.libreoffice.org/16665 Tested-by: Jenkins c...@libreoffice.org Reviewed-by: Noel Grandin noelgran...@gmail.com diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index becde28..8a875ae 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -104,13 +104,13 @@ DomainMapper::DomainMapper( const uno::Reference uno::XComponentContext xCon { // #i24363# tab stops relative to indent m_pImpl-SetDocumentSettingsProperty( -PropertyNameSupplier::GetPropertyNameSupplier().GetName( PROP_TABS_RELATIVE_TO_INDENT ), +getPropertyName( PROP_TABS_RELATIVE_TO_INDENT ), uno::makeAny( false ) ); m_pImpl-SetDocumentSettingsProperty( -PropertyNameSupplier::GetPropertyNameSupplier().GetName( PROP_SURROUND_TEXT_WRAP_SMALL ), +getPropertyName( PROP_SURROUND_TEXT_WRAP_SMALL ), uno::makeAny( true ) ); m_pImpl-SetDocumentSettingsProperty( -PropertyNameSupplier::GetPropertyNameSupplier().GetName( PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING ), +getPropertyName( PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING ), uno::makeAny( true ) ); // Don't load the default style definitions to avoid weird mix @@ -271,7 +271,7 @@ void DomainMapper::lcl_attribute(Id nName, Value val) { uno::Reference beans::XPropertySet xAnchorProps( m_pImpl-GetTopContext()-GetFootnote()-getAnchor(), uno::UNO_QUERY ); xAnchorProps-setPropertyValue( -PropertyNameSupplier::GetPropertyNameSupplier().GetName( PROP_CHAR_FONT_NAME), +getPropertyName( PROP_CHAR_FONT_NAME), uno::makeAny( sStringValue )); } else //a real symbol @@ -1166,7 +1166,6 @@ void DomainMapper::sprmWithProps( Sprm rSprm, PropertyMapPtr rContext ) Value::Pointer_t pValue = rSprm.getValue(); sal_Int32 nIntValue = pValue-getInt(); const OUString sStringValue = pValue-getString(); -PropertyNameSupplier rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier(); switch(nSprmId) { @@ -1525,7 +1524,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm, PropertyMapPtr rContext ) uno::Referencebeans::XPropertySet xCharStyle(m_pImpl-GetCurrentNumberingCharStyle()); if (xCharStyle.is()) - xCharStyle-setPropertyValue(rPropNameSupplier.GetName(PROP_CHAR_WEIGHT), aBold); + xCharStyle-setPropertyValue(getPropertyName(PROP_CHAR_WEIGHT), aBold); if (nSprmId == NS_ooxml::LN_EG_RPrBase_b) m_pImpl-appendGrabBag(m_pImpl-m_aInteropGrabBag, b, OUString::number(nIntValue)); else if (nSprmId == NS_ooxml::LN_EG_RPrBase_bCs) @@ -1605,7 +1604,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm, PropertyMapPtr rContext ) uno::Referencebeans::XPropertySet xCharStyle(m_pImpl-GetCurrentNumberingCharStyle()); if (xCharStyle.is()) - xCharStyle-setPropertyValue(rPropNameSupplier.GetName(PROP_CHAR_HEIGHT), aVal); + xCharStyle-setPropertyValue(getPropertyName(PROP_CHAR_HEIGHT), aVal);
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - filter/qa filter/source
filter/qa/cppunit/data/met/fail/hang-1.met |binary filter/source/graphicfilter/ios2met/ios2met.cxx | 12 +--- 2 files changed, 9 insertions(+), 3 deletions(-) New commits: commit 66744837834e86ea0b7227a704cd0f82f8bdc223 Author: Caolán McNamara caol...@redhat.com Date: Wed Jul 15 12:18:10 2015 +0100 don't hang with 0 len causing no progression Change-Id: Ie553dab291c7bfbde033d89b84159aff6b42a160 (cherry picked from commit 15dfcb7f461893f83abcf28bfe01a4164209a160) Reviewed-on: https://gerrit.libreoffice.org/17084 Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com diff --git a/filter/qa/cppunit/data/met/fail/hang-1.met b/filter/qa/cppunit/data/met/fail/hang-1.met new file mode 100644 index 000..c1a095d Binary files /dev/null and b/filter/qa/cppunit/data/met/fail/hang-1.met differ diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 944dab3..0553d1f 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -2240,7 +2240,6 @@ void OS2METReader::ReadImageData(sal_uInt16 nDataID, sal_uInt16 nDataLen) void OS2METReader::ReadFont(sal_uInt16 nFieldSize) { sal_uLong nPos, nMaxPos; -sal_uInt16 nLen; sal_uInt8 nByte, nTripType, nTripType2; OSFont * pF=new OSFont; pF-pSucc=pFontList; pFontList=pF; @@ -2252,7 +2251,13 @@ void OS2METReader::ReadFont(sal_uInt16 nFieldSize) nMaxPos=nPos+(sal_uLong)nFieldSize; pOS2MET-SeekRel(2); nPos+=2; while (nPosnMaxPos pOS2MET-GetError()==0) { -pOS2MET-ReadUChar( nByte ); nLen =((sal_uInt16)nByte) 0x00ff; +pOS2MET-ReadUChar( nByte ); +sal_uInt16 nLen = ((sal_uInt16)nByte) 0x00ff; +if (nLen == 0) +{ +pOS2MET-SetError(SVSTREAM_FILEFORMAT_ERROR); +ErrorCode=4; +} pOS2MET-ReadUChar( nTripType ); switch (nTripType) { case 0x02: @@ -2304,7 +2309,8 @@ void OS2METReader::ReadFont(sal_uInt16 nFieldSize) break; } } -nPos+=nLen; pOS2MET-Seek(nPos); +nPos+=nLen; +pOS2MET-Seek(nPos); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 92774] Can't add word to dictionary or use other options when list of choices is very long and have to scroll
https://bugs.documentfoundation.org/show_bug.cgi?id=92774 --- Comment #7 from tommy27 ba...@quipo.it --- seems like it's a Windows only bug -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - filter/qa filter/source
filter/qa/cppunit/data/met/fail/hang-1.met |binary filter/source/graphicfilter/ios2met/ios2met.cxx | 12 +--- 2 files changed, 9 insertions(+), 3 deletions(-) New commits: commit a16acd70c711626e8826887ed8ac1052048a0dfa Author: Caolán McNamara caol...@redhat.com Date: Wed Jul 15 12:18:10 2015 +0100 don't hang with 0 len causing no progression Change-Id: Ie553dab291c7bfbde033d89b84159aff6b42a160 (cherry picked from commit 15dfcb7f461893f83abcf28bfe01a4164209a160) Reviewed-on: https://gerrit.libreoffice.org/17086 Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com diff --git a/filter/qa/cppunit/data/met/fail/hang-1.met b/filter/qa/cppunit/data/met/fail/hang-1.met new file mode 100644 index 000..c1a095d Binary files /dev/null and b/filter/qa/cppunit/data/met/fail/hang-1.met differ diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index d86657d..946d68f 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -2258,7 +2258,6 @@ void OS2METReader::ReadImageData(sal_uInt16 nDataID, sal_uInt16 nDataLen) void OS2METReader::ReadFont(sal_uInt16 nFieldSize) { sal_uLong nPos, nMaxPos; -sal_uInt16 nLen; sal_uInt8 nByte, nTripType, nTripType2; OSFont * pF=new OSFont; pF-pSucc=pFontList; pFontList=pF; @@ -2270,7 +2269,13 @@ void OS2METReader::ReadFont(sal_uInt16 nFieldSize) nMaxPos=nPos+(sal_uLong)nFieldSize; pOS2MET-SeekRel(2); nPos+=2; while (nPosnMaxPos pOS2MET-GetError()==0) { -pOS2MET-ReadUChar( nByte ); nLen =((sal_uInt16)nByte) 0x00ff; +pOS2MET-ReadUChar( nByte ); +sal_uInt16 nLen = ((sal_uInt16)nByte) 0x00ff; +if (nLen == 0) +{ +pOS2MET-SetError(SVSTREAM_FILEFORMAT_ERROR); +ErrorCode=4; +} pOS2MET-ReadUChar( nTripType ); switch (nTripType) { case 0x02: @@ -2322,7 +2327,8 @@ void OS2METReader::ReadFont(sal_uInt16 nFieldSize) break; } } -nPos+=nLen; pOS2MET-Seek(nPos); +nPos+=nLen; +pOS2MET-Seek(nPos); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - svtools/source vcl/source
svtools/source/misc/dialogcontrolling.cxx | 18 ++ vcl/source/window/event.cxx |6 -- 2 files changed, 14 insertions(+), 10 deletions(-) New commits: commit fe1e767e3397da41051a20ae6c80be5e123d07ba Author: Michael Meeks michael.me...@collabora.com Date: Tue Jul 14 12:51:04 2015 +0100 tdf#92706 - avoid dbaccess wizard crash. Hold a VclPtr on the window, make reset cleaner, and don't crash removing listeners from disposed windows. Change-Id: I3efb71117fc45562d5c740578f5e33dabb2684fe Reviewed-on: https://gerrit.libreoffice.org/17038 Tested-by: Jenkins c...@libreoffice.org Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx index b381c43..ca62804 100644 --- a/svtools/source/misc/dialogcontrolling.cxx +++ b/svtools/source/misc/dialogcontrolling.cxx @@ -49,13 +49,13 @@ namespace svt struct DialogController_Data { -vcl::Window rInstigator; -::std::vector VclPtrvcl::Window aConcernedWindows; +VclPtrvcl::Window xInstigator; +::std::vector VclPtrvcl::Window aConcernedWindows; PWindowEventFilter pEventFilter; PWindowOperator pOperator; -DialogController_Data( vcl::Window _rInstigator, const PWindowEventFilter _pEventFilter, const PWindowOperator _pOperator ) -:rInstigator( _rInstigator ) +DialogController_Data( vcl::Window _xInstigator, const PWindowEventFilter _pEventFilter, const PWindowOperator _pOperator ) +:xInstigator( _xInstigator ) ,pEventFilter( _pEventFilter ) ,pOperator( _pOperator ) { @@ -66,14 +66,14 @@ namespace svt //= DialogController -DialogController::DialogController( vcl::Window _rInstigator, const PWindowEventFilter _pEventFilter, +DialogController::DialogController( vcl::Window _xInstigator, const PWindowEventFilter _pEventFilter, const PWindowOperator _pOperator ) -:m_pImpl( new DialogController_Data( _rInstigator, _pEventFilter, _pOperator ) ) +:m_pImpl( new DialogController_Data( _xInstigator, _pEventFilter, _pOperator ) ) { DBG_ASSERT( m_pImpl-pEventFilter.get() m_pImpl-pOperator.get(), DialogController::DialogController: invalid filter and/or operator! ); -m_pImpl-rInstigator.AddEventListener( LINK( this, DialogController, OnWindowEvent ) ); +m_pImpl-xInstigator-AddEventListener( LINK( this, DialogController, OnWindowEvent ) ); } @@ -85,7 +85,9 @@ namespace svt void DialogController::reset() { -m_pImpl-rInstigator.RemoveEventListener( LINK( this, DialogController, OnWindowEvent ) ); +if (m_pImpl-xInstigator) +m_pImpl-xInstigator-RemoveEventListener( LINK( this, DialogController, OnWindowEvent ) ); +m_pImpl-xInstigator.clear(); m_pImpl-aConcernedWindows.clear(); m_pImpl-pEventFilter.reset(); m_pImpl-pOperator.reset(); diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx index 61c11ab..852cc0c 100644 --- a/vcl/source/window/event.cxx +++ b/vcl/source/window/event.cxx @@ -249,7 +249,8 @@ void Window::AddEventListener( const Link rEventListener ) void Window::RemoveEventListener( const Link rEventListener ) { -mpWindowImpl-maEventListeners.removeListener( rEventListener ); +if (mpWindowImpl) +mpWindowImpl-maEventListeners.removeListener( rEventListener ); } void Window::AddChildEventListener( const Link rEventListener ) @@ -259,7 +260,8 @@ void Window::AddChildEventListener( const Link rEventListener ) void Window::RemoveChildEventListener( const Link rEventListener ) { -mpWindowImpl-maChildEventListeners.removeListener( rEventListener ); +if (mpWindowImpl) +mpWindowImpl-maChildEventListeners.removeListener( rEventListener ); } ImplSVEvent * Window::PostUserEvent( const Link rLink, void* pCaller, bool bReferenceLink ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 92654] EDITING: Function TIMEVALUE gives only '0' in ReportDesigner
https://bugs.documentfoundation.org/show_bug.cgi?id=92654 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard| target:5.1.0 | target:5.1.0 target:5.0.1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92654] EDITING: Function TIMEVALUE gives only '0' in ReportDesigner
https://bugs.documentfoundation.org/show_bug.cgi?id=92654 --- Comment #9 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Lionel Elie Mamane committed a patch related to this issue. It has been pushed to libreoffice-5-0: http://cgit.freedesktop.org/libreoffice/core/commit/?id=9c20406420966ae8cdc866a8d4fef2b949529a07h=libreoffice-5-0 tdf#92654 a Date can contain a Time, so don't loose date by default It will be available in 5.0.1. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8c0ace56528cfd469d55c17a6e9b32c33e715ec0 Author: Andrzej Hunt andr...@ahunt.org Date: Thu Jun 4 14:02:05 2015 +0100 Fix using /opt/lo/bin/nasm on windows/cygwin Change-Id: Ib3755598bfccffc2efd67816ae5fa5dc8903553e Reviewed-on: https://gerrit.libreoffice.org/16083 Tested-by: Jenkins c...@libreoffice.org Reviewed-by: Michael Stahl mst...@redhat.com (cherry picked from commit a3afa22ba4069212213009fc7304adc3c339b68b) Reviewed-on: https://gerrit.libreoffice.org/17124 Reviewed-by: David Ostrovsky da...@ostrovsky.org Tested-by: Katarina Behrens katarina.behr...@cib.de diff --git a/configure.ac b/configure.ac index 90b13c8..cf63d27 100644 --- a/configure.ac +++ b/configure.ac @@ -7459,7 +7459,7 @@ else if test -z $NASM -a $build_os = cygwin; then if test -n $LODE_HOME -a -x $LODE_HOME/opt/bin/nasm; then NASM=$LODE_HOME/opt/bin/nasm -elif -x /opt/lo/bin/nasm; then +elif test -x /opt/lo/bin/nasm; then NASM=/opt/lo/bin/nasm fi fi ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 3 commits - loleaflet/build loleaflet/src
loleaflet/build/deps.js |1 loleaflet/src/control/Buttons.js |4 +- loleaflet/src/control/Parts.js| 16 +- loleaflet/src/control/Search.js |2 - loleaflet/src/core/Log.js | 53 ++ loleaflet/src/layer/tile/GridLayer.js | 18 +-- loleaflet/src/layer/tile/TileLayer.js | 29 -- 7 files changed, 94 insertions(+), 29 deletions(-) New commits: commit 71ff6dca641072b3f5d05d0d917bc48d402e555d Author: Mihai Varga mihai.va...@collabora.com Date: Thu Jul 16 14:02:49 2015 +0300 loleaflet: log server - client communication diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js index b52d7df..b5c9e64 100644 --- a/loleaflet/src/layer/tile/TileLayer.js +++ b/loleaflet/src/layer/tile/TileLayer.js @@ -272,6 +272,11 @@ L.TileLayer = L.GridLayer.extend({ textMsg = String.fromCharCode.apply(null, bytes.subarray(0, index)); } + if (!textMsg.startsWith('tile:')) { + // log the tile msg separately as we need the tile coordinates + L.Log.log(textMsg, L.INCOMING); + } + if (textMsg.startsWith('cursorvisible:')) { var command = textMsg.match('cursorvisible: true'); this._isCursorVisible = command ? true : false; @@ -459,6 +464,7 @@ L.TileLayer = L.GridLayer.extend({ if (this._pendingTilesCount 0) { this._pendingTilesCount -= 1; } + L.Log.log(textMsg, L.INCOMING, key); } else if (textMsg.startsWith('textselection:')) { strTwips = textMsg.match(/\d+/g); @@ -527,6 +533,7 @@ L.TileLayer = L.GridLayer.extend({ }, sendMessage: function (msg, coords) { + L.Log.log(msg, L.OUTGOING, coords); this._map.socket.send(msg); }, commit 51592a4c53f462385f418a671900920a1db0a5c7 Author: Mihai Varga mihai.va...@collabora.com Date: Thu Jul 16 13:55:53 2015 +0300 loleaflet: log utility It's used to log communication between the server and the client It can print or download a csv formated file diff --git a/loleaflet/build/deps.js b/loleaflet/build/deps.js index 7f22db1..c5927ba 100644 --- a/loleaflet/build/deps.js +++ b/loleaflet/build/deps.js @@ -1,6 +1,7 @@ var deps = { Core: { src: ['Leaflet.js', + 'core/Log.js', 'core/Util.js', 'core/Class.js', 'core/Events.js', diff --git a/loleaflet/src/core/Log.js b/loleaflet/src/core/Log.js new file mode 100644 index 000..e2a1355 --- /dev/null +++ b/loleaflet/src/core/Log.js @@ -0,0 +1,53 @@ +/* + * L.Log contains methods for logging the activity + */ + +L.Log = { + log: function (msg, direction, tileCoords) { + var time = Date.now(); + if (!this._logs) { + this._logs = []; + } + msg = msg.replace(/(\r\n|\n|\r)/gm,' '); + this._logs.push({msg : msg, direction : direction, + coords : tileCoords, time : time}); + }, + + _getEntries: function () { + this._logs.sort(function (a, b) { + if (a.time b.time) { return -1; } + if (a.time b.time) { return 1; } + return 0; + }); + var data = ''; + for (var i = 0; i this._logs.length; i++) { + data += this._logs[i].time + '.' + this._logs[i].direction + '.' + + this._logs[i].msg + '.' + this._logs[i].coords; + data += '\n'; + } + return data; + }, + + print: function () { + console.log(this._getEntries()); + }, + + save: function () { + var blob = new Blob([this._getEntries()], {type: 'text/csv'}), + e = document.createEvent('MouseEvents'), + a = document.createElement('a'); + + a.download = Date.now() + '.csv'; + a.href = window.URL.createObjectURL(blob); + a.dataset.downloadurl = ['text/csv', a.download, a.href].join(':'); + e.initMouseEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null); + a.dispatchEvent(e); + }, + + clear: function () { + this._logs = []; + } +}; + +L.INCOMING = 'INCOMING'; +L.OUTGOING = 'OUTGOING'; commit d5f9250bd874d050b2e56d029c133ef045df1288 Author: Mihai Varga mihai.va...@collabora.com Date: Thu Jul 16 13:20:11 2015 +0300 loleaflet: sendMessage method
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - svx/source
svx/source/sdr/contact/viewcontactofsdrpathobj.cxx | 71 +++-- 1 file changed, 53 insertions(+), 18 deletions(-) New commits: commit f794f6501bcf18e5430d57128699fc579251f900 Author: Caolán McNamara caol...@redhat.com Date: Wed Jul 15 10:09:16 2015 +0100 Resolves: tdf#63955 clip 19km long line to some sane limit Change-Id: If9757a5fa2bb93b56b9cf9f566972f687a4a3a45 Reviewed-on: https://gerrit.libreoffice.org/17036 Reviewed-by: Thorsten Behrens thorsten.behr...@cib.de Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com (cherry picked from commit d1046e7c3f66e5f3384ee1ef534ef28346702fc6) refactor ensuring polygon has at least a line in it just split that out into a standalone function, no logic change Change-Id: I061d5d716b3fc2a9fb6385e7fb249ce300752130 (cherry picked from commit 83b3349bb94d4c48db4da8fe5f8fdb9b19e633b9) Reviewed-on: https://gerrit.libreoffice.org/17074 Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx index 7004342..c44c6a2 100644 --- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx @@ -20,13 +20,14 @@ #include sdr/contact/viewcontactofsdrpathobj.hxx #include svx/svdopath.hxx +#include svx/svdpage.hxx #include svx/sdr/primitive2d/sdrattributecreator.hxx #include basegfx/polygon/b2dpolypolygontools.hxx +#include basegfx/polygon/b2dpolygonclipper.hxx #include sdr/primitive2d/sdrpathprimitive2d.hxx #include basegfx/matrix/b2dhommatrixtools.hxx - namespace sdr { namespace contact @@ -40,26 +41,14 @@ namespace sdr { } -drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrPathObj::createViewIndependentPrimitive2DSequence() const +static sal_uInt32 ensureGeometry(basegfx::B2DPolyPolygon rUnitPolyPolygon) { -const SfxItemSet rItemSet = GetPathObj().GetMergedItemSet(); -const drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute( - drawinglayer::primitive2d::createNewSdrLineFillShadowTextAttribute( -rItemSet, -GetPathObj().getText(0), -false)); -basegfx::B2DPolyPolygon aUnitPolyPolygon(GetPathObj().GetPathPoly()); -Point aGridOff = GetPathObj().GetGridOffset(); -// Hack for calc, transform position of object according -// to current zoom so as objects relative position to grid -// appears stable -aUnitPolyPolygon.transform( basegfx::tools::createTranslateB2DHomMatrix( aGridOff.X(), aGridOff.Y() ) ); -sal_uInt32 nPolyCount(aUnitPolyPolygon.count()); +sal_uInt32 nPolyCount(rUnitPolyPolygon.count()); sal_uInt32 nPointCount(0); for(sal_uInt32 a(0); a nPolyCount; a++) { -nPointCount += aUnitPolyPolygon.getB2DPolygon(a).count(); +nPointCount += rUnitPolyPolygon.getB2DPolygon(a).count(); } if(!nPointCount) @@ -68,20 +57,66 @@ namespace sdr basegfx::B2DPolygon aFallbackLine; aFallbackLine.append(basegfx::B2DPoint(0.0, 0.0)); aFallbackLine.append(basegfx::B2DPoint(1000.0, 1000.0)); -aUnitPolyPolygon = basegfx::B2DPolyPolygon(aFallbackLine); +rUnitPolyPolygon = basegfx::B2DPolyPolygon(aFallbackLine); nPolyCount = 1; } +return nPolyCount; +} + +drawinglayer::primitive2d::Primitive2DSequence ViewContactOfSdrPathObj::createViewIndependentPrimitive2DSequence() const +{ +const SfxItemSet rItemSet = GetPathObj().GetMergedItemSet(); +const drawinglayer::attribute::SdrLineFillShadowTextAttribute aAttribute( + drawinglayer::primitive2d::createNewSdrLineFillShadowTextAttribute( +rItemSet, +GetPathObj().getText(0), +false)); +basegfx::B2DPolyPolygon aUnitPolyPolygon(GetPathObj().GetPathPoly()); +Point aGridOff = GetPathObj().GetGridOffset(); +// Hack for calc, transform position of object according +// to current zoom so as objects relative position to grid +// appears stable +aUnitPolyPolygon.transform( basegfx::tools::createTranslateB2DHomMatrix( aGridOff.X(), aGridOff.Y() ) ); +sal_uInt32 nPolyCount(ensureGeometry(aUnitPolyPolygon)); + // prepare object transformation and unit polygon (direct model data) basegfx::B2DHomMatrix aObjectMatrix; -const bool bIsLine( +bool
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - filter/qa filter/source
filter/qa/cppunit/data/met/fail/crash-1.met |binary filter/source/graphicfilter/ios2met/ios2met.cxx |7 --- 2 files changed, 4 insertions(+), 3 deletions(-) New commits: commit 8840f5c2d7739e751e29b88224b416b20e3cd26a Author: Caolán McNamara caol...@redhat.com Date: Wed Jul 15 12:25:35 2015 +0100 bump size type Change-Id: I2c32c253499a3efb22a3312ed1f0a608649ce124 (cherry picked from commit dc71a72753202d29544845cfd58992bac63c6837) Reviewed-on: https://gerrit.libreoffice.org/17090 Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com diff --git a/filter/qa/cppunit/data/met/fail/crash-1.met b/filter/qa/cppunit/data/met/fail/crash-1.met new file mode 100644 index 000..c46b4a9 Binary files /dev/null and b/filter/qa/cppunit/data/met/fail/crash-1.met differ diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index 6b38be4..d86657d 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -208,7 +208,7 @@ enum PenStyle { PEN_NULL, PEN_SOLID, PEN_DOT, PEN_DASH, PEN_DASHDOT }; struct OSPalette { OSPalette * pSucc; sal_uInt32 * p0RGB; // May be NULL! -sal_uInt16 nSize; +size_t nSize; }; struct OSArea { @@ -743,12 +743,13 @@ void OS2METReader::SetPalette0RGB(sal_uInt16 nIndex, sal_uLong nCol) } if (pPaletteStack-p0RGB==NULL || nIndex=pPaletteStack-nSize) { sal_uInt32 * pOld0RGB=pPaletteStack-p0RGB; -sal_uInt16 i,nOldSize=pPaletteStack-nSize; +size_t nOldSize = pPaletteStack-nSize; if (pOld0RGB==NULL) nOldSize=0; pPaletteStack-nSize=2*(nIndex+1); if (pPaletteStack-nSize256) pPaletteStack-nSize=256; pPaletteStack-p0RGB = new sal_uInt32[pPaletteStack-nSize]; -for (i=0; ipPaletteStack-nSize; i++) { +for (size_t i=0; i pPaletteStack-nSize; ++i) +{ if (inOldSize) pPaletteStack-p0RGB[i]=pOld0RGB[i]; else if (i==0) pPaletteStack-p0RGB[i]=0x00ff; else pPaletteStack-p0RGB[i]=0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 92706] CRASH - when autmatically launching table creation wizard after registration of database
https://bugs.documentfoundation.org/show_bug.cgi?id=92706 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard| target:5.0.0 target:5.1.0 | target:5.0.0 target:5.1.0 ||target:5.0.1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92706] CRASH - when autmatically launching table creation wizard after registration of database
https://bugs.documentfoundation.org/show_bug.cgi?id=92706 --- Comment #8 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Michael Meeks committed a patch related to this issue. It has been pushed to libreoffice-5-0: http://cgit.freedesktop.org/libreoffice/core/commit/?id=fe1e767e3397da41051a20ae6c80be5e123d07bah=libreoffice-5-0 tdf#92706 - avoid dbaccess wizard crash. It will be available in 5.0.1. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: configure.ac download.lst external/liblangtag
configure.ac |2 download.lst |2 external/liblangtag/UnpackedTarball_langtag.mk | 20 external/liblangtag/liblangtag-0.5.1-include-last-record-in-language-subtag-registry.patch | 49 -- external/liblangtag/liblangtag-0.5.1-msvc-snprintf.patch | 25 - external/liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch | 12 -- external/liblangtag/liblangtag-0.5.1-msvc-strtoull.patch | 15 --- external/liblangtag/liblangtag-0.5.1-msvc-warning.patch | 21 external/liblangtag/liblangtag-0.5.1-scope-declaration.patch | 13 -- external/liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch | 14 -- external/liblangtag/liblangtag-0.5.1-unistd.patch | 12 -- external/liblangtag/liblangtag-0.5.1-vsnprintf.patch | 18 --- external/liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch | 16 --- external/liblangtag/liblangtag-leak.patch.0 | 10 -- 14 files changed, 5 insertions(+), 224 deletions(-) New commits: commit 67bded9f0b63f722ff44bd2e653841cce389119b Author: Eike Rathke er...@redhat.com Date: Wed Jul 15 16:54:41 2015 +0200 update to liblangtag-0.5.7 Change-Id: I46bf74efb52435313eb17e0db8b1cf103a329004 Reviewed-on: https://gerrit.libreoffice.org/17078 Tested-by: Jenkins c...@libreoffice.org Reviewed-by: Eike Rathke er...@redhat.com diff --git a/configure.ac b/configure.ac index 87d7990..e7f6872 100644 --- a/configure.ac +++ b/configure.ac @@ -12047,8 +12047,6 @@ if test $enable_liblangtag = yes -o \( $enable_liblangtag = -a $_os != SYSTEM_LIBLANGTAG= AC_MSG_RESULT([no]) BUILD_TYPE=$BUILD_TYPE LIBLANGTAG -dnl TODO: remove when liblangtag is updated to 0.5.5 -AC_DEFINE([LIBLANGTAG_INLINE_FIX]) if test $COM = MSC; then LIBLANGTAG_LIBS=${WORKDIR}/UnpackedTarball/langtag/liblangtag/.libs/liblangtag.lib else diff --git a/download.lst b/download.lst index 07959ae..ceee956 100644 --- a/download.lst +++ b/download.lst @@ -95,7 +95,7 @@ export LIBEOT_TARBALL := libeot-0.01.tar.bz2 export LIBEXTTEXTCAT_TARBALL := 10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 export LIBGLTF_MD5SUM := d63a9f47ab048f5009d90693d6aa6424 export LIBGLTF_TARBALL := libgltf-0.0.2.tar.bz2 -export LIBLANGTAG_TARBALL := 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 +export LIBLANGTAG_TARBALL := 80d063d6db4c010e18c606af8aed6231-liblangtag-0.5.7.tar.bz2 export LIBXMLSEC_TARBALL := 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz export LIBXSLT_TARBALL := 9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz diff --git a/external/liblangtag/UnpackedTarball_langtag.mk b/external/liblangtag/UnpackedTarball_langtag.mk index 2951368..541baa3 100644 --- a/external/liblangtag/UnpackedTarball_langtag.mk +++ b/external/liblangtag/UnpackedTarball_langtag.mk @@ -15,22 +15,10 @@ $(eval $(call gb_UnpackedTarball_set_pre_action,langtag,\ $(GNUTAR) -x -j -f $(gb_UnpackedTarget_TARFILE_LOCATION)/$(LANGTAGREG_TARBALL) \ )) -# external/liblangtag/liblangtag-leak.patch.0 upstream: -# https://bitbucket.org/tagoh/liblangtag/pull-request/8/fix-memory-leak/diff -$(eval $(call gb_UnpackedTarball_add_patches,langtag,\ - external/liblangtag/liblangtag-0.5.1-msvc-warning.patch \ - external/liblangtag/liblangtag-0.5.1-vsnprintf.patch \ - external/liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch \ - external/liblangtag/liblangtag-0.5.1-msvc-snprintf.patch \ - external/liblangtag/liblangtag-0.5.1-msvc-strtoull.patch \ - external/liblangtag/liblangtag-0.5.1-scope-declaration.patch \ - external/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch \ - external/liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch \ - external/liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch \ - external/liblangtag/liblangtag-0.5.1-unistd.patch \ - external/liblangtag/liblangtag-0.5.1-include-last-record-in-language-subtag-registry.patch \ - external/liblangtag/liblangtag-leak.patch.0 \ -)) +# Currently no patches applied, if there were it would be: +#$(eval $(call gb_UnpackedTarball_add_patches,langtag,\ +# external/liblangtag/your-modification.patch \ +#)) ifeq ($(OS),WNT) ifeq ($(COM),GCC) diff --git
[Libreoffice-commits] core.git: 92 commits - fpicker/Library_fps_office.mk fpicker/source framework/inc framework/Library_fwk.mk framework/source framework/util icon-themes/breeze icon-themes/tango in
fpicker/Library_fps_office.mk |1 fpicker/source/office/OfficeFilePicker.cxx | 79 fpicker/source/office/OfficeFilePicker.hxx | 39 fpicker/source/office/OfficeFolderPicker.cxx|2 fpicker/source/office/OfficeFolderPicker.hxx|2 fpicker/source/office/RemoteFilesDialog.cxx | 980 ++ fpicker/source/office/RemoteFilesDialog.hxx | 171 + fpicker/source/office/commonpicker.hxx |8 fpicker/source/office/fpdialogbase.hxx | 113 + fpicker/source/office/fps_office.component |3 fpicker/source/office/fps_office.cxx|6 fpicker/source/office/iodlg.cxx |4 fpicker/source/office/iodlg.hxx | 41 framework/Library_fwk.mk|1 framework/inc/classes/resource.hrc |2 framework/source/classes/resource.src | 10 framework/source/uielement/recentfilesmenucontroller.cxx| 20 framework/source/uielement/saveasmenucontroller.cxx | 192 + framework/util/fwk.component|4 icon-themes/breeze/links.txt|2 icon-themes/tango/links.txt |2 include/sfx2/app.hxx|1 include/sfx2/filedlghelper.hxx |1 include/sfx2/sfxsids.hrc|3 include/sfx2/tbxctrl.hxx| 15 include/svtools/PlaceEditDialog.hxx |8 include/svtools/ServerDetailsControls.hxx | 12 include/svtools/breadcrumb.hxx | 64 include/svtools/foldertree.hxx | 56 include/ucbhelper/simpleauthenticationrequest.hxx |8 officecfg/registry/data/org/openoffice/Office/Common.xcu| 21 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu |8 officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 11 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |8 officecfg/registry/data/org/openoffice/Setup.xcu|1 officecfg/registry/schema/org/openoffice/Office/Common.xcs |5 sc/source/ui/app/scdll.cxx |1 sc/uiconfig/scalc/toolbar/standardbar.xml |3 sfx2/sdi/docslots.sdi |9 sfx2/sdi/sfx.sdi| 51 sfx2/source/appl/appopen.cxx| 10 sfx2/source/appl/appuno.cxx |2 sfx2/source/dialog/backingwindow.cxx| 12 sfx2/source/dialog/backingwindow.hxx|1 sfx2/source/dialog/filedlghelper.cxx|2 sfx2/source/doc/guisaveas.cxx | 47 sfx2/source/doc/objserv.cxx |6 sfx2/source/toolbox/tbxitem.cxx | 50 sfx2/uiconfig/ui/startcenter.ui | 44 svtools/Library_svt.mk |2 svtools/UIConfig_svt.mk |1 svtools/source/contnr/foldertree.cxx| 116 + svtools/source/control/breadcrumb.cxx | 225 ++ svtools/source/dialogs/PlaceEditDialog.cxx | 99 - svtools/source/dialogs/ServerDetailsControls.cxx| 107 - svtools/uiconfig/ui/placeedit.ui| 826 +++- svtools/uiconfig/ui/remotefilesdialog.ui| 241 ++ sw/source/uibase/app/swmodule.cxx |1 sw/uiconfig/swriter/toolbar/standardbar.xml |3 ucb/source/ucp/cmis/auth_provider.cxx |2 ucb/source/ucp/cmis/cmis_content.cxx|9 ucb/source/ucp/cmis/cmis_repo_content.cxx |5 ucbhelper/source/provider/simpleauthenticationrequest.cxx | 32 63 files changed, 3159 insertions(+), 652 deletions(-) New commits: commit c09512c30bdaede606547a246d755cda0154cf33
[Libreoffice-commits] core.git: svx/source
svx/source/tbxctrls/lboxctrl.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 379e07eae784a0af5b20c4006c0ee6c7a3d29c1c Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jul 16 10:44:06 2015 +0200 -Werror,-Wunused-private-field Change-Id: I16094fbe0f6455f373ae7ed300563a94df6436dc diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index 820494c..9c275ca 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -58,7 +58,6 @@ class SvxPopupWindowListBox: public SfxPopupWindow ToolBoxrToolBox; boolbUserSel; sal_uInt16 nTbxId; -OUStringmaCommandURL; public: SvxPopupWindowListBox( sal_uInt16 nSlotId, const OUString rCommandURL, sal_uInt16 nTbxId, ToolBox rTbx ); @@ -82,7 +81,6 @@ SvxPopupWindowListBox::SvxPopupWindowListBox(sal_uInt16 nSlotId, const OUString , rToolBox(rTbx) , bUserSel(false) , nTbxId(nId) -, maCommandURL(rCommandURL) { DBG_ASSERT( nSlotId == GetId(), id mismatch ); get(m_pListBox, treeview); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - forms/source
forms/source/component/clickableimage.cxx | 21 + forms/source/component/clickableimage.hxx |5 + 2 files changed, 26 insertions(+) New commits: commit 3d9b62a40947dbb25360f32a6b330519be6f04ea Author: Zolnai Tamás zolnaitamas2...@gmail.com Date: Wed Jul 15 23:23:48 2015 +0200 tdf#47832: Pictures on buttons, created in forms, gone after reopening form When image is set to a Button control the correspoding graphic object lives only temporarily, after the graphic is copied from the graphic object it's destroyed so save can't find it by graphic ID. Use the same solution which works for ImageControls: use a graphic object member for the control, so save can find it. (cherry picked from commit 70f152983f3425a77df2f65b4798417640d47b76) fix windows build (from Noel Grandin) (cherry picked from commit 4c5498ec5ee478e27fd62bdcf9de1208c692422c) Conflicts: forms/source/component/clickableimage.cxx Change-Id: If99a3efc4727a07df9d2daaefbdacc9565920005 Reviewed-on: https://gerrit.libreoffice.org/17092 Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index 71ad12e..fe5bcde 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -31,6 +31,8 @@ #include com/sun/star/frame/XFrame.hpp #include com/sun/star/awt/ActionEvent.hpp #include com/sun/star/awt/XActionListener.hpp +#include com/sun/star/graphic/XGraphic.hpp +#include com/sun/star/graphic/GraphicObject.hpp #include tools/urlobj.hxx #include tools/debug.hxx #include vcl/svapp.hxx @@ -62,6 +64,7 @@ namespace frm using namespace ::com::sun::star::util; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::form::submission; +using namespace ::com::sun::star::graphic; using ::com::sun::star::awt::MouseEvent; using ::com::sun::star::task::XInteractionHandler; @@ -451,6 +454,7 @@ namespace frm const OUString rDefault ) :OControlModel( _rxFactory, _rUnoControlModelTypeName, rDefault ) ,OPropertyChangeListener(m_aMutex) +,m_xGraphicObject() ,m_pMedium(NULL) ,m_pProducer( NULL ) ,m_bDispatchUrlInternal(false) @@ -465,6 +469,7 @@ namespace frm OClickableImageBaseModel::OClickableImageBaseModel( const OClickableImageBaseModel* _pOriginal, const ReferenceXComponentContext _rxFactory ) :OControlModel( _pOriginal, _rxFactory ) ,OPropertyChangeListener( m_aMutex ) +,m_xGraphicObject( _pOriginal-m_xGraphicObject ) ,m_pMedium( NULL ) ,m_pProducer( NULL ) ,m_bDispatchUrlInternal(false) @@ -497,6 +502,7 @@ namespace frm void OClickableImageBaseModel::implConstruct() { m_pProducer = new ImageProducer; +m_pProducer-SetDoneHdl( LINK( this, OClickableImageBaseModel, OnImageImportDone ) ); increment( m_refCount ); { m_xProducer = m_pProducer; @@ -852,6 +858,21 @@ namespace frm } } +IMPL_LINK( OClickableImageBaseModel, OnImageImportDone, Graphic*, i_pGraphic ) +{ +const Reference XGraphic xGraphic( i_pGraphic != NULL ? Graphic(i_pGraphic-GetBitmapEx()).GetXGraphic() : NULL ); +if ( !xGraphic.is() ) +{ +m_xGraphicObject.clear(); +} +else +{ +m_xGraphicObject = css::graphic::GraphicObject::create( m_xContext ); +m_xGraphicObject-setGraphic( xGraphic ); +} +return 1L; +} + // OImageProducerThread_Impl diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx index 60f03b8..f3d34ca 100644 --- a/forms/source/component/clickableimage.hxx +++ b/forms/source/component/clickableimage.hxx @@ -33,6 +33,7 @@ #include com/sun/star/form/submission/XSubmission.hpp #include com/sun/star/frame/XModel.hpp #include com/sun/star/frame/XDispatchProviderInterception.hpp +#include com/sun/star/graphic/XGraphicObject.hpp #include cppuhelper/implbase3.hxx @@ -64,6 +65,8 @@ namespace frm // ImageProducer stuff ::com::sun::star::uno::Reference ::com::sun::star::awt::XImageProducerm_xProducer; +// Store the image in a graphic object to make it accesible via graphic cache using graphic ID. +::com::sun::star::uno::Reference ::com::sun::star::graphic::XGraphicObject m_xGraphicObject; SfxMedium* m_pMedium; // Download medium ImageProducer* m_pProducer; boolm_bDispatchUrlInternal; // property: is not allowed to set : 1 @@ -143,6 +146,8 @@ namespace frm // to be called from within the cloning-ctor
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - filter/qa filter/source
dev/null|binary filter/qa/cppunit/data/ras/fail/CVE-2008-1097-1.ras |binary filter/source/graphicfilter/iras/iras.cxx | 24 +++- 3 files changed, 14 insertions(+), 10 deletions(-) New commits: commit a1fb6c1344f7e21ff6c8bf24c14e729c7ce69c71 Author: Caolán McNamara caol...@redhat.com Date: Wed Jul 15 11:31:18 2015 +0100 check stream state more often for failures Change-Id: Ie45d858021c3123ec21829cbf4742cf30ce46665 (cherry picked from commit adfa89b5ffc3589b3a19a32e707a134cee232429) Reviewed-on: https://gerrit.libreoffice.org/17071 Tested-by: Jenkins c...@libreoffice.org Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com diff --git a/filter/qa/cppunit/data/ras/pass/CVE-2008-1097-1.ras b/filter/qa/cppunit/data/ras/fail/CVE-2008-1097-1.ras similarity index 100% rename from filter/qa/cppunit/data/ras/pass/CVE-2008-1097-1.ras rename to filter/qa/cppunit/data/ras/fail/CVE-2008-1097-1.ras diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx index 6916daa..5877fa2 100644 --- a/filter/source/graphicfilter/iras/iras.cxx +++ b/filter/source/graphicfilter/iras/iras.cxx @@ -54,7 +54,7 @@ private: boolImplReadBody(BitmapWriteAccess * pAcc); boolImplReadHeader(); -sal_uInt8 ImplGetByte(); +sal_uInt8 ImplGetByte(); public: RASReader(SvStream rRAS); @@ -174,13 +174,11 @@ bool RASReader::ReadRAS(Graphic rGraphic) return mbStatus; } - - bool RASReader::ImplReadHeader() { m_rRAS.ReadInt32(mnWidth).ReadInt32(mnHeight).ReadInt32(mnDepth).ReadInt32(mnImageDatSize).ReadInt32(mnType).ReadInt32(mnColorMapType).ReadInt32(mnColorMapSize); -if ( mnWidth = 0 || mnHeight = 0 || mnImageDatSize = 0 ) +if (mnWidth = 0 || mnHeight = 0 || mnImageDatSize = 0 || !m_rRAS.good()) mbStatus = false; switch ( mnDepth ) @@ -222,7 +220,7 @@ bool RASReader::ImplReadBody(BitmapWriteAccess * pAcc) switch ( mnDstBitsPerPix ) { case 1 : -for ( y = 0; y mnHeight; y++ ) +for (y = 0; y mnHeight mbStatus; ++y) { for ( x = 0; x mnWidth; x++ ) { @@ -233,11 +231,13 @@ bool RASReader::ImplReadBody(BitmapWriteAccess * pAcc) nDat ( ( x 7 ) ^ 7 )) ); } if (!( ( x - 1 ) 0x8 ) ) ImplGetByte(); // WORD ALIGNMENT ??? +if (!m_rRAS.good()) +mbStatus = false; } break; case 8 : -for ( y = 0; y mnHeight; y++ ) +for (y = 0; y mnHeight mbStatus; ++y) { for ( x = 0; x mnWidth; x++ ) { @@ -245,6 +245,8 @@ bool RASReader::ImplReadBody(BitmapWriteAccess * pAcc) pAcc-SetPixelIndex( y, x, nDat ); } if ( x 1 ) ImplGetByte(); // WORD ALIGNMENT ??? +if (!m_rRAS.good()) +mbStatus = false; } break; @@ -253,7 +255,7 @@ bool RASReader::ImplReadBody(BitmapWriteAccess * pAcc) { case 24 : -for ( y = 0; y mnHeight; y++ ) +for (y = 0; y mnHeight mbStatus; ++y) { for ( x = 0; x mnWidth; x++ ) { @@ -272,11 +274,13 @@ bool RASReader::ImplReadBody(BitmapWriteAccess * pAcc) pAcc-SetPixel ( y, x, BitmapColor( nRed, nGreen, nBlue ) ); } if ( x 1 ) ImplGetByte(); // WORD ALIGNMENT ??? +if (!m_rRAS.good()) +mbStatus = false; } break; case 32 : -for ( y = 0; y mnHeight; y++ ) +for (y = 0; y mnHeight mbStatus; ++y) { for ( x = 0; x mnWidth; x++ ) { @@ -295,6 +299,8 @@ bool RASReader::ImplReadBody(BitmapWriteAccess * pAcc) } pAcc-SetPixel ( y, x, BitmapColor( nRed, nGreen, nBlue ) ); } +if (!m_rRAS.good()) +mbStatus = false; } break; } @@ -307,8 +313,6 @@ bool RASReader::ImplReadBody(BitmapWriteAccess * pAcc) return mbStatus; } - - sal_uInt8 RASReader::ImplGetByte() { sal_uInt8 nRetVal; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org
[Libreoffice-bugs] [Bug 47832] FILESAVE: Pictures on buttons, created in forms, gone after reopening form
https://bugs.documentfoundation.org/show_bug.cgi?id=47832 --- Comment #44 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Zolnai Tamás committed a patch related to this issue. It has been pushed to libreoffice-4-4: http://cgit.freedesktop.org/libreoffice/core/commit/?id=3d9b62a40947dbb25360f32a6b330519be6f04eah=libreoffice-4-4 tdf#47832: Pictures on buttons, created in forms, gone after reopening form It will be available in 4.4.6. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 47832] FILESAVE: Pictures on buttons, created in forms, gone after reopening form
https://bugs.documentfoundation.org/show_bug.cgi?id=47832 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|bibisected target:5.1.0 |bibisected target:5.1.0 |target:5.0.1|target:5.0.1 target:4.4.6 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source
sw/source/core/access/accnotextframe.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 03e115e51e5102ffd9c8498f865ed9e768f4f490 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 13 12:38:18 2015 +0100 fix a11y crash seen on close of tdf#92573 its not the reported crash, which has gone away which might be a duplicate of tdf#90502 the switch only handled RES_TITLE_CHANGED and RES_DESCRIPTION_CHANGED so if its anything else, e.g. OBJ_DYING, then don't attempt GetNoTextNode (cherry picked from commit 7de992bcc66c973bb6b247184cac38f01cd1104a) Change-Id: I642beb66613481cbc7ee18647f0204a67d670a84 Reviewed-on: https://gerrit.libreoffice.org/16991 Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx index 9e92a91..8d06a70 100644 --- a/sw/source/core/access/accnotextframe.cxx +++ b/sw/source/core/access/accnotextframe.cxx @@ -102,6 +102,9 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem return; // probably was deleted - avoid doing anything } +if (nWhich != RES_TITLE_CHANGED || nWhich != RES_DESCRIPTION_CHANGED) +return; + const SwNoTxtNode *pNd = GetNoTxtNode(); OSL_ENSURE( pNd == aDepend.GetRegisteredIn(), invalid frame ); switch( nWhich ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 92777] unable create database file
https://bugs.documentfoundation.org/show_bug.cgi?id=92777 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added CC||serval2...@yahoo.fr See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=92 ||706 --- Comment #3 from Julien Nabet serval2...@yahoo.fr --- Terrence: I don't know how you can have save dialog from wizard step 2 but the bt is quite identical to tdf#92706. It should be fixed now with http://cgit.freedesktop.org/libreoffice/core/commit/?id=9e2e8bb5e6c5a7df376f6ada90703f59c95f19d6 I don't know why the 5.0.0 patch was pushed not 5.0 (https://gerrit.libreoffice.org/#/c/17038/1) and master (https://gerrit.libreoffice.org/#/c/17037/), so I pushed the last one. It could be interesting you try again with the quoted patch. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: cui/source editeng/source include/editeng
cui/source/factory/dlgfact.cxx | 20 --- cui/source/factory/dlgfact.hxx |4 - editeng/source/accessibility/AccessibleParaManager.cxx | 10 --- editeng/source/editeng/editdoc.hxx | 37 ++--- editeng/source/editeng/editeng.cxx |4 - editeng/source/editeng/editstt2.hxx|7 -- editeng/source/editeng/editundo.hxx|3 - editeng/source/editeng/edtspell.cxx| 30 -- editeng/source/editeng/edtspell.hxx|4 - editeng/source/editeng/eertfpar.hxx|8 -- editeng/source/editeng/impedit.hxx | 47 +++-- editeng/source/items/paraitem.cxx | 17 -- editeng/source/misc/splwrap.cxx| 17 -- editeng/source/misc/svxacorr.cxx | 40 -- editeng/source/outliner/outleeng.cxx |5 - editeng/source/outliner/outleeng.hxx |1 editeng/source/outliner/paralist.hxx |1 include/editeng/AccessibleEditableTextPara.hxx |3 - include/editeng/AccessibleParaManager.hxx |2 include/editeng/acorrcfg.hxx |4 - include/editeng/borderline.hxx |4 - include/editeng/charsetcoloritem.hxx |1 include/editeng/cmapitem.hxx |2 include/editeng/crossedoutitem.hxx |2 include/editeng/editeng.hxx|3 - include/editeng/editstat.hxx |4 - include/editeng/editview.hxx |4 - include/editeng/edtdlg.hxx |4 - include/editeng/emphasismarkitem.hxx |2 include/editeng/flditem.hxx| 11 --- include/editeng/formatbreakitem.hxx|6 -- include/editeng/fwdtitem.hxx |7 -- include/editeng/langitem.hxx |2 include/editeng/lrspitem.hxx |5 - include/editeng/measfld.hxx|1 include/editeng/numitem.hxx|7 -- include/editeng/outliner.hxx | 24 include/editeng/pmdlitem.hxx |1 include/editeng/postitem.hxx |2 include/editeng/scripttypeitem.hxx |5 - include/editeng/splwrap.hxx| 17 -- include/editeng/svxacorr.hxx |5 - include/editeng/svxrtf.hxx | 18 -- include/editeng/tstpitem.hxx |4 - include/editeng/txtrange.hxx |2 include/editeng/unofield.hxx |1 include/editeng/unoforou.hxx |4 - include/editeng/unoipset.hxx |3 - include/editeng/unopracc.hxx |3 - include/editeng/unotext.hxx|1 include/editeng/wghtitem.hxx |2 51 files changed, 32 insertions(+), 389 deletions(-) New commits: commit 7ab881a57d01e58eebcc2608ae8dd61af4552ae8 Author: Noel Grandin n...@peralex.com Date: Thu Jul 16 08:11:27 2015 +0200 loplugin:unusedmethods editeng Change-Id: I15b2be5a9cd6e72447b674a65eabe9f89cb6ff12 Reviewed-on: https://gerrit.libreoffice.org/17115 Tested-by: Jenkins c...@libreoffice.org Reviewed-by: Noel Grandin noelgran...@gmail.com diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index deb061e..b481e00 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -342,26 +342,6 @@ OUString AbstractThesaurusDialog_Impl::GetWord() return pDlg-GetWord(); }; -sal_uInt16 AbstractThesaurusDialog_Impl::GetLanguage() const -{ -return pDlg-GetLanguage(); -}; - -vcl::Window* AbstractThesaurusDialog_Impl::GetWindow() -{ -return pDlg; -} - -void AbstractHyphenWordDialog_Impl::SelLeft() -{ -pDlg-SelLeft(); -} - -void AbstractHyphenWordDialog_Impl::SelRight() -{ -pDlg-SelRight(); -} - vcl::Window* AbstractHyphenWordDialog_Impl::GetWindow() { return pDlg; diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index dd10939..8e86679 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -166,15 +166,11 @@ class AbstractThesaurusDialog_Impl : public AbstractThesaurusDialog { DECL_ABSTDLG_BASE(AbstractThesaurusDialog_Impl,SvxThesaurusDialog) virtual OUStringGetWord() SAL_OVERRIDE; -virtual sal_uInt16 GetLanguage() const SAL_OVERRIDE; -
[Libreoffice-bugs] [Bug 92775] Can Not resize image when in whatever working on - ex: bithdaycard, CD paper jacket and etc
https://bugs.documentfoundation.org/show_bug.cgi?id=92775 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||serval2...@yahoo.fr Ever confirmed|0 |1 --- Comment #1 from Julien Nabet serval2...@yahoo.fr --- On which LO version are you? Could you attach an example file (by using this link https://bugs.documentfoundation.org/attachment.cgi?bugid=92775action=enter)so we can try to reproduce the pb? (have in mind that any file is automatically made public so remove any private/confidential part) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - extras/source
extras/source/autocorr/lang/af-ZA/DocumentList.xml | 19 extras/source/autocorr/lang/bg/DocumentList.xml| 1153 +++ extras/source/autocorr/lang/ca/DocumentList.xml| 658 ++ extras/source/autocorr/lang/cs/DocumentList.xml| 85 extras/source/autocorr/lang/da/DocumentList.xml| 844 extras/source/autocorr/lang/de/DocumentList.xml| 1154 +++ extras/source/autocorr/lang/en-AU/DocumentList.xml | 2164 + extras/source/autocorr/lang/en-GB/DocumentList.xml | 1163 +++ extras/source/autocorr/lang/en-US/DocumentList.xml | 2057 ++- extras/source/autocorr/lang/en-ZA/DocumentList.xml | 19 extras/source/autocorr/lang/es/DocumentList.xml| 1054 ++ extras/source/autocorr/lang/fa/DocumentList.xml| 19 extras/source/autocorr/lang/fi/DocumentList.xml| 1156 +++ extras/source/autocorr/lang/fr/DocumentList.xml| 954 + extras/source/autocorr/lang/ga-IE/DocumentList.xml | 19 extras/source/autocorr/lang/hr/DocumentList.xml| 294 ++ extras/source/autocorr/lang/hu/DocumentList.xml| 2050 ++- extras/source/autocorr/lang/it/DocumentList.xml| 565 + extras/source/autocorr/lang/ja/DocumentList.xml| 19 extras/source/autocorr/lang/ko/DocumentList.xml| 146 + extras/source/autocorr/lang/lb-LU/DocumentList.xml | 19 extras/source/autocorr/lang/lt/DocumentList.xml| 285 ++ extras/source/autocorr/lang/mn/DocumentList.xml| 19 extras/source/autocorr/lang/nl-BE/DocumentList.xml | 1126 ++ extras/source/autocorr/lang/nl/DocumentList.xml| 1126 ++ extras/source/autocorr/lang/pl/DocumentList.xml| 19 extras/source/autocorr/lang/pt-BR/DocumentList.xml | 955 + extras/source/autocorr/lang/pt/DocumentList.xml| 1140 +++ extras/source/autocorr/lang/ro/DocumentList.xml| 243 ++ extras/source/autocorr/lang/ru/DocumentList.xml| 472 extras/source/autocorr/lang/sk/DocumentList.xml| 83 extras/source/autocorr/lang/sv/DocumentList.xml| 125 + extras/source/autocorr/lang/tr/DocumentList.xml| 19 extras/source/autocorr/lang/vi/DocumentList.xml| 19 extras/source/autocorr/lang/zh-CN/DocumentList.xml | 111 + extras/source/autocorr/lang/zh-TW/DocumentList.xml | 81 36 files changed, 19560 insertions(+), 1874 deletions(-) New commits: commit 08a30cce9d877dd884fdd8ca5b1e74003d244585 Author: László Németh laszlo.nem...@collabora.com Date: Thu Jul 16 04:07:16 2015 +0200 add localized Emoji short names Change-Id: I023dc4200f93f61cb58f96931a8073ad3838d3d9 Reviewed-on: https://gerrit.libreoffice.org/17112 Tested-by: Jenkins c...@libreoffice.org Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com diff --git a/extras/source/autocorr/lang/af-ZA/DocumentList.xml b/extras/source/autocorr/lang/af-ZA/DocumentList.xml index 67a7f41..099a307 100644 --- a/extras/source/autocorr/lang/af-ZA/DocumentList.xml +++ b/extras/source/autocorr/lang/af-ZA/DocumentList.xml @@ -114,4 +114,23 @@ block-list:block block-list:abbreviated-name=1/2 block-list:name=½/ block-list:block block-list:abbreviated-name=1/4 block-list:name=¼/ block-list:block block-list:abbreviated-name=3/4 block-list:name=¾/ + block-list:block block-list:abbreviated-name=:^-: block-list:name=â»/ + block-list:block block-list:abbreviated-name=:^(: block-list:name=â½/ + block-list:block block-list:abbreviated-name=:^): block-list:name=â¾/ + block-list:block block-list:abbreviated-name=:_-: block-list:name=â/ + block-list:block block-list:abbreviated-name=:_(: block-list:name=â/ + block-list:block block-list:abbreviated-name=:_): block-list:name=â/ + block-list:block block-list:abbreviated-name=:---: block-list:name=â/ + block-list:block block-list:abbreviated-name=:--: block-list:name=â/ + block-list:block block-list:abbreviated-name=:-: block-list:name=â/ + block-list:block block-list:abbreviated-name=:!: block-list:name=â/ + block-list:block block-list:abbreviated-name=:!!: block-list:name=â¼/ + block-list:block block-list:abbreviated-name=:!?: block-list:name=â/ + block-list:block block-list:abbreviated-name=:?: block-list:name=â/ + block-list:block block-list:abbreviated-name=:/: block-list:name=â/ + block-list:block block-list:abbreviated-name=:': block-list:name=â/ + block-list:block block-list:abbreviated-name=:\\: block-list:name=â/ + block-list:block block-list:abbreviated-name=:â¦: block-list:name=â¦/ + block-list:block block-list:abbreviated-name=:gt;gt;: block-list:name=â«/ + block-list:block block-list:abbreviated-name=:lt;lt;: block-list:name=âª/ /block-list:block-list diff --git a/extras/source/autocorr/lang/bg/DocumentList.xml b/extras/source/autocorr/lang/bg/DocumentList.xml index 3593f5b..474d4bd 100644 ---
[Libreoffice-commits] core.git: 2 commits - chart2/source
chart2/source/controller/sidebar/ChartElementsPanel.cxx | 11 ++- chart2/source/controller/sidebar/ChartElementsPanel.hxx |1 - 2 files changed, 2 insertions(+), 10 deletions(-) New commits: commit 4439e5f689c8564a092cf40337ead04e1d024f03 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jul 16 10:54:10 2015 +0200 loplugin:vclwidgets Change-Id: I43f8530026261138585eb530b2bc83d3d9be704f diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx index db58221..42f88db 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx @@ -83,7 +83,7 @@ public: throw (::css::uno::RuntimeException, ::std::exception) SAL_OVERRIDE; private: -ChartElementsPanel* mpParent; +VclPtrChartElementsPanel mpParent; }; ChartSidebarModifyListener::ChartSidebarModifyListener(ChartElementsPanel* pParent): commit 9edaebe651a341bf449e366ff54830556f32292d Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jul 16 10:52:54 2015 +0200 Remove unused modelInvalid Change-Id: I18701b367dcca36afb8e6f28645453294881683f diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx index e26c65a..db58221 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx @@ -103,9 +103,7 @@ void ChartSidebarModifyListener::modified(const css::lang::EventObject /*rEvent void ChartSidebarModifyListener::disposing(const css::lang::EventObject /*rEvent*/) throw (::css::uno::RuntimeException, ::std::exception) -{ -mpParent-modelInvalid(); -} +{} ChartModel* getChartModel(css::uno::Referencecss::frame::XModel xModel) { @@ -488,11 +486,6 @@ void ChartElementsPanel::NotifyItemUpdate( { } -void ChartElementsPanel::modelInvalid() -{ - -} - IMPL_LINK(ChartElementsPanel, CheckBoxHdl, CheckBox*, pCheckBox) { bool bChecked = pCheckBox-IsChecked(); diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.hxx b/chart2/source/controller/sidebar/ChartElementsPanel.hxx index 6bf1642..51e7e49 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.hxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.hxx @@ -68,7 +68,6 @@ public: virtual void dispose() SAL_OVERRIDE; void updateData(); -void modelInvalid(); private: //ui controls ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unotools/source
unotools/source/config/lingucfg.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 91f41ac71a773e2016f2f53e08e85c5fc065999d Author: Caolán McNamara caol...@redhat.com Date: Thu Jul 16 08:48:30 2015 +0100 WaE: -Wmaybe-uninitialized Change-Id: Ie49c6a8067c5223bbe3c86505aa909c2bd5d3c93 diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index 2439cd4..5bda4e6 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -569,7 +569,7 @@ bool SvtLinguConfigItem::LoadOptions( const uno::Sequence OUString rProperyN for (sal_Int32 i = 0; i nProps; ++i) { const uno::Any rVal = pValue[i]; -sal_Int32 nPropertyHandle; +sal_Int32 nPropertyHandle(0); GetHdlByName( nPropertyHandle, pProperyNames[i], true ); switch ( nPropertyHandle ) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svtools
include/svtools/ServerDetailsControls.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e373d3cd63dc0728aed0c16782a49754658e5e72 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jul 16 10:06:26 2015 +0200 -Werror,-Winconsistent-missing-override Change-Id: Ic26b03153d856f460a2e6c90b64a670541ec5af0 diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx index 29c951a..5df8a36 100644 --- a/include/svtools/ServerDetailsControls.hxx +++ b/include/svtools/ServerDetailsControls.hxx @@ -130,7 +130,7 @@ class CmisDetailsContainer : public DetailsContainer CmisDetailsContainer( VclBuilderContainer* pBuilder, OUString sBinding ); virtual ~CmisDetailsContainer( ) { }; -virtual void show( bool bShow = true ); +virtual void show( bool bShow = true ) SAL_OVERRIDE; virtual INetURLObject getUrl( ) SAL_OVERRIDE; virtual bool setUrl( const INetURLObject rUrl ) SAL_OVERRIDE; virtual void setUsername( const OUString rUsername ) SAL_OVERRIDE; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Howto build a viewer to compare differences using tiles?
Hi Stef, Le 15/07/2015 18:52, Stef Bon a écrit : Hi, I'm building backup/version system, using sqlite, btrfs and FUSE for the user. It's comparable to snapper, but that's more a tool to backup/snapshot the system. Fuse-backup is a tool for the user, he/she can assign a directory to backup easily, and view versions of files with a simple mouseclick. [...] Now I've spoken with Michael Meeks in Den Hage begin May at the OpenSuse conference. I asked him howto build a tool to view the differences between versions. He suggested me to look at the libreofficekit, and especially the lokdocview, to view pages as tiles. Now can someone describe globally howto write an app using qt 5, showing the pages as tiles, the page of the current version left and the previous version right? I'm also interested by creating a Qt+QML app with LOKit : I would like to use it for making UX prototypes :-) We are not alone : Canonical just announced that they start to integrate LOKit as a plugin of their DocViewer app [1]. It seems Bjoern is involved in this project ? I found the code of the plugin [2], but I have no knowledge how to use it to create a standard basic app. Hope this helps, Michel [1] https://lists.ubuntu.com/archives/ubuntu-community-team/2015-June/000649.html [2] http://bazaar.launchpad.net/~verzegnassi-stefano/ubuntu-docviewer-app/lo-plugin-prototype/files ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svtools/source vcl/source
svtools/source/misc/dialogcontrolling.cxx | 18 ++ vcl/source/window/event.cxx |6 -- 2 files changed, 14 insertions(+), 10 deletions(-) New commits: commit 9e2e8bb5e6c5a7df376f6ada90703f59c95f19d6 Author: Michael Meeks michael.me...@collabora.com Date: Tue Jul 14 12:51:04 2015 +0100 tdf#92706 - avoid dbaccess wizard crash. Hold a VclPtr on the window, make reset cleaner, and don't crash removing listeners from disposed windows. Change-Id: I3efb71117fc45562d5c740578f5e33dabb2684fe Reviewed-on: https://gerrit.libreoffice.org/17037 Reviewed-by: Julien Nabet serval2...@yahoo.fr Tested-by: Julien Nabet serval2...@yahoo.fr diff --git a/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx index b381c43..ca62804 100644 --- a/svtools/source/misc/dialogcontrolling.cxx +++ b/svtools/source/misc/dialogcontrolling.cxx @@ -49,13 +49,13 @@ namespace svt struct DialogController_Data { -vcl::Window rInstigator; -::std::vector VclPtrvcl::Window aConcernedWindows; +VclPtrvcl::Window xInstigator; +::std::vector VclPtrvcl::Window aConcernedWindows; PWindowEventFilter pEventFilter; PWindowOperator pOperator; -DialogController_Data( vcl::Window _rInstigator, const PWindowEventFilter _pEventFilter, const PWindowOperator _pOperator ) -:rInstigator( _rInstigator ) +DialogController_Data( vcl::Window _xInstigator, const PWindowEventFilter _pEventFilter, const PWindowOperator _pOperator ) +:xInstigator( _xInstigator ) ,pEventFilter( _pEventFilter ) ,pOperator( _pOperator ) { @@ -66,14 +66,14 @@ namespace svt //= DialogController -DialogController::DialogController( vcl::Window _rInstigator, const PWindowEventFilter _pEventFilter, +DialogController::DialogController( vcl::Window _xInstigator, const PWindowEventFilter _pEventFilter, const PWindowOperator _pOperator ) -:m_pImpl( new DialogController_Data( _rInstigator, _pEventFilter, _pOperator ) ) +:m_pImpl( new DialogController_Data( _xInstigator, _pEventFilter, _pOperator ) ) { DBG_ASSERT( m_pImpl-pEventFilter.get() m_pImpl-pOperator.get(), DialogController::DialogController: invalid filter and/or operator! ); -m_pImpl-rInstigator.AddEventListener( LINK( this, DialogController, OnWindowEvent ) ); +m_pImpl-xInstigator-AddEventListener( LINK( this, DialogController, OnWindowEvent ) ); } @@ -85,7 +85,9 @@ namespace svt void DialogController::reset() { -m_pImpl-rInstigator.RemoveEventListener( LINK( this, DialogController, OnWindowEvent ) ); +if (m_pImpl-xInstigator) +m_pImpl-xInstigator-RemoveEventListener( LINK( this, DialogController, OnWindowEvent ) ); +m_pImpl-xInstigator.clear(); m_pImpl-aConcernedWindows.clear(); m_pImpl-pEventFilter.reset(); m_pImpl-pOperator.reset(); diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx index ec6a9b6..b736141 100644 --- a/vcl/source/window/event.cxx +++ b/vcl/source/window/event.cxx @@ -249,7 +249,8 @@ void Window::AddEventListener( const Link rEventListener ) void Window::RemoveEventListener( const Link rEventListener ) { -mpWindowImpl-maEventListeners.removeListener( rEventListener ); +if (mpWindowImpl) +mpWindowImpl-maEventListeners.removeListener( rEventListener ); } void Window::AddChildEventListener( const Link rEventListener ) @@ -259,7 +260,8 @@ void Window::AddChildEventListener( const Link rEventListener ) void Window::RemoveChildEventListener( const Link rEventListener ) { -mpWindowImpl-maChildEventListeners.removeListener( rEventListener ); +if (mpWindowImpl) +mpWindowImpl-maChildEventListeners.removeListener( rEventListener ); } ImplSVEvent * Window::PostUserEvent( const Link rLink, void* pCaller, bool bReferenceLink ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - filter/qa filter/source
filter/qa/cppunit/data/dxf/fail/hang-1.dxf|1 filter/qa/cppunit/data/dxf/pass/pyramid.dxf |25008 ++ filter/source/graphicfilter/idxf/dxfgrprd.cxx |3 3 files changed, 25010 insertions(+), 2 deletions(-) New commits: commit e25cbe0c47d1fbd57bb83856a750a8748fdce6bc Author: Caolán McNamara caol...@redhat.com Date: Wed Jul 15 17:10:24 2015 +0100 don't hang if at end of stream Change-Id: I497a30041ec667237c2aa64963dcefb67753e87c (cherry picked from commit 5c8325325868753d2891556400c91651bce58402) Reviewed-on: https://gerrit.libreoffice.org/17116 Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com diff --git a/filter/qa/cppunit/data/dxf/fail/hang-1.dxf b/filter/qa/cppunit/data/dxf/fail/hang-1.dxf new file mode 100644 index 000..d97edbb29 --- /dev/null +++ b/filter/qa/cppunit/data/dxf/fail/hang-1.dxf @@ -0,0 +1 @@ +99 \ No newline at end of file diff --git a/filter/qa/cppunit/data/dxf/pass/pyramid.dxf b/filter/qa/cppunit/data/dxf/pass/pyramid.dxf new file mode 100644 index 000..65cd5f83 --- /dev/null +++ b/filter/qa/cppunit/data/dxf/pass/pyramid.dxf @@ -0,0 +1,25008 @@ +0 +SECTION +2 +HEADER +9 +$ACADVER +1 +AC1014 +9 +$ACADMAINTVER +70 +8 +9 +$DWGCODEPAGE +3 +ANSI_1252 +9 +$INSBASE +10 +0.0 +20 +0.0 +30 +0.0 +9 +$EXTMIN +10 +1.00E+20 +20 +1.00E+20 +30 +1.00E+20 +9 +$EXTMAX +10 +-1.00E+20 +20 +-1.00E+20 +30 +-1.00E+20 +9 +$LIMMIN +10 +0.0 +20 +0.0 +9 +$LIMMAX +10 +12.0 +20 +9.0 +9 +$ORTHOMODE +70 +0 +9 +$REGENMODE +70 +1 +9 +$FILLMODE +70 +1 +9 +$QTEXTMODE +70 +0 +9 +$MIRRTEXT +70 +1 +9 +$DRAGMODE +70 +2 +9 +$LTSCALE +40 +1.0 +9 +$OSMODE +70 +0 +9 +$ATTMODE +70 +1 +9 +$TEXTSIZE +40 +0.2 +9 +$TRACEWID +40 +0.05 +9 +$TEXTSTYLE +7 +STANDARD +9 +$CLAYER +8 +0 +9 +$CELTYPE +6 +BYLAYER +9 +$CECOLOR +62 +256 +9 +$CELTSCALE +40 +1.0 +9 +$DELOBJ +70 +1 +9 +$DISPSILH +70 +0 +9 +$DIMSCALE +40 +1.0 +9 +$DIMASZ +40 +0.18 +9 +$DIMEXO +40 +0.0625 +9 +$DIMDLI +40 +0.38 +9 +$DIMRND +40 +0.0 +9 +$DIMDLE +40 +0.0 +9 +$DIMEXE +40 +0.18 +9 +$DIMTP +40 +0.0 +9 +$DIMTM +40 +0.0 +9 +$DIMTXT +40 +0.18 +9 +$DIMCEN +40 +0.09 +9 +$DIMTSZ +40 +0.0 +9 +$DIMTOL +70 +0 +9 +$DIMLIM +70 +0 +9 +$DIMTIH +70 +1 +9 +$DIMTOH +70 +1 +9 +$DIMSE1 +70 +0 +9 +$DIMSE2 +70 +0 +9 +$DIMTAD +70 +0 +9 +$DIMZIN +70 +0 +9 +$DIMBLK +1 + +9 +$DIMASO +70 +1 +9 +$DIMSHO +70 +1 +9 +$DIMPOST +1 + +9 +$DIMAPOST +1 + +9 +$DIMALT +70 +0 +9 +$DIMALTD +70 +2 +9 +$DIMALTF +40 +25.4 +9 +$DIMLFAC +40 +1.0 +9 +$DIMTOFL +70 +0 +9 +$DIMTVP +40 +0.0 +9 +$DIMTIX +70 +0 +9 +$DIMSOXD +70 +0 +9 +$DIMSAH +70 +0 +9 +$DIMBLK1 +1 + +9 +$DIMBLK2 +1 + +9 +$DIMSTYLE +2 +STANDARD +9 +$DIMCLRD +70 +0 +9 +$DIMCLRE +70 +0 +9 +$DIMCLRT +70 +0 +9 +$DIMTFAC +40 +1.0 +9 +$DIMGAP +40 +0.09 +9 +$DIMJUST +70 +0 +9 +$DIMSD1 +70 +0 +9 +$DIMSD2 +70 +0 +9 +$DIMTOLJ +70 +1 +9 +$DIMTZIN +70 +0 +9 +$DIMALTZ +70 +0 +9 +$DIMALTTZ +70 +0 +9 +$DIMFIT +70 +3 +9 +$DIMUPT +70 +0 +9 +$DIMUNIT +70 +2 +9 +$DIMDEC +70 +4 +9 +$DIMTDEC +70 +4 +9 +$DIMALTU +70 +2 +9 +$DIMALTTD +70 +2 +9 +$DIMTXSTY +7 +STANDARD +9 +$DIMAUNIT +70 +0 +9 +$LUNITS +70 +2 +9 +$LUPREC +70 +4 +9 +$SKETCHINC +40 +0.1 +9 +$FILLETRAD +40 +0.5 +9 +$AUNITS +70 +0 +9 +$AUPREC +70 +0 +9 +$MENU +1 +. +9 +$ELEVATION +40 +0.0 +9 +$PELEVATION +40 +0.0 +9 +$THICKNESS +40 +0.0 +9 +$LIMCHECK +70 +0 +9 +$BLIPMODE +70 +0 +9 +$CHAMFERA +40 +0.5 +9 +$CHAMFERB +40 +0.5 +9 +$CHAMFERC +40 +1.0 +9 +$CHAMFERD +40 +0.0 +9 +$SKPOLY +70 +1 +9 +$TDCREATE +40 +2451008.519973958 +9 +$TDUPDATE +40 +2451008.523538426 +9 +$TDINDWG +40 +0.002406 +9 +$TDUSRTIMER +40 +0.002406 +9 +$USRTIMER +70 +1 +9 +$ANGBASE +50 +0.0 +9 +$ANGDIR +70 +0 +9 +$PDMODE +70 +0 +9 +$PDSIZE +40 +0.0 +9 +$PLINEWID +40 +0.0 +9 +$COORDS +70 +1 +9 +$SPLFRAME +70 +0 +9 +$SPLINETYPE +70 +6 +9 +$SPLINESEGS +70 +8 +9 +$ATTDIA +70 +0 +9 +$ATTREQ +70 +1 +9 +$HANDLING +70 +1 +9 +$HANDSEED +5 +5B +9 +$SURFTAB1 +70 +6 +9 +$SURFTAB2 +70 +6 +9 +$SURFTYPE +70 +6 +9 +$SURFU +70 +6 +9 +$SURFV +70 +6 +9 +$UCSNAME +2 + +9 +$UCSORG +10 +0.0 +20 +0.0 +30 +0.0 +9 +$UCSXDIR +10 +1.0 +20 +0.0 +30 +0.0 +9 +$UCSYDIR +10 +0.0 +20 +1.0 +30 +0.0 +9 +$PUCSNAME +2 + +9 +$PUCSORG +10 +0.0 +20 +0.0 +30 +0.0 +9 +$PUCSXDIR +10 +1.0 +20 +0.0 +30 +0.0 +9 +$PUCSYDIR +10 +0.0 +20 +1.0 +30 +0.0 +9 +$USERI1 +70 +0 +9 +$USERI2 +70 +0 +9 +$USERI3 +70 +0 +9 +$USERI4 +70 +0 +9 +$USERI5 +70 +0 +9 +$USERR1 +40 +0.0 +9 +$USERR2 +40 +0.0 +9 +$USERR3 +40 +0.0 +9 +$USERR4 +40 +0.0 +9 +$USERR5 +40 +0.0 +9 +$WORLDVIEW +70 +1 +9 +$SHADEDGE +70 +3 +9 +$SHADEDIF +70 +70 +9 +$TILEMODE +70 +1 +9 +$MAXACTVP +70 +48 +9 +$PINSBASE +10 +0.0 +20 +0.0 +30 +0.0 +9 +$PLIMCHECK +70 +0 +9 +$PEXTMIN +10 +1.00E+20 +20 +1.00E+20 +30 +1.00E+20 +9 +$PEXTMAX +10 +-1.00E+20 +20 +-1.00E+20 +30 +-1.00E+20 +9 +$PLIMMIN +10 +0.0 +20 +0.0 +9 +$PLIMMAX +10 +12.0 +20 +9.0 +9 +$UNITMODE +70 +0 +9 +$VISRETAIN +70 +1 +9 +$PLINEGEN +70 +0 +9 +$PSLTSCALE +70 +1 +9 +$TREEDEPTH +70 +3020 +9
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - filter/qa filter/source
dev/null|binary filter/qa/cppunit/data/ras/fail/CVE-2008-1097-1.ras |binary filter/source/graphicfilter/iras/iras.cxx | 24 +++- 3 files changed, 14 insertions(+), 10 deletions(-) New commits: commit 2be3b3ee4b94f2b0f25985db931f8981699e784c Author: Caolán McNamara caol...@redhat.com Date: Wed Jul 15 11:31:18 2015 +0100 check stream state more often for failures Change-Id: Ie45d858021c3123ec21829cbf4742cf30ce46665 (cherry picked from commit adfa89b5ffc3589b3a19a32e707a134cee232429) Reviewed-on: https://gerrit.libreoffice.org/17072 Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com diff --git a/filter/qa/cppunit/data/ras/pass/CVE-2008-1097-1.ras b/filter/qa/cppunit/data/ras/fail/CVE-2008-1097-1.ras similarity index 100% rename from filter/qa/cppunit/data/ras/pass/CVE-2008-1097-1.ras rename to filter/qa/cppunit/data/ras/fail/CVE-2008-1097-1.ras diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx index 2f441cf..61d5128 100644 --- a/filter/source/graphicfilter/iras/iras.cxx +++ b/filter/source/graphicfilter/iras/iras.cxx @@ -54,7 +54,7 @@ private: boolImplReadBody(BitmapWriteAccess * pAcc); boolImplReadHeader(); -sal_uInt8 ImplGetByte(); +sal_uInt8 ImplGetByte(); public: RASReader(SvStream rRAS); @@ -174,13 +174,11 @@ bool RASReader::ReadRAS(Graphic rGraphic) return mbStatus; } - - bool RASReader::ImplReadHeader() { m_rRAS.ReadInt32(mnWidth).ReadInt32(mnHeight).ReadInt32(mnDepth).ReadInt32(mnImageDatSize).ReadInt32(mnType).ReadInt32(mnColorMapType).ReadInt32(mnColorMapSize); -if ( mnWidth = 0 || mnHeight = 0 || mnImageDatSize = 0 ) +if (mnWidth = 0 || mnHeight = 0 || mnImageDatSize = 0 || !m_rRAS.good()) mbStatus = false; switch ( mnDepth ) @@ -222,7 +220,7 @@ bool RASReader::ImplReadBody(BitmapWriteAccess * pAcc) switch ( mnDstBitsPerPix ) { case 1 : -for ( y = 0; y mnHeight; y++ ) +for (y = 0; y mnHeight mbStatus; ++y) { for ( x = 0; x mnWidth; x++ ) { @@ -233,11 +231,13 @@ bool RASReader::ImplReadBody(BitmapWriteAccess * pAcc) nDat ( ( x 7 ) ^ 7 )) ); } if (!( ( x - 1 ) 0x8 ) ) ImplGetByte(); // WORD ALIGNMENT ??? +if (!m_rRAS.good()) +mbStatus = false; } break; case 8 : -for ( y = 0; y mnHeight; y++ ) +for (y = 0; y mnHeight mbStatus; ++y) { for ( x = 0; x mnWidth; x++ ) { @@ -245,6 +245,8 @@ bool RASReader::ImplReadBody(BitmapWriteAccess * pAcc) pAcc-SetPixelIndex( y, x, nDat ); } if ( x 1 ) ImplGetByte(); // WORD ALIGNMENT ??? +if (!m_rRAS.good()) +mbStatus = false; } break; @@ -253,7 +255,7 @@ bool RASReader::ImplReadBody(BitmapWriteAccess * pAcc) { case 24 : -for ( y = 0; y mnHeight; y++ ) +for (y = 0; y mnHeight mbStatus; ++y) { for ( x = 0; x mnWidth; x++ ) { @@ -272,11 +274,13 @@ bool RASReader::ImplReadBody(BitmapWriteAccess * pAcc) pAcc-SetPixel ( y, x, BitmapColor( nRed, nGreen, nBlue ) ); } if ( x 1 ) ImplGetByte(); // WORD ALIGNMENT ??? +if (!m_rRAS.good()) +mbStatus = false; } break; case 32 : -for ( y = 0; y mnHeight; y++ ) +for (y = 0; y mnHeight mbStatus; ++y) { for ( x = 0; x mnWidth; x++ ) { @@ -295,6 +299,8 @@ bool RASReader::ImplReadBody(BitmapWriteAccess * pAcc) } pAcc-SetPixel ( y, x, BitmapColor( nRed, nGreen, nBlue ) ); } +if (!m_rRAS.good()) +mbStatus = false; } break; } @@ -307,8 +313,6 @@ bool RASReader::ImplReadBody(BitmapWriteAccess * pAcc) return mbStatus; } - - sal_uInt8 RASReader::ImplGetByte() { sal_uInt8 nRetVal; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 92774] Can't add word to dictionary or use other options when list of choices is very long and have to scroll
https://bugs.documentfoundation.org/show_bug.cgi?id=92774 --- Comment #6 from wope w...@gmx.com --- in german, i tried this with the words jo and me, I must scroll. everthing was ok, i can add the word to the dictionary and ignore, and ... my System: OpenSuse 13.2, 64Bit, LO 5.0.0.3 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 47832] FILESAVE: Pictures on buttons, created in forms, gone after reopening form
https://bugs.documentfoundation.org/show_bug.cgi?id=47832 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #45 from Julien Nabet serval2...@yahoo.fr --- So let's put this one FIXED now. Thank you Zolnai! :-) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92758] Duplication of document in CMIS after checkout/checkin
https://bugs.documentfoundation.org/show_bug.cgi?id=92758 Vasily Melenchuk vasily.melenc...@cib.de changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |vasily.melenc...@cib.de |desktop.org | -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - 3289 commits - accessibility/inc accessibility/source android/Bootstrap android/CustomTarget_android_desktop.mk andro
Rebased ref, commits from common ancestor: commit c09512c30bdaede606547a246d755cda0154cf33 Author: Szymon KÅos eszka...@gmail.com Date: Tue Jul 14 20:55:52 2015 +0200 question about overwriting the file only in the save mode Change-Id: Iabb3bc12a8efae65a1c3d221a31c2214de8f6c90 diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 6c200ae..ec34e96 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -777,11 +777,14 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, OkHdl ) if ( bExists ) { -OUString sMsg = ResId( STR_SVT_ALREADYEXISTOVERWRITE, *ResMgrHolder::getOrCreate() ); -sMsg = sMsg.replaceFirst( $filename$, sName ); -ScopedVclPtrInstance MessageDialog aBox( this, sMsg, VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO ); -if( aBox-Execute() != RET_YES ) -return 0; +if( m_eMode == REMOTEDLG_MODE_SAVE ) +{ +OUString sMsg = ResId( STR_SVT_ALREADYEXISTOVERWRITE, *ResMgrHolder::getOrCreate() ); +sMsg = sMsg.replaceFirst( $filename$, sName ); +ScopedVclPtrInstance MessageDialog aBox( this, sMsg, VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO ); +if( aBox-Execute() != RET_YES ) +return 0; +} } else { commit 84e8159ada9a63ac4fd690406e4295860912ebea Author: Szymon KÅos eszka...@gmail.com Date: Tue Jul 14 16:16:06 2015 +0200 FilePickerLastService as a string, not string-list 2 Change-Id: If100617ef968fde94178528327135e15f64c1542 diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 5ea0658..6c200ae 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -227,10 +227,7 @@ void RemoteFilesDialog::dispose() std::shared_ptr comphelper::ConfigurationChanges batch( comphelper::ConfigurationChanges::create( m_context ) ); -Sequence OUString lastService( 1 ); -lastService[0] = m_sLastServiceUrl; - -officecfg::Office::Common::Misc::FilePickerLastService::set( lastService, batch ); +officecfg::Office::Common::Misc::FilePickerLastService::set( m_sLastServiceUrl, batch ); if( m_bIsUpdated ) { @@ -324,10 +321,8 @@ void RemoteFilesDialog::FillServicesListbox() unsigned int nPos = 0; unsigned int i = 0; -Sequence OUString lastService( officecfg::Office::Common::Misc::FilePickerLastService::get( m_context ) ); -if( lastService.getLength() 0 ) -m_sLastServiceUrl = lastService[0]; +m_sLastServiceUrl = officecfg::Office::Common::Misc::FilePickerLastService::get( m_context ); for( sal_Int32 nPlace = 0; nPlace placesUrlsList.getLength() nPlace placesNamesList.getLength(); ++nPlace ) { commit f587314d8d03cc6ac6e112955b401f098e231223 Author: Szymon KÅos eszka...@gmail.com Date: Tue Jul 14 16:02:02 2015 +0200 FilePickerLastService as a string, not string-list Change-Id: I7c379e797250be2f61791f5f3260d23ad24d26b3 diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 5109e66..220a989 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -5828,7 +5828,7 @@ descList of names of the places the user bookmarked in the file picker dialog./desc /info /prop - prop oor:name=FilePickerLastService oor:type=oor:string-list oor:nillable=false + prop oor:name=FilePickerLastService oor:type=xs:string oor:nillable=false info descURL of the last used service in the remote file picker./desc /info commit 84d266fa838a3df1cedbcde5ab98c8a8b23f6b48 Author: Szymon KÅos eszka...@gmail.com Date: Tue Jul 14 13:10:53 2015 +0200 RemoteFilesDialog: remember last used service Change-Id: I494b1d43d28d8e6c37ce9d391b37580be6a9be31 diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 533940d..5ea0658 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -225,6 +225,13 @@ void RemoteFilesDialog::dispose() { m_pFileView-SetSelectHdl( Link() ); +std::shared_ptr comphelper::ConfigurationChanges batch( comphelper::ConfigurationChanges::create( m_context ) ); + +Sequence OUString lastService( 1 ); +lastService[0] = m_sLastServiceUrl; + +officecfg::Office::Common::Misc::FilePickerLastService::set( lastService, batch ); + if( m_bIsUpdated ) { Sequence OUString placesUrlsList( m_aServices.size() ); @@ -238,12 +245,12 @@ void RemoteFilesDialog::dispose() ++i; } -std::shared_ptr comphelper::ConfigurationChanges batch(
[Libreoffice-bugs] [Bug 83309] FILEOPEN: text paragraph indentation/tab stops in .DOCX displayed incorrectly
https://bugs.documentfoundation.org/show_bug.cgi?id=83309 --- Comment #13 from Stephan Aßmus supersti...@gmx.de --- I was testing the Apache POI based DOCX export of my own software against LibreOffice Writer 4.4.4.3. I thought I was doing something wrong with exporting global styles, since LibreOffice was not picking up indentation or tab-stops of global styles at all. I confirmed that I stored the indentation and tab-stop information exactly like LibreOffice itself is storing this information in word/styles.xml when exporting to DOCX (OOXML). Then I discovered, that LibreOffice Writer *itself* does not restore the indentation and tab-stops from global styles in documents that it has exported itself! To reproduce: 1) In a fresh document in LibreOffice Writer, create a custom root style, not based on any other style. 2) Open format templates, edit this custom style and define an indentation (first, left, right). Define some tab-stops. 3) Observe that a paragraph set to this style in the text shows the expected indentation and tab-stop positions. 4) Export as .docx and close the document. 5) Re-open/import the file exported in step 4. 6) Observe that the indentation and tab-stop information is not restored on the global style. Notice that the text formatted with this style is now formatted differently (with default indentation and tab-stops). -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: framework/source
framework/source/uielement/saveasmenucontroller.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit b3ade2609d3ddde225eddb10cbcb477729baba7c Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jul 16 10:18:27 2015 +0200 loplugin:cstylecast Change-Id: I365b43f0327219f5ccd74984ec907088a8769785 diff --git a/framework/source/uielement/saveasmenucontroller.cxx b/framework/source/uielement/saveasmenucontroller.cxx index 6460013..f02d849 100644 --- a/framework/source/uielement/saveasmenucontroller.cxx +++ b/framework/source/uielement/saveasmenucontroller.cxx @@ -125,14 +125,14 @@ void SaveAsMenuController::fillPopupMenu( Reference css::awt::XPopupMenu rPo // XEventListener void SAL_CALL SaveAsMenuController::disposing( const EventObject ) throw ( RuntimeException, std::exception ) { -Reference css::awt::XMenuListener xHolder(( OWeakObject *)this, UNO_QUERY ); +Reference css::awt::XMenuListener xHolder(static_castOWeakObject *(this), UNO_QUERY ); osl::MutexGuard aLock( m_aMutex ); m_xFrame.clear(); m_xDispatch.clear(); if ( m_xPopupMenu.is() ) -m_xPopupMenu-removeMenuListener( Reference css::awt::XMenuListener (( OWeakObject *)this, UNO_QUERY )); +m_xPopupMenu-removeMenuListener( Reference css::awt::XMenuListener (static_castOWeakObject *(this), UNO_QUERY )); m_xPopupMenu.clear(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 92706] CRASH - when autmatically launching table creation wizard after registration of database
https://bugs.documentfoundation.org/show_bug.cgi?id=92706 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=92 ||777 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92770] thisComponent is not valid during Open Document at startup in non-document macro
https://bugs.documentfoundation.org/show_bug.cgi?id=92770 --- Comment #1 from Noel Power nopo...@novell.com --- (In reply to Lionel Elie Mamane from comment #0) Created attachment 117261 [details] reproduction case When: - LibreOffice is started with instruction to open document foo.odb (for example, type in a shell /path/to/soffice foo.odb) AND - in foo.odb, the Open Document event is bound to a macro OnOpen AND - the macro OnOpen is not saved in foo.odb, but in My Macros OR calls (without delay, without a MsgBox before, etc) a macro Go that is saved in My Macros AND - OnOpen/Go tries to use thisComponent THEN thisComponent is not set to a valid value. E.g., XRay cannot introspect it, it doesn't have a supportsService method, ...BUT isEmpty(thisComponent) is *false*. Unlikely this is anything to do with basic but rather something has changed in the framework code which creates/sets the 'ThisComponent' value. iirc basics ThisComponent value is set in objxstor.c as part of the opening of a document. In this case it seems like the object behind 'ThisComponent' at this point is partially contructed or maybe some sort of placeholder, you'll have to dig deeper in the framework code I expect -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
Approximating a missing platform with gerrit
Our gerrit/jenkins setup is fine in detecting change requests that would break the build. But when you try to (mis-)use it to modify a change request until it passes on all platforms (because you don't have direct access to one of the platforms, say), the situation is not that ideal. As I recently experienced when I tried to get https://gerrit.libreoffice.org/#/c/16880/ Make content of OSL_ASSERT, DBG_ASSERT, etc. visiblie in non-debug builds to build on Windows---and ultimately resorted to a local Windows build anyway, to speed things up. I do understand that this may be issues in the design of the setup that are hard to overcome, but wanted to dump this food for thought anyway: * Once two of the three platforms are known to compile a give change fine, it would be nice if one could requests builds of new versions of the change for only one specific platform (esp. when then newly made modifications are in platform-specific code, so should not affect the already-good platforms anyway). Could save time and reduce (real-world) waste. * Sometimes, a build fails for spurious reasons midway through, and you need to start another build. But the only way to re-trigger a build is to rebase the change. (The downsides are: disrupts the history of the change's revisions; the rebased-upon master revision itself may be broken; and there just might not be a new master revision to rebase against yet at all) It would be nice if one could force rebuilds of already built change request vesions. (In my example, this happend at patch sets 6 - 7.) * In cases like in my example, where the change breaks platform-specific code in various places in the code base, it can be tedious and wasteful to find all those places incrementally, one place per new build. It would be nice if one could trigger builds that employ make -k. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 92774] Can't add word to dictionary or use other options when list of choices is very long and have to scroll
https://bugs.documentfoundation.org/show_bug.cgi?id=92774 --- Comment #5 from tommy27 ba...@quipo.it --- try hk with Italian... I got more that 30 suggestions with that -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
About fix for tdf#82744: on gerritt, need help
Hi all, I pushed the preliminary version of the fix, I have trouble with the build on Windows, I build in Linux only, and being the fault in Windows in an entirely different code area, I fail to see where the culprit lies. I said preliminary because there is still something that's nagging me on a couple of occasions: - when a file is first created and the lock is put on the null resource, an operation the RFC4918 allows; - when you operate on a web site that has has no lock functionality available. The two question are related to each other, both already work, but locking at the net log, there seems to be something I need to check more thoroughly. Thanks -- Kind Regards, Giuseppe Castagno aka beppec56 Acca Esse http://www.acca-esse.eu giuseppe.castagno at acca-esse.eu ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svgio/inc svgio/source
svgio/inc/svgio/svgreader/svgcharacternode.hxx |3 --- svgio/inc/svgio/svgreader/svgdocument.hxx|1 - svgio/inc/svgio/svgreader/svgstyleattributes.hxx |7 --- svgio/inc/svgio/svgreader/svgsvgnode.hxx |1 - svgio/inc/svgio/svgreader/svgsymbolnode.hxx |2 -- svgio/inc/svgio/svgreader/svgtextpathnode.hxx|2 -- svgio/inc/svgio/svgreader/svgtools.hxx |1 - svgio/inc/svgio/svgreader/svgusenode.hxx |2 -- svgio/source/svgreader/svgcharacternode.cxx |3 +-- 9 files changed, 1 insertion(+), 21 deletions(-) New commits: commit ee79541aa892ff218e1dc3f869a3ac11b6f296ba Author: Noel Grandin n...@peralex.com Date: Wed Jul 15 15:28:37 2015 +0200 loplugin:unusedmethods svgio Change-Id: I0dd601429b70dc09780e31079a6f7c0570652fe9 Reviewed-on: https://gerrit.libreoffice.org/17114 Reviewed-by: Noel Grandin noelgran...@gmail.com Tested-by: Noel Grandin noelgran...@gmail.com diff --git a/svgio/inc/svgio/svgreader/svgcharacternode.hxx b/svgio/inc/svgio/svgreader/svgcharacternode.hxx index 192f24d..23d7809 100644 --- a/svgio/inc/svgio/svgreader/svgcharacternode.hxx +++ b/svgio/inc/svgio/svgreader/svgcharacternode.hxx @@ -101,7 +101,6 @@ namespace svgio /// bitfield boolmbLengthAdjust : 1; // true = spacing, false = spacingAndGlyphs boolmbAbsoluteX : 1; -boolmbAbsoluteY : 1; public: SvgTextPosition( @@ -112,11 +111,9 @@ namespace svgio // data read access const SvgTextPosition* getParent() const { return mpParent; } const ::std::vector double getX() const { return maX; } -const ::std::vector double getY() const { return maY; } double getTextLength() const { return mfTextLength; } bool getLengthAdjust() const { return mbLengthAdjust; } bool getAbsoluteX() const { return mbAbsoluteX; } -bool getAbsoluteY() const { return mbAbsoluteY; } // get/set absolute, current, advancing position const basegfx::B2DPoint getPosition() const { return maPosition; } diff --git a/svgio/inc/svgio/svgreader/svgdocument.hxx b/svgio/inc/svgio/svgreader/svgdocument.hxx index e0d0141..46aee7a 100644 --- a/svgio/inc/svgio/svgreader/svgdocument.hxx +++ b/svgio/inc/svgio/svgreader/svgdocument.hxx @@ -61,7 +61,6 @@ namespace svgio void removeSvgNodeFromMapper(const OUString rStr); /// find a node by its Id -bool hasSvgNodesById() const { return !maIdTokenMapperList.empty(); } const SvgNode* findSvgNodeById(const OUString rStr) const; /// add/remove styles to mapper diff --git a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx index 5a67aa1..cb1982d 100644 --- a/svgio/inc/svgio/svgreader/svgstyleattributes.hxx +++ b/svgio/inc/svgio/svgreader/svgstyleattributes.hxx @@ -335,7 +335,6 @@ namespace svgio /// fill rule content FillRule getFillRule() const; -void setFillRule(const FillRule aFillRule = FillRule_notset) { maFillRule = aFillRule; } /// fill StrokeDasharray content const SvgNumberVector getStrokeDasharray() const; @@ -382,7 +381,6 @@ namespace svgio void setFontStyle(const FontStyle aFontStyle = FontStyle_notset) { maFontStyle = aFontStyle; } /// FontVariant content -FontVariant getFontVariant() const; void setFontVariant(const FontVariant aFontVariant = FontVariant_notset) { maFontVariant = aFontVariant; } /// FontWeight content @@ -427,26 +425,21 @@ namespace svgio // ClipPathXLink content const OUString getClipPathXLink() const { return maClipPathXLink; } -void setClipPathXLink(const OUString rNew) { maClipPathXLink = rNew; } // MaskXLink content const OUString getMaskXLink() const { return maMaskXLink; } -void setMaskXLink(const OUString rNew) { maMaskXLink = rNew; } // MarkerStartXLink content OUString getMarkerStartXLink() const; const SvgMarkerNode* accessMarkerStartXLink() const; -void setMarkerStartXLink(const OUString rNew) { maMarkerStartXLink = rNew; } // MarkerMidXLink content OUString getMarkerMidXLink() const; const SvgMarkerNode* accessMarkerMidXLink() const; -void setMarkerMidXLink(const OUString rNew) { maMarkerMidXLink = rNew; } // MarkerEndXLink content OUString getMarkerEndXLink() const; const SvgMarkerNode* accessMarkerEndXLink() const; -void setMarkerEndXLink(const OUString rNew) { maMarkerEndXLink = rNew; } // BaselineShift
[Libreoffice-bugs] [Bug 92782] New: file names with CJK characters are shown as scrambled text
https://bugs.documentfoundation.org/show_bug.cgi?id=92782 Bug ID: 92782 Summary: file names with CJK characters are shown as scrambled text Product: LibreOffice Version: 4.4.4.3 release Hardware: x86 (IA32) OS: Linux (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: UI Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: eqrls23fe...@sute.jp Created attachment 117274 -- https://bugs.documentfoundation.org/attachment.cgi?id=117274action=edit screenshot with scrambled text in recent documents the names of files in the list of recent documents containing CJK characters are shown as scrambled text if the user interface language is set to a western language. In the opposite case, with CJK as user interface language, even non ASCII characters like German umlauts are shown correctly. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: include/sfx2
include/sfx2/event.hxx | 19 --- 1 file changed, 19 deletions(-) New commits: commit f013178f078d2670b5d7d677ab17edd115de53d7 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jul 16 10:02:08 2015 +0200 Remove unused SfxViewEventHint Change-Id: I42200260b98f90978d2c214fd9ea77376ab8cd8d diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx index e3a01c8..0eb1d5d 100644 --- a/include/sfx2/event.hxx +++ b/include/sfx2/event.hxx @@ -79,25 +79,6 @@ public: { return xViewController; } }; - - -class SfxNamedHint : public SfxHint -{ -OUString_aEventName; -OUString_aArgs; - -public: -SfxNamedHint( const OUString rName, - const OUString rArgs ) -: _aEventName( rName ), -_aArgs( rArgs ) -{} - -SfxNamedHint( const OUString rName ) -: _aEventName( rName ) -{} -}; - class Printer; class SfxPrintingHint : public SfxViewEventHint ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 7 commits - include/svtools svtools/source
include/svtools/ServerDetailsControls.hxx|2 +- include/svtools/breadcrumb.hxx |4 ++-- include/svtools/foldertree.hxx |4 ++-- svtools/source/contnr/foldertree.cxx |4 ++-- svtools/source/control/breadcrumb.cxx|6 +++--- svtools/source/dialogs/ServerDetailsControls.cxx |2 +- 6 files changed, 11 insertions(+), 11 deletions(-) New commits: commit f1fbd6af4f796c53667fbf56b8b5e5dcbcabe45f Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jul 16 10:13:45 2015 +0200 loplugin:stringconstant Change-Id: Ifd9517672252cdbf4957cd23dbd9177aed8631da diff --git a/svtools/source/control/breadcrumb.cxx b/svtools/source/control/breadcrumb.cxx index 3685c1a..564c968 100644 --- a/svtools/source/control/breadcrumb.cxx +++ b/svtools/source/control/breadcrumb.cxx @@ -149,7 +149,7 @@ void Breadcrumb::SetURL( const OUString rURL ) { unsigned int nIndex = nSegments + i; -if( m_aLinks[nIndex]-GetText() == ) +if( m_aLinks[nIndex]-GetText().isEmpty() ) { bRight = false; } commit 21b8cb7ff4907c6ff4d79d892d10feec7557ed34 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jul 16 10:13:14 2015 +0200 loplugin:loopvartoosmall Change-Id: Ia314ea7e924b2096c121d9cfda2c64e6d523a987 diff --git a/svtools/source/control/breadcrumb.cxx b/svtools/source/control/breadcrumb.cxx index 8b43fa1..3685c1a 100644 --- a/svtools/source/control/breadcrumb.cxx +++ b/svtools/source/control/breadcrumb.cxx @@ -23,7 +23,7 @@ Breadcrumb::~Breadcrumb() void Breadcrumb::dispose() { -for( unsigned int i = 0; i m_aLinks.size(); i++ ) +for( std::vectorVclPtrFixedHyperlink::size_type i = 0; i m_aLinks.size(); i++ ) { m_aSeparators[i].disposeAndClear(); m_aLinks[i].disposeAndClear(); @@ -93,7 +93,7 @@ void Breadcrumb::SetURL( const OUString rURL ) // clear unused fields -for( unsigned int i = nSegments + 1; i m_aLinks.size(); i++ ) +for( std::vectorVclPtrFixedHyperlink::size_type i = nSegments + 1; i m_aLinks.size(); i++ ) { if( bClear ) m_aLinks[i]-SetText( ); commit 97a3ea0a2d9194003d67fb3f6bb6f1a5c145440b Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jul 16 10:12:09 2015 +0200 loplugin:saloverride Change-Id: Ia3f3fbc7a0cd936b9cb6e89a15dd08fb4b73332e diff --git a/include/svtools/breadcrumb.hxx b/include/svtools/breadcrumb.hxx index ff08994..6e6ac5f 100644 --- a/include/svtools/breadcrumb.hxx +++ b/include/svtools/breadcrumb.hxx @@ -47,9 +47,9 @@ class SVT_DLLPUBLIC Breadcrumb : public VclHBox public: Breadcrumb( vcl::Window* pParent, WinBits nWinStyle = 0 ); -~Breadcrumb(); +virtual ~Breadcrumb(); -void dispose(); +void dispose() SAL_OVERRIDE; void SetClickHdl( const Link rLink ); OUString GetHdlURL(); commit 109ca5b630018dad9ad4001724abd410886974cd Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jul 16 10:11:22 2015 +0200 loplugin:loopvartoosmall Change-Id: Iaeb3e12f9e83328c9ffd4718e7907bd7c7a39910 diff --git a/svtools/source/contnr/foldertree.cxx b/svtools/source/contnr/foldertree.cxx index c1e038d..5c8ee46 100644 --- a/svtools/source/contnr/foldertree.cxx +++ b/svtools/source/contnr/foldertree.cxx @@ -50,7 +50,7 @@ void FolderTree::FillTreeEntry( SvTreeListEntry* pEntry ) if ( SUCCESS == eResult ) { -for( unsigned int i = 0; i aContent.size(); i++ ) +for( std::vectorSortingData_Impl *::size_type i = 0; i aContent.size(); i++ ) { if( aContent[i]-mbIsFolder ) { commit a9c4476cbb1babdc45695601e92e98ca5ac072a2 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jul 16 10:10:30 2015 +0200 loplugin:saloverride Change-Id: Id6e434c0261dbba88b1ec1b98534e4f63db6dcda diff --git a/include/svtools/foldertree.hxx b/include/svtools/foldertree.hxx index bd066d7..e430072 100644 --- a/include/svtools/foldertree.hxx +++ b/include/svtools/foldertree.hxx @@ -44,7 +44,7 @@ private: public: FolderTree( vcl::Window* pParent, WinBits nBits ); -virtual void RequestingChildren( SvTreeListEntry* pEntry ); +virtual void RequestingChildren( SvTreeListEntry* pEntry ) SAL_OVERRIDE; void FillTreeEntry( SvTreeListEntry* pEntry ); void SetTreePath( OUString const sUrl ); commit ef6d7c50e05e09fc33f50a876e709a7587df4ff0 Author: Stephan Bergmann sberg...@redhat.com Date: Thu Jul 16 10:09:57 2015 +0200 loplugin:passstuffbyref Change-Id: Iddd06dcc2bf4744ae9d70b54e4c58a9a468c1461 diff --git a/include/svtools/foldertree.hxx b/include/svtools/foldertree.hxx index 213c254..bd066d7 100644 --- a/include/svtools/foldertree.hxx +++ b/include/svtools/foldertree.hxx @@ -47,7 +47,7 @@ public:
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source
sw/source/core/access/accnotextframe.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit c7d2270f86b2bd1f3c764d8461a40c903780ee56 Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 13 12:38:18 2015 +0100 fix a11y crash seen on close of tdf#92573 its not the reported crash, which has gone away which might be a duplicate of tdf#90502 the switch only handled RES_TITLE_CHANGED and RES_DESCRIPTION_CHANGED so if its anything else, e.g. OBJ_DYING, then don't attempt GetNoTextNode Change-Id: I642beb66613481cbc7ee18647f0204a67d670a84 (cherry picked from commit 7de992bcc66c973bb6b247184cac38f01cd1104a) Reviewed-on: https://gerrit.libreoffice.org/16989 Tested-by: Jenkins c...@libreoffice.org Reviewed-by: Michael Meeks michael.me...@collabora.com diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx index cee5edb..bcf5031 100644 --- a/sw/source/core/access/accnotextframe.cxx +++ b/sw/source/core/access/accnotextframe.cxx @@ -102,6 +102,9 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem return; // probably was deleted - avoid doing anything } +if (nWhich != RES_TITLE_CHANGED || nWhich != RES_DESCRIPTION_CHANGED) +return; + const SwNoTextNode *pNd = GetNoTextNode(); OSL_ENSURE( pNd == aDepend.GetRegisteredIn(), invalid frame ); switch( nWhich ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 92110] UI Button with keyboard focus has invisible label (KDE-specific)
https://bugs.documentfoundation.org/show_bug.cgi?id=92110 Doug dougt901-2...@yahoo.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #13 from Doug dougt901-2...@yahoo.com --- Confirmed fixed blocked button label OpenSuse 13.2/KDE 4.14.9 using: LO Version: 5.0.0.3 / Build ID: 00m0(Build:3) / Locale: en-US (en_US.UTF-8). Confirmed checkbox artifact fixed in that version as well. (see bug 92558 and bug 91808 merged into this one). -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92779] Converting to entire column is inconsistent (sometimes works sometimes produces #REF!)
https://bugs.documentfoundation.org/show_bug.cgi?id=92779 Eike Rathke er...@redhat.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Hardware|Other |All Ever confirmed|0 |1 Severity|normal |enhancement --- Comment #3 from Eike Rathke er...@redhat.com --- (In reply to Óvári from comment #0) Example E (bug appears) 1. Open LibreOffice (LO) Calc 2. In cell A2 enter: =SUM(B1:B1048575) 3. Right click on row heading 4 4. Select 'Insert Rows Above' 5. Cell A2 incorrectly shows: =SUM(B1:B1048576) Cell A2 should show: =SUM(B:B) {As shown in Example A, step 5} Note that this is different, example A has both absolute row references. References that result from inserting/deleting/shifting/moving and have not both anchors absolute are not displayed as entire col/row references. For user convenience, only when entering an expression and both anchors are relative it is taken as entire col/row reference, because that is what you also get when selecting a range with Shift+Ctrl+Down for example. 6. Repeat steps 3-5 and LO Calc correctly shows formula in A2 as: =SUM(B1:B#REF!) Example F (bug appears) 1. Open LibreOffice (LO) Calc 2. In cell A2 enter: =SUM(B1:B$1048575) 3. Right click on row heading 4 4. Select 'Insert Rows Above' 5. Cell A2 incorrectly shows: =SUM(B1:B$1048576) Cell A2 should show: =SUM(B:B) {As shown in Example A, step 5} Mixed anchors, one relative one absolute. This will never yield an entire col/row reference. On purpose, because when copypaste such reference the absolute part is sticky and the relative parts gets adjusted relatively to the new position. 6. Repeat steps 3-5 and LO Calc correctly shows formula in A2 as: =SUM(B1:B$#REF!) Example G (bug appears) 1. Open LibreOffice (LO) Calc 2. In cell A2 enter: =SUM(B$1:B1048575) 3. Right click on row heading 4 4. Select 'Insert Rows Above' 5. Cell A2 incorrectly shows: =SUM(B$1:B1048576) Cell A2 should show: =SUM(B:B) {As shown in Example A, step 5} Again the same, mixed anchors. 6. Repeat steps 3-5 and LO Calc correctly shows formula in A2 as: =SUM(B$1:B#REF!) It is debatable what actually should happen with references that were not entire col/row but only become when inserting rows/cols. Excel is a bit more lax there and if both anchors are either absolute or relative, the reference is displayed as entire col/row reference. Not with mixed anchors. Also if inserting rows results in an entire column that the reference wasn't before, even if not displayed as A:A/1:1 because of mixed anchors, the reference anchors become sticky, regardless of relative or absolute addressing, and are not shifted when deleting rows or when inserting further rows. However, copypaste =SUM(B$1:B1048576) one row further down still results in #REF! Maybe we could implement similar behaviour. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/unx
vcl/unx/gtk/window/gtksalframe.cxx | 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-) New commits: commit baea35b431e03819406199ed6001d3cbbe650b9c Author: Caolán McNamara caol...@redhat.com Date: Mon Jul 13 16:18:41 2015 +0100 Resolves: tdf#92671 union each monitor workarea to find best screen workarea Change-Id: Ia77063f7008f960373861b8b59710abe9918865c (cherry picked from commit 74f9d9808fce14f015d56a2aaa4ec5616ed7aa3e) Reviewed-on: https://gerrit.libreoffice.org/17015 Tested-by: Jenkins c...@libreoffice.org Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 3bee994..ce2918f 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -2158,10 +2158,16 @@ void GtkSalFrame::GetWorkArea( Rectangle rRect ) rRect = GetGtkSalData()-GetGtkDisplay()-getWMAdaptor()-getWorkArea( 0 ); #else GdkScreen *pScreen = gtk_window_get_screen(GTK_WINDOW(m_pWindow)); -gint nMonitor = gdk_screen_get_monitor_at_window(pScreen, widget_get_window(m_pWindow)); -GdkRectangle aRect; -gdk_screen_get_monitor_workarea(pScreen, nMonitor, aRect); -rRect = Rectangle(aRect.x, aRect.y, aRect.width, aRect.height); +Rectangle aRetRect; +int max = gdk_screen_get_n_monitors (pScreen); +for (int i = 0; i max; ++i) +{ +GdkRectangle aRect; +gdk_screen_get_monitor_workarea(pScreen, i, aRect); +Rectangle aMonitorRect(aRect.x, aRect.y, aRect.x+aRect.width, aRect.y+aRect.height); +aRetRect.Union(aMonitorRect); +} +rRect = aRetRect; #endif } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 42082] [META] Make LibreOffice shine and glow on OS X
https://bugs.documentfoundation.org/show_bug.cgi?id=42082 Adolfo Jayme f...@libreoffice.org changed: What|Removed |Added Depends on||92750 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92750] Text Services do not work
https://bugs.documentfoundation.org/show_bug.cgi?id=92750 Adolfo Jayme f...@libreoffice.org changed: What|Removed |Added Priority|medium |lowest Status|UNCONFIRMED |NEW Blocks||42082 Ever confirmed|0 |1 Severity|normal |enhancement --- Comment #4 from Adolfo Jayme f...@libreoffice.org --- No, it’s not the same thing as Extensions (!) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 92746] Default margin around contour-wrapped images is very tight
https://bugs.documentfoundation.org/show_bug.cgi?id=92746 Adolfo Jayme f...@libreoffice.org changed: What|Removed |Added Status|UNCONFIRMED |NEW Summary|Default contour is very |Default margin around |tight |contour-wrapped images is ||very tight Ever confirmed|0 |1 --- Comment #4 from Adolfo Jayme f...@libreoffice.org --- It is pretty tight indeed (the mileage obviously varies with different images, but still). Anyone who has ever taken a book should perceive what a minimal margin should be. The current value should be doubled at least. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs