core.git: bin/find-can-be-private-symbols.py bin/find-mergedlib-can-be-private.classes.results bin/find-mergedlib-can-be-private.py bin/find-mergedlib-can-be-private-symbols.classes.results bin/find-m
bin/find-can-be-private-symbols.py | 24
bin/find-mergedlib-can-be-private-symbols.classes.results | 250
bin/find-mergedlib-can-be-private-symbols.functions.results |16589
bin/find-mergedlib-can-be-private.classes.results | 251
bin/find-mergedlib-can-be-private.py| 237
5 files changed, 17020 insertions(+), 331 deletions(-)
New commits:
commit 32d7935b3d506504e25737fe8ad8f0f5a2a75845
Author: Noel Grandin
AuthorDate: Sat Apr 27 20:36:24 2024 +0200
Commit: Noel Grandin
CommitDate: Sun Apr 28 06:21:43 2024 +0200
improve the mergedlib script
by copying the improvements from the normal find-can-be-private
script.
Change-Id: I3cb23022ca33d3008af962fa99b5b0907fe753b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166783
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/bin/find-can-be-private-symbols.py
b/bin/find-can-be-private-symbols.py
index da28310196f7..e5d7175d4be7 100755
--- a/bin/find-can-be-private-symbols.py
+++ b/bin/find-can-be-private-symbols.py
@@ -23,18 +23,8 @@ exported_symbols1 = set()
imported_symbols1 = set()
exported_symbols2 = set() # decoded
imported_symbols2 = set() # decoded
-# all names that exist in the source code
-#all_source_names = set()
-#subprocess_find_all_source_names = subprocess.Popen("git grep -oh -P
'\b\w\w\w+\b' -- '*.h*' | sort -u",
-#stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True)
-#with subprocess_find_all_source_names.stdout as txt:
-#for line in txt:
-#line = line.strip()
-#all_source_names.add(line)
-#subprocess_find_all_source_names.terminate()
-
# find all our shared libs
subprocess_find = subprocess.Popen("find ./instdir -name *.so && find
./workdir/LinkTarget/CppunitTest -name *.so",
stdout=subprocess.PIPE, shell=True)
@@ -88,15 +78,6 @@ with subprocess_find.stdout as txt:
imported_symbols1.add(sym)
subprocess_find.terminate()
-#progress = 0;
-#for sym in sorted(imported_symbols - exported_symbols):
-#progress += 1
-#if (progress % 128 == 0): print( str(int(progress * 100 / len(diff))) +
"%")
-#filtered_sym = subprocess.check_output(["c++filt",
sym]).strip().decode("utf-8")
-#if filtered_sym.startswith("non-virtual thunk to "): filtered_sym =
filtered_sym[21:]
-#elif filtered_sym.startswith("virtual thunk to "): filtered_sym =
filtered_sym[17:]
-#print("Symbol imported but not exported? " + filtered_sym)
-
# Now we have to symbolize before comparing because sometimes (due to thunks)
two
# different encoded names symbolize to the same method/func name
#
@@ -123,11 +104,6 @@ print("exported = " + str(len(exported_symbols2)))
print("imported = " + str(len(imported_symbols2)))
print("unused_exports = " + str(len(unused_exports)))
-#def extractFunctionNameFromSignature(sym):
-#i = sym.find("(")
-#if i == -1: return sym
-#return sym[:i]
-
# for each class, count how many symbols will become hidden if we mark the
class as hidden
can_be_hidden_count = dict()
for sym in exported_symbols2:
diff --git a/bin/find-mergedlib-can-be-private-symbols.classes.results
b/bin/find-mergedlib-can-be-private-symbols.classes.results
new file mode 100644
index ..1eaf49a0d2a7
--- /dev/null
+++ b/bin/find-mergedlib-can-be-private-symbols.classes.results
@@ -0,0 +1,250 @@
+118 SkCanvas
+108 GraphicsRenderTests
+97 SdrTextObj
+90 SkPath
+71 ScDocument
+70 lucene::index::IndexWriter
+67 StyleSettings
+67 SkMatrix
+66 QtFrame
+64 sdr::table::SdrTableObj
+61 vcl::Window
+61 SvtSearchOptions
+57 SvxRuler
+49 lucene::queryParser::QueryParser
+49 SdrObjCustomShape
+46 E3dScene
+44 GrDirectContext
+43 SmDocShell
+43 SdrPathObj
+41 SfxObjectShell
+38 ToolBox
+38 SvxEditEngineForwarder
+38 SfxMedium
+37 VCLXMenu
+36 StatusBar
+36 SkTypeface
+35 SkBitmap
+35 ListBox
+34 SvxShape
+34 SkNWayCanvas
+34 SdrObject
+34 SdrObjGroup
+34 Menu
+33 XMLTextImportHelper
+33 ThumbnailView
+33 SkPathBuilder
+33 SdrPaintView
+32 lucene::queryParser::QueryParserTokenManager
+32 framework::Desktop
+32 SkString
+31 lucene::util::Misc
+31 SplitWindow
+31 SkRegion
+31 SdrObjEditView
+31 ComboBox
+30 SvXMLImport
+30 SdrRectObj
+30 SdrOle2Obj
+29 lucene::util::StringBuffer
+29 SdrModel
+27 lucene::index::MultiReader
+27 libepubgen::EPUBTextGenerator
+27 SvxRTFParser
+27 E3dObject
+27 BrowseBox
+26 svx::FrameSelector
+26 lucene::index::IndexReader
+26 lucene::document::Field
+26 lucene::analysis::Token
+26 connectivity::file::OPreparedStatement
+26 SkiaSalBitmap
+25 lucene::store::FSDirectory
+25 StarBASIC
+25 SkFont
+24 sfx2::sidebar::SidebarController
+24 comphelper::BackupFileHelper
+24 SkPaintFilterCanvas
+23 oox::drawingml::Color
+23 SkTDStorage
+23 SkPaint
+23 SkMemoryStream
+23 SkColorSpace
+23 Application
+22 SwXTextTableCursor
+22 Hunspell
+21 lucene::index::IndexModifier
+21 formula::FormulaCompiler
+21 SvxRectCtl
+21
core.git: comphelper/source
comphelper/source/container/embeddedobjectcontainer.cxx | 39
comphelper/source/container/enumerablemap.cxx |8 --
comphelper/source/container/enumhelper.cxx |2
comphelper/source/eventattachermgr/eventattachermgr.cxx |3
comphelper/source/misc/docpasswordhelper.cxx|9 --
comphelper/source/misc/sequenceashashmap.cxx| 18 +
comphelper/source/misc/xmlsechelper.cxx |8 --
comphelper/source/property/ChainablePropertySet.cxx | 36 ---
comphelper/source/property/MasterPropertySet.cxx| 32 --
comphelper/source/property/genericpropertyset.cxx | 14 +---
comphelper/source/property/opropertybag.cxx | 31 +++---
comphelper/source/property/propagg.cxx | 30 +++--
comphelper/source/property/propertysethelper.cxx| 49
comphelper/source/property/propertystatecontainer.cxx | 44 +-
comphelper/source/property/propshlp.cxx |3
comphelper/source/property/propstate.cxx| 19 ++
16 files changed, 128 insertions(+), 217 deletions(-)
New commits:
commit 826e7e79f36de0248782213e0196baebc1653e85
Author: Mike Kaganski
AuthorDate: Sun Apr 28 00:52:10 2024 +0500
Commit: Mike Kaganski
CommitDate: Sun Apr 28 05:14:50 2024 +0200
Simplify a bit
Change-Id: I1db779648b273d0c732683042c74bd29666f1b10
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166785
Reviewed-by: Mike Kaganski
Tested-by: Jenkins
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx
b/comphelper/source/container/embeddedobjectcontainer.cxx
index a66ac2dec527..56b50c964823 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -1165,12 +1165,9 @@ bool EmbeddedObjectContainer::StoreAsChildren(bool
_bOasisFormat,bool _bCreateEm
try
{
comphelper::EmbeddedObjectContainer aCnt( _xStorage );
-const uno::Sequence < OUString > aNames = GetObjectNames();
-const OUString* pIter = aNames.getConstArray();
-const OUString* pEnd = pIter + aNames.getLength();
-for(;pIter != pEnd;++pIter)
+for (auto& name : GetObjectNames())
{
-uno::Reference < embed::XEmbeddedObject > xObj =
GetEmbeddedObject( *pIter );
+uno::Reference xObj =
GetEmbeddedObject(name);
SAL_WARN_IF( !xObj.is(), "comphelper.container", "An empty entry
in the embedded objects list!" );
if ( xObj.is() )
{
@@ -1209,13 +1206,13 @@ bool EmbeddedObjectContainer::StoreAsChildren(bool
_bOasisFormat,bool _bCreateEm
{
// if it is an embedded object or the optimized
inserting fails the normal inserting should be done
if ( _bCreateEmbedded
-|| !aCnt.InsertGraphicStreamDirectly( xStream,
*pIter, aMediaType ) )
-aCnt.InsertGraphicStream( xStream, *pIter,
aMediaType );
+|| !aCnt.InsertGraphicStreamDirectly(xStream,
name, aMediaType))
+aCnt.InsertGraphicStream(xStream, name,
aMediaType);
}
else
{
// it is a linked object exported into SO7 format
-InsertStreamIntoPicturesStorage_Impl( _xStorage,
xStream, *pIter );
+InsertStreamIntoPicturesStorage_Impl(_xStorage,
xStream, name);
}
}
}
@@ -1248,7 +1245,7 @@ bool EmbeddedObjectContainer::StoreAsChildren(bool
_bOasisFormat,bool _bCreateEm
}
catch (const embed::WrongStateException&)
{
-SAL_WARN("comphelper.container", "failed to store '"
<< *pIter << "'");
+SAL_WARN("comphelper.container", "failed to store '"
<< name << "'");
}
}
@@ -1290,14 +1287,11 @@ bool EmbeddedObjectContainer::StoreAsChildren(bool
_bOasisFormat,bool _bCreateEm
bool EmbeddedObjectContainer::StoreChildren(bool _bOasisFormat,bool
_bObjectsOnly)
{
bool bResult = true;
-const uno::Sequence < OUString > aNames = GetObjectNames();
-const OUString* pIter = aNames.getConstArray();
-const OUString* pEnd = pIter + aNames.getLength();
-for(;pIter != pEnd;++pIter)
+for (auto& name : GetObjectNames())
{
try
{
-uno::Reference < embed::XEmbeddedObject > xObj =
GetEmbeddedObject( *pIter );
+uno::Reference xObj =
GetEmbeddedObject(name);
SAL_WARN_IF( !xObj.is(), "comphelper.container", "An empty entry
in the embedded objects l
core.git: sd/inc
sd/inc/glob.hxx |4 1 file changed, 4 deletions(-) New commits: commit 2f5ab5b8e7bd7dd06e00153abb77a69e5d192dd2 Author: Gabor Kelemen AuthorDate: Fri Apr 26 10:10:46 2024 +0200 Commit: Gabor Kelemen CommitDate: Sat Apr 27 22:47:25 2024 +0200 Drop now unused option-stream identifiers Change-Id: Id08e41e11b8027339e58ab182739087030e66eef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166754 Reviewed-by: Gabor Kelemen Tested-by: Jenkins diff --git a/sd/inc/glob.hxx b/sd/inc/glob.hxx index ad4ce9f3584c..5905601507b6 100644 --- a/sd/inc/glob.hxx +++ b/sd/inc/glob.hxx @@ -50,8 +50,4 @@ // Separator between layout name and template name of presentation templates inline constexpr OUString SD_LT_SEPARATOR = u"~LT~"_ustr; -// option-stream identifier -#define SD_OPTION_MORPHING u"Morph" -#define SD_OPTION_VECTORIZE u"Vectorize" - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
core.git: chart2/qa chart2/source
chart2/qa/extras/chart2export3.cxx |4
chart2/qa/unit/common_functor_test.cxx |4
chart2/source/controller/main/DrawCommandDispatch.cxx |6
chart2/source/inc/CommonFunctors.hxx | 65
chart2/source/model/filter/XMLFilter.cxx |2
chart2/source/model/main/ChartModel_Persistence.cxx| 20 --
chart2/source/tools/CachedDataSequence.cxx | 76 +
chart2/source/tools/ColorPerPointHelper.cxx|4
chart2/source/tools/InternalDataProvider.cxx | 99 +++--
chart2/source/tools/MeanValueRegressionCurveCalculator.cxx | 18 --
chart2/source/tools/UncachedDataSequence.cxx | 14 -
chart2/source/view/main/ChartView.cxx | 22 +-
12 files changed, 99 insertions(+), 235 deletions(-)
New commits:
commit faeb8adf4b12a62919fbf961f65181964cce5325
Author: Mike Kaganski
AuthorDate: Sat Apr 27 20:49:13 2024 +0500
Commit: Mike Kaganski
CommitDate: Sat Apr 27 20:50:48 2024 +0200
Simplify a bit
Change-Id: Ic6d0dd0f66a258fffd0be7f458316801516aaefc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166778
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/chart2/qa/extras/chart2export3.cxx
b/chart2/qa/extras/chart2export3.cxx
index df96a70e8e1f..df70cd603d89 100644
--- a/chart2/qa/extras/chart2export3.cxx
+++ b/chart2/qa/extras/chart2export3.cxx
@@ -838,9 +838,9 @@ void checkCharacterProps(Reference
const & xTitleProp)
std::vector aValues = { "This", " is", "3", " a ", "custom", "
erte1
", "2dfgd ch", "ar", "t ", "title" };
for (sal_Int32 i = 0; i < xFormattedSubTitle.getLength(); i++)
{
-const OUString aText =
xFormattedSubTitle.getConstArray()[i]->getString();
+const OUString aText = xFormattedSubTitle[i]->getString();
CPPUNIT_ASSERT_EQUAL(aValues[i], aText);
-Reference< beans::XPropertySet >
xRunPropSet(xFormattedSubTitle.getConstArray()[i], uno::UNO_QUERY);
+Reference< beans::XPropertySet > xRunPropSet(xFormattedSubTitle[i],
uno::UNO_QUERY);
// common props
uno::Any aAny = xRunPropSet->getPropertyValue("CharFontName");
CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Aptos Narrow")), aAny);
diff --git a/chart2/qa/unit/common_functor_test.cxx
b/chart2/qa/unit/common_functor_test.cxx
index b2e404e13508..a744945e6663 100644
--- a/chart2/qa/unit/common_functor_test.cxx
+++ b/chart2/qa/unit/common_functor_test.cxx
@@ -48,7 +48,7 @@ void CommonFunctorsTest::testAnyToString()
std::vector aOutput;
std::transform(aInput.begin(), aInput.end(),
-std::back_inserter(aOutput), chart::CommonFunctors::AnyToString());
+std::back_inserter(aOutput), chart::CommonFunctors::ToString());
CPPUNIT_ASSERT_EQUAL(OUString("2"), aOutput[0]);
CPPUNIT_ASSERT_EQUAL(OUString("10"), aOutput[1]);
@@ -65,7 +65,7 @@ void CommonFunctorsTest::testDoubleToString()
std::vector aOutput;
std::transform(aInput.begin(), aInput.end(),
-std::back_inserter(aOutput),
chart::CommonFunctors::DoubleToOUString());
+std::back_inserter(aOutput), chart::CommonFunctors::ToString());
CPPUNIT_ASSERT_EQUAL(OUString("2"), aOutput[0]);
CPPUNIT_ASSERT_EQUAL(OUString("10"), aOutput[1]);
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx
b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 01771f1e7763..516c2d2ec5f3 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -346,13 +346,11 @@ void DrawCommandDispatch::execute( const OUString&
rCommand, const Sequence< bea
pDrawViewWrapper->SetCreateMode();
}
-const beans::PropertyValue* pIter = rArgs.getConstArray();
-const beans::PropertyValue* pEnd = pIter + rArgs.getLength();
-const beans::PropertyValue* pKeyModifier = std::find_if(pIter, pEnd,
+const beans::PropertyValue* pKeyModifier = std::find_if(rArgs.begin(),
rArgs.end(),
[](const
beans::PropertyValue& lhs)
{return lhs.Name ==
"KeyModifier";} );
sal_Int16 nKeyModifier = 0;
-if ( !(pKeyModifier != pEnd && ( pKeyModifier->Value >>= nKeyModifier ) &&
nKeyModifier == KEY_MOD1) )
+if ( !(pKeyModifier != rArgs.end() && ( pKeyModifier->Value >>=
nKeyModifier ) && nKeyModifier == KEY_MOD1) )
return;
if ( eDrawMode != CHARTDRAW_INSERT )
diff --git a/chart2/source/inc/CommonFunctors.hxx
b/chart2/source/inc/CommonFunctors.hxx
index 7bb776490cda..2d01e7ad27ae 100644
--- a/chart2/source/inc/CommonFunctors.hxx
+++ b/chart2/source/inc/CommonFunctors.hxx
@@ -21,9 +21,11 @@
#include
#include
#include
+#include
#include
#include "charttoolsdllapi.hxx"
+#include
#include
core.git: solenv/gbuild
solenv/gbuild/extensions/pre_MergedLibsList.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 47bebbdcf1bdca0ad6da48514a3befa473dd7d7b Author: Noel Grandin AuthorDate: Sat Apr 27 19:27:44 2024 +0200 Commit: Noel Grandin CommitDate: Sat Apr 27 20:45:28 2024 +0200 fix mergelibs build since commit 828c1999e08c5bfad0a1d0e6e5ab07ee8bbc427e Author: Noel Grandin Date: Wed Apr 10 16:50:51 2024 +0100 move writerfilter inside sw Change-Id: I1c8b37510ccdd640937669f36c8086f5f65183f9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166782 Reviewed-by: Noel Grandin Tested-by: Jenkins diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index cc7b9d5e9d25..3c780ec65199 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -184,7 +184,6 @@ gb_MERGE_LIBRARY_LIST += \ solver \ storagefd \ svgfilter \ - sw_writerfilter \ t602filter \ textconversiondlgs \ $(call gb_Helper_optional,XMLHELP,ucpchelp1) \
core.git: include/vbahelper
include/vbahelper/vbashaperange.hxx |4 ++--
include/vbahelper/vbashapes.hxx |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 6c9f7050f60725b64c288179e9aacc5b5327c240
Author: Noel Grandin
AuthorDate: Sat Apr 27 19:04:47 2024 +0200
Commit: Noel Grandin
CommitDate: Sat Apr 27 20:34:31 2024 +0200
reduce symbol visibility in vbahelper
Change-Id: I68995b10956afe4b2a2cf69fe1393d4deaaff02a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166780
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/vbahelper/vbashaperange.hxx
b/include/vbahelper/vbashaperange.hxx
index dfcca6c82549..3dff675063aa 100644
--- a/include/vbahelper/vbashaperange.hxx
+++ b/include/vbahelper/vbashaperange.hxx
@@ -51,7 +51,7 @@ namespace ooo::vba {
typedef CollTestImplHelper< ov::msforms::XShapeRange > ScVbaShapeRange_BASE;
-class VBAHELPER_DLLPUBLIC ScVbaShapeRange final : public ScVbaShapeRange_BASE
+class SAL_DLLPUBLIC_RTTI ScVbaShapeRange final : public ScVbaShapeRange_BASE
{
private:
css::uno::Reference< css::drawing::XDrawPage > m_xDrawPage;
@@ -62,7 +62,7 @@ private:
/// @throws css::uno::RuntimeException
css::uno::Reference< css::drawing::XShapes > const & getShapes() ;
public:
-ScVbaShapeRange( const css::uno::Reference< ov::XHelperInterface >&
xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::container::XIndexAccess >& xShapes,
css::uno::Reference< css::drawing::XDrawPage> xDrawShape, css::uno::Reference<
css::frame::XModel > xModel );
+VBAHELPER_DLLPUBLIC ScVbaShapeRange( const css::uno::Reference<
ov::XHelperInterface >& xParent, const css::uno::Reference<
css::uno::XComponentContext >& xContext, const css::uno::Reference<
css::container::XIndexAccess >& xShapes, css::uno::Reference<
css::drawing::XDrawPage> xDrawShape, css::uno::Reference< css::frame::XModel >
xModel );
// Methods
virtual void SAL_CALL Select( ) override;
diff --git a/include/vbahelper/vbashapes.hxx b/include/vbahelper/vbashapes.hxx
index 7131d8118031..0367f16785c6 100644
--- a/include/vbahelper/vbashapes.hxx
+++ b/include/vbahelper/vbashapes.hxx
@@ -52,7 +52,7 @@ namespace ooo::vba {
typedef CollTestImplHelper< ov::msforms::XShapes > ScVbaShapes_BASE;
-class VBAHELPER_DLLPUBLIC ScVbaShapes final : public ScVbaShapes_BASE
+class SAL_DLLPUBLIC_RTTI ScVbaShapes final : public ScVbaShapes_BASE
{
private:
css::uno::Reference< css::drawing::XShapes > m_xShapes;
@@ -77,7 +77,7 @@ private:
//css::awt::Point calculateTopLeftMargin( css::uno::Reference<
ov::XHelperInterface > xDocument );
public:
-ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent,
const css::uno::Reference< css::uno::XComponentContext >& xContext, const
css::uno::Reference< css::container::XIndexAccess >& xShapes,
css::uno::Reference< css::frame::XModel > xModel );
+VBAHELPER_DLLPUBLIC ScVbaShapes( const css::uno::Reference<
ov::XHelperInterface >& xParent, const css::uno::Reference<
css::uno::XComponentContext >& xContext, const css::uno::Reference<
css::container::XIndexAccess >& xShapes, css::uno::Reference<
css::frame::XModel > xModel );
/// @throws css::uno::RuntimeException
static void setDefaultShapeProperties( const css::uno::Reference<
css::drawing::XShape >& xShape );
static void setShape_NameProperty( const css::uno::Reference<
css::drawing::XShape >& xShape, const OUString& sName );
core.git: sc/inc sc/source
sc/inc/arealink.hxx |4 ++--
sc/inc/autoform.hxx | 24
sc/inc/cellvalue.hxx | 18 +-
sc/inc/colorscale.hxx | 16
sc/inc/conditio.hxx | 22 +++---
sc/inc/dpdimsave.hxx | 14 +++---
sc/inc/dpshttab.hxx |6 +++---
sc/inc/patattr.hxx| 34 +-
sc/inc/postit.hxx | 16
sc/inc/rangeutl.hxx | 14 +++---
sc/inc/refdata.hxx| 34 +-
sc/inc/stlpool.hxx|8
sc/inc/tabprotection.hxx | 20 ++--
sc/source/ui/inc/impex.hxx| 14 +++---
sc/source/ui/inc/undobase.hxx |2 +-
sc/source/ui/inc/undoblk.hxx |8
16 files changed, 127 insertions(+), 127 deletions(-)
New commits:
commit 0eeb12b4243b7af92b99daddbce4eee0b828b6be
Author: Noel Grandin
AuthorDate: Sat Apr 27 16:06:37 2024 +0200
Commit: Noel Grandin
CommitDate: Sat Apr 27 20:12:31 2024 +0200
reduce symbol visibility in sc
Change-Id: I7a1c7dbe61e302584b977fdf202d041d987d0833
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166777
Reviewed-by: Noel Grandin
Tested-by: Jenkins
diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx
index 5eff082b6b80..aabe8b8a8c7e 100644
--- a/sc/inc/arealink.hxx
+++ b/sc/inc/arealink.hxx
@@ -27,7 +27,7 @@
class SfxObjectShell;
class ScDocShell;
-class SC_DLLPUBLIC ScAreaLink final : public ::sfx2::SvBaseLink, public
ScRefreshTimer
+class SAL_DLLPUBLIC_RTTI ScAreaLink final : public ::sfx2::SvBaseLink, public
ScRefreshTimer
{
private:
ScDocShell* m_pDocSh;
@@ -42,7 +42,7 @@ private:
static bool FindExtRange( ScRange& rRange, const ScDocument& rSrcDoc,
const OUString& rAreaName );
public:
-ScAreaLink( ScDocShell* pShell, OUString aFile,
+SC_DLLPUBLIC ScAreaLink( ScDocShell* pShell, OUString aFile,
OUString aFilter, OUString aOpt,
OUString aArea, const ScRange& rDest, sal_Int32
nRefreshDelaySeconds );
virtual ~ScAreaLink() override;
diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx
index b6facd437e12..923a8f0afd58 100644
--- a/sc/inc/autoform.hxx
+++ b/sc/inc/autoform.hxx
@@ -109,7 +109,7 @@ public:
boolSave( SvStream& rStream, sal_uInt16 fileVersion );
};
-class SC_DLLPUBLIC ScAutoFormatData
+class SAL_DLLPUBLIC_RTTI ScAutoFormatData
{
private:
OUString aName;
@@ -134,8 +134,8 @@ private:
public:
ScAutoFormatData();
-ScAutoFormatData( const ScAutoFormatData& rData );
-~ScAutoFormatData();
+SC_DLLPUBLIC ScAutoFormatData( const ScAutoFormatData& rData );
+SC_DLLPUBLIC ~ScAutoFormatData();
voidSetName( const OUString& rName ) { aName =
rName; nStrResId = USHRT_MAX; }
const OUString& GetName() const { return aName; }
@@ -177,7 +177,7 @@ struct DefaultFirstEntry {
bool operator() (const OUString& left, const OUString& right) const;
};
-class SC_DLLPUBLIC ScAutoFormat
+class SAL_DLLPUBLIC_RTTI ScAutoFormat
{
typedef std::map,
DefaultFirstEntry> MapType;
MapType m_Data;
@@ -193,23 +193,23 @@ public:
ScAutoFormat();
void Load();
-bool Save();
+SC_DLLPUBLIC bool Save();
void SetSaveLater( bool bSet );
bool IsSaveLater() const { return mbSaveLater; }
const ScAutoFormatData* findByIndex(size_t nIndex) const;
-ScAutoFormatData* findByIndex(size_t nIndex);
-iterator find(const OUString& rName);
+SC_DLLPUBLIC ScAutoFormatData* findByIndex(size_t nIndex);
+SC_DLLPUBLIC iterator find(const OUString& rName);
-iterator insert(std::unique_ptr pNew);
-void erase(const iterator& it);
+SC_DLLPUBLIC iterator insert(std::unique_ptr pNew);
+SC_DLLPUBLIC void erase(const iterator& it);
-size_t size() const;
+SC_DLLPUBLIC size_t size() const;
const_iterator begin() const;
const_iterator end() const;
-iterator begin();
-iterator end();
+SC_DLLPUBLIC iterator begin();
+SC_DLLPUBLIC iterator end();
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/cellvalue.hxx b/sc/inc/cellvalue.hxx
index 03f8294c543c..d5a29c607c90 100644
--- a/sc/inc/cellvalue.hxx
+++ b/sc/inc/cellvalue.hxx
@@ -104,7 +104,7 @@ public:
* this class any longer than necessary, and absolutely not after the
* original cell has been destroyed.
*/
-struct SC_DLLPUBLIC ScRefCellValue
+struct SAL_DLLPUBLIC_RTTI ScRefCellValue
{
private:
CellType meType;
@@ -116,8 +116,8 @@ private:
};
public:
-ScRefCellValue();
-ScRefCellValue( double fValue );
+SC_DLLPUBLIC ScRefCellValue();
+SC_DLLPUBLIC ScRefCellValue( double fValue );
ScRefCellValue( const svl::SharedString* pString );
ScRefCellValue( const EditTextObject* pEd
core.git: solenv/gdb
solenv/gdb/libreoffice/sw_writerfilter.py |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit adaea5d10d157bacf858a31f611bf3f72ec881a2
Author: Miklos Vajna
AuthorDate: Fri Apr 26 14:54:47 2024 +0200
Commit: Noel Grandin
CommitDate: Sat Apr 27 19:06:19 2024 +0200
solenv, gdb fix error while loading the sw_writerfilter pretty printer
Fixes:
Traceback (most recent call last):
File
"/home/vmiklos/git/libreoffice/core-clang/instdir/program/libsw_writerfilterlo.so-gdb.py",
line 23, in
module = importlib.import_module('libreoffice.' + mod)
File "/usr/lib64/python3.6/importlib/__init__.py", line 126, in
import_module
return _bootstrap._gcd_import(name[level:], package, level)
File "", line 994, in _gcd_import
File "", line 971, in _find_and_load
File "", line 953, in _find_and_load_unlocked
ModuleNotFoundError: No module named 'libreoffice.sw_writerfilter'
When loading a DOCX file while gdb is attached to the soffice process.
Change-Id: I383cadfe6afcd3673adecf46388376a6341dbc93
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166742
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/solenv/gdb/libreoffice/writerfilter.py
b/solenv/gdb/libreoffice/sw_writerfilter.py
similarity index 97%
rename from solenv/gdb/libreoffice/writerfilter.py
rename to solenv/gdb/libreoffice/sw_writerfilter.py
index 487263e92b99..53a5e9a56436 100644
--- a/solenv/gdb/libreoffice/writerfilter.py
+++ b/solenv/gdb/libreoffice/sw_writerfilter.py
@@ -72,7 +72,7 @@ printer = None
def build_pretty_printers():
global printer
-printer = printing.Printer("libreoffice/writerfilter")
+printer = printing.Printer("libreoffice/sw_writerfilter")
printer.add('writerfilter::ooxml::OOXMLProperty', OOXMLPropertyPrinter)
printer.add('writerfilter::ooxml::OOXMLPropertySet',
OOXMLPropertySetPrinter)
printer.add('writerfilter::ooxml::OOXMLPropertySetValue',
OOXMLPropertySetValuePrinter)
core.git: vcl/skia
vcl/skia/gdiimpl.cxx | 20
1 file changed, 20 insertions(+)
New commits:
commit 05d3a99aa687ee4e1706f9403651379b7ebdad89
Author: Patrick Luby
AuthorDate: Fri Apr 26 20:25:03 2024 -0400
Commit: Patrick Luby
CommitDate: Sat Apr 27 16:35:56 2024 +0200
tdf#153306 prevent subpixel shifting of X coordinate
HACK: for some unknown reason, if the X coordinate of the
path's bounds is more than 1024, SkBlendMode::kExclusion will
shift by about a half a pixel to the right with Skia/Metal on
a Retina display. Weirdly, if the same polygon is repeatedly
drawn, the total shift is cumulative so if the drawn polygon
is more than a few pixels wide, the blinking cursor in Writer
will exhibit this bug but only for one thin vertical slice at
a time. Apparently, shifting drawing a very tiny amount to
the left seems to be enough to quell this runaway cumulative
X coordinate shift.
Change-Id: Ic1ac8a390df51c4aa1cc3183590dce72059af6b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166766
Reviewed-by: Patrick Luby
Tested-by: Jenkins
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index f90fbace9d69..4c34d9ab2870 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -1508,6 +1508,26 @@ void SkiaSalGraphicsImpl::invert(basegfx::B2DPolygon
const& rPoly, SalInvert eFl
aPaint.setShader(aBitmap.makeShader(SkTileMode::kRepeat,
SkTileMode::kRepeat,
SkSamplingOptions()));
}
+
+#ifdef SK_METAL
+// tdf#153306 prevent subpixel shifting of X coordinate
+// HACK: for some unknown reason, if the X coordinate of the
+// path's bounds is more than 1024, SkBlendMode::kExclusion will
+// shift by about a half a pixel to the right with Skia/Metal on
+// a Retina display. Weirdly, if the same polygon is repeatedly
+// drawn, the total shift is cumulative so if the drawn polygon
+// is more than a few pixels wide, the blinking cursor in Writer
+// will exhibit this bug but only for one thin vertical slice at
+// a time. Apparently, shifting drawing a very tiny amount to
+// the left seems to be enough to quell this runaway cumulative
+// X coordinate shift.
+if (isGPU())
+{
+SkMatrix aMatrix;
+aMatrix.set(SkMatrix::kMTransX, -0.001);
+getDrawCanvas()->concat(aMatrix);
+}
+#endif
}
getDrawCanvas()->drawPath(aPath, aPaint);
}
Requesting .NET 8 installation on CI platforms
Hello, As you may know, there is an ongoing effort to update the .NET binding support for LibreOffice. To make that happen, having latest .NET installed on CI platforms is needed. .NET is now cross platform and open source, and is available via Github. The latest stable version is 8.0.4: https://github.com/dotnet/core I hereby request installation of .NET 8 on various CI platforms, including Windows, Linux and macOS. Downloads can be found here: https://github.com/dotnet/core/blob/main/release-notes/8.0/8.0.4/8.0.4.md Regards, Hossein -- Hossein Nourikhah, Ph.D., Developer Community Architect Tel: +49 30 5557992-65 | Email: hoss...@libreoffice.org The Document Foundation, Winterfeldtstraße 52, 10781 Berlin, DE Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts Legal details: https://www.documentfoundation.org/imprint
core.git: sd/inc sd/source
sd/inc/sdpage.hxx | 20 ++--
sd/source/ui/inc/DrawController.hxx | 10 +++---
sd/source/ui/inc/DrawDocShell.hxx |6 +++---
sd/source/ui/inc/drawview.hxx |2 +-
sd/source/ui/inc/navigatr.hxx |8
sd/source/ui/inc/unomodel.hxx | 34 +-
6 files changed, 42 insertions(+), 38 deletions(-)
New commits:
commit 6f61cb4b6333b88282978f7472d91c3c86bc628f
Author: Noel Grandin
AuthorDate: Fri Apr 26 19:56:38 2024 +0200
Commit: Noel Grandin
CommitDate: Sat Apr 27 16:08:42 2024 +0200
reduce symbol visibility in sd
Change-Id: I3d4de2b8854278b8713992660268e764815fe738
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166761
Reviewed-by: Noel Grandin
Tested-by: Jenkins
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 3903a59b23ed..efaf3fa876bf 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -88,7 +88,7 @@ namespace sd {
class UndoAttrObject;
}
-class SD_DLLPUBLIC SdPage final : public FmFormPage, public SdrObjUserCall
+class SAL_DLLPUBLIC_RTTI SdPage final : public FmFormPage, public
SdrObjUserCall
{
SdPage& operator=(const SdPage&) = delete;
SdPage(const SdPage&) = delete;
@@ -163,10 +163,10 @@ public:
sd::ShapeList& GetPresentationShapeList() { return
maPresentationShapeList; }
void EnsureMasterPageDefaultBackground();
-SdrObject* CreatePresObj(PresObjKind eObjKind, bool bVertical, const
::tools::Rectangle& rRect);
-rtl::Reference CreateDefaultPresObj(PresObjKind eObjKind);
-voidDestroyDefaultPresObj(PresObjKind eObjKind);
-SdrObject* GetPresObj(PresObjKind eObjKind, int nIndex = 1, bool
bFuzzySearch = false );
+SD_DLLPUBLIC SdrObject* CreatePresObj(PresObjKind eObjKind, bool
bVertical, const ::tools::Rectangle& rRect);
+SD_DLLPUBLIC rtl::Reference CreateDefaultPresObj(PresObjKind
eObjKind);
+SD_DLLPUBLIC void DestroyDefaultPresObj(PresObjKind eObjKind);
+SD_DLLPUBLIC SdrObject* GetPresObj(PresObjKind eObjKind, int nIndex = 1,
bool bFuzzySearch = false );
PresObjKind GetPresObjKind(SdrObject* pObj) const;
OUStringGetPresObjText(PresObjKind eObjKind) const;
SfxStyleSheet* GetStyleSheetForMasterPageBackground() const;
@@ -183,7 +183,7 @@ public:
/** inserts the given SdrObject into the presentation object list */
voidInsertPresObj(SdrObject* pObj, PresObjKind eKind );
-voidSetAutoLayout(AutoLayout eLayout, bool bInit=false, bool
bCreate=false);
+SD_DLLPUBLIC void SetAutoLayout(AutoLayout eLayout, bool bInit=false, bool
bCreate=false);
AutoLayout GetAutoLayout() const { return meAutoLayout; }
voidCreateTitleAndLayout(bool bInit=false, bool bCreate=false);
SdrObject* InsertAutoLayoutShape(SdrObject* pObj, PresObjKind
eObjKind, bool bVertical, const ::tools::Rectangle& rRect, bool bInit);
@@ -262,7 +262,7 @@ public:
voidScaleObjects(const Size& rNewPageSize, const
::tools::Rectangle& rNewBorderRect,
bool bScaleAllObj);
-const OUString& GetName() const;
+SD_DLLPUBLIC const OUString& GetName() const;
OUString const & GetRealName() const { return FmFormPage::GetName(); };
voidSetPresentationLayout(std::u16string_view rLayoutName,
@@ -313,10 +313,10 @@ public:
/** Set the name of the page and broadcast a model change.
*/
-void SetName (const OUString& rName);
+SD_DLLPUBLIC void SetName(const OUString& rName);
-const sd::HeaderFooterSettings& getHeaderFooterSettings() const;
-void setHeaderFooterSettings( const sd::HeaderFooterSettings& rNewSettings
);
+SD_DLLPUBLIC const sd::HeaderFooterSettings& getHeaderFooterSettings()
const;
+SD_DLLPUBLIC void setHeaderFooterSettings( const sd::HeaderFooterSettings&
rNewSettings );
/**
@return true if the object from the ViewObjectContact should
diff --git a/sd/source/ui/inc/DrawController.hxx
b/sd/source/ui/inc/DrawController.hxx
index 940efff5bf18..c935888fa92c 100644
--- a/sd/source/ui/inc/DrawController.hxx
+++ b/sd/source/ui/inc/DrawController.hxx
@@ -74,7 +74,7 @@ class ViewShellBase;
The implementation of the XControllerManager interface is not yet in its
final form.
*/
-class SD_DLLPUBLIC DrawController final
+class SAL_DLLPUBLIC_RTTI DrawController final
: public DrawControllerInterfaceBase,
private BroadcastHelperOwner,
public ::cppu::OPropertySetHelper
@@ -160,7 +160,11 @@ public:
*/
void ReleaseViewShellBase();
-DECLARE_XINTERFACE()
+// XInterface
+virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType
) override;
+SD_DLLPUBLIC virtual void SAL_CALL acquire() noexcept override;
+SD_DLLPUBLIC virtual void SAL_CALL release() noexcept override;
+
DECLARE_XTYPEPROVIDER()
// XComponent
@@ -2
core.git: sw/inc sw/Library_sw_writerfilter.mk sw/source
sw/Library_sw_writerfilter.mk|1 +
sw/inc/unotxdoc.hxx |2 ++
sw/source/core/inc/SwXTextDefaults.hxx |3 ++-
sw/source/uibase/uno/unotxdoc.cxx|8
sw/source/writerfilter/dmapper/DomainMapper.cxx |4 ++--
sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx |3 ++-
sw/source/writerfilter/dmapper/StyleSheetTable.cxx |7 +++
7 files changed, 20 insertions(+), 8 deletions(-)
New commits:
commit a77caf28bac50fe8e3592416d5dedf894a02cbbb
Author: Noel Grandin
AuthorDate: Wed Apr 24 12:26:00 2024 +0200
Commit: Noel Grandin
CommitDate: Sat Apr 27 15:56:28 2024 +0200
use more concrete UNO classes in writerfilter (SwXTextDefaults)
Change-Id: I44eb8d4561798980ff7008d843bf076fc29582c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166769
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/Library_sw_writerfilter.mk b/sw/Library_sw_writerfilter.mk
index 3be1a2d937c6..c48e727a5b85 100644
--- a/sw/Library_sw_writerfilter.mk
+++ b/sw/Library_sw_writerfilter.mk
@@ -20,6 +20,7 @@ $(eval $(call
gb_Library_set_precompiled_header,sw_writerfilter,sw/inc/pch/preco
$(eval $(call gb_Library_set_include,sw_writerfilter,\
$$(INCLUDE) \
-I$(SRCDIR)/sw/inc \
+-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/uibase/uno/ \
-I$(SRCDIR)/sw/source/writerfilter/inc \
-I$(SRCDIR)/sw/source/writerfilter \
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index ab655c6019c4..30edc2fb7c84 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -106,6 +106,7 @@ class SwXReferenceMarks;
class SwXLinkTargetSupplier;
class SwXRedlines;
class SwXDocumentSettings;
+class SwXTextDefaults;
namespace com::sun::star::container { class XNameContainer; }
namespace com::sun::star::frame { class XController; }
namespace com::sun::star::lang { struct Locale; }
@@ -509,6 +510,7 @@ public:
SwDocShell* GetDocShell() {return m_pDocShell;}
SW_DLLPUBLIC rtl::Reference createDocumentSettings();
+SW_DLLPUBLIC rtl::Reference createTextDefaults();
};
class SwXLinkTargetSupplier final : public cppu::WeakImplHelper
diff --git a/sw/source/core/inc/SwXTextDefaults.hxx
b/sw/source/core/inc/SwXTextDefaults.hxx
index 0acab2a7d257..87743eb0cee7 100644
--- a/sw/source/core/inc/SwXTextDefaults.hxx
+++ b/sw/source/core/inc/SwXTextDefaults.hxx
@@ -19,6 +19,7 @@
#pragma once
+#include
#include
#include
#include
@@ -27,7 +28,7 @@
class SwDoc;
class SfxItemPropertySet;
-class SwXTextDefaults final : public cppu::WeakImplHelper
+class SW_DLLPUBLIC SwXTextDefaults final : public cppu::WeakImplHelper
<
css::beans::XPropertyState,
css::beans::XPropertySet,
diff --git a/sw/source/uibase/uno/unotxdoc.cxx
b/sw/source/uibase/uno/unotxdoc.cxx
index f93d7438f363..3bbaa1014aff 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -175,6 +175,7 @@
#include
#include
#include
+#include
using namespace ::com::sun::star;
using namespace ::com::sun::star::text;
@@ -1659,6 +1660,13 @@ rtl::Reference< SwXDocumentSettings >
SwXTextDocument::createDocumentSettings()
return new SwXDocumentSettings(this);
}
+rtl::Reference< SwXTextDefaults > SwXTextDocument::createTextDefaults()
+{
+SolarMutexGuard aGuard;
+ThrowIfInvalid();
+return new SwXTextDefaults(&GetDocOrThrow());
+}
+
Reference< XInterface > SwXTextDocument::createInstance(const OUString&
rServiceName)
{
return create(rServiceName, nullptr);
diff --git a/sw/source/writerfilter/dmapper/DomainMapper.cxx
b/sw/source/writerfilter/dmapper/DomainMapper.cxx
index 5a9f84aa3b0d..7d48b265f079 100644
--- a/sw/source/writerfilter/dmapper/DomainMapper.cxx
+++ b/sw/source/writerfilter/dmapper/DomainMapper.cxx
@@ -92,6 +92,7 @@
#include
#include
#include
+#include
using namespace ::com::sun::star;
using namespace oox;
@@ -172,8 +173,7 @@ DomainMapper::DomainMapper( const uno::Reference<
uno::XComponentContext >& xCon
// the intended font to provide best layout match.
try
{
-uno::Reference< beans::XPropertySet >
xDefProps(GetTextDocument()->createInstance("com.sun.star.text.Defaults"),
-uno::UNO_QUERY_THROW);
+rtl::Reference
xDefProps(GetTextDocument()->createTextDefaults());
xDefProps->setPropertyValue(getPropertyName(PROP_CHAR_FONT_NAME),
css::uno::Any(OUString("Calibri")));
xDefProps->setPropertyValue(getPropertyName(PROP_CHAR_HEIGHT),
css::uno::Any(double(11)));
}
diff --git a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
index c9f8e4d2b077..db22d7f25fe6 100644
--- a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
+++ b/sw/s
core.git: bin/find-can-be-private-symbols.classes.results bin/find-can-be-private-symbols.functions.results
bin/find-can-be-private-symbols.classes.results | 49 - bin/find-can-be-private-symbols.functions.results | 709 -- 2 files changed, 436 insertions(+), 322 deletions(-) New commits: commit 1528564ffd6832e19ba3065d20ba7969e6697486 Author: Noel Grandin AuthorDate: Sat Apr 27 12:54:48 2024 +0200 Commit: Noel Grandin CommitDate: Sat Apr 27 15:42:07 2024 +0200 update can-be-private results file Change-Id: I2ed375d0c47391b5afaa88935294313175f7b142 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166776 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/bin/find-can-be-private-symbols.classes.results b/bin/find-can-be-private-symbols.classes.results index b2dc20a8b1c2..382030a5f7e9 100644 --- a/bin/find-can-be-private-symbols.classes.results +++ b/bin/find-can-be-private-symbols.classes.results @@ -1,48 +1,43 @@ 117 SkCanvas 106 GraphicsRenderTests -90 SkPath +92 SkPath 72 accessibility::AccessibleEditableTextPara 72 SvTreeListBox -71 ScDocument +72 ScDocument 70 lucene::index::IndexWriter 66 QtFrame 65 SkMatrix -63 SdrEdgeObj -60 SdrTextObj +59 SdrTextObj 57 sdr::table::SdrTableObj 57 SvxRuler 57 SdPage 50 SvHeaderTabListBox 49 lucene::queryParser::QueryParser -48 SdrMeasureObj -44 GrDirectContext +45 GrDirectContext 43 SmDocShell 43 SdrPathObj -41 SdrMarkView 41 SdXImpressDocument 41 E3dScene 39 SvTreeList +39 SfxObjectShell 38 sd::DrawDocShell 38 SvxEditEngineForwarder -37 SfxObjectShell 37 SfxMedium 37 DbGridControl 36 SkTypeface -35 SkBitmap +36 SkBitmap 34 chart::ChartModel +34 SkString 34 SkNWayCanvas -34 SdrGrafObj 33 XMLTextImportHelper 33 SkPathBuilder 33 SdrObjGroup 32 lucene::queryParser::QueryParserTokenManager 32 framework::Desktop 32 SvxShape -32 SkString +32 SkRegion 32 ScVbaShapeRange 31 lucene::util::Misc -31 SkRegion -31 SdrEditView 31 ScConditionEntry 30 SdrPaintView 30 SdrObject @@ -52,15 +47,17 @@ 27 libepubgen::EPUBTextGenerator 27 SvxRTFParser 27 SvXMLImport +27 SkiaSalBitmap 26 lucene::index::IndexReader 26 lucene::document::Field 26 lucene::analysis::Token -26 SkiaSalBitmap 26 E3dObject 25 sd::DrawController 25 lucene::store::FSDirectory +25 SvtIconChoiceCtrl 25 SkFont -24 SvtIconChoiceCtrl +25 ScPatternAttr +24 sfx2::sidebar::SidebarController 24 SkPaintFilterCanvas 23 oox::drawingml::Color 23 VCLXMenu @@ -72,11 +69,9 @@ 22 SwXTextTableCursor 22 SvListView 22 Hunspell -21 sfx2::sidebar::SidebarController 21 lucene::index::IndexModifier 21 formula::FormulaCompiler 21 SvxMSDffManager -21 ScPatternAttr 20 sdr::contact::ObjectContact 20 chart::ChartView 20 SkiaSalGraphicsImpl @@ -106,6 +101,7 @@ 17 Storage 17 SkRRect 17 SkPicture +17 GrBackendFormat 17 BrowseBox 16 sdr::properties::DefaultProperties 16 chart::Axis @@ -116,26 +112,25 @@ 15 oox::drawingml::Shape 15 lucene::util::ScorerDocQueue 15 lucene::search::Explanation -15 dbaui::OGenericUnoController 15 connectivity::sdbcx::OKey 15 SvTreeListEntry +15 SkImageInfo 15 SkFILEStream +15 SkDynamicMemoryWStream 15 SdrOle2Obj 15 ScSingleRefData 15 SbxVariable 15 SbxObject 15 NumericFormatter -15 GrBackendFormat 15 FixedText 14 sfx2::sidebar::Panel 14 lucene::store::RAMDirectory 14 lucene::queryParser::legacy::QueryParserBase +14 dbaui::OGenericUnoController +14 SwContentIndex 14 SvxPixelCtl 14 SvTabListBox -14 SvNumberformat 14 SkPixmap -14 SkImageInfo -14 SkDynamicMemoryWStream 14 SfxInterface 14 SdrSnapView 14 ScImportExport @@ -150,12 +145,12 @@ 13 connectivity::sdbcx::OGroup 13 chart::DataSeries 13 SvxBmpMask +13 SvNumberformat 13 SpinButton 13 SkTextBlobBuilder 13 SkCodec 13 SfxViewShell 13 SfxApplication -13 SdrCreateView 13 ScPostIt 13 QtInstance 13 MyThes @@ -180,9 +175,8 @@ 12 SfxListUndoAction 12 SdrVirtObj 12 SdrRectObj -12 SdrDragView -12 SdrDragMethod 12 ScVbaShapes +12 ScSheetDPData 12 NotebookBar 12 MenuButton 12 GrBackendTexture @@ -192,7 +186,6 @@ 11 rptui::OOle2Obj 11 property::OPropertySet 11 oox::shape::ShapeContextHandler -11 oox::AttributeList 11 lucene::store::BufferedIndexInput 11 lucene::search::SortField 11 lucene::search::PhraseQuery @@ -214,7 +207,6 @@ 11 SfxDispatcher 11 SdrPageObj 11 ScSimpleUndo -11 ScSheetDPData 11 ScRefCellValue 11 ScRangePairList 11 GrContext_Base @@ -238,13 +230,14 @@ 10 VCLXWindow 10 ToolBox 10 TabControl +10 SwUserField 10 SvxZoomSliderControl 10 SvXMLExport -10 SvNumberFormatter 10 SkWStream 10 SkUTF 10 SkTextBlob 10 SkRuntimeEffect +10 SkPathMeasure 10 SkDrawable 10 SfxDocumentInfoItem 10 SdrText diff --git a/bin/find-can-be-private-symbols.functions.results b/bin/find-can-be-private-symbols.functions.results index 4080a49fb984..566bd25ab31b 100644 --- a/bin/find-can-be-private-symbols.functions.results +++ b/bin/find-can-be-private-symbols.functions.results @@ -41,7 +41,6 @@ BitmapFilterStackBlur::execute(BitmapEx const&) const BitmapHelper::BitmapHelper(SalBitmap const&, bool) BitmapH
core.git: cppuhelper/qa cppuhelper/source cppu/qa cppu/source
cppu/qa/cppumaker/test_cppumaker.cxx|7 +-
cppu/qa/test_any.cxx| 84
cppu/qa/test_unotype.cxx| 58 +++---
cppu/qa/typelib.cxx | 17 +++---
cppu/source/threadpool/current.cxx | 12 ++--
cppu/source/typelib/static_types.cxx| 36 ++---
cppu/source/typelib/typelib.cxx | 30 +--
cppu/source/uno/EnvStack.cxx|2
cppu/source/uno/cascade_mapping.cxx |2
cppu/source/uno/lbenv.cxx |2
cppu/source/uno/lbmap.cxx |4 -
cppuhelper/qa/misc/test_misc.cxx|4 -
cppuhelper/source/access_control.cxx|6 +-
cppuhelper/source/bootstrap.cxx | 34 ++--
cppuhelper/source/component_context.cxx |8 +--
cppuhelper/source/defaultbootstrap.cxx | 18 +++---
cppuhelper/source/exc_thrower.cxx | 20 +++
cppuhelper/source/factory.cxx | 16 +++---
cppuhelper/source/paths.cxx |4 -
cppuhelper/source/propertysetmixin.cxx | 54 ++--
cppuhelper/source/propshlp.cxx |2
cppuhelper/source/servicemanager.cxx| 46 -
cppuhelper/source/shlib.cxx | 16 +++---
cppuhelper/source/tdmgr.cxx | 30 +--
cppuhelper/source/typemanager.cxx | 20 +++
cppuhelper/source/unourl.cxx| 20 +++
26 files changed, 275 insertions(+), 277 deletions(-)
New commits:
commit 60728712f0f8bf72662da0b0e446ab416e9bf347
Author: Noel Grandin
AuthorDate: Fri Apr 26 15:25:01 2024 +0200
Commit: Noel Grandin
CommitDate: Sat Apr 27 15:11:25 2024 +0200
loplugin:ostr in cppu,cppuhelper
Change-Id: I15c00d7a87396d07be2d10a0311f308a93e8eec3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166751
Reviewed-by: Noel Grandin
Tested-by: Jenkins
diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx
b/cppu/qa/cppumaker/test_cppumaker.cxx
index 22e0b81e19b6..7d611ab10a52 100644
--- a/cppu/qa/cppumaker/test_cppumaker.cxx
+++ b/cppu/qa/cppumaker/test_cppumaker.cxx
@@ -474,8 +474,7 @@ void Test::testBigStruct() {
void Test::testPolyStruct() {
CPPUNIT_ASSERT_EQUAL(
-OUString(
-"test.codemaker.cppumaker.Struct"),
+u"test.codemaker.cppumaker.Struct"_ustr,
(css::uno::Any(
test::codemaker::cppumaker::Struct< sal_Unicode, sal_Int16 >()).
getValueType().getTypeName()));
@@ -494,7 +493,7 @@ void Test::testExceptions() {
aEmptySequence;
test::codemaker::cppumaker::TestException1 e11(
-"abc", nullptr, 1,
+u"abc"_ustr, nullptr, 1,
css::uno::Any(123.0),
test::codemaker::cppumaker::HelperEnum_ONE,
test::codemaker::cppumaker::Struct(5,
aEmptySequence), 2);
@@ -504,7 +503,7 @@ void Test::testExceptions() {
e13 = e11;
CPPUNIT_ASSERT_EQUAL(e11, e13);
test::codemaker::cppumaker::TestException2 e21(
-"abc", nullptr, 1,
+u"abc"_ustr, nullptr, 1,
css::uno::Any(123.0),
test::codemaker::cppumaker::HelperEnum_ONE,
test::codemaker::cppumaker::Struct(5,
aEmptySequence), 2);
diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx
index 757040314844..9b54462a5fd2 100644
--- a/cppu/qa/test_any.cxx
+++ b/cppu/qa/test_any.cxx
@@ -284,9 +284,9 @@ void Test::testVoid() {
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
-OUString b("2");
+OUString b(u"2"_ustr);
CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) );
-CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b );
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", u"2"_ustr, b );
}
{
css::uno::Type b(cppu::UnoType::get());
@@ -393,9 +393,9 @@ void Test::testBoolean() {
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
-OUString b("2");
+OUString b(u"2"_ustr);
CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) );
-CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b );
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", u"2"_ustr, b );
}
{
css::uno::Type b(cppu::UnoType::get());
@@ -504,9 +504,9 @@ void Test::testByte() {
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
-OUString b("2");
+OUString b(u"2"_ustr);
CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) );
-CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", OUString("2"), b );
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "OUString", u"2"_ustr, b );
}
{
css::uno::Type b(cppu::UnoType::get());
@@ -615,9 +615,9 @@ void Test::testShort() {
CPPUNIT_ASSERT_EQUAL_MESSAGE("sal_Unicode", u'2', b);
}
{
-OUString b("2");
+OUString b(u"2"_ustr);
CPPUNIT_ASSERT_MESSAGE( "OUString", !(a >>= b) );
-CPPUNIT_ASSERT_EQUAL_MESSAG
core.git: sw/inc sw/Library_sw_writerfilter.mk sw/source
sw/Library_sw_writerfilter.mk|1
sw/inc/unotxdoc.hxx |3 +
sw/source/uibase/uno/SwXDocumentSettings.hxx |4 +
sw/source/uibase/uno/unotxdoc.cxx|7 ++
sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx |7 +-
sw/source/writerfilter/dmapper/DomainMapper_Impl.hxx |6 +-
sw/source/writerfilter/dmapper/SettingsTable.cxx | 49 +++
sw/source/writerfilter/dmapper/SettingsTable.hxx |4 +
sw/source/writerfilter/filter/WriterFilter.cxx |4 -
9 files changed, 46 insertions(+), 39 deletions(-)
New commits:
commit 87e0feafd3690a9b58890cc28f8ba0c521bfb557
Author: Noel Grandin
AuthorDate: Wed Apr 24 12:11:46 2024 +0200
Commit: Noel Grandin
CommitDate: Sat Apr 27 12:47:57 2024 +0200
use more concrete UNO classes in writerfilter (SwXDocumentSettings)
Change-Id: Id668946233d55d641199634d7ceda2607107e76b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166694
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/Library_sw_writerfilter.mk b/sw/Library_sw_writerfilter.mk
index 447752dabd43..3be1a2d937c6 100644
--- a/sw/Library_sw_writerfilter.mk
+++ b/sw/Library_sw_writerfilter.mk
@@ -20,6 +20,7 @@ $(eval $(call
gb_Library_set_precompiled_header,sw_writerfilter,sw/inc/pch/preco
$(eval $(call gb_Library_set_include,sw_writerfilter,\
$$(INCLUDE) \
-I$(SRCDIR)/sw/inc \
+-I$(SRCDIR)/sw/source/uibase/uno/ \
-I$(SRCDIR)/sw/source/writerfilter/inc \
-I$(SRCDIR)/sw/source/writerfilter \
))
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 018784174cbb..ab655c6019c4 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -105,6 +105,7 @@ class SwXLineNumberingProperties;
class SwXReferenceMarks;
class SwXLinkTargetSupplier;
class SwXRedlines;
+class SwXDocumentSettings;
namespace com::sun::star::container { class XNameContainer; }
namespace com::sun::star::frame { class XController; }
namespace com::sun::star::lang { struct Locale; }
@@ -506,6 +507,8 @@ public:
css::uno::Reference<
css::uno::XInterface > const & xLastResult);
SwDocShell* GetDocShell() {return m_pDocShell;}
+
+SW_DLLPUBLIC rtl::Reference createDocumentSettings();
};
class SwXLinkTargetSupplier final : public cppu::WeakImplHelper
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.hxx
b/sw/source/uibase/uno/SwXDocumentSettings.hxx
index 3d722e40ba80..067e2e8fbc1b 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.hxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.hxx
@@ -19,7 +19,9 @@
#pragma once
+#include
#include
+#include
#include
#include
#include
@@ -30,7 +32,7 @@ class SwDocShell;
class SwDoc;
class SfxPrinter;
-class SwXDocumentSettings final :
+class SW_DLLPUBLIC SwXDocumentSettings final :
public comphelper::MasterPropertySet,
public css::lang::XServiceInfo,
public css::lang::XTypeProvider,
diff --git a/sw/source/uibase/uno/unotxdoc.cxx
b/sw/source/uibase/uno/unotxdoc.cxx
index d2641b6c4db4..f93d7438f363 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -1652,6 +1652,13 @@ css::uno::Reference
SwXTextDocument::create(
return xTmp;
}
+rtl::Reference< SwXDocumentSettings > SwXTextDocument::createDocumentSettings()
+{
+SolarMutexGuard aGuard;
+ThrowIfInvalid();
+return new SwXDocumentSettings(this);
+}
+
Reference< XInterface > SwXTextDocument::createInstance(const OUString&
rServiceName)
{
return create(rServiceName, nullptr);
diff --git a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
index aab27ef1a4bc..c9f8e4d2b077 100644
--- a/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
+++ b/sw/source/writerfilter/dmapper/DomainMapper_Impl.cxx
@@ -132,6 +132,7 @@
#include
#include
#include
+#include
#define REFFLDFLAG_STYLE_FROM_BOTTOM 0xc100
#define REFFLDFLAG_STYLE_HIDE_NON_NUMERICAL 0xc200
@@ -523,11 +524,11 @@ uno::Reference< text::XText > const &
DomainMapper_Impl::GetBodyText()
}
-uno::Reference< beans::XPropertySet > const &
DomainMapper_Impl::GetDocumentSettings()
+rtl::Reference const &
DomainMapper_Impl::GetDocumentSettings()
{
if( !m_xDocumentSettings.is() && m_xTextDocument.is())
{
-m_xDocumentSettings.set(
m_xTextDocument->createInstance("com.sun.star.document.Settings"),
uno::UNO_QUERY );
+m_xDocumentSettings = m_xTextDocument->createDocumentSettings();
}
return m_xDocumentSettings;
}
@@ -9592,7 +9593,7 @@ void DomainMapper_Impl::ApplySettingsTable()
m_xTextDocument->setViewData(xBox);
}
-uno::Reference< beans::XPropertySet >
xSettings(m_xTextDocument->createInstance("com.sun.star.document.Settings"),
uno::UNO_QUERY);
+rtl::Reference
xSettings(m_xT
core.git: config_host.mk.in configure.ac
config_host.mk.in |6 +++--- configure.ac | 12 +++- 2 files changed, 10 insertions(+), 8 deletions(-) New commits: commit 9d7548dafb44c1f0af82771a597db1404659af66 Author: Christian Lohmaier AuthorDate: Fri Apr 26 13:03:49 2024 +0200 Commit: Christian Lohmaier CommitDate: Sat Apr 27 10:16:39 2024 +0200 fix some hardcoded use of wsl.exe and fix some typos Change-Id: I6152ee61913638f828eeb201ecb26312de5f8572 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166737 Reviewed-by: Christian Lohmaier Tested-by: Jenkins diff --git a/config_host.mk.in b/config_host.mk.in index 70d73f0a32f5..3ffe88380180 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -792,8 +792,8 @@ include @SRC_ROOT@/download.lst KEEP_AWAKE_CMD=@KEEP_AWAKE_CMD@ -# prep for WSL-as-helper-builds where build runs from within git-bash/MSYS that would otherwise -# messes with anything that looks like a path (starts with /) but it cannot resolve +# used for WSL-as-helper-builds where the build runs from within git-bash/MSYS that otherwise would +# mess with anything that looks like a path (starts with a /) but cannot be resolved to a target export MSYS_NO_PATHCONV=1 STRAWBERRY_PERL=@STRAWBERRY_PERL@ -WSL=@WSL@ \ No newline at end of file +WSL=@WSL@ diff --git a/configure.ac b/configure.ac index 1650686382ef..e04f4a846642 100644 --- a/configure.ac +++ b/configure.ac @@ -337,7 +337,8 @@ if test -n "$WSL_DISTRO_NAME" && $(echo $PATH |grep -q mingw64); then STRAWBERRY_PERL="$formatted_path/perl/bin/perl.exe" AC_ARG_WITH([wsl-command], [AS_HELP_STRING([--with-wsl-command], -[Specify your wsl distro command if it isn't the default/the one used with just wsl.exe])], +[Specify your wsl distro command if it isn't the default/the one used with just wsl.exe – + for example: wsl.exe -d MyDistro -u NonDefaultUser])], [], [with_wsl_command="wsl.exe"]) WSL="$with_wsl_command" @@ -15468,10 +15469,11 @@ if test -n "$WSL_ONLY_AS_HELPER"; then PERL="perl.exe" # use flex, gperf and nasm from wsl-container # if using absolute path, would need to use double-leading slash for the msys path mangling -FLEX="wsl.exe $FLEX" -NASM="wsl.exe $NASM" -# some externals (libebook) checks with AC_PATH_PROGS, and that requires argument to begin with slash... -GPERF="/c/Windows/system32/wsl.exe gperf" +FLEX="$WSL $FLEX" +NASM="$WSL $NASM" +# some externals (libebook) check for it with AC_PATH_PROGS, and that only accepts overrides +# with an absolute path/requires the value to begin with a slash +GPERF="/c/Windows/system32/$WSL gperf" # append strawberry tools dir to PATH (for e.g. windres, ar) LO_PATH="$LO_PATH:$STRAWBERRY_TOOLS" # temp-dir needs to be in windows realm, hardcode for now
core.git: cui/uiconfig
cui/uiconfig/ui/hyperlinkdialog.ui | 222 ++--- 1 file changed, 63 insertions(+), 159 deletions(-) New commits: commit 535391b31abafb02e5a4451e30a14a5605d05ff4 Author: Samuel Mehrbrodt AuthorDate: Fri Apr 26 10:09:06 2024 +0200 Commit: Samuel Mehrbrodt CommitDate: Sat Apr 27 09:29:14 2024 +0200 Save with newer Glade version Change-Id: If36d812ba976bc3331086b5beb5493f20c0556ce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166701 Reviewed-by: Samuel Mehrbrodt Tested-by: Jenkins diff --git a/cui/uiconfig/ui/hyperlinkdialog.ui b/cui/uiconfig/ui/hyperlinkdialog.ui index c598e02093e4..b8819f74d31a 100644 --- a/cui/uiconfig/ui/hyperlinkdialog.ui +++ b/cui/uiconfig/ui/hyperlinkdialog.ui @@ -1,33 +1,33 @@ - + -False +False True True -6 +6 Hyperlink -0 -0 -dialog +0 +0 +dialog -False +False True True vertical 6 -False -end +False +end Reset True -True -True +True +True Resets the entries in the dialog to their original state. @@ -44,8 +44,8 @@ Apply True -True -True +True +True Applies the data to your document. @@ -62,10 +62,10 @@ _OK True -True -True -True -True +True +True +True +True True @@ -78,8 +78,8 @@ _Cancel True -True -True +True +True True @@ -97,8 +97,8 @@ _Help True -True -True +True +True True @@ -112,46 +112,22 @@ False True -end +end 0 True -True +True True True -left +left True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @@ -160,14 +136,14 @@ True -False +False vertical True -False -This is where you create a hyperlink to a Web page. -res/hlinettp.png +False +This is where you create a hyperlink to a Web page. +res/hlinettp.png 6 @@ -179,10 +155,10 @@ True -False +False _Internet -True -internet +True +internet False @@ -192,38 +168,14 @@ -False +False True -False - - - - - - - - - - - - - - - - - - - - - - - - +False @
