[Libreoffice-commits] core.git: chart2/source compilerplugins/clang cui/source dbaccess/source extensions/source sfx2/source solenv/CompilerTest_compilerplugins_clang.mk sw/source toolkit/source
chart2/source/model/main/UndoManager.cxx |2
compilerplugins/clang/redundantpointerops.cxx | 129 +
compilerplugins/clang/test/redundantpointerops.cxx | 38 +
cui/source/tabpages/tpgradnt.cxx |2
cui/source/tabpages/tphatch.cxx|2
cui/source/tabpages/tppattern.cxx |2
dbaccess/source/ui/misc/dbaundomanager.cxx |2
extensions/source/propctrlr/propertycomposer.hxx |2
sfx2/source/doc/docundomanager.cxx |2
solenv/CompilerTest_compilerplugins_clang.mk |1
sw/source/core/doc/CntntIdxStore.cxx |2
sw/source/core/doc/doccorr.cxx |4
toolkit/source/controls/grid/sortablegriddatamodel.cxx |2
13 files changed, 179 insertions(+), 11 deletions(-)
New commits:
commit 326295bf10985a19ac913f988980c8761c301967
Author: Noel Grandin
Date: Fri Sep 1 09:34:37 2017 +0200
new loplugin:redundantpointerops
Change-Id: I8428d86ea9628d69c2b40b36feee3da428a9fe1d
Reviewed-on: https://gerrit.libreoffice.org/41787
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/model/main/UndoManager.cxx
b/chart2/source/model/main/UndoManager.cxx
index 7e5894b012cb..6d6e9ef915da 100644
--- a/chart2/source/model/main/UndoManager.cxx
+++ b/chart2/source/model/main/UndoManager.cxx
@@ -319,7 +319,7 @@ namespace chart
Reference< XInterface > SAL_CALL UndoManager::getParent( )
{
UndoManagerMethodGuard aGuard( *m_pImpl );
-return *&m_pImpl->getParent();
+return m_pImpl->getParent();
}
void SAL_CALL UndoManager::setParent( const Reference< XInterface >& )
diff --git a/compilerplugins/clang/redundantpointerops.cxx
b/compilerplugins/clang/redundantpointerops.cxx
new file mode 100644
index ..6a88cdb13d70
--- /dev/null
+++ b/compilerplugins/clang/redundantpointerops.cxx
@@ -0,0 +1,129 @@
+/* -*- 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/.
+ */
+
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include "compat.hxx"
+#include "plugin.hxx"
+
+/**
+ * Look for:
+ * (&x)->y
+ * which can be tranformed to:
+ * x.y
+ * And
+ *&*x
+ * which can be:
+ *x
+ *
+ * @TODO
+ *(*x).y
+ * which can be:
+ *x->y
+ */
+
+namespace {
+
+class RedundantPointerOps:
+public RecursiveASTVisitor, public loplugin::Plugin
+{
+public:
+explicit RedundantPointerOps(InstantiationData const & data): Plugin(data)
{}
+
+virtual void run() override
+{
+TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+}
+
+bool VisitFunctionDecl(FunctionDecl const *);
+bool VisitMemberExpr(MemberExpr const *);
+bool VisitUnaryOperator(UnaryOperator const *);
+};
+
+bool RedundantPointerOps::VisitFunctionDecl(FunctionDecl const * functionDecl)
+{
+if (ignoreLocation(functionDecl))
+return true;
+//functionDecl->dump();
+return true;
+}
+
+bool RedundantPointerOps::VisitMemberExpr(MemberExpr const * memberExpr)
+{
+if (ignoreLocation(memberExpr))
+return true;
+if (memberExpr->getLocStart().isMacroID())
+return true;
+auto base = memberExpr->getBase()->IgnoreParenImpCasts();
+//parentStmt(parentStmt(memberExpr))->dump();
+if (memberExpr->isArrow())
+{
+if (auto unaryOp = dyn_cast(base))
+{
+if (unaryOp->getOpcode() == UO_AddrOf)
+report(
+DiagnosticsEngine::Warning, "'&' followed by '->', rather
use '.'",
+memberExpr->getLocStart())
+<< memberExpr->getSourceRange();
+
+}
+else if (auto operatorCallExpr = dyn_cast(base))
+{
+if (operatorCallExpr->getOperator() == OO_Amp)
+report(
+DiagnosticsEngine::Warning, "'&' followed by '->', rather
use '.'",
+memberExpr->getLocStart())
+<< memberExpr->getSourceRange();
+
+}
+}
+//else
+//{
+//if (auto unaryOp = dyn_cast(base))
+//{
+//if (unaryOp->getOpcode() == UO_Deref)
+//report(
+//DiagnosticsEngine::Warning, "'*' followed by '.', rather
use '->'",
+//memberExpr->getLocStart())
+//<< memberExpr->getSourceRange();
+//
+//}
+//}
+return true;
+}
+
+bool RedundantPointerOps::VisitUnaryOperator(UnaryOperator const *
unaryOperator)
+{
+if (ignoreLocation(unaryOperator))
+return true;
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.
2 new defect(s) introduced to LibreOffice found with Coverity Scan.
New defect(s) Reported-by: Coverity Scan
Showing 2 of 2 defect(s)
** CID 1417293: Possible Control flow issues (DEADCODE)
/filter/source/msfilter/eschesdo.cxx: 614 in
ImplEESdrWriter::ImplWriteShape(ImplEESdrObject &, EscherSolverContainer &,
bool)()
*** CID 1417293: Possible Control flow issues (DEADCODE)
/filter/source/msfilter/eschesdo.cxx: 614 in
ImplEESdrWriter::ImplWriteShape(ImplEESdrObject &, EscherSolverContainer &,
bool)()
608 aPropOpt.AddOpt( ESCHER_Prop_hspMaster, 0 );
609 }
610 else
611 {
612 //2do: could be made an option in HostAppData whether
OLE object should be written or not
613 bool bAppOLE = true;
>>> CID 1417293: Possible Control flow issues (DEADCODE)
>>> Execution cannot reach the expression "ShapeFlag::NONE" inside this
>>> statement: "addShape(75, (o3tl::is_type...".
614 addShape( ESCHER_ShpInst_PictureFrame,
615 ShapeFlag::HaveShapeProperty |
ShapeFlag::HaveAnchor | (bAppOLE ? ShapeFlag::OLEShape : ShapeFlag::NONE) );
616 if ( aPropOpt.CreateOLEGraphicProperties(
rObj.GetShapeRef() ) )
617 {
618 if ( bAppOLE )
619 { // snooped from Xcl hex dump, nobody knows the
trouble I have seen
** CID 1399392: Error handling issues (UNCAUGHT_EXCEPT)
/sw/source/core/doc/list.cxx: 99 in SwListImpl::~SwListImpl()()
*** CID 1399392: Error handling issues (UNCAUGHT_EXCEPT)
/sw/source/core/doc/list.cxx: 99 in SwListImpl::~SwListImpl()()
93 pNode = rNodes[nIndex];
94 }
95 }
96 while ( pNode != &rNodes.GetEndOfContent() );
97 }
98
>>> CID 1399392: Error handling issues (UNCAUGHT_EXCEPT)
>>> An exception of type "com::sun::star::uno::RuntimeException" is thrown
>>> but the throw list "throw()" doesn't allow it to be thrown. This will cause
>>> a call to unexpected() which usually calls terminate().
99 SwListImpl::~SwListImpl()
100 {
101 tListTrees::iterator aNumberTreeIter;
102 for ( aNumberTreeIter = maListTrees.begin();
103 aNumberTreeIter != maListTrees.end();
104 ++aNumberTreeIter )
To view the defects in Coverity Scan visit,
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRZBnDJeNb0HijxaS4JNJPxk3kpyAm2AYqo71yXmnOxB72ibeUH-2F-2F1Lhi9AZq3dRu-2F4-3D_g-2BrHdvqzaBa155F-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpyLaWi5RDWzLUOtSPr5Wfjo-2BrrSyRB-2FVRUkzs8dblygNPH7X9vTGsU3KvBWLkt1MgesMsTRWortyCEcOhdYO05ceiexkKqyAAa0JqBV5kRo7fz2uuUiRMbtu2YRoMR7Kz5-2Bi7turNrXxZBLvv-2BbKHl-2Bx6EK924YOCGG-2BnScRtSS34-3D
To manage Coverity Scan email notifications for
"libreoffice@lists.freedesktop.org", click
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRbVDbis712qZDP-2FA8y06Nq4k1FZJSDV-2FTHi5VQof9xGafB4oBwGYxuHHknceo2QLpCrZ44Ciy7AqBR2QyX6OCB5lwWgMDuK-2FivqaohkU3M9kT-2Fww10Qt2GoaCJAOQCa0Wv4ijH4oV8jCt0XXa7QeAwh_g-2BrHdvqzaBa155F-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpyLaWi5RDWzLUOtSPr5Wfjo0qnUxPay-2FbNb3QIsn-2F8iv-2B50qIDzxegAAJn8XSx7LytUINoBsVG7SQbJcFYPkaioRjUec8pgmUlxOBh6UexXm6YH0Qdl9wR5s4AYd0w8hiQqnIfbLOhsXlBzoVKTUaevSZpQ6SD3dtt5v7UonX454E-3D
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: toolkit/qa
toolkit/qa/complex/toolkit/UnitConversion.java |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit dfaceb70ec2f6feda6a73b8be00a7f168dfe075b
Author: Johnny_M
Date: Sat Sep 2 13:40:47 2017 +0200
Translate one German variable name
No functional change is intended.
Change-Id: I47312070bea07b0c4994da4f99aa99684cfd850e
Reviewed-on: https://gerrit.libreoffice.org/41832
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/toolkit/qa/complex/toolkit/UnitConversion.java
b/toolkit/qa/complex/toolkit/UnitConversion.java
index 15b67fc61b21..72fcef7cba29 100644
--- a/toolkit/qa/complex/toolkit/UnitConversion.java
+++ b/toolkit/qa/complex/toolkit/UnitConversion.java
@@ -70,14 +70,14 @@ public class UnitConversion
* only a simple test call to convertSizeToLogic(...) with different
parameters
* @param _aSize
* @param _aMeasureUnit
- * @param _sEinheit
+ * @param _sUnit
*/
-private void checkSize(com.sun.star.awt.Size _aSize, short _aMeasureUnit,
String _sEinheit)
+private void checkSize(com.sun.star.awt.Size _aSize, short _aMeasureUnit,
String _sUnit)
{
com.sun.star.awt.Size aSizeIn =
m_xConversion.convertSizeToLogic(_aSize, _aMeasureUnit);
System.out.println("Window size:");
-System.out.println("Width:" + aSizeIn.Width + " " + _sEinheit);
-System.out.println("Height:" + aSizeIn.Height + " " + _sEinheit);
+System.out.println("Width:" + aSizeIn.Width + " " + _sUnit);
+System.out.println("Height:" + aSizeIn.Height + " " + _sUnit);
System.out.println("");
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 15790025c8ac2fe659f458cffc0d72a79089074e Author: heiko tietze Date: Thu Aug 24 16:58:20 2017 +0200 tdf#106988 Default favorite characters Update of default list according design meeting decision Change-Id: I7db04cf402b5e9ed813f5c15188c45ae52dc7a3e Reviewed-on: https://gerrit.libreoffice.org/41523 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 68c37e77f98a..70df274f7ff5 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -3426,16 +3426,16 @@ List of Favorite characters - â + ⬠¥ £ - ⪠- Φ + © Σ - Ψ Ω + ⤠+ ⥠â - ð + Ï â â¡ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 92398087068f08ffd289868a840f925e510ed31b Author: Olivier Hallot Date: Sun Sep 3 21:06:30 2017 -0300 Updated core Project: help 9d09fe1dd6d9ad7036a42152e558d19cfced237f Add es and ast for helponline localization Change-Id: Ie93eb6af531b882afe573d03e93f8f428afd1def Reviewed-on: https://gerrit.libreoffice.org/41872 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index de0193157e3b..9d09fe1dd6d9 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit de0193157e3b09f5da4ac1a1f17625cc3bf62c14 +Subproject commit 9d09fe1dd6d9ad7036a42152e558d19cfced237f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/localized.xsl
help3xsl/localized.xsl |8 1 file changed, 8 insertions(+) New commits: commit 9d09fe1dd6d9ad7036a42152e558d19cfced237f Author: Olivier Hallot Date: Sun Sep 3 21:06:30 2017 -0300 Add es and ast for helponline localization Change-Id: Ie93eb6af531b882afe573d03e93f8f428afd1def Reviewed-on: https://gerrit.libreoffice.org/41872 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/help3xsl/localized.xsl b/help3xsl/localized.xsl index c5b0a8afc..e2bb7469b 100644 --- a/help3xsl/localized.xsl +++ b/help3xsl/localized.xsl @@ -15,8 +15,10 @@ Stylesheet map language-dependent parameters and translation +ContenÃu Contents Contents +Contenido Contents Conteúdo Conteúdo @@ -27,9 +29,11 @@ Stylesheet map language-dependent parameters and translation +Ãndiz Index Index Index +Ãndice Ãndice Ãndice Index @@ -39,9 +43,11 @@ Stylesheet map language-dependent parameters and translation +Alcontrar Find Find Find +Buscar Pesquisar Pesquisar Find @@ -51,9 +57,11 @@ Stylesheet map language-dependent parameters and translation +Llingua Language Language Language +Idioma Idioma Idioma Language ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svtools sd/source svtools/source
include/svtools/tabbar.hxx| 15 +++
sd/source/ui/dlg/LayerTabBar.cxx | 81 ++
sd/source/ui/view/drviews1.cxx| 35 ++--
sd/source/ui/view/drviewsb.cxx| 13 +-
svtools/source/control/tabbar.cxx | 28 +
5 files changed, 151 insertions(+), 21 deletions(-)
New commits:
commit abe958a713ff0c26a3f91c558a2f227c1996c592
Author: Ulrich Gemkow
Date: Sun Aug 20 21:36:14 2017 +0200
tdf#89130 Draw: Better UI for handling layer attributes
This is a RFC to implement comment#2 in tdf#89130: Add
shortcuts to change layer attributes and make the current
attribute values visible in the tab layer name.
Already implemented is that pressing LeftMouse+Shift
toggles layer visibility. When a layer is not visible
its name is displayed in blue.
This patch adds that pressing LeftMouse+Ctrl toggles
layer locked/unlocked and LeftMouse+Ctrl+Shift toggles
layer printable/not printable.
The name of a locked layer is displayed italic. The name
of a nonprintable layer is underlined.
This also adds an Undo action for all changes to mirror
the behavior of the layer attribute change dialog box.
Change-Id: I5d8fa0585d4f088768716956583e324e66e29602
Reviewed-on: https://gerrit.libreoffice.org/41366
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx
index 8cef7ff434d6..766ac7d4744f 100644
--- a/include/svtools/tabbar.hxx
+++ b/include/svtools/tabbar.hxx
@@ -52,6 +52,13 @@ Setting page bits modify the display attributes of the tab
name
TPB_DISPLAY_NAME_BLUE
- Display tab name in light blue, used in draw for
invisible layers and in calc for scenario pages
+TPB_DISPLAY_NAME_ITALIC
+- Display tab name italic, used in draw for
+ locked layers
+TPB_DISPLAY_NAME_UNDERLINE
+- Display tab name underlined, used in draw for
+ non-printable layers
+
Handlers
---
@@ -267,9 +274,17 @@ class Button;
#define WB_INSERTTAB((WinBits)0x4000)
#define WB_STDTABBARWB_BORDER
+// Page bits
+
typedef sal_uInt16 TabBarPageBits;
#define TPB_DISPLAY_NAME_BLUE ((TabBarPageBits)0x0001)
+#define TPB_DISPLAY_NAME_ITALIC((TabBarPageBits)0x0002)
+#define TPB_DISPLAY_NAME_UNDERLINE ((TabBarPageBits)0x0004)
+
+// interface checks only, do not use in regular control flow
+
+#define TPB_DISPLAY_NAME_ALLFLAGS ((TabBarPageBits)(TPB_DISPLAY_NAME_BLUE |
TPB_DISPLAY_NAME_ITALIC | TPB_DISPLAY_NAME_UNDERLINE))
// - TabBar-Types - used in TabBar::AllowRenaming
diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx
index 5d441bc0b299..1d1aae802c41 100644
--- a/sd/source/ui/dlg/LayerTabBar.cxx
+++ b/sd/source/ui/dlg/LayerTabBar.cxx
@@ -75,7 +75,7 @@ void LayerTabBar::MouseButtonDown(const MouseEvent& rMEvt)
{
bool bSetPageID=false;
-if (rMEvt.IsLeft() && !rMEvt.IsMod1() && !rMEvt.IsMod2())
+if (rMEvt.IsLeft() && !rMEvt.IsMod2())
{
Point aPosPixel = rMEvt.GetPosPixel();
sal_uInt16 aLayerId = GetPageId( PixelToLogic(aPosPixel) );
@@ -87,15 +87,81 @@ void LayerTabBar::MouseButtonDown(const MouseEvent& rMEvt)
bSetPageID=true;
}
-else if (rMEvt.IsShift())
+else if (rMEvt.IsMod1() || rMEvt.IsShift())
{
-// Toggle between layer visible / hidden
+// keyboard Shortcuts to change layer attributes
+
OUString aName(GetPageText(aLayerId));
SdrPageView* pPV = pDrViewSh->GetView()->GetSdrPageView();
-bool bVisible = pPV->IsLayerVisible(aName);
-pPV->SetLayerVisible(aName, !bVisible);
+
+// Save old state
+
+bool bOldPrintable = pPV->IsLayerPrintable(aName);
+bool bOldVisible = pPV->IsLayerVisible(aName);
+bool bOldLocked = pPV->IsLayerLocked(aName);
+
+bool bNewPrintable = bOldPrintable;
+bool bNewVisible = bOldVisible;
+bool bNewLocked = bOldLocked;
+
+if (rMEvt.IsMod1() && rMEvt.IsShift())
+{
+// Shift+Ctrl: Toggle between layer printable / not printable
+bNewPrintable = !bOldPrintable;
+pPV->SetLayerPrintable(aName, bNewPrintable);
+}
+else if (rMEvt.IsShift())
+{
+// Shift: Toggle between layer visible / hidden
+bNewVisible = !bOldVisible;
+pPV->SetLayerVisible(aName, bNewVisible);
+}
+else // if (rMEvt.IsMod1())
+{
+// Ctrl: Toggle between layer locked / unlocked
+bNewLocked = !bOldLocked;
+pPV->SetLayerLocked(aName, bNewLocked);
+}
+
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 5 commits - instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo
instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp
|binary
instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt |
158 +++--
instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf|
6
instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp
|binary
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt|
170 +++---
instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp
|binary
instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt |
164 +++--
7 files changed, 191 insertions(+), 307 deletions(-)
New commits:
commit 51fa5a1e26e35efc67651411a92128249edc5783
Author: Matthias Seidel
Date: Sun Sep 3 22:55:17 2017 +
Cleaned up
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 7e32e213d9a4..ee911a835a66 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -18,8 +18,6 @@ AdminChangeFolder Up PushButton 310 64
19 19 3670019 UpIco NewFolder OOO_CONTRO
AdminNetworkLocation BackPushButton 164 243 66 17
3 OOO_CONTROL_14 InstallNow
AdminNetworkLocation Banner Bitmap 0 0 374 44 1
BannerBmp
AdminNetworkLocation BannerLine Line0 44 376 0
1
-#AdminNetworkLocation Branding1 Text4 229 88 13
3 {&MSSWhiteSerif8}[ProductName]
-#AdminNetworkLocation Branding2 Text3 228 88 13
65537 [ProductName]
AdminNetworkLocation Browse PushButton 286 124 66 17
3 OOO_CONTROL_17 Back
AdminNetworkLocation Cancel PushButton 301 243 66 17
3 OOO_CONTROL_18 LBBrowse
AdminNetworkLocation DlgDesc Text21 23 249 25 65539
OOO_CONTROL_19
@@ -46,8 +44,6 @@ CancelSetup Yes PushButton 62 57 66
17 3 OOO_CONTROL_31 No
CustomerInformationBackPushButton 164 243 66 17
3 OOO_CONTROL_32 Next
CustomerInformationBanner Bitmap 0 0 374 44 1
BannerBmp
CustomerInformationBannerLine Line0 44 376 0
1
-#CustomerInformation Branding1 Text4 229 88 13
3 {&MSSWhiteSerif8}[ProductName]
-#CustomerInformation Branding2 Text3 228 88 13
65537 [ProductName]
CustomerInformationCancel PushButton 301 243 66 17
3 OOO_CONTROL_35 NameLabel
CustomerInformationCompanyEdit Edit21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 SerialLabel
CustomerInformationCompanyLabelText21 89 75 10
3 OOO_CONTROL_37 CompanyEdit
@@ -64,8 +60,6 @@ CustomerInformation SerialNumberMaskedEdit 21
138 237 17 2 ISX_SERIALNUM Radio
CustomSetupBackPushButton 164 243 66 17 3
OOO_CONTROL_46 Next
CustomSetupBanner Bitmap 0 0 374 44 1
BannerBmp
CustomSetupBannerLine Line0 44 376 0 1
-#CustomSetup Branding1 Text4 229 88 13 3
{&MSSWhiteSerif8}[ProductName]
-#CustomSetup Branding2 Text3 228 88 13 65537
[ProductName]
CustomSetupCancel PushButton 301 243 66 17 3
OOO_CONTROL_49 Tree
CustomSetupChangeFolderPushButton 301 203 66 17
3 OOO_CONTROL_50 Help
CustomSetupDetails PushButton 93 243 66 17 3
OOO_CONTROL_51 Back
@@ -83,8 +77,6 @@ CustomSetup SizeText241 133 120 50
3 OOO_CONTROL_61
CustomSetupTreeSelectionTree 8 70 220 118 7
_BrowseProperty ChangeFolder
CustomSetupTipsBanner Bitmap 0 0 374 44 1
BannerBmp
CustomSetupTipsBannerLine Line0 44 376 0
1
-#CustomSetupTips Branding1 Text4 229 88 1
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sc/qa sc/source
dev/null |binary
sc/qa/unit/data/xlsx/pivot-table/with-strings-integers-and-dates.xlsx |binary
sc/qa/unit/subsequent_export-test.cxx | 138
++
sc/source/filter/excel/xepivotxml.cxx | 65
+++-
4 files changed, 146 insertions(+), 57 deletions(-)
New commits:
commit 0c457ee0f069b5a53dbcf4480069568fdf201bd7
Author: Bartosz Kosiorek
Date: Tue Aug 15 07:35:35 2017 +0200
tdf#89139 Fix exporting of DateTime to CacheDefinition according to ISO 8601
With this commit, the date is saved in Excel format, like:
"2009-07-06T10:53:02"
We are now exporting attributes:
"minDate"
"maxDate"
"containsDate"
This is necessary to export properly .xlsx file. Without that MS Office 365
is displaying error, and it is not even trying displaying .xslx file content
Reviewed-on: https://gerrit.libreoffice.org/41162
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek
Change-Id: I1239f5582173afe99bf9178fd4edd1dc5ca28e8e
Reviewed-on: https://gerrit.libreoffice.org/41871
Reviewed-by: Mike Kaganski
Tested-by: Mike Kaganski
diff --git
a/sc/qa/unit/data/xlsx/pivot-table/with-strings-integers-and-dates.xlsx
b/sc/qa/unit/data/xlsx/pivot-table/with-strings-integers-and-dates.xlsx
new file mode 100644
index ..f343b51f98be
Binary files /dev/null and
b/sc/qa/unit/data/xlsx/pivot-table/with-strings-integers-and-dates.xlsx differ
diff --git a/sc/qa/unit/data/xlsx/pivot.xlsx b/sc/qa/unit/data/xlsx/pivot.xlsx
deleted file mode 100644
index e6297a91777b..
Binary files a/sc/qa/unit/data/xlsx/pivot.xlsx and /dev/null differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index b5965bcd5aa6..b76a69dc92e0 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -113,7 +113,8 @@ public:
void testFormatExportODS();
void testPivotTableExportXLSX();
-void testPivotExportXLSX();
+void testPivotCacheExportXLSX();
+
void testCommentExportXLSX();
void testCustomColumnWidthExportXLSX();
void testXfDefaultValuesXLSX();
@@ -221,7 +222,8 @@ public:
CPPUNIT_TEST(testFormatExportODS);
CPPUNIT_TEST(testPivotTableExportXLSX);
-CPPUNIT_TEST(testPivotExportXLSX);
+CPPUNIT_TEST(testPivotCacheExportXLSX);
+
CPPUNIT_TEST(testCommentExportXLSX);
CPPUNIT_TEST(testCustomColumnWidthExportXLSX);
CPPUNIT_TEST(testXfDefaultValuesXLSX);
@@ -552,63 +554,107 @@ void ScExportTest::testPivotTableExportXLSX()
assertXPath(pTable,
"/x:pivotTableDefinition/x:pivotFields/x:pivotField[3]/x:items/x:item[3]", "h",
"1");
}
-void ScExportTest::testPivotExportXLSX()
+void ScExportTest::testPivotCacheExportXLSX()
{
-//tdf#89139 FILESAVE xlsx pivot table corrupted after save with LO and
re-open with MS Office
-ScDocShellRef xShell = loadDoc("pivot.", FORMAT_XLSX);
+// tdf#89139 FILESAVE xlsx pivot table corrupted after save with LO and
re-open with MS Office
+// MS Excel is very sensitive for proper values of fields:
+// containsMixedTypes, containsSemiMixedTypes, containsInteger,
containsBlank
+// If it is not properly set, then Excel is not opening spreadsheet
properly.
+// This test case ensures, that such values are properly set according to
documentation:
+//
https://technet.microsoft.com/en-us/library/documentformat.openxml.spreadsheet.shareditems.aspx
+
+ScDocShellRef xShell =
loadDoc("pivot-table/with-strings-integers-and-dates.", FORMAT_XLSX);
CPPUNIT_ASSERT(xShell.Is());
std::shared_ptr pXPathFile =
ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
-xmlDocPtr pSheet = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/pivotCache/pivotCacheDefinition1.xml");
-CPPUNIT_ASSERT(pSheet);
+xmlDocPtr pCacheDef = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/pivotCache/pivotCacheDefinition1.xml");
+CPPUNIT_ASSERT(pCacheDef);
-assertXPath(pSheet, "/x:pivotCacheDefinition/x:cacheFields/x:cacheField",
5);
+assertXPath(pCacheDef,
"/x:pivotCacheDefinition/x:cacheFields/x:cacheField", 5);
// Four strings and one empty field
-assertXPath(pSheet,
"/x:pivotCacheDefinition/x:cacheFields/x:cacheField[1]", "name",
"imieinazwisko");
-assertXPath(pSheet,
"/x:pivotCacheDefinition/x:cacheFields/x:cacheField[1]/x:sharedItems",
"containsBlank", "1");
-assertXPathNoAttribute(pSheet,
"/x:pivotCacheDefinition/x:cacheFields/x:cacheField[1]/x:sharedItems",
"containsMixedTypes");
-assertXPathNoAttribute(pSheet,
"/x:pivotCacheDefinition/x:cacheFields/x:cacheField[1]/x:sharedItems",
"containsSemiMixedTypes");
-assertXPathNoAttribute(pSheet,
"/x:pivotCacheDefinition/x:cacheFields/x:cacheField[1]/x:sharedItems",
"containsString");
-assertXPathNoAttribute(pSheet,
"/
[Libreoffice-commits] core.git: icon-themes/breeze
icon-themes/breeze/cmd/lc_newwindow.png |binary icon-themes/breeze/cmd/sc_drawchart.png |binary icon-themes/breeze/cmd/sc_newwindow.png |binary 3 files changed New commits: commit 52c25a628d6cd300a0ff29f3c31e3528e3c4f8e1 Author: andreas kainz Date: Wed Aug 30 00:25:44 2017 +0200 some color view error was removed Change-Id: Idaebe57a51f589bf626dad9d989a9aefcf9cdfd8 Reviewed-on: https://gerrit.libreoffice.org/41718 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/icon-themes/breeze/cmd/lc_newwindow.png b/icon-themes/breeze/cmd/lc_newwindow.png index ca1978674798..534d825cadcd 100644 Binary files a/icon-themes/breeze/cmd/lc_newwindow.png and b/icon-themes/breeze/cmd/lc_newwindow.png differ diff --git a/icon-themes/breeze/cmd/sc_drawchart.png b/icon-themes/breeze/cmd/sc_drawchart.png index 7d8c1415e111..bd373d243bab 100644 Binary files a/icon-themes/breeze/cmd/sc_drawchart.png and b/icon-themes/breeze/cmd/sc_drawchart.png differ diff --git a/icon-themes/breeze/cmd/sc_newwindow.png b/icon-themes/breeze/cmd/sc_newwindow.png index 75663bc4ce00..da199f1fa17f 100644 Binary files a/icon-themes/breeze/cmd/sc_newwindow.png and b/icon-themes/breeze/cmd/sc_newwindow.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/field2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b3b2c4f1b140b68155891cfbfda9cd2b209f3d7c
Author: Tamás Zolnai
Date: Sun Sep 3 21:49:03 2017 +0200
Assertion when editing pattern field
Change-Id: Ia515382556329feeec359254d3be3f90d2fd17ad
Reviewed-on: https://gerrit.libreoffice.org/41870
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index dfcf63126fe1..3712fc004d24 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -368,7 +368,7 @@ static void ImplPatternProcessStrictModify( Edit* pEdit,
OUString aText = pEdit->GetText();
// remove leading blanks
-if ( bSameMask && !(nFormatFlags & PATTERN_FORMAT_EMPTYLITERALS) )
+if ( bSameMask && !(nFormatFlags & PATTERN_FORMAT_EMPTYLITERALS) &&
!rEditMask.isEmpty() )
{
sal_Int32 i = 0;
sal_Int32 nMaxLen = aText.getLength();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sw/qa sw/source
sw/qa/extras/ooxmlexport/data/tdf112169.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |5 +
sw/source/filter/ww8/ww8atr.cxx |4 +++-
3 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 30a1bb3737b36c4ac13719c003ddc51e9b634000
Author: Tamás Zolnai
Date: Sun Sep 3 14:56:48 2017 +0200
tdf#112169: Crash while saving character background color to DOCX
Reviewed-on: https://gerrit.libreoffice.org/41857
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai
(cherry picked from commit 242688f3b4fc7228637837e0f4fec3da71ac2710)
Change-Id: Iff12b9587b639166caef86f895fb841e83596817
Reviewed-on: https://gerrit.libreoffice.org/41866
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/qa/extras/ooxmlexport/data/tdf112169.odt
b/sw/qa/extras/ooxmlexport/data/tdf112169.odt
new file mode 100755
index ..51bb97f2e1e8
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf112169.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index e2c77dd280d7..f281144d70e2 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -631,6 +631,11 @@ DECLARE_OOXMLEXPORT_TEST(testTdf105095, "tdf105095.docx")
CPPUNIT_ASSERT(xTextRange->getString().endsWith("\tfootnote"));
}
+DECLARE_OOXMLEXPORT_TEST(tdf112169, "tdf112169.odt")
+{
+// LO crashed while export because of chararacter background color handling
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 5047e4f0d0bd..cad3bdb73020 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -5161,8 +5161,10 @@ void AttributeOutputBase::CharBackgroundBase( const
SvxBrushItem& rBrush )
bool bHasShadingMarker = false;
// Check shading marker
+const SfxPoolItem* pItem = GetExport().HasItem(RES_CHRATR_GRABBAG);
+if( pItem )
{
-const SfxGrabBagItem& aGrabBag = static_cast< const SfxGrabBagItem& >(
GetExport().GetItem( RES_CHRATR_GRABBAG ) );
+const SfxGrabBagItem aGrabBag = static_cast< const SfxGrabBagItem&
>(*pItem);
const std::map& rMap = aGrabBag.GetGrabBag();
auto aIterator = rMap.find("CharShadingMarker");
if( aIterator != rMap.end() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: drawinglayer/source sw/qa
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |8
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |4 ++--
sw/qa/extras/uiwriter/uiwriter.cxx |4 ++--
3 files changed, 12 insertions(+), 4 deletions(-)
New commits:
commit cf5b61967ef8647db663a1f0d699169b017916a7
Author: Caolán McNamara
Date: Thu Aug 31 16:22:58 2017 +0100
Resolves: tdf#112145 pdf export of editengine highlight color fails
sometimes
When setting a fill or line color on the outputdevice, put it back to its
previous
setting when finished with the record,
PRIMITIVE2D_ID_POLYPOLYGONCOLORPRIMITIVE2D
was the one in this case but protect the other similar ones here too
Change-Id: Ifb9b182d72bb6c48a9d9480270fde4384be6291e
Reviewed-on: https://gerrit.libreoffice.org/41761
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 4b02e95e6a92..d9455afc13c4 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1223,6 +1223,8 @@ namespace drawinglayer
}
else
{
+mpOutputDevice->Push(PushFlags::LINECOLOR |
PushFlags::FILLCOLOR);
+
// support SvtGraphicStroke MetaCommentAction
SvtGraphicStroke* pSvtGraphicStroke =
impTryToCreateSvtGraphicStroke(
rBasePolygon, nullptr,
@@ -1278,6 +1280,8 @@ namespace drawinglayer
}
impEndSvtGraphicStroke(pSvtGraphicStroke);
+
+mpOutputDevice->Pop();
}
break;
@@ -1657,6 +1661,7 @@ namespace drawinglayer
}
case PRIMITIVE2D_ID_POLYPOLYGONCOLORPRIMITIVE2D :
{
+mpOutputDevice->Push(PushFlags::LINECOLOR |
PushFlags::FILLCOLOR);
const primitive2d::PolyPolygonColorPrimitive2D&
rPolygonCandidate(static_cast< const primitive2d::PolyPolygonColorPrimitive2D&
>(rCandidate));
basegfx::B2DPolyPolygon
aLocalPolyPolygon(rPolygonCandidate.getB2DPolyPolygon());
@@ -1712,6 +1717,7 @@ namespace drawinglayer
impEndSvtGraphicFill(pSvtGraphicFill);
}
+mpOutputDevice->Pop();
break;
}
case PRIMITIVE2D_ID_MASKPRIMITIVE2D :
@@ -1782,6 +1788,7 @@ namespace drawinglayer
}
case PRIMITIVE2D_ID_UNIFIEDTRANSPARENCEPRIMITIVE2D :
{
+mpOutputDevice->Push(PushFlags::LINECOLOR |
PushFlags::FILLCOLOR);
// for metafile: Need to examine what the pure vcl version
is doing here actually
// - uses DrawTransparent with metafile for content and a
gradient
// - uses DrawTransparent for single PolyPolygons
directly. Can be detected by
@@ -1915,6 +1922,7 @@ namespace drawinglayer
}
}
+mpOutputDevice->Pop();
break;
}
case PRIMITIVE2D_ID_TRANSPARENCEPRIMITIVE2D :
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 30bb7462b725..475f29017104 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1281,10 +1281,10 @@ DECLARE_OOXMLIMPORT_TEST(testTdf100072,
"tdf100072.docx")
xmlDocPtr pXmlDoc = dumper.dumpAndParse(rMetaFile);
// Get first polyline rightside x coordinate
-sal_Int32 nFirstEnd = getXPath(pXmlDoc, "/metafile/polyline[1]/point[2]",
"x").toInt32();
+sal_Int32 nFirstEnd = getXPath(pXmlDoc,
"/metafile/push[1]/polyline[1]/point[2]", "x").toInt32();
// Get last stroke x coordinate
-sal_Int32 nSecondEnd = getXPath(pXmlDoc,
"/metafile/polyline[last()]/point[2]", "x").toInt32();
+sal_Int32 nSecondEnd = getXPath(pXmlDoc,
"/metafile/push[last()]/polyline[last()]/point[2]", "x").toInt32();
// Assert that the difference is less than half point.
CPPUNIT_ASSERT_MESSAGE("Shape line width does not match", abs(nFirstEnd -
nSecondEnd) < 10);
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 198b71443e10..e36ca6eb6da0 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -1492,10 +1492,10 @@ void SwUiWriterTest::testFdo87448()
// The first polyline in the document has a number of points to draw arcs,
// the last one jumps back to the start, so we call "end" the last but one.
-sal_Int32 nFirstEnd
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java |
5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 723487f415d8d0474f1de7d9f01eab2aa3db947e
Author: Tomaž Vajngerl
Date: Tue Aug 15 15:10:46 2017 +0200
android: prevent null pointer exception on start
Change-Id: Ifb59ba0cd634d9753f90716bda2af4f58d576afa
Reviewed-on: https://gerrit.libreoffice.org/41173
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git
a/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
b/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
index d3568216c159..cf5cd25647a1 100644
--- a/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
+++ b/android/source/src/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
@@ -930,7 +930,10 @@ class JavaPanZoomController
@Override
public boolean onDown(MotionEvent motionEvent) {
-mWaitForDoubleTap =
mTarget.getZoomConstraints().getAllowDoubleTapZoom();
+if (mTarget.getZoomConstraints() != null)
+mWaitForDoubleTap =
mTarget.getZoomConstraints().getAllowDoubleTapZoom();
+else
+mWaitForDoubleTap = false;
return false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/insdlg.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit e02c57f8ec8fd98764990eeadd9d349314762f0e Author: Andrea Gelmini Date: Sun Sep 3 19:29:53 2017 +0200 Removed duplicated include Change-Id: Id17744f8c2d48a04e1b5e64a11739605709fb6c3 Reviewed-on: https://gerrit.libreoffice.org/41865 Reviewed-by: Tamás Zolnai Tested-by: Tamás Zolnai diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 60d44685ca6b..0bb974c0799e 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -51,7 +51,6 @@ #include #include #include -#include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bfad65a0fbe0acfa490bafb40c5e5f30e45d
Author: Andrea Gelmini
Date: Sun Sep 3 20:49:49 2017 +0200
Fix typos
Change-Id: I0ce33d497d405398145653b9b7da81bd066f68e1
Reviewed-on: https://gerrit.libreoffice.org/41868
Reviewed-by: Tamás Zolnai
Tested-by: Tamás Zolnai
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index e2647a821854..7dbd94bb910f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -1044,7 +1044,7 @@ DECLARE_OOXMLEXPORT_TEST(testActiveXOptionButtonGroup,
"activex_option_button_gr
DECLARE_OOXMLEXPORT_TEST(tdf112169, "tdf112169.odt")
{
-// LO crashed while export because of chararacter background color handling
+// LO crashed while export because of character background color handling
}
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/win
vcl/win/gdi/salfont.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit c3b7c4d3ec6edb5db774d535b77239175f96
Author: Julien Nabet
Date: Sun Sep 3 14:31:11 2017 +0200
tdf#112180: avoid crash with specific ttf
by synchronizing announced size of data (mnByteCount)
with the real size of data (mpRawBytes)
Change-Id: I973bec9deb1150b630d1df32c89b33c253e4b3d2
Reviewed-on: https://gerrit.libreoffice.org/41860
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 360de5368aaa..dc6d2c51692b 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -126,6 +126,9 @@ RawFontData::RawFontData( HDC hDC, DWORD nTableTag )
if( nRawDataOfs != mnByteCount )
{
mpRawBytes.reset();
+// mnByteCount must correspond to mpRawBytes length
+SAL_WARN( "vcl", "Raw data of font is incomplete: " << nRawDataOfs <<
" byte(s) found whereas " << mnByteCount << " byte(s) expected!" );
+mnByteCount = 0;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/tdf112169.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |5 +
sw/source/filter/ww8/ww8atr.cxx |4 +++-
3 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 242688f3b4fc7228637837e0f4fec3da71ac2710
Author: Tamás Zolnai
Date: Sun Sep 3 14:56:48 2017 +0200
tdf#112169: Crash while saving character background color to DOCX
Change-Id: Iff12b9587b639166caef86f895fb841e83596817
Reviewed-on: https://gerrit.libreoffice.org/41857
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai
diff --git a/sw/qa/extras/ooxmlexport/data/tdf112169.odt
b/sw/qa/extras/ooxmlexport/data/tdf112169.odt
new file mode 100755
index ..51bb97f2e1e8
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf112169.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 3867f468649b..e2647a821854 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -1042,6 +1042,11 @@ DECLARE_OOXMLEXPORT_TEST(testActiveXOptionButtonGroup,
"activex_option_button_gr
CPPUNIT_ASSERT_EQUAL(sGroupName, getProperty(xPropertySet,
"GroupName"));
}
+DECLARE_OOXMLEXPORT_TEST(tdf112169, "tdf112169.odt")
+{
+// LO crashed while export because of chararacter background color handling
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 6ba8e5dcd977..7340b13dd32b 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -5173,8 +5173,10 @@ void AttributeOutputBase::CharBackgroundBase( const
SvxBrushItem& rBrush )
bool bHasShadingMarker = false;
// Check shading marker
+const SfxPoolItem* pItem = GetExport().HasItem(RES_CHRATR_GRABBAG);
+if( pItem )
{
-const SfxGrabBagItem& aGrabBag = static_cast< const SfxGrabBagItem& >(
GetExport().GetItem( RES_CHRATR_GRABBAG ) );
+const SfxGrabBagItem aGrabBag = static_cast< const SfxGrabBagItem&
>(*pItem);
const std::map& rMap = aGrabBag.GetGrabBag();
auto aIterator = rMap.find("CharShadingMarker");
if( aIterator != rMap.end() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/Library_svx.mk
svx/Library_svx.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit bc87d93787a5249759640a7af70846292758cd24 Author: jan Iversen Date: Sat Sep 2 17:23:23 2017 +0200 iOS, avmedia lib not used Change-Id: I13636250552211fa53039178851a64b9e2715cef diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index d1c310fe29af..825b6c172487 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -41,7 +41,8 @@ $(eval $(call gb_Library_add_defs,svx,\ $(eval $(call gb_Library_set_precompiled_header,svx,$(SRCDIR)/svx/inc/pch/precompiled_svx)) $(eval $(call gb_Library_use_libraries,svx,\ -avmedia\ +$(if $(filter-out $(OS),IOS), \ +avmedia) \ basegfx \ sb \ comphelper \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Weekly QA Report (W34-2017)
Hello, What have happened in QA in the last 9 days? * 153 have been created, of which, 58 are still unconfirmed ( Total Unconfirmed bugs: 469 ) Link: http://tinyurl.com/y764m5v4 * 1298 comments have been written. == STATUS CHANGED == * 14 bugs have been changed to 'ASSIGNED'. Link: http://tinyurl.com/y72ngcb8 Done by: Julien Nabet ( 5 ), Shubham Gupta ( 2 ), Tamás Zolnai ( 1 ), kshitijpathania ( 1 ), Gabor Kelemen ( 1 ), Eike Rathke ( 1 ), Dennis Francis ( 1 ), Caolán McNamara ( 1 ), Aron Budea ( 1 ) * 2 bugs have been changed to 'CLOSED'. Link: http://tinyurl.com/y9c5c3jj Done by: Regina Henschel ( 1 ), Eike Rathke ( 1 ) * 25 bugs have been changed to 'NEEDINFO'. Link: http://tinyurl.com/yd66j7o4 Done by: Regina Henschel ( 4 ), Alex Thurgood ( 4 ), Buovjaga ( 3 ), Jacques Guilleron ( 3 ), Timur ( 3 ), Xisco Faulí ( 2 ), Julien Nabet ( 2 ), Heiko Tietze ( 1 ), Muhammet Kara ( 1 ), m.a.riosv ( 1 ), Caolán McNamara ( 1 ) * 96 bugs have been changed to 'NEW'. Link: http://tinyurl.com/yb7y7u9e Done by: Buovjaga ( 20 ), raal ( 12 ), Tamás Zolnai ( 7 ), Dieter Praas ( 7 ), Jean-Baptiste Faure ( 6 ), Yousuf Philips (jay) ( 5 ), Jacques Guilleron ( 5 ), V Stuart Foote ( 4 ), Heiko Tietze ( 4 ), Aron Budea ( 4 ), Telesto ( 2 ), Timur ( 2 ), eisa01 ( 2 ), Xisco Faulí ( 1 ), Thorsten Behrens (CIB) ( 1 ), Julien Nabet ( 1 ), robert ( 1 ), Regina Henschel ( 1 ), Olivier Hallot ( 1 ), Maxim Monastirsky ( 1 ), Mike Kaganski ( 1 ), Mihkel Tõnnov ( 1 ), andreas_k ( 1 ), Alex Thurgood ( 1 ), Frederic Parrenin ( 1 ), Adolfo Jayme ( 1 ), Cor Nouws ( 1 ), admin ( 1 ), Freischreiber ( 1 ) * 1 bug has been changed to 'REOPENED'. Link: http://tinyurl.com/ya5ofs8l Done by: Timur ( 1 ) * 33 bugs have been changed to 'RESOLVED DUPLICATE'. Link: http://tinyurl.com/y8ssppo5 Done by: eisa01 ( 6 ), Timur ( 4 ), Aron Budea ( 4 ), Armin Le Grand (CIB) ( 3 ), Heiko Tietze ( 2 ), Telesto ( 2 ), Julien Nabet ( 2 ), Alex Thurgood ( 2 ), Buovjaga ( 1 ), Andras Timar ( 1 ), Thomas Lendo ( 1 ), Regina Henschel ( 1 ), raal ( 1 ), Yousuf Philips (jay) ( 1 ), miles ( 1 ), m.a.riosv ( 1 ) * 60 bugs have been changed to 'RESOLVED FIXED'. Link: http://tinyurl.com/y965a6hq Done by: Heiko Tietze ( 6 ), Tamás Zolnai ( 5 ), Caolán McNamara ( 5 ), Julien Nabet ( 4 ), Takeshi Abe ( 3 ), Michael Stahl ( 3 ), Adolfo Jayme ( 3 ), Miklos Vajna ( 2 ), Paul Trojahn ( 2 ), Olivier Hallot ( 2 ), Gabor Kelemen ( 2 ), Timur ( 2 ), Eike Rathke ( 2 ), admin ( 2 ), Armin Le Grand (CIB) ( 2 ), yossizahn ( 1 ), V Stuart Foote ( 1 ), Stephan Bergmann ( 1 ), Samson ( 1 ), pierre.sauter ( 1 ), Patrick Jaap ( 1 ), Mike Kaganski ( 1 ), Luke Deller ( 1 ), Laurent BP ( 1 ), Justin L ( 1 ), Jean-Baptiste Faure ( 1 ), Jens Carl ( 1 ), Henry Castro ( 1 ), Dennis Francis ( 1 ), Aron Budea ( 1 ) * 1 bug has been changed to 'RESOLVED INSUFFICIENTDATA'. Link: http://tinyurl.com/y6ublod6 Done by: admin ( 1 ) * 2 bugs have been changed to 'RESOLVED INVALID'. Link: http://tinyurl.com/yc3rfyh4 Done by: V Stuart Foote ( 1 ), Adolfo Jayme ( 1 ) * 7 bugs have been changed to 'RESOLVED NOTABUG'. Link: http://tinyurl.com/y7xprzx2 Done by: Regina Henschel ( 1 ), m.a.riosv ( 1 ), Luis ( 1 ), Justin L ( 1 ), Adolfo Jayme ( 1 ), eisa01 ( 1 ), admin ( 1 ) * 4 bugs have been changed to 'RESOLVED NOTOURBUG'. Link: http://tinyurl.com/ydyny9vy Done by: Buovjaga ( 1 ), Julien Nabet ( 1 ), Rene Engelhard ( 1 ), eisa01 ( 1 ) * 12 bugs have been changed to 'RESOLVED WONTFIX'. Link: http://tinyurl.com/y6w284n4 Done by: Heiko Tietze ( 6 ), Timur ( 3 ), Buovjaga ( 1 ), Yousuf Philips (jay) ( 1 ), Alex Thurgood ( 1 ) * 31 bugs have been changed to 'RESOLVED WORKSFORME'. Link: http://tinyurl.com/yd6rqgrs Done by: eisa01 ( 13 ), Heiko Tietze ( 4 ), Timur ( 3 ), Samson ( 2 ), raal ( 2 ), V Stuart Foote ( 1 ), Buovjaga ( 1 ), robert ( 1 ), Jean-Baptiste Faure ( 1 ), fiftyigfuci_f_mi ( 1 ), just-me ( 1 ), Aron Budea ( 1 ) * 19 bugs have been changed to 'UNCONFIRMED'. Link: http://tinyurl.com/yc23sl76 Done by: Andrey ( 2 ), tropikhajma ( 1 ), Buovjaga ( 1 ), Telesto ( 1 ), Elmar ( 1 ), Libomark ( 1 ), Luis ( 1 ), kiloran.public+bugzilla ( 1 ), Alex Thurgood ( 1 ), Hermann Döppes ( 1 ), halima ( 1 ), Jacques Guilleron ( 1 ), Timur ( 1 ), Francisco Lima ( 1 ), David Lynch ( 1 ), Daniel ( 1 ), Sandy Scott ( 1 ), Dimitri Bouron ( 1 ) * 12 bugs have been changed to 'VERIFIED FIXED'. Link: http://tinyurl.com/y8v7jf4r Done by: Timur ( 5 ), Buovjaga ( 2 ), Alex ARNAUD ( 2 ), Jean-Baptiste Faure ( 1 ), Jacques Guilleron ( 1 ), Cor Nouws ( 1 ) == KEYWORDS ADDED == * 'accessibility' has been added to 2 bugs. Link: http://tinyurl.com/y86c23pn Done by: Alex Thurgood ( 1 ), Christoph ( 1 ) * 'bibisectRequest' has been added to 3 bugs. Link: http://tinyurl.com/yaccpye5 Done by: Buovjaga ( 1 ), Alex Thurgood ( 1 ), Jacques Guilleron ( 1 )
[Libreoffice-commits] core.git: avmedia/source include/avmedia sc/source sd/source sw/source
avmedia/source/framework/mediacontrol.cxx |2 +-
avmedia/source/viewer/mediawindow.cxx |7 ---
include/avmedia/mediawindow.hxx |2 +-
sc/source/ui/drawfunc/fuins1.cxx |5 ++---
sd/source/ui/func/fuinsert.cxx|3 +--
sw/source/uibase/shells/grfshex.cxx |3 +--
6 files changed, 10 insertions(+), 12 deletions(-)
New commits:
commit 1abd3b0e00766a6674d965535bd18a4891bac06e
Author: Caolán McNamara
Date: Sat Sep 2 21:30:40 2017 +0100
set parent for insert media file dialog
Change-Id: I71eace1995b229caa75e61df363fd8bad981bed1
Reviewed-on: https://gerrit.libreoffice.org/41851
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/avmedia/source/framework/mediacontrol.cxx
b/avmedia/source/framework/mediacontrol.cxx
index b3dbf8f21cef..98706fc8a679 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -296,7 +296,7 @@ IMPL_LINK( MediaControl, implSelectHdl, ToolBox*, p, void )
{
OUString aURL;
- if (MediaWindow::executeMediaURLDialog(aURL, nullptr))
+ if (MediaWindow::executeMediaURLDialog(this, aURL, nullptr))
{
if( !MediaWindow::isMediaURL( aURL, ""/*TODO?*/, true ) )
MediaWindow::executeFormatErrorBox( this );
diff --git a/avmedia/source/viewer/mediawindow.cxx
b/avmedia/source/viewer/mediawindow.cxx
index 93774aab821f..304384cb2761 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -209,11 +209,12 @@ void MediaWindow::getMediaFilters( FilterNameVector&
rFilterNameVector )
}
-bool MediaWindow::executeMediaURLDialog(OUString& rURL, bool *const o_pbLink)
+bool MediaWindow::executeMediaURLDialog(const vcl::Window* pParent, OUString&
rURL, bool *const o_pbLink)
{
-::sfx2::FileDialogHelperaDlg( o_pbLink
+::sfx2::FileDialogHelperaDlg(o_pbLink
? ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW
-: ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE );
+: ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
+FileDialogFlags::NONE, pParent);
static const char aWildcard[] = "*.";
FilterNameVectoraFilters;
static const char aSeparator[] = ";";
diff --git a/include/avmedia/mediawindow.hxx b/include/avmedia/mediawindow.hxx
index f5dd652f2cd6..a285e26474fc 100644
--- a/include/avmedia/mediawindow.hxx
+++ b/include/avmedia/mediawindow.hxx
@@ -98,7 +98,7 @@ namespace avmedia
static void getMediaFilters( FilterNameVector&
rFilterNameVector );
/// @param o_pbLink if not 0, this is an "insert" dialog: display link
/// checkbox and store its state in *o_pbLink
-static bool executeMediaURLDialog( OUString& rURL, bool *const
o_pbLink );
+static bool executeMediaURLDialog(const vcl::Window* pParent,
OUString& rURL, bool *const o_pbLink);
static void executeFormatErrorBox( vcl::Window* pParent );
static bool isMediaURL( const OUString& rURL, const OUString&
rReferer, bool bDeep = false, Size* pPreferredSizePixel = nullptr );
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index 1177c90e9d84..00a612e2eefe 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -290,7 +290,7 @@ FuInsertGraphic::~FuInsertGraphic()
}
FuInsertMedia::FuInsertMedia( ScTabViewShell* pViewSh,
- vcl::Window* pWin,
+ vcl::Window* pWin,
ScDrawView* pViewP,
SdrModel* pDoc,
const SfxRequest& rReq ) :
@@ -312,8 +312,7 @@ FuInsertMedia::FuInsertMedia( ScTabViewShell* pViewSh,
}
bool bLink(true);
-if (bAPI ||
-::avmedia::MediaWindow::executeMediaURLDialog(aURL, & bLink))
+if (bAPI || ::avmedia::MediaWindow::executeMediaURLDialog(pWin, aURL,
&bLink))
{
Size aPrefSize;
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index e1e4c1e42e8f..67efed274d2b 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -708,8 +708,7 @@ void FuInsertAVMedia::DoExecute( SfxRequest& rReq )
}
bool bLink(true);
-if (bAPI ||
-::avmedia::MediaWindow::executeMediaURLDialog(aURL, & bLink))
+if (bAPI || ::avmedia::MediaWindow::executeMediaURLDialog(mpWindow, aURL,
& bLink))
{
Size aPrefSize;
diff --git a/sw/source/uibase/shells/grfshex.cxx
b/sw/source/uibase/shells/grfshex.cxx
index cf3c3589fc9a..a8f92194cbb9 100644
--- a/sw/source/uibase/shells/grfshex.cxx
+++ b/sw/source/uibase/shells/grfshex.cxx
@@ -74,8
[Libreoffice-commits] core.git: include/svl
include/svl/itempool.hxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit b625d790bf1ccab1b4071ea7670a6e1ceab5fb64
Author: Jochen Nitschke
Date: Sat Sep 2 20:04:20 2017 +0200
SfxItemPool::AddRef always adds 1
Change-Id: I710ff662ed5b8a77d228e49804d3de418899c76b
Reviewed-on: https://gerrit.libreoffice.org/41859
Tested-by: Jenkins
Reviewed-by: Jochen Nitschke
diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx
index 90138c93889a..b148f0aee5d4 100644
--- a/include/svl/itempool.hxx
+++ b/include/svl/itempool.hxx
@@ -81,7 +81,7 @@ public:
protected:
static inline void ClearRefCount(SfxPoolItem& rItem);
-static inline void AddRef(const SfxPoolItem& rItem,
sal_uInt32 n = 1);
+static inline void AddRef(const SfxPoolItem& rItem);
static inline sal_uInt32ReleaseRef(const SfxPoolItem& rItem,
sal_uInt32 n = 1);
public:
@@ -194,9 +194,9 @@ inline void SfxItemPool::ClearRefCount(SfxPoolItem& rItem)
}
// only the pool may manipulate the reference counts
-inline void SfxItemPool::AddRef(const SfxPoolItem& rItem, sal_uInt32 n)
+inline void SfxItemPool::AddRef(const SfxPoolItem& rItem)
{
-rItem.AddRef(n);
+rItem.AddRef();
}
// only the pool may manipulate the reference counts
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sal
include/sal/backtrace.hxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 09ae0a74bb946bc64fbc76082a52064a36ee9b01
Author: Julien Nabet
Date: Sat Sep 2 23:58:19 2017 +0200
Fix leak BacktraceState (enable-dbgutil)
buffer is created from sal/osl/unx/backtraceapi.cxx with:
70 auto b1 = new void *[maxDepth];
71 int n = backtrace(b1, static_cast(maxDepth));
72 return std::unique_ptr(new BacktraceState{ b1, n });
and from sal/osl/w32/backtrace.cxx with:
79 auto pStack = new void *[maxDepth];
80 //
https://msdn.microsoft.com/en-us/library/windows/desktop/bb204633.aspx
81 // "CaptureStackBackTrace function" claims that you "can capture up
to
82 // MAXUSHORT frames", and on Windows Server 2003 and Windows XP it
even
83 // "must be less than 63", but assume that a too large input value is
84 // clamped internally, instead of resulting in an error:
85 int nFrames = CaptureStackBackTrace( 0,
static_cast(maxDepth), pStack, nullptr );
86
87 return std::unique_ptr(new BacktraceState{ pStack,
nFrames });
Introduced with:
https://cgit.freedesktop.org/libreoffice/core/commit/?id=bc9a2ba677ce3fcd46c2bbef6e8faeacb14292c1
Change-Id: Iea0528f5d2b38ff1f3dc4bd50ff035bb100ab981
Reviewed-on: https://gerrit.libreoffice.org/41854
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/sal/backtrace.hxx b/include/sal/backtrace.hxx
index 2c854e102eef..f437a3b73620 100644
--- a/include/sal/backtrace.hxx
+++ b/include/sal/backtrace.hxx
@@ -29,6 +29,7 @@
struct BacktraceState {
void** buffer;
int nDepth;
+~BacktraceState() {delete[] buffer;}
};
SAL_DLLPUBLIC std::unique_ptr SAL_CALL sal_backtrace_get(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source
svl/source/inc/poolio.hxx |2 --
svl/source/items/itempool.cxx |4 +---
2 files changed, 1 insertion(+), 5 deletions(-)
New commits:
commit e0883b6f6a1018d6d7538fc9ddeca3f623918b48
Author: Jochen Nitschke
Date: Sat Sep 2 11:22:04 2017 +0200
SfxItemPool_Impl::nInitRefCount is always 1
since removal of serialisation code
Change-Id: I8cbd7ecd3d4bb61a8d9e6bc098f09f43c02a8f4c
Reviewed-on: https://gerrit.libreoffice.org/41850
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx
index 8318ff52fa8b..a6596e6bd989 100644
--- a/svl/source/inc/poolio.hxx
+++ b/svl/source/inc/poolio.hxx
@@ -83,7 +83,6 @@ struct SfxItemPool_Impl
sal_uInt16* mpPoolRanges;
sal_uInt16 mnStart;
sal_uInt16 mnEnd;
-sal_uInt16 nInitRefCount; // 1, during load, may be 2
MapUnit eDefMetric;
SfxItemPool_Impl( SfxItemPool* pMaster, const OUString& rName, sal_uInt16
nStart, sal_uInt16 nEnd )
@@ -96,7 +95,6 @@ struct SfxItemPool_Impl
, mpPoolRanges(nullptr)
, mnStart(nStart)
, mnEnd(nEnd)
-, nInitRefCount(0)
, eDefMetric(MapUnit::MapCM)
{
DBG_ASSERT(mnStart, "Start-Which-Id must be greater 0" );
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index 3f78b19f2e8c..10a8761eb3bb 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -176,7 +176,6 @@ SfxItemPool::SfxItemPool
pImpl( new SfxItemPool_Impl( this, rName, nStartWhich, nEndWhich ) )
{
pImpl->eDefMetric = MapUnit::MapTwip;
-pImpl->nInitRefCount = 1;
if ( pDefaults )
SetDefaults(pDefaults);
@@ -201,7 +200,6 @@ SfxItemPool::SfxItemPool
pImpl( new SfxItemPool_Impl( this, rPool.pImpl->aName,
rPool.pImpl->mnStart, rPool.pImpl->mnEnd ) )
{
pImpl->eDefMetric = rPool.pImpl->eDefMetric;
-pImpl->nInitRefCount = 1;
// Take over static Defaults
if ( bCloneStaticDefaults )
@@ -695,7 +693,7 @@ const SfxPoolItem& SfxItemPool::Put( const SfxPoolItem&
rItem, sal_uInt16 nWhich
assert((!IsItemPoolable(*pNewItem) || *pNewItem == rItem)
&& "SfxItemPool::Put(): unequal items: no operator== override?");
}
-AddRef( *pNewItem, pImpl->nInitRefCount );
+AddRef( *pNewItem );
// 4. finally insert into the pointer array
assert( pItemArr->maPtrToIndex.find(pNewItem) ==
pItemArr->maPtrToIndex.end() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
