[Libreoffice-commits] core.git: compilerplugins/clang desktop/source include/vcl vcl/generic vcl/headless vcl/inc vcl/opengl vcl/quartz vcl/source vcl/unx vcl/win
compilerplugins/clang/unusedmethods.cxx | 15 +
compilerplugins/clang/unusedmethods.py | 13 +
desktop/source/app/app.cxx |1
include/vcl/accel.hxx |9
include/vcl/alpha.hxx |3
include/vcl/animate.hxx | 11 -
include/vcl/bitmap.hxx |1
include/vcl/bitmapex.hxx|3
include/vcl/bmpacc.hxx | 24 --
include/vcl/cmdevt.hxx | 38 ---
include/vcl/cursor.hxx |5
include/vcl/event.hxx |7
include/vcl/gdimtf.hxx |2
include/vcl/gfxlink.hxx |4
include/vcl/gradient.hxx|2
include/vcl/graph.h |2
include/vcl/hatch.hxx |1
include/vcl/inputctx.hxx|1
include/vcl/lineinfo.hxx|1
include/vcl/metaact.hxx | 102 -
include/vcl/metric.hxx |1
include/vcl/opengl/OpenGLContext.hxx|5
include/vcl/outdev.hxx | 28 --
include/vcl/region.hxx |1
include/vcl/salbtype.hxx| 27 --
include/vcl/scheduler.hxx |2
include/vcl/virdev.hxx |1
include/vcl/wall.hxx|2
include/vcl/window.hxx | 11 -
vcl/generic/print/genpspgraphics.cxx|7
vcl/headless/svpbmp.cxx | 10
vcl/headless/svpgdi.cxx |7
vcl/inc/generic/genpspgraphics.h|3
vcl/inc/headless/svpbmp.hxx |2
vcl/inc/headless/svpgdi.hxx |3
vcl/inc/opengl/framebuffer.hxx |1
vcl/inc/opengl/salbmp.hxx |4
vcl/inc/opengl/texture.hxx |1
vcl/inc/openglgdiimpl.hxx |1
vcl/inc/quartz/salbmp.h |2
vcl/inc/quartz/salgdi.h |3
vcl/inc/salbmp.hxx |2
vcl/inc/salgdi.hxx |5
vcl/inc/sallayout.hxx |1
vcl/inc/unx/salbmp.h|2
vcl/inc/unx/salgdi.h|5
vcl/inc/win/salbmp.h|2
vcl/inc/win/salgdi.h|3
vcl/opengl/gdiimpl.cxx |7
vcl/opengl/salbmp.cxx | 10
vcl/opengl/texture.cxx | 29 --
vcl/quartz/salbmp.cxx | 10
vcl/quartz/salgdicommon.cxx |6
vcl/source/gdi/metaact.cxx | 345
vcl/source/gdi/region.cxx | 28 --
vcl/source/gdi/sallayout.cxx| 37 ---
vcl/source/gdi/virdev.cxx |8
vcl/source/opengl/OpenGLContext.cxx | 101 -
vcl/source/outdev/map.cxx | 85 ---
vcl/source/outdev/outdev.cxx| 23 --
vcl/source/outdev/transparent.cxx | 10
vcl/source/window/window.cxx| 54 -
vcl/source/window/winproc.cxx |2
vcl/unx/generic/gdi/salbmp.cxx | 10
vcl/unx/generic/gdi/salgdi2.cxx |7
vcl/win/source/gdi/salbmp.cxx | 10
vcl/win/source/gdi/salgdi2.cxx |7
67 files changed, 30 insertions(+), 1146 deletions(-)
New commits:
commit 449d272daf5e99f039cdfdd25f020bd798fb9e1d
Author: Noel Grandin n...@peralex.com
Date: Tue Jul 7 13:58:41 2015 +0200
loplugin:unusedmethods vcl
Change-Id: I98b88ca3369a2c888fd63796e39d42376d513002
diff --git a/compilerplugins/clang/unusedmethods.cxx
b/compilerplugins/clang/unusedmethods.cxx
index 7dc57e9..2868334 100644
--- a/compilerplugins/clang/unusedmethods.cxx
+++ b/compilerplugins/clang/unusedmethods.cxx
@@ -137,18 +137,25 @@ static bool isStandardStuff(const std::string s)
|| startsWith(s, (anonymous namespace)::);
}
+// prevent recursive templates from blowing up the stack
+static std::setstd::string traversedTemplateFunctionSet;
+
bool UnusedMethods::VisitCallExpr(CallExpr* expr)
{
if (ignoreLocation(expr)) {
return true;
}
FunctionDecl* calleeFunctionDecl = expr-getDirectCallee();
-// if we see a call to a templated method, it effectively instantiates a
new method,
-// so we need to examine it's interior to see if it in turn calls anything
else
-if (calleeFunctionDecl-getTemplatedKind() !=
clang::FunctionDecl::TemplatedKind::TK_NonTemplate
+if (calleeFunctionDecl == nullptr) {
+return true;
+}
+// if we see a call to a templated function, it effectively creates new
code,
+// so we need to examine it's interior to see if it, in turn, calls
anything else
+if (calleeFunctionDecl-getTemplatedKind() !=
FunctionDecl::TemplatedKind::TK_NonTemplate
|| calleeFunctionDecl-isFunctionTemplateSpecialization())
{
-
[Libreoffice-commits] core.git: cui/source
cui/source/customize/cfg.cxx |5 +
cui/source/inc/cfg.hxx |2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
New commits:
commit d29aeee806991a1439697c255b95db111230e262
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jul 8 09:39:27 2015 +0200
loplugin:staticmethods
Change-Id: I8eb65173d7bf71a829b8c1d8451dbbc7d81a8d38
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 2481d48..8e9f094 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -4749,7 +4749,6 @@ SvxNewToolbarDialog::SvxNewToolbarDialog(vcl::Window*
pWindow, const OUString r
get(m_pSaveInListBox, savein);
m_pEdtName-SetText( rName );
m_pEdtName-SetSelection(Selection(SELECTION_MIN, SELECTION_MAX));
-ModifyHdl(m_pEdtName);
m_pEdtName-SetModifyHdl(LINK(this, SvxNewToolbarDialog, ModifyHdl));
}
@@ -4767,10 +4766,8 @@ void SvxNewToolbarDialog::dispose()
}
-IMPL_LINK(SvxNewToolbarDialog, ModifyHdl, Edit*, pEdit)
+IMPL_STATIC_LINK_NOARG(SvxNewToolbarDialog, ModifyHdl)
{
-(void)pEdit;
-
return 0;
}
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 6a0a9ca..206c083 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -666,7 +666,7 @@ private:
VclPtrEdit m_pEdtName;
VclPtrOKButton m_pBtnOK;
-DECL_LINK(ModifyHdl, Edit*);
+DECL_STATIC_LINK(SvxNewToolbarDialog, ModifyHdl, void *);
public:
SvxNewToolbarDialog(vcl::Window* pWindow, const OUString rName);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Branch 'libreoffice-5-0' - source/text
source/text/shared/guide/startcenter.xhp | 24 1 file changed, 12 insertions(+), 12 deletions(-) New commits: commit 176f822e7a3569ffeb3026df7fc074fd8c0163cc Author: Andras Timar andras.ti...@collabora.com Date: Tue Jul 7 14:52:38 2015 +0200 tdf#86301 fix hids of startcenter Change-Id: Ic33ff7519d820d9d770db6a3d2d067a81fb38272 (cherry picked from commit 5aad108719014b52c9aba6be407ed553d0095a66) Reviewed-on: https://gerrit.libreoffice.org/16817 Reviewed-by: Adolfo Jayme Barrientos fit...@ubuntu.com Tested-by: Adolfo Jayme Barrientos fit...@ubuntu.com diff --git a/source/text/shared/guide/startcenter.xhp b/source/text/shared/guide/startcenter.xhp index ea1a448..be364d1 100644 --- a/source/text/shared/guide/startcenter.xhp +++ b/source/text/shared/guide/startcenter.xhp @@ -31,10 +31,10 @@ bookmark_valuestart center/bookmark_value /bookmark bookmark xml-lang=en-US branch=hid/FWK_HID_BACKINGWINDOW id=bm_id0820200802550234 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/StartCenter id=bm_id0820200802550237 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/help id=bm_id0820200802550235 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/extensions id=bm_id0820200802550236 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/all_recent id=bm_id0820200802550238 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/StartCenter id=bm_id0820200802550237 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/help id=bm_id0820200802550235 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/extensions id=bm_id0820200802550236 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/all_recent id=bm_id0820200802550238 localize=false/ paragraph xml-lang=en-US id=hd_id0820200802524447 role=heading level=1 l10n=NEWvariable id=startcenterlink href=text/shared/guide/startcenter.xhpStart Center/link /variable/paragraph paragraph xml-lang=en-US id=par_id0820200803204063 role=paragraph l10n=NEWWelcome to %PRODUCTNAME. @@ -43,12 +43,12 @@ paragraph xml-lang=en-US id=par_id0820200802524413 role=paragraph l10n=NEWYou see the Start Center when no document is open in %PRODUCTNAME. It is divided into two panes. ahelp hid=.Click an icon on the left pane to open a new document or a file dialog./ahelp /paragraph -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/writer_all id=bm_id1022200910564632 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/calc_all id=bm_id1022200910570124 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/draw_all id=bm_id1022200910571273 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/impress_all id=bm_id102220091057270 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/database_all id=bm_id102220091057437 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/math_all id=bm_id1022200910575575 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/writer_all id=bm_id1022200910564632 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/calc_all id=bm_id1022200910570124 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/draw_all id=bm_id1022200910571273 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/impress_all id=bm_id102220091057270 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/database_all id=bm_id102220091057437 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/math_all id=bm_id1022200910575575 localize=false/ paragraph xml-lang=en-US id=par_id0820200803104810 role=paragraph l10n=NEWahelp hid=.The document icons each open a new document of the specified type./ahelp/paragraph list type=ordered listitem @@ -76,10 +76,10 @@ emphFormula/emph opens %PRODUCTNAME link href=text/smath/main.xhpMath/link/paragraph /listitem /list -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/templates_all id=bm_id1022200910584084 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/templates_all id=bm_id1022200910584084 localize=false/ paragraph xml-lang=en-US id=par_id1022200911011855 role=paragraph l10n=NEWahelp hid=. visibility=hiddenThe Templates icon opens the Templates and Documents dialog./ahelp/paragraph paragraph xml-lang=en-US id=par_id0820200803105045 role=paragraph l10n=NEWThe emphTemplates/emph icon opens the link href=text/shared/guide/aaa_start.xhpTemplates and Documents/link dialog./paragraph -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/open_all id=bm_id1022200910595546 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/open_all id=bm_id1022200910595546 localize=false/ paragraph xml-lang=en-US
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7991c1ca3bbf58ff46fc922a218bb7e1f5d35e2d Author: Andras Timar andras.ti...@collabora.com Date: Tue Jul 7 14:52:38 2015 +0200 Updated core Project: help 176f822e7a3569ffeb3026df7fc074fd8c0163cc tdf#86301 fix hids of startcenter Change-Id: Ic33ff7519d820d9d770db6a3d2d067a81fb38272 (cherry picked from commit 5aad108719014b52c9aba6be407ed553d0095a66) Reviewed-on: https://gerrit.libreoffice.org/16817 Reviewed-by: Adolfo Jayme Barrientos fit...@ubuntu.com Tested-by: Adolfo Jayme Barrientos fit...@ubuntu.com diff --git a/helpcontent2 b/helpcontent2 index 50f9003..176f822 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 50f9003c4388967ce4e49f959f8c2ac8218d08fb +Subproject commit 176f822e7a3569ffeb3026df7fc074fd8c0163cc ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 92617] Base is crashing frequently when EDITING data and switching Forms
https://bugs.documentfoundation.org/show_bug.cgi?id=92617 t...@tim-passingham.co.uk changed: What|Removed |Added CC||bjoern.michaelsen@canonical ||.com, ipla...@yahoo.co.uk, ||lio...@mamane.lu, ||t...@tim-passingham.co.uk --- Comment #1 from t...@tim-passingham.co.uk --- I have taken the liberty of copying the email addresses from #70703 to this report. -- 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' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 492f860898a08500bf164ba55db83bf086835458 Author: Andras Timar andras.ti...@collabora.com Date: Tue Jul 7 14:52:38 2015 +0200 Updated core Project: help 172c582a5c6f5f93997d99872114f9f1b2c6e415 tdf#86301 fix hids of startcenter (cherry picked from commit 5aad108719014b52c9aba6be407ed553d0095a66) Conflicts: source/text/shared/guide/startcenter.xhp Change-Id: Ic33ff7519d820d9d770db6a3d2d067a81fb38272 Reviewed-on: https://gerrit.libreoffice.org/16818 Reviewed-by: Adolfo Jayme Barrientos fit...@ubuntu.com Tested-by: Adolfo Jayme Barrientos fit...@ubuntu.com diff --git a/helpcontent2 b/helpcontent2 index 40967ad..172c582 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 40967add67da1353dae0f1f9cc31475f4650381c +Subproject commit 172c582a5c6f5f93997d99872114f9f1b2c6e415 ___ 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' - sc/source
sc/source/ui/miscdlgs/anyrefdg.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit f932f1197e1cabd901231223dc9c7ce9c171120e Author: Caolán McNamara caol...@redhat.com Date: Tue Jul 7 13:46:41 2015 +0100 Related: tdf#92392 clear some more vclptrs on dispose Change-Id: I91b8d082ff19328e35e2f1c2a02838d96224dc9c (cherry picked from commit 8e20a25319e16d2f74e18696480556bc841a1679) Reviewed-on: https://gerrit.libreoffice.org/16831 Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 6208048..870692c 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -83,6 +83,11 @@ void ScFormulaReferenceHelper::dispose() pInputHdl-ResetDelayTimer(); // stop the timer for disabling the input line pAccel.reset(); + +mpOldEditParent.clear(); +m_pWindow.clear(); +pRefBtn.clear(); +pRefEdit.clear(); } void ScFormulaReferenceHelper::enableInput( bool bEnable ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/runner qadevOOo/tests
qadevOOo/runner/helper/OfficeProvider.java |2 +-
qadevOOo/tests/java/ifc/text/_XText.java |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1302fbe6a1872e3234dee3902079970d8672db92
Author: Andras Timar andras.ti...@collabora.com
Date: Wed Jul 8 10:34:12 2015 +0200
typo: contest - content
Change-Id: If7fa4672ef76082526f4dd3e6090a19d7f9687b3
diff --git a/qadevOOo/runner/helper/OfficeProvider.java
b/qadevOOo/runner/helper/OfficeProvider.java
index 7318144..ed99b7d 100644
--- a/qadevOOo/runner/helper/OfficeProvider.java
+++ b/qadevOOo/runner/helper/OfficeProvider.java
@@ -655,7 +655,7 @@ public class OfficeProvider implements AppProvider
/**
* If the office is connected but the CODEAppExecutionCommand/CODE is
not set,
* this function asks the office for its location and fill the
- * CODEAppExecutionCommand/CODE with valid contest.
+ * CODEAppExecutionCommand/CODE with valid content.
* This function was only called if parameter CODEAutoRestart/CODE is
set.
* @param msf the CODEMultiServiceFactory/CODE
* @param param the CODETestParameters/CODE
diff --git a/qadevOOo/tests/java/ifc/text/_XText.java
b/qadevOOo/tests/java/ifc/text/_XText.java
index eb1df0c..234dd5f 100644
--- a/qadevOOo/tests/java/ifc/text/_XText.java
+++ b/qadevOOo/tests/java/ifc/text/_XText.java
@@ -124,7 +124,7 @@ public class _XText extends MultiMethodTest {
/**
- * Removes the text contest added before. p
+ * Removes the text content added before. p
* Has b OK /b status if the method successfully returns
* and no exceptions were thrown. p
* The following method tests are to be completed successfully before :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - sc/inc sc/source sd/qa sd/source sw/source
sc/inc/pch/precompiled_sc.hxx |1 -
sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx |2 --
sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx |4 +---
sc/source/ui/StatisticsDialogs/FTestDialog.cxx |6 ++
sc/source/ui/StatisticsDialogs/TTestDialog.cxx |6 ++
sc/source/ui/StatisticsDialogs/ZTestDialog.cxx |6 ++
sd/qa/unit/export-tests.cxx|2 +-
sd/source/core/stlsheet.cxx|7 +++
sw/source/uibase/sidebar/PagePropertyPanel.cxx | 10
--
sw/source/uibase/sidebar/SwPanelFactory.cxx|1 -
10 files changed, 19 insertions(+), 26 deletions(-)
New commits:
commit 5f3930edf853003fa57130b0a7d0a92059f94dc7
Author: Michael Stahl mst...@redhat.com
Date: Tue Jul 7 22:12:51 2015 +0200
sw: remove boost::bind from PagePropertyPanel
Change-Id: I4e5bb81a14ee996bddc8585b5d350487f5f20d50
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx
b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
index 0d0ac10..4300404 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
@@ -48,8 +48,6 @@
#include sfx2/viewsh.hxx
#include sfx2/objsh.hxx
-#include boost/bind.hpp
-
#include com/sun/star/frame/XController.hpp
#include com/sun/star/frame/XModel.hpp
#include com/sun/star/document/XUndoManagerSupplier.hpp
@@ -171,16 +169,16 @@ PagePropertyPanel::PagePropertyPanel(
, m_aSwPagePgMetricControl(SID_ATTR_METRIC, *pBindings, *this)
, maOrientationPopup( this,
- ::boost::bind(
PagePropertyPanel::CreatePageOrientationControl, this, _1 ),
+[this] (svx::sidebar::PopupContainer *parent) { return
this-CreatePageOrientationControl(parent); },
OUString(Page orientation) )
, maMarginPopup( this,
- ::boost::bind(
PagePropertyPanel::CreatePageMarginControl, this, _1 ),
+[this] (svx::sidebar::PopupContainer *parent) { return
this-CreatePageMarginControl(parent); },
OUString(Page margins) )
, maSizePopup( this,
- ::boost::bind( PagePropertyPanel::CreatePageSizeControl,
this, _1 ),
+[this] (svx::sidebar::PopupContainer *parent) { return
this-CreatePageSizeControl(parent); },
OUString(Page size) )
, maColumnPopup( this,
- ::boost::bind(
PagePropertyPanel::CreatePageColumnControl, this, _1 ),
+[this] (svx::sidebar::PopupContainer *parent) { return
this-CreatePageColumnControl(parent); },
OUString(Page columns) )
, mxUndoManager( getUndoManager( rxFrame ) )
diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx
b/sw/source/uibase/sidebar/SwPanelFactory.cxx
index 92dd487..ae6feab 100644
--- a/sw/source/uibase/sidebar/SwPanelFactory.cxx
+++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx
@@ -37,7 +37,6 @@
#include cppuhelper/basemutex.hxx
#include cppuhelper/supportsservice.hxx
-#include boost/bind.hpp
#include boost/noncopyable.hpp
using namespace css;
commit 177f59b9e0ebdbde1d13d0c18d57e215287eafbf
Author: Michael Stahl mst...@redhat.com
Date: Tue Jul 7 17:49:21 2015 +0200
sc: convert boost::scoped_ptr to std::unique_ptr while there
Change-Id: I5c03889f3611b7c1799c39aa75a223ba34b603e4
diff --git a/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
b/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
index 36ed5fe..1759c71 100644
--- a/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
@@ -11,7 +11,6 @@
#include sfx2/dispatch.hxx
#include svl/zforlist.hxx
#include svl/undo.hxx
-#include boost/scoped_ptr.hpp
#include formulacell.hxx
#include rangelst.hxx
diff --git a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
index 4f935c0..0701b2e 100644
--- a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
@@ -11,7 +11,6 @@
#include sfx2/dispatch.hxx
#include svl/zforlist.hxx
#include svl/undo.hxx
-#include boost/scoped_ptr.hpp
#include formulacell.hxx
#include rangelst.hxx
@@ -87,7 +86,7 @@ ScRange
ScDescriptiveStatisticsDialog::ApplyOutput(ScDocShell* pDocShell)
formula::FormulaGrammar::mergeToGrammar(
formula::FormulaGrammar::GRAM_ENGLISH, mAddressDetails.eConv));
FormulaTemplate aTemplate(mDocument);
-boost::scoped_ptrDataRangeIterator pIterator;
+std::unique_ptrDataRangeIterator pIterator;
if (mGroupedBy == BY_COLUMN)
pIterator.reset(new DataRangeByColumnIterator(mInputRange));
else
diff --git
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/vcl vcl/generic vcl/inc vcl/source
include/vcl/print.hxx |2 +-
include/vcl/printerinfomanager.hxx |1 +
vcl/generic/print/genprnpsp.cxx|1 +
vcl/generic/print/prtsetup.cxx |8
vcl/inc/jobset.h |1 +
vcl/source/gdi/jobset.cxx |2 ++
vcl/source/gdi/print.cxx |6 --
vcl/source/gdi/print3.cxx |2 +-
8 files changed, 19 insertions(+), 4 deletions(-)
New commits:
commit 6779b46796c93cbb4293a400f57c29e8ae85811b
Author: Katarina Behrens katarina.behr...@cib.de
Date: Tue Jul 7 12:08:33 2015 +0200
Related tdf#91362: disable paper size orientation selection
Unless 'Use only papersize from printer prefs' is toggled on,
whatever the user sets here doesn't have any effect on the actual
printing (page settings from the document are used instead). It is
misleading to have the user believe otherwise.
It was really challenging to have this one toggle get all the way
down through several layers of abstraction, though ...
Change-Id: If240084ca23b3946a92882a6ee47dbc161b3b86c
Reviewed-on: https://gerrit.libreoffice.org/16822
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 35c6109..d0ec6a1 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -320,7 +320,7 @@ public:
boolSetJobSetup( const JobSetup rSetup );
const JobSetup GetJobSetup() const { return maJobSetup; }
-boolSetup( vcl::Window* pWindow = NULL );
+boolSetup( vcl::Window* pWindow = NULL, bool
bPapersizeFromSetup = false );
boolSetPrinterProps( const Printer* pPrinter );
// SetPrinterOptions is used internally only now
diff --git a/include/vcl/printerinfomanager.hxx
b/include/vcl/printerinfomanager.hxx
index ec5c587..52245c4 100644
--- a/include/vcl/printerinfomanager.hxx
+++ b/include/vcl/printerinfomanager.hxx
@@ -50,6 +50,7 @@ struct PrinterInfo : JobData
// a list of special features separated by ',' not used by psprint
// but assigned from the outside (currently for
fax,pdf=,autoqueue,external_dialog)
OUString m_aFeatures;
+bool m_bPapersizeFromSetup;
PrinterInfo() :
JobData()
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 425b717..6f4a907 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -560,6 +560,7 @@ bool PspSalInfoPrinter::Setup( SalFrame* pFrame,
ImplJobSetup* pJobSetup )
SetData( ~0, pJobSetup );
JobData::constructFromStreamBuffer( pJobSetup-mpDriverData,
pJobSetup-mnDriverDataLen, aInfo );
}
+aInfo.m_bPapersizeFromSetup = pJobSetup-mbPapersizeFromSetup;
if (SetupPrinterDriver(aInfo))
{
diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/generic/print/prtsetup.cxx
index 41fd69c..8a5fd70 100644
--- a/vcl/generic/print/prtsetup.cxx
+++ b/vcl/generic/print/prtsetup.cxx
@@ -256,6 +256,14 @@ void RTSPaperPage::update()
m_pSlotText-Enable( false );
m_pSlotBox-Enable( false );
}
+
+// disable those, unless user wants to use papersize from printer prefs
+// as they have no influence on what's going to be printed anyway
+if (!m_pParent-m_aJobData.m_bPapersizeFromSetup)
+{
+m_pPaperBox-Enable( false );
+m_pOrientBox-Enable( false );
+}
}
IMPL_LINK( RTSPaperPage, SelectHdl, ListBox*, pBox )
diff --git a/vcl/inc/jobset.h b/vcl/inc/jobset.h
index 9ce9c5c..f0bf8a5 100644
--- a/vcl/inc/jobset.h
+++ b/vcl/inc/jobset.h
@@ -43,6 +43,7 @@ struct ImplJobSetup
longmnPaperHeight; // paper height (100th mm)
sal_uIntPtr mnDriverDataLen;// length of system specific data
sal_uInt8* mpDriverData; // system specific data (will be
streamed a byte block)
+boolmbPapersizeFromSetup;
std::unordered_map OUString, OUString, OUStringHash maValueMap;
ImplJobSetup();
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index 623d7be..ab6d0cd 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -61,6 +61,7 @@ ImplJobSetup::ImplJobSetup()
mnPaperHeight = 0;
mnDriverDataLen = 0;
mpDriverData= NULL;
+mbPapersizeFromSetup = false;
}
ImplJobSetup::ImplJobSetup( const ImplJobSetup rJobSetup ) :
@@ -83,6 +84,7 @@ ImplJobSetup::ImplJobSetup( const ImplJobSetup rJobSetup ) :
}
else
mpDriverData = NULL;
+mbPapersizeFromSetup = rJobSetup.mbPapersizeFromSetup;
maValueMap = rJobSetup.maValueMap;
}
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index b920cea..c01d6a3 100644
--- a/vcl/source/gdi/print.cxx
+++
[Libreoffice-bugs] [Bug 92620] New: Password protected Macro lenght limited
https://bugs.documentfoundation.org/show_bug.cgi?id=92620 Bug ID: 92620 Summary: Password protected Macro lenght limited Product: LibreOffice Version: 4.4.3.2 release Hardware: x86 (IA32) OS: Windows (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: BASIC Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: a.nard...@gmail.com Created attachment 117122 -- https://bugs.documentfoundation.org/attachment.cgi?id=117122action=edit Error during password protecting macro I prepared a complex macro made of about 50 subs with about 5300 lines of code (about 20 characters). When I try to password protect it I receive an error indication related to the fact that the library seems to be too large to be stored in a binary format. So it is impossible to protect it without splitting it in smaller modules. This are the steps I follow to obtain the problem: (I use the italian version of Libreoffice) 1. Strumenti - Macro - Organizza Macro - LibreOffice Basic... 2. Gestione 3. Librerie Then from the Posizione drop down menù I select my spreadsheet name (I created a library other than the standard one) then I select the library name and clic on Password button. Then I insert new password and I confirm it. Then click on OK button then clic on Chiudi button and then on Chiudi button again. Then I try to save the file with name and I obtain the following attached error. The error is present also in version 4.4.4.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-commits] core.git: Branch 'libreoffice-4-4' - sc/source
sc/source/core/data/document.cxx | 63 +++
1 file changed, 63 insertions(+)
New commits:
commit b85ddf6ef577e7f38394a398818420fe9f367a66
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/16838
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.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] online.git: loleaflet/src
loleaflet/src/layer/tile/GridLayer.js |4 ++--
loleaflet/src/layer/tile/TileLayer.js |6 --
2 files changed, 2 insertions(+), 8 deletions(-)
New commits:
commit 9321a7bb6dc4b8b3b1cfb3730bfd01411b4b371d
Author: Mihai Varga mihai.va...@collabora.com
Date: Wed Jul 8 14:45:18 2015 +0300
loleaflet: disable fade Animation as it still causes problems
diff --git a/loleaflet/src/layer/tile/GridLayer.js
b/loleaflet/src/layer/tile/GridLayer.js
index 79875ef..b658b28 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -36,6 +36,7 @@ L.GridLayer = L.Layer.extend({
this._tiles = {};
this._tileCache = {};
+ this._map._fadeAnimated = false;
this._viewReset();
this._update();
this._map._docLayer = this;
@@ -453,7 +454,6 @@ L.GridLayer = L.Layer.extend({
},
_move: function () {
- this._skipFadeAnimated = false;
this._update();
},
@@ -692,7 +692,7 @@ L.GridLayer = L.Layer.extend({
if (!tile) { return; }
tile.loaded = +new Date();
- if (this._map._fadeAnimated !this._skipFadeAnimated) {
+ if (this._map._fadeAnimated) {
L.DomUtil.setOpacity(tile.el, 0);
L.Util.cancelAnimFrame(this._fadeFrame);
this._fadeFrame =
L.Util.requestAnimFrame(this._updateOpacity, this);
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 1dbc3ce..de52184 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -423,11 +423,6 @@ L.TileLayer = L.GridLayer.extend({
key = this._tileCoordsToKey(coords);
var tile = this._tiles[key];
if (tile) {
- if (tile.el.src) {
- // cancel the animFade if there's any
- L.DomUtil.setOpacity(tile.el, 1);
- this._skipFadeAnimated = true;
- }
if (this._tiles[key]._invalidCount 0) {
this._tiles[key]._invalidCount -= 1;
}
@@ -1035,7 +1030,6 @@ L.TileLayer = L.GridLayer.extend({
_onZoom: function (e) {
if (e.type === 'zoomstart') {
- this._skipFadeAnimated = true;
}
else if (e.type === 'zoomend') {
this._onUpdateCursor();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 92623] mail merge crashes between step 6 and 7
https://bugs.documentfoundation.org/show_bug.cgi?id=92623 Justin L jl...@mail.com changed: What|Removed |Added Keywords||regression CC||jl...@mail.com Whiteboard||bibisected -- 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: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8caef148f4ce5f811588390c24bda41a1390093d Author: Olivier Hallot olivier.hal...@edx.srv.br Date: Fri Jun 5 16:37:28 2015 -0300 Updated core Project: help fd9b00bd84e3fe1a0aa087f5355aa0fcd27ef95f Promote ODF Formula standard in Calc function help Insert ODF Formula standard citation in Calc functions where it applies. In this example, function TIMEVALUE is a standard ODF Formula 1.2 function. Many other functions qualify to be a ODFF function. But since Excel is changing its function names, not every Calc function is and ODFF funciton. Change-Id: Ib764d780f9f66c8a7adaba8954d91fc9b4d70410 Reviewed-on: https://gerrit.libreoffice.org/16110 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpcontent2 b/helpcontent2 index f36f288..fd9b00b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f36f2883973e4ba6d59ee8d0d9b3e98273aa1c44 +Subproject commit fd9b00bd84e3fe1a0aa087f5355aa0fcd27ef95f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 92621] Extension is not support
https://bugs.documentfoundation.org/show_bug.cgi?id=92621 osnola alo...@loria.fr changed: What|Removed |Added Component|General |Extensions Product|Document Liberation Project |LibreOffice -- 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 92623] New: mail merge crashes between step 6 and 7
https://bugs.documentfoundation.org/show_bug.cgi?id=92623 Bug ID: 92623 Summary: mail merge crashes between step 6 and 7 Product: LibreOffice Version: 4.4.0.0.alpha0+ Master Hardware: Other OS: Linux (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: jl...@mail.com Created attachment 117124 -- https://bugs.documentfoundation.org/attachment.cgi?id=117124action=edit bibisect log and gdb backtrace Somewhere between Sept 9 and 10 this bug was introduced. Bibisected with bibisect44. The full bibisect log and a gdb backtrace are provided in the attachment. commit 1964870db4ad1e4334e8fc5050795469dc1fb05e Author: Giuseppe Bilotta giuseppe.bilo...@gmail.com AuthorDate: Tue Sep 9 21:34:45 2014 +0200 Commit: Chris Sherlock chris.sherloc...@gmail.com CommitDate: Wed Sep 10 11:23:56 2014 + Fallback DPI detection on X11 When the Xft.dpi setting is not found, and if only one screen is available, fall back to detecting the screen DPI from the reported # good: [312241a875e22a660f37f2484e56674a173dc3be] source-hash-355267ba5885ad0a26ae1caa24460b89fff45b12 git bisect good 312241a875e22a660f37f2484e56674a173dc3be # first bad commit: [95d4432551fd58a604029ea886134d0126ec0289] source-hash-1964870db4ad1e4334e8fc5050795469dc1fb05e last known Good commit authorJan Holesovsky ke...@collabora.com2014-09-07 10:14:30 (GMT) committerJan Holesovsky ke...@collabora.com2014-09-09 04:58:27 (GMT) commit355267ba5885ad0a26ae1caa24460b89fff45b12 (patch) tree8f4f105247f0c78460dd02e065592c5d7fdabd49 parent047d2f953ada34ada593768766d3ea8a725f9442 (diff) vcl: Move MenuFloatingWindow to an own file + adapt code. The needed changes included: * Move MenuItemList and MenuItemData to an own file * Introduce MenuWindow class for pieces shared between MenuFloatingWindow and MenuBarWindow. Change-Id: I129b6ddba6efb8f0cb60018a2d8abafed42552c8 -- 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: external/libcmis
external/libcmis/UnpackedTarball_cmis.mk |1 +
external/libcmis/tdf90351.patch | 10 ++
2 files changed, 11 insertions(+)
New commits:
commit 5c10e8cd0eedefc2dcc905154c4daa142561aef3
Author: Andras Timar andras.ti...@collabora.com
Date: Wed Jul 8 14:16:55 2015 +0200
tdf#90351 libcmis: prevent crash
Change-Id: I2d9673bb261a2586e1802f025c900962249cfc42
Reviewed-on: https://gerrit.libreoffice.org/16854
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/external/libcmis/UnpackedTarball_cmis.mk
b/external/libcmis/UnpackedTarball_cmis.mk
index 16d4400..b4b596b 100644
--- a/external/libcmis/UnpackedTarball_cmis.mk
+++ b/external/libcmis/UnpackedTarball_cmis.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,cmis,0))
$(eval $(call gb_UnpackedTarball_add_patches,cmis, \
external/libcmis/libcmis-libxml2_compatibility.patch \
+ external/libcmis/tdf90351.patch
\
))
ifeq ($(OS)$(COM),WNTMSC)
diff --git a/external/libcmis/tdf90351.patch b/external/libcmis/tdf90351.patch
new file mode 100644
index 000..fe0e5c5
--- /dev/null
+++ b/external/libcmis/tdf90351.patch
@@ -0,0 +1,10 @@
+--- src/libcmis/atom-session.cxx
src/libcmis/atom-session.cxx
+@@ -233,6 +233,7 @@ libcmis::ObjectPtr
AtomPubSession::createObjectFromEntryDoc( xmlDocPtr doc )
+ else
+ {
+ // Not a valid CMIS atom entry... weird
++cmisObject.reset( new AtomDocument( this, node ) );
+ }
+ }
+ xmlXPathFreeObject( xpathObj );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 92622] New: WRITER: context menu Unstyle the text from Styles Formatting
https://bugs.documentfoundation.org/show_bug.cgi?id=92622 Bug ID: 92622 Summary: WRITER: context menu Unstyle the text from Styles Formatting Product: LibreOffice Version: 4.4.4.3 release Hardware: Other OS: All Status: UNCONFIRMED Severity: enhancement Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: phil.j...@free.fr CC: philip...@hotmail.com I have a text formatted with Paragraph style + Char style + Bullet style. I would like to remove the bullet style. Select text Go to Style formatting sidebar Select Bullet styles One is selected because it is applied to my selected text At this point, I would like to right click on the selected bullet style and say remove this style from my selection (Unstyle Text). -- 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: 3 commits - sw/inc sw/source
sw/inc/pch/precompiled_sw.hxx |1 -
sw/source/core/access/accmap.cxx |3 +--
sw/source/core/doc/docbm.cxx | 15 +++
sw/source/core/txtnode/fmtatr2.cxx |3 +--
sw/source/core/unocore/unoobj2.cxx |1 -
5 files changed, 9 insertions(+), 14 deletions(-)
New commits:
commit 056066dfdb4e4a91aa742028f6a9c06eedeaa537
Author: Michael Stahl mst...@redhat.com
Date: Wed Jul 8 12:58:11 2015 +0200
sw: remove boost::bind from accmap.cxx
Change-Id: I9953cd58e4e285f655f11afccc1d6ee535f85d7e
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index f14d1c9..576c721 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -43,7 +43,6 @@
#include basic/sbx.hxx
#include basic/sbxobj.hxx
#include basic/sbxvar.hxx
-#include boost/bind.hpp
#include boost/function.hpp
#include boost/make_shared.hpp
#include boost/noncopyable.hpp
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index e682292..6a0883f 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -71,7 +71,6 @@
#include dflyobj.hxx
#include prevwpage.hxx
#include calbck.hxx
-#include boost/bind.hpp
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
@@ -3092,7 +3091,7 @@ void SwAccessibleMap::FireEvents()
mpEvents-SetFiring();
mpEvents-MoveInvalidXAccToEnd();
::std::for_each(mpEvents-begin(), mpEvents-end(),
-boost::bind(SwAccessibleMap::FireEvent, this,
_1));
+[this] (SwAccessibleEvent_Impl const rEvent) {
this-FireEvent(rEvent); } );
delete mpEventMap;
mpEventMap = nullptr;
commit 1dca84e374898185851b5a90595a8b5b741431ad
Author: Michael Stahl mst...@redhat.com
Date: Wed Jul 8 12:53:45 2015 +0200
sw: remove boost::bind from docbm.cxx
Change-Id: I3e91817c5113a391668ef0f35d6b8df4702f9715
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 930312c..060c32f 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -19,7 +19,6 @@
#include MarkManager.hxx
#include bookmrk.hxx
-#include boost/bind.hpp
#include boost/function.hpp
#include cntfrm.hxx
#include crossrefbookmark.hxx
@@ -168,7 +167,7 @@ namespace
rMarks.begin(),
pCandidatesEnd,
back_inserter(vCandidates),
-boost::bind( ::std::logical_notbool(), boost::bind(
IMark::EndsBefore, _1, rPos ) ) );
+[] (IDocumentMarkAccess::pMark_t const rpMark) { return
!rpMark-EndsBefore(rPos); } );
// no candidate left = we are in front of the first mark or there are
none
if(vCandidates.empty()) return NULL;
// return the highest (last) candidate using mark end ordering
@@ -269,7 +268,7 @@ namespace
return find_if(
ppMarksBegin,
ppMarksEnd,
-boost::bind(OUString::equals, boost::bind(IMark::GetName, _1),
rName));
+[] (IDocumentMarkAccess::pMark_t const rpMark) { return
rpMark-GetName() == rName; } );
}
#if 0
@@ -960,7 +959,7 @@ namespace sw { namespace mark
find_if(
pMarkLow,
pMarkHigh,
-boost::bind( ::std::equal_toconst IMark*(),
boost::bind(boost::shared_ptrIMark::get, _1), pMark ) );
+[] (pMark_t const rpMark) { return rpMark.get() == pMark; }
);
if(pMarkFound != pMarkHigh)
deleteMark(pMarkFound);
}
@@ -1015,8 +1014,8 @@ namespace sw { namespace mark
{
const_iterator_t pFieldmark = find_if(
m_vFieldmarks.begin(),
-m_vFieldmarks.end( ),
-boost::bind(IMark::IsCoveringPosition, _1, rPos));
+m_vFieldmarks.end(),
+[] (pMark_t const rpMark) { return
rpMark-IsCoveringPosition(rPos); } );
if(pFieldmark == m_vFieldmarks.end()) return NULL;
return dynamic_castIFieldmark*(pFieldmark-get());
}
@@ -1081,8 +1080,8 @@ namespace sw { namespace mark
{
const_iterator_t pAnnotationMark = find_if(
m_vAnnotationMarks.begin(),
-m_vAnnotationMarks.end( ),
-boost::bind(IMark::IsCoveringPosition, _1, rPos));
+m_vAnnotationMarks.end(),
+[] (pMark_t const rpMark) { return
rpMark-IsCoveringPosition(rPos); } );
if (pAnnotationMark == m_vAnnotationMarks.end())
return NULL;
return pAnnotationMark-get();
commit 84806f306114a038b4d5cc4eb6f34b90fbe71f9d
Author: Michael Stahl mst...@redhat.com
Date: Wed Jul 8 12:46:37 2015 +0200
sw: remove boost::bind from fmtatr2.cxx
Change-Id: I4924251babfcea9a87e7e688c904264dd80f9359
diff --git a/sw/source/core/txtnode/fmtatr2.cxx
b/sw/source/core/txtnode/fmtatr2.cxx
index 90a45b9..dcd698e 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/inc sc/source
sc/inc/refdata.hxx |9 +++
sc/inc/tokenarray.hxx |6 ++
sc/source/core/data/formulacell.cxx |3 +
sc/source/core/tool/interpr4.cxx|1
sc/source/core/tool/refdata.cxx | 92
sc/source/core/tool/token.cxx | 27 ++
6 files changed, 138 insertions(+)
New commits:
commit 9bb4b60fd6deb348af37d9a51860e4d554ffbc35
Author: Eike Rathke er...@redhat.com
Date: Tue Jul 7 01:45:41 2015 +0200
always justify a referenced range in order, tdf#92468
(cherry picked from commit d24c6a0280b0287ee6c23ca89068323c6b7c3dd7)
(re-)introduce ScComplexRefData::PutInOrder(), tdf#92468
(cherry picked from commit ad3d2b6c2e88d191d76f90eb5be927f7ca76c670)
introduce ScTokenArray::AdjustReferenceOnCopy(), tdf#92468
(cherry picked from commit 369ee0b1faf79f1bd23c75ee04dd0dcc5bf283af)
call ScTokenArray::AdjustReferenceOnCopy() in ScFormulaCell clone, tdf#92468
(cherry picked from commit 3ddaeaab37d585971e376de6ad7b0f06f55f2e1a)
f551e02a77a416b95f74266de896391d1d72eb3c
0a7ac0d9d10e96223cd5f095a771aa6f9d271417
0dc0c3528b35bc6ea2525bafb94d72ee65e4791a
Backported.
Change-Id: Id69c58800d28f1733777f7931a20d8ee7bdf034f
Reviewed-on: https://gerrit.libreoffice.org/16829
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index e0d9b80..75c94a1 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -104,6 +104,9 @@ public:
SCCOL Col() const;
SCTAB Tab() const;
+/** Adjust ordering (front-top-left/rear-bottom-right) to a new position.
*/
+static void PutInOrder( ScSingleRefData rRef1, ScSingleRefData rRef2,
const ScAddress rPos );
+
bool operator==( const ScSingleRefData ) const;
bool operator!=( const ScSingleRefData ) const;
@@ -147,8 +150,14 @@ struct ScComplexRefData
bool ValidExternal() const;
SC_DLLPUBLIC ScRange toAbs( const ScAddress rPos ) const;
+
+/** Set a new range, assuming that the ordering of the range matches the
+ordering of the reference data flags already set. */
void SetRange( const ScRange rRange, const ScAddress rPos );
+/** Adjust ordering (front-top-left/rear-bottom-right) to a new position.
*/
+void PutInOrder( const ScAddress rPos );
+
inline bool operator==( const ScComplexRefData r ) const
{ return Ref1 == r.Ref1 Ref2 == r.Ref2; }
/** Enlarge range if reference passed is not within existing range.
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index cd32952..01d7a52 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -216,6 +216,12 @@ public:
void AdjustReferenceOnMovedOriginIfOtherSheet( const ScAddress rOldPos,
const ScAddress rNewPos );
/**
+ * Adjust internal range references on base position change to justify /
+ * put in order the relative references.
+ */
+void AdjustReferenceOnCopy( const ScAddress rNewPos );
+
+/**
* Clear sheet deleted flag from internal reference tokens if the sheet
* index falls within specified range. Note that when a reference is on a
* sheet that's been deleted, its referenced sheet index retains the
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index d456911..71b30d0 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -844,6 +844,9 @@ ScFormulaCell::ScFormulaCell( const ScFormulaCell rCell,
ScDocument rDoc, cons
pCode-AdjustAbsoluteRefs( rCell.pDocument, rCell.aPos, aPos, false,
bCopyBetweenDocs );
}
+if (!pDocument-IsClipOrUndo())
+pCode-AdjustReferenceOnCopy( aPos);
+
if ( nCloneFlags SC_CLONECELL_ADJUST3DREL )
pCode-ReadjustRelative3DReferences( rCell.aPos, aPos );
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 504e878..f4158f0 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1305,6 +1305,7 @@ void ScInterpreter::DoubleRefToRange( const
ScComplexRefData rCRef,
rRange.aStart.Set( nCol, nRow, nTab );
SingleRefToVars( rCRef.Ref2, nCol, nRow, nTab);
rRange.aEnd.Set( nCol, nRow, nTab );
+rRange.Justify();
if (! pDok-aTableOpList.empty() !bDontCheckForTableOp )
{
if ( IsTableOpInRange( rRange ) )
diff --git a/sc/source/core/tool/refdata.cxx b/sc/source/core/tool/refdata.cxx
index 97d419c..4a814db 100644
--- a/sc/source/core/tool/refdata.cxx
+++ b/sc/source/core/tool/refdata.cxx
@@ -239,6 +239,93 @@ SCTAB ScSingleRefData::Tab() const
return mnTab;
}
+// static
+void ScSingleRefData::PutInOrder( ScSingleRefData rRef1, ScSingleRefData
rRef2, const ScAddress rPos )
+{
+sal_uInt8 nRelState1 = rRef1.Flags.bRelName ?
+((rRef1.Flags.bTabRel
[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-3' - loleaflet/src
loleaflet/src/layer/tile/GridLayer.js |4 ++--
loleaflet/src/layer/tile/TileLayer.js |6 --
2 files changed, 2 insertions(+), 8 deletions(-)
New commits:
commit 025a95c6689bb9939c10c5ca6b543165a4f4f9aa
Author: Mihai Varga mihai.va...@collabora.com
Date: Wed Jul 8 14:45:18 2015 +0300
loleaflet: disable fade Animation as it still causes problems
diff --git a/loleaflet/src/layer/tile/GridLayer.js
b/loleaflet/src/layer/tile/GridLayer.js
index 79875ef..b658b28 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -36,6 +36,7 @@ L.GridLayer = L.Layer.extend({
this._tiles = {};
this._tileCache = {};
+ this._map._fadeAnimated = false;
this._viewReset();
this._update();
this._map._docLayer = this;
@@ -453,7 +454,6 @@ L.GridLayer = L.Layer.extend({
},
_move: function () {
- this._skipFadeAnimated = false;
this._update();
},
@@ -692,7 +692,7 @@ L.GridLayer = L.Layer.extend({
if (!tile) { return; }
tile.loaded = +new Date();
- if (this._map._fadeAnimated !this._skipFadeAnimated) {
+ if (this._map._fadeAnimated) {
L.DomUtil.setOpacity(tile.el, 0);
L.Util.cancelAnimFrame(this._fadeFrame);
this._fadeFrame =
L.Util.requestAnimFrame(this._updateOpacity, this);
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 37bbe44..dad1cea 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -419,11 +419,6 @@ L.TileLayer = L.GridLayer.extend({
key = this._tileCoordsToKey(coords);
var tile = this._tiles[key];
if (tile) {
- if (tile.el.src) {
- // cancel the animFade if there's any
- L.DomUtil.setOpacity(tile.el, 1);
- this._skipFadeAnimated = true;
- }
if (this._tiles[key]._invalidCount 0) {
this._tiles[key]._invalidCount -= 1;
}
@@ -1025,7 +1020,6 @@ L.TileLayer = L.GridLayer.extend({
_onZoom: function (e) {
if (e.type === 'zoomstart') {
- this._skipFadeAnimated = true;
}
else if (e.type === 'zoomend') {
this._onUpdateCursor();
___
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' - sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/tdf90611.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 10 ++
writerfilter/source/dmapper/DomainMapper.cxx |2 +-
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 13 +
writerfilter/source/dmapper/DomainMapper_Impl.hxx |4
5 files changed, 28 insertions(+), 1 deletion(-)
New commits:
commit 16626008162545d3caec72fbffc4c19a79326a74
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Jul 6 09:23:40 2015 +0200
tdf#90611 DOCX import: fix missing paragraph style on footnotes
One one hand, a problem since commit
330b860205c7ba69dd6603f65324d0f89ad9cd5f (fdo#68787 DOCX import: handle
when w:separator is missing for footnotes, 2013-09-04) was that the type
attribute from w:footnote w:type=separator resulted in two
ooxml:CT_FtnEdn_type tokens, ignoring too many paragraph ends for
footnotes, which resulted in missing paragraph style on footnotes.
On the other hand, fixing the first problem showed that it wasn't
correct that commit 9389cf78e304a5a99bcf1745b9388e14ac36281a (cp#118
RTF import: empty para at the end of footnote text got lost, 2013-11-15)
unconditionally removed the RemoveLastParagraph() call in
DomainMapper_Impl::PopFootOrEndnote(). It turns out that RTF and DOCX
have different semantics here, the footnote is always within a p/p
pair in DOCX, while in RTF a \par at the end of a
footnote means an empty paragraph. Fix that by conditionally restoring
the removed RemoveLastParagraph() call.
(cherry picked from commit 519b34300f73b1e08f6194d6ba49d4fc010cf186)
Change-Id: I33020ac761c94addfec8164a17863565e4453b07
Reviewed-on: https://gerrit.libreoffice.org/16810
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/sw/qa/extras/ooxmlimport/data/tdf90611.docx
b/sw/qa/extras/ooxmlimport/data/tdf90611.docx
new file mode 100644
index 000..ac54fee
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf90611.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index d8cd372..2bac72a 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2725,6 +2725,16 @@ DECLARE_OOXMLIMPORT_TEST(testTdf87460, tdf87460.docx)
CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(1), xEndnotes-getCount());
}
+DECLARE_OOXMLIMPORT_TEST(testTdf90611, tdf90611.docx)
+{
+uno::Referencetext::XFootnotesSupplier xFootnotesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xFootnotes(xFootnotesSupplier-getFootnotes(), uno::UNO_QUERY);
+uno::Referencetext::XText xFootnoteText;
+xFootnotes-getByIndex(0) = xFootnoteText;
+// This was 11.
+CPPUNIT_ASSERT_EQUAL(10.f, getPropertyfloat(getParagraphOfText(1,
xFootnoteText), CharHeight));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 5542cca..d78aca7 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -991,7 +991,7 @@ void DomainMapper::lcl_attribute(Id nName, Value val)
case NS_ooxml::LN_CT_FtnEdn_type:
// This is the separator footnote, ignore its linebreak.
if (static_castsal_uInt32(nIntValue) ==
NS_ooxml::LN_Value_doc_ST_FtnEdn_separator)
-m_pImpl-m_bIgnoreNextPara = true;
+m_pImpl-SeenFootOrEndnoteSeparator();
break;
case NS_ooxml::LN_CT_DataBinding_prefixMappings:
m_pImpl-appendGrabBag(m_pImpl-m_aInteropGrabBag,
ooxml:CT_DataBinding_prefixMappings, sStringValue);
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 944fdf3..5ff66e9 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -208,6 +208,7 @@ DomainMapper_Impl::DomainMapper_Impl(
m_bInHeaderFooterImport( false ),
m_bDiscardHeaderFooter( false ),
m_bInFootOrEndnote(false),
+m_bSeenFootOrEndnoteSeparator(false),
m_bLineNumberingSet( false ),
m_bIsInFootnoteProperties( false ),
m_bIsCustomFtnMark( false ),
@@ -1747,6 +1748,9 @@ void DomainMapper_Impl::PushAnnotation()
void DomainMapper_Impl::PopFootOrEndnote()
{
+if (!IsRTFImport())
+RemoveLastParagraph();
+
// In case the foot or endnote did not contain a tab.
m_bIgnoreNextTab = false;
@@ -1759,9 +1763,18 @@ void DomainMapper_Impl::PopFootOrEndnote()
return;
}
m_aRedlines.pop();
+m_bSeenFootOrEndnoteSeparator = false;
m_bInFootOrEndnote = false;
}
+void
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/inc sc/source
sc/inc/refdata.hxx |9 +++
sc/inc/tokenarray.hxx |6 ++
sc/source/core/data/formulacell.cxx |3 +
sc/source/core/tool/interpr4.cxx|1
sc/source/core/tool/refdata.cxx | 92
sc/source/core/tool/token.cxx | 28 ++
6 files changed, 139 insertions(+)
New commits:
commit 21d5e7bbb5ba986a3fd2b4194f83c18003fc3bac
Author: Eike Rathke er...@redhat.com
Date: Tue Jul 7 01:45:41 2015 +0200
always justify a referenced range in order, tdf#92468
(cherry picked from commit d24c6a0280b0287ee6c23ca89068323c6b7c3dd7)
(re-)introduce ScComplexRefData::PutInOrder(), tdf#92468
(cherry picked from commit ad3d2b6c2e88d191d76f90eb5be927f7ca76c670)
introduce ScTokenArray::AdjustReferenceOnCopy(), tdf#92468
(cherry picked from commit 369ee0b1faf79f1bd23c75ee04dd0dcc5bf283af)
call ScTokenArray::AdjustReferenceOnCopy() in ScFormulaCell clone, tdf#92468
(cherry picked from commit 3ddaeaab37d585971e376de6ad7b0f06f55f2e1a)
f551e02a77a416b95f74266de896391d1d72eb3c
0a7ac0d9d10e96223cd5f095a771aa6f9d271417
0dc0c3528b35bc6ea2525bafb94d72ee65e4791a
Change-Id: Id69c58800d28f1733777f7931a20d8ee7bdf034f
Reviewed-on: https://gerrit.libreoffice.org/16815
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/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index c49682f..b96acb7 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -104,6 +104,9 @@ public:
SCCOL Col() const;
SCTAB Tab() const;
+/** Adjust ordering (front-top-left/rear-bottom-right) to a new position.
*/
+static void PutInOrder( ScSingleRefData rRef1, ScSingleRefData rRef2,
const ScAddress rPos );
+
bool operator==( const ScSingleRefData ) const;
bool operator!=( const ScSingleRefData ) const;
@@ -161,8 +164,14 @@ struct ScComplexRefData
}
SC_DLLPUBLIC ScRange toAbs( const ScAddress rPos ) const;
+
+/** Set a new range, assuming that the ordering of the range matches the
+ordering of the reference data flags already set. */
void SetRange( const ScRange rRange, const ScAddress rPos );
+/** Adjust ordering (front-top-left/rear-bottom-right) to a new position.
*/
+void PutInOrder( const ScAddress rPos );
+
inline bool operator==( const ScComplexRefData r ) const
{ return Ref1 == r.Ref1 Ref2 == r.Ref2; }
/** Enlarge range if reference passed is not within existing range.
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index 0d3fa02..8ed8697 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -217,6 +217,12 @@ public:
void AdjustReferenceOnMovedOriginIfOtherSheet( const ScAddress rOldPos,
const ScAddress rNewPos );
/**
+ * Adjust internal range references on base position change to justify /
+ * put in order the relative references.
+ */
+void AdjustReferenceOnCopy( const ScAddress rNewPos );
+
+/**
* Clear sheet deleted flag from internal reference tokens if the sheet
* index falls within specified range. Note that when a reference is on a
* sheet that's been deleted, its referenced sheet index retains the
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 24f365a..eb2b374 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -850,6 +850,9 @@ ScFormulaCell::ScFormulaCell( const ScFormulaCell rCell,
ScDocument rDoc, cons
pCode-AdjustAbsoluteRefs( rCell.pDocument, rCell.aPos, aPos, false,
bCopyBetweenDocs );
}
+if (!pDocument-IsClipOrUndo())
+pCode-AdjustReferenceOnCopy( aPos);
+
if ( nCloneFlags SC_CLONECELL_ADJUST3DREL )
pCode-ReadjustRelative3DReferences( rCell.aPos, aPos );
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 18dee8e..9d4821c 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1309,6 +1309,7 @@ void ScInterpreter::DoubleRefToRange( const
ScComplexRefData rCRef,
rRange.aStart.Set( nCol, nRow, nTab );
SingleRefToVars( rCRef.Ref2, nCol, nRow, nTab);
rRange.aEnd.Set( nCol, nRow, nTab );
+rRange.Justify();
if (! pDok-aTableOpList.empty() !bDontCheckForTableOp )
{
if ( IsTableOpInRange( rRange ) )
diff --git a/sc/source/core/tool/refdata.cxx b/sc/source/core/tool/refdata.cxx
index 97d419c..4a814db 100644
--- a/sc/source/core/tool/refdata.cxx
+++ b/sc/source/core/tool/refdata.cxx
@@ -239,6 +239,93 @@ SCTAB ScSingleRefData::Tab() const
return mnTab;
}
+// static
+void ScSingleRefData::PutInOrder( ScSingleRefData rRef1, ScSingleRefData
rRef2, const ScAddress rPos )
+{
+sal_uInt8 nRelState1 = rRef1.Flags.bRelName ?
+((rRef1.Flags.bTabRel ? 4
[Libreoffice-bugs] [Bug 92622] WRITER: context menu Unstyle the text from Styles Formatting
https://bugs.documentfoundation.org/show_bug.cgi?id=92622 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added CC||c...@nouenoff.nl --- Comment #1 from Cor Nouws c...@nouenoff.nl --- (In reply to Philippe Jung from comment #0) At this point, I would like to right click on the selected bullet style and say remove this style from my selection (Unstyle Text). Hi Philippe, You know this can be simply done by Ctrl+Shft+F12 or the Icon Bullets/numbering On/Off ? -- 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' - sc/inc sc/source
sc/inc/scmatrix.hxx |3 +++
sc/source/core/tool/interpr5.cxx | 10 +-
sc/source/core/tool/scmatrix.cxx | 13 +
3 files changed, 21 insertions(+), 5 deletions(-)
New commits:
commit f5427fa4d7cb9ad79d68d0760030ca998ca1d0e5
Author: Eike Rathke er...@redhat.com
Date: Mon Jul 6 16:48:42 2015 +0200
use ScMatrix::IsValueOrEmpty() on math operators Mul/Div/Pow, tdf#91453
... which aren't implemented at ScMatrix yet. Using IsValue() worked
when errors were not propagated, and before that when errors were
propagated because ScMatrix didn't have empty elements but instead was
initialized to 0.0
Change-Id: Ib9c6d34f2e6a68e483b606923cbcc41a3c1d2f51
Reviewed-on: https://gerrit.libreoffice.org/16799
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index 27d3777..63284e9 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -342,6 +342,9 @@ public:
bool IsValue( SCSIZE nC, SCSIZE nR ) const;
/// @return TRUE/ if value or boolean or empty or empty path.
+bool IsValueOrEmpty( SCSIZE nIndex ) const;
+
+/// @return TRUE/ if value or boolean or empty or empty path.
bool IsValueOrEmpty( SCSIZE nC, SCSIZE nR ) const;
/// @return TRUE/ if boolean.
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index 3aab1c2..4a093be 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -1471,7 +1471,7 @@ void ScInterpreter::ScMul()
{
SCSIZE nCount = nC * nR;
for ( SCSIZE i = 0; i nCount; i++ )
-if (pMat-IsValue(i))
+if (pMat-IsValueOrEmpty(i))
pResMat-PutDouble(pMat-GetDouble(i)*fVal, i);
else
pResMat-PutError( errNoValue, i);
@@ -1550,14 +1550,14 @@ void ScInterpreter::ScDiv()
SCSIZE nCount = nC * nR;
if (bFlag)
{ for ( SCSIZE i = 0; i nCount; i++ )
-if (pMat-IsValue(i))
+if (pMat-IsValueOrEmpty(i))
pResMat-PutDouble( div( fVal, pMat-GetDouble(i)), i);
else
pResMat-PutError( errNoValue, i);
}
else
{ for ( SCSIZE i = 0; i nCount; i++ )
-if (pMat-IsValue(i))
+if (pMat-IsValueOrEmpty(i))
pResMat-PutDouble( div( pMat-GetDouble(i), fVal), i);
else
pResMat-PutError( errNoValue, i);
@@ -1629,14 +1629,14 @@ void ScInterpreter::ScPow()
SCSIZE nCount = nC * nR;
if (bFlag)
{ for ( SCSIZE i = 0; i nCount; i++ )
-if (pMat-IsValue(i))
+if (pMat-IsValueOrEmpty(i))
pResMat-PutDouble(pow(fVal,pMat-GetDouble(i)), i);
else
pResMat-PutError( errNoValue, i);
}
else
{ for ( SCSIZE i = 0; i nCount; i++ )
-if (pMat-IsValue(i))
+if (pMat-IsValueOrEmpty(i))
pResMat-PutDouble(pow(pMat-GetDouble(i),fVal), i);
else
pResMat-PutError( errNoValue, i);
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 90b2376..707337e 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -259,6 +259,7 @@ public:
bool IsEmptyPath( SCSIZE nC, SCSIZE nR ) const;
bool IsValue( SCSIZE nIndex ) const;
bool IsValue( SCSIZE nC, SCSIZE nR ) const;
+bool IsValueOrEmpty( SCSIZE nIndex ) const;
bool IsValueOrEmpty( SCSIZE nC, SCSIZE nR ) const;
bool IsBoolean( SCSIZE nC, SCSIZE nR ) const;
bool IsNumeric() const;
@@ -749,6 +750,13 @@ bool ScMatrixImpl::IsValue( SCSIZE nC, SCSIZE nR ) const
return false;
}
+bool ScMatrixImpl::IsValueOrEmpty( SCSIZE nIndex ) const
+{
+SCSIZE nC, nR;
+CalcPosition(nIndex, nC, nR);
+return IsValueOrEmpty(nC, nR);
+}
+
bool ScMatrixImpl::IsValueOrEmpty( SCSIZE nC, SCSIZE nR ) const
{
ValidColRowReplicated(nC, nR);
@@ -2364,6 +2372,11 @@ bool ScMatrix::IsValue( SCSIZE nC, SCSIZE nR ) const
return pImpl-IsValue(nC, nR);
}
+bool ScMatrix::IsValueOrEmpty( SCSIZE nIndex ) const
+{
+return pImpl-IsValueOrEmpty(nIndex);
+}
+
bool ScMatrix::IsValueOrEmpty( SCSIZE nC, SCSIZE nR ) const
{
return pImpl-IsValueOrEmpty(nC, nR);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 90351] CMIS: crashes with index out of range! when saving a document
https://bugs.documentfoundation.org/show_bug.cgi?id=90351 Andras Timar tima...@gmail.com changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |tima...@gmail.com |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: config_host/config_dconf.h.in config_host.mk.in configmgr/CppunitTest_configmgr_unit.mk configmgr/Library_configmgr.mk configmgr/source configure.ac distro-configs/Libr
RepositoryExternal.mk |5 config_host.mk.in |3 config_host/config_dconf.h.in | 17 configmgr/CppunitTest_configmgr_unit.mk |1 configmgr/Library_configmgr.mk |8 configmgr/source/components.cxx | 14 configmgr/source/readdconflayer.cxx | 931 configmgr/source/readdconflayer.hxx | 25 configure.ac| 29 distro-configs/LibreOfficeLinux.conf|1 include/sal/log-areas.dox |1 instsetoo_native/CustomTarget_setup.mk |2 scp2/source/ooo/common_brand.scp| 19 13 files changed, 1048 insertions(+), 8 deletions(-) New commits: commit ecc617e797aa5ed329668114e54ec7ffa5c0e87b Author: Stephan Bergmann sberg...@redhat.com Date: Wed Jul 8 11:20:19 2015 +0200 configmgr: support reading from a dconf layer (WIP) Work in progress to allow integration of LO with https://wiki.gnome.org/Projects/FleetCommander. During configuration, dconf support is implicitly enabled when available on the host (which is presumably only available on Linux). It is explicitly disabled for TDF Linux builds for now, though, to avoid accidental dependencies of the distributed installation sets on system dconf libraries. A dconf layer is represented in the CONFIGURATION_LAYERS bootstrap variable with type dconf and an empty URL. See the comment at the top of configmgr/source/readdconflayer.cxx for the encoding of component-data in dconf. All of this is still subject to change. Change-Id: I2d08d81c8ea43ba4a99040a8882ae75b91bcfdb9 Reviewed-on: https://gerrit.libreoffice.org/16848 Tested-by: Jenkins c...@libreoffice.org Reviewed-by: Stephan Bergmann sberg...@redhat.com diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index a0a0d61..75f033f 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3584,6 +3584,11 @@ endif # ENABLE_COLLADA endif # ENABLE_GLTF +define gb_LinkTarget__use_dconf +$(call gb_LinkTarget_add_defs,$(1),$(DCONF_CFLAGS)) +$(call gb_LinkTarget_add_libs,$(1),$(DCONF_LIBS)) +endef + ### Jars ifneq ($(SYSTEM_HSQLDB),) diff --git a/config_host.mk.in b/config_host.mk.in index 1d0702b..2a20b8b 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -91,6 +91,8 @@ export DBUSMENUGTK_CFLAGS=$(gb_SPACE)@DBUSMENUGTK_CFLAGS@ export DBUSMENUGTK_LIBS=$(gb_SPACE)@DBUSMENUGTK_LIBS@ export DBUS_CFLAGS=$(gb_SPACE)@DBUS_CFLAGS@ export DBUS_LIBS=$(gb_SPACE)@DBUS_LIBS@ +export DCONF_CFLAGS=@DCONF_CFLAGS@ +export DCONF_LIBS=@DCONF_LIBS@ export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@ export DIAGRAM_EXTENSION_PACK=@DIAGRAM_EXTENSION_PACK@ export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@ @@ -122,6 +124,7 @@ export ENABLE_CUPS=@ENABLE_CUPS@ export ENABLE_CURL=@ENABLE_CURL@ export ENABLE_DBGUTIL=@ENABLE_DBGUTIL@ export ENABLE_DBUS=@ENABLE_DBUS@ +export ENABLE_DCONF=@ENABLE_DCONF@ export ENABLE_DEBUG=@ENABLE_DEBUG@ export ENABLE_DEBUGINFO_FOR=@ENABLE_DEBUGINFO_FOR@ export ENABLE_DIRECTX=@ENABLE_DIRECTX@ diff --git a/config_host/config_dconf.h.in b/config_host/config_dconf.h.in new file mode 100644 index 000..09608c4 --- /dev/null +++ b/config_host/config_dconf.h.in @@ -0,0 +1,17 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef INCLUDED_CONFIG_DCONF_H +#define INCLUDED_CONFIG_DCONF_H + +#define ENABLE_DCONF 0 + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/configmgr/CppunitTest_configmgr_unit.mk b/configmgr/CppunitTest_configmgr_unit.mk index 1672c9f..e8bddc2 100644 --- a/configmgr/CppunitTest_configmgr_unit.mk +++ b/configmgr/CppunitTest_configmgr_unit.mk @@ -49,5 +49,6 @@ $(eval $(call gb_CppunitTest_use_components,configmgr_unit,\ $(eval $(call gb_CppunitTest_use_externals,configmgr_unit,\ boost_headers \ +dconf \ icu_headers \ )) diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk index 528b150..36c316a 100644 --- a/configmgr/Library_configmgr.mk +++ b/configmgr/Library_configmgr.mk @@ -38,15 +38,19 @@ $(eval $(call gb_Library_add_exception_objects,configmgr, \ configmgr/source/type \ configmgr/source/update \ configmgr/source/valueparser \ -$(if $(filter $(OS),WNT), configmgr/source/winreg ) \ configmgr/source/writemodfile \ configmgr/source/xcdparser \ configmgr/source/xcsparser \ configmgr/source/xcuparser \ configmgr/source/xmldata \ +$(if $(ENABLE_DCONF),configmgr/source/readdconflayer) \ +$(if $(filter
[Libreoffice-commits] core.git: 3 commits - stoc/source
stoc/source/inspect/introspection.cxx | 70 --
1 file changed, 18 insertions(+), 52 deletions(-)
New commits:
commit f0c4130746e7b61029ce90f24e69a3203b547e54
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jul 8 14:30:27 2015 +0200
Use OUString::starts/endsWith
Change-Id: I88effbf6f88dfb286f85f8fbd06bab8033aca6b0
diff --git a/stoc/source/inspect/introspection.cxx
b/stoc/source/inspect/introspection.cxx
index 9f061ae..e6b9110 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -1972,12 +1972,9 @@ css::uno::Referencecss::beans::XIntrospectionAccess
Implementation::inspect(
continue;
// Ist es eine get-Methode?
-OUString aStartStr = aMethName.copy( 0, 3 );
-if( aStartStr == get )
+OUString aPropName;
+if( aMethName.startsWith(get, aPropName) )
{
-// Namen der potentiellen Property
-OUString aPropName = aMethName.copy( 3 );
-
// get-Methode darf keinen Parameter haben
Sequence ReferenceXIdlClass getParams =
rxMethod_i-getParameterTypes();
if( getParams.getLength() 0 )
@@ -2044,13 +2041,9 @@ css::uno::Referencecss::beans::XIntrospectionAccess
Implementation::inspect(
// Name holen und auswerten
OUString aMethName2 = rxMethod_k-getName();
-OUString aStartStr2 = aMethName2.copy( 0, 3 );
-if( aStartStr2 != set )
-continue;
-
-// Ist es denn der gleiche Name?
-OUString aPropName2 = aMethName2.copy( 3 );
-if( aPropName != aPropName2 )
+OUString aPropName2;
+if (!(aMethName2.startsWith(set, aPropName2)
+ aPropName2 == aPropName))
continue;
// set-Methode muss void returnen
@@ -2092,22 +2085,13 @@ css::uno::Referencecss::beans::XIntrospectionAccess
Implementation::inspect(
}
// Ist es eine addListener-Methode?
-else if( aStartStr == add )
+else if( aMethName.startsWith(add, aPropName) )
{
-OUString aListenerStr( Listener );
-
-// Namen der potentiellen Property
-sal_Int32 nStrLen = aMethName.getLength();
-sal_Int32 nCopyLen = nStrLen -
aListenerStr.getLength();
-OUString aEndStr = aMethName.copy( nCopyLen 0 ?
nCopyLen : 0 );
-
// Endet das Teil auf Listener?
-if( aEndStr != aListenerStr )
+OUString aListenerName;
+if( !aPropName.endsWith(Listener,
aListenerName) )
continue;
-// Welcher Listener?
-OUString aListenerName = aMethName.copy( 3,
nStrLen - aListenerStr.getLength() - 3 );
-
// TODO: Hier koennten noch genauere Pruefungen
vorgenommen werden
// - Rueckgabe-Typ
// - Anzahl und Art der Parameter
@@ -2126,19 +2110,12 @@ css::uno::Referencecss::beans::XIntrospectionAccess
Implementation::inspect(
// Name holen und auswerten
OUString aMethName2 = rxMethod_k-getName();
-sal_Int32 nNameLen = aMethName2.getLength();
-sal_Int32 nCopyLen2 = (nNameLen 6) ?
nNameLen : 6;
-OUString aStartStr2 = aMethName2.copy( 0,
nCopyLen2 );
-OUString aRemoveStr(remove );
-if( aStartStr2 != aRemoveStr )
-continue;
-
-// Ist es denn der gleiche Listener?
-if( aMethName2.getLength() -
aRemoveStr.getLength() = aListenerStr.getLength() )
-continue;
-OUString aListenerName2 = aMethName2.copy
- ( 6, aMethName2.getLength() -
aRemoveStr.getLength() - aListenerStr.getLength() );
-if( aListenerName != aListenerName2 )
+OUString aListenerName2;
+
[Libreoffice-bugs] [Bug 92621] New: Extension is not support
https://bugs.documentfoundation.org/show_bug.cgi?id=92621 Bug ID: 92621 Summary: Extension is not support Product: Document Liberation Project Version: unspecified Hardware: Other OS: Windows (All) Status: UNCONFIRMED Severity: major Priority: medium Component: General Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: pratik.chavande...@gmail.com Created attachment 117123 -- https://bugs.documentfoundation.org/attachment.cgi?id=117123action=edit Error message for extension Extension is not support for Libreffice.Error message shows. Steps to followed : 1. Click on Libreoffice. 2. Click on extension. -- 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
New Defects reported by Coverity Scan for LibreOffice
Hi,
Please find the latest report on new defect(s) introduced to LibreOffice found
with Coverity Scan.
6 new defect(s) introduced to LibreOffice found with Coverity Scan.
12 defect(s), reported by Coverity Scan earlier, were marked fixed in the
recent build analyzed by Coverity Scan.
New defect(s) Reported-by: Coverity Scan
Showing 6 of 6 defect(s)
** CID 1311336: Uninitialized members (UNINIT_CTOR)
/cui/source/options/optaboutconfig.cxx: 68 in UserData::UserData(const
rtl::OUString )()
*** CID 1311336: Uninitialized members (UNINIT_CTOR)
/cui/source/options/optaboutconfig.cxx: 68 in UserData::UserData(const
rtl::OUString )()
62 int aLineage;
63 ReferenceXNameAccess aXNameAccess;
64
65 explicit UserData( OUString const rPropertyPath )
66 : bIsPropertyPath( true )
67 , sPropertyPath(rPropertyPath)
CID 1311336: Uninitialized members (UNINIT_CTOR)
Non-static class member aLineage is not initialized in this
constructor nor in any functions that it calls.
68 {}
69
70 explicit UserData( ReferenceXNameAccess const rXNameAccess, int
rIndex = 0 )
71 : bIsPropertyPath( false )
72 , aLineage(rIndex)
73 , aXNameAccess( rXNameAccess )
** CID 1311335: Error handling issues (UNCAUGHT_EXCEPT)
/sc/source/ui/vba/vbaapplication.cxx: 1066 in
unnamed::lclCreateVbaRange(const
com::sun::star::uno::Referencecom::sun::star::uno::XComponentContext , const
com::sun::star::uno::Referencecom::sun::star::frame::XModel , const
std::listScRange, std::allocatorScRange )()
*** CID 1311335: Error handling issues (UNCAUGHT_EXCEPT)
/sc/source/ui/vba/vbaapplication.cxx: 1066 in
unnamed::lclCreateVbaRange(const
com::sun::star::uno::Referencecom::sun::star::uno::XComponentContext , const
com::sun::star::uno::Referencecom::sun::star::frame::XModel , const
std::listScRange, std::allocatorScRange )()
1060 // again, join the result ranges
1061 lclJoinRanges( rList );
1062 }
1063 }
1064
1065 /** Creates a VBA Range object from the passed list of ranges. */
CID 1311335: Error handling issues (UNCAUGHT_EXCEPT)
An exception of type std::length_error is thrown but the throw list
throw(com::sun::star::uno::RuntimeException) doesn't allow it to be
thrown. This will cause a call to unexpected() which usually calls
terminate().
1066 uno::Reference excel::XRange lclCreateVbaRange(
1067 const uno::Reference uno::XComponentContext rxContext,
1068 const uno::Reference frame::XModel rxModel,
1069 const ListOfScRange rList ) throw (uno::RuntimeException)
1070 {
1071 ScDocShell* pDocShell = excel::getDocShell( rxModel );
** CID 1311334: Error handling issues (UNCAUGHT_EXCEPT)
/sc/source/ui/vba/vbaeventshelper.cxx: 860 in
ScVbaEventsHelper::createRange(const
com::sun::star::uno::Sequencecom::sun::star::uno::Any , int) const()
*** CID 1311334: Error handling issues (UNCAUGHT_EXCEPT)
/sc/source/ui/vba/vbaeventshelper.cxx: 860 in
ScVbaEventsHelper::createRange(const
com::sun::star::uno::Sequencecom::sun::star::uno::Any , int) const()
854 {
855 // extract sheet index, will throw, if parameter is invalid
856 SCTAB nTab = lclGetTabFromArgs( rArgs, nIndex );
857 return uno::Any( excel::getUnoSheetModuleObj( mxModel, nTab ) );
858 }
859
CID 1311334: Error handling issues (UNCAUGHT_EXCEPT)
An exception of type std::length_error is thrown but the throw list
throw(com::sun::star::uno::RuntimeException,
com::sun::star::lang::IllegalArgumentException) doesn't allow it to be
thrown. This will cause a call to unexpected() which usually calls
terminate().
860 uno::Any ScVbaEventsHelper::createRange( const uno::Sequence uno::Any
rArgs, sal_Int32 nIndex ) const
861 throw (lang::IllegalArgumentException, uno::RuntimeException)
862 {
863 // it is possible to pass an existing VBA Range object
864 uno::Reference excel::XRange xVbaRange = getXSomethingFromArgs
excel::XRange ( rArgs, nIndex );
865 if( !xVbaRange.is() )
** CID 1311333: Error handling issues (UNCAUGHT_EXCEPT)
/sc/source/ui/vba/vbarange.cxx: 1238 in getRangeForName(const
com::sun::star::uno::Referencecom::sun::star::uno::XComponentContext , const
rtl::OUString , ScDocShell *, com::sun::star::table::CellRangeAddress ,
formula::FormulaGrammar::AddressConvention)()
*** CID 1311333: Error handling issues (UNCAUGHT_EXCEPT)
[Libreoffice-bugs] [Bug 91808] UI glitches in various dialogs (checkboxes and radiobuttons) (KDE-specific)
https://bugs.documentfoundation.org/show_bug.cgi?id=91808 Doug dougt901-2...@yahoo.com changed: What|Removed |Added CC||dougt901-2...@yahoo.com --- Comment #10 from Doug dougt901-2...@yahoo.com --- *** Bug 92558 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-commits] core.git: Branch 'libreoffice-5-0' - sc/source
sc/source/core/data/document.cxx | 63 +++
1 file changed, 63 insertions(+)
New commits:
commit d71ed0ee3fbf70c21513379184dea596b30b0baf
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/16840
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 14ab9ac..e00a5cc 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -5646,18 +5646,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-bugs] [Bug 92558] BASE: bad paint/draw of checkbox in index dialog for table editing
https://bugs.documentfoundation.org/show_bug.cgi?id=92558 Doug dougt901-2...@yahoo.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE --- Comment #3 from Doug dougt901-2...@yahoo.com --- This bug is the same as 91808 which was declared having same origin as bug 92110. *** This bug has been marked as a duplicate of bug 91808 *** -- 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] help.git: AllLangHelp_scalc.mk source/text
AllLangHelp_scalc.mk|1 source/text/scalc/01/ODFF.xhp | 35 + source/text/scalc/01/func_timevalue.xhp | 85 +++- 3 files changed, 76 insertions(+), 45 deletions(-) New commits: commit fd9b00bd84e3fe1a0aa087f5355aa0fcd27ef95f Author: Olivier Hallot olivier.hal...@edx.srv.br Date: Fri Jun 5 16:37:28 2015 -0300 Promote ODF Formula standard in Calc function help Insert ODF Formula standard citation in Calc functions where it applies. In this example, function TIMEVALUE is a standard ODF Formula 1.2 function. Many other functions qualify to be a ODFF function. But since Excel is changing its function names, not every Calc function is and ODFF funciton. Change-Id: Ib764d780f9f66c8a7adaba8954d91fc9b4d70410 Reviewed-on: https://gerrit.libreoffice.org/16110 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk index 49434ca..9987151 100644 --- a/AllLangHelp_scalc.mk +++ b/AllLangHelp_scalc.mk @@ -210,6 +210,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\ helpcontent2/source/text/scalc/01/solver_options \ helpcontent2/source/text/scalc/01/statistics \ helpcontent2/source/text/scalc/01/stat_data \ +helpcontent2/source/text/scalc/01/ODFF \ helpcontent2/source/text/scalc/01/text2columns \ helpcontent2/source/text/scalc/02/0213 \ helpcontent2/source/text/scalc/02/0214 \ diff --git a/source/text/scalc/01/ODFF.xhp b/source/text/scalc/01/ODFF.xhp new file mode 100644 index 000..85aebf9 --- /dev/null +++ b/source/text/scalc/01/ODFF.xhp @@ -0,0 +1,35 @@ +?xml version=1.0? +helpdocument version=1.0 +!--*** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + ***-- + +meta +topic id=topic_0506201512363995 +title xml-lang=en-US id=titODFF/title +filenametext/scalc/01/ODFF.xhp/filename +/topic +/meta +body +section id=odff +paragraph id=hd_id110 role=note xml-lang=en-USThis function is a standard Open Document Formula version 1.2 function./paragraph +/section +/body +/helpdocument \ No newline at end of file diff --git a/source/text/scalc/01/func_timevalue.xhp b/source/text/scalc/01/func_timevalue.xhp index 97f35db..d986caf 100644 --- a/source/text/scalc/01/func_timevalue.xhp +++ b/source/text/scalc/01/func_timevalue.xhp @@ -1,51 +1,46 @@ -?xml version=1.0 encoding=UTF-8? +?xml version=1.0? helpdocument version=1.0 - -!-- - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the License); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - -- +!--*** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + *
Gsoc weekly report(Week #6)
This week I worked on - 1. Completed the task of SlideBackground tab: (Some minor bug fixing needed) 2. Completed the area tab work. 3. Moved the effects list to the animation tab (#87813) [work in progress] 4. Refactored the code for sidebar selection analyzer for writer as a follow up for the commit https://gerrit.libreoffice.org/#/c/16165/ [work in progress] ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: external/libcmis
external/libcmis/tdf90351.patch | 111 +---
1 file changed, 105 insertions(+), 6 deletions(-)
New commits:
commit f3c687a87c4c238286c35adcec54592c2e8cdffa
Author: Thorsten Behrens thorsten.behr...@cib.de
Date: Wed Jul 8 14:44:09 2015 +0200
tdf#90351: server response does not always contain cmis:baseTypeId
So if we know which object we just created, don't rely on the server
response to tell us. Improvement on the fix from
5c10e8cd0eedefc2dcc905154c4daa142561aef3.
Change-Id: Iddf706fb3b8bef38217a406c806963ba4496c7c9
diff --git a/external/libcmis/tdf90351.patch b/external/libcmis/tdf90351.patch
index fe0e5c5..65d630a 100644
--- a/external/libcmis/tdf90351.patch
+++ b/external/libcmis/tdf90351.patch
@@ -1,10 +1,109 @@
+From 2b85882048847a3d2076a8ac0ed63d905aeea1dd Mon Sep 17 00:00:00 2001
+From: Thorsten Behrens thorsten.behr...@cib.de
+Date: Wed, 8 Jul 2015 14:26:01 +0200
+Subject: [PATCH] tdf#90351: response does not always contain cmis:baseTypeId
+
+So if we know which object we just created, don't rely on the server
+response to tell us.
+---
+ src/libcmis/atom-document.cxx | 4 ++--
+ src/libcmis/atom-folder.cxx | 4 ++--
+ src/libcmis/atom-session.cxx | 6 +++---
+ src/libcmis/atom-session.hxx | 3 ++-
+ 4 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/src/libcmis/atom-document.cxx b/src/libcmis/atom-document.cxx
+index b7f28b3..49cfd45 100644
+--- src/libcmis/atom-document.cxx
src/libcmis/atom-document.cxx
+@@ -280,7 +280,7 @@ libcmis::DocumentPtr AtomDocument::checkOut( ) throw (
libcmis::Exception )
+ if ( NULL == doc )
+ throw libcmis::Exception( Failed to parse object infos );
+
+-libcmis::ObjectPtr created = getSession( )-createObjectFromEntryDoc( doc
);
++libcmis::ObjectPtr created = getSession( )-createObjectFromEntryDoc(
doc, AtomPubSession::RESULT_DOCUMENT );
+ xmlFreeDoc( doc );
+
+ libcmis::DocumentPtr pwc = boost::dynamic_pointer_cast libcmis::Document
( created );
+@@ -377,7 +377,7 @@ libcmis::DocumentPtr AtomDocument::checkIn( bool isMajor,
string comment,
+ throw libcmis::Exception( Failed to parse object infos );
+
+
+-libcmis::ObjectPtr newVersion = getSession( )-createObjectFromEntryDoc(
doc );
++libcmis::ObjectPtr newVersion = getSession( )-createObjectFromEntryDoc(
doc, AtomPubSession::RESULT_DOCUMENT );
+
+ if ( newVersion-getId( ) == getId( ) )
+ refreshImpl( doc );
+diff --git a/src/libcmis/atom-folder.cxx b/src/libcmis/atom-folder.cxx
+index 7947883..55ac2a9 100644
+--- src/libcmis/atom-folder.cxx
src/libcmis/atom-folder.cxx
+@@ -170,7 +170,7 @@ libcmis::FolderPtr AtomFolder::createFolder( const
PropertyPtrMap properties )
+ if ( NULL == doc )
+ throw libcmis::Exception( Failed to parse object infos );
+
+-libcmis::ObjectPtr created = getSession( )-createObjectFromEntryDoc( doc
);
++libcmis::ObjectPtr created = getSession( )-createObjectFromEntryDoc(
doc, AtomPubSession::RESULT_FOLDER );
+ xmlFreeDoc( doc );
+
+ libcmis::FolderPtr newFolder = boost::dynamic_pointer_cast
libcmis::Folder ( created );
+@@ -244,7 +244,7 @@ libcmis::DocumentPtr AtomFolder::createDocument( const
PropertyPtrMap propertie
+ throw libcmis::Exception( Missing expected response from server
);
+ }
+
+-libcmis::ObjectPtr created = getSession( )-createObjectFromEntryDoc( doc
);
++libcmis::ObjectPtr created = getSession( )-createObjectFromEntryDoc(
doc, AtomPubSession::RESULT_DOCUMENT );
+ xmlFreeDoc( doc );
+
+ libcmis::DocumentPtr newDocument = boost::dynamic_pointer_cast
libcmis::Document ( created );
+diff --git a/src/libcmis/atom-session.cxx b/src/libcmis/atom-session.cxx
+index ffa93a7..e470884 100644
--- src/libcmis/atom-session.cxx
+++ src/libcmis/atom-session.cxx
-@@ -233,6 +233,7 @@ libcmis::ObjectPtr
AtomPubSession::createObjectFromEntryDoc( xmlDocPtr doc )
- else
+@@ -201,7 +201,7 @@ bool AtomPubSession::setRepository( string repositoryId )
+ return found;
+ }
+
+-libcmis::ObjectPtr AtomPubSession::createObjectFromEntryDoc( xmlDocPtr doc )
++libcmis::ObjectPtr AtomPubSession::createObjectFromEntryDoc( xmlDocPtr doc,
ResultObjectType res )
+ {
+ libcmis::ObjectPtr cmisObject;
+
+@@ -222,11 +222,11 @@ libcmis::ObjectPtr
AtomPubSession::createObjectFromEntryDoc( xmlDocPtr doc )
+ string baseType = libcmis::getXPathValue( xpathCtx,
baseTypeReq );
+
+ xmlNodePtr node = xpathObj-nodesetval-nodeTab[0];
+-if ( baseType == cmis:folder )
++if ( res == RESULT_FOLDER || baseType == cmis:folder )
{
- // Not a valid CMIS atom entry... weird
-+cmisObject.reset( new AtomDocument( this, node ) );
+ cmisObject.reset( new AtomFolder( this, node ) );
}
- }
-
[Libreoffice-bugs] [Bug 92615] bridges: Add support for linux mips64.
https://bugs.documentfoundation.org/show_bug.cgi?id=92615 --- Comment #2 from Heiher r...@hev.cc --- (In reply to David Tardon from comment #1) Please use gerrit to submit patches (https://wiki.documentfoundation.org/Development/gerrit). OK, This is the changes on gerrit: https://gerrit.libreoffice.org/16845 -- 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 92617] Base is crashing frequently when EDITING data and switching Forms
https://bugs.documentfoundation.org/show_bug.cgi?id=92617 --- Comment #2 from t...@tim-passingham.co.uk --- Created attachment 117120 -- https://bugs.documentfoundation.org/attachment.cgi?id=117120action=edit hs_err_pid file I just found a related java error log, attached. -- 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 92617] New: Base is crashing frequently when EDITING data and switching Forms
https://bugs.documentfoundation.org/show_bug.cgi?id=92617 Bug ID: 92617 Summary: Base is crashing frequently when EDITING data and switching Forms Product: LibreOffice Version: 4.4.4.3 release Hardware: x86-64 (AMD64) OS: Linux (All) Status: UNCONFIRMED Severity: major Priority: medium Component: Base Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: t...@tim-passingham.co.uk Created attachment 117119 -- https://bugs.documentfoundation.org/attachment.cgi?id=117119action=edit An extract of the ubuntu crash report In bug #70703 I had regular crashes switching forms. That was fixed. However, the same symptom has now resurfaced, but it appears to be a slightly different cause since my demo of that crash does not crash in 4.4.4.3. I'm running MariaDB (10.0.20) and Libreoffice from the Ubuntu 14.04 ppas. The crashes usually occur when I have entered or modified data in a form which has been invoked from a series of previous forms, close that one and automatically expect to see the previous one show again. I use Basic macros to provide a type of modal user interface for the application. To explain briefly, it is a music catalogue, where I have a record set (eg one or more CDs), with several performances, on tracks, of pieces and/or parts of pieces. I can therefore view the record set, edit/add a performance or an existing or new piece, and return back to the record set and see that it now has a new track on it. There are quite a few bells and whistles. A number of forms and sub-forms are involved, and a number of tables and queries. My suspicion is that it is a GUI problem, as opposed to a Database problem, but I could well be wrong. I have some .xsession-errors but they are not time-stamped so I can't match them up with the syslog and may well be unrelated. I am well aware that this is insufficient information to help diagnose the problem(s). Supplying a copy of a fully populated database and instructions on how to use a non-trivial application, with inconsistent results, is, however, not very practical. I have run this in the debug version, and have a ubuntu crash report. That's over 40MB, so not very practical to upload here. I have therefore edited it to remove the core dump and attached 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
[Libreoffice-bugs] [Bug 92617] Base is crashing frequently when EDITING data and switching Forms
https://bugs.documentfoundation.org/show_bug.cgi?id=92617
--- Comment #3 from Lionel Elie Mamane lio...@mamane.lu ---
The Ubuntu crash report contains a backtrace. It points to this method in file
svx/source/form/formcontrolling.cxx:
bool FormControllerHelper::isModifiedRow() const
{
bool bIs = false;
if ( m_xFormOperations.is() )
bIs = m_xFormOperations-isModifiedRow();
return bIs;
}
and seems to be the line m_xFormOperations.is(), where m_xFormOperations
is 0x40, an obviously invalid value. I deduce that from one frame down:
#7 is (this=0x40) at
/build/libreoffice-A1OEbm/libreoffice-4.4.4~rc3/include/com/sun/star/uno/Reference.h:93
--
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] help.git: Branch 'distro/collabora/cp-4.4' - source/text
source/text/shared/guide/startcenter.xhp | 27 +-- 1 file changed, 13 insertions(+), 14 deletions(-) New commits: commit 74016cc893deb4b5b68d19c4fd209f8f9a68dc03 Author: Andras Timar andras.ti...@collabora.com Date: Tue Jul 7 14:52:38 2015 +0200 tdf#86301 fix hids of startcenter (cherry picked from commit 5aad108719014b52c9aba6be407ed553d0095a66) Conflicts: source/text/shared/guide/startcenter.xhp Change-Id: Ic33ff7519d820d9d770db6a3d2d067a81fb38272 Reviewed-on: https://gerrit.libreoffice.org/16818 Reviewed-by: Adolfo Jayme Barrientos fit...@ubuntu.com Tested-by: Adolfo Jayme Barrientos fit...@ubuntu.com diff --git a/source/text/shared/guide/startcenter.xhp b/source/text/shared/guide/startcenter.xhp index 2544df5..1ff0f96 100644 --- a/source/text/shared/guide/startcenter.xhp +++ b/source/text/shared/guide/startcenter.xhp @@ -31,10 +31,10 @@ bookmark_valuestart center/bookmark_value /bookmark bookmark xml-lang=en-US branch=hid/FWK_HID_BACKINGWINDOW id=bm_id0820200802550234 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/StartCenter id=bm_id0820200802550237 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/help id=bm_id0820200802550235 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/extensions id=bm_id0820200802550236 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/all_recent id=bm_id0820200802550238 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/StartCenter id=bm_id0820200802550237 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/help id=bm_id0820200802550235 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/extensions id=bm_id0820200802550236 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/all_recent id=bm_id0820200802550238 localize=false/ paragraph xml-lang=en-US id=hd_id0820200802524447 role=heading level=1 l10n=NEWvariable id=startcenterlink href=text/shared/guide/startcenter.xhpStart Center/link /variable/paragraph paragraph xml-lang=en-US id=par_id0820200803204063 role=paragraph l10n=NEWWelcome to %PRODUCTNAME. @@ -43,14 +43,13 @@ paragraph xml-lang=en-US id=par_id0820200802524413 role=paragraph l10n=NEWYou see the Start Center when no document is open in %PRODUCTNAME. It is divided into two panes. ahelp hid=.Click an icon on the left pane to open a new document or a file dialog./ahelp /paragraph -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/writer_all id=bm_id1022200910564632 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/calc_all id=bm_id1022200910570124 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/draw_all id=bm_id1022200910571273 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/impress_all id=bm_id102220091057270 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/database_all id=bm_id102220091057437 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/math_all id=bm_id1022200910575575 localize=false/ -paragraph xml-lang=en-US id=par_id0820200803104810 role=paragraph l10n=NEWahelp hid=.The document icons each open a new document -of the specified type./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/writer_all id=bm_id1022200910564632 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/calc_all id=bm_id1022200910570124 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/draw_all id=bm_id1022200910571273 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/impress_all id=bm_id102220091057270 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/database_all id=bm_id102220091057437 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/math_all id=bm_id1022200910575575 localize=false/ +paragraph xml-lang=en-US id=par_id0820200803104810 role=paragraph l10n=NEWahelp hid=.The document icons each open a new document of the specified type./ahelp/paragraph list type=ordered listitem paragraph xml-lang=en-US id=par_id0820200803104978 role=paragraph l10n=NEW @@ -77,10 +76,10 @@ emphFormula/emph opens %PRODUCTNAME link href=text/smath/main.xhpMath/link/paragraph /listitem /list -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/templates_all id=bm_id1022200910584084 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/templates_all id=bm_id1022200910584084 localize=false/ paragraph xml-lang=en-US id=par_id1022200911011855 role=paragraph l10n=NEWahelp hid=. visibility=hiddenThe Templates icon opens the Templates and Documents dialog./ahelp/paragraph paragraph xml-lang=en-US id=par_id0820200803105045 role=paragraph l10n=NEWThe emphTemplates/emph icon opens the link
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b9e717d769cc930364b9536b1c3d437890bb7e8d Author: Andras Timar andras.ti...@collabora.com Date: Tue Jul 7 14:52:38 2015 +0200 Updated core Project: help 74016cc893deb4b5b68d19c4fd209f8f9a68dc03 tdf#86301 fix hids of startcenter (cherry picked from commit 5aad108719014b52c9aba6be407ed553d0095a66) Conflicts: source/text/shared/guide/startcenter.xhp Change-Id: Ic33ff7519d820d9d770db6a3d2d067a81fb38272 Reviewed-on: https://gerrit.libreoffice.org/16818 Reviewed-by: Adolfo Jayme Barrientos fit...@ubuntu.com Tested-by: Adolfo Jayme Barrientos fit...@ubuntu.com diff --git a/helpcontent2 b/helpcontent2 index 40967ad..74016cc 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 40967add67da1353dae0f1f9cc31475f4650381c +Subproject commit 74016cc893deb4b5b68d19c4fd209f8f9a68dc03 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 81428] Import MathML format generated by MathJax into OpenOffice / LibreOffice
https://bugs.documentfoundation.org/show_bug.cgi?id=81428 Regina Henschel rb.hensc...@t-online.de changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #3 from Regina Henschel rb.hensc...@t-online.de --- Can you please be more exact about MathML generated with MathJax. I thought MathJax is a rendering help for webpages which contain MathML segments. The only thing I see, is the ability to show MathML source in a separate window from the context menu of a formula, when showing the webpage in the browser. -- 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 92619] New: WRITER Styles : (Paragraph styles List vs Numbered) vs Bullet Style
https://bugs.documentfoundation.org/show_bug.cgi?id=92619 Bug ID: 92619 Summary: WRITER Styles : (Paragraph styles List vs Numbered) vs Bullet Style Product: LibreOffice Version: 4.4.4.3 release Hardware: Other OS: All Status: UNCONFIRMED Severity: enhancement Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: phil.j...@free.fr The Paragraph Style List 1 should also set the bullet style Bullet 1 Moreover the French translation of paragraph style List 1 is rather translated as Bullet 1 As a end user point of view, when writing lists, I expect numbered paragraph or bulleted paragraphs. = I think we should update paragraph styles List n to Bullet Lists n and ensure that, by default, setting paragraph style Bullet Lists n also set bullet style Bullet n -- 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: vcl/unx
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 25 + 1 file changed, 9 insertions(+), 16 deletions(-) New commits: commit e7a6b023e3354713ec584321e849e575ab310cb9 Author: Caolán McNamara caol...@redhat.com Date: Wed Jul 8 09:11:03 2015 +0100 gtk3: rework to remove gtk_style_context_set_path warning Change-Id: I5d09d460e145bc3dc04d0cdd27bc4a1094053669 diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx index 98ad9b1..9fa1f7e 100644 --- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx @@ -1971,8 +1971,6 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow ) if(style_loaded) return; -GtkWidgetPath* path; - style_loaded = true; gtk_init(NULL, NULL); /* Load the GtkStyleContexts, it might be a bit slow, but usually, @@ -1989,24 +1987,19 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow ) getStyleContext(mpTextViewStyle, gtk_text_view_new()); getStyleContext(mpButtonStyle, gtk_button_new()); -getStyleContext(mpToolbarStyle, gtk_toolbar_new()); +GtkWidget* pToolbar = gtk_toolbar_new(); +mpToolbarStyle = gtk_widget_get_style_context(pToolbar); gtk_style_context_add_class(mpToolbarStyle, GTK_STYLE_CLASS_PRIMARY_TOOLBAR); gtk_style_context_add_class(mpToolbarStyle, GTK_STYLE_CLASS_TOOLBAR); -getStyleContext(mpToolbarSeperatorStyle, GTK_WIDGET(gtk_separator_tool_item_new())); - -getStyleContext(mpToolButtonStyle, gtk_button_new()); +GtkToolItem *item = gtk_separator_tool_item_new(); +gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), item, -1); +mpToolbarSeperatorStyle = gtk_widget_get_style_context(GTK_WIDGET(item)); -/* Create a widget path for our toolbutton widget */ -path = gtk_widget_path_new(); -gtk_widget_path_append_type(path, GTK_TYPE_TOOLBAR); -gtk_widget_path_append_type(path, GTK_TYPE_TOOL_BUTTON); -gtk_widget_path_append_type(path, GTK_TYPE_BUTTON); -gtk_widget_path_iter_add_class (path, 0, GTK_STYLE_CLASS_PRIMARY_TOOLBAR); -gtk_widget_path_iter_add_class (path, 1, GTK_STYLE_CLASS_TOOLBAR); -gtk_widget_path_iter_add_class (path, 2, GTK_STYLE_CLASS_BUTTON); -gtk_style_context_set_path(mpToolButtonStyle, path); -gtk_widget_path_free (path); +GtkWidget *pButton = gtk_button_new(); +item = gtk_tool_button_new(pButton, NULL); +gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), item, -1); +mpToolButtonStyle = gtk_widget_get_style_context(GTK_WIDGET(pButton)); getStyleContext(mpVScrollbarStyle, gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, NULL)); gtk_style_context_add_class(mpVScrollbarStyle, GTK_STYLE_CLASS_SCROLLBAR); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 92392] EDITING + UI: Calc crash when hitting Enter key
https://bugs.documentfoundation.org/show_bug.cgi?id=92392 --- Comment #17 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=a26723f028a9795104e12b5f98cddb53471b44d2h=libreoffice-5-0 Related: tdf#92392 clear workwins that point to pWindow It will be available in 5.0.0.3. 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 92161] GBK encoded Chinese text can't be read
https://bugs.documentfoundation.org/show_bug.cgi?id=92161 Caolán McNamara caol...@redhat.com changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |NOTABUG --- Comment #3 from Caolán McNamara caol...@redhat.com --- It can be read, it just can't auto-detect the format. You need to use file-open and select the text - choose encoding filter, the press ok, and then select Chinese simplified (GB-18030) as the encoding here. -- 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 92062] Crash When Click a 'New Theme...'/Gallery at Sidebar
https://bugs.documentfoundation.org/show_bug.cgi?id=92062 --- Comment #5 from Beluga todven...@suomi24.fi --- (In reply to krajcsi from comment #4) I can reproduce this on Linux Mint 17.1, and LO 4.4. Version: 4.4.4.3 Build ID: 2c39ebcf046445232b798108aa8a7e7d89552ea8 Locale: en_US.UTF-8 How did you manage to install KeyID for 4.4? I could not figure out how to do it for 4.4 in Ubuntu and the steps didn't crash for me. Ubuntu 15.04 64-bit Version: 4.4.4.3 Build ID: 40m0(Build:3) Locale: en_US.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-commits] core.git: Branch 'distro/collabora/cp-4.4' - 18 commits - cppcanvas/source dbaccess/source filter/source icon-themes/sifr include/oox include/svx include/unotools oox/source read
cppcanvas/source/mtfrenderer/emfplus.cxx |2 dbaccess/source/ui/app/AppController.cxx |2 filter/source/graphicfilter/ipsd/ipsd.cxx| 47 icon-themes/sifr/sw/res/doublepage_10x22.png |binary icon-themes/sifr/sw/res/emptypage_10x14.png |binary icon-themes/sifr/sw/res/twopages_10x24.png |binary include/oox/vml/vmlshape.hxx |1 include/oox/vml/vmltextbox.hxx |1 include/svx/svdpagv.hxx |5 include/unotools/historyoptions.hxx |3 oox/source/vml/vmlshape.cxx | 77 oox/source/vml/vmlshapecontext.cxx |1 oox/source/vml/vmltextboxcontext.cxx |2 readlicense_oo/license/CREDITS.fodt | 2885 +++ sc/source/ui/Accessibility/AccessibleDocument.cxx|3 sc/source/ui/Accessibility/AccessibleEditObject.cxx | 12 sc/source/ui/cctrl/tbinsert.cxx |2 sc/source/ui/inc/tbinsert.hxx|4 sd/source/ui/func/fusel.cxx |9 sd/source/ui/func/futext.cxx |9 sdext/source/pdfimport/tree/drawtreevisiting.cxx | 85 sdext/source/pdfimport/tree/pdfiprocessor.cxx| 88 sfx2/source/appl/newhelp.cxx |2 sfx2/source/appl/sfxpicklist.cxx | 35 svx/source/sdr/contact/viewobjectcontactofgraphic.cxx| 21 svx/source/svdraw/svdmrkv.cxx| 51 sw/qa/extras/ooxmlimport/data/tdf87460.docx |binary sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 13 sw/qa/extras/ww8export/data/tdf92281.doc |binary sw/qa/extras/ww8export/ww8export.cxx |8 sw/source/filter/ww8/ww8par6.cxx |2 sw/source/uibase/app/docsh.cxx |6 tools/source/zcodec/zcodec.cxx |6 unotools/source/config/historyoptions.cxx| 17 vcl/source/control/ilstbox.cxx | 10 vcl/unx/gtk/window/gtksalframe.cxx | 12 writerfilter/CppunitTest_writerfilter_misc.mk|1 writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 12 writerfilter/source/dmapper/DomainMapperTableHandler.hxx |4 writerfilter/source/dmapper/DomainMapper_Impl.cxx| 180 writerfilter/source/dmapper/DomainMapper_Impl.hxx|3 writerfilter/source/dmapper/GraphicImport.cxx|8 42 files changed, 1912 insertions(+), 1717 deletions(-) New commits: commit 929f83d5152a38c72ceda7f6f85bf331040b6f19 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Wed Jul 8 00:12:47 2015 +0200 update credits Change-Id: I05b92ee50757165652710b0ed4e3c7d09264dd3b diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index 77d3069..616d1e7 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,24 +1,24 @@ ?xml version=1.0 encoding=UTF-8? office:document xmlns:office=urn:oasis:names:tc:opendocument:xmlns:office:1.0 xmlns:style=urn:oasis:names:tc:opendocument:xmlns:style:1.0 xmlns:text=urn:oasis:names:tc:opendocument:xmlns:text:1.0 xmlns:table=urn:oasis:names:tc:opendocument:xmlns:table:1.0 xmlns:draw=urn:oasis:names:tc:opendocument:xmlns:drawing:1.0 xmlns:fo=urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0 xmlns:xlink=http://www.w3.org/1999/xlink; xmlns:dc=http://purl.org/dc/elements/1.1/; xmlns:meta=urn:oasis:names:tc:opendocument:xmlns:meta:1.0 xmlns:number=urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0 xmlns:svg=urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0 xmlns:chart=urn:oasis:names:tc:opendocument:xmlns:chart:1.0 xmlns:dr3d=urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0 xmlns:math=http://www.w3.org/1998/Math/MathML; xmlns:form=urn:oasis:names:tc:opendocument:xmlns:form:1.0 xmlns:script=urn:oasis:names:tc:opendocument:xmlns:script:1.0 xmlns:config=urn:oas is:names:tc:opendocument:xmlns:config:1.0 xmlns:ooo=http://openoffice.org/2004/office; xmlns:ooow=http://openoffice.org/2004/writer; xmlns:oooc=http://openoffice.org/2004/calc; xmlns:dom=http://www.w3.org/2001/xml-events; xmlns:xforms=http://www.w3.org/2002/xforms; xmlns:xsd=http://www.w3.org/2001/XMLSchema; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xmlns:rpt=http://openoffice.org/2005/report; xmlns:of=urn:oasis:names:tc:opendocument:xmlns:of:1.2 xmlns:xhtml=http://www.w3.org/1999/xhtml; xmlns:grddl=http://www.w3.org/2003/g/data-view#; xmlns:officeooo=http://openoffice.org/2009/office; xmlns:tableooo=http://openoffice.org/2009/table;
[Bug 38885] Remove CreateTextFromNode methods
https://bugs.documentfoundation.org/show_bug.cgi?id=38885 --- Comment #7 from Regina Henschel rb.hensc...@t-online.de --- I think, that it should be a long time goal to switch from StarMath to MathML. But as long as there exists no direct editing of MathML, it is too early to remove generating StarMath source. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf89890.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 23 +++
sw/qa/extras/ooxmlexport/ooxmlexport4.cxx|2 +-
writerfilter/source/dmapper/NumberingManager.cxx | 14 ++
4 files changed, 38 insertions(+), 1 deletion(-)
New commits:
commit e3d78d605905ef23b15002a29f0f3a6de5cc12ac
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Jun 26 09:02:31 2015 +0200
tdf#89890 DOCX import: fix too large num pic bullet
Reading SwWW8ImplReader::CoreLoad()'s update graphic bullet
information block, it turns out that the numbering picture bullet's
height should be independent from the supplied bitmap, and only its
aspect ratio should be respected.
Reviewed-on: https://gerrit.libreoffice.org/16500
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Jenkins c...@libreoffice.org
(cherry picked from commit eab89b7f024a8c86decdcb3362c40c40a7df37df)
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: I1300aa0397a8098df2a3170af795fbba47fd2a9e
Reviewed-on: https://gerrit.libreoffice.org/16844
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/extras/ooxmlexport/data/tdf89890.docx
b/sw/qa/extras/ooxmlexport/data/tdf89890.docx
new file mode 100644
index 000..8b3e8eb
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf89890.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index ac4b246..2e4b8a3 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -638,6 +638,29 @@ DECLARE_OOXMLEXPORT_TEST(testTdf91261, tdf91261.docx)
}
+DECLARE_OOXMLEXPORT_TEST(testTdf89890, tdf89890.docx)
+{
+// Numbering picture bullet was too large.
+uno::Referencebeans::XPropertySet
xPropertySet(getStyles(NumberingStyles)-getByName(WWNum1), uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xLevels(xPropertySet-getPropertyValue(NumberingRules), uno::UNO_QUERY);
+uno::Sequencebeans::PropertyValue aProps;
+xLevels-getByIndex(0) = aProps; // 1st level
+
+bool bFound = false;
+for (int i = 0; i aProps.getLength(); ++i)
+{
+const beans::PropertyValue rProp = aProps[i];
+
+if (rProp.Name == GraphicSize)
+{
+// Height of the graphic was too large: 4382 after import, then
2485 after roundtrip.
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(279),
rProp.Value.getawt::Size().Height);
+bFound = true;
+}
+}
+CPPUNIT_ASSERT(bFound);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index e187959..9a495fd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -353,7 +353,7 @@ DECLARE_OOXMLEXPORT_TEST(testFDO74215, FDO74215.docx)
xmlDocPtr pXmlDoc = parseExport(word/numbering.xml);
if (!pXmlDoc)
return;
-assertXPath(pXmlDoc, /w:numbering/w:numPicBullet[2]/w:pict/v:shape,
style, width:6.4pt;height:6.4pt);
+assertXPath(pXmlDoc, /w:numbering/w:numPicBullet[2]/w:pict/v:shape,
style, width:7.9pt;height:7.9pt);
}
DECLARE_OOXMLEXPORT_TEST(testColumnBreak_ColumnCountIsZero,fdo74153.docx)
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index 2412f8c..17786ea 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -877,6 +877,20 @@ void ListsManager::lcl_sprm( Sprm rSprm )
case NS_ooxml::LN_CT_NumPicBullet_pict:
{
uno::Referencedrawing::XShape xShape =
m_rDMapper.PopPendingShape();
+
+// Respect only the aspect ratio of the picture, not its size.
+awt::Size aPrefSize = xShape-getSize();
+// See SwDefBulletConfig::InitFont(), default height is 14.
+const int nFontHeight = 14;
+// Point - mm100.
+const int nHeight = nFontHeight * 35;
+if (aPrefSize.Height * aPrefSize.Width != 0)
+{
+int nWidth = (nHeight * aPrefSize.Width) /
aPrefSize.Height;
+awt::Size aSize(nWidth, nHeight);
+xShape-setSize(aSize);
+}
+
m_pCurrentNumPicBullet-SetShape(xShape);
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'private/jmux/kde4-vcl-5-0-fix'
New branch 'private/jmux/kde4-vcl-5-0-fix' available with the following commits: commit 875a1eac037f61db6f47efc3c12fd70803616b57 Author: Jan-Marek Glogowski glo...@fbihome.de Date: Wed Jul 8 07:51:57 2015 + KDE4: cleanup IsNativeControlSupported Be (more) correct about the widgets and parts, we actually can draw natively in KDE4. Also add an assert, so drawNativeControl won't be called with values not supported by IsNativeControlSupported. Change-Id: Iac6c78194191a9cd059ace560c285263ce7c1045 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 92392] EDITING + UI: Calc crash when hitting Enter key
https://bugs.documentfoundation.org/show_bug.cgi?id=92392 --- 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=f932f1197e1cabd901231223dc9c7ce9c171120eh=libreoffice-5-0 Related: tdf#92392 clear some more vclptrs on dispose It will be available in 5.0.0.3. 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 84190] libcmis: Wrong Password Entered For Alfresco Never Allows For Correction
https://bugs.documentfoundation.org/show_bug.cgi?id=84190 --- Comment #10 from Julien Nabet serval2...@yahoo.fr --- I was just astonished that the patch was first in 5.0 branch instead of master branch, thank you for your quick feedback Cédric. -- 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
Heiher license statement
All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. -- Best regards! Heiher http://hev.cc ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: basegfx/source chart2/source drawinglayer/source include/basegfx
basegfx/source/polygon/b3dpolygon.cxx| 114 +--
basegfx/source/polygon/b3dpolypolygon.cxx|8
chart2/source/model/template/AreaChartTypeTemplate.cxx |2
chart2/source/model/template/BarChartTypeTemplate.cxx|2
chart2/source/model/template/BubbleChartTypeTemplate.cxx |2
chart2/source/model/template/ChartTypeTemplate.cxx |2
chart2/source/model/template/ChartTypeTemplate.hxx |2
chart2/source/model/template/ColumnLineChartTypeTemplate.cxx |4
chart2/source/model/template/LineChartTypeTemplate.cxx |2
chart2/source/model/template/NetChartTypeTemplate.cxx|2
chart2/source/model/template/PieChartTypeTemplate.cxx|2
chart2/source/model/template/ScatterChartTypeTemplate.cxx|2
chart2/source/model/template/StockChartTypeTemplate.cxx |2
drawinglayer/source/primitive3d/sdrcubeprimitive3d.cxx |2
drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx |2
drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx |2
drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx|8
drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx |8
drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx |2
include/basegfx/polygon/b3dpolygon.hxx |2
include/basegfx/polygon/b3dpolypolygon.hxx |2
21 files changed, 87 insertions(+), 87 deletions(-)
New commits:
commit 93e7870f31065ceda3485cb9390374d240587a78
Author: Tor Lillqvist t...@collabora.com
Date: Wed Jul 8 11:43:35 2015 +0300
s/Coordiante/Coordinate
Change-Id: Iac584b09844b5877586061e9a44b1f7473bffed4
diff --git a/basegfx/source/polygon/b3dpolygon.cxx
b/basegfx/source/polygon/b3dpolygon.cxx
index 3458770..020b6c6 100644
--- a/basegfx/source/polygon/b3dpolygon.cxx
+++ b/basegfx/source/polygon/b3dpolygon.cxx
@@ -753,7 +753,7 @@ class ImplB3DPolygon
// The TextureCoordinates vector. This vectors are created on demand
// and may be zero.
-TextureCoordinate2D*mpTextureCoordiantes;
+TextureCoordinate2D*mpTextureCoordinates;
// The calculated plane normal. mbPlaneNormalValid says if it's valid.
::basegfx::B3DVectormaPlaneNormal;
@@ -781,7 +781,7 @@ public:
: maPoints(0L),
mpBColors(0L),
mpNormals(0L),
-mpTextureCoordiantes(0L),
+mpTextureCoordinates(0L),
maPlaneNormal(::basegfx::B3DVector::getEmptyVector()),
mbIsClosed(false),
mbPlaneNormalValid(true)
@@ -793,7 +793,7 @@ public:
: maPoints(rToBeCopied.maPoints),
mpBColors(0L),
mpNormals(0L),
-mpTextureCoordiantes(0L),
+mpTextureCoordinates(0L),
maPlaneNormal(rToBeCopied.maPlaneNormal),
mbIsClosed(rToBeCopied.mbIsClosed),
mbPlaneNormalValid(rToBeCopied.mbPlaneNormalValid)
@@ -809,9 +809,9 @@ public:
mpNormals = new NormalsArray3D(*rToBeCopied.mpNormals);
}
-if(rToBeCopied.mpTextureCoordiantes
rToBeCopied.mpTextureCoordiantes-isUsed())
+if(rToBeCopied.mpTextureCoordinates
rToBeCopied.mpTextureCoordinates-isUsed())
{
-mpTextureCoordiantes = new
TextureCoordinate2D(*rToBeCopied.mpTextureCoordiantes);
+mpTextureCoordinates = new
TextureCoordinate2D(*rToBeCopied.mpTextureCoordinates);
}
}
@@ -819,7 +819,7 @@ public:
: maPoints(rToBeCopied.maPoints, nIndex, nCount),
mpBColors(0L),
mpNormals(0L),
-mpTextureCoordiantes(0L),
+mpTextureCoordinates(0L),
maPlaneNormal(::basegfx::B3DVector::getEmptyVector()),
mbIsClosed(rToBeCopied.mbIsClosed),
mbPlaneNormalValid(false)
@@ -847,14 +847,14 @@ public:
}
}
-if(rToBeCopied.mpTextureCoordiantes
rToBeCopied.mpTextureCoordiantes-isUsed())
+if(rToBeCopied.mpTextureCoordinates
rToBeCopied.mpTextureCoordinates-isUsed())
{
-mpTextureCoordiantes = new
TextureCoordinate2D(*rToBeCopied.mpTextureCoordiantes, nIndex, nCount);
+mpTextureCoordinates = new
TextureCoordinate2D(*rToBeCopied.mpTextureCoordinates, nIndex, nCount);
-if(!mpTextureCoordiantes-isUsed())
+if(!mpTextureCoordinates-isUsed())
{
-delete mpTextureCoordiantes;
-mpTextureCoordiantes = 0L;
+delete mpTextureCoordinates;
+mpTextureCoordinates = 0L;
}
}
}
@@ -873,10 +873,10 @@ public:
mpNormals = 0L;
}
-if(mpTextureCoordiantes)
+if(mpTextureCoordinates)
{
-delete mpTextureCoordiantes;
-mpTextureCoordiantes = 0L;
+delete mpTextureCoordinates;
+
[Libreoffice-bugs] [Bug 56755] FILESAVE: option to use mathml in xhtml export / html save-as
https://bugs.documentfoundation.org/show_bug.cgi?id=56755 Regina Henschel rb.hensc...@t-online.de changed: What|Removed |Added Status|RESOLVED|CLOSED CC||rb.hensc...@t-online.de -- 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 92582] spellcheck preview not updated
https://bugs.documentfoundation.org/show_bug.cgi?id=92582 Beluga todven...@suomi24.fi changed: What|Removed |Added Whiteboard|bibisectRequest |bibisected -- 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] help.git: Branch 'libreoffice-4-4' - source/text
source/text/shared/guide/startcenter.xhp | 27 +-- 1 file changed, 13 insertions(+), 14 deletions(-) New commits: commit 172c582a5c6f5f93997d99872114f9f1b2c6e415 Author: Andras Timar andras.ti...@collabora.com Date: Tue Jul 7 14:52:38 2015 +0200 tdf#86301 fix hids of startcenter (cherry picked from commit 5aad108719014b52c9aba6be407ed553d0095a66) Conflicts: source/text/shared/guide/startcenter.xhp Change-Id: Ic33ff7519d820d9d770db6a3d2d067a81fb38272 Reviewed-on: https://gerrit.libreoffice.org/16818 Reviewed-by: Adolfo Jayme Barrientos fit...@ubuntu.com Tested-by: Adolfo Jayme Barrientos fit...@ubuntu.com diff --git a/source/text/shared/guide/startcenter.xhp b/source/text/shared/guide/startcenter.xhp index 2544df5..1ff0f96 100644 --- a/source/text/shared/guide/startcenter.xhp +++ b/source/text/shared/guide/startcenter.xhp @@ -31,10 +31,10 @@ bookmark_valuestart center/bookmark_value /bookmark bookmark xml-lang=en-US branch=hid/FWK_HID_BACKINGWINDOW id=bm_id0820200802550234 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/StartCenter id=bm_id0820200802550237 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/help id=bm_id0820200802550235 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/extensions id=bm_id0820200802550236 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/all_recent id=bm_id0820200802550238 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/StartCenter id=bm_id0820200802550237 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/help id=bm_id0820200802550235 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/extensions id=bm_id0820200802550236 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/all_recent id=bm_id0820200802550238 localize=false/ paragraph xml-lang=en-US id=hd_id0820200802524447 role=heading level=1 l10n=NEWvariable id=startcenterlink href=text/shared/guide/startcenter.xhpStart Center/link /variable/paragraph paragraph xml-lang=en-US id=par_id0820200803204063 role=paragraph l10n=NEWWelcome to %PRODUCTNAME. @@ -43,14 +43,13 @@ paragraph xml-lang=en-US id=par_id0820200802524413 role=paragraph l10n=NEWYou see the Start Center when no document is open in %PRODUCTNAME. It is divided into two panes. ahelp hid=.Click an icon on the left pane to open a new document or a file dialog./ahelp /paragraph -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/writer_all id=bm_id1022200910564632 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/calc_all id=bm_id1022200910570124 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/draw_all id=bm_id1022200910571273 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/impress_all id=bm_id102220091057270 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/database_all id=bm_id102220091057437 localize=false/ -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/math_all id=bm_id1022200910575575 localize=false/ -paragraph xml-lang=en-US id=par_id0820200803104810 role=paragraph l10n=NEWahelp hid=.The document icons each open a new document -of the specified type./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/writer_all id=bm_id1022200910564632 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/calc_all id=bm_id1022200910570124 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/draw_all id=bm_id1022200910571273 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/impress_all id=bm_id102220091057270 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/database_all id=bm_id102220091057437 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/math_all id=bm_id1022200910575575 localize=false/ +paragraph xml-lang=en-US id=par_id0820200803104810 role=paragraph l10n=NEWahelp hid=.The document icons each open a new document of the specified type./ahelp/paragraph list type=ordered listitem paragraph xml-lang=en-US id=par_id0820200803104978 role=paragraph l10n=NEW @@ -77,10 +76,10 @@ emphFormula/emph opens %PRODUCTNAME link href=text/smath/main.xhpMath/link/paragraph /listitem /list -bookmark xml-lang=en-US branch=hid/sfx2/ui/startcenter/templates_all id=bm_id1022200910584084 localize=false/ +bookmark xml-lang=en-US branch=hid/sfx/ui/startcenter/templates_all id=bm_id1022200910584084 localize=false/ paragraph xml-lang=en-US id=par_id1022200911011855 role=paragraph l10n=NEWahelp hid=. visibility=hiddenThe Templates icon opens the Templates and Documents dialog./ahelp/paragraph paragraph xml-lang=en-US id=par_id0820200803105045 role=paragraph l10n=NEWThe emphTemplates/emph icon opens the link
[Libreoffice-bugs] [Bug 84190] libcmis: Wrong Password Entered For Alfresco Never Allows For Correction
https://bugs.documentfoundation.org/show_bug.cgi?id=84190 --- Comment #9 from Cédric Bosdonnat cedric.bosdonnat@free.fr --- (In reply to Julien Nabet from comment #8) Cédric: I don't find Szymon Kłos in Bugzilla, do you know what's planned for master branch? His patch is sitting in his gsoc branch that will be merged in master before the end of summer: so master is targetted too -- 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' - include/sfx2 sfx2/source
include/sfx2/childwin.hxx |2 ++
sfx2/source/appl/childwin.cxx | 17 +++--
2 files changed, 13 insertions(+), 6 deletions(-)
New commits:
commit a26723f028a9795104e12b5f98cddb53471b44d2
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jul 7 13:47:14 2015 +0100
Related: tdf#92392 clear workwins that point to pWindow
before trying to destroy pWindow
Change-Id: I7257096e8da2a5d6753ad2091287d63ea9ae244b
(cherry picked from commit 3c6eec0d99a2bb84bd6719ad498d5de54dc959fe)
Reviewed-on: https://gerrit.libreoffice.org/16832
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index eb43f8e..7214005 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -163,6 +163,8 @@ private:
GetContext() const
{ return pContext; }
+SAL_DLLPRIVATE void ClearWorkwin();
+
protected:
SfxChildWindow(vcl::Window *pParentWindow, sal_uInt16
nId);
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 0b41d43..35e53d6 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -177,12 +177,7 @@ void SfxChildWindow::Destroy()
{
if ( GetFrame().is() )
{
-if (pImp-pWorkWin)
-{
-if (pImp-pWorkWin-GetActiveChild_Impl() == pWindow)
-pImp-pWorkWin-SetActiveChild_Impl(NULL);
-pImp-pWorkWin = NULL;
-}
+ClearWorkwin();
try
{
::com::sun::star::uno::Reference
::com::sun::star::util::XCloseable xClose( GetFrame(),
::com::sun::star::uno::UNO_QUERY );
@@ -199,11 +194,21 @@ void SfxChildWindow::Destroy()
delete this;
}
+void SfxChildWindow::ClearWorkwin()
+{
+if (pImp-pWorkWin)
+{
+if (pImp-pWorkWin-GetActiveChild_Impl() == pWindow)
+pImp-pWorkWin-SetActiveChild_Impl(NULL);
+pImp-pWorkWin = NULL;
+}
+}
SfxChildWindow::~SfxChildWindow()
{
delete pContext;
pContext = NULL;
+ClearWorkwin();
pWindow.disposeAndClear();
delete pImp;
pImp = NULL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 92616] New: PIVOTTABLE: Grouped Column Fields problems including with drill to details
https://bugs.documentfoundation.org/show_bug.cgi?id=92616 Bug ID: 92616 Summary: PIVOTTABLE: Grouped Column Fields problems including with drill to details Product: LibreOffice Version: 4.3.5.2 release Hardware: Other OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Calc Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: a...@patternjugglers.co.nz Created attachment 117118 -- https://bugs.documentfoundation.org/attachment.cgi?id=117118action=edit Sample workbook with data and multiple demonstroatin pivottables Sorry, but there may be multiple issues rolled into this. -I'm also aware that Pivottables are typically for brave souls only. This arose in assisting a user with an existing Pivottable, but I have replicated with a simpler example. Original issues were on 4.3.5.2, detailed testing done on 4.4.3.2 (both windows). The attached example sets out to create grouped columns of 'category', and then drill to details within these. Step 1: Basic table with 'Category' in Columns, 'Type' in Rows, and Value in data. Issue 1: Enable Drill to Details hidden and unchecked by default. IME Drill to details is fairly standard expected behaviour - is there a performance advantage to disabling it? Once 'Enable Drill to Details' is checked, drilling works as expected prior to any grouping being attempted. Step 2: Attempt to Group the columns so that a1,a2,a3 are together, b1,b2,b3 are together. -Select column headings a1,a2,a3 and then DataGroup and OutlineGroup Issue 2: Grouping does not work AT ALL if the 'Category' field is beneath the 'Data' field in the 'Edit Layout' dialog (which is the only place you can place it. To remedy this you need to either demote or delete the 'Data' field. The sheet 'Pivot Table_Data_1' has been left in the ungroupable state. The sheet 'Pivot Table_Data_2' has been fixed by removing the 'Data' field Step 3: Drill to details -Double-click on values in sheet sheet 'Pivot Table_Data_2' to show rows of original data in new sheet Issue 3: Cannot drill into values in a non-grouped column. In the example sheet 'Pivot Table_Data_2' categories a1/a2/a3 and b1/b2/b2 are each grouped and category c1 is not grouped. No groups are collapsed. Double-clicking on Cell B4 will not drill. Cell C4 will drill. The sheet 'Pivot Table_Data_3' is a direct copy of sheet 'Pivot Table_Data_2', except with category c1 grouped (into a group of 1). Issue 4: Attempt to rename Group causes Group to vanish. The sheet 'Pivot Table_Data_4' is a direct copy of The sheet 'Pivot Table_Data_3'. I edited Cell B2 which contained the header for Group1, to attempt to rename it 'Group of A'. At this stage the entire group of records disappears. -- 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 84190] libcmis: Wrong Password Entered For Alfresco Never Allows For Correction
https://bugs.documentfoundation.org/show_bug.cgi?id=84190 Cédric Bosdonnat cedric.bosdonnat@free.fr changed: What|Removed |Added CC||eszka...@gmail.com --- Comment #11 from Cédric Bosdonnat cedric.bosdonnat@free.fr --- Adding Szymon as CC -- 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-ux-advise] [Bug 90452] Breeze icons poorly visible in Start Center
https://bugs.documentfoundation.org/show_bug.cgi?id=90452 --- Comment #69 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Adolfo Jayme Barrientos committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=9bb825704b7592cfc66267303cb019e38dcb3c2d tdf#90452 StartCenter: Replace old, clunky, non-transparent LO logo… 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 on the CC list for the bug. ___ Libreoffice-ux-advise mailing list Libreoffice-ux-advise@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise
[Libreoffice-bugs] [Bug 90452] Breeze icons poorly visible in Start Center
https://bugs.documentfoundation.org/show_bug.cgi?id=90452 --- Comment #69 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Adolfo Jayme Barrientos committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=9bb825704b7592cfc66267303cb019e38dcb3c2d tdf#90452 StartCenter: Replace old, clunky, non-transparent LO logo… 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-commits] core.git: icon-themes/galaxy
icon-themes/galaxy/sfx2/res/logo.png |binary 1 file changed New commits: commit 9bb825704b7592cfc66267303cb019e38dcb3c2d Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Wed Jul 8 05:12:02 2015 -0500 tdf#90452 StartCenter: Replace old, clunky, non-transparent LO logo⦠⦠with something more elegant and sophisticated. Change-Id: Ie9cba3a0bc576c42279e7a46e24576b44a2e049a diff --git a/icon-themes/galaxy/sfx2/res/logo.png b/icon-themes/galaxy/sfx2/res/logo.png index d5f2c25..0678afb 100644 Binary files a/icon-themes/galaxy/sfx2/res/logo.png and b/icon-themes/galaxy/sfx2/res/logo.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/app/sdmod2.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 737e392537d909f7915fb071230cc59ee1ff51e6
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jul 8 11:02:08 2015 +0100
fix crash on loading presentation with page name field
regression from
commit 42b521f800a08b11432cf906ce1bdf9fcbfffdeb
Date: Wed Apr 22 23:31:43 2015 +0200
tdf#88056: Implement ODF import/export of page title field
Change-Id: I577a7c52836bbb13cc93910b4458aee5482ffc86
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 35ff9ce..a69beb8 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -270,7 +270,8 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*,
pInfo)
}
else
{
-aRepresentation = ( ( pDoc-GetDocumentType() ==
DOCUMENT_TYPE_IMPRESS )
+DocumentType eDocType = pDoc ? pDoc-GetDocumentType() :
DOCUMENT_TYPE_IMPRESS;
+aRepresentation = ( ( eDocType == DOCUMENT_TYPE_IMPRESS )
?
SdResId(STR_FIELD_PLACEHOLDER_SLIDENAME).toString()
:
SdResId(STR_FIELD_PLACEHOLDER_PAGENAME).toString() );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 81759] Mac OS X dictation (aka Siri) does not work with Libreoffice 4.3.0.3 or newer (did work in 4.2) [Bisected: 179334dd4, see Comment#32]
https://bugs.documentfoundation.org/show_bug.cgi?id=81759 --- Comment #39 from steve -_- st...@openmailbox.org --- Nope. Still broken. Version: 5.1.0.0.alpha1+ Build ID: 799cc41b53a59c543408fa5370e107c2c57a2904 TinderBox: MacOSX-x86_64@49-TDF, Branch:master, Time: 2015-07-08_05:50:48 Locale: de-DE (de.UTF-8) OSX 10.10.4 Just hearing the low ping to indicate dictation did not start. When doing the same in MS Word, hearing the high ping and dication starts and works as expected. -- 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 91808] UI glitches in various dialogs (checkboxes and radiobuttons) (KDE-specific)
https://bugs.documentfoundation.org/show_bug.cgi?id=91808 Katarina Behrens (CIB) katarina.behr...@cib.de changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE --- Comment #9 from Katarina Behrens (CIB) katarina.behr...@cib.de --- Marking this guy as duplicate, as underlying cause of both issues is the same *** This bug has been marked as a duplicate of bug 92110 *** -- 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 92110] UI Button with keyboard focus has invisible label (KDE-specific)
https://bugs.documentfoundation.org/show_bug.cgi?id=92110 --- Comment #9 from Katarina Behrens (CIB) katarina.behr...@cib.de --- *** Bug 91808 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 92562] Polish localization of Add to dictionary which is Dodaj do słownika has an unnecessary underline sign
https://bugs.documentfoundation.org/show_bug.cgi?id=92562 --- Comment #4 from sophie gautier.sop...@gmail.com --- (In reply to tommy27 from comment #3) Ok, it seems there's an unwanted space in the middle of the word Dodaj which looks Dod aj with an underline between Dod and aj @Sophie do you know who's in charge for the polish localization? I'll ping him on the l10n list - Sophie -- 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 92062] Crash When Click a 'New Theme...'/Gallery at Sidebar
https://bugs.documentfoundation.org/show_bug.cgi?id=92062 --- Comment #6 from Beluga todven...@suomi24.fi --- Ok, Sophie clued me into this: http://downloadarchive.documentfoundation.org/libreoffice/old/4.4.0.0.beta2/deb/x86_64/LibreOfficeDev_4.4.0.0.beta2_Linux_x86-64_deb_langpack_qtz.tar.gz I managed to reproduce the crash, clicking New theme and canceling. Yet, the Writer interface with KeyID went totally bonkers, changing vertical size constantly, up and down like a madman. The craziness does not manifest yet in the start center. Here's how I did it, following https://wiki.documentfoundation.org/Installing_in_parallel/Linux Untarred the pack with tar -vxzf Created a folder install inside DEBS Then inside it: for i in ../*.deb; do dpkg-deb -x $i . ; done Then went inside install/opt/libreofficedev4.4 Then did: sudo cp -R * /usr/lib/libreoffice Ubuntu 15.04 64-bit Version: 4.4.4.3 Build ID: 40m0(Build:3) Locale: en_US.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 91362] wrong defaults for format/orientation in printsettingsdialogs of printerdrivers
https://bugs.documentfoundation.org/show_bug.cgi?id=91362 --- Comment #11 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Katarina Behrens committed a patch related to this issue. It has been pushed to libreoffice-5-0: http://cgit.freedesktop.org/libreoffice/core/commit/?id=6779b46796c93cbb4293a400f57c29e8ae85811bh=libreoffice-5-0 Related tdf#91362: disable paper size orientation selection It will be available in 5.0.0.3. 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: 4 commits - registry/inc reportbuilder/java sal/osl sal/qa sc/qa scripting/source sc/source sdext/README sdext/source sd/source sfx2/source shell/source slideshow/qa so
registry/inc/regapi.hxx |2 - reportbuilder/java/org/libreoffice/report/pentaho/output/text/MasterPageFactory.java |2 - sal/osl/unx/file_misc.cxx |2 - sal/osl/w32/file_dirvol.cxx |2 - sal/qa/OStringBuffer/rtl_OStringBuffer.cxx |4 +- sc/qa/unit/filters-test.cxx |4 +- sc/qa/unit/ucalc_pivottable.cxx |2 - sc/source/filter/inc/xestyle.hxx |2 - sc/source/ui/Accessibility/AccessiblePageHeader.cxx |2 - sc/source/ui/inc/inputhdl.hxx |2 - sc/source/ui/vba/vbaborders.cxx |2 - sc/source/ui/vba/vbarange.cxx |2 - sc/source/ui/view/cellsh1.cxx |2 - scripting/source/provider/MasterScriptProvider.cxx |2 - sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx |2 - sdext/README |2 - sdext/source/presenter/PresenterAccessibility.cxx |2 - sfx2/source/dialog/splitwin.cxx |4 +- sfx2/source/view/frame.cxx |2 - shell/source/tools/lngconvex/lngconvex.cxx |2 - slideshow/qa/tools/mkeffects.pl |2 - slideshow/qa/tools/mktransitions.pl |2 - solenv/gbuild/platform/filter-showIncludes.awk |2 - sot/source/sdstor/stgelem.hxx |2 - stoc/source/javavm/javavm.cxx |4 +- svtools/source/config/printoptions.cxx |2 - svtools/source/control/ctrltool.cxx |2 - svtools/source/misc/langtab.cxx |2 - svtools/source/table/tablecontrol.cxx |2 - svx/source/dialog/charmap.cxx |4 +- svx/source/engine3d/view3d.cxx |2 - svx/source/form/filtnav.cxx |2 - svx/source/sdr/contact/viewcontactofpageobj.cxx |2 - svx/source/sdr/contact/viewcontactofsdrpathobj.cxx |2 - svx/source/xml/xmlgrhlp.cxx |2 - sw/inc/doc.hxx |2 - sw/source/core/crsr/findtxt.cxx |2 - sw/source/core/doc/DocumentChartDataProviderManager.cxx |2 - sw/source/core/doc/DocumentContentOperationsManager.cxx | 20 +- sw/source/core/text/inftxt.hxx |2 - sw/source/core/text/itrpaint.cxx |2 - sw/source/core/text/portxt.cxx |2 - sw/source/core/unocore/unostyle.cxx |4 +- sw/source/core/view/viewsh.cxx |2 - sw/source/filter/ww8/docxattributeoutput.cxx |2 - sw/source/filter/ww8/wrtw8nds.cxx |6 +-- sw/source/filter/xml/swxml.cxx |2 - sw/source/ui/vba/vbaborders.cxx |2 - ucb/source/cacher/dynamicresultsetwrapper.cxx |2 - ucb/source/sorter/sortdynres.cxx |2 - ucb/source/ucp/cmis/cmis_content.cxx |2 - unoxml/source/dom/document.cxx
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - include/svx svx/source
include/svx/svdedxv.hxx |9 +
svx/source/svdraw/svdedxv.cxx | 64 +++---
2 files changed, 57 insertions(+), 16 deletions(-)
New commits:
commit e76ca3b674ebd74bdd1ad81dc9ab942c7151f0e1
Author: matteocam matteo.campane...@gmail.com
Date: Wed Jul 8 09:00:20 2015 -0400
Move to the other box after OF.
Change-Id: I5184cfb09bb796821fa12a07f085bf790d46b792
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index 010032e..0f9de4d 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -35,6 +35,9 @@ class ImpSdrEditPara;
struct PasteOrDropInfos;
class SdrUndoManager;
+enum class CursorChainingEvent;
+class ESelection;
+
namespace com { namespace sun { namespace star { namespace uno {
class Any;
} } } }
@@ -94,6 +97,10 @@ private:
SVX_DLLPRIVATE void ImpClearVars();
+// FIXME(matteocam)
+CursorChainingEvent *maCursorEvent;
+ESelection *maPreChainingSel;
+
protected:
// central method to get an SdrUndoManager for enhanced TextEdit. Default
will
// try to return a dynamic_casted GetModel()-GetSdrUndoManager().
Applications
@@ -103,6 +110,8 @@ protected:
OutlinerView* ImpFindOutlinerView(vcl::Window* pWin) const;
+void ImpMoveCursorAfterChainingEvent();
+
// Create a new OutlinerView at the heap and initialize all required
parameters.
// pTextEditObj, pTextEditPV and pTextEditOutliner have to be initialized
OutlinerView* ImpMakeOutlinerView(vcl::Window* pWin, bool bNoPaint,
OutlinerView* pGivenView) const;
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index febb1c5..c09dfb1 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -500,7 +500,7 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
pTextChain-SetNilChainingEvent(pTextObj, true);
// Save previous selection pos
-ESelection aPreChainingSel(pOLV-GetSelection());
+maPreChainingSel = new ESelection(pOLV-GetSelection());
// trigger actual chaining
pTextObj-onChainingEvent();
@@ -508,22 +508,9 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
// XXX: this logic could be put in a separate approppriate class
/* Cursor motion stuff */
-CursorChainingEvent aCursorEvent =
pTextChain-GetCursorEvent(pTextObj);
-SdrTextObj *pNextLink = pTextObj-GetNextLinkInChain();
+maCursorEvent = new
CursorChainingEvent(pTextChain-GetCursorEvent(pTextObj));
+//SdrTextObj *pNextLink = pTextObj-GetNextLinkInChain();
-switch (aCursorEvent) {
-
-case CursorChainingEvent::UNCHANGED:
-pOLV-SetSelection(aPreChainingSel);
-break;
-case CursorChainingEvent::TO_NEXT_LINK:
-//SdrEndTextEdit(true);
-//SdrBeginTextEdit(pNextLink, nullptr, nullptr, false,
nullptr, nullptr, true, true);
-break;
-case CursorChainingEvent::TO_PREV_LINK:
-// XXX: To be handled
-break;
-}
// Find last Para
/*
@@ -545,6 +532,47 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
return 0;
}
+
+void SdrObjEditView::ImpMoveCursorAfterChainingEvent()
+{
+if (!mxTextEditObj.is())
+return;
+
+SdrTextObj* pTextObj = dynamic_castSdrTextObj*(mxTextEditObj.get());
+
+if (!pTextObj-IsChainable() || !pTextObj-GetNextLinkInChain())
+return;
+
+assert(maCursorEvent);
+assert(maPreChainingSel);
+
+SdrTextObj *pNextLink = pTextObj-GetNextLinkInChain();
+OutlinerView* pOLV = GetTextEditOutlinerView();
+
+switch (*maCursorEvent) {
+
+case CursorChainingEvent::UNCHANGED:
+pOLV-SetSelection(*maPreChainingSel);
+break;
+case CursorChainingEvent::TO_NEXT_LINK:
+SdrEndTextEdit();
+SdrBeginTextEdit(pNextLink);
+
+//SdrEndTextEdit(true);
+//SdrBeginTextEdit(pNextLink, nullptr, nullptr, false,
nullptr, nullptr, true, true);
+break;
+case CursorChainingEvent::TO_PREV_LINK:
+// XXX: To be handled
+break;
+}
+
+// Default case
+// XXX: You should delete the old ones here too.
+maCursorEvent = NULL;
+maPreChainingSel = NULL;
+
+}
+
IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI)
{
bool bOk=false;
@@ -1274,6 +1302,10 @@ bool SdrObjEditView::KeyInput(const KeyEvent rKEvt,
vcl::Window* pWin)
if (pItemBrowser!=nullptr) pItemBrowser-SetDirty();
#endif
ImpMakeTextCursorAreaVisible();
+
+// FIXME(matteocam)
+ImpMoveCursorAfterChainingEvent();
+
return true;
[Libreoffice-bugs] [Bug 92614] Gradients Are Displayed Poorly For Native File Format, but look fine after saving in ppt format
https://bugs.documentfoundation.org/show_bug.cgi?id=92614 --- Comment #3 from nk...@mrpk.org --- Created attachment 117126 -- https://bugs.documentfoundation.org/attachment.cgi?id=117126action=edit odp version -- 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 92614] Gradients Are Displayed Poorly For Native File Format, but look fine after saving in ppt format
https://bugs.documentfoundation.org/show_bug.cgi?id=92614 --- Comment #2 from nk...@mrpk.org --- Created attachment 117125 -- https://bugs.documentfoundation.org/attachment.cgi?id=117125action=edit ppt version -- 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 92243] Menu highlighting incorrect with libreoffice-gtk
https://bugs.documentfoundation.org/show_bug.cgi?id=92243 --- Comment #2 from Simon Long si...@raspberrypi.org --- Now submitted to gerrit as https://gerrit.libreoffice.org/#/c/16856/ -- 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' - sd/source
sd/source/ui/framework/factories/FullScreenPane.cxx |7 +++
sd/source/ui/presenter/PresenterHelper.cxx |6 +++---
2 files changed, 6 insertions(+), 7 deletions(-)
New commits:
commit 7079f691a31ca380610b3c77a2faa0bcf0b3
Author: Michael Meeks michael.me...@collabora.com
Date: Tue Jul 7 22:35:46 2015 +0100
tdf#91574 - fix slideshow presenter console lifecycle.
Change-Id: I9748579fed8fd4dcf505bc79e48e40c1255bd22e
Reviewed-on: https://gerrit.libreoffice.org/16836
Reviewed-by: David Ostrovsky da...@ostrovsky.org
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com
diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx
b/sd/source/ui/framework/factories/FullScreenPane.cxx
index 746be66..b1540bc 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.cxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.cxx
@@ -42,8 +42,7 @@ FullScreenPane::FullScreenPane (
const ReferenceXResourceId rxPaneId,
const vcl::Window* pViewShellWindow)
: FrameWindowPane(rxPaneId,NULL),
- mxComponentContext(rxComponentContext),
- mpWorkWindow(NULL)
+ mxComponentContext(rxComponentContext)
{
vcl::Window* pParent = NULL;
mpWorkWindow.reset(VclPtrWorkWindow::Create(
@@ -110,7 +109,7 @@ void SAL_CALL FullScreenPane::disposing()
{
Link aWindowEventHandler (LINK(this, FullScreenPane,
WindowEventHandler));
mpWorkWindow-RemoveEventListener(aWindowEventHandler);
-mpWorkWindow.reset();
+mpWorkWindow.disposeAndClear();
}
FrameWindowPane::disposing();
@@ -186,7 +185,7 @@ IMPL_LINK(FullScreenPane, WindowEventHandler,
VclWindowEvent*, pEvent)
break;
case VCLEVENT_OBJECT_DYING:
-mpWorkWindow.reset();
+mpWorkWindow.disposeAndClear();
break;
}
return 1;
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx
b/sd/source/ui/presenter/PresenterHelper.cxx
index 60b7bcb..8b99c0b 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -73,10 +73,10 @@ Referenceawt::XWindow SAL_CALL
PresenterHelper::createWindow (
sal_Bool bEnableParentClip)
throw (css::uno::RuntimeException, std::exception)
{
-vcl::Window* pParentWindow = VCLUnoHelper::GetWindow(rxParentWindow);
+VclPtrvcl::Window pParentWindow(VCLUnoHelper::GetWindow(rxParentWindow));
// Create a new window.
-vcl::Window* pWindow = NULL;
+VclPtrvcl::Window pWindow;
if (bCreateSystemChildWindow)
{
pWindow = VclPtrWorkWindow::Create(pParentWindow,
WB_SYSTEMCHILDWINDOW);
@@ -91,7 +91,7 @@ Referenceawt::XWindow SAL_CALL
PresenterHelper::createWindow (
{
// Make the frame window transparent and make the parent able to
// draw behind it.
-if (pParentWindow != NULL)
+if (pParentWindow.get() != NULL)
pParentWindow-EnableChildTransparentMode(true);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sdext/README
sdext/README |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3e8cb7da52e84b03b309b68708889fc42789b722 Author: Takeshi Abe t...@fixedpoint.jp Date: Wed Jul 8 21:51:05 2015 +0900 Fix typo Change-Id: Iec20cfa243e336d36e12e13d36564eacc9db1435 diff --git a/sdext/README b/sdext/README index ed9aa33..b43d62b 100644 --- a/sdext/README +++ b/sdext/README @@ -5,7 +5,7 @@ source/pdfimport/ - PDF import Uses an external poppler process to parse and handle PDF import as draw shapes. -source/minimizer/ - Presentation Minizer +source/minimizer/ - Presentation Minimizer Shrinks presentations by down-scaling images, and removing extraneous eg. embedded OLE content. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: HelpAuthoring.oxt: An easy way to edit help files
Hi Regina, Regina Henschel píše v So 04. 07. 2015 v 17:13 +0200: Olivier recently resurrected the HelpAuthoring.oxt extension that makes it much easier to edit help files, and I've pushed that to git now: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/helpauthoring I do not share your euphoria. If you do not already know, how the help is organized, it will not make it much easier. And for correcting single words and typos, it is not necessary. But I agree, if you know, how the help is organized, it helps you inserting all the tags and attributes. Yes - let's see how it becomes used. The good thing about having it in the git now is that we can fix whatever needs fixing there :-) Having said that, the filter to load / save .xhp is implemented in xslt; which is a nightmare; I hope we'll convert it to Python at some stage to be able to fix stuff there much more effectively - but let's see. Removing some old stuff, like the history-element or the l10n and oldref attributes is nice too. I don't want to announce it too widely yet, tough; it has a bug that from some reason, the new edits appear in bold when saved (they appear enclosed in emph / /emph). Unfortunately no solution for that problem. I first thought inserting would create a span element, but saving as odt has no such element. But another error: The tool removes the indexer-attribute from the topic element. The value is sometimes intentionally set to exclude, for to make the file invisible to the full text search. That is necessary, because some files have only content, that is to be embedded in other files. Such files are very confusing to users and should be hidden. When you select exclude when you use Edit Meta Data, this attribute is not set. Nasty :-( Further problems: The template has unsuitable fonts, for example a Droid Sans. The page margins of the template are far to large. In help viewer the margins will be about 5mm left and right and 10mm top. Perhaps open the file in Web-view? The browse-button for file name search in Embed Section does not recognize the path, that has been set in Set Document Root and therefore inserts an absolute path. The dialog for selecting a section to be embedded does not use unicode in the selection window and therefore the preview is wrong. Feature request: Provide a preview of the help, as it would be shown in the help viewer, I mean without the yellow fields. Thank you for collecting the list - worth looking at that! All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 91574] SLIDESHOW: presenter console not shown and focus remains on the secondary monitor
https://bugs.documentfoundation.org/show_bug.cgi?id=91574 --- Comment #51 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=7079f691a31ca380610b3c77a2faa0bcf0b3h=libreoffice-5-0 tdf#91574 - fix slideshow presenter console lifecycle. It will be available in 5.0.0.3. 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 92619] WRITER Styles : List and Numbering paragraph styles do not have a numbering/bullet style associated by default
https://bugs.documentfoundation.org/show_bug.cgi?id=92619 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||c...@nouenoff.nl, ||gautier.sop...@gmail.com, ||rb.hensc...@t-online.de Version|4.4.4.3 release |Inherited From OOo Summary|WRITER Styles : (Paragraph |WRITER Styles : List and |styles List vs|Numbering paragraph styles |Numbered) vs Bullet |do not have a |Style |numbering/bullet style ||associated by default Ever confirmed|0 |1 --- Comment #1 from Cor Nouws c...@nouenoff.nl --- Hi Philippe, Thanks for reporting. I see no problem with this. But to be safe, asking Regina and Sophie too. Mind that it's then needed for all List 1 variations, i.e. List 1, List 1 Start, List 1 Cont., List 1 End. etc. Ciao - Cor -- 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 92614] Gradients Are Displayed Poorly For Native File Format, but look fine after saving in ppt format
https://bugs.documentfoundation.org/show_bug.cgi?id=92614 nk...@mrpk.org changed: What|Removed |Added Status|NEEDINFO|UNCONFIRMED Ever confirmed|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-bugs] [Bug 92624] Master x86 crashes on open under Windows XP x86
https://bugs.documentfoundation.org/show_bug.cgi?id=92624 --- Comment #1 from Pedro pedl...@gmail.com --- Created attachment 117128 -- https://bugs.documentfoundation.org/attachment.cgi?id=117128action=edit Screenshot of error message -- 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 92614] Gradients Are Displayed Poorly For Native File Format, but look fine after saving in ppt format
https://bugs.documentfoundation.org/show_bug.cgi?id=92614 --- Comment #5 from nk...@mrpk.org --- I added the files you requested and the pdf too. -- 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 92614] Gradients Are Displayed Poorly For Native File Format, but look fine after saving in ppt format
https://bugs.documentfoundation.org/show_bug.cgi?id=92614 --- Comment #4 from nk...@mrpk.org --- Created attachment 117127 -- https://bugs.documentfoundation.org/attachment.cgi?id=117127action=edit pdf version -- 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 'private/jmux/kde4-vcl-5-0-fix' - 122 commits - accessibility/inc basegfx/qa basegfx/source basic/source bean/com canvas/source chart2/source compilerplugins/cla
Rebased ref, commits from common ancestor:
commit dfe72b7c885e1e4db7cf90e05c8605716401ffd2
Author: Jan-Marek Glogowski glo...@fbihome.de
Date: Wed Jul 8 13:41:54 2015 +
tdf#92115 KDE4 workaround combo boxes
Actually most combo boxes seem to be list boxes.
Once I understand the correct subControl drawing, the button will be
replaced. So this uses LO drop down drawing...
Change-Id: I76c0c62b35158b20f5aabed1d97907063a99ccc7
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index a843269..cc320ae 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -100,7 +100,6 @@ bool KDESalGraphics::IsNativeControlSupported( ControlType
type, ControlPart par
case CTRL_EDITBOX:
case CTRL_COMBOBOX:
case CTRL_TOOLBAR:
-case CTRL_LISTBOX:
case CTRL_FRAME:
case CTRL_SCROLLBAR:
case CTRL_WINDOW_BACKGROUND:
@@ -108,6 +107,10 @@ bool KDESalGraphics::IsNativeControlSupported( ControlType
type, ControlPart par
case CTRL_FIXEDLINE:
return true;
+case CTRL_LISTBOX:
+return (part == PART_ENTIRE_CONTROL
+ || part == PART_SUB_EDIT);
+
case CTRL_SPINBOX:
return (part == PART_ENTIRE_CONTROL || part ==
HAS_BACKGROUND_TEXTURE);
@@ -643,6 +646,12 @@ bool KDESalGraphics::getNativeControlRegion( ControlType
type, ControlPart part,
const OUString,
Rectangle nativeBoundingRegion,
Rectangle nativeContentRegion )
{
+bool nativeSupport = IsNativeControlSupported( type, part );
+if( ! nativeSupport ) {
+assert( ! nativeSupport drawNativeControl called without native
support! );
+return false;
+}
+
bool retVal = false;
QRect boundingRect = region2QRect( controlRegion );
@@ -724,8 +733,6 @@ bool KDESalGraphics::getNativeControlRegion( ControlType
type, ControlPart part,
{
case PART_ENTIRE_CONTROL:
{
-int size =
QApplication::style()-pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2;
-
// find out the minimum size that should be used
// assume contents is a text ling
int nHeight = QApplication::fontMetrics().height();
@@ -738,8 +745,10 @@ bool KDESalGraphics::getNativeControlRegion( ControlType
type, ControlPart part,
// FIXME: why this difference between comboboxes and
listboxes ?
// because a combobox has a sub edit and that is positioned
// inside the outer bordered control ?
-if( type == CTRL_COMBOBOX )
+if( type == CTRL_COMBOBOX ) {
+int size =
QApplication::style()-pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2;
contentRect.adjust(-size,-size,size,size);
+}
retVal = true;
break;
}
commit 7b3bb98517fdf626b31765fb7c925e63a6687327
Author: Jan-Marek Glogowski glo...@fbihome.de
Date: Wed Jul 8 07:51:57 2015 +
KDE4: cleanup IsNativeControlSupported
Be (more) correct about the widgets and parts, we actually can draw
natively in KDE4.
Also add an assert, so drawNativeControl won't be called with values
not supported by IsNativeControlSupported.
Fixes tdf#92110
Fixes tdf#91808
Change-Id: Iac6c78194191a9cd059ace560c285263ce7c1045
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 1fa06fd..a843269 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -85,47 +85,38 @@ KDESalGraphics::~KDESalGraphics()
bool KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart
part )
{
-if (type == CTRL_PUSHBUTTON) return true;
-
-if (type == CTRL_MENUBAR) return true;
-
-if (type == CTRL_MENU_POPUP) return true;
-
-if (type == CTRL_EDITBOX) return true;
-
-if (type == CTRL_COMBOBOX) return true;
-
-if (type == CTRL_TOOLBAR) return true;
-
-if (type == CTRL_CHECKBOX) return true;
-
-if (type == CTRL_LISTBOX) return true;
-
-if (type == CTRL_LISTNODE) return true;
-
-if (type == CTRL_FRAME) return true;
-
-if (type == CTRL_SCROLLBAR) return true;
-
-if (type == CTRL_WINDOW_BACKGROUND) return true;
-
-if (type == CTRL_SPINBOX (part == PART_ENTIRE_CONTROL || part ==
HAS_BACKGROUND_TEXTURE) ) return true;
-
-// no spinbuttons for KDE, paint spinbox complete
-//if (type == CTRL_SPINBUTTONS) return true;
-
-if (type == CTRL_GROUPBOX) return true;
-
-if (type == CTRL_FIXEDLINE) return true;
+switch (type)
+{
+case CTRL_PUSHBUTTON:
+case CTRL_RADIOBUTTON:
+case CTRL_CHECKBOX:
+case
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source
sw/source/ui/dbui/mailmergewizard.cxx |1
sw/source/uibase/dbui/mmconfigitem.cxx | 70 +++--
sw/source/uibase/inc/mmconfigitem.hxx |6 +-
3 files changed, 30 insertions(+), 47 deletions(-)
New commits:
commit d623e7e6cba3090dcb5d21174cd5ed42bb069163
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Sat Jul 4 23:22:53 2015 +0200
tdf#90377: fix exclude recipient in mail merge
- first, actually use the selection in MergeNew()
- secoond, bring back GetSelection() for that
- third, throw away lots of the old (dead) code that mostly just
stumbled over itself
- e.g. ExcludeRecord() wouldnt work on the last element due to a
off-by-one error
Change-Id: I07d07e086b748b393f2ada7cb22fdb2ce285ad65
Reviewed-on: https://gerrit.libreoffice.org/16762
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Reviewed-on: https://gerrit.libreoffice.org/16853
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx
b/sw/source/ui/dbui/mailmergewizard.cxx
index ced4c6e..4889be0 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -276,6 +276,7 @@ void SwMailMergeWizard::CreateTargetDocument()
aDescriptor[ svx::daCursor ] = m_rConfigItem.GetResultSet();
aDescriptor[ svx::daCommand ] =
m_rConfigItem.GetCurrentDBData().sCommand;
aDescriptor[ svx::daCommandType ] =
m_rConfigItem.GetCurrentDBData().nCommandType;
+aDescriptor[ svx::daSelection ] = m_rConfigItem.GetSelection();
SwMergeDescriptor aMergeDesc( DBMGR_MERGE_SHELL,
GetSwView()-GetWrtShell(),
aDescriptor);
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx
b/sw/source/uibase/dbui/mmconfigitem.cxx
index 341fcd8..2a36db3 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -17,7 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#include mmconfigitem.hxx
+#include vector
#include swtypes.hxx
#include osl/diagnose.h
#include com/sun/star/uno/Any.hxx
@@ -34,6 +36,7 @@
#include comphelper/processfactory.hxx
#include comphelper/types.hxx
#include com/sun/star/sdb/CommandType.hpp
+#include comphelper/sequence.hxx
#include rtl/instance.hxx
#include unotools/configitem.hxx
#include mailmergehelper.hxx
@@ -1020,57 +1023,34 @@ sal_Int32 SwMailMergeConfigItem::GetResultSetPosition()
const
return m_pImpl-nResultSetCursorPos;
}
-bool SwMailMergeConfigItem::IsRecordExcluded(sal_Int32 nRecord)
-{
-bool bRet = false;
-if(nRecord 0 nRecord m_aSelection.getLength())
-{
-sal_Int32 nTemp = 0;
-m_aSelection[nRecord - 1] = nTemp;
-bRet = nTemp 1;
-}
-return bRet;
-}
+bool SwMailMergeConfigItem::IsRecordExcluded(sal_Int32 nRecord) const
+{ return m_aExcludedRecords.find(nRecord) != m_aExcludedRecords.end(); }
void SwMailMergeConfigItem::ExcludeRecord(sal_Int32 nRecord, bool bExclude)
{
-//nRecord is based on 1
-//the selection array contains Anys for all records
-//excluded records contain a '-1'
-if(!m_aSelection.getLength() || nRecord m_aSelection.getLength())
-{
-if(bExclude)
-{
-//if no selection array is available we need to create one
containing the
-//entries for all available records
-if(!m_pImpl-xResultSet.is())
-GetResultSet();
-if(m_pImpl-xResultSet.is())
-{
-m_pImpl-xResultSet-last();
-sal_Int32 nEnd = m_pImpl-xResultSet-getRow();
-sal_Int32 nStart = m_aSelection.getLength();
-m_aSelection.realloc(nEnd);
-Any* pSelection = m_aSelection.getArray();
-for(sal_Int32 nIndex = nStart; nIndex nEnd; ++nIndex)
-{
-if((nRecord - 1) != nIndex)
-pSelection[nIndex] = nIndex + 1;
-else
-pSelection[nIndex] = (sal_Int32) -1;
-}
-}
-}
-}
+if(bExclude)
+m_aExcludedRecords.insert(nRecord);
else
-{
-if(nRecord 0 m_aSelection.getLength() nRecord)
-{
-m_aSelection[nRecord - 1] = bExclude ? -1 : nRecord;
-}
-}
+m_aExcludedRecords.erase(nRecord);
}
+uno::Sequenceuno::Any SwMailMergeConfigItem::GetSelection() const
+{
+if(!m_pImpl-xResultSet.is())
+GetResultSet();
+if(!m_pImpl-xResultSet.is())
+return {};
+m_pImpl-xResultSet-last();
+sal_Int32 nResultSetSize = m_pImpl-xResultSet-getRow()+1;
+std::vectoruno::Any vResult;
+vResult.reserve(nResultSetSize);
+for(sal_Int32 nIdx=1; nIdxnResultSetSize;++nIdx)
+
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source include/editeng svx/source
editeng/source/outliner/overflowingtxt.cxx | 57 -
include/editeng/overflowingtxt.hxx |7 +++
svx/source/svdraw/textchainflow.cxx|5 +-
3 files changed, 50 insertions(+), 19 deletions(-)
New commits:
commit abf19ac0252a7f21bb276ed98ee73312096eaf93
Author: matteocam matteo.campane...@gmail.com
Date: Wed Jul 8 09:31:28 2015 -0400
Save insertion point in dest box when making overflowing text
Change-Id: If08717c89d424b3e248d628e289f00da2d340d94
diff --git a/editeng/source/outliner/overflowingtxt.cxx
b/editeng/source/outliner/overflowingtxt.cxx
index 49284f6..77f4829 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -31,23 +31,8 @@ OutlinerParaObject
*NonOverflowingText::ToParaObject(Outliner *pOutliner) const
return pPObj;
}
-/*
-OUString OverflowingText::GetEndingLines() const
-{
-// If the only overflowing part is some lines in a paragraph,
-// the end of the overflowing text is its head.
-if (!HasOtherParas())
-return mHeadTxt;
-
-return mTailTxt;
-}
-
-OUString OverflowingText::GetHeadingLines() const
-{
-return mHeadTxt;
-}
-* */
-
+// The equivalent of ToParaObject for OverflowingText. Here we are prepending
the overflowing text to the old dest box's text
+// XXX: In a sense a better name for OverflowingText and NonOverflowingText
are respectively DestLinkText and SourceLinkText
OutlinerParaObject *OverflowingText::GetJuxtaposedParaObject(Outliner *pOutl,
OutlinerParaObject *pNextPObj)
{
if (mpContentTextObj == NULL) {
@@ -59,14 +44,52 @@ OutlinerParaObject
*OverflowingText::GetJuxtaposedParaObject(Outliner *pOutl, Ou
OutlinerParaObject *pOverflowingPObj = new
OutlinerParaObject(*mpContentTextObj);
// the OutlinerParaObject constr. at the prev line gives no valid outliner
mode, so we set it
pOverflowingPObj-SetOutlinerMode(pOutl-GetOutlinerMode());
+
+/* Actual Text Setting */
pOutl-SetText(*pOverflowingPObj);
+
+// Set selection position between new and old text
+maInsertionPointSel = impGetEndSelection(pOutl);
+
pOutl-AddText(*pNextPObj);
+// End Text Setting
+
OutlinerParaObject *pPObj = pOutl-CreateParaObject();
//pPObj-SetOutlinerMode(pOutl-GetOutlinerMode());
return pPObj;
}
+ESelection OverflowingText::impGetEndSelection(Outliner *pOutl) const
+{
+const sal_Int32 nParaCount = pOutl-GetParagraphCount();
+const sal_Int32 nLastParaIndex = nParaCount 1 ? nParaCount - 1 : 0;
+Paragraph* pLastPara = pOutl-GetParagraph( nLastParaIndex);
+const sal_Int32 nLenLastPara = pOutl-GetText(pLastPara).getLength();
+// Selection at end of editing area
+ESelection
aEndSel(nLastParaIndex,nLenLastPara,nLastParaIndex,nLenLastPara);
+return aEndSel;
+}
+
+/*
+OUString OverflowingText::GetEndingLines() const
+{
+// If the only overflowing part is some lines in a paragraph,
+// the end of the overflowing text is its head.
+if (!HasOtherParas())
+return mHeadTxt;
+
+return mTailTxt;
+}
+
+OUString OverflowingText::GetHeadingLines() const
+{
+return mHeadTxt;
+}
+* */
+
+
+
OFlowChainedText::OFlowChainedText(Outliner *pOutl)
{
diff --git a/include/editeng/overflowingtxt.hxx
b/include/editeng/overflowingtxt.hxx
index 797264b..be5530b 100644
--- a/include/editeng/overflowingtxt.hxx
+++ b/include/editeng/overflowingtxt.hxx
@@ -22,6 +22,7 @@
#include editeng/macros.hxx
#include editeng/editengdllapi.h
+#include editeng/editdata.hxx
class OUString;
@@ -39,9 +40,12 @@ public:
OverflowingText(EditTextObject *pTObj) : mpContentTextObj(pTObj)
{
+ESelection aStartPos(0,0,0,0);
+maInsertionPointSel = aStartPos;
}
OutlinerParaObject *GetJuxtaposedParaObject(Outliner *,
OutlinerParaObject *);
+ESelection GetInsertionPointSel() const;
//OUString GetHeadingLines() const;
//OUString GetEndingLines() const;
@@ -49,6 +53,9 @@ public:
private:
const EditTextObject *mpContentTextObj;
+ESelection maInsertionPointSel;
+
+ESelection impGetEndSelection(Outliner *pOutl) const;
};
class NonOverflowingText {
diff --git a/svx/source/svdraw/textchainflow.cxx
b/svx/source/svdraw/textchainflow.cxx
index 2647afa..9e794bc 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -63,7 +63,8 @@ void TextChainFlow::impSetFlowOutlinerParams(SdrOutliner *,
SdrOutliner *)
void TextChainFlow::impCheckForFlowEvents(SdrOutliner *pFlowOutl, SdrOutliner
*pParamOutl)
{
bool bOldUpdateMode = pFlowOutl-GetUpdateMode();
-// NOTE: Nah you probably don't need this
+
+// XXX: This could be reorganized moving most of this stuff inside
EditingTextChainFlow (we need update=true anyway for TextChainFlow though)
if (pParamOutl != NULL)
{
// We need this since it's required to check
[Libreoffice-commits] core.git: 9 commits - cui/source sc/source sd/qa sd/source
cui/source/options/optaboutconfig.cxx |1
sc/source/ui/vba/excelvbahelper.cxx |2 -
sc/source/ui/vba/excelvbahelper.hxx |2 -
sc/source/ui/vba/vbaapplication.cxx |2 -
sc/source/ui/vba/vbaeventshelper.cxx|4 +--
sc/source/ui/vba/vbaeventshelper.hxx|4 +--
sc/source/ui/vba/vbarange.cxx |4 +--
sc/source/ui/vba/vbarange.hxx |2 -
sd/qa/unit/data/odp/pass/test-slide-name-fields.odp |binary
sd/source/ui/unoidl/unomodel.cxx| 26 ++--
10 files changed, 35 insertions(+), 12 deletions(-)
New commits:
commit 6793eaa4fa77292b23e9b86221e598f438d45b8e
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jul 8 14:23:55 2015 +0100
coverity#1311335 Uncaught exception
Change-Id: Idd654a49457c89598e45e0eb17336297b6745703
diff --git a/sc/source/ui/vba/vbaapplication.cxx
b/sc/source/ui/vba/vbaapplication.cxx
index f1cf9fc..2135014 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -1066,7 +1066,7 @@ void lclIntersectRanges( ListOfScRange rList, const
uno::Any rArg )
uno::Reference excel::XRange lclCreateVbaRange(
const uno::Reference uno::XComponentContext rxContext,
const uno::Reference frame::XModel rxModel,
-const ListOfScRange rList ) throw (uno::RuntimeException)
+const ListOfScRange rList ) throw (uno::RuntimeException,
std::exception)
{
ScDocShell* pDocShell = excel::getDocShell( rxModel );
if( !pDocShell ) throw uno::RuntimeException();
commit 1e40c6459fd0dd64cd27c7b2ffc093045cdbe78d
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jul 8 14:23:26 2015 +0100
coverity#1311334 Uncaught exception
Change-Id: I70c8fb0a30eb8185a5fe326d0ce11fcac7aa7e4f
diff --git a/sc/source/ui/vba/vbaeventshelper.cxx
b/sc/source/ui/vba/vbaeventshelper.cxx
index ea428c1..e471839 100644
--- a/sc/source/ui/vba/vbaeventshelper.cxx
+++ b/sc/source/ui/vba/vbaeventshelper.cxx
@@ -858,7 +858,7 @@ uno::Any ScVbaEventsHelper::createWorksheet( const
uno::Sequence uno::Any rA
}
uno::Any ScVbaEventsHelper::createRange( const uno::Sequence uno::Any
rArgs, sal_Int32 nIndex ) const
-throw (lang::IllegalArgumentException, uno::RuntimeException)
+throw (lang::IllegalArgumentException, uno::RuntimeException,
std::exception)
{
// it is possible to pass an existing VBA Range object
uno::Reference excel::XRange xVbaRange = getXSomethingFromArgs
excel::XRange ( rArgs, nIndex );
diff --git a/sc/source/ui/vba/vbaeventshelper.hxx
b/sc/source/ui/vba/vbaeventshelper.hxx
index e9020b0..7a86674 100644
--- a/sc/source/ui/vba/vbaeventshelper.hxx
+++ b/sc/source/ui/vba/vbaeventshelper.hxx
@@ -57,7 +57,7 @@ private:
/** Creates a VBA Worksheet object (the argument must contain a sheet
index). */
css::uno::Any createWorksheet( const css::uno::Sequence css::uno::Any
rArgs, sal_Int32 nIndex ) const throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException, std::exception);
/** Creates a VBA Range object (the argument must contain a UNO range or
UNO range list). */
-css::uno::Any createRange( const css::uno::Sequence css::uno::Any
rArgs, sal_Int32 nIndex ) const throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException);
+css::uno::Any createRange( const css::uno::Sequence css::uno::Any
rArgs, sal_Int32 nIndex ) const throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException, std::exception);
/** Creates a VBA Hyperlink object (the argument must contain a UNO cell).
*/
css::uno::Any createHyperlink( const css::uno::Sequence css::uno::Any
rArgs, sal_Int32 nIndex ) const throw (css::lang::IllegalArgumentException,
css::uno::RuntimeException, std::exception);
/** Creates a VBA Window object (the argument must contain a model
controller). */
commit 856583492785d3c332f5ad4092a8196d590f930b
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jul 8 14:22:29 2015 +0100
coverity#1311333 Uncaught exception
Change-Id: I692712d7a5a84efdec383c5d1ec7bd492a2e1aca
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index ef83fae..dc5b1f2 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -1235,7 +1235,7 @@ bool getScRangeListForAddress( const OUString sName,
ScDocShell* pDocSh, ScRang
}
ScVbaRange*
-getRangeForName( const uno::Reference uno::XComponentContext xContext,
const OUString sName, ScDocShell* pDocSh, table::CellRangeAddress pAddr,
formula::FormulaGrammar::AddressConvention eConv =
formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException )
+getRangeForName( const uno::Reference uno::XComponentContext xContext,
const OUString sName, ScDocShell* pDocSh, table::CellRangeAddress pAddr,
[Libreoffice-bugs] [Bug 92624] New: Master x86 crashes on open under Windows XP x86
https://bugs.documentfoundation.org/show_bug.cgi?id=92624 Bug ID: 92624 Summary: Master x86 crashes on open under Windows XP x86 Product: LibreOffice Version: 5.1.0.0.alpha0+ Master Hardware: x86 (IA32) OS: Windows (All) Status: UNCONFIRMED Severity: blocker Priority: medium Component: LibreOffice Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: pedl...@gmail.com Tested with build master~2015-07-08_07.22.58_LibreOfficeDev_5.1.0.0.alpha1_Win_x86 (I can't get to the About dialog) Master crashes on open with error displayed on the attached image (message is in Portuguese but the essential is readable) Also attached is a backtrace of the crash (I'm not sure if it is helpful since the program crashes before I can press F5) -- 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 92624] Master x86 crashes on open under Windows XP x86
https://bugs.documentfoundation.org/show_bug.cgi?id=92624 --- Comment #2 from Pedro pedl...@gmail.com --- Created attachment 117129 -- https://bugs.documentfoundation.org/attachment.cgi?id=117129action=edit Backtrace of crash using Windbg -- 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 'aoo/trunk' - dtrans/source officecfg/registry sot/inc sot/source starmath/inc starmath/sdi starmath/source starmath/uiconfig
dtrans/source/win32/ftransl/ftransl.cxx |2
officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu |5
sot/inc/sot/formats.hxx |3
sot/source/base/exchange.cxx |1
starmath/inc/starmath.hrc |1
starmath/sdi/smath.sdi| 25 +++
starmath/sdi/smslots.sdi |6
starmath/source/view.cxx | 74
++
starmath/uiconfig/smath/menubar/menubar.xml |1
9 files changed, 117 insertions(+), 1 deletion(-)
New commits:
commit 9ec2148653436be8612273439180749e71e2ce58
Author: Regina Henschel reg...@apache.org
Date: Wed Jul 8 12:31:43 2015 +
#i107734 Support for Math Input Panel in Windows 7
The patch introduces a new command .uno:ImportMathClipboard to module Math.
It imports MathML content from clipboard and transforms it to Starmath
It handles clipboard MIME type 'application/mathml+xml' and
plain text, which can be interpreted as MathML segment.
It partly solves issues #i14252, #i34781, and #i53509 too.
Review by: Hanya hanya.r...@gmail.com
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx
b/dtrans/source/win32/ftransl/ftransl.cxx
index cfceddc1..eedbc00 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -516,6 +516,8 @@ void SAL_CALL CDataFormatTranslator::initTranslationTable()
m_TranslTable.push_back(FormatEntry(image/bmp, Windows Bitmap, NULL,
CF_INVALID, CPPUTYPE_DEFAULT));
//SOT_FORMATSTR_ID_PNG
m_TranslTable.push_back(FormatEntry(image/png, PNG, NULL, CF_INVALID,
CPPUTYPE_DEFAULT));
+//SOT_FORMATSTR_ID_MATHML
+m_TranslTable.push_back(FormatEntry(application/mathml+xml, MathML,
NULL, CF_INVALID, CPPUTYPE_DEFAULT));
//SOT_FORMATSTR_ID_DUMMY3
m_TranslTable.push_back(FormatEntry(application/x-openoffice-dummy3;windows_formatname=\SO_DUMMYFORMAT_3\,
SO_DUMMYFORMAT_3, NULL, CF_INVALID, CPPUTYPE_DEFAULT));
//SOT_FORMATSTR_ID_DUMMY4
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
index c266fbf..babc106 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
@@ -77,6 +77,11 @@
value xml:lang=en-US~Import Formula.../value
/prop
/node
+node oor:name=.uno:ImportMathMLClipboard oor:op=replace
+prop oor:name=Label oor:type=xs:string
+value xml:lang=en-USImport MathML from
Clipboard/value
+/prop
+/node
node oor:name=.uno:InsertCommand oor:op=replace
prop oor:name=Label oor:type=xs:string
value xml:lang=en-USInsert Command/value
diff --git a/sot/inc/sot/formats.hxx b/sot/inc/sot/formats.hxx
index 24bdd44..6c30d18 100644
--- a/sot/inc/sot/formats.hxx
+++ b/sot/inc/sot/formats.hxx
@@ -182,7 +182,8 @@
#define SOT_FORMATSTR_ID_STARBASE_8 ((sal_uLong)139)
#define SOT_FORMATSTR_ID_HC_GDIMETAFILE ((sal_uLong)140)
#define SOT_FORMATSTR_ID_PNG((sal_uLong)141)
-#define SOT_FORMATSTR_ID_USER_END SOT_FORMATSTR_ID_PNG
+#define SOT_FORMATSTR_ID_MATHML ((sal_uLong)142)
+#define SOT_FORMATSTR_ID_USER_END SOT_FORMATSTR_ID_MATHML
#endif // _SOT_FORMATS_HXX
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index c576eb2..4b824e6 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -208,6 +208,7 @@ namespace
/*139 SOT_FORMATSTR_ID_STARBASE_8*/{
MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII, StarBase 8, ::getCppuType(
(const Sequence sal_Int8 *) 0 ) },
/*140 SOT_FORMAT_GDIMETAFILE*/ {
application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\GDIMetaFile\,
High Contrast GDIMetaFile, ::getCppuType( (const Sequence sal_Int8 *) 0 )
},
/*141 SOT_FORMATSTR_ID_PNG*/{ image/png,
PNG Bitmap, ::getCppuType( (const Sequence sal_Int8 *) 0 ) },
+/*142 SOT_FORMATSTR_ID_MATHML*/ {
application/mathml+xml, MathML, ::getCppuType( (const Sequence sal_Int8
*) 0 ) },
};
return aInstance[0];
}
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index c1855d8..d273a7d 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -52,6 +52,7 @@
#define SID_SYMBOLS (SID_SMA_START + 56) // Muss erstmal
wieder aufgenommen werden !
#define SID_TEXTMODE(SID_SMA_START + 57)
[Libreoffice-bugs] [Bug 92607] ACCESSIBILITY: improve one-handed usability
https://bugs.documentfoundation.org/show_bug.cgi?id=92607 --- Comment #2 from MarjaE erw...@alumni.beloit.edu --- Commands which require users to mouse and to press keys at the same time. please provide an example Alt+Click -- 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/opengl
vcl/opengl/gdiimpl.cxx | 19 +--
1 file changed, 9 insertions(+), 10 deletions(-)
New commits:
commit d9b7c779a0aed3bacccf5700a0179947db13afa8
Author: Tomaž Vajngerl tomaz.vajng...@collabora.co.uk
Date: Tue Jun 30 17:57:14 2015 +0900
opengl: fix fat hairlines - draw hairlines using DrawLineAA
Change-Id: I935bef48fd057e6223dcfc437cbaf242fd61
Reviewed-on: https://gerrit.libreoffice.org/16857
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 351fc1d..e2512b6 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -1348,20 +1348,19 @@ bool OpenGLSalGraphicsImpl::drawPolyLine(
//bool bDrawnOk = true;
if( bIsHairline )
{
-// hairlines can be drawn in a simpler way (the linejoin and linecap
styles can be ignored)
-basegfx::B2DTrapezoidVector aB2DTrapVector;
-basegfx::tools::createLineTrapezoidFromB2DPolygon( aB2DTrapVector,
aPolygon, rLineWidth.getX() );
-// draw tesselation result
-if( aB2DTrapVector.size())
+PreDraw();
+if( UseSolidAA( mnLineColor ) )
{
-PreDraw();
-if( UseSolid( mnLineColor, fTransparency ))
+sal_uInt32 nPoints = rPolygon.count();
+for (sal_uInt32 i = 0; i nPoints - 1; ++i)
{
-for( size_t i = 0; i aB2DTrapVector.size(); ++i )
-DrawTrapezoid( aB2DTrapVector[ i ] );
+const basegfx::B2DPoint rPt1 = rPolygon.getB2DPoint(i);
+const basegfx::B2DPoint rPt2 = rPolygon.getB2DPoint(i+1);
+DrawLineAA(rPt1.getX(), rPt1.getY(),
+ rPt2.getX(), rPt2.getY());
}
-PostDraw();
}
+PostDraw();
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 92625] New: LibreOffice changes DOCX format from Default to preformatted text
https://bugs.documentfoundation.org/show_bug.cgi?id=92625 Bug ID: 92625 Summary: LibreOffice changes DOCX format from Default to preformatted text Product: LibreOffice Version: 4.4.3.2 release Hardware: x86-64 (AMD64) OS: Linux (All) Status: UNCONFIRMED Severity: major Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: myramenisg...@gmail.com OS: Linux Mint 17.2 It seems that when I make a new docx then use the document formatting, the file turns into a preformatted text when saving to a computer with SFTP and nemo or samba and nemo. It's caused me a lot of pain since I'm doing research projects that need to be in a certain format.. Steps to reproduce: 1. create README.docx on nemo from a SFTP'd or Samba'd computer 2. copy paste formatted text to the new README 3. Save 4. close 5. re-open 6. document is in preformatted text mode with no format at all and in Liberation Mono 7. cry because boss is mad that the readmes are hard to read I'll see what other tests I can do... -- 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/gsoc14-draw-chained-text-boxes' - include/svx svx/source
include/svx/textchain.hxx | 88
svx/source/svdraw/svdedxv.cxx | 14 -
svx/source/svdraw/textchain.cxx | 39 ---
svx/source/svdraw/textchainflow.cxx |2
4 files changed, 89 insertions(+), 54 deletions(-)
New commits:
commit 4c9e5c5862d1aed26f96228c2fe01ebf0de8fd01
Author: matteocam matteo.campane...@gmail.com
Date: Wed Jul 8 10:29:51 2015 -0400
Define macro system for text chain properties
Change-Id: Id50a9996e0b60e0650dbd67fdb4ebbc8ef2f1d4a
diff --git a/include/svx/textchain.hxx b/include/svx/textchain.hxx
index 730489b..efd52ef 100644
--- a/include/svx/textchain.hxx
+++ b/include/svx/textchain.hxx
@@ -20,6 +20,52 @@
#ifndef INCLUDED_SVX_TEXTCHAIN_HXX
#define INCLUDED_SVX_TEXTCHAIN_HXX
+/*
+ * Properties can be accessed and set from a TextChain with:
+ * - T TextChain::GetPROPNAME(SdrTextObj *)
+ * - void TextChain::SetPROPNAME(SdrTextObj *, T)
+ * where T and PROPNAME are respectively type and name of a property.
+ *
+ * To add a property PROPNAME of type T (and its interface) in TextChain:
+ * 1) Add
+ * DECL_CHAIN_PROP(PROPNAME, T)
+ *in class ImpChainLinkProperties;
+ * 2) Add
+ * INIT_CHAIN_PROP(PROPNAME, V)
+ *in constructor of ImpChainLinkProperties below
+ *(V is the initialization value for PROPNAME)
+ *
+ * 2) Add
+ * DECL_CHAIN_PROP_INTERFACE(PROPNAME, T)
+ *in class TextChain (under public:);
+ * 3) Add
+ * IMPL_CHAIN_PROP_INTERFACE(PROPNAME, T)
+ *in file svx/source/svdraw/textchain.cxx
+*/
+
+#define DECL_CHAIN_PROP(PropName, PropType) \
+PropType a##PropName;
+
+#define INIT_CHAIN_PROP(PropName, PropDefault) \
+a##PropName = (PropDefault);
+
+#define DECL_CHAIN_PROP_INTERFACE(PropName, PropType) \
+PropType Get##PropName (SdrTextObj *); \
+void Set##PropName (SdrTextObj *, PropType);
+
+#define IMPL_CHAIN_PROP_INTERFACE(PropName, PropType) \
+PropType TextChain::Get##PropName (SdrTextObj *pTarget) { \
+ImpChainLinkProperties *pLinkProperties = GetLinkProperties(pTarget); \
+return pLinkProperties-a##PropName; \
+} \
+void TextChain::Set##PropName (SdrTextObj *pTarget, PropType aPropParam) \
+{ \
+ImpChainLinkProperties *pLinkProperties = GetLinkProperties(pTarget); \
+pLinkProperties-a##PropName = aPropParam; \
+}
+
+/* End Special Properties Macro */
+
#include map
class ImpChainLinkProperties;
@@ -39,16 +85,40 @@ enum class CursorChainingEvent
UNCHANGED
};
+/*
+ * // Note Sure I need the code here
+struct CursorChainingInfo
+{
+public:
+CursorChainingEvent GetEvent() const;
+ESelection GetPreChainingSel() const;
+ESelection GetPostChainingSel() const;
+
+void SetEvent(CursorChainingEvent aEvent) { maEvent = aEvent; }
+void SetPreChainingSel(ESelection aSel) { maPreChainingSel = aSel; }
+void SetPostChainingSel(ESelection aSel) { maPostChaingingSel = aSel; }
+private:
+CursorChainingEvent maEvent;
+ESelection maPreChainingSel;
+ESelection maPostChainingSel;
+};
+* */
+
class ImpChainLinkProperties
{
protected:
friend class TextChain;
-ImpChainLinkProperties();
+ImpChainLinkProperties() {
+INIT_CHAIN_PROP(NilChainingEvent, false)
+INIT_CHAIN_PROP(CursorEvent, CursorChainingEvent::UNCHANGED)
+}
+private:
// NOTE: Remember to set default value in contructor when adding field
-bool bNilChainingEvent;
-CursorChainingEvent aCursorEvent; // XXX: replace with enum instead of
bool?
+DECL_CHAIN_PROP(NilChainingEvent, bool)
+DECL_CHAIN_PROP(CursorEvent, CursorChainingEvent)
+
};
@@ -62,18 +132,18 @@ class TextChain {
bool IsLinkInChain(SdrTextObj *) const;
SdrTextObj *GetNextLink(SdrTextObj *) const;
-CursorChainingEvent GetCursorEvent(SdrTextObj *);
-void SetCursorEvent(SdrTextObj *, CursorChainingEvent);
-
ChainLinkId GetId(SdrTextObj *) const;
ImpChainLinkProperties *GetLinkProperties(SdrTextObj *);
+// Specific Link Properties
+DECL_CHAIN_PROP_INTERFACE(CursorEvent, CursorChainingEvent)
+DECL_CHAIN_PROP_INTERFACE(NilChainingEvent, bool)
+
+
+
// return whether a paragraph is split between the two links in the
argument
bool GetLinksHaveMergeableFirstPara(SdrTextObj *, SdrTextObj *);
-bool GetNilChainingEvent(SdrTextObj *pTarget);
-void SetNilChainingEvent(SdrTextObj *, bool);
-
protected:
LinkPropertiesMap maLinkPropertiesMap;
};
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index c09dfb1..04bf0df 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -505,23 +505,9 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
// trigger actual chaining
pTextObj-onChainingEvent();
-// XXX: this logic could be put in a separate approppriate class
-
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - 2 commits - include/svx svx/source
include/svx/textchain.hxx |7 ++-
svx/source/svdraw/svdedxv.cxx | 19 +--
svx/source/svdraw/textchain.cxx |1 +
3 files changed, 16 insertions(+), 11 deletions(-)
New commits:
commit 849d8130c32ed8bd4016bd637eabaf8681615ee6
Author: matteocam matteo.campane...@gmail.com
Date: Wed Jul 8 10:54:38 2015 -0400
Reset chaining cursor event after handling it
Change-Id: I6c03b4a4340e1ee0c7498dae78c8563b54ef191f
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 2908ce7..3b5f021 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -553,6 +553,9 @@ void SdrObjEditView::ImpMoveCursorAfterChainingEvent()
break;
}
+// Reset event
+pTextChain-SetCursorEvent(pTextObj, CursorChainingEvent::UNCHANGED);
+
}
IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI)
commit 82183e28056e2e661801c9f549f4be9dcf2d4249
Author: matteocam matteo.campane...@gmail.com
Date: Wed Jul 8 10:46:13 2015 -0400
Implemented PreChainingSel as a TextChain property
Change-Id: Ifec26d8c49b1471f7ae25deca962516f1480e0dc
diff --git a/include/svx/textchain.hxx b/include/svx/textchain.hxx
index efd52ef..77e3b32 100644
--- a/include/svx/textchain.hxx
+++ b/include/svx/textchain.hxx
@@ -20,6 +20,9 @@
#ifndef INCLUDED_SVX_TEXTCHAIN_HXX
#define INCLUDED_SVX_TEXTCHAIN_HXX
+#include editeng/editdata.hxx
+#include map
+
/*
* Properties can be accessed and set from a TextChain with:
* - T TextChain::GetPROPNAME(SdrTextObj *)
@@ -66,7 +69,6 @@
/* End Special Properties Macro */
-#include map
class ImpChainLinkProperties;
class SdrTextObj;
@@ -112,12 +114,14 @@ class ImpChainLinkProperties
ImpChainLinkProperties() {
INIT_CHAIN_PROP(NilChainingEvent, false)
INIT_CHAIN_PROP(CursorEvent, CursorChainingEvent::UNCHANGED)
+INIT_CHAIN_PROP(PreChainingSel, ESelection(0,0,0,0));
}
private:
// NOTE: Remember to set default value in contructor when adding field
DECL_CHAIN_PROP(NilChainingEvent, bool)
DECL_CHAIN_PROP(CursorEvent, CursorChainingEvent)
+DECL_CHAIN_PROP(PreChainingSel, ESelection)
};
@@ -138,6 +142,7 @@ class TextChain {
// Specific Link Properties
DECL_CHAIN_PROP_INTERFACE(CursorEvent, CursorChainingEvent)
DECL_CHAIN_PROP_INTERFACE(NilChainingEvent, bool)
+DECL_CHAIN_PROP_INTERFACE(PreChainingSel, ESelection)
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 3ca380d..2908ce7 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -500,12 +500,13 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl)
pTextChain-SetNilChainingEvent(pTextObj, true);
// Save previous selection pos
-maPreChainingSel = new ESelection(pOLV-GetSelection());
+pTextChain-SetPreChainingSel(pTextObj, pOLV-GetSelection());
+//maPreChainingSel = new ESelection(pOLV-GetSelection());
// trigger actual chaining
pTextObj-onChainingEvent();
-maCursorEvent = new
CursorChainingEvent(pTextChain-GetCursorEvent(pTextObj));
+//maCursorEvent = new
CursorChainingEvent(pTextChain-GetCursorEvent(pTextObj));
//SdrTextObj *pNextLink = pTextObj-GetNextLinkInChain();
// NOTE: Must be called. Don't let the function return if you set
it to true and not reset it
@@ -529,16 +530,16 @@ void SdrObjEditView::ImpMoveCursorAfterChainingEvent()
if (!pTextObj-IsChainable() || !pTextObj-GetNextLinkInChain())
return;
-if(!maCursorEvent || !maPreChainingSel)
-return;
SdrTextObj *pNextLink = pTextObj-GetNextLinkInChain();
OutlinerView* pOLV = GetTextEditOutlinerView();
-switch (*maCursorEvent) {
+TextChain *pTextChain = pTextObj-GetTextChain();
+
+switch ( pTextChain-GetCursorEvent(pTextObj) ) {
case CursorChainingEvent::UNCHANGED:
-pOLV-SetSelection(*maPreChainingSel);
+
pOLV-SetSelection(pTextChain-GetPreChainingSel(pTextObj));
break;
case CursorChainingEvent::TO_NEXT_LINK:
SdrEndTextEdit();
@@ -552,11 +553,6 @@ void SdrObjEditView::ImpMoveCursorAfterChainingEvent()
break;
}
-// Default case
-// XXX: You should delete the old ones here too.
-maCursorEvent = NULL;
-maPreChainingSel = NULL;
-
}
IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI)
diff --git a/svx/source/svdraw/textchain.cxx b/svx/source/svdraw/textchain.cxx
index a9b59a9..270712e 100644
--- a/svx/source/svdraw/textchain.cxx
+++ b/svx/source/svdraw/textchain.cxx
@@ -26,6 +26,7 @@
IMPL_CHAIN_PROP_INTERFACE(CursorEvent, CursorChainingEvent)
IMPL_CHAIN_PROP_INTERFACE(NilChainingEvent, bool)
+IMPL_CHAIN_PROP_INTERFACE(PreChainingSel,
