[Libreoffice-commits] core.git: sd/inc sd/qa sd/source sd/workben
/custompanel/ctp_panel.hxx |5 + 422 files changed, 422 insertions(+), 1669 deletions(-) New commits: commit 7fb85fa0f0a85384f085b13e7d08113f63392445 Author: Vincent LE GARREC AuthorDate: Tue Mar 23 20:02:02 2021 +0100 Commit: Ilmari Lauhakangas CommitDate: Wed Mar 24 07:39:31 2021 +0100 tdf#124176 Use pragma once in sd Change-Id: Ic439140d9ecdcdee9272185bd3c2d11e11288f07 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112051 Reviewed-by: Ilmari Lauhakangas Tested-by: Ilmari Lauhakangas diff --git a/sd/inc/AnnotationEnumeration.hxx b/sd/inc/AnnotationEnumeration.hxx index 3acc18e9a131..6dbc7250e92f 100644 --- a/sd/inc/AnnotationEnumeration.hxx +++ b/sd/inc/AnnotationEnumeration.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_ANNOTATIONENUMERATION_HXX -#define INCLUDED_SD_INC_ANNOTATIONENUMERATION_HXX +#pragma once #include @@ -35,6 +34,4 @@ css::uno::Reference createAnnotationEnumeration(const AnnotationVector&); } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/CustomAnimationCloner.hxx b/sd/inc/CustomAnimationCloner.hxx index 52b727c97289..5cc71b0e69ab 100644 --- a/sd/inc/CustomAnimationCloner.hxx +++ b/sd/inc/CustomAnimationCloner.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_CUSTOMANIMATIONCLONER_HXX -#define INCLUDED_SD_INC_CUSTOMANIMATIONCLONER_HXX +#pragma once #include @@ -31,6 +30,4 @@ Clone(const css::uno::Reference& xSourceNode, const SdPage* pSource = nullptr, const SdPage* pTarget = nullptr); } -#endif // INCLUDED_SD_INC_CUSTOMANIMATIONCLONER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx index 59c29717995a..eebda95f01b8 100644 --- a/sd/inc/CustomAnimationEffect.hxx +++ b/sd/inc/CustomAnimationEffect.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_CUSTOMANIMATIONEFFECT_HXX -#define INCLUDED_SD_INC_CUSTOMANIMATIONEFFECT_HXX +#pragma once #include #include @@ -452,6 +451,4 @@ private: } -#endif // INCLUDED_SD_INC_CUSTOMANIMATIONEFFECT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx index e2739fd3213c..6894a7c7af77 100644 --- a/sd/inc/CustomAnimationPreset.hxx +++ b/sd/inc/CustomAnimationPreset.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_CUSTOMANIMATIONPRESET_HXX -#define INCLUDED_SD_INC_CUSTOMANIMATIONPRESET_HXX +#pragma once #include @@ -140,6 +139,4 @@ void implImportLabels( const css::uno::Reference< css::lang::XMultiServiceFactor } -#endif // _SD_CUSTOMANIMATIONEFFECTS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/DocumentRenderer.hrc b/sd/inc/DocumentRenderer.hrc index 1b2cefe4732f..3cdd5b004f55 100644 --- a/sd/inc/DocumentRenderer.hrc +++ b/sd/inc/DocumentRenderer.hrc @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_DOCUMENTRENDERER_HRC -#define INCLUDED_SD_INC_DOCUMENTRENDERER_HRC +#pragma once #define NC_(Context, String) reinterpret_cast(Context "\004" u8##String) @@ -91,6 +90,4 @@ const char* STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE[] = NC_("STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE", "~Selection") }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/EffectMigration.hxx b/sd/inc/EffectMigration.hxx index adc8bbd4eaa3..7d803cb16bd9 100644 --- a/sd/inc/EffectMigration.hxx +++ b/sd/inc/EffectMigration.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_EFFECTMIGRATION_HXX -#define INCLUDED_SD_INC_EFFECTMIGRATION_HXX +#pragma once #include #include @@ -73,6 +72,4 @@ public: } // end of namespace sd -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/FactoryIds.hxx b/sd/inc/FactoryIds.hxx index b6a5284b479c..cc257b20a94b 100644 --- a/sd/inc/FactoryIds.hxx +++ b/sd/inc/FactoryIds.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SD_INC_FACTORYIDS_HXX -#define INCLUDED_SD_INC_FACTORYIDS_HXX +#pragma once #include @@ -38,6 +37,4 @@ constexpr auto PRESENTATION_FACTORY_ID = SfxInterfaceId(4); } // end of namespace sd -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index adee254359e1..40a25641be4c 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.o
[Libreoffice-commits] core.git: xmlhelp/source xmloff/inc xmloff/source xmlsecurity/inc xmlsecurity/source
/xforms/SchemaSimpleTypeContext.hxx |5 + xmloff/source/xforms/TokenContext.hxx |5 + xmloff/source/xforms/XFormsBindContext.hxx|5 + xmloff/source/xforms/XFormsInstanceContext.hxx|5 + xmloff/source/xforms/XFormsModelContext.hxx |5 + xmloff/source/xforms/XFormsModelExport.hxx|5 + xmloff/source/xforms/XFormsSubmissionContext.hxx |5 + xmloff/source/xforms/xformsapi.hxx|5 + xmlsecurity/inc/bitmaps.hlst |5 + xmlsecurity/inc/framework/saxeventkeeperimpl.hxx |5 + xmlsecurity/inc/framework/securityengine.hxx |5 + xmlsecurity/inc/framework/signaturecreatorimpl.hxx|5 + xmlsecurity/inc/framework/signatureengine.hxx |5 + xmlsecurity/inc/framework/signatureverifierimpl.hxx |5 + xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx|5 + xmlsecurity/inc/gpg/SEInitializer.hxx |5 + xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx |5 + xmlsecurity/inc/strings.hrc |5 + xmlsecurity/inc/xmlsec-wrapper.h |5 + xmlsecurity/inc/xmlsec/errorcallback.hxx |5 + xmlsecurity/inc/xmlsec/saxhelper.hxx |5 + xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx |5 + xmlsecurity/inc/xmlsec/xmlsec_init.hxx|5 + xmlsecurity/inc/xmlsec/xmlstreamio.hxx|5 + xmlsecurity/inc/xmlsecuritydllapi.h |5 + xmlsecurity/inc/xsecxmlsecdllapi.h|5 + xmlsecurity/source/framework/buffernode.hxx |5 + xmlsecurity/source/framework/elementcollector.hxx |5 + xmlsecurity/source/framework/elementmark.hxx |5 + xmlsecurity/source/gpg/CertificateImpl.hxx|5 + xmlsecurity/source/gpg/CipherContext.hxx |5 + xmlsecurity/source/gpg/DigestContext.hxx |5 + xmlsecurity/source/gpg/SecurityEnvironment.hxx|5 + xmlsecurity/source/gpg/XMLEncryption.hxx |5 + xmlsecurity/source/gpg/XMLSecurityContext.hxx |5 + xmlsecurity/source/helper/ooxmlsecexporter.hxx|5 + xmlsecurity/source/helper/ooxmlsecparser.hxx |5 + xmlsecurity/source/helper/xsecparser.hxx |5 + xmlsecurity/source/xmlsec/certificateextension_certextn.hxx |5 + xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx |5 + xmlsecurity/source/xmlsec/mscrypt/akmngr.hxx |5 + xmlsecurity/source/xmlsec/mscrypt/oid.hxx |5 + xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx|5 + xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx |5 + xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx |5 + xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx |5 + xmlsecurity/source/xmlsec/nss/ciphercontext.hxx |5 + xmlsecurity/source/xmlsec/nss/digestcontext.hxx |5 + xmlsecurity/source/xmlsec/nss/nssinitializer.hxx |5 + xmlsecurity/source/xmlsec/nss/nssrenam.h |5 + xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx|5 + xmlsecurity/source/xmlsec/nss/secerror.hxx|4 +--- xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx |5 + xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.hxx |5 + xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx |5 + xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx|5 + 350 files changed, 350 insertions(+), 1393 deletions(-) New commits: commit aef40e738842522c050538cc8a62c2d1f4861861 Author: Vincent LE GARREC AuthorDate: Sat Mar 6 09:51:47 2021 +0100 Commit: Ilmari Lauhakangas CommitDate: Tue Mar 23 13:14:42
[Libreoffice-commits] core.git: filter/inc filter/source forms/inc forms/source formula/inc formula/source fpicker/inc fpicker/source framework/inc framework/source
|5 + framework/source/layoutmanager/toolbarlayoutmanager.hxx|5 + framework/source/uiconfiguration/CommandImageResolver.hxx |5 + framework/source/uiconfiguration/imagemanagerimpl.hxx |5 + 328 files changed, 328 insertions(+), 1299 deletions(-) New commits: commit 90c978f839e5029c69b4acb70f37909ee3016614 Author: Vincent LE GARREC AuthorDate: Sat Mar 6 08:21:49 2021 +0100 Commit: Ilmari Lauhakangas CommitDate: Tue Mar 23 13:07:09 2021 +0100 tdf#124176 Use pragma once in f* filter, forms, fpicker, framework Change-Id: I55a25ad2dc3749e63465e638e8eeea3c322eabbf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112047 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas diff --git a/filter/inc/strings.hrc b/filter/inc/strings.hrc index 3f1eaeac78ac..b1bea27dec47 100644 --- a/filter/inc/strings.hrc +++ b/filter/inc/strings.hrc @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FILTER_INC_STRINGS_HRC -#define INCLUDED_FILTER_INC_STRINGS_HRC +#pragma once #define NC_(Context, String) reinterpret_cast(Context "\004" u8##String) @@ -74,6 +73,4 @@ #define STR_ERR_SIGNATURE_FAILED NC_("STR_ERR_SIGNATURE_FAILED", "Signature generation failed") #define STR_ERR_PDF_EXPORT_ABORTED NC_("STR_ERR_PDF_EXPORT_ABORTED", "PDF export aborted") -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/inc/strings.hxx b/filter/inc/strings.hxx index c405e61121ab..df622a59cb11 100644 --- a/filter/inc/strings.hxx +++ b/filter/inc/strings.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_FILTER_INC_STRINGS_HXX -#define INCLUDED_FILTER_INC_STRINGS_HXX +#pragma once #define STR_APPL_NAME_WRITER"%PRODUCTNAME Writer (.sxw)" #define STR_APPL_NAME_CALC "%PRODUCTNAME Calc (.sxc)" @@ -20,6 +19,4 @@ #define STR_APPL_NAME_OASIS_DRAW"%PRODUCTNAME Draw (.odg)" #define STR_DEFAULT_EXTENSION "xml" -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx index 7ba811ccc060..001c304ffaed 100644 --- a/filter/source/config/cache/basecontainer.hxx +++ b/filter/source/config/cache/basecontainer.hxx @@ -16,8 +16,7 @@ * 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_FILTER_SOURCE_CONFIG_CACHE_BASECONTAINER_HXX -#define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_BASECONTAINER_HXX +#pragma once #include @@ -258,6 +257,4 @@ class BaseContainer : public BaseLock } // namespace filter::config -#endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_BASECONTAINER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx index aeaaf3a83afb..f0c3558da856 100644 --- a/filter/source/config/cache/cacheitem.hxx +++ b/filter/source/config/cache/cacheitem.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CACHEITEM_HXX -#define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CACHEITEM_HXX +#pragma once #include #include @@ -189,6 +188,4 @@ typedef ::std::vector< FlatDetectionInfo > FlatDetection; } // namespace filter::config -#endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CACHEITEM_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/config/cache/cacheupdatelistener.hxx b/filter/source/config/cache/cacheupdatelistener.hxx index 714e4016ba51..9567b3bd3042 100644 --- a/filter/source/config/cache/cacheupdatelistener.hxx +++ b/filter/source/config/cache/cacheupdatelistener.hxx @@ -16,8 +16,7 @@ * 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_FILTER_SOURCE_CONFIG_CACHE_CACHEUPDATELISTENER_HXX -#define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CACHEUPDATELISTENER_HXX +#pragma once #include "filtercache.hxx" #include @@ -109,6 +108,4 @@ class CacheUpdateListener : public BaseLock // must be the first one to guarante } // namespace filter::config -#endif // INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CACHEUPDATELISTENER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/source/config/cache/configflush.hxx b/filter/source/config/cache/configflush.hxx index f3e284556681..05edb639c886 100644 --- a/filter/source/config/cache/configflush.hxx +++ b/filter/source/config/cache/configflush.hxx @@ -16,8 +16,7 @@ * except in compliance with the License
[Libreoffice-commits] core.git: connectivity/inc connectivity/source connectivity/workben
/source/inc/odbc/OPreparedStatement.hxx |4 +--- connectivity/source/inc/odbc/OResultSet.hxx |4 +--- connectivity/source/inc/odbc/OResultSetMetaData.hxx |4 +--- connectivity/source/inc/odbc/OStatement.hxx |4 +--- connectivity/source/inc/odbc/OTools.hxx |4 +--- connectivity/source/inc/odbc/odbcbasedllapi.hxx |5 + connectivity/source/inc/propertyids.hxx |5 + connectivity/source/inc/resource/sharedresources.hxx|5 + connectivity/source/inc/writer/WCatalog.hxx |5 + connectivity/source/inc/writer/WConnection.hxx |5 + connectivity/source/inc/writer/WDatabaseMetaData.hxx|5 + connectivity/source/inc/writer/WDriver.hxx |5 + connectivity/source/inc/writer/WTable.hxx |5 + connectivity/source/inc/writer/WTables.hxx |5 + connectivity/source/manager/mdrivermanager.hxx |5 + connectivity/workben/skeleton/SResultSet.hxx|4 +--- 247 files changed, 247 insertions(+), 866 deletions(-) New commits: commit 6069a66690a10550d54f7641cda1aa83560ff019 Author: Vincent LE GARREC AuthorDate: Thu Mar 4 22:38:38 2021 +0100 Commit: Ilmari Lauhakangas CommitDate: Tue Mar 23 12:12:27 2021 +0100 tdf#124176 Use pragma once in connectivity Change-Id: I4a57cd6dcbc180fe9a378d2713c687a66476ee79 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111979 Reviewed-by: Ilmari Lauhakangas Tested-by: Ilmari Lauhakangas diff --git a/connectivity/inc/bitmaps.hlst b/connectivity/inc/bitmaps.hlst index d51533745e2e..e2bf53892d3e 100644 --- a/connectivity/inc/bitmaps.hlst +++ b/connectivity/inc/bitmaps.hlst @@ -7,11 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CONNECTIVITY_INC_BITMAPS_HRC -#define INCLUDED_CONNECTIVITY_INC_BITMAPS_HRC +#pragma once #define LINKED_TEXT_TABLE_IMAGE_RESOURCE "dbaccess/res/linked_text_table.png" -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/connectivity/inc/strings.hxx b/connectivity/inc/strings.hxx index c81b2a08b74b..5a08f67c5114 100644 --- a/connectivity/inc/strings.hxx +++ b/connectivity/inc/strings.hxx @@ -7,8 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_CONNECTIVITY_INC_STRINGS_HXX -#define INCLUDED_CONNECTIVITY_INC_STRINGS_HXX +#pragma once // = log messages for the JDBC driver @@ -72,6 +71,4 @@ #define STR_DB_NOT_CONNECTED_STATE "08003" #define STR_DATA_CANNOT_SELECT_UNFILTERED_STATE "IM001" -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/connectivity/source/drivers/evoab2/EApi.h b/connectivity/source/drivers/evoab2/EApi.h index 8c05f95fa2ce..4d17922aab30 100644 --- a/connectivity/source/drivers/evoab2/EApi.h +++ b/connectivity/source/drivers/evoab2/EApi.h @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_EAPI_H -#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_EAPI_H +#pragma once #include // Initializes the API below, returns false if not available @@ -157,6 +156,5 @@ ESourceRegistry *get_e_source_registry(); bool isSourceBackend(ESource *pSource, const char *backendname); G_END_DECLS -#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab2/NCatalog.hxx b/connectivity/source/drivers/evoab2/NCatalog.hxx index d54ad68a2a9a..b2bd8084474c 100644 --- a/connectivity/source/drivers/evoab2/NCatalog.hxx +++ b/connectivity/source/drivers/evoab2/NCatalog.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NCATALOG_HXX -#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NCATALOG_HXX +#pragma once #include @@ -41,6 +40,4 @@ namespace connectivity::evoab }; } -#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NCATALOG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab2/NColumns.hxx b/connectivity/source/drivers/evoab2/NColumns.hxx index be5996c6ebec..f768c51bb046 100644 --- a/connectivity/source/drivers/evoab2/NColumns.hxx +++ b/connectivity/source/drivers/evoab2/NColumns.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVER
[Libreoffice-commits] core.git: winaccessibility/inc winaccessibility/source writerfilter/inc writerfilter/source writerperfect/inc writerperfect/qa writerperfect/source
|5 + writerperfect/qa/unit/wpftimport.hxx|5 + writerperfect/qa/unit/wpftqahelperdllapi.h |5 + writerperfect/source/draw/CDRImportFilter.hxx |5 + writerperfect/source/draw/CMXImportFilter.hxx |5 + writerperfect/source/draw/FreehandImportFilter.hxx |5 + writerperfect/source/draw/MSPUBImportFilter.hxx |5 + writerperfect/source/draw/MWAWDrawImportFilter.hxx |5 + writerperfect/source/draw/PageMakerImportFilter.hxx |5 + writerperfect/source/draw/QXPImportFilter.hxx |5 + writerperfect/source/draw/StarOfficeDrawImportFilter.hxx|5 + writerperfect/source/draw/VisioImportFilter.hxx |5 + writerperfect/source/draw/WPGImportFilter.hxx |5 + writerperfect/source/draw/ZMFImportFilter.hxx |5 + writerperfect/source/impress/KeynoteImportFilter.hxx|5 + writerperfect/source/impress/MWAWPresentationImportFilter.hxx |5 + writerperfect/source/impress/StarOfficePresentationImportFilter.hxx |5 + writerperfect/source/writer/AbiWordImportFilter.hxx |5 + writerperfect/source/writer/EPUBExportDialog.hxx|5 + writerperfect/source/writer/EPUBExportFilter.hxx|5 + writerperfect/source/writer/EPUBExportUIComponent.hxx |5 + writerperfect/source/writer/EPUBPackage.hxx |5 + writerperfect/source/writer/MSWorksImportFilter.hxx |5 + writerperfect/source/writer/MWAWImportFilter.hxx|5 + writerperfect/source/writer/PagesImportFilter.hxx |5 + writerperfect/source/writer/StarOfficeWriterImportFilter.hxx|5 + writerperfect/source/writer/WordPerfectImportFilter.hxx |5 + writerperfect/source/writer/exp/XMLBase64ImportContext.hxx |5 + writerperfect/source/writer/exp/XMLFootnoteImportContext.hxx|5 + writerperfect/source/writer/exp/XMLSectionContext.hxx |5 + writerperfect/source/writer/exp/XMLTextFrameContext.hxx |5 + writerperfect/source/writer/exp/XMLTextListContext.hxx |5 + writerperfect/source/writer/exp/XMLTextListItemContext.hxx |5 + writerperfect/source/writer/exp/txtparai.hxx|5 + writerperfect/source/writer/exp/txtstyli.hxx|5 + writerperfect/source/writer/exp/xmlfmt.hxx |5 + writerperfect/source/writer/exp/xmlictxt.hxx|5 + writerperfect/source/writer/exp/xmlimp.hxx |5 + writerperfect/source/writer/exp/xmlmetai.hxx|5 + writerperfect/source/writer/exp/xmltbli.hxx |5 + writerperfect/source/writer/exp/xmltext.hxx |5 + 161 files changed, 161 insertions(+), 632 deletions(-) New commits: commit e29f53b71058b9468cb6c29f82dbf6de53d4cdd0 Author: Vincent LE GARREC AuthorDate: Sat Mar 6 10:14:31 2021 +0100 Commit: Ilmari Lauhakangas CommitDate: Tue Mar 23 11:06:48 2021 +0100 tdf#124176 Use pragma once in w* Change-Id: I693f6dafb743d39afd8e41e66a8066f04043f8a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112052 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas diff --git a/winaccessibility/inc/AccComponentEventListener.hxx b/winaccessibility/inc/AccComponentEventListener.hxx index 926c5cb74b65..6c2683f8b6e3 100644 --- a/winaccessibility/inc/AccComponentEventListener.hxx +++ b/winaccessibility/inc/AccComponentEventListener.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCCOMPONENTEVENTLISTENER_HXX -#define INCLUDED_WINACCESSIBILITY_INC_ACCCOMPONENTEVENTLISTENER_HXX +#pragma once #include #include "AccEventListener.hxx" @@ -66,6 +65,4 @@ public: void HandleTextSelectionChangedEvent(); }; -#endif // INCLUDED_WINACCESSIBILITY_INC_ACCCOMPONENTEVENTLISTENER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/inc/AccContainerEventListener.hxx b/winaccessibility/inc/AccContainerEventListener.hxx index 2bd797a60e37..f0b87c3d4042 100644 --- a/winaccessibility/inc/AccContainerEventListener.hxx +++ b/winaccessibility/inc/AccContainerEventListener.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */
[Libreoffice-commits] core.git: ucb/source unodevtools/inc unodevtools/source unoidl/source unotest/source unotools/source unoxml/inc unoxml/source uui/inc uui/source
/webdavcontent.hxx |5 + ucb/source/ucp/webdav/webdavdatasupplier.hxx |5 + ucb/source/ucp/webdav/webdavprovider.hxx |5 + ucb/source/ucp/webdav/webdavresponseparser.hxx |5 + ucb/source/ucp/webdav/webdavresultset.hxx|5 + unodevtools/inc/options.hxx |5 + unodevtools/source/skeletonmaker/skeletoncommon.hxx |5 + unodevtools/source/skeletonmaker/skeletoncpp.hxx |5 + unodevtools/source/skeletonmaker/skeletonjava.hxx|5 + unoidl/source/sourceprovider-scanner.hxx |5 + unoidl/source/sourcetreeprovider.hxx |5 + unotest/source/cpp/getargument.hxx |5 + unotools/source/config/itemholder1.hxx |5 + unotools/source/misc/ServiceDocumenter.hxx |4 +--- unotools/source/ucbhelper/XTempFile.hxx |4 +--- unotools/source/ucbhelper/ucblockbytes.hxx |5 + unoxml/inc/event.hxx |4 +--- unoxml/inc/eventdispatcher.hxx |5 + unoxml/inc/mouseevent.hxx|4 +--- unoxml/inc/mutationevent.hxx |4 +--- unoxml/inc/node.hxx |5 + unoxml/inc/uievent.hxx |4 +--- unoxml/source/dom/attr.hxx |5 + unoxml/source/dom/attributesmap.hxx |5 + unoxml/source/dom/cdatasection.hxx |5 + unoxml/source/dom/characterdata.hxx |5 + unoxml/source/dom/childlist.hxx |5 + unoxml/source/dom/comment.hxx|5 + unoxml/source/dom/document.hxx |5 + unoxml/source/dom/documentbuilder.hxx|5 + unoxml/source/dom/documentfragment.hxx |4 +--- unoxml/source/dom/documenttype.hxx |4 +--- unoxml/source/dom/domimplementation.hxx |4 +--- unoxml/source/dom/element.hxx|5 + unoxml/source/dom/elementlist.hxx|5 + unoxml/source/dom/entitiesmap.hxx|5 + unoxml/source/dom/entity.hxx |5 + unoxml/source/dom/entityreference.hxx|4 +--- unoxml/source/dom/notation.hxx |5 + unoxml/source/dom/notationsmap.hxx |5 + unoxml/source/dom/processinginstruction.hxx |5 + unoxml/source/dom/saxbuilder.hxx |5 + unoxml/source/dom/text.hxx |4 +--- unoxml/source/xpath/nodelist.hxx |5 + unoxml/source/xpath/xpathapi.hxx |5 + unoxml/source/xpath/xpathobject.hxx |5 + uui/inc/ids.hrc |5 + uui/inc/ids.hxx |5 + uui/inc/strings.hrc |5 + uui/source/alreadyopen.hxx |5 + uui/source/authfallbackdlg.hxx |5 + uui/source/filechanged.hxx |5 + uui/source/fltdlg.hxx|5 + uui/source/getcontinuations.hxx |5 + uui/source/iahndl.hxx|5 + uui/source/lockcorrupt.hxx |5 + uui/source/lockfailed.hxx|5 + uui/source/logindlg.hxx |5 + uui/source/loginerr.hxx |5 + uui/source/masterpasscrtdlg.hxx |5 + uui/source/masterpassworddlg.hxx |5 + uui/source/nameclashdlg.hxx |5 + uui/source/openlocked.hxx|5 + uui/source/passwordcontainer.hxx |5 + uui/source/passworddlg.hxx |5 + uui/source/requeststringresolver.hxx |5 + uui/source/secmacrowarnings.hxx |5 + uui/source/sslwarndlg.hxx|5 + uui/source/trylater.hxx |5 + uui/source/unknownauthdlg.hxx|5 + 219 files changed, 219 insertions(+), 858 deletions(-) New commits: commit 1c0c2bb7920f5da7562a053019514d1e4cbdf1f6 Author: Vincent LE GARREC AuthorDate: Sat Mar 6 08:28:23 2021 +0100 Commit: Ilmari Lauhakangas CommitDate: Tue Mar 23 10:54:09 2021 +0100 tdf#124176 Use pragma once in u* ucb, uno*, uui Change
[Libreoffice-commits] core.git: extensions/source extensions/test
/XCallback_Impl/Callback.h |5 + extensions/test/ole/unoTocomCalls/XCallback_Impl/Simple.h |5 + 122 files changed, 122 insertions(+), 485 deletions(-) New commits: commit 039e90ec011157c9e851221a53ec62d33acb71d1 Author: Vincent LE GARREC AuthorDate: Sat Mar 6 08:18:00 2021 +0100 Commit: Ilmari Lauhakangas CommitDate: Tue Mar 23 10:48:06 2021 +0100 tdf#124176 Use pragma once in extensions Change-Id: I1a5ed69da20cef4428f5f61db5fb9411cff61dc7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112048 Tested-by: Jenkins Reviewed-by: John Turpish Reviewed-by: Ilmari Lauhakangas diff --git a/extensions/source/activex/SOActionsApproval.h b/extensions/source/activex/SOActionsApproval.h index f96b23fd9452..2484e74620dd 100644 --- a/extensions/source/activex/SOActionsApproval.h +++ b/extensions/source/activex/SOActionsApproval.h @@ -19,8 +19,7 @@ // SOActionsApproval.h: Definition of the SOActionsApproval class -#ifndef INCLUDED_EXTENSIONS_SOURCE_ACTIVEX_SOACTIONSAPPROVAL_H -#define INCLUDED_EXTENSIONS_SOURCE_ACTIVEX_SOACTIONSAPPROVAL_H +#pragma once #ifdef _MSC_VER #pragma once @@ -103,6 +102,4 @@ DECLARE_REGISTRY_RESOURCEID(IDR_SODOCUMENTEVENTLISTENER) } }; -#endif // INCLUDED_EXTENSIONS_SOURCE_ACTIVEX_SOACTIONSAPPROVAL_H - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/activex/SOActiveX.h b/extensions/source/activex/SOActiveX.h index 719bce5d4271..f3a66e183ed5 100644 --- a/extensions/source/activex/SOActiveX.h +++ b/extensions/source/activex/SOActiveX.h @@ -19,8 +19,7 @@ // SOActiveX.h : Declaration of the CSOActiveX -#ifndef INCLUDED_EXTENSIONS_SOURCE_ACTIVEX_SOACTIVEX_H -#define INCLUDED_EXTENSIONS_SOURCE_ACTIVEX_SOACTIVEX_H +#pragma once #include "resource.h" @@ -210,6 +209,4 @@ public: SOVersion GetVersionConnected(); }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/activex/SOComWindowPeer.h b/extensions/source/activex/SOComWindowPeer.h index 8e2b704e6783..379ca767a66a 100644 --- a/extensions/source/activex/SOComWindowPeer.h +++ b/extensions/source/activex/SOComWindowPeer.h @@ -19,8 +19,7 @@ // SOComWindowPeer.h: Definition of the SOComWindowPeer class -#ifndef INCLUDED_EXTENSIONS_SOURCE_ACTIVEX_SOCOMWINDOWPEER_H -#define INCLUDED_EXTENSIONS_SOURCE_ACTIVEX_SOCOMWINDOWPEER_H +#pragma once #ifdef _MSC_VER #pragma once @@ -157,6 +156,4 @@ DECLARE_REGISTRY_RESOURCEID(IDR_SOCOMWINDOWPEER) void SetHWNDInternally( HWND hwnd ) { m_hwnd = hwnd; } }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/activex/SODispatchInterceptor.h b/extensions/source/activex/SODispatchInterceptor.h index aa8138024fc6..3c060434820b 100644 --- a/extensions/source/activex/SODispatchInterceptor.h +++ b/extensions/source/activex/SODispatchInterceptor.h @@ -19,8 +19,7 @@ // SODispatchInterceptor.h: Definition of the SODispatchInterceptor class -#ifndef INCLUDED_EXTENSIONS_SOURCE_ACTIVEX_SODISPATCHINTERCEPTOR_H -#define INCLUDED_EXTENSIONS_SOURCE_ACTIVEX_SODISPATCHINTERCEPTOR_H +#pragma once #ifdef _MSC_VER #pragma once @@ -173,6 +172,4 @@ DECLARE_REGISTRY_RESOURCEID(IDR_SODISPATCHINTERCEPTOR) } }; -#endif // INCLUDED_EXTENSIONS_SOURCE_ACTIVEX_SODISPATCHINTERCEPTOR_H - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/activex/StdAfx2.h b/extensions/source/activex/StdAfx2.h index 01665c2001e3..56bd75b8ac32 100644 --- a/extensions/source/activex/StdAfx2.h +++ b/extensions/source/activex/StdAfx2.h @@ -21,8 +21,7 @@ // or project specific include files that are used frequently, // but are changed infrequently -#ifndef INCLUDED_EXTENSIONS_SOURCE_ACTIVEX_STDAFX2_H -#define INCLUDED_EXTENSIONS_SOURCE_ACTIVEX_STDAFX2_H +#pragma once #define STRICT #define _ATL_APARTMENT_THREADED @@ -66,6 +65,4 @@ extern CComModule _Module; //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. -#endif // !defined(INCLUDED_EXTENSIONS_SOURCE_ACTIVEX_STDAFX2_H) - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bibbeam.hxx b/extensions/source/bibliography/bibbeam.hxx index 57216922b7c7..4cc32d7da93e 100644 --- a/extensions/source/bibliography/bibbeam.hxx +++ b/extensions/source/bibliography/bibbeam.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBBEAM_HXX -#define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBBEAM_HXX +#pragma once #include #include @@ -69,6 +68,4 @@ namespace bib } // namespace bib -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx index 3755abf0..6a62ac7c5
[Libreoffice-commits] core.git: external/libvisio
external/libvisio/ExternalProject_libvisio.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b371f746d7b48826121665bbec207fcbcf4f0a44 Author: Vincent LE GARREC AuthorDate: Wed Feb 24 21:08:11 2021 +0100 Commit: Michael Stahl CommitDate: Tue Mar 2 13:40:15 2021 +0100 Build libvisio with user CXXFLAGS Related with commit 8ae9d4727d8010a8f5d51f76ff0ebc5f88f0709f Change-Id: Ic38585f5f5ea5a633a67026d2640e0c43ea43f2b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111503 Reviewed-by: Michael Stahl Tested-by: Jenkins diff --git a/external/libvisio/ExternalProject_libvisio.mk b/external/libvisio/ExternalProject_libvisio.mk index 0911fcd87c7c..ea2f09688fff 100644 --- a/external/libvisio/ExternalProject_libvisio.mk +++ b/external/libvisio/ExternalProject_libvisio.mk @@ -37,7 +37,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) : --disable-werror \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ $(if $(gb_FULLDEPS),,--disable-dependency-tracking) \ - CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ + CXXFLAGS="$(CXXFLAGS) $(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - external/icu vcl/win
external/icu/ExternalProject_icu.mk |2 +- vcl/win/gdi/salbmp.cxx |9 - 2 files changed, 5 insertions(+), 6 deletions(-) New commits: commit 8ae9d4727d8010a8f5d51f76ff0ebc5f88f0709f Author: Vincent LE GARREC AuthorDate: Sun Feb 21 11:52:43 2021 +0100 Commit: Michael Stahl CommitDate: Wed Feb 24 19:22:08 2021 +0100 Build internal icu with user CFLAGS I have a Gentoo (Linux) with libxml2 built with icu support. Under Gentoo, icu is built with U_DISABLE_RENAMING=1. Building LibreOffice with internal icu uses system libxml2. So both builds need CFLAGS="U_DISABLE_RENAMING=1" to avoid naming conflicts. Change-Id: I565c4ac079aee5e48a1e43f21d0a697e3498f925 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111276 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk index 3ded08562211..4ff8370ebd50 100644 --- a/external/icu/ExternalProject_icu.mk +++ b/external/icu/ExternalProject_icu.mk @@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) : else # $(OS) -icu_CFLAGS:=" \ +icu_CFLAGS:="$(CFLAGS) \ $(if $(filter iOS,$(OS)),-DUCONFIG_NO_FILE_IO) \ $(if $(SYSBASE),-I$(SYSBASE)/usr/include) \ $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \ commit 18e9e6d3dfa36afcc6c287578083948149d5aa4c Author: Noel Grandin AuthorDate: Wed Feb 24 10:17:18 2021 +0200 Commit: Noel Grandin CommitDate: Wed Feb 24 19:21:53 2021 +0100 use unique_ptr in WinSalBitmap::AcquireBuffer Change-Id: I1fca86f6d1f9bd64238b8e75cd98f53df99f91bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111447 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/vcl/win/gdi/salbmp.cxx b/vcl/win/gdi/salbmp.cxx index b0dffd5394dd..0d9dba981ae7 100644 --- a/vcl/win/gdi/salbmp.cxx +++ b/vcl/win/gdi/salbmp.cxx @@ -791,7 +791,7 @@ HANDLE WinSalBitmap::ImplCopyDIBOrDDB( HANDLE hHdl, bool bDIB ) BitmapBuffer* WinSalBitmap::AcquireBuffer( BitmapAccessMode /*nMode*/ ) { -BitmapBuffer* pBuffer = nullptr; +std::unique_ptr pBuffer; if( mhDIB ) { @@ -826,7 +826,7 @@ BitmapBuffer* WinSalBitmap::AcquireBuffer( BitmapAccessMode /*nMode*/ ) if( pBIH->biPlanes == 1 ) { -pBuffer = new BitmapBuffer; +pBuffer.reset(new BitmapBuffer); pBuffer->mnFormat = pBIH->biBitCount == 1 ? ScanlineFormat::N1BitMsbPal : pBIH->biBitCount == 4 ? ScanlineFormat::N4BitMsnPal : @@ -894,15 +894,14 @@ BitmapBuffer* WinSalBitmap::AcquireBuffer( BitmapAccessMode /*nMode*/ ) else { GlobalUnlock( mhDIB ); -delete pBuffer; -pBuffer = nullptr; +pBuffer.reset(); } } else GlobalUnlock( mhDIB ); } -return pBuffer; +return pBuffer.release(); } void WinSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, BitmapAccessMode nMode ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/bansan/chardraw' - cui/source
cui/source/dialogs/cuicharmap.cxx| 11 +-- cui/source/factory/neuralnetworkinternal.hxx | 94 +++ cui/source/inc/neuralnetwork.hxx |4 - 3 files changed, 102 insertions(+), 7 deletions(-) New commits: commit f26664b907986b86d5f6896f7dfe6bcb3cfa6ebd Author: Vincent Le Garrec <legarrec.vinc...@gmail.com> Date: Sun Feb 18 10:59:58 2018 +0100 Add missing include and small changes to be compatible with changes of the master. diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index a1fd1a8ee3c9..ae20b895160e 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -77,7 +77,7 @@ void Ocr::ReadBitmap() } else { -Color c = r->GetPixel (j, i); +BitmapColor c = r->GetPixel (j, i); if (c.GetRed () == 0 && c.GetGreen () == 0 && c.GetBlue () == 0) { data[j*w_+i] = 1; @@ -235,7 +235,7 @@ void Ocr::ToFann(fann_type *out_data) } else { -Color c = r->GetPixel(j, i); +BitmapColor c = r->GetPixel(j, i); if (c.GetRed () == 255 && c.GetGreen () == 255 && c.GetBlue () == 255) { out_data[idata] = 0.; @@ -1232,7 +1232,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, DrawToggleHdl, Button*, void) { for (long k = 0; k < w; k++) { -Color c = r->GetPixel(j, k); +BitmapColor c = r->GetPixel(j, k); if (c.GetRed () == 0 && c.GetGreen () == 0 && c.GetBlue () == 0) { std::cout << "1"; @@ -1306,15 +1306,16 @@ IMPL_LINK_NOARG(SvxCharacterMap, DrawToggleHdl, Button*, void) delete ann; } -fann_type *calc_out; fann_type input[Ocr::SIZE*Ocr::SIZE]; std::cout << "Starting loading fann" << std::endl; AbstractNeuralNetwork * ann = AbstractNeuralNetwork::CreateFactory("/tmp/fann.net"); +fann_type calc_out[ann->GetNumOutput()]; + o.ToFann([0]); std::cout << "Starting finding best result" << std::endl; -calc_out = ann->Run(input); +ann->Run(input, _out[0]); std::cout << "End of fann" << std::endl; std::multimap<float, sal_UCS4> sorted_results; diff --git a/cui/source/factory/neuralnetworkinternal.hxx b/cui/source/factory/neuralnetworkinternal.hxx new file mode 100644 index ..3a2956adc89d --- /dev/null +++ b/cui/source/factory/neuralnetworkinternal.hxx @@ -0,0 +1,94 @@ +/* -*- 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_CUI_SOURCE_FACTORY_NEURALNETWORKINTERNAL_HXX +#define INCLUDED_CUI_SOURCE_FACTORY_NEURALNETWORKINTERNAL_HXX + +#include "neuralnetwork.hxx" + +#include +#include + +class NeuralNetworkInternal : public AbstractNeuralNetwork +{ +public: +NeuralNetworkInternal(sal_uInt32 nLayers, const sal_uInt32* nLayer); +NeuralNetworkInternal(const OUString& file); + +void SetActivationFunction(ActivationFunction function) override; +void SetTrainingAlgorithm(TrainingAlgorithm algorithm) override; +void SetLearningRate(float rate) override; + +void InitTraining(sal_uInt32 nExamples) override; +sal_uInt32 GetNumInput() override; +float* GetInput(sal_uInt32 nIeme) override; +sal_uInt32 GetNumOutput() override; +float* GetOutput(sal_uInt32 nIeme) override; + +void Train(sal_uInt32 nEpochs, float error) override; +void Run(float *data_input, float* result) override; +void Save(const OUString& file) override; + +virtual ~NeuralNetworkInternal(){} + +virtual void * GetTrain(){return nullptr;} + +private: +enum class Func
[Libreoffice-commits] core.git: Branch 'private/bansan/chardraw' - 6 commits - config_host.mk.in configure.ac cui/Library_cui.mk cui/source download.lst RepositoryExternal.mk
RepositoryExternal.mk| 15 + config_host.mk.in|2 configure.ac |6 cui/Library_cui.mk |4 cui/source/dialogs/cuicharmap.cxx| 386 ++- cui/source/factory/neuralnetwork.cxx | 37 ++ cui/source/factory/neuralnetworkfann.cxx | 133 + cui/source/factory/neuralnetworkfann.hxx | 58 cui/source/factory/neuralnetworkinternal.cxx | 360 + cui/source/inc/cuicharmap.hxx| 23 + cui/source/inc/neuralnetwork.hxx | 55 +++ download.lst |2 12 files changed, 1080 insertions(+), 1 deletion(-) New commits: commit 56bfe8ecdc5f3e41ea8ce84ef4e9b54c86f1e2ec Author: Vincent Le Garrec <legarrec.vinc...@gmail.com> Date: Tue Jan 16 22:15:44 2018 +0100 First try to make a NN implementation It doesn't work but a good work has been done. Change-Id: I09d9ed910ef8a905fa0f3e0a689b741006f6fd18 diff --git a/cui/source/factory/neuralnetwork.cxx b/cui/source/factory/neuralnetwork.cxx index 5651b80b3ab8..cd08d084b7f4 100644 --- a/cui/source/factory/neuralnetwork.cxx +++ b/cui/source/factory/neuralnetwork.cxx @@ -20,15 +20,18 @@ #include #include "neuralnetworkfann.hxx" +#include "neuralnetworkinternal.hxx" AbstractNeuralNetwork * AbstractNeuralNetwork::CreateFactory(sal_uInt32 nLayers, const sal_uInt32* nLayer) { -return new NeuralNetworkFann(nLayers, nLayer); +//return new NeuralNetworkFann(nLayers, nLayer); +return new NeuralNetworkInternal(nLayers, nLayer); } AbstractNeuralNetwork * AbstractNeuralNetwork::CreateFactory(const OUString& file) { -return new NeuralNetworkFann(file); +//return new NeuralNetworkFann(file); +return new NeuralNetworkInternal(file); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/factory/neuralnetworkfann.cxx b/cui/source/factory/neuralnetworkfann.cxx index e622916c1ccf..2366989e7d8b 100644 --- a/cui/source/factory/neuralnetworkfann.cxx +++ b/cui/source/factory/neuralnetworkfann.cxx @@ -39,6 +39,11 @@ void NeuralNetworkFann::SetActivationFunction(ActivationFunction function) { case ActivationFunction::SIGMOID: { +func = FANN_SIGMOID; +break; +} +case ActivationFunction::SIGMOID_SYMMETRIC: +{ func = FANN_SIGMOID_SYMMETRIC; break; } @@ -75,8 +80,6 @@ void NeuralNetworkFann::SetLearningRate(float rate) fann_set_learning_rate(ann.get(), rate); } -#include - void NeuralNetworkFann::InitTraining(sal_uInt32 nExamples) { data.reset(fann_create_train(nExamples, fann_get_num_input(ann.get()), fann_get_num_output(ann.get(; @@ -108,9 +111,18 @@ float* NeuralNetworkFann::GetOutput(sal_uInt32 nIeme) return >output[nIeme][0]; } -float* NeuralNetworkFann::Run(float *data_input) +void NeuralNetworkFann::Run(float *data_input, float *result) { -return fann_run(ann.get(), data_input); +float * fann_result = fann_run(ann.get(), data_input); + +if (result == nullptr) +{ +return; +} +for (sal_uInt32 i = 0; i < GetNumOutput(); i++) +{ +result[i] = fann_result[i]; +} } void NeuralNetworkFann::Train(sal_uInt32 nEpochs, float error) diff --git a/cui/source/factory/neuralnetworkfann.hxx b/cui/source/factory/neuralnetworkfann.hxx index 472f4640dde3..993d78c0f3d2 100644 --- a/cui/source/factory/neuralnetworkfann.hxx +++ b/cui/source/factory/neuralnetworkfann.hxx @@ -41,11 +41,13 @@ public: float* GetOutput(sal_uInt32 nIeme) override; void Train(sal_uInt32 nEpochs, float error) override; -float* Run(float *data_input) override; +void Run(float *data_input, float* result) override; void Save(const OUString& file) override; virtual ~NeuralNetworkFann(){} +virtual void * GetTrain(){return data.get();} + private: std::unique_ptr ann; std::unique_ptr data; diff --git a/cui/source/factory/neuralnetworkinternal.cxx b/cui/source/factory/neuralnetworkinternal.cxx index 52597c57ca92..087f9c1c6d55 100644 --- a/cui/source/factory/neuralnetworkinternal.cxx +++ b/cui/source/factory/neuralnetworkinternal.cxx @@ -17,4 +17,344 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "neuralnetworkinternal.hxx" + +#include +#include + +NeuralNetworkInternal::NeuralNetworkInternal(sal_uInt32 nLayers, const sal_uInt32* nLayer) : +n(nLayers, std::vector()), +learning_rate(0.2), +learning_rate_alpha(0.4), +learning_input(), +learning_output() +{ +for (sal_uInt32 i = 0; i < nLayers; i++) +{ +n[i].resize(nLayer[i]+1); // One neuron is biais. + +if (i != nLayers-1) +{ +for
[Libreoffice-commits] core.git: Branch 'private/bansan/chardraw' - cui/source cui/uiconfig
cui/source/dialogs/cuicharmap.cxx| 93 +++ cui/source/inc/cuicharmap.hxx| 24 - cui/uiconfig/ui/specialcharacters.ui |6 -- 3 files changed, 118 insertions(+), 5 deletions(-) New commits: commit 7fd8902e6b423f76aae473f78b210d175e539433 Author: Vincent Le Garrec <legarrec.vinc...@gmail.com> Date: Mon Jan 15 23:28:40 2018 +0100 Allow draw symbol with mouse Use left click to draw black symbol. Use right click to rub the symbol. Change-Id: I3cb2155f105452f8b0f92a7fe2873ce98168cf2d diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 4c6a2b3a3d82..7ca01ffba5b1 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -1281,4 +1281,97 @@ void SvxShowText::SetText( const OUString& rText ) } +VCL_BUILDER_FACTORY(DrawingAreaOcr) + +void DrawingAreaOcr::MouseButtonDown (const MouseEvent ) +{ +if (rMEvt.IsLeft()) +{ +state = State::DRAW; +} +else if (rMEvt.IsRight()) +{ +state = State::DELETE; +} + +if (state != State::NONE) +{ +const Point & mouse_pos = rMEvt.GetPosPixel(); + +data.emplace_back(mouse_pos.X(), mouse_pos.Y(), state); +} +} + +void DrawingAreaOcr::MouseMove( const MouseEvent ) +{ +const Point & mouse_pos = rMEvt.GetPosPixel(); + +if (state != State::NONE) +{ +data.emplace_back(mouse_pos.X(), mouse_pos.Y(), state); +} + +Invalidate(); +Update(); +std::cout << static_cast(state) << std::endl; +} + +void DrawingAreaOcr::MouseButtonUp (const MouseEvent ) +{ +const Point & mouse_pos = rMEvt.GetPosPixel(); +state = State::NONE; +data.emplace_back(mouse_pos.X(), mouse_pos.Y(), state); +} + +void DrawingAreaOcr::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle&) +{ +Color aTextCol = rRenderContext.GetLineColor(); + +rRenderContext.SetLineColor(Color( COL_WHITE )); +rRenderContext.DrawRect(tools::Rectangle(Point(0, 0), Size(GetOutputSizePixel().Width(), GetOutputSizePixel().Height(; + +const auto * i_1 = (); +basegfx::B2DPolygon aB2DPolyLine; +for (const auto & i : data) +{ +if (i_1->state == i.state) +{ +aB2DPolyLine.append(basegfx::B2DPoint(i.x, i.y)); +} +else +{ +if (i_1->state == State::DRAW) +{ +rRenderContext.SetLineColor(Color( COL_BLACK )); +rRenderContext.DrawPolyLine(aB2DPolyLine, 10.0); +} +else if (i_1->state == State::DELETE) +{ +rRenderContext.SetLineColor(Color( COL_WHITE )); +rRenderContext.DrawPolyLine(aB2DPolyLine, 10.0); +} +aB2DPolyLine.clear(); +} +i_1 = +} + +size_t size = data.size(); +if (size >= 2) +{ +if (data[size-2].state == State::DRAW) +{ +rRenderContext.SetLineColor(Color( COL_BLACK )); +rRenderContext.DrawPolyLine(aB2DPolyLine, 10.0); +} +else if (data[size-2].state == State::DELETE) +{ +rRenderContext.SetLineColor(Color( COL_WHITE )); +rRenderContext.DrawPolyLine(aB2DPolyLine, 10.0); +} +aB2DPolyLine.clear(); +} + +rRenderContext.SetTextLineColor(aTextCol); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index 7e2619efc10b..752678e1ad91 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -39,6 +39,28 @@ namespace svx struct SvxShowCharSetItem; } +class DrawingAreaOcr : public Control +{ +public: +DrawingAreaOcr(vcl::Window* pParent) : Control(pParent, WB_BORDER), state(State::NONE) {} +void MouseButtonDown (const MouseEvent ) override; +void MouseMove( const MouseEvent ) override; +void MouseButtonUp (const MouseEvent ) override; +void Paint( vcl::RenderContext& rRenderContext, const ::tools::Rectangle& ) override; + +private: +enum class State {DRAW, DELETE, NONE}; +State state; +struct DrawPoint +{ +int x; +int y; +State state; +DrawPoint(int x_, int y_, State state_) : x(x_), y(y_), state(state_) {}; +}; +std::vector data; +}; + class SvxShowText : public Control { public: @@ -79,7 +101,7 @@ private: VclPtrm_pSubsetLB; VclPtrm_pShowChar; VclPtr m_pDrawChk; -VclPtrm_pDrawingArea; +VclPtr m_pDrawingArea; VclPtr m_pSearchText; VclPtr m_pHexCodeText; VclPtr m_pDecimalCodeText; diff --git a/cui/uiconfig/ui/specialcharacters.ui b/cui/uiconfig/ui/specialcharacters.ui index ca21156de36c..9067d6fbb163 100644 --- a/cui/uiconfig/ui/specialcharacter
[Libreoffice-commits] core.git: Branch 'private/bansan/chardraw' - 2 commits - cui/source cui/uiconfig
cui/source/dialogs/cuicharmap.cxx| 19 ++ cui/source/inc/cuicharmap.hxx|3 ++ cui/uiconfig/ui/specialcharacters.ui | 47 +-- 3 files changed, 62 insertions(+), 7 deletions(-) New commits: commit 98a44dbadab9fee22ddebebb0b3e08691b818021 Author: Vincent Le Garrec <legarrec.vinc...@gmail.com> Date: Mon Jan 15 23:20:29 2018 +0100 Add event to draw checkbox When box is checked, the drawingarea is visible instead of the showchar. Change-Id: I1f1219eb0087a8aff4d70c856c4b2823249b0ceb diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index ef849a56f8d6..4c6a2b3a3d82 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -64,6 +64,8 @@ SvxCharacterMap::SvxCharacterMap( vcl::Window* pParent, const SfxItemSet* pSet, get(m_pShowSet, "showcharset"); get(m_pSearchSet, "searchcharset"); get(m_pShowChar, "showchar"); +get(m_pDrawChk, "drawcheckbutton"); +get(m_pDrawingArea, "drawingarea"); m_pShowChar->SetCentered(true); if (m_bHasInsert) get(m_pOKBtn, "insert"); else get(m_pOKBtn, "ok"); @@ -188,6 +190,8 @@ void SvxCharacterMap::dispose() m_pSubsetText.clear(); m_pSubsetLB.clear(); m_pShowChar.clear(); +m_pDrawChk.clear(); +m_pDrawingArea.clear(); m_pHexCodeText.clear(); m_pDecimalCodeText.clear(); m_pCharName.clear(); @@ -486,6 +490,8 @@ void SvxCharacterMap::init() m_pShowSet->SetPreSelectHdl( LINK( this, SvxCharacterMap, CharPreSelectHdl ) ); m_pShowSet->SetFavClickHdl( LINK( this, SvxCharacterMap, FavClickHdl ) ); +m_pDrawChk->SetClickHdl( LINK( this, SvxCharacterMap, DrawToggleHdl ) ); + m_pSearchSet->SetDoubleClickHdl( LINK( this, SvxCharacterMap, SearchCharDoubleClickHdl ) ); m_pSearchSet->SetSelectHdl( LINK( this, SvxCharacterMap, SearchCharSelectHdl ) ); m_pSearchSet->SetHighlightHdl( LINK( this, SvxCharacterMap, SearchCharHighlightHdl ) ); @@ -939,6 +945,19 @@ IMPL_LINK_NOARG(SvxCharacterMap, InsertClickHdl, Button*, void) EndDialog(RET_OK); } +IMPL_LINK_NOARG(SvxCharacterMap, DrawToggleHdl, Button*, void) +{ +if (m_pDrawChk->IsChecked()) +{ +m_pDrawingArea->Show(); +m_pShowChar->Hide(); +} +else +{ +m_pDrawingArea->Hide(); +m_pShowChar->Show(); +} +} IMPL_STATIC_LINK(SvxCharacterMap, LoseFocusHdl, Control&, pItem, void) { diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index b1a06b4540e3..7e2619efc10b 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -78,6 +78,8 @@ private: VclPtr m_pSubsetText; VclPtrm_pSubsetLB; VclPtrm_pShowChar; +VclPtr m_pDrawChk; +VclPtrm_pDrawingArea; VclPtr m_pSearchText; VclPtr m_pHexCodeText; VclPtr m_pDecimalCodeText; @@ -105,6 +107,7 @@ private: DECL_LINK(SubsetSelectHdl, ListBox&, void); DECL_LINK(CharDoubleClickHdl, SvxShowCharSet*,void); DECL_LINK(CharSelectHdl, SvxShowCharSet*, void); +DECL_LINK(DrawToggleHdl, Button*, void); DECL_LINK(CharHighlightHdl, SvxShowCharSet*, void); DECL_LINK(CharPreSelectHdl, SvxShowCharSet*, void); DECL_LINK(FavClickHdl, SvxShowCharSet*,void); commit c61d6a88c0f991b70c4bf19466eb671523f84aae Author: Vincent Le Garrec <legarrec.vinc...@gmail.com> Date: Mon Jan 15 23:16:41 2018 +0100 Add draw functions to specialchar ui Change-Id: I6b732127cdd48b5e0acf8c409d586426d9b13c8e diff --git a/cui/uiconfig/ui/specialcharacters.ui b/cui/uiconfig/ui/specialcharacters.ui index 09a18b37b90a..ca21156de36c 100644 --- a/cui/uiconfig/ui/specialcharacters.ui +++ b/cui/uiconfig/ui/specialcharacters.ui @@ -202,6 +202,22 @@ + +80 +150 +False +True +True +True + + +False +True +0 +1 + + + True False @@ -212,7 +228,7 @@ 0 -1 +2 @@ -224,6 +240,23 @@ 6 True + +Draw +True +True +False +True +start +
[Libreoffice-commits] core.git: Branch 'private/bansan/chardraw' - cui/uiconfig
cui/uiconfig/ui/specialcharacters.ui | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) New commits: commit 95412fb81060f9483406ca7fd50de8cf8fa684a3 Author: Vincent Le Garrec <legarrec.vinc...@gmail.com> Date: Sun Jan 14 21:14:56 2018 +0100 Sort lines according to top_attach Change-Id: Ic03e086800f90a201f26b4ec754a7ffefc92e3cb diff --git a/cui/uiconfig/ui/specialcharacters.ui b/cui/uiconfig/ui/specialcharacters.ui index 91411e893f12..09a18b37b90a 100644 --- a/cui/uiconfig/ui/specialcharacters.ui +++ b/cui/uiconfig/ui/specialcharacters.ui @@ -202,6 +202,20 @@ + +True +False +False +word +center +False + + +0 +1 + + + True False @@ -306,20 +320,6 @@ 2 - - -True -False -False -word -center -False - - -0 -1 - - 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits