[Libreoffice-commits] core.git: include/editeng include/sfx2 include/svl include/svx sc/inc sfx2/source svl/source

2021-07-04 Thread Noel Grandin (via logerrit) 
 include/editeng/scripttypeitem.hxx |2 -
 include/sfx2/tabdlg.hxx|1 
 include/svl/poolitem.hxx   |   28 ---
 include/svl/setitem.hxx|   52 +
 include/svx/pageitem.hxx   |2 -
 include/svx/xflasit.hxx|2 -
 include/svx/xlnasit.hxx|2 -
 sc/inc/patattr.hxx |2 -
 sfx2/source/control/shell.cxx  |1 
 svl/source/items/itempool.cxx  |1 
 svl/source/items/itemset.cxx   |1 
 svl/source/items/poolcach.cxx  |1 
 svl/source/items/sitem.cxx |1 
 13 files changed, 63 insertions(+), 33 deletions(-)

New commits:
commit 9f669d2271d5ac64e4cd38ba450fb4ce3dadd5f2
Author: Noel Grandin 
AuthorDate: Sat Jul 3 21:18:24 2021 +0200
Commit: Noel Grandin 
CommitDate: Sun Jul 4 16:12:17 2021 +0200

move SfxSetItem to own header file

Change-Id: I77ba873ed236091443627e26e6127e89cd8e15bd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118360
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/editeng/scripttypeitem.hxx 
b/include/editeng/scripttypeitem.hxx
index e69ea0bdc4da..bfe84f5f6a9a 100644
--- a/include/editeng/scripttypeitem.hxx
+++ b/include/editeng/scripttypeitem.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_EDITENG_SCRIPTTYPEITEM_HXX
 
 #include 
-#include 
+#include 
 #include 
 
 class EDITENG_DLLPUBLIC SvxScriptSetItem final : public SfxSetItem
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index e6aee128f4bf..7d338e40c342 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 class SfxTabPage;
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index 7dbd7d85c24b..ba22aed9a9cc 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -305,34 +305,6 @@ public:
 virtual boolIsVoidItem() const override;
 };
 
