[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/mysql_jdbc/YUser.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 49c87270f7176312806d1759967c247a312f0acf Author: Noel Grandin AuthorDate: Mon Oct 15 08:56:36 2018 +0200 Commit: Noel Grandin CommitDate: Mon Oct 15 08:56:36 2018 +0200 fix missing include after commit b2cefc2e36925b4384eb0aea54aa2c6bcfb018a8 Revert removal of mysql jdbc connector Change-Id: I379cfba0f36b0e55ea135e5c9eb14a2851fb2881 diff --git a/connectivity/source/drivers/mysql_jdbc/YUser.cxx b/connectivity/source/drivers/mysql_jdbc/YUser.cxx index f29ba3b9006c..c5031f3c0205 100644 --- a/connectivity/source/drivers/mysql_jdbc/YUser.cxx +++ b/connectivity/source/drivers/mysql_jdbc/YUser.cxx @@ -26,6 +26,7 @@ #include #include #include +#include using namespace connectivity; using namespace connectivity::mysql; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unotools/source unoxml/source uui/source vbahelper/source
unotools/source/config/compatibility.cxx |4 +-
unotools/source/config/dynamicmenuoptions.cxx | 32 ++---
unotools/source/config/eventcfg.cxx| 10 ++
unotools/source/config/fontcfg.cxx | 13
unotools/source/config/options.cxx | 14 +++--
unotools/source/misc/fontdefs.cxx |6 +--
unotools/source/ucbhelper/ucbhelper.cxx| 17 +++
unoxml/source/dom/document.cxx | 17 +++
unoxml/source/rdf/librdf_repository.cxx|6 +--
unoxml/source/xpath/xpathapi.cxx | 19
uui/source/fltdlg.cxx |6 +--
uui/source/iahndl.cxx | 11 +--
vbahelper/source/vbahelper/vbacommandbarhelper.cxx | 11 ++-
vbahelper/source/vbahelper/vbaeventshelperbase.cxx |4 +-
vbahelper/source/vbahelper/vbahelper.cxx |7 +---
15 files changed, 63 insertions(+), 114 deletions(-)
New commits:
commit 40ab4d8fda9b69b388ac674c1ee4e88084af9519
Author: Arkadiy Illarionov
AuthorDate: Sun Oct 14 20:25:12 2018 +0300
Commit: Noel Grandin
CommitDate: Mon Oct 15 08:00:08 2018 +0200
Simplify containers iterations in unotools, unoxml, uui, vbahelper
Use range-based loop or replace with STL functions.
Change-Id: I5a43f6fc62c81453dcef3820bb715f4da76915af
Reviewed-on: https://gerrit.libreoffice.org/61762
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/unotools/source/config/compatibility.cxx
b/unotools/source/config/compatibility.cxx
index ba5df9a01113..ce4ed63b8430 100644
--- a/unotools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.cxx
@@ -244,10 +244,10 @@ Sequence< Sequence< PropertyValue > >
SvtCompatibilityOptions_Impl::GetList() co
lProperties[i].Name = SvtCompatibilityEntry::getName(
SvtCompatibilityEntry::Index(i) );
sal_Int32 j = 0;
-for ( std::vector< SvtCompatibilityEntry >::const_iterator pItem =
m_aOptions.begin(); pItem != m_aOptions.end(); ++pItem )
+for ( const auto& rItem : m_aOptions )
{
for ( int i = static_cast(SvtCompatibilityEntry::Index::Name); i
< static_cast(SvtCompatibilityEntry::Index::INVALID); ++i )
-lProperties[i].Value = pItem->getValue(
SvtCompatibilityEntry::Index(i) );
+lProperties[i].Value = rItem.getValue(
SvtCompatibilityEntry::Index(i) );
lResult[ j++ ] = lProperties;
}
diff --git a/unotools/source/config/dynamicmenuoptions.cxx
b/unotools/source/config/dynamicmenuoptions.cxx
index 871886b238d0..6c451d387dcb 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.cxx
@@ -94,8 +94,6 @@ class SvtDynMenu
// convert internal list to external format
// for using it on right menus really
// Notice: We build a property list with 4 entries and set it on
result list then.
-// The while-loop starts with pointer on internal member
list lSetupEntries, change to
-// lUserEntries then and stop after that with NULL!
// Separator entries will be packed in another way then
normal entries! We define
// special string "sSeparator" to perform too ...
Sequence< Sequence< PropertyValue > > GetList() const
@@ -106,20 +104,17 @@ class SvtDynMenu
Sequence< PropertyValue > lProperties ( PROPERTYCOUNT
);
Sequence< Sequence< PropertyValue > > lResult (
nSetupCount+nUserCount );
OUString sSeparator (
"private:separator" );
-const vector< SvtDynMenuEntry >*pList =
&lSetupEntries;
lProperties[OFFSET_URL].Name = PROPERTYNAME_URL;
lProperties[OFFSET_TITLE ].Name = PROPERTYNAME_TITLE;
lProperties[OFFSET_IMAGEIDENTIFIER].Name =
PROPERTYNAME_IMAGEIDENTIFIER;
lProperties[OFFSET_TARGETNAME ].Name = PROPERTYNAME_TARGETNAME;
-while( pList != nullptr )
+for( const auto& pList : {&lSetupEntries, &lUserEntries} )
{
-for( vector< SvtDynMenuEntry >::const_iterator pItem
=pList->begin();
- pItem!=pList->end();
- ++pItem )
+for( const auto& rItem : *pList )
{
-if( pItem->sURL == sSeparator )
+if( rItem.sURL == sSeparator )
{
lProperties[OFFSET_URL ].Value <<=
sSeparator;
lProperties[OFFSET_TITLE].Value <<=
OUString();
@@ -128,18 +123,14 @@ class SvtDynMenu
}
[Libreoffice-commits] core.git: basic/source connectivity/source cui/source drawinglayer/source editeng/source embeddedobj/source emfio/source extensions/source filter/source forms/source include/tool
basic/source/basmgr/basmgr.cxx |6 +- basic/source/runtime/methods.cxx |4 - connectivity/source/drivers/dbase/DTable.cxx |9 +-- connectivity/source/drivers/dbase/dindexnode.cxx |2 cui/source/dialogs/insdlg.cxx |2 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |4 - editeng/source/editeng/eeobj.cxx |8 --- embeddedobj/source/msole/graphconvert.cxx |4 - emfio/source/reader/mtftools.cxx |2 emfio/source/reader/wmfreader.cxx |2 extensions/source/scanner/sane.cxx |3 - extensions/source/scanner/scanunx.cxx | 10 +--- filter/source/flash/swfwriter.cxx |3 - filter/source/flash/swfwriter1.cxx |8 +-- filter/source/flash/swfwriter2.cxx |3 - filter/source/graphicfilter/eps/eps.cxx|3 - filter/source/msfilter/escherex.cxx|9 +-- filter/source/msfilter/msdffimp.cxx|6 -- filter/source/svg/svgfilter.cxx|5 -- forms/source/component/DatabaseForm.cxx|2 include/tools/stream.hxx |1 lotuswordpro/source/filter/bencont.cxx | 14 - lotuswordpro/source/filter/lwpgrfobj.cxx |5 -- sc/source/filter/excel/xiescher.cxx|3 - sc/source/filter/excel/xistream.cxx|3 - sc/source/filter/ftools/fprogressbar.cxx |6 -- sc/source/filter/lotus/filter.cxx |3 - sc/source/ui/docshell/impex.cxx|7 -- sc/source/ui/unoobj/confuno.cxx|8 --- sc/source/ui/unoobj/exceldetect.cxx|6 -- sc/source/ui/unoobj/scdetect.cxx |3 - sd/source/filter/eppt/eppt.cxx |3 - sd/source/filter/eppt/epptso.cxx |3 - sd/source/filter/eppt/escherex.cxx |3 - sd/source/filter/ppt/pptatom.cxx |5 -- sd/source/filter/ppt/propread.cxx |5 -- sd/source/ui/app/sdxfer.cxx|2 sd/source/ui/unoidl/UnoDocumentSettings.cxx|8 --- sfx2/source/bastyp/sfxhtml.cxx |6 -- sfx2/source/doc/docinf.cxx |9 --- sfx2/source/doc/graphhelp.cxx |2 sfx2/source/doc/sfxbasemodel.cxx | 15 ++ sot/source/sdstor/stg.cxx |6 +- sot/source/sdstor/stgcache.cxx |6 -- sot/source/sdstor/stgdir.cxx |4 - sot/source/sdstor/stgstrms.cxx |4 - sot/source/sdstor/storage.cxx |5 -- sot/source/sdstor/ucbstorage.cxx | 15 +- starmath/source/unomodel.cxx |3 - svtools/source/misc/embedtransfer.cxx |4 - svtools/source/misc/transfer.cxx | 10 ++-- svx/qa/unit/xoutdev.cxx|4 - svx/source/dialog/compressgraphicdialog.cxx|6 -- svx/source/gallery2/codec.cxx |3 - svx/source/xml/xmlgrhlp.cxx|9 +-- svx/source/xoutdev/_xoutbmp.cxx|3 - sw/qa/extras/htmlexport/htmlexport.cxx | 32 +++-- sw/source/core/doc/swserv.cxx |2 sw/source/filter/ascii/parasc.cxx |4 - sw/source/filter/html/htmlcss1.cxx |3 - sw/source/filter/html/htmlreqifreader.cxx |3 - sw/source/filter/ww8/rtfattributeoutput.cxx| 18 ++- sw/source/filter/ww8/rtfsdrexport.cxx |3 - sw/source/filter/ww8/wrtww8.cxx|6 -- sw/source/filter/ww8/ww8par.cxx| 10 +--- sw/source/filter/ww8/ww8scan.cxx |8 --- sw/source/uibase/dbui/mailmergehelper.cxx |3 - sw/source/uibase/uno/SwXDocumentSettings.cxx |3 - unotools/source/streaming/streamwrap.cxx | 18 +-- unotools/source/ucbhelper/xtempfile.cxx|9 --- vcl/source/edit/textview.cxx |3 - vcl/source/filter/graphicf
[Libreoffice-commits] core.git: compilerplugins/clang include/oox oox/inc oox/qa oox/source opencl/inc
compilerplugins/clang/staticconstfield.cxx |2 include/oox/core/contexthandler2.hxx|2 include/oox/core/filterdetect.hxx |2 include/oox/core/fragmenthandler.hxx|2 include/oox/core/relations.hxx |2 include/oox/crypto/AgileEngine.hxx | 18 +++--- include/oox/crypto/CryptTools.hxx |2 include/oox/crypto/DocumentEncryption.hxx |2 include/oox/drawingml/graphicshapecontext.hxx |4 - include/oox/drawingml/shape.hxx |2 include/oox/drawingml/shapepropertymap.hxx | 10 +-- include/oox/dump/dumperbase.hxx |8 +-- include/oox/dump/oledumper.hxx | 22 include/oox/export/chartexport.hxx |8 +-- include/oox/export/drawingml.hxx|2 include/oox/helper/binaryinputstream.hxx|2 include/oox/helper/modelobjecthelper.hxx|2 include/oox/helper/storagebase.hxx |8 +-- include/oox/ole/axbinaryreader.hxx |6 +- include/oox/ole/axbinarywriter.hxx |8 +-- include/oox/ole/axcontrol.hxx | 14 ++--- include/oox/ole/olehelper.hxx |4 - include/oox/ole/vbacontrol.hxx |2 include/oox/ole/vbaexport.hxx |4 - include/oox/ole/vbamodule.hxx |4 - include/oox/ole/vbaproject.hxx |2 include/oox/ppt/pptfilterhelpers.hxx| 10 +-- include/oox/ppt/pptshapegroupcontext.hxx|4 - include/oox/ppt/slidefragmenthandler.hxx|2 include/oox/ppt/slidemastertextstylescontext.hxx|2 include/oox/ppt/slidepersist.hxx| 16 +++--- include/oox/ppt/timenodelistcontext.hxx |2 include/oox/vml/vmltextbox.hxx |4 - include/oox/vml/vmltextboxcontext.hxx |4 - oox/inc/drawingml/chart/axismodel.hxx |2 oox/inc/drawingml/chart/chartdrawingfragment.hxx|4 - oox/inc/drawingml/chart/titlemodel.hxx |2 oox/inc/drawingml/chart/typegroupmodel.hxx |2 oox/inc/drawingml/clrschemecontext.hxx |2 oox/inc/drawingml/transform2dcontext.hxx|2 oox/qa/token/tokenmap-test.cxx |2 oox/qa/unit/vba_compression.cxx |2 oox/source/core/fastparser.cxx |2 oox/source/core/recordparser.cxx|2 oox/source/drawingml/chart/converterbase.cxx|2 oox/source/drawingml/chart/objectformatter.cxx | 42 oox/source/drawingml/clrscheme.cxx |2 oox/source/drawingml/customshapegeometry.cxx|2 oox/source/drawingml/diagram/diagramfragmenthandler.hxx |4 - oox/source/drawingml/diagram/diagramlayoutatoms.hxx |4 - oox/source/dump/dffdumper.cxx |8 +-- oox/source/export/ColorPropertySet.cxx |2 oox/source/export/ColorPropertySet.hxx |6 +- oox/source/export/chartexport.cxx |2 oox/source/helper/progressbar.cxx |4 - oox/source/ole/axcontrol.cxx| 15 + oox/source/ole/olehelper.cxx|2 oox/source/ole/olestorage.cxx |2 oox/source/ppt/animvariantcontext.hxx |2 oox/source/ppt/extdrawingfragmenthandler.hxx|2 oox/source/ppt/timenodelistcontext.cxx |4 - oox/source/shape/ShapeDrawingFragmentHandler.hxx|2 opencl/inc/opencl_device_selection.h|2 63 files changed, 157 insertions(+), 162 deletions(-) New commits: commit a84e3df74eecc8778e3d5be5dd80ad4ddb511edf Author: Noel Grandin AuthorDate: Fri Oct 12 17:12:39 2018 +0200 Commit: Noel Grandin CommitDate: Mon Oct 15 07:56:21 2018 +0200 loplugin:constfields in oox Change-Id: I1e110d193ebfa30ab1ab0d85bfb6dc409e341439 Reviewed-on: https://gerrit.libreoffice.org/61728 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/compilerplugins/clang/staticconstfield.cxx b/compilerplugins/clang/staticconstfield.cxx index 79fda38531e9..cde2f80babc5 100644 --- a/compilerplugins/clang/staticconstfield.cxx +++ b/compilerplugins/clang/staticconstfield.cxx @@ -93,6 +93,8 @@ bool StaticConstField::TraverseConstructorInitializer(CXXCtorInitializer* init) // unusual case wh
[Libreoffice-commits] core.git: svx/source
svx/source/dialog/svxruler.cxx | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 2da25cb43f4af8d094b01de1073eee2e2023c029
Author: Mike Kaganski
AuthorDate: Sun Oct 14 23:52:18 2018 +0300
Commit: Mike Kaganski
CommitDate: Mon Oct 15 06:56:21 2018 +0200
tdf#120593: properly handle tab pos identical to right indent
... otherwise it's counted without taking into account current column,
as well as TabsRelativeToIndent mode.
Change-Id: I7442f63d9d5c51c5a4d82094b49b8028f2b42b41
Reviewed-on: https://gerrit.libreoffice.org/61768
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index af433f2348e0..e6ec4bc8e876 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -2200,7 +2200,15 @@ void SvxRuler::ApplyTabs()
if( mxRulerImpl->lMaxRightLogic != -1 &&
mpTabs[nCoreIdx + TAB_GAP].nPos + Ruler::GetNullOffset() ==
nMaxRight )
{
-aTabStop.GetTabPos() = mxRulerImpl->lMaxRightLogic -
lLogicNullOffset;
+// Set tab pos exactly at the right indent
+long nTmpLeftIndentLogic
+= lAppNullOffset + (bRTL ? GetRightFrameMargin() :
GetLeftFrameMargin());
+if (mxRulerImpl->bIsTabsRelativeToIndent && mxParaItem)
+{
+nTmpLeftIndentLogic += bRTL ? mxParaItem->GetRight() :
mxParaItem->GetLeft();
+}
+aTabStop.GetTabPos()
+= mxRulerImpl->lMaxRightLogic - lLogicNullOffset -
nTmpLeftIndentLogic;
}
else
{
___
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 e00ac11c6b12d5e8e3e1537b3206eaa29a0a5e95 Author: Adolfo Jayme Barrientos AuthorDate: Sun Oct 14 23:00:30 2018 -0500 Commit: Gerrit Code Review CommitDate: Mon Oct 15 06:00:56 2018 +0200 Update git submodules * Update helpcontent2 from branch 'master' - One of the first things LibreOffice did was remove registration Change-Id: I9463222744eee12c24157fc33c133f15be898f6a diff --git a/helpcontent2 b/helpcontent2 index 46319a43b3d4..613d463deb1a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 46319a43b3d490b9513492c59b593fe5e6c3091f +Subproject commit 613d463deb1a35855edcf670a951b22bb3657fb2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/00/0408.xhp |1 - 1 file changed, 1 deletion(-) New commits: commit 613d463deb1a35855edcf670a951b22bb3657fb2 Author: Adolfo Jayme Barrientos AuthorDate: Sun Oct 14 23:00:30 2018 -0500 Commit: Adolfo Jayme Barrientos CommitDate: Sun Oct 14 23:00:30 2018 -0500 One of the first things LibreOffice did was remove registration Change-Id: I9463222744eee12c24157fc33c133f15be898f6a diff --git a/source/text/shared/00/0408.xhp b/source/text/shared/00/0408.xhp index 0bc6954e6..705c3ccbb 100644 --- a/source/text/shared/00/0408.xhp +++ b/source/text/shared/00/0408.xhp @@ -35,7 +35,6 @@ Choose Help - About %PRODUCTNAME. Automatically after %PRODUCTNAME is first started. -Choose Help - Registration. This is a direct link to an external website.Do we still have this? ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/inc cui/source
cui/inc/strings.hrc |2 +-
cui/source/dialogs/cuicharmap.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit cf2825d9f8af86a73aae5ac4216966504b320184
Author: Adolfo Jayme Barrientos
AuthorDate: Wed Sep 12 16:14:28 2018 -0500
Commit: Adolfo Jayme Barrientos
CommitDate: Mon Oct 15 01:46:59 2018 +0200
The code doesn’t check for glyphs, but for code points (i.e., characters)
This string was a little misleading. A typical pair of OS-provided fonts
can encode glyphs at different code points (e.g., the f+i ligature is
encoded at U+F001 (legacy position) in Arial Black but at U+FB01 in
Comic Sans MS.
Change-Id: I6ca93e9ad247f62e1674a03d6ab1bc0800df3612
Reviewed-on: https://gerrit.libreoffice.org/60419
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 71ff45488568..f8cc42be3fcb 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -100,7 +100,7 @@
#define RID_SVXSTR_INSERTROW_BEFORE
NC_("RID_SVXSTR_INSERTROW_BEFORE", "Above selection")
#define RID_SVXSTR_INSERTROW_AFTER
NC_("RID_SVXSTR_INSERTROW_AFTER", "Below selection")
#define RID_SVXSTR_REMOVE_FAVORITES
NC_("RID_SVXSTR_REMOVE_FAVORITES", "Remove from Favorites")
-#define RID_SVXSTR_MISSING_GLYPH
NC_("RID_SVXSTR_MISSING_GLYPH", "Missing Glyph")
+#define RID_SVXSTR_MISSING_CHAR
NC_("RID_SVXSTR_MISSING_CHAR", "Missing character")
#define RID_SVXSTR_ADD_FAVORITES
NC_("RID_SVXSTR_ADD_FAVORITES", "Add to Favorites")
// PPI is pixel per inch, %1 is a number
#define RID_SVXSTR_PPI NC_("RID_SVXSTR_PPI", "(%1
PPI)")
diff --git a/cui/source/dialogs/cuicharmap.cxx
b/cui/source/dialogs/cuicharmap.cxx
index 4ffc213003ca..64581f5f5165 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -1049,7 +1049,7 @@ void SvxCharacterMap::selectCharByCode(Radix radix)
// Select the corresponding character
SetChar(cChar);
else {
-m_xCharName->set_label(CuiResId(RID_SVXSTR_MISSING_GLYPH));
+m_xCharName->set_label(CuiResId(RID_SVXSTR_MISSING_CHAR));
m_aShowChar.SetText(" ");
switch(radix)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Infra call on Tue, Oct 16 at 16:30 UTC
Hi there, The next infra call will take place at `date -d 'Tue Oct 16 16:30:00 UTC 2018'` (18:30:00 Berlin time). We'll meet at https://jitsi.documentfoundation.org/infra and write the minutes to https://pad.documentfoundation.org/p/infra . Agenda TBA. See you there! Cheers, -- Guilhem. signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] Minutes of 2018-10-11 ESC call
Stephan Bergmann wrote: > > + setup new CentOS7 baseline VM (Cloph) > > [ done for the 64bit builds, for 32bit we stick to the CentOS6 ] > Perhaps then time to start pondering deprecation of the Linux x86 platform? Cheers, -- Thorsten signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/vcl sc/source solenv/clang-format svx/source toolkit/source vcl/Library_vcl.mk vcl/source
sc/source/ui/inc/acredlin.hxx |1 - sc/source/ui/inc/autofmt.hxx |1 - sc/source/ui/inc/consdlg.hxx |1 - sc/source/ui/inc/filtdlg.hxx |1 - sc/source/ui/inc/highred.hxx |1 - sc/source/ui/inc/namedlg.hxx |1 - sc/source/ui/inc/pfiltdlg.hxx |1 - sc/source/ui/inc/pvfundlg.hxx |1 - sc/source/ui/inc/simpref.hxx |1 - solenv/clang-format/blacklist |4 ++-- svx/source/dialog/srchdlg.cxx |1 - toolkit/source/awt/vclxtoolkit.cxx |2 +- vcl/Library_vcl.mk |2 +- vcl/source/toolkit/morebtn.cxx |2 +- 14 files changed, 5 insertions(+), 15 deletions(-) New commits: commit 26c7c10d2de625f616d34897fa45c1b9b22c50a8 Author: Caolán McNamara AuthorDate: Sun Oct 14 20:09:47 2018 +0100 Commit: Caolán McNamara CommitDate: Sun Oct 14 22:27:05 2018 +0200 MoreButton is solely used by toolkit Change-Id: Ieb436b49be3598e316d59a6d89cb211879d061c1 Reviewed-on: https://gerrit.libreoffice.org/61766 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/include/vcl/morebtn.hxx b/include/vcl/toolkit/morebtn.hxx similarity index 100% rename from include/vcl/morebtn.hxx rename to include/vcl/toolkit/morebtn.hxx diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index 52526a8bbafb..2cca8dcc3416 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_ACREDLIN_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACREDLIN_HXX -#include #include #include #include diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx index fc7bbde7d4d9..25e70f9e69b0 100644 --- a/sc/source/ui/inc/autofmt.hxx +++ b/sc/source/ui/inc/autofmt.hxx @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index 13db9eff938f..5c6429e8825c 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -23,7 +23,6 @@ #include #include #include -#include #include #include "anyrefdg.hxx" diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index 8200b1c4b242..86df47984813 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include "anyrefdg.hxx" diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx index 909c18f7865f..c13d4a1b5518 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_HIGHRED_HXX #define INCLUDED_SC_SOURCE_UI_INC_HIGHRED_HXX -#include #include #include #include diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index b9ea2bc75e6e..4139c1ae1c75 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_NAMEDLG_HXX #define INCLUDED_SC_SOURCE_UI_INC_NAMEDLG_HXX -#include #include #include #include diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index 07f2ab565bcc..31d7b04d73a6 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_PFILTDLG_HXX #define INCLUDED_SC_SOURCE_UI_INC_PFILTDLG_HXX -#include #include #include #include diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index d7db0bf76530..40ce2858ef67 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index 5babf263e4f3..94b67684743d 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.hxx @@ -22,7 +22,6 @@ #include #include -#include #include "anyrefdg.hxx" #include diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 6d0368fc6783..6afa247fbfab 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -7991,7 +7991,6 @@ include/vcl/metaactiontypes.hxx include/vcl/metric.hxx include/vcl/mnemonic.hxx include/vcl/mnemonicengine.hxx -include/vcl/morebtn.hxx include/vcl/msgbox.hxx include/vcl/notebookbar.hxx include/vcl/oldprintadaptor.hxx @@ -8052,6 +8051,7 @@ include/vcl/throbber.hxx include/vcl/timer.hxx include/vcl/toolbox.hxx include/vcl/toolkit/group.hxx +include/vcl/toolkit/morebtn.hxx include/vcl/toolkit/unowrap.hxx include/vcl/txtattr.hxx include/vcl/uitest/factory.hxx @@ -17993,7 +17993,6 @@ vcl/source/control/listbox.cxx vcl/source/control/listctrl.cxx vcl/source/control/longcurr.cxx vcl/source/control/menubtn.cxx -vcl/source/control/morebtn.cxx vcl/source/control/notebookbar.c
[Libreoffice-commits] core.git: include/vcl toolkit/source vcl/source
include/vcl/svapp.hxx | 17 -
include/vcl/toolkit/unowrap.hxx| 17 +
toolkit/source/awt/vclxtoolkit.cxx |2 +-
vcl/source/app/salvtables.cxx |2 +-
vcl/source/app/svapp.cxx |6 +++---
vcl/source/outdev/outdev.cxx |4 ++--
vcl/source/window/menu.cxx |2 +-
vcl/source/window/window.cxx |6 +++---
8 files changed, 28 insertions(+), 28 deletions(-)
New commits:
commit 1c97e5ffa79ccb6ad6272b7044c008800b61da79
Author: Caolán McNamara
AuthorDate: Sun Oct 14 19:57:49 2018 +0100
Commit: Caolán McNamara
CommitDate: Sun Oct 14 22:17:13 2018 +0200
only vcl and toolkit need to use [G|S]etUnoWrapper
Change-Id: I47cdb47cceda32f0871fd2f713ea565852383ca7
Reviewed-on: https://gerrit.libreoffice.org/61765
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 8fd852a5cb53..b1e9eb7c9a45 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1183,23 +1183,6 @@ public:
*/
static css::uno::Reference< css::awt::XToolkit > GetVCLToolkit();
-/** Get the application's UNO wrapper object.
-
- Note that this static function will only ever try to create UNO wrapper
object once, and
- if it fails then it will not ever try again, even if the function is
called multiple times.
-
- @param bCreateIfNotExists Create the UNO wrapper object if it
doesn't exist when true.
-
- @return UNO wrapper object.
-*/
-static UnoWrapperBase* GetUnoWrapper( bool bCreateIfNotExists = true
);
-
-/** Sets the application's UNO Wrapper object.
-
- @param pWrapperPointer to UNO wrapper object.
-*/
-static void SetUnoWrapper( UnoWrapperBase* pWrapper );
-
///@}
diff --git a/include/vcl/toolkit/unowrap.hxx b/include/vcl/toolkit/unowrap.hxx
index bc4cc3ca848e..2146f27d3e19 100644
--- a/include/vcl/toolkit/unowrap.hxx
+++ b/include/vcl/toolkit/unowrap.hxx
@@ -78,6 +78,23 @@ public:
virtual css::uno::Reference< css::accessibility::XAccessible >
CreateAccessible( Menu* pMenu, bool bIsMenuBar
) = 0;
+/** Get the application's UNO wrapper object.
+
+ Note that this static function will only ever try to create UNO wrapper
object once, and
+ if it fails then it will not ever try again, even if the function is
called multiple times.
+
+ @param bCreateIfNotExists Create the UNO wrapper object if it
doesn't exist when true.
+
+ @return UNO wrapper object.
+*/
+static UnoWrapperBase* GetUnoWrapper( bool bCreateIfNotExists = true
);
+
+/** Sets the application's UNO Wrapper object.
+
+ @param pWrapperPointer to UNO wrapper object.
+*/
+static void SetUnoWrapper( UnoWrapperBase* pWrapper );
+
protected:
~UnoWrapperBase() {}
};
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index a045fa430ed3..4f078e2968f5 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -899,7 +899,7 @@ static void ToolkitWorkerFunction( void* pArgs )
if( bInitedByVCLToolkit )
{
UnoWrapper* pUnoWrapper = new UnoWrapper( pTk );
-Application::SetUnoWrapper( pUnoWrapper );
+UnoWrapperBase::SetUnoWrapper( pUnoWrapper );
}
getInitCondition().set();
if( bInitedByVCLToolkit )
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index efb5214ddb33..b5b2519482b0 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -2906,7 +2906,7 @@ weld::MessageDialog*
SalInstance::CreateMessageDialog(weld::Widget* pParent, Vcl
weld::Window* SalInstance::GetFrameWeld(const
css::uno::Reference& rWindow)
{
-UnoWrapperBase* pWrapper = Application::GetUnoWrapper();
+UnoWrapperBase* pWrapper = UnoWrapperBase::GetUnoWrapper();
if (!pWrapper)
return nullptr;
VclPtr xWindow = pWrapper->GetWindow(rWindow);
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index cd4422f0ef89..2cd32996be86 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1394,7 +1394,7 @@ SystemWindowFlags Application::GetSystemWindowMode()
css::uno::Reference< css::awt::XToolkit > Application::GetVCLToolkit()
{
css::uno::Reference< css::awt::XToolkit > xT;
-UnoWrapperBase* pWrapper = Application::GetUnoWrapper();
+UnoWrapperBase* pWrapper = UnoWrapperBase::GetUnoWrapper();
if ( pWrapper )
xT = pWrapper->GetVCLToolkit();
return xT;
@@ -1410,7 +1410,7 @@ extern "C" { static void thisModule() {} }
#endif
-UnoWrapperBase* Application::GetUnoWrapper( bool bCreateIfNotExist )
+UnoWrapperBase* UnoWrapperBase::GetUnoWrapper( bool bCreateIfNotExist )
{
ImplSVData* pSVData = ImplGetSVData();
static bool
[Libreoffice-commits] core.git: include/vcl solenv/clang-format toolkit/source vcl/Library_vcl.mk vcl/source
include/vcl/toolkit/README |2 ++ solenv/clang-format/blacklist |4 ++-- toolkit/source/awt/vclxtoolkit.cxx |2 +- vcl/Library_vcl.mk |2 +- vcl/source/toolkit/README |2 ++ vcl/source/toolkit/group.cxx |2 +- 6 files changed, 9 insertions(+), 5 deletions(-) New commits: commit 17a416248235d89f145e8c15dac01d6946ac8460 Author: Caolán McNamara AuthorDate: Sun Oct 14 19:38:43 2018 +0100 Commit: Caolán McNamara CommitDate: Sun Oct 14 22:16:37 2018 +0200 split out vcl stuff used solely by toolkit module Change-Id: Idb1dfcdaaefefa9a8d97ecdd22e39377cb31bc62 Reviewed-on: https://gerrit.libreoffice.org/61763 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/include/vcl/toolkit/README b/include/vcl/toolkit/README new file mode 100644 index ..889f0b20aa50 --- /dev/null +++ b/include/vcl/toolkit/README @@ -0,0 +1,2 @@ +These are includes which are now only used by the toolkit module, which exposes +them via uno. Don't use these in any new code. diff --git a/include/vcl/group.hxx b/include/vcl/toolkit/group.hxx similarity index 100% rename from include/vcl/group.hxx rename to include/vcl/toolkit/group.hxx diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 2dcbc9d4d4cf..5f15395d1dca 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -7963,7 +7963,6 @@ include/vcl/gradient.hxx include/vcl/graph.hxx include/vcl/graphicfilter.hxx include/vcl/graphictools.hxx -include/vcl/group.hxx include/vcl/hatch.hxx include/vcl/help.hxx include/vcl/i18nhelp.hxx @@ -8052,6 +8051,7 @@ include/vcl/threadex.hxx include/vcl/throbber.hxx include/vcl/timer.hxx include/vcl/toolbox.hxx +include/vcl/toolkit/group.hxx include/vcl/txtattr.hxx include/vcl/uitest/factory.hxx include/vcl/uitest/logger.hxx @@ -17987,7 +17987,6 @@ vcl/source/control/field.cxx vcl/source/control/field2.cxx vcl/source/control/fixed.cxx vcl/source/control/fixedhyper.cxx -vcl/source/control/group.cxx vcl/source/control/imgctrl.cxx vcl/source/control/imp_listbox.cxx vcl/source/control/listbox.cxx @@ -18181,6 +18180,7 @@ vcl/source/outdev/transparent.cxx vcl/source/outdev/vclreferencebase.cxx vcl/source/outdev/wallpaper.cxx vcl/source/salmain/salmain.cxx +vcl/source/toolkit/group.cxx vcl/source/uipreviewer/previewer.cxx vcl/source/uitest/logger.cxx vcl/source/uitest/uiobject.cxx diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index d65bf794dc88..a045fa430ed3 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -94,7 +94,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index ca04103ac8cc..b856204a8569 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -182,7 +182,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/control/field \ vcl/source/control/fixed \ vcl/source/control/fixedhyper \ -vcl/source/control/group \ vcl/source/control/imgctrl \ vcl/source/control/listctrl \ vcl/source/control/longcurr \ @@ -207,6 +206,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/edit/textview \ vcl/source/edit/txtattr \ vcl/source/edit/xtextedt \ +vcl/source/toolkit/group \ vcl/source/outdev/outdev \ vcl/source/outdev/outdevstate \ vcl/source/outdev/outdevstatestack \ diff --git a/vcl/source/toolkit/README b/vcl/source/toolkit/README new file mode 100644 index ..78863390f1a7 --- /dev/null +++ b/vcl/source/toolkit/README @@ -0,0 +1,2 @@ +These are controls which are now only used by the toolkit module, which exposes +them via uno. Don't use these in any new code. diff --git a/vcl/source/control/group.cxx b/vcl/source/toolkit/group.cxx similarity index 99% rename from vcl/source/control/group.cxx rename to vcl/source/toolkit/group.cxx index 78f4fc90f122..8ef95d4ff587 100644 --- a/vcl/source/control/group.cxx +++ b/vcl/source/toolkit/group.cxx @@ -18,7 +18,7 @@ */ #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: canvas/workben include/vcl solenv/clang-format toolkit/inc vcl/inc vcl/source
canvas/workben/canvasdemo.cxx |1 - solenv/clang-format/blacklist |2 +- toolkit/inc/helper/unowrapper.hxx |2 +- vcl/inc/pch/precompiled_vcl.hxx |2 +- vcl/source/app/salvtables.cxx |2 +- vcl/source/app/svapp.cxx|2 +- vcl/source/app/svmain.cxx |2 +- vcl/source/outdev/outdev.cxx|2 +- vcl/source/window/accessibility.cxx |2 +- vcl/source/window/dialog.cxx|2 +- vcl/source/window/dockmgr.cxx |2 +- vcl/source/window/dockwin.cxx |2 +- vcl/source/window/menu.cxx |2 +- vcl/source/window/syswin.cxx|2 +- vcl/source/window/window.cxx|2 +- 15 files changed, 14 insertions(+), 15 deletions(-) New commits: commit d377c085627ac00268952d2401a8b8fde360336c Author: Caolán McNamara AuthorDate: Sun Oct 14 19:49:00 2018 +0100 Commit: Caolán McNamara CommitDate: Sun Oct 14 22:16:56 2018 +0200 unowrap.hxx is also exposed for toolkit only Change-Id: Ife3648c8ca84c942f02fb6eab2990ec3eb3eb3f9 Reviewed-on: https://gerrit.libreoffice.org/61764 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx index c419bb72775a..20b345e5060a 100644 --- a/canvas/workben/canvasdemo.cxx +++ b/canvas/workben/canvasdemo.cxx @@ -49,7 +49,6 @@ #include #include #include -#include #include #include diff --git a/include/vcl/unowrap.hxx b/include/vcl/toolkit/unowrap.hxx similarity index 100% rename from include/vcl/unowrap.hxx rename to include/vcl/toolkit/unowrap.hxx diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 5f15395d1dca..6d0368fc6783 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -8052,6 +8052,7 @@ include/vcl/throbber.hxx include/vcl/timer.hxx include/vcl/toolbox.hxx include/vcl/toolkit/group.hxx +include/vcl/toolkit/unowrap.hxx include/vcl/txtattr.hxx include/vcl/uitest/factory.hxx include/vcl/uitest/logger.hxx @@ -8059,7 +8060,6 @@ include/vcl/uitest/uiobject.hxx include/vcl/uitest/uitest.hxx include/vcl/unohelp.hxx include/vcl/unohelp2.hxx -include/vcl/unowrap.hxx include/vcl/vclenum.hxx include/vcl/vclevent.hxx include/vcl/vcllayout.hxx diff --git a/toolkit/inc/helper/unowrapper.hxx b/toolkit/inc/helper/unowrapper.hxx index 31844f12cd35..1c6c2a5e8a67 100644 --- a/toolkit/inc/helper/unowrapper.hxx +++ b/toolkit/inc/helper/unowrapper.hxx @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index 509a0493ffec..c37db5d2bd15 100644 --- a/vcl/inc/pch/precompiled_vcl.hxx +++ b/vcl/inc/pch/precompiled_vcl.hxx @@ -179,9 +179,9 @@ #include #include #include +#include #include #include -#include #include #include #include diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index aed6316810e9..efb5214ddb33 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 43cdf894e3c2..cd4422f0ef89 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 4f660133ebf6..673e800e4ac4 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index 340c0a68f495..a58bc91779cc 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx index 6802b1a604f7..069cac8e11e7 100644 --- a/vcl/source/window/accessibility.cxx +++ b/vcl/source/window/accessibility.cxx @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 5b2ec3b225db..a03ea6021d33 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 795a6f98c0fa..c5d6a93798d4 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEA
[Libreoffice-commits] core.git: connectivity/Configuration_mysql_jdbc.mk connectivity/Library_mysql_jdbc.mk connectivity/Module_connectivity.mk connectivity/registry connectivity/source dbaccess/sourc
Repository.mk |1 connectivity/Configuration_mysql_jdbc.mk | 20 connectivity/Library_mysql_jdbc.mk | 48 + connectivity/Module_connectivity.mk |2 connectivity/registry/mysql_jdbc/org/openoffice/Office/DataAccess/Drivers.xcu | 249 + connectivity/source/drivers/mysql_jdbc/YCatalog.cxx | 133 +++ connectivity/source/drivers/mysql_jdbc/YColumns.cxx | 74 + connectivity/source/drivers/mysql_jdbc/YDriver.cxx | 435 ++ connectivity/source/drivers/mysql_jdbc/YTable.cxx | 336 +++ connectivity/source/drivers/mysql_jdbc/YTables.cxx | 216 connectivity/source/drivers/mysql_jdbc/YUser.cxx | 324 +++ connectivity/source/drivers/mysql_jdbc/YUsers.cxx | 101 ++ connectivity/source/drivers/mysql_jdbc/YViews.cxx | 146 +++ connectivity/source/drivers/mysql_jdbc/Yservices.cxx | 66 + connectivity/source/drivers/mysql_jdbc/mysql_jdbc.component | 26 dbaccess/source/ui/dlg/generalpage.cxx |4 dbaccess/source/ui/dlg/generalpage.hxx |5 postprocess/CustomTarget_registry.mk |5 postprocess/Rdb_services.mk |1 19 files changed, 2190 insertions(+), 2 deletions(-) New commits: commit b2cefc2e36925b4384eb0aea54aa2c6bcfb018a8 Author: Tamas Bunth AuthorDate: Mon Oct 8 11:04:48 2018 +0200 Commit: Tamás Bunth CommitDate: Sun Oct 14 22:16:05 2018 +0200 Revert removal of mysql jdbc connector And also make some minor fixes so it cooperates with the new mysqlc library. Change-Id: I866add99a699150c6550ee7f7ff2ee947e07117c Reviewed-on: https://gerrit.libreoffice.org/61648 Tested-by: Jenkins Reviewed-by: Tamás Bunth diff --git a/Repository.mk b/Repository.mk index 7376e0391d6f..f7162e48e080 100644 --- a/Repository.mk +++ b/Repository.mk @@ -403,6 +403,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ msfilter \ $(call gb_Helper_optional,SCRIPTING,msforms) \ mtfrenderer \ + $(call gb_Helper_optional,DBCONNECTIVITY,mysql_jdbc) \ $(call gb_Helper_optional,DBCONNECTIVITY,mysqlc) \ numbertext \ odbc \ diff --git a/connectivity/Configuration_mysql_jdbc.mk b/connectivity/Configuration_mysql_jdbc.mk new file mode 100644 index ..27a672aad9b3 --- /dev/null +++ b/connectivity/Configuration_mysql_jdbc.mk @@ -0,0 +1,20 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. +# + +$(eval $(call gb_Configuration_Configuration,driver_mysql_jdbc)) + +$(eval $(call gb_Configuration_add_spool_modules,driver_mysql_jdbc,connectivity/registry/mysql_jdbc,\ + org/openoffice/Office/DataAccess/Drivers-mysql_jdbc.xcu \ +)) + +$(eval $(call gb_Configuration_add_localized_datas,driver_mysql_jdbc,connectivity/registry/mysql_jdbc,\ + org/openoffice/Office/DataAccess/Drivers.xcu \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/connectivity/Library_mysql_jdbc.mk b/connectivity/Library_mysql_jdbc.mk new file mode 100644 index ..3e92a7e19622 --- /dev/null +++ b/connectivity/Library_mysql_jdbc.mk @@ -0,0 +1,48 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# +# 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/. +# + +$(eval $(call gb_Library_Library,mysql_jdbc)) + +$(eval $(call gb_Library_set_componentfile,mysql_jdbc,connectivity/source/drivers/mysql_jdbc/mysql_jdbc)) + +$(eval $(call gb_Library_use_external,mysql_jdbc,boost_headers)) + +$(eval $(call gb_Library_use_sdk_api,mysql_jdbc)) + +$(eval $(call gb_Library_set_include,mysql_jdbc,\ + $$(INCLUDE) \ + -I$(SRCDIR)/connectivity/inc \ + -I$(SRCDIR)/connectivity/source/inc \ +)) + +$(eval $(call gb_Library_set_precompiled_header,mysql_jdbc,$(SRCDIR)/connectivity/inc/pch/precompiled_mysql)) + +$(eval $(call gb_Library_use_libraries,mysql_jdbc,\ + cppu \ + cppuhelper \ + sal \ + salhelper \ + dbtools \ + comphelper
[Libreoffice-commits] core.git: cui/source dbaccess/source extensions/source formula/source fpicker/source include/svx sc/source sd/source svx/inc svx/source sw/inc sw/source toolkit/source
cui/source/dialogs/insdlg.cxx|1 - cui/source/dialogs/linkdlg.cxx |1 - cui/source/inc/SpellDialog.hxx |1 - cui/source/inc/SvxMenuConfigPage.hxx |1 - cui/source/inc/SvxToolbarConfigPage.hxx |1 - cui/source/inc/acccfg.hxx|1 - cui/source/inc/autocdlg.hxx |1 - cui/source/inc/backgrnd.hxx |1 - cui/source/inc/border.hxx|1 - cui/source/inc/cfg.hxx |1 - cui/source/inc/cuisrchdlg.hxx|1 - cui/source/inc/dstribut.hxx |1 - cui/source/inc/hltpbase.hxx |1 - cui/source/inc/measure.hxx |1 - cui/source/inc/numpages.hxx |1 - cui/source/inc/optasian.hxx |1 - cui/source/inc/optdict.hxx |1 - cui/source/inc/optlingu.hxx |1 - cui/source/inc/optpath.hxx |1 - cui/source/inc/page.hxx |1 - cui/source/inc/textanim.hxx |1 - cui/source/inc/textattr.hxx |3 --- cui/source/options/optcolor.hxx |1 - cui/source/options/optfltr.hxx |1 - cui/source/options/optgdlg.hxx |1 - cui/source/options/opthtml.hxx |1 - cui/source/options/optinet2.hxx |1 - cui/source/options/optsave.hxx |1 - dbaccess/source/ui/dlg/UserAdmin.hxx |1 - dbaccess/source/ui/dlg/dsselect.hxx |1 - dbaccess/source/ui/inc/WCPage.hxx|1 - extensions/source/bibliography/bibload.cxx |1 - extensions/source/bibliography/datman.cxx|1 - extensions/source/bibliography/general.hxx |1 - extensions/source/scanner/sanedlg.hxx|1 - formula/source/ui/dlg/formula.cxx|1 - formula/source/ui/dlg/funcpage.hxx |1 - formula/source/ui/dlg/parawin.hxx|1 - formula/source/ui/dlg/structpg.hxx |1 - fpicker/source/office/iodlgimp.hxx |1 - include/svx/galctrl.hxx |1 - include/svx/hdft.hxx |1 - include/svx/srchdlg.hxx |1 - include/svx/tabline.hxx |1 - sc/source/ui/inc/AnalysisOfVarianceDialog.hxx|1 - sc/source/ui/inc/ExponentialSmoothingDialog.hxx |1 - sc/source/ui/inc/MatrixComparisonGenerator.hxx |1 - sc/source/ui/inc/MovingAverageDialog.hxx |1 - sc/source/ui/inc/RandomNumberGeneratorDialog.hxx |1 - sc/source/ui/inc/SamplingDialog.hxx |1 - sc/source/ui/inc/StatisticsInputOutputDialog.hxx |1 - sc/source/ui/inc/StatisticsTwoVariableDialog.hxx |1 - sc/source/ui/inc/acredlin.hxx|1 - sc/source/ui/inc/consdlg.hxx |1 - sc/source/ui/inc/formula.hxx |1 - sc/source/ui/inc/highred.hxx |1 - sc/source/ui/inc/namedlg.hxx |1 - sc/source/ui/inc/opredlin.hxx|6 -- sc/source/ui/inc/optsolver.hxx |1 - sc/source/ui/inc/simpref.hxx |4 sc/source/ui/inc/solvrdlg.hxx|1 - sc/source/ui/inc/tabopdlg.hxx|1 - sc/source/ui/inc/tabpages.hxx|1 - sc/source/ui/inc/tpcalc.hxx |1 - sc/source/ui/inc/tphfedit.hxx|1 - sc/source/ui/inc/tpview.hxx |1 - sd/source/ui/func/fuoaprms.cxx |1 - svx/inc/pch/precompiled_svx.hxx |1 - svx/source/dialog/imapdlg.cxx|1 - sw/inc/pch/precompiled_swui.hxx |1 - sw/source/ui/envelp/labprt.hxx |1 - sw/source/ui/fldui/flddb.hxx |1 - sw/source/ui/fldui/flddinf.hxx |1 - sw/source/ui/fldui/flddok.hxx|1 - sw/source/ui/fldui/fldfunc.hxx |1 - sw/source/ui/fldui/fldref.hxx|1 - sw/source/ui/fldui/fldvar.hxx|1 - sw/source/uibase/inc/chrdlg.hxx |1 - sw/source/uibase/inc/column.hxx |1 - sw/source/uibase/inc/cption.hxx |1 - sw/source/uibase/inc/dbinsdlg.hxx|1 - sw/source/uibase/inc/optload.hxx |1 - sw/source/uibase/inc/optpage.hxx |1 - sw/source/uibase/inc/pgfnote.hxx |1 - sw/source/uibase/inc/regionsw.hx
[Libreoffice-commits] core.git: chart2/source cui/source extras/source include/svx include/vcl solenv/clang-format svx/source sw/source sw/uiconfig vcl/source vcl/unx
chart2/source/controller/dialogs/TextDirectionListBox.cxx |2
chart2/source/controller/inc/TextDirectionListBox.hxx |2
cui/source/inc/align.hxx |2
cui/source/inc/page.hxx |2
cui/source/inc/paragrph.hxx |2
cui/source/tabpages/align.cxx |2
cui/source/tabpages/page.cxx |2
cui/source/tabpages/paragrph.cxx |2
extras/source/glade/libreoffice-catalog.xml.in|3
include/svx/frmdirlbox.hxx| 28 -
include/vcl/combobox.hxx |5
include/vcl/weld.hxx |2
solenv/clang-format/blacklist |1
svx/source/dialog/frmdirlbox.cxx | 52 --
sw/source/ui/frmdlg/column.cxx|2
sw/source/ui/frmdlg/frmpage.cxx | 301 ++
sw/source/ui/table/tabledlg.cxx |2
sw/source/uibase/inc/column.hxx |2
sw/source/uibase/inc/frmpage.hxx | 58 +-
sw/source/uibase/table/tablepg.hxx|2
sw/uiconfig/swriter/ui/frmaddpage.ui | 42 -
vcl/source/app/salvtables.cxx | 17
vcl/source/control/combobox.cxx |5
vcl/unx/gtk3/gtk3gtkinst.cxx | 36 +
24 files changed, 261 insertions(+), 313 deletions(-)
New commits:
commit 2b9f23b9b8a62d82691233d789e830b3bde7b3da
Author: Caolán McNamara
AuthorDate: Sat Oct 13 21:39:00 2018 +0100
Commit: Caolán McNamara
CommitDate: Sun Oct 14 20:18:41 2018 +0200
weld SwFrameAddPage
Change-Id: Ia63e22d01c6bcc08f50d3e1b12943094660c7fd0
Reviewed-on: https://gerrit.libreoffice.org/61758
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx
b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
index b26350942f03..f0440155e9e6 100644
--- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx
+++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
@@ -28,7 +28,7 @@ namespace chart
{
TextDirectionListBox::TextDirectionListBox(std::unique_ptr
pControl)
-: svx::SvxFrameDirectionListBox(std::move(pControl))
+: svx::FrameDirectionListBox(std::move(pControl))
{
append(SvxFrameDirection::Horizontal_LR_TB,
SchResId(STR_TEXT_DIRECTION_LTR));
append(SvxFrameDirection::Horizontal_RL_TB,
SchResId(STR_TEXT_DIRECTION_RTL));
diff --git a/chart2/source/controller/inc/TextDirectionListBox.hxx
b/chart2/source/controller/inc/TextDirectionListBox.hxx
index 83c64b541370..8f50065eedce 100644
--- a/chart2/source/controller/inc/TextDirectionListBox.hxx
+++ b/chart2/source/controller/inc/TextDirectionListBox.hxx
@@ -27,7 +27,7 @@ namespace vcl { class Window; }
namespace chart
{
-class TextDirectionListBox : public svx::SvxFrameDirectionListBox
+class TextDirectionListBox : public svx::FrameDirectionListBox
{
public:
explicit TextDirectionListBox(std::unique_ptr pControl);
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index 5c96ec25aa30..1f5257e9d2c1 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -98,7 +98,7 @@ private:
std::unique_ptr m_xBtnWrap;
std::unique_ptr m_xBtnHyphen;
std::unique_ptr m_xBtnShrink;
-std::unique_ptr m_xLbFrameDir;
+std::unique_ptr m_xLbFrameDir;
// hidden labels/string
std::unique_ptr m_xFtBotLock;
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index 69892a64f699..e6105af52c08 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -106,7 +106,7 @@ private:
std::unique_ptr m_xPortraitBtn;
std::unique_ptr m_xLandscapeBtn;
std::unique_ptr m_xTextFlowLbl;
-std::unique_ptr m_xTextFlowBox;
+std::unique_ptr m_xTextFlowBox;
std::unique_ptr m_xPaperTrayBox;
// Margins
std::unique_ptr m_xLeftMarginLbl;
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index b656f8d52b05..8acc4f4ea4bd 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -157,7 +157,7 @@ class SvxParaAlignTabPage : public SfxTabPage
std::unique_ptr m_xVertAlignLB;
std::unique_ptr m_xPropertiesFL;
-std::unique_ptr m_xTextDirectionLB;
+std::unique_ptr m_xTextDirectionLB;
DECL_LINK(AlignHdl_Impl, weld::ToggleButton&, void);
DECL_LINK(LastLineHdl_Impl, weld::ComboBox&, void);
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 76581331f0a5..821e9abf875a 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source
cui/source/options/fontsubs.src |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 916e40069d27ff96cb84209e465489d2b639d91e
Author: Matthias Seidel
AuthorDate: Sun Oct 14 16:23:18 2018 +
Commit: Matthias Seidel
CommitDate: Sun Oct 14 16:23:18 2018 +
Re-added Maskcolor.
Will investigate further why this is needed here.
diff --git a/cui/source/options/fontsubs.src b/cui/source/options/fontsubs.src
index 93fa59210004..058d95875b87 100644
--- a/cui/source/options/fontsubs.src
+++ b/cui/source/options/fontsubs.src
@@ -82,13 +82,14 @@ TabPage RID_SVX_FONT_SUBSTITUTION
};
ImageList IL_ICON
{
-Prefix = "nu" ;
+Prefix = "nu";
+MaskColor = Color { Red = 0x ; Green = 0x ; Blue = 0x ; };
IdList =
{
BT_SUBSTAPPLY ;
BT_SUBSTDELETE ;
};
-IdCount = { 2 ; } ;
+IdCount = { 2 ; };
};
ToolBox TBX_SUBSTNEWDEL
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - cui/source
cui/source/options/optsave.src |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit e798a3177976806b4b726d2845251f2b11ae7bcd
Author: Matthias Seidel
AuthorDate: Sun Oct 14 14:51:35 2018 +
Commit: Matthias Seidel
CommitDate: Sun Oct 14 14:51:35 2018 +
Moved ODF warning up a bit
diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
index 15c23ec065cb..e743cc50ae88 100644
--- a/cui/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -224,16 +224,16 @@ TabPage RID_SFXPAGE_SAVE
};
FixedImage FI_ODF_WARNING
{
-Pos = MAP_APPFONT ( 12, 180 ) ;
+Pos = MAP_APPFONT ( 12, 174 ) ;
Size = MAP_APPFONT ( 8, 8 ) ;
Hide = TRUE ;
};
FixedText FT_WARN
{
-Pos = MAP_APPFONT ( 23, 180 ) ;
+Pos = MAP_APPFONT ( 23, 174 ) ;
Size = MAP_APPFONT ( 239, 8 ) ;
Hide = TRUE ;
-Text [ en-US ] = "Not using ODF 1.2 Extended may cause information to
be lost!" ;
+Text [ en-US ] = "Not using ODF 1.2 Extended may cause information to
be lost." ;
};
Image IMG_ODF_WARNING
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/headless vcl/inc vcl/osx vcl/qt5 vcl/quartz vcl/source vcl/unx vcl/win vcl/workben
vcl/headless/svpframe.cxx |5
vcl/inc/impdel.hxx |5
vcl/osx/salnativewidgets.cxx | 10 -
vcl/qt5/Qt5Instance_Print.cxx |6 -
vcl/quartz/ctfonts.cxx |5
vcl/quartz/salgdicommon.cxx|9 -
vcl/source/control/throbber.cxx|7 -
vcl/source/filter/graphicfilter.cxx| 15 --
vcl/source/filter/wmf/wmfwr.cxx|5
vcl/source/font/PhysicalFontCollection.cxx |5
vcl/source/fontsubset/sft.cxx |5
vcl/source/gdi/pdfextoutdevdata.cxx| 35 ++
vcl/source/gdi/pdfwriter_impl.cxx | 14 --
vcl/source/gdi/textlayout.cxx |7 -
vcl/source/window/accmgr.cxx | 14 --
vcl/source/window/builder.cxx | 35 ++
vcl/source/window/dialog.cxx | 18 +--
vcl/source/window/dlgctrl.cxx | 27 +
vcl/source/window/layout.cxx |9 -
vcl/source/window/menu.cxx |6 -
vcl/source/window/printdlg.cxx | 20 +--
vcl/source/window/taskpanelist.cxx | 130 +++--
vcl/source/window/toolbox.cxx | 61 +++
vcl/source/window/toolbox2.cxx | 104 ++--
vcl/unx/generic/dtrans/X11_selection.cxx | 11 --
vcl/unx/generic/fontmanager/fontconfig.cxx |4
vcl/unx/generic/gdi/cairotextrender.cxx|8 -
vcl/unx/generic/gdi/salbmp.cxx | 11 --
vcl/unx/generic/printer/ppdparser.cxx | 25 ++--
vcl/unx/generic/printer/printerinfomanager.cxx | 35 ++
vcl/unx/gtk/gtksalframe.cxx| 19 +--
vcl/unx/gtk/salprn-gtk.cxx |5
vcl/unx/gtk3/gtk3gtkframe.cxx | 19 +--
vcl/win/gdi/salnativewidgets-luna.cxx |8 -
vcl/workben/vcldemo.cxx| 11 --
35 files changed, 268 insertions(+), 445 deletions(-)
New commits:
commit 19be86249dcc5b13b3c95f5469600fa2bc1b749b
Author: Arkadiy Illarionov
AuthorDate: Sun Oct 14 12:00:03 2018 +0300
Commit: Noel Grandin
CommitDate: Sun Oct 14 17:30:32 2018 +0200
Simplify containers iterations in vcl
Use range-based loop or replace with STL functions.
Change-Id: Ide2f89194238ae6a1f21e8132e2297710d9e6dcd
Reviewed-on: https://gerrit.libreoffice.org/61756
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index 20a3ffa68823..9bf3e9cb84e6 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -81,9 +81,8 @@ SvpSalFrame::~SvpSalFrame()
m_pInstance->deregisterFrame( this );
std::list Children = m_aChildren;
-for( std::list::iterator it = Children.begin();
- it != Children.end(); ++it )
- (*it)->SetParent( m_pParent );
+for( auto& rChild : Children )
+rChild->SetParent( m_pParent );
if( m_pParent )
m_pParent->m_aChildren.remove( this );
diff --git a/vcl/inc/impdel.hxx b/vcl/inc/impdel.hxx
index 95f373b1dcb9..308872b9c9eb 100644
--- a/vcl/inc/impdel.hxx
+++ b/vcl/inc/impdel.hxx
@@ -67,9 +67,8 @@ class DeletionListener
inline void DeletionNotifier::notifyDelete()
{
-for( std::list< DeletionListener* >::const_iterator it =
-m_aListeners.begin(); it != m_aListeners.end(); ++it )
- (*it)->deleted();
+for( auto& rListener : m_aListeners )
+ rListener->deleted();
m_aListeners.clear();
}
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index 9e5008703549..d89fecf1681e 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -74,12 +74,10 @@ public:
void AquaBlinker::Blink( AquaSalFrame* pFrame, const tools::Rectangle& rRect,
int nTimeout )
{
// prevent repeated paints from triggering themselves all the time
-for( std::list< AquaBlinker* >::const_iterator it =
pFrame->maBlinkers.begin();
- it != pFrame->maBlinkers.end(); ++it )
-{
-if( (*it)->maInvalidateRect == rRect )
-return;
-}
+auto isRepeated = std::any_of(pFrame->maBlinkers.begin(),
pFrame->maBlinkers.end(),
+[&rRect](AquaBlinker* pBlinker) { return pBlinker->maInvalidateRect ==
rRect; });
+if( isRepeated )
+return;
AquaBlinker* pNew = new AquaBlinker( pFrame, rRect );
pNew->SetTimeout( nTimeout );
pNew->Start();
diff --git a/vcl/qt5/Qt5Instance_Print.cxx b/vcl/qt5/Qt5Instance_Print.cxx
index dd095f533c1a..501db07e7362 100644
--- a/vcl/qt5/Qt5Instance_Print.cxx
+++ b/vcl/qt5/Qt5Instance_Print.cxx
@@ -89,12 +89,12 @@ void Qt5Instance::GetPrinterQueueInfo(ImplPrnQueueList*
pList)
::std::vector aPrinters;
rManager.listPrinters(aPrinters);
-for (::std::vector::iter
[Libreoffice-commits] core.git: jvmfwk/inc jvmfwk/plugins
jvmfwk/inc/vendorbase.hxx|6 --
jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx | 18 +-
2 files changed, 1 insertion(+), 23 deletions(-)
New commits:
commit 7758115d15ded2afd81946df0865ecc831b179aa
Author: Arnaud Versini
AuthorDate: Sun Oct 14 09:27:32 2018 +0200
Commit: Noel Grandin
CommitDate: Sun Oct 14 17:13:25 2018 +0200
Remove useless constructor and destructor
Change-Id: I3130ffb7e3ec1c39965ddbc921e5b3ef8303fa31
Reviewed-on: https://gerrit.libreoffice.org/61755
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/jvmfwk/inc/vendorbase.hxx b/jvmfwk/inc/vendorbase.hxx
index b2ae34915459..02684a62b675 100644
--- a/jvmfwk/inc/vendorbase.hxx
+++ b/jvmfwk/inc/vendorbase.hxx
@@ -85,13 +85,7 @@ OpenJDK at least, but probably not true for Lemotes JDK */
class MalformedVersionException : public std::exception
{
public:
-MalformedVersionException();
-
-MalformedVersionException(const MalformedVersionException &);
-
virtual ~MalformedVersionException() override;
-
-MalformedVersionException & operator =(const MalformedVersionException &);
};
class VendorBase: public salhelper::SimpleReferenceObject
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
index 5aaf385ecc69..254f17e16de9 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
@@ -31,23 +31,7 @@ using namespace osl;
namespace jfw_plugin
{
-MalformedVersionException::MalformedVersionException()
-{}
-
-MalformedVersionException::MalformedVersionException(
-const MalformedVersionException & )
-{}
-
-MalformedVersionException::~MalformedVersionException()
-{}
-
-MalformedVersionException &
-MalformedVersionException::operator =(
-const MalformedVersionException &)
-{
-return *this;
-}
-
+MalformedVersionException::~MalformedVersionException() = default;
VendorBase::VendorBase(): m_bAccessibility(false)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - chart2/source cui/source extras/source include/svx solenv/clang-format solenv/sanitizers svx/Library_svx.mk svx/source
chart2/source/controller/dialogs/tp_TitleRotation.hxx |1
cui/source/inc/align.hxx |1
extras/source/glade/libreoffice-catalog.xml.in|3
include/svx/orienthelper.hxx | 92 ---
solenv/clang-format/blacklist |2
solenv/sanitizers/ui/modules/schart.suppr |4
svx/Library_svx.mk|1
svx/source/dialog/dialcontrol.cxx |2
svx/source/dialog/orienthelper.cxx| 149 --
9 files changed, 255 deletions(-)
New commits:
commit 21a6a683257e7d2d9f372ab7f2eec6525f22
Author: Caolán McNamara
AuthorDate: Sat Oct 13 20:43:36 2018 +0100
Commit: Caolán McNamara
CommitDate: Sun Oct 14 15:03:14 2018 +0200
drop now unused orienthelper
Change-Id: I6a33104002ecb304a65e930320595a082049faa9
Reviewed-on: https://gerrit.libreoffice.org/61750
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
index 217f2e73a543..7520a84eee4d 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
@@ -21,7 +21,6 @@
#include
#include
-#include
#include
#include
#include
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index 669cac0467e0..5c96ec25aa30 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -36,7 +36,6 @@
#define ALIGNDLG_VERALIGN_DISTRIBUTED 5
-#include
#include
#include
#include
diff --git a/include/svx/orienthelper.hxx b/include/svx/orienthelper.hxx
deleted file mode 100644
index 6fb516f831b0..
--- a/include/svx/orienthelper.hxx
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -*- 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 .
- */
-
-#ifndef INCLUDED_SVX_ORIENTHELPER_HXX
-#define INCLUDED_SVX_ORIENTHELPER_HXX
-
-#include
-#include
-#include
-
-class NumericField;
-class CheckBox;
-
-namespace svx {
-
-class DialControl;
-
-
-struct OrientationHelper_Impl;
-
-/** A helper class that manages a DialControl and a "Stacked text" check box.
-
-This helper remembers a DialControl for entering a rotation angle, and a
-check box for stacked text, that enables/disables other controls dependent
-on its state.
-
-It is possible to register more controls that have to be enabled/disabled
-together with this helper object (optionally dependent on the stacked text
-check box), using the function AddDependentWindow(). All registered windows
-are handled on a call of Enable(), or Show(), or on changing the state of
-the "Stacked text" check box.
-
-Note: The member function SetStackedState() should be used instead of
-direct modifications of the "Stacked text" check box. Otherwise the update
-mechanism of registered controls will not work.
- */
-class SVX_DLLPUBLIC OrientationHelper final
-{
-public:
-/** @param rNfRotation A numeric field that will be connected to the
DialControl. */
-explicitOrientationHelper(
-DialControl& rCtrlDial,
-NumericField& rNfRotation,
-CheckBox& rCbStacked );
-
- ~OrientationHelper();
-
-/** Registers the passed window to be enabled/disabled on call of Enable().
-@param eDisableIfStacked
-TRISTATE_TRUE:Window always disabled, if stacked text is turned on.
-TRISTATE_FALSE: Window always disabled, if stacked text is turned off.
-TRISTATE_INDET: Window will be enabled/disabled independent from
stacked text. */
-voidAddDependentWindow( vcl::Window& rWindow, TriState
eDisableIfStacked = TRISTATE_INDET );
-
-/** Enables or disables the dial control and all dependent windows. */
-voidEnable( bool bEnable = true );
-
-/** Shows or hides the dial control and all dependent windows. */
-
[Libreoffice-commits] core.git: 2 commits - chart2/source chart2/uiconfig extras/source solenv/sanitizers
chart2/source/controller/dialogs/TextDirectionListBox.cxx | 15 ---
chart2/source/controller/dialogs/res_LegendPosition.cxx | 64 ++
chart2/source/controller/dialogs/tp_LegendPosition.cxx| 25 ++---
chart2/source/controller/dialogs/tp_LegendPosition.hxx|9 -
chart2/source/controller/inc/TextDirectionListBox.hxx |6 -
chart2/source/controller/inc/res_LegendPosition.hxx |7 +
chart2/uiconfig/ui/tp_LegendPosition.ui | 25 +
extras/source/glade/libreoffice-catalog.xml.in|3
solenv/sanitizers/ui/modules/schart.suppr |3
9 files changed, 93 insertions(+), 64 deletions(-)
New commits:
commit c8ecf827f4ba8f2ff81a58c45bea773d52828723
Author: Caolán McNamara
AuthorDate: Sat Oct 13 21:25:11 2018 +0100
Commit: Caolán McNamara
CommitDate: Sun Oct 14 15:03:37 2018 +0200
TextDirectionListBox is gone now
Change-Id: If71c156164b51362754b6996f46917e30aee5b87
Reviewed-on: https://gerrit.libreoffice.org/61753
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx
b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
index a622e2b651d2..1114cd8b52f2 100644
--- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx
+++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
@@ -27,21 +27,6 @@
namespace chart
{
-TextDirectionListBox::TextDirectionListBox( vcl::Window* pParent ) :
-svx::FrameDirectionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_DROPDOWN)
-{
-InsertEntryValue( SchResId( STR_TEXT_DIRECTION_LTR ),
SvxFrameDirection::Horizontal_LR_TB );
-InsertEntryValue( SchResId( STR_TEXT_DIRECTION_RTL ),
SvxFrameDirection::Horizontal_RL_TB );
-InsertEntryValue( SchResId( STR_TEXT_DIRECTION_SUPER ),
SvxFrameDirection::Environment );
-
-if( !SvtLanguageOptions().IsCTLFontEnabled() )
-{
-Hide();
-}
-}
-
-VCL_BUILDER_FACTORY(TextDirectionListBox)
-
SchTextDirectionListBox::SchTextDirectionListBox(std::unique_ptr
pControl)
: svx::SvxFrameDirectionListBox(std::move(pControl))
{
diff --git a/chart2/source/controller/inc/TextDirectionListBox.hxx
b/chart2/source/controller/inc/TextDirectionListBox.hxx
index e04fcca15718..766c8a95c1fb 100644
--- a/chart2/source/controller/inc/TextDirectionListBox.hxx
+++ b/chart2/source/controller/inc/TextDirectionListBox.hxx
@@ -27,12 +27,6 @@ namespace vcl { class Window; }
namespace chart
{
-class TextDirectionListBox : public svx::FrameDirectionListBox
-{
-public:
-explicitTextDirectionListBox( vcl::Window* pParent );
-};
-
class SchTextDirectionListBox : public svx::SvxFrameDirectionListBox
{
public:
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index 27a9e815670b..3b365dbff79c 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -274,9 +274,6 @@
-
diff --git a/solenv/sanitizers/ui/modules/schart.suppr
b/solenv/sanitizers/ui/modules/schart.suppr
index 9d4d00d02d9a..cabe450598bb 100644
--- a/solenv/sanitizers/ui/modules/schart.suppr
+++ b/solenv/sanitizers/ui/modules/schart.suppr
@@ -25,12 +25,10 @@
chart2/uiconfig/ui/titlerotationtabpage.ui://GtkSpinButton[@id='OrientDegree'] n
chart2/uiconfig/ui/titlerotationtabpage.ui://GtkLabel[@id='degreeL']
orphan-label
chart2/uiconfig/ui/titlerotationtabpage.ui://GtkLabel[@id='labelABCD']
orphan-label
chart2/uiconfig/ui/titlerotationtabpage.ui://GtkLabel[@id='textdirL']
orphan-label
-chart2/uiconfig/ui/titlerotationtabpage.ui://chartcontrollerlo-TextDirectionListBox[@id='textdirLB']
no-labelled-by
chart2/uiconfig/ui/tp_axisLabel.ui://GtkSpinButton[@id='OrientDegree']
no-labelled-by
chart2/uiconfig/ui/tp_axisLabel.ui://GtkLabel[@id='degreeL'] orphan-label
chart2/uiconfig/ui/tp_axisLabel.ui://GtkLabel[@id='labelABCD'] orphan-label
chart2/uiconfig/ui/tp_axisLabel.ui://GtkLabel[@id='textdirL'] orphan-label
-chart2/uiconfig/ui/tp_axisLabel.ui://chartcontrollerlo-TextDirectionListBox[@id='textdirLB']
no-labelled-by
chart2/uiconfig/ui/tp_ChartType.ui://GtkLabel[@id='FT_CAPTION_FOR_WIZARD']
orphan-label
chart2/uiconfig/ui/tp_ChartType.ui://GtkTreeView[@id='charttype:border']
no-labelled-by
chart2/uiconfig/ui/tp_DataLabel.ui://GtkLabel[@id='CT_LABEL_DIAL'] orphan-label
@@ -48,7 +46,6 @@
chart2/uiconfig/ui/tp_ErrorBars.ui://GtkLabel[@id='STR_DATA_SELECT_RANGE_FOR_POS
chart2/uiconfig/ui/tp_ErrorBars.ui://GtkLabel[@id='STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS']
orphan-label
chart2/uiconfig/ui/tp_ErrorBars.ui://GtkLabel[@id='STR_CONTROLTEXT_ERROR_BARS_FROM_DATA']
orphan-label
chart2/uiconfig/ui/tp_LegendPosition.ui://GtkLabel[@id='FT_LEGEND_TEXTDIR']
orphan-label
-chart2/uiconfig/ui/tp_LegendPosition.ui://chartcontrollerlo-TextDirectionListBox[@id='LB_LEGEND_TEXTDIR']
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/dialogs/TextDirectionListBox.cxx |2 +-
chart2/source/controller/dialogs/res_DataLabel.cxx|2 +-
chart2/source/controller/dialogs/res_DataLabel.hxx|2 +-
chart2/source/controller/dialogs/tp_AxisLabel.cxx |2 +-
chart2/source/controller/dialogs/tp_AxisLabel.hxx |2 +-
chart2/source/controller/dialogs/tp_LegendPosition.cxx|2 +-
chart2/source/controller/dialogs/tp_LegendPosition.hxx|2 +-
chart2/source/controller/dialogs/tp_TitleRotation.cxx |2 +-
chart2/source/controller/dialogs/tp_TitleRotation.hxx |2 +-
chart2/source/controller/inc/TextDirectionListBox.hxx |4 ++--
10 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 7e85ee1e5fdf0c122f450155f49d9696aef17de0
Author: Caolán McNamara
AuthorDate: Sat Oct 13 21:26:16 2018 +0100
Commit: Caolán McNamara
CommitDate: Sun Oct 14 15:03:51 2018 +0200
rename SchTextDirectionListBox back to TextDirectionListBox
Change-Id: Ic2369630e66fa26e189fbbc374c5a60ce7fb8173
Reviewed-on: https://gerrit.libreoffice.org/61754
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/chart2/source/controller/dialogs/TextDirectionListBox.cxx
b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
index 1114cd8b52f2..b26350942f03 100644
--- a/chart2/source/controller/dialogs/TextDirectionListBox.cxx
+++ b/chart2/source/controller/dialogs/TextDirectionListBox.cxx
@@ -27,7 +27,7 @@
namespace chart
{
-SchTextDirectionListBox::SchTextDirectionListBox(std::unique_ptr
pControl)
+TextDirectionListBox::TextDirectionListBox(std::unique_ptr
pControl)
: svx::SvxFrameDirectionListBox(std::move(pControl))
{
append(SvxFrameDirection::Horizontal_LR_TB,
SchResId(STR_TEXT_DIRECTION_LTR));
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx
b/chart2/source/controller/dialogs/res_DataLabel.cxx
index e44a346a0a46..e77fb0644961 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -108,7 +108,7 @@ DataLabelResources::DataLabelResources(weld::Builder*
pBuilder, weld::Window* pP
, m_xFT_Dial(pBuilder->weld_label("CT_LABEL_DIAL"))
, m_xNF_Degrees(pBuilder->weld_spin_button("NF_LABEL_DEGREES"))
, m_xBxTextDirection(pBuilder->weld_widget("boxTXT_DIRECTION"))
-, m_xLB_TextDirection(new
SchTextDirectionListBox(pBuilder->weld_combo_box("LB_LABEL_TEXTDIR")))
+, m_xLB_TextDirection(new
TextDirectionListBox(pBuilder->weld_combo_box("LB_LABEL_TEXTDIR")))
, m_xDC_Dial(new weld::CustomWeld(*pBuilder, "CT_DIAL", m_aDC_Dial))
{
m_aDC_Dial.SetText(m_xFT_Dial->get_label());
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx
b/chart2/source/controller/dialogs/res_DataLabel.hxx
index 036441266cf6..c1bbaef60ae0 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -83,7 +83,7 @@ private:
std::unique_ptr m_xBxTextDirection;
-std::unique_ptr m_xLB_TextDirection;
+std::unique_ptr m_xLB_TextDirection;
std::unique_ptr m_xDC_Dial;
DECL_LINK(NumberFormatDialogHdl, weld::Button&, void );
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index d6526884188d..477049d24a5e 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -53,7 +53,7 @@ SchAxisLabelTabPage::SchAxisLabelTabPage(TabPageParent
pParent, const SfxItemSet
, m_xNfRotate(m_xBuilder->weld_spin_button("OrientDegree"))
, m_xCbStacked(m_xBuilder->weld_check_button("stackedCB"))
, m_xFtTextDirection(m_xBuilder->weld_label("textdirL"))
-, m_xLbTextDirection(new
SchTextDirectionListBox(m_xBuilder->weld_combo_box("textdirLB")))
+, m_xLbTextDirection(new
TextDirectionListBox(m_xBuilder->weld_combo_box("textdirLB")))
, m_xCtrlDial(new weld::CustomWeld(*m_xBuilder, "dialCtrl", m_aCtrlDial))
{
m_aCtrlDial.SetText(m_xFtABCD->get_label());
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
index 619e099bd889..cd5673b7cb98 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
@@ -55,7 +55,7 @@ private:
std::unique_ptr m_xNfRotate;
std::unique_ptr m_xCbStacked;
std::unique_ptr m_xFtTextDirection;
-std::unique_ptr m_xLbTextDirection;
+std::unique_ptr m_xLbTextDirection;
std::unique_ptr m_xCtrlDial;
DECL_LINK(StackedToggleHdl, weld::ToggleButton&, void);
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index a16aec38a439..ce44fc18229e 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/control
[Libreoffice-commits] core.git: 2 commits - chart2/source chart2/uiconfig include/svx svx/source
chart2/source/controller/dialogs/tp_AxisLabel.cxx| 222 ---
chart2/source/controller/dialogs/tp_AxisLabel.hxx| 51 ++--
chart2/source/controller/dialogs/tp_PolarOptions.cxx | 57 ++--
chart2/source/controller/dialogs/tp_PolarOptions.hxx | 20 -
chart2/uiconfig/ui/tp_PolarOptions.ui| 20 +
chart2/uiconfig/ui/tp_axisLabel.ui | 47 +---
include/svx/dialcontrol.hxx |2
svx/source/dialog/dialcontrol.cxx|5
8 files changed, 209 insertions(+), 215 deletions(-)
New commits:
commit 41e5d31b19188318ce035a3da918de52569e3030
Author: Caolán McNamara
AuthorDate: Sat Oct 13 20:38:44 2018 +0100
Commit: Caolán McNamara
CommitDate: Sun Oct 14 15:02:52 2018 +0200
weld PolarOptionsTabPage
Change-Id: I7e0c9bcd940a5f1816e3e18077be4373644ce760
Reviewed-on: https://gerrit.libreoffice.org/61748
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index e756d7a2edc1..a33bbcfa17ca 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -29,20 +29,16 @@
namespace chart
{
-PolarOptionsTabPage::PolarOptionsTabPage( vcl::Window* pWindow,const
SfxItemSet& rInAttrs ) :
-SfxTabPage( pWindow
-,"tp_PolarOptions"
-,"modules/schart/ui/tp_PolarOptions.ui"
-,&rInAttrs)
+PolarOptionsTabPage::PolarOptionsTabPage(TabPageParent pWindow, const
SfxItemSet& rInAttrs)
+: SfxTabPage(pWindow, "modules/schart/ui/tp_PolarOptions.ui",
"tp_PolarOptions", &rInAttrs)
+, m_xCB_Clockwise(m_xBuilder->weld_check_button("CB_CLOCKWISE"))
+, m_xFL_StartingAngle(m_xBuilder->weld_frame("frameANGLE"))
+, m_xNF_StartingAngle(m_xBuilder->weld_spin_button("NF_STARTING_ANGLE"))
+, m_xFL_PlotOptions(m_xBuilder->weld_frame("framePLOT_OPTIONS"))
+,
m_xCB_IncludeHiddenCells(m_xBuilder->weld_check_button("CB_INCLUDE_HIDDEN_CELLS_POLAR"))
+, m_xAngleDial(new weld::CustomWeld(*m_xBuilder, "CT_ANGLE_DIAL",
m_aAngleDial))
{
-get(m_pCB_Clockwise, "CB_CLOCKWISE");
-get(m_pFL_StartingAngle, "frameANGLE");
-get(m_pAngleDial, "CT_ANGLE_DIAL");
-get(m_pNF_StartingAngle, "NF_STARTING_ANGLE");
-get(m_pFL_PlotOptions, "framePLOT_OPTIONS");
-get(m_pCB_IncludeHiddenCells, "CB_INCLUDE_HIDDEN_CELLS_POLAR");
-
-m_pAngleDial->SetLinkedField( m_pNF_StartingAngle );
+m_aAngleDial.SetLinkedField(m_xNF_StartingAngle.get());
}
PolarOptionsTabPage::~PolarOptionsTabPage()
@@ -52,33 +48,28 @@ PolarOptionsTabPage::~PolarOptionsTabPage()
void PolarOptionsTabPage::dispose()
{
-m_pCB_Clockwise.clear();
-m_pFL_StartingAngle.clear();
-m_pAngleDial.clear();
-m_pNF_StartingAngle.clear();
-m_pFL_PlotOptions.clear();
-m_pCB_IncludeHiddenCells.clear();
+m_xAngleDial.reset();
SfxTabPage::dispose();
}
-VclPtr PolarOptionsTabPage::Create( TabPageParent pWindow,const
SfxItemSet* rOutAttrs )
+VclPtr PolarOptionsTabPage::Create(TabPageParent pParent, const
SfxItemSet* rOutAttrs)
{
-return VclPtr::Create( pWindow.pParent, *rOutAttrs );
+return VclPtr::Create(pParent, *rOutAttrs);
}
bool PolarOptionsTabPage::FillItemSet( SfxItemSet* rOutAttrs )
{
-if( m_pAngleDial->IsVisible() )
+if (m_xAngleDial->get_visible())
{
rOutAttrs->Put(SfxInt32Item(SCHATTR_STARTING_ANGLE,
-static_cast< sal_Int32 >(m_pAngleDial->GetRotation()/100)));
+static_cast< sal_Int32 >(m_aAngleDial.GetRotation()/100)));
}
-if( m_pCB_Clockwise->IsVisible() )
-
rOutAttrs->Put(SfxBoolItem(SCHATTR_CLOCKWISE,m_pCB_Clockwise->IsChecked()));
+if( m_xCB_Clockwise->get_visible() )
+
rOutAttrs->Put(SfxBoolItem(SCHATTR_CLOCKWISE,m_xCB_Clockwise->get_active()));
-if (m_pCB_IncludeHiddenCells->IsVisible())
-rOutAttrs->Put(SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS,
m_pCB_IncludeHiddenCells->IsChecked()));
+if (m_xCB_IncludeHiddenCells->get_visible())
+rOutAttrs->Put(SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS,
m_xCB_IncludeHiddenCells->get_active()));
return true;
}
@@ -90,29 +81,29 @@ void PolarOptionsTabPage::Reset(const SfxItemSet* rInAttrs)
if (rInAttrs->GetItemState(SCHATTR_STARTING_ANGLE, true, &pPoolItem) ==
SfxItemState::SET)
{
long nTmp = static_cast(static_cast(pPoolItem)->GetValue());
-m_pAngleDial->SetRotation( nTmp*100 );
+m_aAngleDial.SetRotation( nTmp*100 );
}
else
{
-m_pFL_StartingAngle->Show(false);
+m_xFL_StartingAngle->show(false);
}
if (rInAttrs->GetItemState(SCHATTR_CLOCKWISE, true, &pPoolItem) ==
SfxItemState::SET)
{
bool bCheck = static_cast< const SfxBoolItem * >( pPoolItem
)->GetValue();
-m_pCB_Clockwise->Check(bCheck);
+
Re: unit test LayerTabBar, now linker problem
On 13/10/2018 21:04, Regina Henschel wrote: Hi all, the patch in https://gerrit.libreoffice.org/61545 works fine on my PC, but I get an error message from Jenkins Build Failed https://ci.libreoffice.org/job/gerrit_master/16732/ : FAILURE linker cannot find typeinfo for sd::GraphicViewShell ( https://ci.libreoffice.org/job/gerrit_linux_gcc_release/17086/ ) What is wrong there? apparently GCC can't find the type information for GraphicViewShell because it isn't exported from the shared library "sd". it is needed because of dynamic_cast in the test. you could use SAL_DLLPUBLIC_RTTI on GraphicViewShell, which will export just enough so that dynamic_cast and type_info works, or use SD_DLLPUBLIC on it, which will make all its member functions available as well. What do I need to do on my PC (Windows 10, 64bit) to catch it? probably the issue doesn't happen with MSVC because it implements dynamic_cast differently, so unless you want to set up a Linux VM, you'll have to rely on Jenkins... ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Hunspell probably breaks build on macOS
On 13/10/2018 23:51, Thorsten Wagner wrote: Issue has been fixed. Reason was automake 1.16. After reverting to automake 1.14 build succeded without errors. Hunspell 1.6.2 do not cause any errors now. Many thanks for looking at the issue anyway. if automake 1.16 breaks the build, do we need to check for this version in LO's configure? why does hunspell run "autoreconf" anyway, isn't this something we want to avoid, for exactly this reason? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