-class SVL_DLLPUBLIC SfxSetItem: public SfxPoolItem
-{
-std::unique_ptr  pSet;
-
-SfxSetItem & operator=( const SfxSetItem& ) = delete;
-
-public:
-SfxSetItem( sal_uInt16 nWhich, 
std::unique_ptr & );
-SfxSetItem( sal_uInt16 nWhich, const SfxItemSet 
 );
-SfxSetItem( const SfxSetItem&, SfxItemPool *pPool 
= nullptr );
-virtual ~SfxSetItem() override;
-
-virtual booloperator==( const SfxPoolItem& ) const override;
-
-virtual bool GetPresentation( SfxItemPresentation ePres,
-MapUnit eCoreMetric,
-MapUnit ePresMetric,
-OUString ,
-const IntlWrapper& ) const override;
-
-// create a copy of itself
-virtual SfxSetItem* Clone( SfxItemPool *pPool = nullptr ) const 
override = 0;
-
-const SfxItemSet&   GetItemSet() const
-{ return *pSet; }
-SfxItemSet& GetItemSet()
-{ return *pSet; }
-};
 
 class SVL_DLLPUBLIC SfxPoolItemHint final : public SfxHint
 {
diff --git a/include/svl/setitem.hxx b/include/svl/setitem.hxx
new file mode 100644
index ..81f832b756ae
--- /dev/null
+++ b/include/svl/setitem.hxx
@@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include 
+
+#include 
+#include 
+
+class SVL_DLLPUBLIC SfxSetItem : public SfxPoolItem
+{
+std::unique_ptr pSet;
+
+SfxSetItem& operator=(const SfxSetItem&) = delete;
+
+public:
+SfxSetItem(sal_uInt16 nWhich, std::unique_ptr&& pSet);
+SfxSetItem(sal_uInt16 nWhich, const SfxItemSet& rSet);
+SfxSetItem(const SfxSetItem&, SfxItemPool* pPool = nullptr);
+virtual ~SfxSetItem() override;
+
+virtual bool operator==(const SfxPoolItem&) const override;
+
+virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit 
eCoreMetric,
+ MapUnit ePresMetric, OUString& rText,
+

[Libreoffice-commits] core.git: include/editeng include/sfx2 include/svx starmath/inc starmath/sdi starmath/source

2018-01-04 Thread Noel Grandin 
 include/editeng/editids.hrc |2 -
 include/sfx2/sfxsids.hrc|   49 +---
 include/svx/svxids.hrc  |   41 
 starmath/inc/starmath.hrc   |2 -
 starmath/inc/view.hxx   |2 -
 starmath/sdi/smath.sdi  |2 -
 starmath/sdi/smslots.sdi|2 -
 starmath/source/dialog.cxx  |4 +--
 starmath/source/view.cxx|4 +--
 9 files changed, 32 insertions(+), 76 deletions(-)

New commits:
commit 08209f2b67cf84b96dd03c90d87bc2d8dad26c8c
Author: Noel Grandin 
Date:   Thu Jan 4 10:21:24 2018 +0200

de-duplicate some defines in hrc files

and rename SID_INSERTSYMBOL -> SID_INSERTSPECIAL in starmath to make it
unique

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

diff --git a/include/editeng/editids.hrc b/include/editeng/editids.hrc
index f728255f4285..5921eff49866 100644
--- a/include/editeng/editids.hrc
+++ b/include/editeng/editids.hrc
@@ -138,8 +138,6 @@
 #error Resource-Overflow in #line, #file
 #endif
 
-#define SID_DRAW_TEXT_VERTICAL
SID_ATTR_CHAR_VERTICAL
-
 #endif
 
 // *** EOF
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 995f3641a744..8ded365cdc6e 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -550,41 +550,41 @@
 // SlotIds for Basic ---
 #define SID_BASICIDE_TOGGLEBRKPNT   ( SID_BASICIDE_START +  0 )
 #define SID_BASICIDE_ADDWATCH   ( SID_BASICIDE_START +  1 )
-#define SID_BASICIDE_APPEAR ( SID_BASICIDE_START + 15 )
-#define SID_BASICIDE_BRKPNTSCHANGED ( SID_BASICIDE_START + 36 )
 #define SID_BASICIDE_CHOOSEMACRO( SID_BASICIDE_START +  2 )
-#define SID_BASICIDE_CREATEMACRO( SID_BASICIDE_START +  4 )
-#define SID_BASICIDE_DELETECURRENT  ( SID_BASICIDE_START + 22 )
 #define SID_BASICIDE_EDITMACRO  ( SID_BASICIDE_START +  3 )
-#define SID_BASICIDE_HIDECURPAGE( SID_BASICIDE_START + 10 )
-#define SID_BASICIDE_LIBLOADED  ( SID_BASICIDE_START + 27 )
-#define SID_BASICIDE_LIBSELECTOR( SID_BASICIDE_START + 19 )
-#define SID_BASICIDE_LIBSELECTED( SID_BASICIDE_START + 18 )
-#define SID_BASICIDE_LIBREMOVED ( SID_BASICIDE_START + 28 )
-#define SID_BASICIDE_ARG_LIBNAME( SID_BASICIDE_START + 34 )
-#define SID_BASICIDE_MATCHGROUP ( SID_BASICIDE_START + 14 )
+#define SID_BASICIDE_CREATEMACRO( SID_BASICIDE_START +  4 )
 #define SID_BASICIDE_MODULEDLG  ( SID_BASICIDE_START +  5 )
-#define SID_BASICIDE_NAMECHANGEDONTAB   ( SID_BASICIDE_START + 11 )
-#define SID_BASICIDE_ARG_TABID  ( SID_BASICIDE_START + 30 )
-#define SID_BASICIDE_ARG_MACROINFO  ( SID_BASICIDE_START + 32 )
-#define SID_BASICIDE_ARG_MODULENAME ( SID_BASICIDE_START + 35 )
-#define SID_BASICIDE_ARG_SBX( SID_BASICIDE_START + 31 )
-#define SID_BASICIDE_NEWMODULE  ( SID_BASICIDE_START + 21 )
-#define SID_BASICIDE_NEWDIALOG  ( SID_BASICIDE_START + 20 )
 #define SID_BASICIDE_OBJCAT ( SID_BASICIDE_START +  6 )
 #define SID_BASICIDE_REMOVEWATCH( SID_BASICIDE_START +  7 )
+#define SID_BASICIDE_SHOWSBX( SID_BASICIDE_START +  9 )
+#define SID_BASICIDE_HIDECURPAGE( SID_BASICIDE_START + 10 )
+#define SID_BASICIDE_NAMECHANGEDONTAB   ( SID_BASICIDE_START + 11 )
+#define SID_BASICIDE_UPDATEMODULESOURCE ( SID_BASICIDE_START + 12 )
+#define SID_BASICIDE_STOREMODULESOURCE  ( SID_BASICIDE_START + 13 )
+#define SID_BASICIDE_MATCHGROUP ( SID_BASICIDE_START + 14 )
+#define SID_BASICIDE_APPEAR ( SID_BASICIDE_START + 15 )
+#define SID_BASICIDE_STOREALLMODULESOURCES  ( SID_BASICIDE_START + 16 )
+#define SID_BASICIDE_UPDATEALLMODULESOURCES ( SID_BASICIDE_START + 17 )
+#define SID_BASICIDE_LIBSELECTED( SID_BASICIDE_START + 18 )
+#define SID_BASICIDE_LIBSELECTOR( SID_BASICIDE_START + 19 )
+#define SID_BASICIDE_NEWDIALOG  ( SID_BASICIDE_START + 20 )
+#define SID_BASICIDE_NEWMODULE  ( SID_BASICIDE_START + 21 )
+#define SID_BASICIDE_DELETECURRENT  ( SID_BASICIDE_START + 22 )
 #define SID_BASICIDE_RENAMECURRENT  ( SID_BASICIDE_START + 23 )
 #define SID_BASICIDE_SBXDELETED ( SID_BASICIDE_START + 24 )
 #define SID_BASICIDE_SBXINSERTED( SID_BASICIDE_START + 25 )
 #define SID_BASICIDE_SBXRENAMED ( SID_BASICIDE_START + 26 )
-#define SID_BASICIDE_SHOWSBX( SID_BASICIDE_START +  9 )
+#define SID_BASICIDE_LIBLOADED

[Libreoffice-commits] core.git: include/editeng include/sfx2 include/svx sc/inc sc/source sd/source sfx2/source svx/source sw/source vcl/source

2017-02-19 Thread Julien Nabet 
 include/editeng/txtrange.hxx |4 ++--
 include/sfx2/chalign.hxx |2 +-
 include/svx/svdmrkv.hxx  |2 +-
 include/svx/unoprov.hxx  |2 +-
 sc/inc/datauno.hxx   |4 ++--
 sc/source/core/data/validat.cxx  |2 +-
 sc/source/core/tool/interpr4.cxx |2 +-
 sc/source/filter/inc/scflt.hxx   |   10 +-
 sc/source/ui/unoobj/cellsuno.cxx |2 +-
 sc/source/ui/view/gridwin.cxx|2 +-
 sd/source/ui/app/sddll.cxx   |2 +-
 sd/source/ui/func/fusel.cxx  |2 +-
 sd/source/ui/view/sdview3.cxx|2 +-
 sfx2/source/appl/workwin.cxx |4 ++--
 sfx2/source/dialog/templdlg.cxx  |2 +-
 svx/source/engine3d/scene3d.cxx  |2 +-
 svx/source/svdraw/svdpage.cxx|   12 ++--
 svx/source/unodraw/unoprov.cxx   |2 +-
 svx/source/unodraw/unoshap3.cxx  |2 +-
 sw/source/core/layout/frmtool.cxx|2 +-
 sw/source/uibase/app/swdll.cxx   |6 +++---
 sw/source/uibase/dochdl/swdtflvr.cxx |2 +-
 sw/source/uibase/ribbar/drawbase.cxx |2 +-
 sw/source/uibase/uiview/viewdraw.cxx |2 +-
 sw/source/uibase/wrtsh/wrtsh1.cxx|2 +-
 vcl/source/filter/sgvmain.hxx|2 +-
 26 files changed, 40 insertions(+), 40 deletions(-)

New commits:
commit 07f98f3fdcc34320736e8c75c2528866eae65f30
Author: Julien Nabet 
Date:   Sat Feb 18 23:42:01 2017 +0100

Typos: mainly translation remnants of Objekt instead of object

Change-Id: I84c488a4a0fa96f85158d34035a16aa5e10c7c21
Reviewed-on: https://gerrit.libreoffice.org/34418
Tested-by: Jenkins 
Reviewed-by: Fakabbir Amin (Aeimi) 
Reviewed-by: Julien Nabet 

diff --git a/include/editeng/txtrange.hxx b/include/editeng/txtrange.hxx
index 0e959e7..9611a26 100644
--- a/include/editeng/txtrange.hxx
+++ b/include/editeng/txtrange.hxx
@@ -53,8 +53,8 @@ class EDITENG_DLLPUBLIC TextRanger
 sal_uInt16 nLower;  // Distance Text-Contour
 sal_uInt32 nPointCount; // Number of polygon points
 bool   bSimple : 1; // Just outside edge
-bool   bInner  : 1; // TRUE: Objekt inline (EditEngine);
-// FALSE: Objekt flow (StarWriter);
+bool   bInner  : 1; // TRUE: Object inline (EditEngine);
+// FALSE: Object flow (StarWriter);
 bool   bVertical :1;// for vertical writing mode
 
 TextRanger( const TextRanger& ) = delete;
diff --git a/include/sfx2/chalign.hxx b/include/sfx2/chalign.hxx
index 5572f11..d63646e 100644
--- a/include/sfx2/chalign.hxx
+++ b/include/sfx2/chalign.hxx
@@ -35,7 +35,7 @@ enum class SfxChildAlignment
 FIRSTRIGHT,
 TOP,  // for example Hyperlink-Builder, SplitWindow
 BOTTOM,   // for example SplitWindow
-TOOLBOXTOP,   // for example Objekt bar
+TOOLBOXTOP,   // for example Object bar
 TOOLBOXBOTTOM,
 LOWESTTOP,// for example Calc bar
 HIGHESTBOTTOM,// for example Status bar
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 4ceb311..d36663a 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -36,7 +36,7 @@ enum class SdrSearchOptions
 DEEP = 0x0001, /* recursive into group objects */
 ALSOONMASTER = 0x0002, /* MasterPages are also scanned */
 WHOLEPAGE= 0x0004, /* Not just the ObjList of PageView */
-TESTMARKABLE = 0x0008, /* just markable Objekte/Punkte/Handles/... */
+TESTMARKABLE = 0x0008, /* just markable objects/points/handles/... */
 TESTMACRO= 0x0010, /* Just objects with macro */
 TESTTEXTEDIT = 0x0020, /* Just TextEdit-enabled objects */
 WITHTEXT = 0x0040, /* Just objects with text */
diff --git a/include/svx/unoprov.hxx b/include/svx/unoprov.hxx
index 9ac270c..38a5930 100644
--- a/include/svx/unoprov.hxx
+++ b/include/svx/unoprov.hxx
@@ -57,7 +57,7 @@ public:
 #define SVXMAP_POLYPOLYGONBEZIER5
 #define SVXMAP_GRAPHICOBJECT6
 #define SVXMAP_3DSCENEOBJECT7
-#define SVXMAP_3DCUBEOBJEKT 8
+#define SVXMAP_3DCUBEOBJECT 8
 #define SVXMAP_3DSPHEREOBJECT   9
 #define SVXMAP_3DLATHEOBJECT10
 #define SVXMAP_3DEXTRUDEOBJECT  11
diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx
index 52c2604..34b7da8 100644
--- a/sc/inc/datauno.hxx
+++ b/sc/inc/datauno.hxx
@@ -65,7 +65,7 @@ public:
 static css::sheet::GeneralFunction SubTotalToGeneral( ScSubTotalFunc 
eSubTotal );
 };
 
-//  ImportDescriptor is not available as Uno-Objekt any longer, only 
Property-Sequence
+//  ImportDescriptor is not available as Uno-object any longer, only 
Property-Sequence
 
 class ScImportDescriptor
 {
@@ -79,7 +79,7 @@ public:
 static long GetPropertyCount() { return 4; }
 };
 
-//  SortDescriptor is not available as Uno-Objekt any longer, only 
Property-Sequence
+//  SortDescriptor is not

[Libreoffice-commits] core.git: include/editeng include/sfx2 vcl/osx vcl/source vcl/unx

2017-02-12 Thread Tor Lillqvist 
 include/editeng/svxacorr.hxx   |2 +-
 include/sfx2/emojiview.hxx |2 +-
 vcl/osx/salframeview.mm|2 +-
 vcl/source/font/fontcharmap.cxx|4 ++--
 vcl/source/gdi/pdfwriter_impl.cxx  |2 +-
 vcl/source/outdev/font.cxx |4 ++--
 vcl/unx/generic/fontmanager/fontconfig.cxx |   18 +-
 7 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 6d15d4a6f6fbc163001ec082d55404481e64bed1
Author: Tor Lillqvist 
Date:   Sun Feb 12 12:55:00 2017 +0200

Get rid of "unicodes" in lower-case, too

Instead, use "code points" (if you mean full 21-bit Unicode code
points), or "code units" (if you mean the 16-bit units that make up
UTF-16). Hopefully I got it right which one was meant in each case
here.

Change-Id: I8ee7a98996f1cebcfb95cd7d18a56570e48fa390

diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index beecd96..23b85d4 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -73,7 +73,7 @@ const long ChgWordLstLoad   = 0x2000;   // Replacement 
list loaded
 const long CplSttLstLoad= 0x4000;   // Exception list for Capital 
letters Start loaded
 const long WrdSttLstLoad= 0x8000;   // Exception list for Word Start 
loaded
 
-// TODO: handle unicodes > U+ and check users of this class
+// TODO: handle code points > U+ and check users of this class
 
 // only a mapping class
 class EDITENG_DLLPUBLIC SvxAutoCorrDoc
diff --git a/include/sfx2/emojiview.hxx b/include/sfx2/emojiview.hxx
index adb8306..1b0d0ac 100644
--- a/include/sfx2/emojiview.hxx
+++ b/include/sfx2/emojiview.hxx
@@ -59,7 +59,7 @@ public:
 
 virtual ~EmojiView () override;
 
-// Fill view with emoji unicodes
+// Fill view with emojis
 void Populate ();
 
 void setInsertEmojiHdl (const Link );
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 1b16485..15d5733 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -1550,7 +1550,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 }
 if( nKeyCode != 0 )
 {
-// don't send unicodes in the private use area
+// don't send code points in the private use area
 if( keyChar >= 0xf700 && keyChar < 0xf780 )
 keyChar = 0;
 BOOL bRet = [self sendKeyToFrameDirect: nKeyCode character: 
keyChar modifiers: mpFrame->mnLastModifierFlags];
diff --git a/vcl/source/font/fontcharmap.cxx b/vcl/source/font/fontcharmap.cxx
index fa0fb5b..f30c4e6 100644
--- a/vcl/source/font/fontcharmap.cxx
+++ b/vcl/source/font/fontcharmap.cxx
@@ -287,7 +287,7 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, 
CmapResult& rResult )
 
 if( aConverter && aCvtContext )
 {
-// determine the set of supported unicodes from encoded ranges
+// determine the set of supported code points from encoded ranges
 std::set aSupportedCodePoints;
 
 static const int NINSIZE = 64;
@@ -327,7 +327,7 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, 
CmapResult& rResult )
 rtl_destroyTextToUnicodeConverter( aCvtContext );
 rtl_destroyTextToUnicodeConverter( aConverter );
 
-// convert the set of supported unicodes to ranges
+// convert the set of supported code points to ranges
 std::vector aSupportedRanges;
 
 std::set::const_iterator itChar = 
aSupportedCodePoints.begin();
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index dce4752..13bd2fe 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -3097,7 +3097,7 @@ sal_Int32 PDFWriterImpl::createToUnicodeCMap( sal_uInt8* 
pEncoding,
 aContents.append( '<' );
 appendHex( (sal_Int8)pEncoding[n], aContents );
 aContents.append( "> <" );
-// TODO: handle unicodes>U+
+// TODO: handle code points>U+
 sal_Int32 nIndex = pEncToUnicodeIndex[n];
 for( sal_Int32 j = 0; j < pCodeUnitsPerGlyph[n]; j++ )
 {
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index cea5665..1c04f05 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -1377,7 +1377,7 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( 
SalLayout* pSalLayout, ImplLay
 rLayoutArgs.PrepareFallback();
 rLayoutArgs.mnFlags |= SalLayoutFlags::ForFallback;
 
-// get list of unicodes that need glyph fallback
+// get list of code units that need glyph fallback
 int nCharPos = -1;
 bool bRTL = false;
 OUStringBuffer aMissingCodeBuf;
@@ -1388,7 +1388,7 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( 
SalLayout* pSalLayout, ImplLay
 
 FontSelectPattern aFontSelData = mpFontInstance->maFontSelData;
 
-// try if fallback

[Libreoffice-commits] core.git: include/editeng include/sfx2 include/svl include/svx include/vcl sc/source sfx2/source vcl/source

2016-11-03 Thread Noel Grandin 
 include/editeng/numitem.hxx|2 +-
 include/sfx2/childwin.hxx  |1 -
 include/sfx2/navigat.hxx   |1 -
 include/sfx2/objsh.hxx |2 +-
 include/svl/itempool.hxx   |2 +-
 include/svx/svdmrkv.hxx|2 +-
 include/svx/svdobj.hxx |2 +-
 include/svx/svdotext.hxx   |2 +-
 include/vcl/syswin.hxx |2 --
 sc/source/ui/inc/fupoor.hxx|2 +-
 sfx2/source/appl/childwin.cxx  |4 
 sfx2/source/dialog/navigat.cxx |   10 --
 vcl/source/window/brdwin.cxx   |3 ---
 vcl/source/window/syswin.cxx   |8 
 14 files changed, 7 insertions(+), 36 deletions(-)

New commits:
commit 880bcf9ed8c54f53d9fb631b9e064a468a9d02da
Author: Noel Grandin 
Date:   Wed Nov 2 16:35:25 2016 +0200

loplugin:unnecessaryvirtual

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

diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index e687246..5466ae8 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -181,7 +181,7 @@ public:
 virtual voidSetGraphicBrush( const SvxBrushItem* pBrushItem, const 
Size* pSize = nullptr, const sal_Int16* pOrient = nullptr);
 const SvxBrushItem* GetBrush() const {return pGraphicBrush;}
 voidSetGraphic( const OUString& rName );
-virtual sal_Int16   GetVertOrient() const;
+sal_Int16   GetVertOrient() const;
 voidSetGraphicSize(const Size& rSet) {aGraphicSize = rSet;}
 const Size& GetGraphicSize() const {return aGraphicSize;}
 
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index 8a77f2e..3068d00 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -137,7 +137,6 @@ public:
 
 FloatingWindow* GetFloatingWindow() const;
 
-virtual voidResizing( Size& rSize );
 static void RegisterChildWindowContext(SfxModule*, sal_uInt16, 
SfxChildWinContextFactory*);
 };
 
diff --git a/include/sfx2/navigat.hxx b/include/sfx2/navigat.hxx
index 749adbf..8ba2193 100644
--- a/include/sfx2/navigat.hxx
+++ b/include/sfx2/navigat.hxx
@@ -46,7 +46,6 @@ public:
 WinBits nBits );
 
 virtual voidResize() override;
-virtual voidResizing( Size& rSize ) override;
 virtual boolClose() override;
 };
 
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 20ec6e3..fe72c66 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -433,7 +433,7 @@ public:
 boolIsSecurityOptOpenReadOnly() const;
 voidSetSecurityOptOpenReadOnly( bool bOpenReadOnly 
= true );
 
-virtual SizeGetFirstPageSize();
+SizeGetFirstPageSize();
 boolDoClose();
 virtual voidPrepareReload();
 std::shared_ptr GetPreviewMetaFile( bool bFullContent = false 
) const;
diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx
index 624ef08..e15bf82 100644
--- a/include/svl/itempool.hxx
+++ b/include/svl/itempool.hxx
@@ -146,7 +146,7 @@ public:
 const OUString& GetName() const;
 
 virtual const SfxPoolItem&  Put( const SfxPoolItem&, sal_uInt16 nWhich 
= 0 );
-virtual voidRemove( const SfxPoolItem& );
+voidRemove( const SfxPoolItem& );
 const SfxPoolItem&  GetDefaultItem( sal_uInt16 nWhich ) const;
 
 const SfxPoolItem*  LoadItem( SvStream ,
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index bb187a8..2213699 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -182,7 +182,7 @@ public:
 
 virtual void ClearPageView() override;
 virtual void HideSdrPage() override;
-virtual bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const;
+bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const;
 
 // Returns sal_True if objects, points or glue points are selected by 
drawing a frame
 // (as long as the frame is drawn).
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 266f289..4855868 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -636,7 +636,7 @@ public:
 void ImpSetAnchorPos(const Point& rPnt);
 virtual void NbcSetAnchorPos(const Point& rPnt);
 virtual void SetAnchorPos(const Point& rPnt);
-virtual const Point& GetAnchorPos() const;
+const Point& GetAnchorPos() const;
 
 /// Snap is not done on the BoundRect but if possible on logic coordinates
 /// (i.e. without considering stroke width, ...)
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index ec316e9..ee5a393 100644
--- a/include/svx/svdotext.hxx

[Libreoffice-commits] core.git: include/editeng include/sfx2

2016-10-10 Thread Caolán McNamara 
 include/editeng/edtdlg.hxx   |1 -
 include/editeng/itemtype.hxx |1 -
 include/sfx2/sfxdlg.hxx  |1 -
 include/sfx2/viewfac.hxx |1 -
 4 files changed, 4 deletions(-)

New commits:
commit a1c77e9d3afd27b4b5603cffc6f3aea0577987fc
Author: Caolán McNamara 
Date:   Mon Oct 10 08:54:18 2016 +0100

drop some unused forward declarations and includes

Change-Id: Ibf5b915798f1a9554d06c705d454cbfb998ea277

diff --git a/include/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx
index da9d347..ea0c5ec 100644
--- a/include/editeng/edtdlg.hxx
+++ b/include/editeng/edtdlg.hxx
@@ -34,7 +34,6 @@ namespace com { namespace sun { namespace star { namespace 
linguistic2
 } } } }
 
 namespace vcl { class Window; }
-class ResId;
 class SvxSpellWrapper;
 class Button;
 class CheckBox;
diff --git a/include/editeng/itemtype.hxx b/include/editeng/itemtype.hxx
index eea1b0a..873d5cd 100644
--- a/include/editeng/itemtype.hxx
+++ b/include/editeng/itemtype.hxx
@@ -24,7 +24,6 @@
 
 // forward ---
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx
index 5469ea3..071e3f8 100644
--- a/include/sfx2/sfxdlg.hxx
+++ b/include/sfx2/sfxdlg.hxx
@@ -36,7 +36,6 @@ class SfxTabPage;
 class SfxViewFrame;
 class SfxBindings;
 class SfxItemSet;
-class ResId;
 namespace vcl { class Window; }
 namespace rtl {
class OUString;
diff --git a/include/sfx2/viewfac.hxx b/include/sfx2/viewfac.hxx
index 541b18f..2bff0da 100644
--- a/include/sfx2/viewfac.hxx
+++ b/include/sfx2/viewfac.hxx
@@ -22,7 +22,6 @@
 #include 
 #include 
 #include 
-#include 
 
 class SfxViewFrame;
 class SfxViewShell;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/editeng include/sfx2 include/svl svl/source

2016-09-29 Thread Jochen Nitschke 
 include/editeng/unotext.hxx|2 +-
 include/sfx2/DocumentMetadataAccess.hxx|4 ++--
 include/sfx2/Metadatable.hxx   |5 ++---
 include/sfx2/docstoragemodifylistener.hxx  |4 ++--
 include/sfx2/sfxstatuslistener.hxx |4 ++--
 include/sfx2/sidebar/Accessible.hxx|4 ++--
 include/sfx2/sidebar/SidebarController.hxx |4 ++--
 include/sfx2/sidebar/SidebarPanelBase.hxx  |4 ++--
 include/sfx2/sidebar/Theme.hxx |4 ++--
 include/sfx2/sidebar/UnoDeck.hxx   |5 ++---
 include/sfx2/sidebar/UnoDecks.hxx  |5 ++---
 include/sfx2/sidebar/UnoPanel.hxx  |5 ++---
 include/sfx2/sidebar/UnoPanels.hxx |5 ++---
 include/sfx2/sidebar/UnoSidebar.hxx|5 ++---
 include/sfx2/unoctitm.hxx  |6 +++---
 include/svl/itemprop.hxx   |6 +++---
 include/svl/style.hxx  |6 +++---
 svl/source/items/style.cxx |2 +-
 18 files changed, 37 insertions(+), 43 deletions(-)

New commits:
commit 2bebc1fc2e76f73d953ca1e1f64803fd4c42a62c
Author: Jochen Nitschke 
Date:   Wed Sep 28 21:53:59 2016 +0200

tdf#88206 replace cppu::WeakImplHelper* in sfx2 and svl

some fallout in include/editeng/unotext.hxx
which uses WeakAggImplHelper1 from implbase1.hxx

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

diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 20ee791..6bd0baa 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -44,7 +44,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/include/sfx2/DocumentMetadataAccess.hxx 
b/include/sfx2/DocumentMetadataAccess.hxx
index 7af6e32..973808d 100644
--- a/include/sfx2/DocumentMetadataAccess.hxx
+++ b/include/sfx2/DocumentMetadataAccess.hxx
@@ -28,7 +28,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include 
 
@@ -69,7 +69,7 @@ createBaseURI(
 struct DocumentMetadataAccess_Impl;
 
 class SFX2_DLLPUBLIC DocumentMetadataAccess :
-public ::cppu::WeakImplHelper1< css::rdf::XDocumentMetadataAccess>
+public cppu::WeakImplHelper
 {
 DocumentMetadataAccess(const DocumentMetadataAccess&) = delete;
 DocumentMetadataAccess& operator=( const DocumentMetadataAccess& ) = 
delete;
diff --git a/include/sfx2/Metadatable.hxx b/include/sfx2/Metadatable.hxx
index 2d7bc54..b838c9f 100644
--- a/include/sfx2/Metadatable.hxx
+++ b/include/sfx2/Metadatable.hxx
@@ -23,7 +23,7 @@
 
 #include 
 
-#include 
+#include 
 #include 
 
 #include 
@@ -135,8 +135,7 @@ private:
Metadatable.
  */
 class SFX2_DLLPUBLIC MetadatableMixin :
-public ::cppu::WeakImplHelper1<
-css::rdf::XMetadatable>
+public cppu::WeakImplHelper
 {
 
 public:
diff --git a/include/sfx2/docstoragemodifylistener.hxx 
b/include/sfx2/docstoragemodifylistener.hxx
index 4733e2a..fa1a291 100644
--- a/include/sfx2/docstoragemodifylistener.hxx
+++ b/include/sfx2/docstoragemodifylistener.hxx
@@ -24,7 +24,7 @@
 
 #include 
 
-#include 
+#include 
 
 namespace comphelper { class SolarMutex; }
 
@@ -50,7 +50,7 @@ namespace sfx2
 
 //= DocumentStorageModifyListener
 
-typedef ::cppu::WeakImplHelper1 < css::util::XModifyListener > 
DocumentStorageModifyListener_Base;
+typedef cppu::WeakImplHelper 
DocumentStorageModifyListener_Base;
 
 class SFX2_DLLPUBLIC DocumentStorageModifyListener : public 
DocumentStorageModifyListener_Base
 {
diff --git a/include/sfx2/sfxstatuslistener.hxx 
b/include/sfx2/sfxstatuslistener.hxx
index ab9cb1e..c5a18e9 100644
--- a/include/sfx2/sfxstatuslistener.hxx
+++ b/include/sfx2/sfxstatuslistener.hxx
@@ -30,9 +30,9 @@
 #include 
 #include 
 
-#include 
+#include 
 
-class SFX2_DLLPUBLIC SfxStatusListener : public ::cppu::WeakImplHelper2<
+class SFX2_DLLPUBLIC SfxStatusListener : public cppu::WeakImplHelper<
   css::frame::XStatusListener,
   css::lang::XComponent>
 {
diff --git a/include/sfx2/sidebar/Accessible.hxx 
b/include/sfx2/sidebar/Accessible.hxx
index eaa3f52..cb1d729 100644
--- a/include/sfx2/sidebar/Accessible.hxx
+++ b/include/sfx2/sidebar/Accessible.hxx
@@ -22,12 +22,12 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
 
 namespace
 {
-typedef ::cppu::WeakComponentImplHelper1 <
+typedef cppu::WeakComponentImplHelper <
 css::accessibility::XAccessible
 > AccessibleInterfaceBase;
 }
diff --git a/include/sfx2/sidebar/SidebarController.hxx 
b/include/sfx2/sidebar/SidebarController.hxx
index c32e9c4..6b64fde 100644
--- a/include/sfx2/sidebar/SidebarController.hxx
+++ b/include/sfx2/sidebar/SidebarController.hxx
@@ -38,13 +38,13 @@
 #include 
 
 #include 
-#include